gentoo resync : 25.11.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-11-25 22:39:15 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-11-25 22:39:15 +0000
commit: d934827bf44b7cfcf6711964418148fa60877668 (patch)
tree: 0625f358789b5e015e49db139cc1dbc9be00428f /dev-util
parent: 2e34d110f164bf74d55fced27fe0000201b3eec5 (diff)
418 files changed, 6307 insertions, 5407 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 26dae6013de7..329fee4eb2eb 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/abi-dumper/Manifest b/dev-util/abi-dumper/Manifest
index aa3292abca2f..362869e7c07f 100644
--- a/dev-util/abi-dumper/Manifest
+++ b/dev-util/abi-dumper/Manifest
@@ -1,3 +1,5 @@
 DIST abi-dumper-1.1.tar.gz 49012 BLAKE2B ec86c073bccef5022376acf10b7e0b13d34bac8394277ae53c5ea9b981c4008c5895d3137e3ca0a5cfd64f2d2425cb13a0912f6dada048adfa290dd144ab58ed SHA512 28b791de74dafd0b3d78314c1c722d03bfeb0daa5cb702def9268e4c64f49c79b4fd92d4adf89a20f79c745ef70bc18d2b1143fbe0c7ad192b2f64cb1551b371
+DIST abi-dumper-1.2.tar.gz 47287 BLAKE2B 93aef6a4f11ce33f04d6778d02749b4caf2eb782297957c6295d0d27f43386a92e0207b9bf6fbd17ae5e7f09964677810d6c42d3aea589fcfa46ce5f8353ee16 SHA512 cb081a8aaa548bb2360cfe55d4258c263990a4cc36feaabdafa0dc32252d19ce3ce0209e6af14c03157a144fea0e5ecb6700848f74b4da4c3ee2cdb6f0d860d2
 EBUILD abi-dumper-1.1.ebuild 587 BLAKE2B b3362c46859c331740304089106e36b1ee8cbabc0874febf7a524ab5c0e7d7dc80633d971dcc5a5c2da59a3a933b92593d5e56e2f201e1fc4ac6bf7513d892df SHA512 d9b0ed3d94f6bba83e949e4e3ee309d544d53efe58666e69b37286f879201ed6d2f00e62ac7d8994c711571c6a65a3e02115066a8edcecefdc14fa8dd07ce873
+EBUILD abi-dumper-1.2.ebuild 584 BLAKE2B 717578d28a2891a6343928575c7e1920c9d4215ecdb5c9733d8d7c1f0e41237bbf9b1c8498274faa950adbf93d077c7b678f6064ebb9b9acf5959a07aeca8562 SHA512 ab6a32f5c940b23cff28694aa62bbbcd52f7d31afdab0a767676ac8fa169389ff07a82e3a200d04b17672aa15857fc1091d03e4dc858aaf6592c85f6e30784a6
 MISC metadata.xml 433 BLAKE2B df4920a06673222e81e4142dbfe44e7aaf8cef4793ee72d512f6cc28dd02df6c8e280b722860ed5ccd3e1bf96a26190ab8be81ae76c305190c5b5e053abe1d0e SHA512 1d2b626dd625e2469efe07130c1ccb1d3727f61226a7759d8a9c4eb942c37f992bc8d7bddcb54869b4316af8442c92ff56b76981fcd7bb779920e8da4bb1116a
diff --git a/dev-util/abi-dumper/abi-dumper-1.2.ebuild b/dev-util/abi-dumper/abi-dumper-1.2.ebuild
new file mode 100644
index 000000000000..954291e0ea90
--- /dev/null
+++ b/dev-util/abi-dumper/abi-dumper-1.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Dump ABI of an ELF object containing DWARF debug info"
+HOMEPAGE="https://github.com/lvc/abi-dumper"
+SRC_URI="https://github.com/lvc/abi-dumper/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-lang/perl"
+RDEPEND="${DEPEND}
+	dev-libs/elfutils
+	dev-util/vtable-dumper"
+
+src_compile() {
+	:
+}
+
+src_install() {
+	dodir /usr
+	perl Makefile.pl -install -prefix "${EPREFIX}/usr" -destdir "${D}" || die
+	einstalldocs
+}
diff --git a/dev-util/android-studio/Manifest b/dev-util/android-studio/Manifest
index 5867d4497003..15968b5cb41f 100644
--- a/dev-util/android-studio/Manifest
+++ b/dev-util/android-studio/Manifest
@@ -1,14 +1,6 @@
 AUX 0001-use-java-home-before-bundled.patch 927 BLAKE2B 4a04243d6c6e3712bffca951225ac8d6019fbacb4d48472cc9e8915eb0e10fd569f6421f5daf541a82e96f494203336a9fa62f2afd14b654add82819d6971b22 SHA512 ab21686432190e47bdd8ad0cb4cb9cd0a6d9e89b7c376b589024fe04eebfc2c0f0d59d8c186921726f6960b896798ee69b147663f56f21501680938b03331832
-DIST android-studio-ide-191.6010548-linux.tar.gz 774544822 BLAKE2B eeeed14c8749015f7a0c9235552c04195f81a30a727adfc48d56d2b39ead6d8b017600be801e19fd8eae25ffd2ccbd081b59d464d7ae6bbf14c0a42dd508087d SHA512 95e7befa684b02c5261244a0568f2180a3fd5cee2abe47309f4d183aae1c97b47c08af3cd228462f7db10f3bdb40c591472e74ffb9d89f08301fc25a04f41507
-DIST android-studio-ide-192.6200805-linux.tar.gz 803889418 BLAKE2B dcbfb2eef299456023a3c21a006b32a203566f1fa3d7ce9eb2e6863bfdc9db9f462b911f7ae96f4ccd62f602b424932365355a0b3a684909116ae87448111a86 SHA512 430b145f0816c06ddbd9583da9d609db52f807412b23d02d2ec3b67d947c2bc669a17c45378f3f0ed42a28108ad90b412878e0fcaa8189ae802a6cac2b19138b
-DIST android-studio-ide-192.6241897-linux.tar.gz 803889879 BLAKE2B 5d2d24de5daa317c53513e2a8985e6998891043b1fe730fadd04c6f8ca9702e8be9f2444d73e47578e4d368951897003170ea7e96c569f038f18b98286478df0 SHA512 7ef878ecbc17f542b2faaf18965a294941424f835c21250ff7fde5e29ddc261b35e5e7391cc50803babdcfc98e25390b806f33d0f7dc0f0bcaf7a94feeeab82e
-DIST android-studio-ide-192.6308749-linux.tar.gz 803133146 BLAKE2B 159192929a0cd526c789d915ad15bcc7f6d92e86f1e09f178548ae1055d3086e31f8fb88ceaff55d514728c755eacc84b2abe3c754542fea9e1f5ea117606df5 SHA512 86ce587c2e997dc623498fcf34060568fe58a26f8d287102fc458d963756ba98a4782709cb45f54e847658f64ad263ae2f59bbe1024a5a20be79be821ba9db00
-DIST android-studio-ide-192.6392135-linux.tar.gz 810065819 BLAKE2B e133c346f7ee9ac775efc492f2f0d73a1f82bb95dcf2f108e20fa9201639bff79efa10d67b38187791e1473df3c1ac60c387e741bf5c5fa30b97766ca5f15107 SHA512 246e8b201b99e0d218699a21293c4c85ea334e04d2b13a0ea72e8595e253fe196af2ff9a20920d86a07348aaa64147a13a97a550debe6053d037b49821dc5c8f
 DIST android-studio-ide-193.6626763-linux.tar.gz 907569312 BLAKE2B 602170eea29e632dd5720ef364510a20056a4d98c61e77d5436a2f624a60e0cfa4e0533174613a74f359d8fdeb4e87489caeb5c34b292fcdc35843a76440a9a3 SHA512 7fba99efccdf3bbbfcbc94625aba3789b1bad0e830b2ac890bd681b9089e6789e87b2dbdc80c6ef3d8db2b2438678a8bb58aefb3c311f61f619042ab1ec9dfac
-EBUILD android-studio-3.5.3.0.191.6010548.ebuild 3656 BLAKE2B ed1003b89ef10c8638787930258095cd44b084e757fd0542364dfb0d9431fee874dc685d549517d5ffa37d07d59bb09650d03a0643b1d82a43158b42fec80e0b SHA512 6b6d86ad22486353f650e7d6bc36e5a8a2aa654ca38b24ffa09bb5016892f477d828f604eb3c968399de6c42c5ee2f6fa64767eb9705c57d298afc12e782d187
-EBUILD android-studio-3.6.0.21.192.6200805.ebuild 3658 BLAKE2B a4d9f2469abf8064e298949f81f91295aeea992dea500b1e721b68c0ac5ea0371446a088e7ae144704feaeb00ad78ee4b718f6a3eb21b83c2cbb6be1dc5db0a2 SHA512 333a6979fa5d1e863cde3a92172b129b7d16874bb4905228743fc35de421802d855ae2bcc85bfa3b7a1cfebefa508208051ab63d54096eed0f458382e91d9407
-EBUILD android-studio-3.6.1.0.192.6241897.ebuild 3658 BLAKE2B a4d9f2469abf8064e298949f81f91295aeea992dea500b1e721b68c0ac5ea0371446a088e7ae144704feaeb00ad78ee4b718f6a3eb21b83c2cbb6be1dc5db0a2 SHA512 333a6979fa5d1e863cde3a92172b129b7d16874bb4905228743fc35de421802d855ae2bcc85bfa3b7a1cfebefa508208051ab63d54096eed0f458382e91d9407
-EBUILD android-studio-3.6.2.0.192.6308749.ebuild 3658 BLAKE2B a4d9f2469abf8064e298949f81f91295aeea992dea500b1e721b68c0ac5ea0371446a088e7ae144704feaeb00ad78ee4b718f6a3eb21b83c2cbb6be1dc5db0a2 SHA512 333a6979fa5d1e863cde3a92172b129b7d16874bb4905228743fc35de421802d855ae2bcc85bfa3b7a1cfebefa508208051ab63d54096eed0f458382e91d9407
-EBUILD android-studio-3.6.3.0.192.6392135.ebuild 3658 BLAKE2B a4d9f2469abf8064e298949f81f91295aeea992dea500b1e721b68c0ac5ea0371446a088e7ae144704feaeb00ad78ee4b718f6a3eb21b83c2cbb6be1dc5db0a2 SHA512 333a6979fa5d1e863cde3a92172b129b7d16874bb4905228743fc35de421802d855ae2bcc85bfa3b7a1cfebefa508208051ab63d54096eed0f458382e91d9407
+DIST android-studio-ide-201.6858069-linux.tar.gz 926181537 BLAKE2B ed815f5565ef97ca3f4e1c6cbae3548c70ba94a94a7ae522102044ada31468f241db68ef3d1a1ce6acef60a1bc2e6cd7eba1375a1cebbf01c73063a3d85eb9b2 SHA512 b473e9573e21c666042befa17fde8fc9cb0d6ffd41513d64b74779815079d8971c66afcd1dda5663b503324d14851c4f24a454e5da97e2473550323c09919825
 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
 MISC metadata.xml 313 BLAKE2B 623366c889e8b0d9c33a56fd3ca96156208db355e1549bbf8040a6839a953a82459b3c87e5a0f16f1d67ede403ee5a9e1747c445e855434f25d0f03fe5a6c43a SHA512 1c3e18bd57e48e7f65791f8904bcdde910f1d97d83e781c7c3815df6127aaac9063614e0a11cf7762059f762c4696e2b89ca446ffb9e631a2c85ff2b350e972a
diff --git a/dev-util/android-studio/android-studio-3.5.3.0.191.6010548.ebuild b/dev-util/android-studio/android-studio-3.5.3.0.191.6010548.ebuild
deleted file mode 100644
index 0eebfe88b67d..000000000000
--- a/dev-util/android-studio/android-studio-3.5.3.0.191.6010548.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2020 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-studio/android-studio-3.6.1.0.192.6241897.ebuild b/dev-util/android-studio/android-studio-3.6.1.0.192.6241897.ebuild
deleted file mode 100644
index e9812c3699a7..000000000000
--- a/dev-util/android-studio/android-studio-3.6.1.0.192.6241897.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2020 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-studio/android-studio-3.6.2.0.192.6308749.ebuild b/dev-util/android-studio/android-studio-3.6.2.0.192.6308749.ebuild
deleted file mode 100644
index e9812c3699a7..000000000000
--- a/dev-util/android-studio/android-studio-3.6.2.0.192.6308749.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2020 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-studio/android-studio-3.6.3.0.192.6392135.ebuild b/dev-util/android-studio/android-studio-3.6.3.0.192.6392135.ebuild
deleted file mode 100644
index e9812c3699a7..000000000000
--- a/dev-util/android-studio/android-studio-3.6.3.0.192.6392135.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2020 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-studio/android-studio-3.6.0.21.192.6200805.ebuild b/dev-util/android-studio/android-studio-4.1.0.19.201.6858069.ebuild
index e9812c3699a7..e9812c3699a7 100644
--- a/dev-util/android-studio/android-studio-3.6.0.21.192.6200805.ebuild
+++ b/dev-util/android-studio/android-studio-4.1.0.19.201.6858069.ebuild
diff --git a/dev-util/android-tools/Manifest b/dev-util/android-tools/Manifest
index 2044f82cc51f..c76b0f22f5e9 100644
--- a/dev-util/android-tools/Manifest
+++ b/dev-util/android-tools/Manifest
@@ -18,7 +18,7 @@ DIST android-tools-8.1.0_r1-selinux.tar.xz 3188060 BLAKE2B 8c513d858e8dcaed70597
 DIST android-tools-8.1.0_r1.ninja.xz 2740 BLAKE2B 34473e33970cefdaf82bbe4524665fd50e6617cf867757ca07cdccc2e7356f43ef4bb455080ef4bac516ddba3c4e4120f0b27306e84725f8d5738a81800e3a53 SHA512 707e0e1c53832a42384e93d363f80007b76f18166b9f3f7d516431410b05319b1acc804daa1fddc218e11feb48de48683efb5203f4fa6d80646dcb1a2953139f
 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
-DIST android-tools-9.0.0_r3-arch.tar.xz 7628 BLAKE2B d0d7267d41ade2031d72236c18850ea329afbdd57a2b5bf25837e405d3e66d7aaef5b48996e7aafd4cf6e4543de03ba6549823845e5e8cb35c6d4bc900b8e275 SHA512 534d99fe15b3a3ba4f2a7331662fdb8645424830122cc4c1ff0b44d43059280610389147d4a916c55b3be71ac84d019223c90993cbdae2588f9e9737f0b5606d
+DIST android-tools-9.0.0_r3-arch.tar.gz 8451 BLAKE2B b28649333aa0e5a6f4bc83f9e42e1749a4d138075d03559c5871a24f782bf8608bcf07a609bd791ee29afabcb4435ece2ed8f8abc171265ef9d67da231c8a29e SHA512 d3409f89d2c334b66e694fd77e068e2d863dc9a99b9ef332b0a08c9c186c26eb9d969ef5cde5aa6e28b866847b4a85a4d3a4c2b0951a37752510b2f3b41c5943
 DIST android-tools-9.0.0_r3-core.tar.gz 27484684 BLAKE2B d071adacd5be0341a9114e57242fe51f623773683b9db2735eac9231a77cc22651f09e1c63682e729494aa6409939696a5635afcd5e8a40ec0f75d2784c00ffc SHA512 0edc8b02b57085ce88b39c987284af1c681870594b20ab9ecf4be98a0cfdff2905bc80f5d8eeb7fbc7f4604b800b6f95bc6b2b0321c900bf833313dfcbb2eefb
 DIST android-tools-9.0.0_r3-e2fsprogs.tar.xz 5255616 BLAKE2B 5fe62da70686148d755c60c1cef4b64d80f0c6a891d13a778d2a3209f950b0f9c5b19bf39ed28c5d38d01103ef1ea474133f57b7104a4fdf80eafd8edc17a3a5 SHA512 a9c3c180ddb96f10710a18794b20cfc641d40af3643a1133091127a40c27fa724b6e6f1af8e66fc1e1ca33053e33499b910880eab05979a2de95a0d3d7a79f93
 DIST android-tools-9.0.0_r3-extras.tar.xz 1653548 BLAKE2B 1a8c2ee2e564adc04d646ab54e1913d17e9ed0fb0ef3872bd8a459ecad5fbf7324830c1120c367d9515607ecc659fb0f27c4f7db740fda318fd13be1300a6a51 SHA512 13dc145faf919c1f7cc183f823ca46330568daff19ffb110af383876cdb6b0e9f0a83690a4e22633b572c1e6c2aba14ef0181c01720095173d258320229e9108
@@ -30,6 +30,5 @@ DIST boringssl-45210dd4e21ace9d28cb76b3f83303fcdd2efcce.tar.gz 13581532 BLAKE2B
 EBUILD android-tools-5.1.1_p13.ebuild 2077 BLAKE2B edb2e3a9f69c2c8a4f86170b39aedb1f44b173df943b2edcb96f7d90384658c6689925e06873c3d5331c20f360732860f70e0bfecdb0d5518dfbb9d90816b671 SHA512 3659aca002096aa11dc94631de73f1081cda5a5728f2842aa767844b6b3e12e0bdcdd0abbc2903efbb1d9f11666e7bd392be694910ffae58fce1e8b52a8cd090
 EBUILD android-tools-6.0.1_p79.ebuild 2820 BLAKE2B a87ef5bc6d814ef772c3fe4292563c73beabd59cacebae706721d4019059be8b2cf31e27594c473abe202ed1f4afb78993ae3e947ef7c21b5016245797f90b45 SHA512 ccdd6e4fbc6a98ca0e9cfd89618c6a13e11e174abd6c6b3dd1d1b8f7a592a4574cf83e0f4770750918ee481b129d01425ae56fd55ddc323b3409add6ddf10279
 EBUILD android-tools-8.1.0_p1.ebuild 3982 BLAKE2B 6b21b82b84a1d94bc3ccd1cd5827e88a1b7bfcfa1f50f6abb503a88e78e9c9e7f237e80b7fe45909666fab2fbaa640a6545ebb80bbbaa244c5909cb253a18051 SHA512 1f4f60511a2e1acf5144a5707078619b3921c71dd31f01152ffb71d1d4c3fa2fa0de1aaf9da632af7b77164f6d5df58d8f3e2954755f347327cf8d27f4f27eba
-EBUILD android-tools-9.0.0_p3-r1.ebuild 5091 BLAKE2B a78f722803e50d119548fd647c17407f0937c14cd3701d7ac2026b3a5178563a4a111f640f524457cf7c6fc427440c2d1a58be033fab750feadda4eae803f0d2 SHA512 345bbd26457be15b2e0ee88a34b79cfa1e9aff6064aeef730c3b234c1668bee6e68af593fff94252b0ffd66f65d08f6d14ce9380d5cdceaa4101e3a6381246d3
-EBUILD android-tools-9.0.0_p3.ebuild 4533 BLAKE2B 0880891bd4b9acaebd1263398d4a9878e86bbd44ec917fc61bbb09d1403a42486a78fdf9e5951101f0ca11313c30fc4d41fa7315a43977c3bf04eafe63521b02 SHA512 61b4df609583f65361ed05264b0c104e8e325bad2ac92dfc9d93bcb9e7bc986317ce39f33196e4f0aa6191a309ee5d9294fd7c0b870955a03127bd00ab86cf6c
+EBUILD android-tools-9.0.0_p3-r1.ebuild 5079 BLAKE2B 880ee504792a04cf55953a2a0bed4873e5a981db982d4b95f322407ec05c065e69f16ae2b138ddd0db5ec78a612f217a689edb4a4218d72e7787559188775073 SHA512 310ae2e3db0ee92d8ff990ef315fc46fea60f987c538dc3cc6bacd21576851ec93bfef94dcb9f532e435503c85bdc603aac22d138d4b83de62b349acc2172b8e
 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 0a5d152abd25..b2b942ac225a 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
@@ -18,7 +18,7 @@ BORINGSSL_SHA1="45210dd4e21ace9d28cb76b3f83303fcdd2efcce"
 GLIBC_GETTID_PATCH="${P}-fix-build-with-glibc-2.30.patch"
 # The ninja file was created by running the ruby script from archlinux by hand and fixing the build vars.
 # No point in depending on something large/uncommon like ruby just to generate a ninja file.
-SRC_URI="https://git.archlinux.org/svntogit/community.git/snapshot/community-0ffb7b41d599741d100a6a00a4bb20e162cd3f90.tar.xz -> ${MY_P}-arch.tar.xz
+SRC_URI="https://github.com/archlinux/svntogit-community/archive/0ffb7b41d599741d100a6a00a4bb20e162cd3f90.tar.gz -> ${MY_P}-arch.tar.gz
 	https://github.com/android/platform_system_core/archive/android-${MY_PV}.tar.gz -> ${MY_P}-core.tar.gz
 	https://github.com/google/boringssl/archive/${BORINGSSL_SHA1}.tar.gz -> boringssl-${BORINGSSL_SHA1}.tar.gz
 	mirror://gentoo/${MY_P}-e2fsprogs.tar.xz https://dev.gentoo.org/~zmedico/dist/${MY_P}-e2fsprogs.tar.xz
@@ -61,7 +61,7 @@ unpack_into() {
 }
 
 src_unpack() {
-	unpack_into "${MY_P}-arch.tar.xz" arch
+	unpack_into "${MY_P}-arch.tar.gz" arch
 	unpack_into "${MY_P}-core.tar.gz" core
 	unpack_into "${MY_P}-e2fsprogs.tar.xz" ./e2fsprogs
 	unpack_into "${MY_P}-extras.tar.xz" extras
diff --git a/dev-util/android-tools/android-tools-9.0.0_p3.ebuild b/dev-util/android-tools/android-tools-9.0.0_p3.ebuild
deleted file mode 100644
index 36c89fee7e76..000000000000
--- a/dev-util/android-tools/android-tools-9.0.0_p3.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_{6,7} )
-CMAKE_MAKEFILE_GENERATOR="ninja"
-
-inherit flag-o-matic bash-completion-r1 ninja-utils toolchain-funcs cmake-utils python-r1
-
-MY_PV="${PV/_p/_r}"
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Android platform tools (adb, fastboot, and mkbootimg)"
-HOMEPAGE="https://android.googlesource.com/platform/system/core.git/"
-# See helper scripts in files/ for creating these tarballs and getting this hash.
-BORINGSSL_SHA1="45210dd4e21ace9d28cb76b3f83303fcdd2efcce"
-# The ninja file was created by running the ruby script from archlinux by hand and fixing the build vars.
-# No point in depending on something large/uncommon like ruby just to generate a ninja file.
-SRC_URI="https://git.archlinux.org/svntogit/community.git/snapshot/community-0ffb7b41d599741d100a6a00a4bb20e162cd3f90.tar.xz -> ${MY_P}-arch.tar.xz
-	https://github.com/android/platform_system_core/archive/android-${MY_PV}.tar.gz -> ${MY_P}-core.tar.gz
-	https://github.com/google/boringssl/archive/${BORINGSSL_SHA1}.tar.gz -> boringssl-${BORINGSSL_SHA1}.tar.gz
-	mirror://gentoo/${MY_P}-e2fsprogs.tar.xz https://dev.gentoo.org/~zmedico/dist/${MY_P}-e2fsprogs.tar.xz
-	mirror://gentoo/${MY_P}-extras.tar.xz https://dev.gentoo.org/~zmedico/dist/${MY_P}-extras.tar.xz
-	mirror://gentoo/${MY_P}-selinux.tar.xz https://dev.gentoo.org/~zmedico/dist/${MY_P}-selinux.tar.xz
-	mirror://gentoo/${MY_P}-f2fs-tools.tar.xz https://dev.gentoo.org/~zmedico/dist/${MY_P}-f2fs-tools.tar.xz
-	mirror://gentoo/${MY_P}.ninja.xz https://dev.gentoo.org/~zmedico/dist/${MY_P}.ninja.xz"
-
-# The entire source code is Apache-2.0, except for fastboot which is BSD-2.
-LICENSE="Apache-2.0 BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86 ~x86-linux"
-IUSE="python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-DEPEND="sys-libs/zlib:=
-	dev-libs/libpcre2:=
-	virtual/libusb:1="
-RDEPEND="${DEPEND}
-	python? ( ${PYTHON_DEPS} )"
-DEPEND+="
-	dev-lang/go"
-
-S=${WORKDIR}
-CMAKE_USE_DIR="${S}/boringssl"
-
-unpack_into() {
-	local archive="$1"
-	local dir="$2"
-
-	mkdir -p "${dir}"
-	pushd "${dir}" >/dev/null || die
-	unpack "${archive}"
-	if [[ ${dir} != ./* ]] ; then
-		mv */* ./ || die
-	fi
-	popd >/dev/null
-}
-
-src_unpack() {
-	unpack_into "${MY_P}-arch.tar.xz" arch
-	unpack_into "${MY_P}-core.tar.gz" core
-	unpack_into "${MY_P}-e2fsprogs.tar.xz" ./e2fsprogs
-	unpack_into "${MY_P}-extras.tar.xz" extras
-	unpack_into "${MY_P}-f2fs-tools.tar.xz" ./f2fs-tools
-	unpack_into "${MY_P}-selinux.tar.xz" ./selinux
-	unpack_into boringssl-${BORINGSSL_SHA1}.tar.gz boringssl
-
-	unpack "${MY_P}.ninja.xz"
-	mv "${MY_P}.ninja" "build.ninja" || die
-
-	# Avoid depending on gtest just for its prod headers when boringssl bundles it.
-	ln -s ../../boringssl/third_party/googletest/include/gtest core/include/ || die
-}
-
-src_prepare() {
-	sed -e 's:elseif (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "i386"):\0\n  set(ARCH "x86")\nelseif (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "i586"):' \
-		-i "${S}"/boringssl/CMakeLists.txt || die #668792
-
-	cd "${S}"/core || die
-	eapply "${WORKDIR}"/arch/trunk/fix_build_core.patch
-	eapply "${FILESDIR}"/android-tools-8.1.0_p1-build.patch
-
-	cd "${S}"/selinux || die
-	eapply "${WORKDIR}"/arch/trunk/fix_build_selinux.patch
-
-	cd "${S}"/e2fsprogs || die
-	eapply "${WORKDIR}"/arch/trunk/fix_build_e2fsprogs.patch
-
-	cd "${S}"/extras
-	sed -e 's|^#include <sys/cdefs.h>$|/*\0*/|' \
-		-e 's|^__BEGIN_DECLS$|#ifdef __cplusplus\nextern "C" {\n#endif|' \
-		-e 's|^__END_DECLS$|#ifdef __cplusplus\n}\n#endif|' \
-		-i ext4_utils/include/ext4_utils/ext4_crypt{,_init_extensions}.h || die #580686
-
-	cd "${S}" || die
-	default
-
-	sed -E \
-		-e "s|^(CC =).*|\\1 $(tc-getCC)|g" \
-		-e "s|^(CXX =).*|\\1 $(tc-getCXX)|g" \
-		-e "s|^(CFLAGS =).*|\\1 ${CFLAGS}|g" \
-		-e "s|^(CPPFLAGS =).*|\\1 ${CPPFLAGS}|g" \
-		-e "s|^(CXXFLAGS =).*|\\1 ${CXXFLAGS}|g" \
-		-e "s|^(LDFLAGS =).*|\\1 ${LDFLAGS}|g" \
-		-e "s|^(PKGVER =).*|\\1 ${MY_PV}|g" \
-		-i build.ninja || die
-
-	# The pregenerated ninja file expects the build/ dir.
-	BUILD_DIR="${CMAKE_USE_DIR}/build"
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	append-lfs-flags
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	# We only need a few libs from boringssl.
-	cmake-utils_src_compile libcrypto.a libssl.a
-
-	eninja
-}
-
-src_install() {
-	dobin adb e2fsdroid ext2simg fastboot mke2fs.android
-	dodoc core/adb/*.{txt,TXT} core/fastboot/README.md
-	use python && python_foreach_impl python_doexe core/mkbootimg/mkbootimg
-	newbashcomp arch/trunk/bash_completion.fastboot fastboot
-}
diff --git a/dev-util/aruba/Manifest b/dev-util/aruba/Manifest
index efd141d22b4d..6e301640720f 100644
--- a/dev-util/aruba/Manifest
+++ b/dev-util/aruba/Manifest
@@ -3,7 +3,7 @@ DIST aruba-0.6.2.gem 75776 BLAKE2B 569af009cc20b644878fda25b5e7f79bd2f7c6f5fa9ef
 DIST aruba-1.0.2.tar.gz 132977 BLAKE2B 762abef412a62e91931690a0a56ee1b04868c9f446f79e1c282e15c1ded1faf609d480e7fb032b09c3230e2d233b3cb0e09a58b2950c7a138f486c34339b8a0c SHA512 ff9161a94627e1bd123c00a0c3dd8624034b10741867d60c85264322e4ae5f2226d585d361fe8f2229003c187a1dff38c4278c359f018ca28cef1fd6efd26aa0
 DIST aruba-1.0.3.tar.gz 133790 BLAKE2B 4008cfec1bc1d63113b1d8961e3bd6219f3884875350b5f2ec6676f6a6167e9bbc6b759c8cc0a29a6774877d3ab2f1c95954d83dbfe3e79669cc8968c1c533ec SHA512 ff89846b805267e2a4bff394c8285b9227d40a2cd93a7ca8fdf8cd6d38a3b2144d5e96b0bd1cef94714df630ad7a779d609e05585c671371124b400130f3b3b4
 EBUILD aruba-0.14.14.ebuild 1746 BLAKE2B 419b70985f18519c23aab2e13b006d867a19ae534fda30c9a4ab88a3df18bab5a38b74b5614c8fa00f1577acca27b90ab260c05de2da8700133d33c71edbc97f SHA512 84eb8be2f99c0e7a65a61450ed56ddf632565da6db96e1b10e5cd5dffeae24f476a765507a2e57fffa22a7d90447036967f66cd346bf03c7151c5797d6118140
-EBUILD aruba-0.6.2-r2.ebuild 966 BLAKE2B 5ac0fb744b55ea1931dfb419839b292bdea1a3191b2e2fe0d4cc913d4cd4cbef2829e581b40df28d7665e4cc5e8dcb9af43c8df8851b698040fe5af72b9ca357 SHA512 e58618308f98b565f103de437e5b2d4fafd1994dca8e3c9654300fe2dc474259cf7cb7c009a67cfd0c4d3c9b6846351a4b6807950756f6fab760e2f237843437
+EBUILD aruba-0.6.2-r2.ebuild 965 BLAKE2B 4988dd0014e07031f1ed9e4e2dd052a4e16f4c3692e2bac9a724ccad35bddc88694f1b622b71a75af997e7f09dd1eadf3ebf89b330c64bbeab7368b19a61ae7b SHA512 2e2be6948e70a9826ab445ab002466183ede2a185b40ab95ad78d218d0df32e0fe10bc351567fdb1eacdd04a3cc2d7bd290b42fec2f5459c758eb711a8c1f4a0
 EBUILD aruba-1.0.2.ebuild 1922 BLAKE2B f7d9aa054e862cf7aeef26a322a067ef8b279c8a96a472471aa0dd2a027c0e06d66908ede4730ccfeeec07c76dcc52657a497f7040d9b83104a60cee83d4f032 SHA512 e8451f0ec7ec1c9967dd0046050eb01b96ce616c55fb50ab98705595ad4b98b747df4be1c468da45163c710398d2de2b253d3b3ff58f042153f45e30664bc311
 EBUILD aruba-1.0.3-r1.ebuild 1962 BLAKE2B 5121d8d5e5b6db8b66b04988f99ae73878c03cf2b57889d40e4e33f298cf69a91856792b70c574a295cfd6cc072f170dc8f5b533e25eb38a2a44611145944563 SHA512 4c80de11a4cf9799fbf3ca52d0a6899c0657ef57c4d18b5ba6cf1ca11ec5c70a6994327fb61461d7ae7bb33e393e7f73731bb0688d7a75a7a351dde6b69cd877
 EBUILD aruba-1.0.3.ebuild 1955 BLAKE2B 0b36d1b42e8a9cf1ca22a19118189f2a8bcd5291cf8e4626d2de1542fa3352a0e9c2a777394f93b7bc92888debfa32673863a52137c8077cc0b97040eeded385 SHA512 25587725ee21665a2d36bbae4eae8e836cc96f57b95b974a7dd0f0ba0e9a8a8b520451e1543d80ae335d1ad6ab00b681beb67bc294e71ad0160dcad5e732053c
diff --git a/dev-util/aruba/aruba-0.6.2-r2.ebuild b/dev-util/aruba/aruba-0.6.2-r2.ebuild
index fe3881d25c7f..b39e9f9ee5b7 100644
--- a/dev-util/aruba/aruba-0.6.2-r2.ebuild
+++ b/dev-util/aruba/aruba-0.6.2-r2.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="Cucumber steps for driving out command line applications"
 HOMEPAGE="https://github.com/cucumber/aruba"
 LICENSE="MIT"
 
-KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 s390 sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ppc ppc64 s390 sparc x86"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-util/bats/Manifest b/dev-util/bats/Manifest
index 935b240290d1..7171eaca8677 100644
--- a/dev-util/bats/Manifest
+++ b/dev-util/bats/Manifest
@@ -3,5 +3,5 @@ DIST bats-0.4.0_p20170219.tar.gz 18776 BLAKE2B 994649547424ee2e0859e7a82f9d46266
 DIST bats-1.2.1.tar.gz 62685 BLAKE2B 7ac54c8955375571edf7b303dfe9228a384ca5ec06986b9ac3c368e5b855456b2a3291cb3231f963dcd9c1bd5178f06fcbc8c81bdeee82b659561de072cccba9 SHA512 632345e6d83ed930dab23abc03e4797769063bb049ae1bb99e3102dc1e93e5111144ddc61615d05962f7b5bbf72d90ce19a324faf670a3d6e4ce7ab508b0db29
 EBUILD bats-0.4.0.ebuild 485 BLAKE2B ef5b83cc2119b9fc9d96b3a3e7bc465fa8ba6d73892a7d63f6f7de531f96c489e3f7692ac0142ba9dabd0f2871004de956032a8809453434fc1f5d26b67dc920 SHA512 48856743881d5bec9e275531d2d50897e3d31401d5f4e189a7f9b62f8fde45b108791f50ae4f6c9a9e3f129cad83c391ba220bd359527e1851ab6a97664e43ef
 EBUILD bats-0.4.0_p20170219.ebuild 659 BLAKE2B 0944a49ce57ad39b193d05750e32a9bae8f8b8e2e7c9ffd9750b8a8650049a16932b3876ae174d5c2049d3a58c749583b82335d7097c4bb9d56bc425307a8d30 SHA512 f625785af87a23e9431d4f126ff847804c412f2cd20b88aaa31f10b9486d39375f07de312bc142f22ed07e537af36e64b65562eafb11d2aaa18b36bae2bb021e
-EBUILD bats-1.2.1.ebuild 719 BLAKE2B 07d9c3646f121aa852964e13ae1ef06bd1cb543643837626d8ed04e645794746a7116f669e35d09f9271e945c63b935f77514037382c226301c1a006d383159e SHA512 701673428fe48b8f076021a5b9aaba49120b2d4fa23a29e65f222d191eb0e4ce73943827dc364cb78692042f17dc1f817b2cbfa3c710142d50af2ace65583ed2
+EBUILD bats-1.2.1.ebuild 820 BLAKE2B 3e55920280b2668618b1e5cdc784dfe1630172dd0b974f90d78a119f62e9a9f525f51b34666b69ad92778e46faf973c1ee37502a86f1c2e8b7e563cc1a800e02 SHA512 ae8938047efb19fe8761264a4d3129a65842ccff7c68d10ee64c36fb97c0163fc20c85208fe5010b745498511545c9e31dd4c8a3ea8b0d295350b8854d7640ea
 MISC metadata.xml 905 BLAKE2B 9f8936030d43402bb9cc48b3efba2443bb16af1aaed47795290d860d2c666a5a3cfd2e85660838d46aa76e6b737dd374b3b3ad44ea977c385243bfc3bd5f21ef SHA512 a76c1dddee2b286b10ceea09e5ee778d2ee8fb944d9c00e7929ca1dc4ef9e546ca6bb7327b15fc4c7bb410f059e7d4ef792ae82d07d0d2b6e1857424a5c47574
diff --git a/dev-util/bats/bats-1.2.1.ebuild b/dev-util/bats/bats-1.2.1.ebuild
index 0ab0773b5e99..82cdfda1600c 100644
--- a/dev-util/bats/bats-1.2.1.ebuild
+++ b/dev-util/bats/bats-1.2.1.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=7
 
+inherit optfeature
+
 MY_PN="bats-core"
 DESCRIPTION="Bats-core: Bash Automated Testing System"
 HOMEPAGE="https://github.com/bats-core/bats-core/"
@@ -10,7 +12,7 @@ SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 DEPEND="app-shells/bash:*"
 RDEPEND="${DEPEND}"
@@ -31,3 +33,7 @@ src_install() {
 	dodoc README.md
 	doman man/${PN}.1 man/${PN}.7
 }
+
+pkg_postinst() {
+	optfeature "Parallel Execution" sys-process/parallel
+}
diff --git a/dev-util/bbe/Manifest b/dev-util/bbe/Manifest
index 2d937e4fa396..028167ea0754 100644
--- a/dev-util/bbe/Manifest
+++ b/dev-util/bbe/Manifest
@@ -1,3 +1,3 @@
 DIST bbe-0.2.2.tar.gz 211590 BLAKE2B 47eb57d07419342377b9e21f15db6619e2c94ed835c059d50992a8166fa4020c87586cd4085f5cefe044794494b359aa4db5b2a400d638a93e75d9192397133d SHA512 6ac31aa005f18cbfd3fbacfe86b3d81ee61a027764296f574c4180da6ccc23dbf716a835fb013730d30c09c045197a70e28584303f3521afab0e5c63d0cf693f
-EBUILD bbe-0.2.2-r1.ebuild 463 BLAKE2B 16caefaae661cb64245a82fb7dc87ec8630cc89cb38e93ce93ddd45c013c54ec1d1197a4848eb010023f9f2c4226def3403bff7621e4a41bcc7afedea7d1a324 SHA512 ce9f716455c6abdad3e46d40c6a8424b8b6f27560e38d59225d7e40dc169204a23f8f115bdb575110e00a11f402b9e72535ff858b660a8e81a0bdb42df846972
+EBUILD bbe-0.2.2-r1.ebuild 570 BLAKE2B 8a1eb92c7acba979298709f60621360ddf033f9acd04311b7f97b75e01ec08fcf2690c1bfc723c1864460571df085090630a9ae5f16b19346ac25f2af0399efb SHA512 9d5abcf2dc2209caeb94afdaeb3b70ca6d8aaf9acd3076638b372c5a841d5e0acf3e2b475f9a5edf95c92f79f62e5444c346986767c99496af145c0effda0f1e
 MISC metadata.xml 323 BLAKE2B 4bcf6d746791f68582290bf43697ff941344dbfe4e07111b9a164077f0cd2080ac4d477785b2952898e5a75f37cfa3e2081458366d0f6b2180335baf20812fbe SHA512 58f9102a7e5a4c09bd8d16c7e66ba1088cd9e8b6f78998c5ba5930634fb7778d7f06a126e4c6dc33bc1d37574dfda200f71d2b7dc6a471daa3b22e3624462fa0
diff --git a/dev-util/bbe/bbe-0.2.2-r1.ebuild b/dev-util/bbe/bbe-0.2.2-r1.ebuild
index 3a57f98b2b44..63a113fdda81 100644
--- a/dev-util/bbe/bbe-0.2.2-r1.ebuild
+++ b/dev-util/bbe/bbe-0.2.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools
+inherit autotools flag-o-matic
 
 DESCRIPTION="Sed-like editor for binary files"
 HOMEPAGE="https://sourceforge.net/projects/bbe-/"
@@ -21,3 +21,10 @@ src_prepare() {
 	eaclocal
 	eautoreconf
 }
+
+src_configure() {
+	# Avoid linking problems, bug #750545.
+	replace-flags -Os -O2
+
+	default
+}
diff --git a/dev-util/bcc/Manifest b/dev-util/bcc/Manifest
index d7fee002414e..f681f0f10af9 100644
--- a/dev-util/bcc/Manifest
+++ b/dev-util/bcc/Manifest
@@ -1,20 +1,8 @@
+AUX 60bcc.env 32 BLAKE2B dbbfb31408af7f3375b02981113d81d71075d339fded45db24b2168baa9f3ffe51205447c12eb9c3f06188fd32db591f21bce41edaff473a40b10320067447cd SHA512 a040c762df54a0218fb3fc4a6609b0e924003be689eaff629fabe69e1ed224fc38fdaac377624944718e5b174ac413edf3730cd0a228bd73bf8ef8678e97d73c
 AUX bcc-0.14.0-cmakelists.patch 444 BLAKE2B 3832bdfe3fdb3946889fb614c3f89220dae7b319329ad45649edda0f7c9cbd8c8e90ce200c6f7df4913c3eceb0cc729e83d90b7dcc8af991e3f59b5a772f9cc8 SHA512 05f2c50e7daabe9118ea4e6dfd6d8dc155bb0311fbb2fbc491c2740d6f5081cc95ec7cb8faf19751eb161bcf60d30be87e0b6c88d032bf88ecae48af5119e0df
 AUX bcc-0.9.0-no-luajit-automagic-dep.patch 463 BLAKE2B 286ed298055cbdb22d9c3f3f064c77da685cf75cc8c0ab0cad4d4b473f0eac0b1533ca8eb7e6159108d184d16db7a264b0ea9d30ccdc3d988d88bab28be7310d SHA512 6e5c20de22547410ffa566cb8226a47ee0e8c91183bc5b70eb22637a08fe55cfc96fde169ef3ab8d6e8d7c9e356c35e61b164b3ad675835d3ea8d5239a448979
-DIST bcc-0.11.0.tar.gz 2611511 BLAKE2B db12e10a3da11b1d3691ca5e0e036f56af4c5765d49e2edefc3e30bc90036a5f521d196db797e3725e618efa68ba2550848b3dc044015f6aea6b2da6ca2a34f5 SHA512 4854a5a15a89a8bd3a10daa6f0e831428316751280902cbdc74f3c6f78263ee1c58521ae9125804e72fec6482702818a5fec781436400640627e4b7c2fc189fb
-DIST bcc-0.12.0.tar.gz 2627075 BLAKE2B 44c435eaaf6233ad24249cf5da4e778cd31e41573199ded97d1f411c7424128fb11f838c55fa48c692b4d5f267ea594d6cab9992dc76137da1b41453285c98c5 SHA512 db3ea929b1296f4d9d82d2a11e89e11a1c31512d3f7f935475a7613e0128a5cf9441f3138969535ef41de0c0f677c7446f62f1c64575d41a9896e5339f3f112b
-DIST bcc-0.13.0.tar.gz 3928016 BLAKE2B ecaf2dc077a5e0b808ea1d588a89793291ed56de8747e1cb59f0e841b70e4a4f0333e2941ee2b42b5b9a570cd8d4f9941be772e7790186be156e452a416d40bb SHA512 7c82007979814ac11d1dfc81fe8e00d988f518f7fbba3e115851e17500c22eca23b33b84f9053acc10aefda0ee3b80429f8daf1389590c2d3686ee8d7ced72cb
-DIST bcc-0.14.0.tar.gz 4021098 BLAKE2B 2c66c82e14ee7f858f2e4ff8aa158d03c1580686f4023e920f643454283ed26265ec1e122695a308c4e570c369a0f66e6b0a9347fd9046f2eeb6cd4b536e4dc6 SHA512 216033a6944134c9f9b03a254c83236ff49b02c87808d2719a51a5ebe3b2e3f6b283e905cfbbc85084eab60cf8ef89c3135b4e07ddb9bd83348c69f6e49a84b8
-DIST bcc-0.15.0.tar.gz 4056782 BLAKE2B 4ae1ee615111b7fadc29fecc0799e3bd65da4f741c83f86e75b7376dca397ed83e6b159dba149a5e675110a0fae92397c0685085b9691786361cfbedff31d4dd SHA512 d340ff54138cb44f610804edc7c8f7424d7182d81fd48c1e3edc6b45977eca8171b6367242abc4418e1baf2c8d3b53a77d0a408d053f246a0c169ddeeea2a68e
 DIST bcc-0.16.0.tar.gz 4124285 BLAKE2B 443077ffd5ad02e34d28a86ee64b8ec52fa4a18696295d58e87aaf2aeb833c394047cd0d87b3bf1da52d5512b889f8873b788e8141bdd91c9463e27cf30a1ef6 SHA512 50d09d6d02335a63d7c01c22f16a706584f231ee16973a80df5b640c31b8e25775da13a2bdff9e57c04c7f6181bb8c46cf3bd11c1e59741234024da71c7f6cdb
-DIST libbpf-0.0.5.tar.gz 160335 BLAKE2B 2cf4a3e6edc002b3a32f9d08bb22a07863d8f6f90472e9593a9e9a93b08a00f0557d5a59fa841325b947e6f7b129232e7cd1fdc906f45de57b0dbe594548f1c2 SHA512 e42f6cc8f834f2d3cf9138d655bd3727ffffb2693850f7f6409ec4d536336bc5fa479a64eefc802a5915e333677eca843f8f1bd0132589bba10bdc89064eee0c
-DIST libbpf-0.0.6.tar.gz 213791 BLAKE2B 9f0a08cc7bae41f7fa93d5ba2f535f76ce47fe691efb6bac6257b88a5607deb62fa53f59984d83b6070ccd573c902899f7528b376d9acbfd77317659de6ab061 SHA512 1678133d9a2bd1cf13d4d1f9b83bb3f0642de91e3e3c8d785e2993257035573aff39b9a1a457e73d9c4c1c66b6a52544a8ad06ac560766d335428bb3fc421e71
-DIST libbpf-0.0.7.tar.gz 262068 BLAKE2B e77ff25449274881ddb9d32f25cd6ad8988e4524102bd109049ee6cfce3e2753fd99ebe2a080f809a4c5422dbf6b17633e4b0cea156f289bf95b92f8375a273c SHA512 c2cbc869b7e11339deab3152a6e2d0b3bba25da513d18d77fb0a698cbe61d6bd48175a58e7dd7a3695fbf27faf48b4f517ac5d3a3c66c086df2e5d1b73a2595d
-DIST libbpf-0.0.8.tar.gz 262519 BLAKE2B 2a3620c97834cc23e716476b6966c1c65c1c82064b3ba1ae4ab4906ae362a777d9aa7ae40620f9a259fe969a5a897e97c14d97f627f39c47fa28c89abb1efa9a SHA512 1074fb52b7a158e4e2713c4c7083528ccf2d99b899853078f230234ba112071bfa66e174d8800d36516e26d5bf06da44d100a5b2f866d267f62c9308f431220c
-DIST libbpf-0.0.9.tar.gz 273726 BLAKE2B 1277ce5b9dab9037e287910c43a71ee33cd6607d7cbe59d40c6930bf49407e04fcdfa6f4795f98202930fd564c1569c2feef0bca73294334f00abd601a288ed0 SHA512 d54bbdee6f7ea83ffef3fd0abe07f71644bcf83e5cf4a307fb4e03d885503617f1af2d324cc869f0f01a92bcb58836780a4802ac4db83b9f037ea196edc1131a
-EBUILD bcc-0.11.0.ebuild 1862 BLAKE2B ed50015774cd375e2bbbf7a5be10ddc53c7864314fbb839027952860e25fafd5bcace7a42936ee316db1e18c13082be994a9b1084d94468f8293b1b780dcb978 SHA512 9701b5a605c19d4fe78ccb68477be41aac1b9fbc9990932e25d28b8e074cc528746893dc7fd70d919366d3b94e83d2b45cf806da94e793b683d07f8611b4d09c
-EBUILD bcc-0.12.0-r1.ebuild 1886 BLAKE2B f3879a2437abbfc99b87ad1a3a5c1b8b600a9e0213be90ee17ecba036b76798529de61b159dd7af7ce56000e071d44923f2707d366383c5f6ed228fb78b10858 SHA512 492110b8a4dd64c30bf8d8f5af5dce183976ee31d3ee5652efe61e7734c779b8a08d9334fdb2c4c0aa4a90df71a5a1d5374677eb9c9566ce534ee760b135caf5
-EBUILD bcc-0.13.0.ebuild 1925 BLAKE2B 4cf4fcfd74ca4a941be56ec92c003be585b81105dc0986e0a63cdcafbb0a9c22f7803aded42ff0214338312463019f6ba7938775dcd6538afd80d85a92b0d523 SHA512 69e3e78d7f6ead73c007e821f5ea2a6e3f5244cf716703b763427bb49e89f5012ec0327fdf142dee93b6c9091c572985a8cc3738b6b238e19e9ceef0a4a9e0d6
-EBUILD bcc-0.14.0.ebuild 1968 BLAKE2B 00d8a66ef59c00a518ee27211236327d883972d4d71eeb9906c0fc20e1eb764dccadaf807937b8c15b67fba45c881f04b6cf8ef866bb24817506d39a2b7bd1e4 SHA512 4620985b4d093c7f436f9d9a7e10f5077afff49f21bf4664bb55c8eb41f2dbac8d9b70ccc91ae6d852f8cabe65e0056540894ea1ba7659e7df7aa691fe75170c
-EBUILD bcc-0.15.0.ebuild 1968 BLAKE2B d26398d364cd3737535b7b2edd992f731cacca839f96fc53908321c86eb40d8944b5c4eaf0b337a61076532dee73e9e99b2a856cafbfa90048f2cba5f7ddcf75 SHA512 c45482e2f910d9b1e17c2531530161cb81f9d240b510092c9890c32aeb628a6572dd785eac846758256fe79e4b15f9c307b86cf299f48c788f9cc061c31177b0
-EBUILD bcc-0.16.0.ebuild 2054 BLAKE2B 8ea20763614fbc217bf29cd38f29af9f66a04e36742fc0bd4ba0fd6e732e70c61e73d5c34ac0c0d7a07a95f798bb5aa35353bb46f4c40c92d370f80ab53e6098 SHA512 3677dedc28cbbb04cc2741d36bc331f3d78f7578696c7c2846b43593e468e00208b9d2d758e874cdbe7eeecba714b114eb195aa3896619f5ec34f62cf6db5b87
+DIST bcc-0.17.0.tar.gz 4166410 BLAKE2B 6833c7a58ed9e99b58bf147dc499ba7c7c113961ff5c21a3ac388abab8caa01dc2a67378899e26050460c4af851a5ddd8747911bda7c7b405dfcb6df29981f85 SHA512 32f27bdd3d8f3e850e59011bcf662b91842b1dcef94d118a0662ffda3b2c48c97a359d736d01f6d06afd74e3d7a4efda4966c71a5c9146b2076d4fba087a85cf
+EBUILD bcc-0.16.0-r1.ebuild 2191 BLAKE2B 9a69c08e0244f91b42301fd0d9cbb4b22454c90ffbf1f605e33ae8aa76f29256309af1a36623a035bb2bfed2556a5d94820d17effa333fe3ba13171577d42863 SHA512 1e60b696e69194f12f5c13df237e2b19132536e4a98a25a3f118de9988919099173a0d9f7f0f50ecbfa935ad5a7d19b7c7d70e10a0a778faa7bc418cb0d6843b
+EBUILD bcc-0.17.0.ebuild 2149 BLAKE2B cbd5d044ead7d7dc1cf07fff28a63b7682091b91f5becf42c14d99aa34dc89a1998cbeeae53b965ca547ca1d6f94cd537b88d4e4c7c1523b3c0f5487ad6ce073 SHA512 285aed71c15830e54efed7d75867e92fb54f06882a0514b539a4986b3ae8438036a56f068f624bbb512c1f18fb8d39fb5861be787b6dbddff5f80fe22c1d7f5c
 MISC metadata.xml 386 BLAKE2B 73062e6902dd7d7f9afb988cce26a8aa5a66e1252652ae364f2295b0a5e77013eec682b36ab65c93772843ad0ec8c7187cd29d8308a3ba17dbacd1ef193f03ae SHA512 6529fa57011cd17b9892e1b8f05e063ae6314f85665a30881335efa80e9b9238a7b61d1f732316e45496707bf350d03149e7ec5efdf1a0fee6d5a788b58a7e70
diff --git a/dev-util/bcc/bcc-0.11.0.ebuild b/dev-util/bcc/bcc-0.11.0.ebuild
deleted file mode 100644
index 06720965ca28..000000000000
--- a/dev-util/bcc/bcc-0.11.0.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit cmake-utils linux-info python-single-r1
-
-EGIT_COMMIT="v${PV}"
-LIBBPF_VER="0.0.5"
-
-DESCRIPTION="Tools for BPF-based Linux IO analysis, networking, monitoring, and more"
-HOMEPAGE="https://iovisor.github.io/bcc/"
-
-# This bundles libbpf, I tried to unbundle it, but I am not good enough
-# with cmake to do it. Patches accepted...
-SRC_URI="https://github.com/iovisor/bcc/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
-	https://github.com/libbpf/libbpf/archive/v${LIBBPF_VER}.tar.gz -> libbpf-${LIBBPF_VER}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+luajit test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND=">=sys-kernel/linux-headers-4.18
-	>=dev-libs/elfutils-0.166:=
-	sys-devel/clang:=
-	>=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)]
-	luajit? ( dev-lang/luajit )
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	test? (
-		|| (
-			net-misc/iputils[arping]
-			net-analyzer/arping
-		)
-		net-analyzer/netperf
-		net-misc/iperf:*
-	)"
-BDEPEND="dev-util/cmake
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${PN}-${EGIT_COMMIT#v}
-
-PATCHES=(
-	"${FILESDIR}/bcc-0.9.0-no-luajit-automagic-dep.patch"
-)
-
-# tests need root access
-RESTRICT="test"
-
-pkg_pretend() {
-	local CONFIG_CHECK="~BPF ~BPF_SYSCALL ~NET_CLS_BPF ~NET_ACT_BPF
-		~BPF_JIT ~BPF_EVENTS ~DEBUG_INFO ~FUNCTION_TRACER ~KALLSYMS_ALL
-		~KPROBES"
-
-	check_extra_config
-}
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	rmdir src/cc/libbpf || die
-	mv "${WORKDIR}"/libbpf-${LIBBPF_VER} src/cc/libbpf || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DREVISION=${PV%%_*}
-		$(usex luajit '-DWITH_LUAJIT=1' '' '' '')
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	python_fix_shebang "${ED}"
-}
diff --git a/dev-util/bcc/bcc-0.12.0-r1.ebuild b/dev-util/bcc/bcc-0.12.0-r1.ebuild
deleted file mode 100644
index f14150fc76e6..000000000000
--- a/dev-util/bcc/bcc-0.12.0-r1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit cmake-utils linux-info python-single-r1
-
-EGIT_COMMIT="v${PV}"
-LIBBPF_VER="0.0.6"
-
-DESCRIPTION="Tools for BPF-based Linux IO analysis, networking, monitoring, and more"
-HOMEPAGE="https://iovisor.github.io/bcc/"
-
-# This bundles libbpf, I tried to unbundle it, but I am not good enough
-# with cmake to do it. Patches accepted...
-SRC_URI="https://github.com/iovisor/bcc/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
-	https://github.com/libbpf/libbpf/archive/v${LIBBPF_VER}.tar.gz -> libbpf-${LIBBPF_VER}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+luajit test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	>=sys-kernel/linux-headers-4.14
-	>=dev-libs/elfutils-0.166:=
-	sys-devel/clang:=
-	>=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)]
-	luajit? ( dev-lang/luajit )
-	${PYTHON_DEPS}
-"
-DEPEND="${RDEPEND}
-	test? (
-		|| (
-			net-misc/iputils[arping]
-			net-analyzer/arping
-		)
-		net-analyzer/netperf
-		net-misc/iperf:*
-	)
-"
-BDEPEND="
-	dev-util/cmake
-	virtual/pkgconfig
-"
-
-S=${WORKDIR}/${PN}-${EGIT_COMMIT#v}
-
-PATCHES=(
-	"${FILESDIR}/bcc-0.9.0-no-luajit-automagic-dep.patch"
-)
-
-# tests need root access
-RESTRICT="test"
-
-pkg_pretend() {
-	local CONFIG_CHECK="~BPF ~BPF_SYSCALL ~NET_CLS_BPF ~NET_ACT_BPF
-		~BPF_JIT ~BPF_EVENTS ~DEBUG_INFO ~FUNCTION_TRACER ~KALLSYMS_ALL
-		~KPROBES"
-
-	check_extra_config
-}
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	rmdir src/cc/libbpf || die
-	mv "${WORKDIR}"/libbpf-${LIBBPF_VER} src/cc/libbpf || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DREVISION=${PV%%_*}
-		$(usex luajit '-DWITH_LUAJIT=1' '' '' '')
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	python_fix_shebang "${ED}"
-	python_optimize
-}
diff --git a/dev-util/bcc/bcc-0.13.0.ebuild b/dev-util/bcc/bcc-0.13.0.ebuild
deleted file mode 100644
index 748cd29f46e9..000000000000
--- a/dev-util/bcc/bcc-0.13.0.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit cmake-utils linux-info llvm python-single-r1
-
-EGIT_COMMIT="v${PV}"
-LIBBPF_VER="0.0.7"
-
-DESCRIPTION="Tools for BPF-based Linux IO analysis, networking, monitoring, and more"
-HOMEPAGE="https://iovisor.github.io/bcc/"
-
-# This bundles libbpf, I tried to unbundle it, but I am not good enough
-# with cmake to do it. Patches accepted...
-SRC_URI="https://github.com/iovisor/bcc/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
-	https://github.com/libbpf/libbpf/archive/v${LIBBPF_VER}.tar.gz -> libbpf-${LIBBPF_VER}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+luajit test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	>=sys-kernel/linux-headers-4.14
-	>=dev-libs/elfutils-0.166:=
-	<sys-devel/clang-10:=
-	<sys-devel/llvm-10:=[llvm_targets_BPF(+)]
-	luajit? ( dev-lang/luajit )
-	${PYTHON_DEPS}
-"
-DEPEND="${RDEPEND}
-	test? (
-		|| (
-			net-misc/iputils[arping]
-			net-analyzer/arping
-		)
-		net-analyzer/netperf
-		net-misc/iperf:*
-	)
-"
-BDEPEND="
-	dev-util/cmake
-	virtual/pkgconfig
-"
-
-S=${WORKDIR}/${PN}-${EGIT_COMMIT#v}
-
-PATCHES=(
-	"${FILESDIR}/bcc-0.9.0-no-luajit-automagic-dep.patch"
-)
-
-# tests need root access
-RESTRICT="test"
-
-pkg_pretend() {
-	local CONFIG_CHECK="~BPF ~BPF_SYSCALL ~NET_CLS_BPF ~NET_ACT_BPF
-		~BPF_JIT ~BPF_EVENTS ~DEBUG_INFO ~FUNCTION_TRACER ~KALLSYMS_ALL
-		~KPROBES"
-
-	check_extra_config
-}
-
-pkg_setup() {
-	LLVM_MAX_SLOT=9 llvm_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	rmdir src/cc/libbpf || die
-	mv "${WORKDIR}"/libbpf-${LIBBPF_VER} src/cc/libbpf || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DREVISION=${PV%%_*}
-		$(usex luajit '-DWITH_LUAJIT=1' '' '' '')
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	python_fix_shebang "${ED}"
-	python_optimize
-}
diff --git a/dev-util/bcc/bcc-0.14.0.ebuild b/dev-util/bcc/bcc-0.14.0.ebuild
deleted file mode 100644
index 5b4acaeb9b3b..000000000000
--- a/dev-util/bcc/bcc-0.14.0.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit cmake-utils linux-info llvm python-single-r1
-
-EGIT_COMMIT="v${PV}"
-LIBBPF_VER="0.0.8"
-
-DESCRIPTION="Tools for BPF-based Linux IO analysis, networking, monitoring, and more"
-HOMEPAGE="https://iovisor.github.io/bcc/"
-
-# This bundles libbpf, I tried to unbundle it, but I am not good enough
-# with cmake to do it. Patches accepted...
-SRC_URI="https://github.com/iovisor/bcc/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
-	https://github.com/libbpf/libbpf/archive/v${LIBBPF_VER}.tar.gz -> libbpf-${LIBBPF_VER}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+luajit test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	>=sys-kernel/linux-headers-4.14
-	>=dev-libs/elfutils-0.166:=
-	<sys-devel/clang-10:=
-	<sys-devel/llvm-10:=[llvm_targets_BPF(+)]
-	luajit? ( dev-lang/luajit )
-	${PYTHON_DEPS}
-"
-DEPEND="${RDEPEND}
-	test? (
-		|| (
-			net-misc/iputils[arping]
-			net-analyzer/arping
-		)
-		net-analyzer/netperf
-		net-misc/iperf:*
-	)
-"
-BDEPEND="
-	dev-util/cmake
-	virtual/pkgconfig
-"
-
-S=${WORKDIR}/${PN}-${EGIT_COMMIT#v}
-
-PATCHES=(
-	"${FILESDIR}/bcc-0.9.0-no-luajit-automagic-dep.patch"
-	"${FILESDIR}/bcc-0.14.0-cmakelists.patch"
-)
-
-# tests need root access
-RESTRICT="test"
-
-pkg_pretend() {
-	local CONFIG_CHECK="~BPF ~BPF_SYSCALL ~NET_CLS_BPF ~NET_ACT_BPF
-		~BPF_JIT ~BPF_EVENTS ~DEBUG_INFO ~FUNCTION_TRACER ~KALLSYMS_ALL
-		~KPROBES"
-
-	check_extra_config
-}
-
-pkg_setup() {
-	LLVM_MAX_SLOT=9 llvm_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	rmdir src/cc/libbpf || die
-	mv "${WORKDIR}"/libbpf-${LIBBPF_VER} src/cc/libbpf || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DREVISION=${PV%%_*}
-		$(usex luajit '-DWITH_LUAJIT=1' '' '' '')
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	python_fix_shebang "${ED}"
-	python_optimize
-}
diff --git a/dev-util/bcc/bcc-0.15.0.ebuild b/dev-util/bcc/bcc-0.15.0.ebuild
deleted file mode 100644
index 18274e39b788..000000000000
--- a/dev-util/bcc/bcc-0.15.0.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit cmake-utils linux-info llvm python-single-r1
-
-EGIT_COMMIT="v${PV}"
-LIBBPF_VER="0.0.9"
-
-DESCRIPTION="Tools for BPF-based Linux IO analysis, networking, monitoring, and more"
-HOMEPAGE="https://iovisor.github.io/bcc/"
-
-# This bundles libbpf, I tried to unbundle it, but I am not good enough
-# with cmake to do it. Patches accepted...
-SRC_URI="https://github.com/iovisor/bcc/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
-	https://github.com/libbpf/libbpf/archive/v${LIBBPF_VER}.tar.gz -> libbpf-${LIBBPF_VER}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+luajit test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	>=sys-kernel/linux-headers-4.14
-	>=dev-libs/elfutils-0.166:=
-	<sys-devel/clang-10:=
-	<sys-devel/llvm-10:=[llvm_targets_BPF(+)]
-	luajit? ( dev-lang/luajit )
-	${PYTHON_DEPS}
-"
-DEPEND="${RDEPEND}
-	test? (
-		|| (
-			net-misc/iputils[arping]
-			net-analyzer/arping
-		)
-		net-analyzer/netperf
-		net-misc/iperf:*
-	)
-"
-BDEPEND="
-	dev-util/cmake
-	virtual/pkgconfig
-"
-
-S=${WORKDIR}/${PN}-${EGIT_COMMIT#v}
-
-PATCHES=(
-	"${FILESDIR}/bcc-0.9.0-no-luajit-automagic-dep.patch"
-	"${FILESDIR}/bcc-0.14.0-cmakelists.patch"
-)
-
-# tests need root access
-RESTRICT="test"
-
-pkg_pretend() {
-	local CONFIG_CHECK="~BPF ~BPF_SYSCALL ~NET_CLS_BPF ~NET_ACT_BPF
-		~BPF_JIT ~BPF_EVENTS ~DEBUG_INFO ~FUNCTION_TRACER ~KALLSYMS_ALL
-		~KPROBES"
-
-	check_extra_config
-}
-
-pkg_setup() {
-	LLVM_MAX_SLOT=9 llvm_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	rmdir src/cc/libbpf || die
-	mv "${WORKDIR}"/libbpf-${LIBBPF_VER} src/cc/libbpf || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DREVISION=${PV%%_*}
-		$(usex luajit '-DWITH_LUAJIT=1' '' '' '')
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	python_fix_shebang "${ED}"
-	python_optimize
-}
diff --git a/dev-util/bcc/bcc-0.16.0.ebuild b/dev-util/bcc/bcc-0.16.0-r1.ebuild
index e1c3279fc72e..52f59488240d 100644
--- a/dev-util/bcc/bcc-0.16.0.ebuild
+++ b/dev-util/bcc/bcc-0.16.0-r1.ebuild
@@ -20,10 +20,11 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
 	>=dev-libs/libbpf-0.1.0-r1[static-libs(-)]
+	<dev-libs/libbpf-0.2[static-libs(-)]
 	>=sys-kernel/linux-headers-4.14
 	>=dev-libs/elfutils-0.166:=
-	sys-devel/clang:=
-	sys-devel/llvm:=[llvm_targets_BPF(+)]
+	<=sys-devel/clang-12:=
+	<=sys-devel/llvm-12:=[llvm_targets_BPF(+)]
 	luajit? ( dev-lang/luajit )
 	${PYTHON_DEPS}
 "
@@ -52,7 +53,7 @@ RESTRICT="test"
 
 pkg_pretend() {
 	local CONFIG_CHECK="~BPF ~BPF_SYSCALL ~NET_CLS_BPF ~NET_ACT_BPF
-		~BPF_JIT ~BPF_EVENTS ~DEBUG_INFO ~FUNCTION_TRACER ~KALLSYMS_ALL
+		~HAVE_BPF_JIT ~BPF_EVENTS ~DEBUG_INFO ~FUNCTION_TRACER ~KALLSYMS_ALL
 		~KPROBES"
 
 	check_extra_config
@@ -85,6 +86,7 @@ src_configure() {
 		-DREVISION=${PV%%_*}
 		-DENABLE_LLVM_SHARED=ON
 		-DCMAKE_USE_LIBBPF_PACKAGE=ON
+		-DKERNEL_INCLUDE_DIRS="${KERNEL_DIR}"
 		-DPYTHON_CMD="${bcc_python_impls%;}"
 		$(usex luajit '-DWITH_LUAJIT=1')
 	)
@@ -96,4 +98,6 @@ src_install() {
 	cmake_src_install
 	python_foreach_impl python_optimize
 	python_replicate_script $(grep -Flr '#!/usr/bin/python' "${ED}/usr/share/bcc/tools")
+
+	newenvd "${FILESDIR}"/60bcc.env 60bcc.env
 }
diff --git a/dev-util/bcc/bcc-0.17.0.ebuild b/dev-util/bcc/bcc-0.17.0.ebuild
new file mode 100644
index 000000000000..29d6cc3139dd
--- /dev/null
+++ b/dev-util/bcc/bcc-0.17.0.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit cmake linux-info llvm python-r1
+
+DESCRIPTION="Tools for BPF-based Linux IO analysis, networking, monitoring, and more"
+HOMEPAGE="https://iovisor.github.io/bcc/"
+
+SRC_URI="https://github.com/iovisor/bcc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+luajit test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	>=dev-libs/libbpf-0.2[static-libs(-)]
+	>=sys-kernel/linux-headers-4.14
+	>=dev-libs/elfutils-0.166:=
+	<=sys-devel/clang-12:=
+	<=sys-devel/llvm-12:=[llvm_targets_BPF(+)]
+	luajit? ( dev-lang/luajit )
+	${PYTHON_DEPS}
+"
+DEPEND="${RDEPEND}
+	test? (
+		|| (
+			net-misc/iputils[arping]
+			net-analyzer/arping
+		)
+		net-analyzer/netperf
+		net-misc/iperf:*
+	)
+"
+BDEPEND="
+	dev-util/cmake
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/bcc-0.9.0-no-luajit-automagic-dep.patch"
+	"${FILESDIR}/bcc-0.14.0-cmakelists.patch"
+)
+
+# tests need root access
+RESTRICT="test"
+
+pkg_pretend() {
+	local CONFIG_CHECK="~BPF ~BPF_SYSCALL ~NET_CLS_BPF ~NET_ACT_BPF
+		~HAVE_EBPF_JIT ~BPF_EVENTS ~DEBUG_INFO ~FUNCTION_TRACER ~KALLSYMS_ALL
+		~KPROBES"
+
+	check_extra_config
+}
+
+pkg_setup() {
+	LLVM_MAX_SLOT=11 llvm_pkg_setup
+	python_setup
+}
+
+src_prepare() {
+	local bpf_link_path
+
+	# this avoids bundling
+	bpf_link_path="$(realpath --relative-to="${S}/src/cc/libbpf" /usr/include/bpf)" || die
+	ln -sfn "${bpf_link_path}" src/cc/libbpf/include || die
+
+	cmake_src_prepare
+}
+
+python_add_impl() {
+	bcc_python_impls+="${EPYTHON};"
+}
+
+src_configure() {
+	local bcc_python_impls
+	python_foreach_impl python_add_impl
+
+	local -a mycmakeargs=(
+		-DREVISION=${PV%%_*}
+		-DENABLE_LLVM_SHARED=ON
+		-DCMAKE_USE_LIBBPF_PACKAGE=ON
+		-DKERNEL_INCLUDE_DIRS="${KERNEL_DIR}"
+		-DPYTHON_CMD="${bcc_python_impls%;}"
+		$(usex luajit '-DWITH_LUAJIT=1')
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	python_foreach_impl python_optimize
+	python_replicate_script $(grep -Flr '#!/usr/bin/python' "${ED}/usr/share/bcc/tools")
+
+	newenvd "${FILESDIR}"/60bcc.env 60bcc.env
+}
diff --git a/dev-util/bcc/files/60bcc.env b/dev-util/bcc/files/60bcc.env
new file mode 100644
index 000000000000..9bbcc95cff50
--- /dev/null
+++ b/dev-util/bcc/files/60bcc.env
@@ -0,0 +1 @@
+ROOTPATH="/usr/share/bcc/tools"
diff --git a/dev-util/boost-build/Manifest b/dev-util/boost-build/Manifest
index 3c45889fe4f4..c5dfe6b77fb9 100644
--- a/dev-util/boost-build/Manifest
+++ b/dev-util/boost-build/Manifest
@@ -5,13 +5,10 @@ AUX boost-build-1.71.0-fix-test.patch 363 BLAKE2B b64a87e69df3d4832e5704014a92b4
 AUX boost-build-1.71.0-no-implicit-march-flags.patch 15700 BLAKE2B dc73dcbd5320db6c57b62a009371325c5e6964ca76dc66f1504a8ff3498c631dd6defc3b46288be3148048856c4385f95bfda32b60751e038b7da205eb4b3e10 SHA512 a4b62f5a0e96896dde641e2d59551036c2844fdff02c5f266f05fcd4b651c096d9af93ec468af3a5f2b98ca1020ca82612da4db3de498b9eb7e9e1bc40654bcc
 AUX boost-build-1.71.0-respect-c_ld-flags.patch 367 BLAKE2B fee2e2f2db024a1421ad7f7d59a17908d6d74bd95c568c27adf9853725d8d92b7460d1c520c2a591f4a8d41213e2bd822044aef490b7b50590a6dac63630dc39 SHA512 148171cd6b1946e4dd0c2cfe734ff9a7e7adb4789868a363bd6f0855fad882f69e34aa079c0e1521864db5f5b7dfa449cfed74236b5f6743ed520ed477e48d1c
 AUX boost-build-1.73.0-add-none-feature-options.patch 475 BLAKE2B 5211dbc9188056bea09c4d9d5073cb772ff876b6ed7a05c18db34b2b86b85301d092c6dfd5698aec9ad93a828aeef8283d005136cfb4eb10ab2001f50f41b51a SHA512 0ba75a1e46a58dcc6a332ef8cc8a688f1219619cf84b681233e044da1fda754b7f8dc5ecc903776674729275d7a39a571803022cd66b99e9e335e6ba5bbc5501
-AUX boost-build-1.73.0-no-implicit-march-flags.patch 15834 BLAKE2B 313bef93a7792396d61b886ec75724caf0eb55dbaf419749f7b878a7f9b1b8aeba6cdb865af5ff99727fa30a71a3f023694a7df8e5fe12cb6e7a73cf279f8365 SHA512 91a0c5b4beedd79f73a91e688f4410d66044aead146cec13151cd700680dc596ed021f2f4d9e8872c8d487cd3ee73f6b4337f62fb9e084664bd58ff550873e62
 AUX boost-build-1.74.0-no-implicit-march-flags.patch 16904 BLAKE2B cd37f24ca075760dd220926b081ab898f0f61e9de22e1dbc119afd5d746f3a7d215065332c96af9f64299e9374d994655d196430ad7deac592a42e7d165b0bdf SHA512 d07b55530d26c63b7453d265e27ba6a1e902f67f2b74e581a0286f563e0b2afa833bbdeb625be1a0beec255ead811eecb10d3a6f45c27cb929dc224430c60a8c
 AUX site-config.jam 688 BLAKE2B e43a7ad1a94d113a7f890e8b634770f5c60556101d428d83f655bbbe72c46b587485886a9941d05a2ae4319fc325f1e0ecfb9b660158b81c5e9fd02e0b1c0530 SHA512 b65bf1be3133f9f66d3139b00f195a288591bb20a13ba35041507c2c33d7d2da6047c3b02dc27bc4eb21798b91e1262a60e294b7fd4af90808b9de0f5af517df
 DIST boost_1_72_0.tar.bz2 106907358 BLAKE2B ab270a0e3cb24da687d86785e2d2e6d7731b4dbc07bd839eadb642dfa5a428ad584acb1f3529661a8de9a986008ff3427491041059ea2b742348d02e00761cd8 SHA512 63bbd1743e7c904b2e69fdc2eafd1c2a8a30fd70d960dcd366059d0100f000cb605d56cbd9397bb18421631f1c9552a772c434d0f0caddbe56302273f51fd1f6
-DIST boost_1_73_0.tar.bz2 109247910 BLAKE2B 5995ff6ca21f45988b187b94bf743795cca97531baa8355f488be0987b9426289dd85d6ce25b7eb03ccd690109f05ba56252a95bca50505ad9cd66f4e0e234e8 SHA512 86c296511c0766145097625a62bf099c3d155284d250ad6e528e788bc90b2945838498dfe473c6c6c78d1694b6fba8e19f7dee0d064a043841e6231603fff668
 DIST boost_1_74_0.tar.bz2 109600630 BLAKE2B 2982f64fccf6fdb3b4b74452e603f459242d7abb42df4162278d9b558b637786a2eb97442126967b19088d591777c64ced8f60a23e71eaa0b7545e80f800de63 SHA512 4ec9c1164ec9b95ce46ba1c073e586c94b3882dce5b7347ea14bbef0c1da230e12aa5328a501ce38cae1b1d7623daa3246325625899179b4cc309242540982a4
 EBUILD boost-build-1.72.0.ebuild 1997 BLAKE2B 3324ba02b442f04e3a5d46c42aeff5c860670797397f6d854590d7d63333e2feb9bf45b7a6ef8e36a520fcea8fd90f72123a13383cde2e61183577e76e44531a SHA512 3d5202a851bfccda98c8c72a080fc2e140b242640364dbdccba448de4a0cc0945a7b1d3ffc568e09e44eac1157168b0c36d9559bd1f8e561b369f71a3d79d72e
-EBUILD boost-build-1.73.0.ebuild 2005 BLAKE2B 65d0a35b6f6b602a58121b2a523c7ca0f585b68480a6dfef08bfa664bf11fc899810cfaac178429d81652162fadc55558b47d15a069099f2621fcc6575415749 SHA512 6749a4ebff4a09f8d6ab0db1299e0292f268c3a7b2f7f2fbdfd86861df1c152923a4e275d3284253a476dc74d7f7f92b46f5f424531d5eaee1b30268c79d20ae
-EBUILD boost-build-1.74.0.ebuild 2005 BLAKE2B 94ac8f0d07a8ca25a8ee5d21f659a4b7ed7d7537afbe38691c3e75675cfad25edd82893b553a8c2f720ef5590dc236266b3bf4709d6739a141fe1a946cf7d85b SHA512 f5ff365d0b832bdba137f463ae3c362ee412673cde9ce085ed664cb8b5f92aeb85830613ab337c50a1e26e110b8b3251284e96571f16ef338c325f37886bda40
+EBUILD boost-build-1.74.0.ebuild 1970 BLAKE2B fe580d61fc9dc857728603a0736d300e879d1ebb67cceefd12658d4caf9aa3632dc18b48b6b58cc4483840bda0a14c72aed579163fe29749191d581e8e9f24fd SHA512 903cbcd060470d292fac6c19e4686bc52e33d3b5bf2f694bafe96221b7c58db0492742fd296346ad2485db2bdc728fba36931a93cb9f61a9d41804c9c69410ae
 MISC metadata.xml 329 BLAKE2B f492b1ba64c3f7bce1d3fb304bcff93357cc069dfd06b69c25cf26f4423ebea51ac4614a8d865635568f0e9db424a6904fc1edd5fa729243838e16e9887f4202 SHA512 57baf2d8e0a4c240d99f68ce122086a147d42145687b712609fdcd73b77fe3fdfecc1b078edb6a9c922213482fcc17c2fccb6762ec69890fbc9a912c4cb34827
diff --git a/dev-util/boost-build/boost-build-1.73.0.ebuild b/dev-util/boost-build/boost-build-1.73.0.ebuild
deleted file mode 100644
index bb838e5bd699..000000000000
--- a/dev-util/boost-build/boost-build-1.73.0.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic prefix toolchain-funcs
-
-MY_PV="$(ver_rs 1- _)"
-
-DESCRIPTION="A system for large project software construction, simple to use and powerful"
-HOMEPAGE="https://boostorg.github.io/build/"
-SRC_URI="https://dl.bintray.com/boostorg/release/${PV}/source/boost_${MY_PV}.tar.bz2"
-
-LICENSE="Boost-1.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="examples"
-RESTRICT="test"
-
-S="${WORKDIR}/boost_${MY_PV}/tools/build/src"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.71.0-disable_python_rpath.patch
-	"${FILESDIR}"/${PN}-1.71.0-darwin-gentoo-toolchain.patch
-	"${FILESDIR}"/${PN}-1.73.0-add-none-feature-options.patch
-	"${FILESDIR}"/${PN}-1.71.0-respect-c_ld-flags.patch
-	"${FILESDIR}"/${PN}-1.73.0-no-implicit-march-flags.patch
-)
-
-src_unpack() {
-	tar xojf "${DISTDIR}/${A}" boost_${MY_PV}/tools/build || die "unpacking tar failed"
-}
-
-src_prepare() {
-	default
-
-	pushd .. >/dev/null || die
-	eapply "${FILESDIR}"/${PN}-1.71.0-fix-test.patch
-	popd >/dev/null || die
-}
-
-src_configure() {
-	hprefixify engine/Jambase
-	tc-export CXX
-}
-
-src_compile() {
-	cd engine || die
-	./build.sh cxx -d+2 --without-python || die "building bjam failed"
-}
-
-src_test() {
-	# Forget tests, bjam is a lost cause
-	:
-}
-
-src_install() {
-	dobin engine/{bjam,b2}
-
-	insinto /usr/share/boost-build
-	doins -r "${FILESDIR}/site-config.jam" \
-		../boost-build.jam bootstrap.jam build-system.jam ../example/user-config.jam *.py \
-		build kernel options tools util
-
-	find "${ED}"/usr/share/boost-build -iname '*.py' -delete || die
-
-	dodoc ../notes/{changes,release_procedure,build_dir_option,relative_source_paths}.txt
-
-	if use examples; then
-		docinto examples
-		dodoc -r ../example/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-util/boost-build/boost-build-1.74.0.ebuild b/dev-util/boost-build/boost-build-1.74.0.ebuild
index 40e1b4993f78..5074670c2b5d 100644
--- a/dev-util/boost-build/boost-build-1.74.0.ebuild
+++ b/dev-util/boost-build/boost-build-1.74.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://dl.bintray.com/boostorg/release/${PV}/source/boost_${MY_PV}.tar
 
 LICENSE="Boost-1.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples"
 RESTRICT="test"
 
@@ -40,7 +40,6 @@ src_prepare() {
 }
 
 src_configure() {
-	hprefixify engine/Jambase
 	tc-export CXX
 }
 
diff --git a/dev-util/boost-build/files/boost-build-1.73.0-no-implicit-march-flags.patch b/dev-util/boost-build/files/boost-build-1.73.0-no-implicit-march-flags.patch
deleted file mode 100644
index ef6de8948036..000000000000
--- a/dev-util/boost-build/files/boost-build-1.73.0-no-implicit-march-flags.patch
+++ /dev/null
@@ -1,269 +0,0 @@
-Prevent bjam from injecting what it thinks are great -march/-mcpu flags
-in order to optimize code for you. This breaks on 32-bit builds, because
--march=i686 will not work on an i486 CHOST.
-
-See also:
-https://bugs.gentoo.org/624616
-
---- a/tools/gcc.jam
---- a/tools/gcc.jam
-+++ b/tools/gcc.jam
-@@ -1202,129 +1202,8 @@
- # x86 and compatible
- # The 'native' option appeared in gcc 4.2 so we cannot safely use it as default.
- # Use i686 instead for 32-bit.
--toolset.flags gcc OPTIONS <architecture>x86/<address-model>32/<instruction-set> : -march=i686 ;
--cpu-flags gcc OPTIONS : x86 : native : -march=native ;
--cpu-flags gcc OPTIONS : x86 : i486 : -march=i486 ;
--cpu-flags gcc OPTIONS : x86 : i586 : -march=i586 ;
--cpu-flags gcc OPTIONS : x86 : i686 : -march=i686 ;
--cpu-flags gcc OPTIONS : x86 : pentium : -march=pentium ;
--cpu-flags gcc OPTIONS : x86 : pentium-mmx : -march=pentium-mmx ;
--cpu-flags gcc OPTIONS : x86 : pentiumpro : -march=pentiumpro ;
--cpu-flags gcc OPTIONS : x86 : pentium2 : -march=pentium2 ;
--cpu-flags gcc OPTIONS : x86 : pentium3 : -march=pentium3 ;
--cpu-flags gcc OPTIONS : x86 : pentium3m : -march=pentium3m ;
--cpu-flags gcc OPTIONS : x86 : pentium-m : -march=pentium-m ;
--cpu-flags gcc OPTIONS : x86 : pentium4 : -march=pentium4 ;
--cpu-flags gcc OPTIONS : x86 : pentium4m : -march=pentium4m ;
--cpu-flags gcc OPTIONS : x86 : prescott : -march=prescott ;
--cpu-flags gcc OPTIONS : x86 : nocona : -march=nocona ;
--cpu-flags gcc OPTIONS : x86 : core2 : -march=core2 ;
--cpu-flags gcc OPTIONS : x86 : conroe : -march=core2 ;
--cpu-flags gcc OPTIONS : x86 : conroe-xe : -march=core2 ;
--cpu-flags gcc OPTIONS : x86 : conroe-l : -march=core2 ;
--cpu-flags gcc OPTIONS : x86 : allendale : -march=core2 ;
--cpu-flags gcc OPTIONS : x86 : wolfdale : -march=core2 -msse4.1 ;
--cpu-flags gcc OPTIONS : x86 : merom : -march=core2 ;
--cpu-flags gcc OPTIONS : x86 : merom-xe : -march=core2 ;
--cpu-flags gcc OPTIONS : x86 : kentsfield : -march=core2 ;
--cpu-flags gcc OPTIONS : x86 : kentsfield-xe : -march=core2 ;
--cpu-flags gcc OPTIONS : x86 : yorksfield : -march=core2 ;
--cpu-flags gcc OPTIONS : x86 : penryn : -march=core2 ;
--cpu-flags gcc OPTIONS : x86 : corei7 : -march=corei7 ;
--cpu-flags gcc OPTIONS : x86 : nehalem : -march=corei7 ;
--cpu-flags gcc OPTIONS : x86 : corei7-avx : -march=corei7-avx ;
--cpu-flags gcc OPTIONS : x86 : sandy-bridge : -march=corei7-avx ;
--cpu-flags gcc OPTIONS : x86 : core-avx-i : -march=core-avx-i ;
--cpu-flags gcc OPTIONS : x86 : ivy-bridge : -march=core-avx-i ;
--cpu-flags gcc OPTIONS : x86 : haswell : -march=core-avx-i -mavx2 -mfma -mbmi -mbmi2 -mlzcnt ;
--cpu-flags gcc OPTIONS : x86 : broadwell : -march=broadwell ;
--cpu-flags gcc OPTIONS : x86 : skylake : -march=skylake ;
--cpu-flags gcc OPTIONS : x86 : skylake-avx512 : -march=skylake-avx512 ;
--cpu-flags gcc OPTIONS : x86 : cannonlake : -march=skylake-avx512 -mavx512vbmi -mavx512ifma -msha ;
--cpu-flags gcc OPTIONS : x86 : icelake : -march=icelake ;
--cpu-flags gcc OPTIONS : x86 : k6 : -march=k6 ;
--cpu-flags gcc OPTIONS : x86 : k6-2 : -march=k6-2 ;
--cpu-flags gcc OPTIONS : x86 : k6-3 : -march=k6-3 ;
--cpu-flags gcc OPTIONS : x86 : athlon : -march=athlon ;
--cpu-flags gcc OPTIONS : x86 : athlon-tbird : -march=athlon-tbird ;
--cpu-flags gcc OPTIONS : x86 : athlon-4 : -march=athlon-4 ;
--cpu-flags gcc OPTIONS : x86 : athlon-xp : -march=athlon-xp ;
--cpu-flags gcc OPTIONS : x86 : athlon-mp : -march=athlon-mp ;
- ##
--cpu-flags gcc OPTIONS : x86 : k8 : -march=k8 ;
--cpu-flags gcc OPTIONS : x86 : opteron : -march=opteron ;
--cpu-flags gcc OPTIONS : x86 : athlon64 : -march=athlon64 ;
--cpu-flags gcc OPTIONS : x86 : athlon-fx : -march=athlon-fx ;
--cpu-flags gcc OPTIONS : x86 : k8-sse3 : -march=k8-sse3 ;
--cpu-flags gcc OPTIONS : x86 : opteron-sse3 : -march=opteron-sse3 ;
--cpu-flags gcc OPTIONS : x86 : athlon64-sse3 : -march=athlon64-sse3 ;
--cpu-flags gcc OPTIONS : x86 : amdfam10 : -march=amdfam10 ;
--cpu-flags gcc OPTIONS : x86 : barcelona : -march=barcelona ;
--cpu-flags gcc OPTIONS : x86 : bdver1 : -march=bdver1 ;
--cpu-flags gcc OPTIONS : x86 : bdver2 : -march=bdver2 ;
--cpu-flags gcc OPTIONS : x86 : bdver3 : -march=bdver3 ;
--cpu-flags gcc OPTIONS : x86 : bdver4 : -march=bdver4 ;
--cpu-flags gcc OPTIONS : x86 : btver1 : -march=btver1 ;
--cpu-flags gcc OPTIONS : x86 : btver2 : -march=btver2 ;
--cpu-flags gcc OPTIONS : x86 : znver1 : -march=znver1 ;
--cpu-flags gcc OPTIONS : x86 : winchip-c6 : -march=winchip-c6 ;
--cpu-flags gcc OPTIONS : x86 : winchip2 : -march=winchip2 ;
--cpu-flags gcc OPTIONS : x86 : c3 : -march=c3 ;
--cpu-flags gcc OPTIONS : x86 : c3-2 : -march=c3-2 ;
- ##
--cpu-flags gcc OPTIONS : x86 : atom : -march=atom ;
--# Sparc
--cpu-flags gcc OPTIONS : sparc : v7 : -mcpu=v7 : default ;
--cpu-flags gcc OPTIONS : sparc : cypress : -mcpu=cypress ;
--cpu-flags gcc OPTIONS : sparc : v8 : -mcpu=v8 ;
--cpu-flags gcc OPTIONS : sparc : supersparc : -mcpu=supersparc ;
--cpu-flags gcc OPTIONS : sparc : sparclite : -mcpu=sparclite ;
--cpu-flags gcc OPTIONS : sparc : hypersparc : -mcpu=hypersparc ;
--cpu-flags gcc OPTIONS : sparc : sparclite86x : -mcpu=sparclite86x ;
--cpu-flags gcc OPTIONS : sparc : f930 : -mcpu=f930 ;
--cpu-flags gcc OPTIONS : sparc : f934 : -mcpu=f934 ;
--cpu-flags gcc OPTIONS : sparc : sparclet : -mcpu=sparclet ;
--cpu-flags gcc OPTIONS : sparc : tsc701 : -mcpu=tsc701 ;
--cpu-flags gcc OPTIONS : sparc : v9 : -mcpu=v9 ;
--cpu-flags gcc OPTIONS : sparc : ultrasparc : -mcpu=ultrasparc ;
--cpu-flags gcc OPTIONS : sparc : ultrasparc3 : -mcpu=ultrasparc3 ;
- # RS/6000 & PowerPC
--cpu-flags gcc OPTIONS : power : 403 : -mcpu=403 ;
--cpu-flags gcc OPTIONS : power : 505 : -mcpu=505 ;
--cpu-flags gcc OPTIONS : power : 601 : -mcpu=601 ;
--cpu-flags gcc OPTIONS : power : 602 : -mcpu=602 ;
--cpu-flags gcc OPTIONS : power : 603 : -mcpu=603 ;
--cpu-flags gcc OPTIONS : power : 603e : -mcpu=603e ;
--cpu-flags gcc OPTIONS : power : 604 : -mcpu=604 ;
--cpu-flags gcc OPTIONS : power : 604e : -mcpu=604e ;
--cpu-flags gcc OPTIONS : power : 620 : -mcpu=620 ;
--cpu-flags gcc OPTIONS : power : 630 : -mcpu=630 ;
--cpu-flags gcc OPTIONS : power : 740 : -mcpu=740 ;
--cpu-flags gcc OPTIONS : power : 7400 : -mcpu=7400 ;
--cpu-flags gcc OPTIONS : power : 7450 : -mcpu=7450 ;
--cpu-flags gcc OPTIONS : power : 750 : -mcpu=750 ;
--cpu-flags gcc OPTIONS : power : 801 : -mcpu=801 ;
--cpu-flags gcc OPTIONS : power : 821 : -mcpu=821 ;
--cpu-flags gcc OPTIONS : power : 823 : -mcpu=823 ;
--cpu-flags gcc OPTIONS : power : 860 : -mcpu=860 ;
--cpu-flags gcc OPTIONS : power : 970 : -mcpu=970 ;
--cpu-flags gcc OPTIONS : power : 8540 : -mcpu=8540 ;
--cpu-flags gcc OPTIONS : power : power : -mcpu=power ;
--cpu-flags gcc OPTIONS : power : power2 : -mcpu=power2 ;
--cpu-flags gcc OPTIONS : power : power3 : -mcpu=power3 ;
--cpu-flags gcc OPTIONS : power : power4 : -mcpu=power4 ;
--cpu-flags gcc OPTIONS : power : power5 : -mcpu=power5 ;
--cpu-flags gcc OPTIONS : power : powerpc : -mcpu=powerpc ;
--cpu-flags gcc OPTIONS : power : powerpc64 : -mcpu=powerpc64 ;
--cpu-flags gcc OPTIONS : power : rios : -mcpu=rios ;
--cpu-flags gcc OPTIONS : power : rios1 : -mcpu=rios1 ;
--cpu-flags gcc OPTIONS : power : rios2 : -mcpu=rios2 ;
--cpu-flags gcc OPTIONS : power : rsc : -mcpu=rsc ;
--cpu-flags gcc OPTIONS : power : rs64a : -mcpu=rs64 ;
--cpu-flags gcc OPTIONS : s390x : z196 : -march=z196 ;
--cpu-flags gcc OPTIONS : s390x : zEC12 : -march=zEC12 ;
--cpu-flags gcc OPTIONS : s390x : z13 : -march=z13 ;
--cpu-flags gcc OPTIONS : s390x : z14 : -march=z14 ;
--cpu-flags gcc OPTIONS : s390x : z15 : -march=z15 ;
- # AIX variant of RS/6000 & PowerPC
- toolset.flags gcc AROPTIONS <address-model>64/<target-os>aix : "-X64" ;
---- a/tools/gcc.py
-+++ b/tools/gcc.py
-@@ -745,126 +745,14 @@
- # x86 and compatible
- flags('gcc', 'OPTIONS', ['<architecture>x86/<address-model>32'], ['-m32'])
- flags('gcc', 'OPTIONS', ['<architecture>x86/<address-model>64'], ['-m64'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'native', ['-march=native'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'i486', ['-march=i486'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'i586', ['-march=i586'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'i686', ['-march=i686'], default=True)
--cpu_flags('gcc', 'OPTIONS', 'x86', 'pentium', ['-march=pentium'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'pentium-mmx', ['-march=pentium-mmx'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'pentiumpro', ['-march=pentiumpro'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'pentium2', ['-march=pentium2'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'pentium3', ['-march=pentium3'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'pentium3m', ['-march=pentium3m'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'pentium-m', ['-march=pentium-m'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'pentium4', ['-march=pentium4'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'pentium4m', ['-march=pentium4m'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'prescott', ['-march=prescott'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'nocona', ['-march=nocona'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'core2', ['-march=core2'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'conroe', ['-march=core2'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'conroe-xe', ['-march=core2'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'conroe-l', ['-march=core2'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'allendale', ['-march=core2'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'wolfdale', ['-march=core2', '-msse4.1'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'merom', ['-march=core2'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'merom-xe', ['-march=core2'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'kentsfield', ['-march=core2'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'kentsfield-xe', ['-march=core2'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'yorksfield', ['-march=core2'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'penryn', ['-march=core2'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'corei7', ['-march=corei7'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'nehalem', ['-march=corei7'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'corei7-avx', ['-march=corei7-avx'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'sandy-bridge', ['-march=corei7-avx'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'core-avx-i', ['-march=core-avx-i'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'ivy-bridge', ['-march=core-avx-i'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'haswell', ['-march=core-avx-i', '-mavx2', '-mfma', '-mbmi', '-mbmi2', '-mlzcnt'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'k6', ['-march=k6'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'k6-2', ['-march=k6-2'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'k6-3', ['-march=k6-3'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'athlon', ['-march=athlon'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'athlon-tbird', ['-march=athlon-tbird'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'athlon-4', ['-march=athlon-4'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'athlon-xp', ['-march=athlon-xp'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'athlon-mp', ['-march=athlon-mp'])
- ##
--cpu_flags('gcc', 'OPTIONS', 'x86', 'k8', ['-march=k8'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'opteron', ['-march=opteron'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'athlon64', ['-march=athlon64'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'athlon-fx', ['-march=athlon-fx'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'k8-sse3', ['-march=k8-sse3'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'opteron-sse3', ['-march=opteron-sse3'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'athlon64-sse3', ['-march=athlon64-sse3'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'amdfam10', ['-march=amdfam10'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'barcelona', ['-march=barcelona'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'bdver1', ['-march=bdver1'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'bdver2', ['-march=bdver2'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'bdver3', ['-march=bdver3'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'btver1', ['-march=btver1'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'btver2', ['-march=btver2'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'winchip-c6', ['-march=winchip-c6'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'winchip2', ['-march=winchip2'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'c3', ['-march=c3'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'c3-2', ['-march=c3-2'])
- ##
--cpu_flags('gcc', 'OPTIONS', 'x86', 'atom', ['-march=atom'])
- # Sparc
- flags('gcc', 'OPTIONS', ['<architecture>sparc/<address-model>32'], ['-m32'])
- flags('gcc', 'OPTIONS', ['<architecture>sparc/<address-model>64'], ['-m64'])
--cpu_flags('gcc', 'OPTIONS', 'sparc', 'v7', ['-mcpu=v7'], default=True)
--cpu_flags('gcc', 'OPTIONS', 'sparc', 'cypress', ['-mcpu=cypress'])
--cpu_flags('gcc', 'OPTIONS', 'sparc', 'v8', ['-mcpu=v8'])
--cpu_flags('gcc', 'OPTIONS', 'sparc', 'supersparc', ['-mcpu=supersparc'])
--cpu_flags('gcc', 'OPTIONS', 'sparc', 'sparclite', ['-mcpu=sparclite'])
--cpu_flags('gcc', 'OPTIONS', 'sparc', 'hypersparc', ['-mcpu=hypersparc'])
--cpu_flags('gcc', 'OPTIONS', 'sparc', 'sparclite86x', ['-mcpu=sparclite86x'])
--cpu_flags('gcc', 'OPTIONS', 'sparc', 'f930', ['-mcpu=f930'])
--cpu_flags('gcc', 'OPTIONS', 'sparc', 'f934', ['-mcpu=f934'])
--cpu_flags('gcc', 'OPTIONS', 'sparc', 'sparclet', ['-mcpu=sparclet'])
--cpu_flags('gcc', 'OPTIONS', 'sparc', 'tsc701', ['-mcpu=tsc701'])
--cpu_flags('gcc', 'OPTIONS', 'sparc', 'v9', ['-mcpu=v9'])
--cpu_flags('gcc', 'OPTIONS', 'sparc', 'ultrasparc', ['-mcpu=ultrasparc'])
--cpu_flags('gcc', 'OPTIONS', 'sparc', 'ultrasparc3', ['-mcpu=ultrasparc3'])
- # RS/6000 & PowerPC
- flags('gcc', 'OPTIONS', ['<architecture>power/<address-model>32'], ['-m32'])
- flags('gcc', 'OPTIONS', ['<architecture>power/<address-model>64'], ['-m64'])
--cpu_flags('gcc', 'OPTIONS', 'power', '403', ['-mcpu=403'])
--cpu_flags('gcc', 'OPTIONS', 'power', '505', ['-mcpu=505'])
--cpu_flags('gcc', 'OPTIONS', 'power', '601', ['-mcpu=601'])
--cpu_flags('gcc', 'OPTIONS', 'power', '602', ['-mcpu=602'])
--cpu_flags('gcc', 'OPTIONS', 'power', '603', ['-mcpu=603'])
--cpu_flags('gcc', 'OPTIONS', 'power', '603e', ['-mcpu=603e'])
--cpu_flags('gcc', 'OPTIONS', 'power', '604', ['-mcpu=604'])
--cpu_flags('gcc', 'OPTIONS', 'power', '604e', ['-mcpu=604e'])
--cpu_flags('gcc', 'OPTIONS', 'power', '620', ['-mcpu=620'])
--cpu_flags('gcc', 'OPTIONS', 'power', '630', ['-mcpu=630'])
--cpu_flags('gcc', 'OPTIONS', 'power', '740', ['-mcpu=740'])
--cpu_flags('gcc', 'OPTIONS', 'power', '7400', ['-mcpu=7400'])
--cpu_flags('gcc', 'OPTIONS', 'power', '7450', ['-mcpu=7450'])
--cpu_flags('gcc', 'OPTIONS', 'power', '750', ['-mcpu=750'])
--cpu_flags('gcc', 'OPTIONS', 'power', '801', ['-mcpu=801'])
--cpu_flags('gcc', 'OPTIONS', 'power', '821', ['-mcpu=821'])
--cpu_flags('gcc', 'OPTIONS', 'power', '823', ['-mcpu=823'])
--cpu_flags('gcc', 'OPTIONS', 'power', '860', ['-mcpu=860'])
--cpu_flags('gcc', 'OPTIONS', 'power', '970', ['-mcpu=970'])
--cpu_flags('gcc', 'OPTIONS', 'power', '8540', ['-mcpu=8540'])
--cpu_flags('gcc', 'OPTIONS', 'power', 'power', ['-mcpu=power'])
--cpu_flags('gcc', 'OPTIONS', 'power', 'power2', ['-mcpu=power2'])
--cpu_flags('gcc', 'OPTIONS', 'power', 'power3', ['-mcpu=power3'])
--cpu_flags('gcc', 'OPTIONS', 'power', 'power4', ['-mcpu=power4'])
--cpu_flags('gcc', 'OPTIONS', 'power', 'power5', ['-mcpu=power5'])
--cpu_flags('gcc', 'OPTIONS', 'power', 'powerpc', ['-mcpu=powerpc'])
--cpu_flags('gcc', 'OPTIONS', 'power', 'powerpc64', ['-mcpu=powerpc64'])
--cpu_flags('gcc', 'OPTIONS', 'power', 'rios', ['-mcpu=rios'])
--cpu_flags('gcc', 'OPTIONS', 'power', 'rios1', ['-mcpu=rios1'])
--cpu_flags('gcc', 'OPTIONS', 'power', 'rios2', ['-mcpu=rios2'])
--cpu_flags('gcc', 'OPTIONS', 'power', 'rsc', ['-mcpu=rsc'])
--cpu_flags('gcc', 'OPTIONS', 'power', 'rs64a', ['-mcpu=rs64'])
--cpu_flags('gcc', 'OPTIONS', 's390x',  'z196', ['-march=z196'])
--cpu_flags('gcc', 'OPTIONS', 's390x',  'zEC12', ['-march=zEC12'])
--cpu_flags('gcc', 'OPTIONS', 's390x',  'z13', ['-march=z13'])
--cpu_flags('gcc', 'OPTIONS', 's390x',  'z14', ['-march=z14'])
--cpu_flags('gcc', 'OPTIONS', 's390x',  'z15', ['-march=z15'])
- # AIX variant of RS/6000 & PowerPC
- flags('gcc', 'OPTIONS', ['<architecture>power/<address-model>32/<target-os>aix'], ['-maix32'])
- flags('gcc', 'OPTIONS', ['<architecture>power/<address-model>64/<target-os>aix'], ['-maix64'])
diff --git a/dev-util/bpftrace/Manifest b/dev-util/bpftrace/Manifest
index 32a30795c5ea..b46009a8945d 100644
--- a/dev-util/bpftrace/Manifest
+++ b/dev-util/bpftrace/Manifest
@@ -1,13 +1,6 @@
 AUX bpftrace-0.10.0-dont-compress-man.patch 722 BLAKE2B 583969e9f4457a49f17f33d984ab2585ec2e6f6976846af4d39084ce41bf334892b0971d1a1571e9495d4a05eea680412899d1fb23a8eb25a9b9cab84c3b101b SHA512 1f588dd589933c2fbb0ca79a5782c542cb137e748a442b9904153f76d142ae117755e1c24acfc50947e6040afbad78f31ef0c181082695f63ebb61b3acbe4b6a
-AUX bpftrace-0.10.0-install-libs.patch 5790 BLAKE2B 93f12b430f8ba5772423fc0350c59d0f43b9de05fbbc03c4ef46c113886b74a330c397122daa6a423f4a6111b1d113679503b06d7e507f23a837dc06a4c662ca SHA512 585b1128e1a7d4cb92a38eb4043ff824179aed5767f9884d54714dbcc5148d95ca1e95b1fadbde520f57be60501d850c217204f7aed1c556ea5924e422c661bd
-AUX bpftrace-0.10.0-llvm-multi.patch 2516 BLAKE2B 354882237ce984c776ae8f4c0c442a3f250b007d11a03d3bc794c69df9405d67ee09e0ae86ff2585ea025e941a246904e80556857e531c1f3fc06befba88c7da SHA512 5a5d6db61da9c1d07991500ab7feeb5aa945d11dc2f6387d7ccb04ff6a07da478d9a1005a79bba8ad04805eadca95fc72ffc3cc1ffc4bca76ea66f08ea56e2a8
-AUX bpftrace-0.10.0-no-bpf_detach_kfunc.patch 379 BLAKE2B cb796b682fa5b4a89d4f7e879e23d7b1fd3a8202b87467dec8cb3abb0b80edaa3b3353bfd56277d2a087541576a0066526110266b961ae36c57c833cb38c46b1 SHA512 be47a1f688f71c49d249a4ce1292e705f0cc5fb0ec73b77c976cde896325cd65423fba9999a5fba2d027230da02c8a8ebc5d2d73f22e46d53b42ae9528a8724d
 AUX bpftrace-0.11.0-install-libs.patch 6063 BLAKE2B c05146ef6d6ffd7fb5e1f97a9ea3dbdbab1b875bcf1707b07ff8c2b93e0e8cd36093330edc32b1d25796a5b72370b114301c1c0db78bc59c48740158e31a8e95 SHA512 e022425af1d19e1ff586f23d7de384b912bf8b67e501b86d31e3450e118ea3266cb81413caa06b3e674a31df2585ad447234e3897c716f055c7423a5f7333a66
-DIST bpftrace-0.10.0.tar.gz 835854 BLAKE2B 623369bb2a2ad8d5eec364afa98bdae3fbe5e66182d8f1187fe86a8bd70ee357a554eb063fdbe5476eab23912adf2cf027092cac3e6989d8f716e91aa5d01212 SHA512 da400efe78cea505a32deead594b047ec4394d3eefe86e7b6853fe2dc715c5847a3abcbd26c1fac39d0a534f1e57d6c0bc3625e0c3f1054b0d84b7b1d6eb69b9
-DIST bpftrace-0.11.0.tar.gz 867444 BLAKE2B a99255befadea0b4cb54299a8318c0a7a667ac2258b612750705b4d351ac59f4411f2567bc0100929291e3c9756d276671e41af9d398b118b3d486dace2953d7 SHA512 32bf0c23a7b0e1a57d0e0b8fc845a9e184e201ac3f6018a3d3cee8c97096093b333578cb898ede02fb3ab8d55ba9bcd2bb67ac70b81a49461c0f6e5c03c2a6f5
-DIST bpftrace-0.11.1.tar.gz 867481 BLAKE2B d77e69e21a1cdd65c610b57a8e16d02ff2da69bbb6fd207ff312d2ee3dd4ccbaded205e4b9f16a7ff24177fbc227304ffbb447cd974f44c7828d54f38ad573d5 SHA512 361cedc6ce8a950188717db5ffd005b9709371010810cf6bc870ca945c1db9bdc7ab99b55b694345d580d03145b3eb6ca169f2f1f9909f3e9fc34250df9999f3
-EBUILD bpftrace-0.10.0-r1.ebuild 1676 BLAKE2B 57af40bbdefcc28fc775f7aadeb2d7213b974b130aa51591076354f1f351ecace66d9c1355c99adab7f5cdcf2e711767d1f045f6e076eef2476055d7a0309bd2 SHA512 42b1eefa65583294af9baf692dcd9d8da5577b4e59cdb202b5d0df25e7746acafeac9888ee2c7eac8bff8974edaf4407c9d07e62e47662a02743fc0de0fbc9e5
-EBUILD bpftrace-0.11.0-r1.ebuild 1538 BLAKE2B 7bc25c0281e1e50bf22933c32cb16802a521ea9633e003ca1c6487542ea8ac6f101e932a9c1e163c9f42936c1ef7115f143212aa9275ef0d57187117f2474602 SHA512 0be111921a92d1e6b7c17aa59842a9d06ab6478fd6b86aab7c232b19978541ee3e9b3d5adbefaf57f26272c0276c9ed5dcac53beeb34cdc07cdd7440a4d258d8
-EBUILD bpftrace-0.11.1.ebuild 1538 BLAKE2B 7bc25c0281e1e50bf22933c32cb16802a521ea9633e003ca1c6487542ea8ac6f101e932a9c1e163c9f42936c1ef7115f143212aa9275ef0d57187117f2474602 SHA512 0be111921a92d1e6b7c17aa59842a9d06ab6478fd6b86aab7c232b19978541ee3e9b3d5adbefaf57f26272c0276c9ed5dcac53beeb34cdc07cdd7440a4d258d8
-EBUILD bpftrace-9999.ebuild 1538 BLAKE2B 7bc25c0281e1e50bf22933c32cb16802a521ea9633e003ca1c6487542ea8ac6f101e932a9c1e163c9f42936c1ef7115f143212aa9275ef0d57187117f2474602 SHA512 0be111921a92d1e6b7c17aa59842a9d06ab6478fd6b86aab7c232b19978541ee3e9b3d5adbefaf57f26272c0276c9ed5dcac53beeb34cdc07cdd7440a4d258d8
+DIST bpftrace-0.11.3.tar.gz 867967 BLAKE2B 950362e4a4c0f61d67056eacfde0b54a9be9b65285b243cbbb137d113020868f01b1792fddaffbaf41ed174b47cd2f197c0aa89f78690d3e71dae4b7a4c05e3e SHA512 76f6b19ce2a2f3989ebafc49a4df337c6b5f3acf39e7415846b16ee08e2fa7a59821cd18de3c9ed29420b323de8458d1411ccf801e9cd5f3ac64f2bd981e2c3c
+EBUILD bpftrace-0.11.3-r1.ebuild 1568 BLAKE2B 7eed05d2ad5a514ec624fc8d028aab8f79dadec6f3e402812d20fc1669941f9c071bceb57ba68c509989739742d5558e9d6cd96bf0dff6e9f5b0211e3237215c SHA512 55d21fe383907e16087ec5c85c619f632be4f21457fd1217915a0a7b39918941605e4ce29f8f19e13d84fe1eebf90a7b1db2ca031647d3b46773945a396a4f54
+EBUILD bpftrace-9999.ebuild 1573 BLAKE2B 69c5ba3fc6278cd1b6098d174d8057c0ee758832a63716ff8864229deb35028d7ee5b738658cbb9787464391d250c35bf1933e0caf23fdbfc8d7f32422f86726 SHA512 aa783e719ee50be25065c696d291a1524b25949a43c78e9d7309cfbf5016ab413314a8575ac869bd45bb35fb9e251b0ea272f195b38cf1f20afb3b0783baacd7
 MISC metadata.xml 308 BLAKE2B 5440fafa478bdbdf6906c74d697a9542deb8b13b76527a380df723562759d914d597dff029f93ba4567ce4e0f4723fded5a13ea7d2032752253bad1906e753dc SHA512 c27c2ef4795e9167ea133e0c0e2c6d67425d6db754bd563d9cb7a791b4a155ebe855ad0e67c2b29235a9b9761f29dbb14958b124c95a1aaddb97801c763914ba
diff --git a/dev-util/bpftrace/bpftrace-0.10.0-r1.ebuild b/dev-util/bpftrace/bpftrace-0.10.0-r1.ebuild
deleted file mode 100644
index 26c1753afef8..000000000000
--- a/dev-util/bpftrace/bpftrace-0.10.0-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs linux-info cmake-utils
-
-DESCRIPTION="High-level tracing language for eBPF"
-HOMEPAGE="https://github.com/iovisor/bpftrace"
-
-if [[ ${PV} =~ 9{4,} ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/iovisor/${PN}"
-	BDEPEND=""
-else
-	MY_PV="${PV//_/}"
-	SRC_URI="https://github.com/iovisor/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
-	BDEPEND="app-arch/xz-utils "
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-
-COMMON_DEPEND="dev-util/systemtap
-	sys-devel/clang:=
-	dev-libs/libbpf:=
-	>=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)]
-	<sys-devel/clang-10:=
-	<sys-devel/llvm-10:=[llvm_targets_BPF(+)]
-	>=dev-util/bcc-0.12.0:=
-	virtual/libelf"
-DEPEND="${COMMON_DEPEND}
-	test? ( dev-cpp/gtest )"
-RDEPEND="${COMMON_DEPEND}"
-BDEPEND+="dev-util/cmake
-	sys-devel/flex
-	sys-devel/bison"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-QA_DT_NEEDED="/usr/lib.*/libbpftraceresources.so"
-
-PATCHES=(
-	"${FILESDIR}/bpftrace-0.10.0-install-libs.patch"
-	"${FILESDIR}/bpftrace-0.10.0-dont-compress-man.patch"
-	"${FILESDIR}/bpftrace-0.10.0-llvm-multi.patch"
-	# bpf_detach_kfunc has always been a noop
-	"${FILESDIR}/bpftrace-0.10.0-no-bpf_detach_kfunc.patch"
-)
-
-# lots of fixing needed
-RESTRICT="test"
-
-pkg_pretend() {
-	local CONFIG_CHECK="
-		~BPF
-		~BPF_EVENTS
-		~BPF_JIT
-		~BPF_SYSCALL
-		~FTRACE_SYSCALLS
-		~HAVE_EBPF_JIT
-	"
-
-	check_extra_config
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local -a mycmakeargs
-	mycmakeargs=(
-		"-DSTATIC_LINKING:BOOL=OFF"
-		"-DBUILD_TESTING:BOOL=OFF"
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/dev-util/bpftrace/bpftrace-0.11.1.ebuild b/dev-util/bpftrace/bpftrace-0.11.1.ebuild
deleted file mode 100644
index 6eeeb6c28d67..000000000000
--- a/dev-util/bpftrace/bpftrace-0.11.1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs llvm linux-info cmake
-
-DESCRIPTION="High-level tracing language for eBPF"
-HOMEPAGE="https://github.com/iovisor/bpftrace"
-
-if [[ ${PV} =~ 9{4,} ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/iovisor/${PN}"
-	BDEPEND=""
-else
-	MY_PV="${PV//_/}"
-	SRC_URI="https://github.com/iovisor/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
-	BDEPEND="app-arch/xz-utils "
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-
-COMMON_DEPEND="
-	dev-util/systemtap
-	sys-devel/clang:=
-	dev-libs/libbpf:=
-	>=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)]
-	sys-devel/clang:=
-	>=dev-util/bcc-0.13.0:=
-	virtual/libelf
-"
-DEPEND="${COMMON_DEPEND}
-	test? ( dev-cpp/gtest )
-"
-RDEPEND="${COMMON_DEPEND}"
-BDEPEND+="
-	>=dev-util/cmake-3.8
-	sys-devel/flex
-	sys-devel/bison
-"
-
-S="${WORKDIR}/${PN}-${MY_PV:-${PV}}"
-QA_DT_NEEDED="/usr/lib.*/libbpftraceresources.so"
-
-PATCHES=(
-	"${FILESDIR}/bpftrace-0.11.0-install-libs.patch"
-	"${FILESDIR}/bpftrace-0.10.0-dont-compress-man.patch"
-)
-
-# lots of fixing needed
-RESTRICT="test"
-
-pkg_pretend() {
-	local CONFIG_CHECK="
-		~BPF
-		~BPF_EVENTS
-		~BPF_JIT
-		~BPF_SYSCALL
-		~FTRACE_SYSCALLS
-		~HAVE_EBPF_JIT
-	"
-
-	check_extra_config
-}
-
-pkg_setup() {
-	LLVM_MAX_SLOT=11 llvm_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-}
-
-src_configure() {
-	local -a mycmakeargs
-	mycmakeargs=(
-		"-DSTATIC_LINKING:BOOL=OFF"
-		"-DBUILD_TESTING:BOOL=OFF"
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-util/bpftrace/bpftrace-0.11.0-r1.ebuild b/dev-util/bpftrace/bpftrace-0.11.3-r1.ebuild
index 6eeeb6c28d67..b941fc56d719 100644
--- a/dev-util/bpftrace/bpftrace-0.11.0-r1.ebuild
+++ b/dev-util/bpftrace/bpftrace-0.11.3-r1.ebuild
@@ -25,10 +25,10 @@ IUSE="test"
 
 COMMON_DEPEND="
 	dev-util/systemtap
-	sys-devel/clang:=
 	dev-libs/libbpf:=
 	>=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)]
-	sys-devel/clang:=
+	<=sys-devel/llvm-12:=[llvm_targets_BPF(+)]
+	<=sys-devel/clang-12:=
 	>=dev-util/bcc-0.13.0:=
 	virtual/libelf
 "
diff --git a/dev-util/bpftrace/bpftrace-9999.ebuild b/dev-util/bpftrace/bpftrace-9999.ebuild
index 6eeeb6c28d67..2a14dc584768 100644
--- a/dev-util/bpftrace/bpftrace-9999.ebuild
+++ b/dev-util/bpftrace/bpftrace-9999.ebuild
@@ -25,10 +25,10 @@ IUSE="test"
 
 COMMON_DEPEND="
 	dev-util/systemtap
-	sys-devel/clang:=
-	dev-libs/libbpf:=
+	<dev-libs/libbpf-0.2:=
 	>=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)]
-	sys-devel/clang:=
+	<=sys-devel/llvm-12:=[llvm_targets_BPF(+)]
+	<=sys-devel/clang-12:=
 	>=dev-util/bcc-0.13.0:=
 	virtual/libelf
 "
diff --git a/dev-util/bpftrace/files/bpftrace-0.10.0-install-libs.patch b/dev-util/bpftrace/files/bpftrace-0.10.0-install-libs.patch
deleted file mode 100644
index cf5ed9d76b96..000000000000
--- a/dev-util/bpftrace/files/bpftrace-0.10.0-install-libs.patch
+++ /dev/null
@@ -1,148 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e89a6a9..efa2ff3 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -90,9 +90,10 @@ find_package(FLEX REQUIRED)
- bison_target(bison_parser src/parser.yy ${CMAKE_BINARY_DIR}/parser.tab.cc VERBOSE)
- flex_target(flex_lexer src/lexer.l ${CMAKE_BINARY_DIR}/lex.yy.cc)
- add_flex_bison_dependency(flex_lexer bison_parser)
--add_library(parser ${BISON_bison_parser_OUTPUTS} ${FLEX_flex_lexer_OUTPUTS})
--target_compile_options(parser PRIVATE "-w")
--target_include_directories(parser PUBLIC src src/ast ${CMAKE_BINARY_DIR})
-+add_library(bpftraceparser ${BISON_bison_parser_OUTPUTS} ${FLEX_flex_lexer_OUTPUTS})
-+target_compile_options(bpftraceparser PRIVATE "-w")
-+target_include_directories(bpftraceparser PUBLIC src src/ast ${CMAKE_BINARY_DIR})
-+install(TARGETS bpftraceparser LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
- 
- include(CheckSymbolExists)
- set(CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE)
-diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt
-index a95c60a..f5c4d67 100644
---- a/resources/CMakeLists.txt
-+++ b/resources/CMakeLists.txt
-@@ -1,6 +1,7 @@
--add_library(resources headers.cpp)
-+add_library(bpftraceresources headers.cpp)
- 
--target_include_directories(resources PUBLIC ../src)
-+target_include_directories(bpftraceresources PUBLIC ../src)
-+install(TARGETS bpftraceresources LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
- 
- function(embed_headers output)
-   file(WRITE ${output} "#include \"headers.h\"\n\nnamespace bpftrace {\n")
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 4fa0418..4d0c2a9 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -75,7 +75,8 @@ if (ALLOW_UNSAFE_PROBE)
-   target_compile_definitions(bpftrace PRIVATE HAVE_UNSAFE_PROBE)
- endif(ALLOW_UNSAFE_PROBE)
- 
--target_link_libraries(bpftrace arch ast parser resources)
-+target_link_libraries(bpftrace bpftracearch bpftraceast bpftraceparser
-+  bpftraceresources)
- 
- target_link_libraries(bpftrace ${LIBBCC_LIBRARIES})
- if(STATIC_LINKING)
-diff --git a/src/arch/CMakeLists.txt b/src/arch/CMakeLists.txt
-index 7156276..32faeae 100644
---- a/src/arch/CMakeLists.txt
-+++ b/src/arch/CMakeLists.txt
-@@ -1,10 +1,12 @@
- if(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")
--    add_library(arch aarch64.cpp)
-+    add_library(bpftracearch aarch64.cpp)
- elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "ppc64" OR
-        CMAKE_SYSTEM_PROCESSOR STREQUAL "ppc64le")
--    add_library(arch ppc64.cpp)
-+    add_library(bpftracearch ppc64.cpp)
- elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
--    add_library(arch x86_64.cpp)
-+    add_library(bpftracearch x86_64.cpp)
- else()
-   message(FATAL_ERROR "Unsupported architecture: {CMAKE_SYSTEM_PROCESSOR}")
- endif()
-+
-+install(TARGETS bpftracearch LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
-diff --git a/src/ast/CMakeLists.txt b/src/ast/CMakeLists.txt
-index 0d58cd9..e33d585 100644
---- a/src/ast/CMakeLists.txt
-+++ b/src/ast/CMakeLists.txt
-@@ -1,4 +1,4 @@
--add_library(ast
-+add_library(bpftraceast
-   ast.cpp
-   attachpoint_parser.cpp
-   codegen_llvm.cpp
-@@ -8,16 +8,17 @@ add_library(ast
-   semantic_analyser.cpp
- )
- 
--target_include_directories(ast PUBLIC ${CMAKE_SOURCE_DIR}/src)
--target_include_directories(ast PUBLIC ${CMAKE_SOURCE_DIR}/src/ast)
--target_include_directories(ast PUBLIC ${CMAKE_BINARY_DIR})
--target_link_libraries(ast arch)
-+target_include_directories(bpftraceast PUBLIC ${CMAKE_SOURCE_DIR}/src)
-+target_include_directories(bpftraceast PUBLIC ${CMAKE_SOURCE_DIR}/src/ast)
-+target_include_directories(bpftraceast PUBLIC ${CMAKE_BINARY_DIR})
-+target_link_libraries(bpftraceast bpftracearch)
-+install(TARGETS bpftraceast LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
- 
- if (HAVE_KFUNC)
--  target_compile_definitions(ast PRIVATE HAVE_KFUNC)
-+  target_compile_definitions(bpftraceast PRIVATE HAVE_KFUNC)
- endif(HAVE_KFUNC)
- 
--add_dependencies(ast parser)
-+add_dependencies(bpftraceast bpftraceparser)
- 
- if (STATIC_LINKING)
-   set(clang_libs
-@@ -41,26 +42,26 @@ if (STATIC_LINKING)
-     if(EMBED_LIBCLANG_ONLY)
-       unlink_transitive_dependency("${CLANG_EXPORTED_TARGETS}" "LLVM")
-     endif()
--    target_link_libraries(ast ${CLANG_EMBEDDED_CMAKE_TARGETS})
-+    target_link_libraries(bpftraceast ${CLANG_EMBEDDED_CMAKE_TARGETS})
-   else()
-     list(INSERT clang_libs 0 libclang.a)
-   endif()
- 
-   if(EMBED_LLVM)
--    target_link_libraries(ast ${LLVM_EMBEDDED_CMAKE_TARGETS})
-+    target_link_libraries(bpftraceast ${LLVM_EMBEDDED_CMAKE_TARGETS})
-   else()
-     llvm_map_components_to_libnames(llvm_libs bpfcodegen ipo irreader mcjit orcjit ${LLVM_TARGETS_TO_BUILD})
--    target_link_libraries(ast ${clang_libs})
--    target_link_libraries(ast ${llvm_libs})
-+    target_link_libraries(bpftraceast ${clang_libs})
-+    target_link_libraries(bpftraceast ${llvm_libs})
-   endif()
- else()
-   find_library(found_LLVM LLVM HINTS ${LLVM_LIBRARY_DIRS})
-   if(found_LLVM)
--    target_link_libraries(ast LLVM)
-+    target_link_libraries(bpftraceast LLVM)
-   else()
-     llvm_map_components_to_libnames(_llvm_libs bpfcodegen ipo irreader mcjit orcjit ${LLVM_TARGETS_TO_BUILD})
-     llvm_expand_dependencies(llvm_libs ${_llvm_libs})
--    target_link_libraries(ast ${llvm_libs})
-+    target_link_libraries(bpftraceast ${llvm_libs})
-   endif()
--  target_link_libraries(ast libclang)
-+  target_link_libraries(bpftraceast libclang)
- endif()
-diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
-index 56bcb4a..3f874f8 100644
---- a/tests/CMakeLists.txt
-+++ b/tests/CMakeLists.txt
-@@ -93,7 +93,8 @@ if(HAVE_BFD_DISASM)
-   endif(STATIC_LINKING)
- endif(HAVE_BFD_DISASM)
- 
--target_link_libraries(bpftrace_test arch ast parser resources)
-+target_link_libraries(bpftrace_test bpftracearch bpftraceast bpftraceparser
-+  bpftraceresources)
- 
- target_link_libraries(bpftrace_test ${LIBBCC_LIBRARIES})
- if (STATIC_LINKING)
diff --git a/dev-util/bpftrace/files/bpftrace-0.10.0-llvm-multi.patch b/dev-util/bpftrace/files/bpftrace-0.10.0-llvm-multi.patch
deleted file mode 100644
index 48eeeb8e2001..000000000000
--- a/dev-util/bpftrace/files/bpftrace-0.10.0-llvm-multi.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -ru a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt	2020-05-20 21:00:22.789744736 -0500
-+++ b/CMakeLists.txt	2020-05-20 18:52:38.241091110 -0500
-@@ -30,6 +30,11 @@
-   elseif(STATIC_LIBC)
-     message(WARNING "static libc is known to cause problems, consider STATIC_LIBC=OFF. Proceed at your own risk") #iovisor/bpftrace/issues/266
-   endif()
-+else()
-+  find_package(LLVM 9 REQUIRED CONFIG)
-+
-+  message(STATUS "Found LLVM ${LLVM_PACKAGE_VERSION}")
-+  message(STATUS "Using LLVMConfig.cmake in: ${LLVM_DIR}")
- endif()
-
- if(EMBED_LIBCLANG_ONLY AND NOT EMBED_CLANG)
-diff -ru a/src/ast/CMakeLists.txt b/src/ast/CMakeLists.txt
---- a/src/ast/CMakeLists.txt	2020-05-20 21:00:22.777744534 -0500
-+++ b/src/ast/CMakeLists.txt	2020-05-20 20:52:39.657888690 -0500
-@@ -42,26 +41,29 @@
-     if(EMBED_LIBCLANG_ONLY)
-       unlink_transitive_dependency("${CLANG_EXPORTED_TARGETS}" "LLVM")
-     endif()
--    target_link_libraries(bpftraceast ${CLANG_EMBEDDED_CMAKE_TARGETS})
-+    target_link_libraries(bpftraceast ${CLANG_EMBEDDED_CMAKE_TARGETS})
-   else()
-     list(INSERT clang_libs 0 libclang.a)
-   endif()
-
-   if(EMBED_LLVM)
--    target_link_libraries(bpftraceast ${LLVM_EMBEDDED_CMAKE_TARGETS})
-+    target_link_libraries(bpftraceast ${LLVM_EMBEDDED_CMAKE_TARGETS})
-   else()
-     llvm_map_components_to_libnames(llvm_libs bpfcodegen ipo irreader mcjit orcjit ${LLVM_TARGETS_TO_BUILD})
--    target_link_libraries(bpftraceast ${clang_libs})
--    target_link_libraries(bpftraceast ${llvm_libs})
-+    target_link_libraries(bpftraceast ${clang_libs})
-+    target_link_libraries(bpftraceast ${llvm_libs})
-   endif()
- else()
--  find_library(found_LLVM LLVM HINTS ${LLVM_LIBRARY_DIRS})
--  if(found_LLVM)
--    target_link_libraries(bpftraceast LLVM)
--  else()
--    llvm_map_components_to_libnames(_llvm_libs bpfcodegen ipo irreader mcjit orcjit ${LLVM_TARGETS_TO_BUILD})
--    llvm_expand_dependencies(llvm_libs ${_llvm_libs})
--    target_link_libraries(bpftraceast ${llvm_libs})
-+  find_package(LLVM 9 REQUIRED CONFIG)
-+
-+  include_directories(${LLVM_INCLUDE_DIRS})
-+  add_definitions(${LLVM_DEFINITIONS})
-+
-+  find_library(found_clang clang HINTS ${LLVM_LIBRARY_DIRS})
-+  if(found_clang)
-+    target_link_libraries(bpftraceast ${found_clang})
-   endif()
--  target_link_libraries(bpftraceast libclang)
-+  llvm_map_components_to_libnames(_llvm_libs bpfcodegen ipo irreader mcjit orcjit ${LLVM_TARGETS_TO_BUILD})
-+  llvm_expand_dependencies(llvm_libs ${_llvm_libs})
-+  target_link_libraries(bpftraceast ${llvm_libs})
- endif()
diff --git a/dev-util/bpftrace/files/bpftrace-0.10.0-no-bpf_detach_kfunc.patch b/dev-util/bpftrace/files/bpftrace-0.10.0-no-bpf_detach_kfunc.patch
deleted file mode 100644
index 145fb1c0ca91..000000000000
--- a/dev-util/bpftrace/files/bpftrace-0.10.0-no-bpf_detach_kfunc.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/attached_probe.cpp b/src/attached_probe.cpp
-index c7e789e..08f657e 100644
---- a/src/attached_probe.cpp
-+++ b/src/attached_probe.cpp
-@@ -116,7 +116,7 @@ void AttachedProbe::attach_kfunc(void)
- int AttachedProbe::detach_kfunc(void)
- {
-   close(tracing_fd_);
--  return bpf_detach_kfunc(progfd_, NULL);
-+  return 0;
- }
- #else
- void AttachedProbe::attach_kfunc(void)
diff --git a/dev-util/buildbot-badges/Manifest b/dev-util/buildbot-badges/Manifest
index 7f42e7495854..4c6942e893fb 100644
--- a/dev-util/buildbot-badges/Manifest
+++ b/dev-util/buildbot-badges/Manifest
@@ -1,3 +1,5 @@
 DIST buildbot-badges-2.8.2.tar.gz 3982 BLAKE2B d2320979c3c8530089ddad3c9c57e9f77576da8979b5834ab7f4e6766c5d210c822e7ab582103e897591db0efc63139dc7cb9f9d834bf81ae199dd25929c6b49 SHA512 e2f6ca0178428db90812633c9af47e8f5c40220f506e62745a150a5572a95f99d3a4115621c29b8188b4b5d48aa3b0bac1862b6c5793cd87a4971798a5aae28a
+DIST buildbot-badges-2.8.4.tar.gz 3983 BLAKE2B 24d77c179a2f3287f80b46b66abcc42897016f1094a0b5cfa36dc691be1e7d3c3c709f2c7f13c789bfcecb50d59788e5c8d660f45414855831f31892d34b63af SHA512 bfd11c0dedcf4586e73eff3cc158953d2d3eb8f75c7d900354381e962b5215ca52d2e14c5f20d558c3ae6068a680a4af17967ee7dd7d677a2ba8af2d9cf4e725
 EBUILD buildbot-badges-2.8.2.ebuild 934 BLAKE2B d0dcd4eeb7fae46b19a851c03585212352793045f54fa289a48fb085318dcfdfaa75984e8d04e32b1b783b7823f1010db7d00a5af35231ac1b098ecda2dd9e23 SHA512 c4302329a9cbbb3d2be9a353bf8c477ae3b39d7a575bf1fe6d955751e20ddb4e5d1ed82de394c552ddb6015a7066b33db0747bcd4dbcae54a9963994e5f93467
+EBUILD buildbot-badges-2.8.4.ebuild 934 BLAKE2B d0dcd4eeb7fae46b19a851c03585212352793045f54fa289a48fb085318dcfdfaa75984e8d04e32b1b783b7823f1010db7d00a5af35231ac1b098ecda2dd9e23 SHA512 c4302329a9cbbb3d2be9a353bf8c477ae3b39d7a575bf1fe6d955751e20ddb4e5d1ed82de394c552ddb6015a7066b33db0747bcd4dbcae54a9963994e5f93467
 MISC metadata.xml 761 BLAKE2B 5e3b300c2266a8f89672880260926a73744b83141b265f5a6e5ab11f9e2256165762d4371255d58a97c704479f281e160cb42e74269f35d4d623b2937fe8ff05 SHA512 72b794413f121ae9246da5fdf07b730c72949d84cac8fb881dabe31ef283d283afd83b62bcd71de7a6f92f247d07fb5d134f9945273032e2f21469bf9a030f73
diff --git a/dev-util/buildbot-badges/buildbot-badges-2.8.4.ebuild b/dev-util/buildbot-badges/buildbot-badges-2.8.4.ebuild
new file mode 100644
index 000000000000..c59f1ad4227a
--- /dev/null
+++ b/dev-util/buildbot-badges/buildbot-badges-2.8.4.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+DISTUTILS_USE_SETUPTOOLS="rdepend"
+
+inherit distutils-r1
+
+DESCRIPTION="Buildbot badges plugin produces an image in SVG or PNG format..."
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-grid-view/"
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64"
+
+IUSE=""
+
+RDEPEND=""
+
+DEPEND="${RDEPEND}
+	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
+	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
+	~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]
+	dev-python/cairocffi[${PYTHON_USEDEP}]
+	media-gfx/cairosvg[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
+	dev-python/klein[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-util/buildbot-console-view/Manifest b/dev-util/buildbot-console-view/Manifest
index 5da730e89d96..6c5c76b3707c 100644
--- a/dev-util/buildbot-console-view/Manifest
+++ b/dev-util/buildbot-console-view/Manifest
@@ -1,3 +1,5 @@
 DIST buildbot-console-view-2.8.2.tar.gz 17575 BLAKE2B e036429dd40fdfdadd65a10d4f6fc025b00d9a61153aecd4f31e0c6c133ba1e546b1c810254ec1fb83913cd4434db223c3cd782481ef5785ec48162a2f111682 SHA512 dbec358933865aa79ad86754ef454d89fa369fc64f3df54eb079c0f1ebadb027131d4bd7ac14dd29a16d34aa416e21f90cbecc873944a7ab8ef7da637e20c999
+DIST buildbot-console-view-2.8.4.tar.gz 18531 BLAKE2B 8d997e34eefea4be6bbbb33902b992a4864b601ef689cedbd7051667e5cab1ee45b13e2d5ad888af4a805ab1a60f0bc79439580583b3c3e233d321b52b28e0d9 SHA512 ccaa8b9ab18bd6e6609ab017ce4f2d447f99310b3448584decb8a572c573426bf84e6b86837f68b715863c66de013a8cad546e35dbbfb051c1c8d32a3825fe7f
 EBUILD buildbot-console-view-2.8.2.ebuild 756 BLAKE2B 4efd6cf5e862092bc00e10f8951ba7cd54c9c5619908cb164f20e8b70f8eed9f4dff0a95d1368fc3c8fe7b383bafd1ea5454608939d7d31c1ad6503091795706 SHA512 bc65b167fc41c9869292a7665f14ce5045eb79d7c48115fde3fbce653c45e8e23ed6afe85eabb96e0ae5c7bef4c4729f02c7610001645c31fcbf7dab34520884
+EBUILD buildbot-console-view-2.8.4.ebuild 756 BLAKE2B 4efd6cf5e862092bc00e10f8951ba7cd54c9c5619908cb164f20e8b70f8eed9f4dff0a95d1368fc3c8fe7b383bafd1ea5454608939d7d31c1ad6503091795706 SHA512 bc65b167fc41c9869292a7665f14ce5045eb79d7c48115fde3fbce653c45e8e23ed6afe85eabb96e0ae5c7bef4c4729f02c7610001645c31fcbf7dab34520884
 MISC metadata.xml 660 BLAKE2B dd64f91ba93d64ffa1d1aec035eddab0863d2332664ae9292d54ddb394c3d406ca4f5c55cc4da7e0163563623d27602dbc51656e100e587797653b4fdd01f5b2 SHA512 975022375960d255342c24364513b4352e6eb6ec34ef8f16f8a7c08a978969202660516957eea8f61e4afe13622dec826ad8a5f69673d0cabffb9f52e91e0992
diff --git a/dev-util/buildbot-console-view/buildbot-console-view-2.8.4.ebuild b/dev-util/buildbot-console-view/buildbot-console-view-2.8.4.ebuild
new file mode 100644
index 000000000000..461db8d8fd20
--- /dev/null
+++ b/dev-util/buildbot-console-view/buildbot-console-view-2.8.4.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+DISTUTILS_USE_SETUPTOOLS="rdepend"
+
+inherit distutils-r1
+
+DESCRIPTION="Buildbot console-view plugin"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-console-view/"
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64"
+
+IUSE=""
+
+RDEPEND="
+	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
+	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
+"
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+python_install_all() {
+	distutils-r1_python_install_all
+}
diff --git a/dev-util/buildbot-grid-view/Manifest b/dev-util/buildbot-grid-view/Manifest
index bc281d9867aa..87d7308654ba 100644
--- a/dev-util/buildbot-grid-view/Manifest
+++ b/dev-util/buildbot-grid-view/Manifest
@@ -1,3 +1,5 @@
 DIST buildbot-grid-view-2.8.2.tar.gz 13373 BLAKE2B 0a7a73011655e9a57574575943a3560c395ca4358c0f2169def8413a60f8381644512a227b54f016b23e6dcd18641d1ea7a3295f6c0a983c6f3caa9ab1dda60d SHA512 9b136d96f5a38f0d28f6c37db6269e039eca0cff5bbc7d75d43346566ba2e9f7924e453098f4777792429a7a9bbbb5e02c34a9b81e131d40dc3e339f4dd377f1
+DIST buildbot-grid-view-2.8.4.tar.gz 13510 BLAKE2B 97816ae90c06cbc3ac63920da4dd2e1152750181a5c23c59d3f227f46131228140e676328aa80741626ff071679dd8c9385f3895ce92d27ce6d0264afe299872 SHA512 dfeb454f9d9162e30e0ea8555a0978ecfad2266e1a9412e0633924ad44ae404144ae4a51b58fdca31fa54b67fe53bab57cac1f54926fee346decf90623f91f89
 EBUILD buildbot-grid-view-2.8.2.ebuild 757 BLAKE2B 19309fc37c0f499a196327984a3154e26e289d94dfa3ef194eb8e8901a895411f85a069850995209fed20b55971d5fef2001b409d7e6f58ee58cc3b507ec81ce SHA512 6c34f80ba22ab5c3d33d3b99a9fe4292ae0313a8ebb99bf660c73a228de78c3dde3288c68005f52f5b497c69c04c27f160db8c6550b49609dd9a6b2a8b9d0da9
+EBUILD buildbot-grid-view-2.8.4.ebuild 757 BLAKE2B 19309fc37c0f499a196327984a3154e26e289d94dfa3ef194eb8e8901a895411f85a069850995209fed20b55971d5fef2001b409d7e6f58ee58cc3b507ec81ce SHA512 6c34f80ba22ab5c3d33d3b99a9fe4292ae0313a8ebb99bf660c73a228de78c3dde3288c68005f52f5b497c69c04c27f160db8c6550b49609dd9a6b2a8b9d0da9
 MISC metadata.xml 639 BLAKE2B 563a20f38d4d1476b8833f8e858110adfcf70f9abbe589e5538eac0289ce0d232d5359a111d710b371030342571bab3298e3a2425bc360cecc11d0c976653835 SHA512 5f1f6e27005ff78eb008f4e9a74cac6fb58dc0b73155fa52325b2771f8723691755e5123382a33beb427a4a33c1832f796b56fc94eaafc7eb91c7042546e964d
diff --git a/dev-util/buildbot-grid-view/buildbot-grid-view-2.8.4.ebuild b/dev-util/buildbot-grid-view/buildbot-grid-view-2.8.4.ebuild
new file mode 100644
index 000000000000..d598731012b9
--- /dev/null
+++ b/dev-util/buildbot-grid-view/buildbot-grid-view-2.8.4.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+DISTUTILS_USE_SETUPTOOLS="rdepend"
+
+inherit distutils-r1
+
+DESCRIPTION="BuildBot grid view web interface"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-grid-view/"
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64"
+
+IUSE=""
+
+RDEPEND=""
+
+DEPEND="${RDEPEND}
+	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
+	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}/${MY_P}"
+
+python_install_all() {
+	distutils-r1_python_install_all
+}
diff --git a/dev-util/buildbot-pkg/Manifest b/dev-util/buildbot-pkg/Manifest
index 821b254c9730..574118f3591f 100644
--- a/dev-util/buildbot-pkg/Manifest
+++ b/dev-util/buildbot-pkg/Manifest
@@ -1,3 +1,5 @@
 DIST buildbot-pkg-2.8.2.tar.gz 4736 BLAKE2B afbd5213b51240845f8becfcc727dc3280aa1510dd62305a5e029099da4f8e7cbbf749365baba568a2205354205e97dbdbff78a1740e464164e0c2bbc3148194 SHA512 611b5600df181adfbbe203947c36ad64a99c10c6c63c0f4e65ffd2ae4551f2d879559007b59302434cd1a2ae915a2a7125afb90f6c896110ebf514212434a2a7
+DIST buildbot-pkg-2.8.4.tar.gz 4772 BLAKE2B 08e1bdf7db8a4b1f007b12475937638575afa3e16511c28f24dab59fda88d83b03420b84d4e674aaf8e2e7962e80291f759fc7083424d3d96df2643946e8d2d5 SHA512 c5ca0c36315807bb458e16f4bdc015659b32e0c6047a067d5717251e6054249aa8a162873aa196b4fb6367c68a9a99ec3a698e861a5c70de1f81e90601b3467f
 EBUILD buildbot-pkg-2.8.2.ebuild 697 BLAKE2B 180e58c11212eb4959cf774e6b573374d8ef435d10b08e3968479a0d78deac119ed09603fc3f3cc7d097792ba8c4504841d8efc8d54d83df6490c4cf45d1d193 SHA512 ba6850ef6aa66485dc2c1f32b599f17662c93e84e7213ee929946a2d0db4bced437bcf7333860da0089969234743367158c4628ae72e88ad04f0d0e383d6efa7
+EBUILD buildbot-pkg-2.8.4.ebuild 697 BLAKE2B 180e58c11212eb4959cf774e6b573374d8ef435d10b08e3968479a0d78deac119ed09603fc3f3cc7d097792ba8c4504841d8efc8d54d83df6490c4cf45d1d193 SHA512 ba6850ef6aa66485dc2c1f32b599f17662c93e84e7213ee929946a2d0db4bced437bcf7333860da0089969234743367158c4628ae72e88ad04f0d0e383d6efa7
 MISC metadata.xml 1198 BLAKE2B 3b336db0b25b79b1baa060ec52c8451732cb3d7a099c3cf148bc5db4c68276dd72e684b2aa82c50e4eb7aa0fc6b0d88a7e0e2d8a4ab15e423904b19f0102a664 SHA512 c85c49f440cb6fbbc0ddf0d522949d9132e71abac4ace66c93893fb29ccd70b240482f8a33176849889521e082913ed71225e8a4fe663d2602c8d5da3db3b95f
diff --git a/dev-util/buildbot-pkg/buildbot-pkg-2.8.4.ebuild b/dev-util/buildbot-pkg/buildbot-pkg-2.8.4.ebuild
new file mode 100644
index 000000000000..24f94f8cc0d5
--- /dev/null
+++ b/dev-util/buildbot-pkg/buildbot-pkg-2.8.4.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+DISTUTILS_USE_SETUPTOOLS="rdepend"
+
+inherit distutils-r1
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="BuildBot common www build tools for packaging releases"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-pkg/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64"
+
+# No real integration tests for this pkg.
+# all tests are related to making releases and final checks for distribution
+
+S=${WORKDIR}/${MY_P}
diff --git a/dev-util/buildbot-waterfall-view/Manifest b/dev-util/buildbot-waterfall-view/Manifest
index 98b63aef0fce..2693581b5eeb 100644
--- a/dev-util/buildbot-waterfall-view/Manifest
+++ b/dev-util/buildbot-waterfall-view/Manifest
@@ -1,3 +1,5 @@
 DIST buildbot-waterfall-view-2.8.2.tar.gz 190551 BLAKE2B 9db81d1cf17357a57c34eb8f3b1e4412635c4804708d3d99646a68293af52594952884f96f7d528c6a87302c3563a8d4f4411ed410da2fe1043b4439d4113d73 SHA512 e252874745a623c1ec8fefcfb10c742a783ec677f172d20ef8165687ec5981f4df09092096f7922381e886f4ea7ba4c795997ad8ff8fd58fd6aa40d8bc057b00
+DIST buildbot-waterfall-view-2.8.4.tar.gz 191026 BLAKE2B f81dea767bf881182eeb6eb750cdcf4bc289ac92097b9b8e13a5b5a237873aa4ea16f48625e56de2dc69fe849e5602d96a3d7991cdeb427dae169de5740f0bcb SHA512 c15b7bd23193742b50deaceb1810f8dbeedb77768f0d8a3d0a7bf72c89d914b963aa2141475464f9f3701881da6abed49e730ccb39d824a755ad9c567590dd7f
 EBUILD buildbot-waterfall-view-2.8.2.ebuild 737 BLAKE2B 2605c7faef8d318b3102ce2db0d28697146778a1015cdd6ec2f733e454b60c4d4af6b57d91efc3250344e62a459b77fcbb24f3e700e4b49c3fc914ed91aed7c3 SHA512 86800c7957c85078d5437df0b2d14bd46a02a1c89f5e6a7b1051bf0cc4a1b30ddcb575a818b6d95b3b6c97fe37c9f7e1d401e85be48ee6820cb45266ef5a7ab1
+EBUILD buildbot-waterfall-view-2.8.4.ebuild 737 BLAKE2B 2605c7faef8d318b3102ce2db0d28697146778a1015cdd6ec2f733e454b60c4d4af6b57d91efc3250344e62a459b77fcbb24f3e700e4b49c3fc914ed91aed7c3 SHA512 86800c7957c85078d5437df0b2d14bd46a02a1c89f5e6a7b1051bf0cc4a1b30ddcb575a818b6d95b3b6c97fe37c9f7e1d401e85be48ee6820cb45266ef5a7ab1
 MISC metadata.xml 680 BLAKE2B 47bfc9bb17933438a0c3ec478c1dad7da7f398cde2133ab96c472d0665e563f4d5c8d09ba04bcdccf820603cf3dcc18086b1e217aa86f7ae4d8067178922020b SHA512 266fd7fb76a1373c9342b438487d73a319209f320097981041bae9cf3892dc9d091fd253532457328a3f6f52ec37b0a0e6cd1119c6800de42bf19d7fc6054133
diff --git a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-2.8.4.ebuild b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-2.8.4.ebuild
new file mode 100644
index 000000000000..8e4b9cc0d871
--- /dev/null
+++ b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-2.8.4.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+DISTUTILS_USE_SETUPTOOLS="rdepend"
+
+inherit distutils-r1
+
+DESCRIPTION="Buildbot waterfall-view plugin"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-waterfall-view/"
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+	KEYWORDS="~amd64"
+
+IUSE=""
+
+RDEPEND="
+	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
+"
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-util/buildbot-worker/Manifest b/dev-util/buildbot-worker/Manifest
index 1ca9c4bdec2c..5bbd15c162f7 100644
--- a/dev-util/buildbot-worker/Manifest
+++ b/dev-util/buildbot-worker/Manifest
@@ -2,6 +2,8 @@ AUX buildbot.tac.sample 1799 BLAKE2B 25fa4b85b0ad16d51780613b20f89c56e0131d73eb7
 AUX buildbot_worker.confd2 366 BLAKE2B bfd08d2c6ee89c9e9d09e3280ded65765789b701cd4aa31d953b8f87d24ec1d85260b22d978d152191c918c72569e77bdac91de07d3eae4dad9ac529b4c140d4 SHA512 2bcb93b739827566bce295bc508481c50b57c1202d858359733649d4f35f116d994e0285a53a84d1b89d371a6fd23c0a89f4e555c31555bf14783eb5f57f15b0
 AUX buildbot_worker.initd2 1640 BLAKE2B 17a40547260004b40d77219aefa70f08846741e328a2a20bb0b075d5fa0007cc6ad63ecf600eee49251de14c4abb41f70ca813a9429dbce251509121157da9b9 SHA512 8eae575cb001b4750cd2033f9cb82d3985ad9bc2a4bc20ff0e4aaa0cbd05bacf8d6d885ec08112da15e0ccf8fd895006eed39b0b9a4bcaee86911b5180fab0f2
 DIST buildbot-worker-2.8.2.tar.gz 101707 BLAKE2B 451dff979c6934bf6dd4e1579abbe18e9cf43551c906bd516c788a6a5f6170650a5468927bec0a8d4ab242e5886247406b2e098e1908a8d9b5777744982c7be6 SHA512 0628825ac023a66cd249dc6b42ff2f3ad3b5c0cb97561fd332ce4775abaa5368a8b7b636115259ab4aa842c811178c9b641ef4453b06167315eb81117ffef815
+DIST buildbot-worker-2.8.4.tar.gz 101175 BLAKE2B 23077305d26ab282eaa4c633ebee7ca7c502285862604ecafe25d6b666ce802729c5478d676e6834bf9a2e27ccf48e1ad0e69449e55532aa81b0dcd3c6780011 SHA512 16ad9a0e5e9c875f90383fc90c359ee843e0b82a7878f87f2ac9e7091d8d907707c69210876f25b4fdf7148bcaafab10d10a8a0a8865c73808db707320757107
 EBUILD buildbot-worker-2.8.2.ebuild 4614 BLAKE2B c42112272244fb8a1da208eaa6e3583d98b4465bfa39c2240012eeb4243fd6a5edf59321a54bc72f0918d353a43c0d89062fdeb523b7a5bc9078c6ef86475d80 SHA512 b655a8a68739e287f2f2e4a19ad22f3567801982342d491d0c75e949d0d7671869b0b624d8cf2c1d2f4003eb3a97938d893654c780939de6256f7706556b5bee
+EBUILD buildbot-worker-2.8.4.ebuild 4614 BLAKE2B c42112272244fb8a1da208eaa6e3583d98b4465bfa39c2240012eeb4243fd6a5edf59321a54bc72f0918d353a43c0d89062fdeb523b7a5bc9078c6ef86475d80 SHA512 b655a8a68739e287f2f2e4a19ad22f3567801982342d491d0c75e949d0d7671869b0b624d8cf2c1d2f4003eb3a97938d893654c780939de6256f7706556b5bee
 EBUILD buildbot-worker-9999.ebuild 4619 BLAKE2B a88900d63e3fb4e3b51e31b4736cacd7bc8f60a3aa7f27f6bd6200e9fa788147ad4073d5aea22ec55cc1a54148f87dda3de5f0953cac31f3152fba10d8399012 SHA512 79bdf14db42b15492932d100ee01c3bf043f7ad01dc72d35d68152d95601359aaee73b8661ada31d490218f5081465b7dac5c649aa2a704373e9bbe18426fa3f
 MISC metadata.xml 480 BLAKE2B 5ee99e9a87b5449742a0066a5c720137406a952a63f81574bb7d5cc94f235ee54c1fae5bd13e320e7b017d5005cc45a009360351c987609fe208089ed464cacb SHA512 95b7d71c74d693b93e2d0ff8943d97ffb2d9ea9fb2090bdb5fd8948444237ad20c571b97aa16f0ea5d20cf76e4d8e0392df276a0d1ba39b5263a72c57da3dea0
diff --git a/dev-util/buildbot-worker/buildbot-worker-2.8.4.ebuild b/dev-util/buildbot-worker/buildbot-worker-2.8.4.ebuild
new file mode 100644
index 000000000000..3bd934a50342
--- /dev/null
+++ b/dev-util/buildbot-worker/buildbot-worker-2.8.4.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+DISTUTILS_USE_SETUPTOOLS="rdepend"
+
+inherit readme.gentoo-r1 distutils-r1
+
+DESCRIPTION="BuildBot Worker (slave) Daemon"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-worker/"
+
+MY_V="${PV/_p/.post}"
+MY_P="${PN}-${MY_V}"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	acct-user/buildbot
+	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
+	dev-python/future[${PYTHON_USEDEP}]
+	!<dev-util/buildbot-1.0.0
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/setuptools_trial[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	DOC_CONTENTS="The \"buildbot\" user and the \"buildbot_worker\" init script has been added
+		to support starting buildbot_worker through Gentoo's init system. To use this,
+		execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance.
+		Set up your build worker following the documentation, make sure the
+		resulting directories are owned by the \"buildbot\" user and point
+		\"${ROOT}/etc/conf.d/buildbot_worker.myinstance\" at the right location.
+		The scripts can	run as a different user if desired."
+}
+
+distutils_enable_tests setup.py
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	doman docs/buildbot-worker.1
+
+	newconfd "${FILESDIR}/buildbot_worker.confd2" buildbot_worker
+	newinitd "${FILESDIR}/buildbot_worker.initd2" buildbot_worker
+
+	dodir /var/lib/buildbot_worker
+	cp "${FILESDIR}/buildbot.tac.sample" "${D}/var/lib/buildbot_worker"|| die "Install failed!"
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		ewarn
+		ewarn "More than one instance of a buildbot_worker can be run simultaneously."
+		ewarn " Note that \"BASEDIR\" in the buildbot_worker configuration file"
+		ewarn "is now the common base directory for all instances. If you are migrating from an older"
+		ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory."
+		ewarn "The name of the subdirectory corresponds to the name of the buildbot_worker instance."
+		ewarn "In order to start the service running OpenRC-based systems need to link to the init file:"
+		ewarn "    ln --symbolic --relative /etc/init.d/buildbot_worker /etc/init.d/buildbot_worker.myinstance"
+		ewarn "    rc-update add buildbot_worker.myinstance default"
+		ewarn "    /etc/init.d/buildbot_worker.myinstance start"
+		ewarn "Systems using systemd can do the following:"
+		ewarn "    systemctl enable buildbot_worker@myinstance.service"
+		ewarn "    systemctl enable buildbot_worker.target"
+		ewarn "    systemctl start buildbot_worker.target"
+	fi
+}
+
+pkg_config() {
+	local buildworker_path="/var/lib/buildbot_worker"
+	local log_path="/var/log/buildbot_worker"
+
+	einfo "This will prepare a new buildbot_worker instance in ${buildworker_path}."
+	einfo "Press Control-C to abort."
+
+	einfo "Enter the name for the new instance: "
+	read instance_name
+	[[ -z "${instance_name}" ]] && die "Invalid instance name"
+
+	local instance_path="${buildworker_path}/${instance_name}"
+	local instance_log_path="${log_path}/${instance_name}"
+
+	if [[ -e "${instance_path}" ]]; then
+		eerror "The instance with the specified name already exists:"
+		eerror "${instance_path}"
+		die "Instance already exists"
+	fi
+
+	if [[ ! -d "${instance_path}" ]]; then
+		mkdir --parents "${instance_path}" || die "Unable to create directory ${buildworker_path}"
+	fi
+	chown --recursive buildbot:buildbot "${instance_path}" || die "Setting permissions for instance failed"
+	cp "${buildworker_path}/buildbot.tac.sample" "${instance_path}/buildbot.tac" \
+		|| die "Moving sample configuration failed"
+	ln --symbolic --relative "/etc/init.d/buildbot_worker" "/etc/init.d/buildbot_worker.${instance_name}" \
+		|| die "Unable to create link to init file"
+
+	if [[ ! -d "${instance_log_path}" ]]; then
+		mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}"
+		chown --recursive buildbot:buildbot "${instance_log_path}" \
+			|| die "Setting permissions for instance failed"
+	fi
+	ln --symbolic --relative "${instance_log_path}/twistd.log" "${instance_path}/twistd.log" \
+		|| die "Unable to create link to log file"
+
+	einfo "Successfully created a buildbot_worker instance at ${instance_path}."
+	einfo "To change the default settings edit the buildbot.tac file in this directory."
+}
diff --git a/dev-util/buildbot-wsgi-dashboards/Manifest b/dev-util/buildbot-wsgi-dashboards/Manifest
index 5c2abd7f7201..fa8f5037b364 100644
--- a/dev-util/buildbot-wsgi-dashboards/Manifest
+++ b/dev-util/buildbot-wsgi-dashboards/Manifest
@@ -1,3 +1,5 @@
 DIST buildbot-wsgi-dashboards-2.8.2.tar.gz 5566 BLAKE2B 487b816862366acae9e55c39cb440a21c8e5c438299c43e2d6fad049ff946ece5ab647390955fbbad403ad1d7c0a2707a7612129442dc398cc7210d831aa49ef SHA512 2b75a61331aa457b3f168e1955b8905f95d11008ab6bee611ac92488f988cb0cf73fbf92321e594ac0a6e5ae03b82dfa05daab5a0647ae636a96922c0f4e8eff
+DIST buildbot-wsgi-dashboards-2.8.4.tar.gz 5588 BLAKE2B 3298edaebe2f9eb5e31f8298598e892d64d653648843e3c107710d4df3a24977bd3e77db06f7edecdf8d85bbbdeedfc66a75c6f3eef93ec8374d0df1973790dc SHA512 656f0626c8cad2c21d64ebc3eb4d6e1ac24a10909afc28819e54046be8e843a7383f3648a00a908cfddd9543767e1c3293825170d7c6c64c40a61bdcd55245bd
 EBUILD buildbot-wsgi-dashboards-2.8.2.ebuild 783 BLAKE2B e86d4cd37741844a6a73194d8dbf87940cc4002db9d29f1d533d9be8f085e051d625369ae2ca4139c70e23e7feceff253c34a3cb659b18138546ac9fba5d6f59 SHA512 2341b355fb3868fc0f488c9a8b378e67b0e9ffcfa973628f235686467623f50c57d1e554f3781ea476a77dcf580bc3399e53d110cd39bd9a364ed83fc1c39884
+EBUILD buildbot-wsgi-dashboards-2.8.4.ebuild 783 BLAKE2B e86d4cd37741844a6a73194d8dbf87940cc4002db9d29f1d533d9be8f085e051d625369ae2ca4139c70e23e7feceff253c34a3cb659b18138546ac9fba5d6f59 SHA512 2341b355fb3868fc0f488c9a8b378e67b0e9ffcfa973628f235686467623f50c57d1e554f3781ea476a77dcf580bc3399e53d110cd39bd9a364ed83fc1c39884
 MISC metadata.xml 679 BLAKE2B 9ce30ea17fc3c2fa7f7c4fba8ad2f521bdf828662683893a8b6e8fc43f4c1ce8fcd8afdb1bc237153751eeb5d134df683b1abe9f0bf7a70f1b6c98517640d3b9 SHA512 47cebf0aa635cee9157445057c21b2d1272b222291874371791656823f75b20f59772ebae2eb1dd8230752808878f284879127650f7130e2b9820ce60fc6d92b
diff --git a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-2.8.4.ebuild b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-2.8.4.ebuild
new file mode 100644
index 000000000000..f124a0ef5c54
--- /dev/null
+++ b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-2.8.4.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+DISTUTILS_USE_SETUPTOOLS="rdepend"
+
+inherit distutils-r1
+
+DESCRIPTION="Buildbot plugin to integrate flask or bottle dashboards to buildbot UI"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-wsgi-dashboards/"
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64"
+
+RDEPEND=""
+
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
+	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
+	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-util/buildbot-www/Manifest b/dev-util/buildbot-www/Manifest
index 0f2708e7f07f..eee71866de69 100644
--- a/dev-util/buildbot-www/Manifest
+++ b/dev-util/buildbot-www/Manifest
@@ -1,3 +1,5 @@
 DIST buildbot-www-2.8.2.tar.gz 3172352 BLAKE2B 8ead9e9eb046bf773bd70d312ae612dced839b263b02d300f600d066fcf21ef98a7884fef36c494bdc8eb26129d5bf7897c319256f0fe6ef8e1515dc8507a26e SHA512 22d0ccb3e5b3badeb5a59db18dd7b0b925fe84936c1be1773437e899122df95bc9b0a4205a0c87182cf6be4ca4275ab20cb86a4da6098c9d9c73927cb9b3c784
+DIST buildbot-www-2.8.4.tar.gz 3170166 BLAKE2B d3d5c8a6b4b963cffaa75035e2f4a076af27c9f816a8e80b346bdeade55f01c7c8403612b8e6d12036261dabe6ab4f05ddb7ffce4e7369565d361fe7b062f691 SHA512 8b698b8b99b3f9b51df0ce230c3d6e5dea8d1c1278cb7372edd170844ec46f7fe213be20db628da244cd38daaa53b1e2fcbffd3ab3980eee35ccc6a9824c7ae5
 EBUILD buildbot-www-2.8.2.ebuild 684 BLAKE2B 039407715092e067fdbce4aa6ec39c384e359947513c1013b2ad85bc50150d2cbbc56936fe1296f15a3187a1df48349c821adbe77ca61d233dfd64b281f363b0 SHA512 22bd07189fb594572729155b7cb57e4d3cd95a81d7b29526835f2434dd7845491c2b9e68c403d0a53b597b31152492ace54a5e71330f3104772a44a2db440fa0
+EBUILD buildbot-www-2.8.4.ebuild 684 BLAKE2B 039407715092e067fdbce4aa6ec39c384e359947513c1013b2ad85bc50150d2cbbc56936fe1296f15a3187a1df48349c821adbe77ca61d233dfd64b281f363b0 SHA512 22bd07189fb594572729155b7cb57e4d3cd95a81d7b29526835f2434dd7845491c2b9e68c403d0a53b597b31152492ace54a5e71330f3104772a44a2db440fa0
 MISC metadata.xml 666 BLAKE2B 2fc8d01c607e9f1fc0de5d151e0256fd7adbc1572d2497126012b0792967dbafe2522b269232a72c5208a5c0a6b9eddb9094afdde5d99d4b27995ad506c08f03 SHA512 1d00795d602f0df5e1dac771d38dc068e80edd098add25231bafb11d0f8d2ce783e884e41c3b0eba1a52fc2dac26a62f4c1c29603e20d6cb0af7c6977f437907
diff --git a/dev-util/buildbot-www/buildbot-www-2.8.4.ebuild b/dev-util/buildbot-www/buildbot-www-2.8.4.ebuild
new file mode 100644
index 000000000000..c5f7aebcb28c
--- /dev/null
+++ b/dev-util/buildbot-www/buildbot-www-2.8.4.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+DISTUTILS_USE_SETUPTOOLS="rdepend"
+
+inherit distutils-r1
+
+DESCRIPTION="BuildBot base web interface, use with buildbot-{console-view,waterfall-view}..."
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-www/"
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64"
+
+DEPEND="
+	~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-util/buildbot/Manifest b/dev-util/buildbot/Manifest
index 3a4da2068b49..984bf27784f5 100644
--- a/dev-util/buildbot/Manifest
+++ b/dev-util/buildbot/Manifest
@@ -6,6 +6,8 @@ AUX buildmaster_at.service.conf 150 BLAKE2B c6931c3ebfd77553d52b650668c440ca17f3
 AUX pypugjs-2.8.0.patch 3633 BLAKE2B de243262e4631e7ce3b3208d4f3acc7c7857375c4e938809d18ed65c1dcd2aa8abbdf0339fe278a329bc734220a21cf85f772b81e0284d42cf3c66599902a0e1 SHA512 c847026d0658d61ac617b7471a09fc0ae4f70fdf82bd1c79d460c0dfc9beb060081073b260aed2cdb5f2092746146dbe12787589f311bce6857a2769ccfa1e13
 DIST buildbot-2.8.0-fakedb.tar.xz 16204 BLAKE2B 741676e2c9117b1ab174ce49747bdfcd07766ad3e471e308398dff476f167fd231b7772c2f02002cbafb27e2ef535242d84d5aa84f4bc8942d4d216b2d5bf1f6 SHA512 c2b00d8621b3a1e521f6c17e902ae331b606dda3d319187895f26629dbdaf50caefc5d49fb150fb780e682ae431515c7ded4950d62448e8a73b8efba821c0fa1
 DIST buildbot-2.8.2.tar.gz 3181035 BLAKE2B 40a3e424cc03c982549f25993a4abd2fe04bdc089ad22288af4d25724972f9f3541ef32549d2761c808845df44a972b00cf631adfc564bf4852c4b6b6ab14404 SHA512 7d7f15becc7fc1803ae4e9f1906d547c89dfe1efaa51e8fda0674a3d9b060bafbaae4cb671ec844750313247edb73f17c9014c545bce58070df0ca322a0fd9a2
+DIST buildbot-2.8.4.tar.gz 3134447 BLAKE2B 67052a060c9951e584a5e94f36b92262b9a1956c22efbce7ac17d83f93edde3d9443b00a7bc3afc5918006d68cc023ea0ae913e7bbf0e7cede0d9345992f83ae SHA512 45a6e6116ab5fec18b9b3a6d54886bcf86d3a821a79fd151f9311c8c3646c61051a194250395e203f02b9aa0161e12a9ca54b623897c74eee6133df752f1742c
 EBUILD buildbot-2.8.2-r1.ebuild 7150 BLAKE2B ce82918388f2e96e42448bfab5e1ce342ba5399d6cef53d0143132413bc4740622c8902431d4f603ea2b8c6c6c73be682e15ac07b4da12892654f779fc417602 SHA512 ecbd1a1a60a7492e0390006360e790aff3df2b454131da427876595748b6f0d0afd4caab5aef993aed1e38b54271e04626c340830c35cdf7b450a70be019cf37
-EBUILD buildbot-9999.ebuild 7065 BLAKE2B 582634c656ab3f3b211c0894c3be6b7e96804fd4ce88fc0a3d640c5f40a4a01ee436cab144541ae3f0208b4ac8122ad5b0aff8605fc40b29b20e759e1bfa8aec SHA512 5f3182f5aed253d0605234d53879ef99fd23938033c50a86d5a3a96424a595720f4bbd91dcc2059954b0917f1c18624de345cbd6bc484df1f0b7178a67710a52
+EBUILD buildbot-2.8.4.ebuild 7245 BLAKE2B 78eecca70f1d93f2721bd7ec2d0dbd51b6881a0c742c56bcbbe79daad8c433d2716978281862021cb461d7a8275949786569580cb0d902a09ba8fa41a01d4282 SHA512 726abd002b948f8b3fcf5f7554825ea63aec36916a606bc3d5048852bb15bdcb7ecd112a32739dcea7c918d1718f8cace24d2957bc5cb13be4ab21580b60b44d
+EBUILD buildbot-9999.ebuild 7076 BLAKE2B c21d9658a745a9390000f3af726e6867308f697feedfed799ae2fc84c7887a7acf273d2371d596cd1301e5c5dae183ad77c2cbbf0207251da4936317adaaf3f7 SHA512 6a683e2d003b48052b1dac3cb912a8a9b3a4c99e0a4cabb8318c70bc8dca052dba439b5bc2f05039e47c66a4127f1d0c5d602073a470012dabde0f4943b53a08
 MISC metadata.xml 1359 BLAKE2B 33a6b0f21ad4255f28bc527fb18a384889eb34b2ddc5df5cfa03cc4b1960712b91c787706b95913154300b8e82a5879703dd90d0bf4d796cd6b8bb2a7c4b71cd SHA512 ded6f9cd25bef2df1431b71d5ffc9f0aa3efe9d2f7433cee7800fc27e1f6f76ad64cda9bbc4d3eb3fe0f44dbd7414c75b029f78307925dab5ed06df3d52d86e7
diff --git a/dev-util/buildbot/buildbot-2.8.4.ebuild b/dev-util/buildbot/buildbot-2.8.4.ebuild
new file mode 100644
index 000000000000..1912aad93d96
--- /dev/null
+++ b/dev-util/buildbot/buildbot-2.8.4.ebuild
@@ -0,0 +1,204 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+DISTUTILS_USE_SETUPTOOLS="rdepend"
+
+inherit readme.gentoo-r1 systemd distutils-r1
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="BuildBot build automation system"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz
+	https://dev.gentoo.org/~dolsen/distfiles/buildbot-2.8.0-fakedb.tar.xz
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~amd64-linux ~x86-linux"
+
+IUSE="crypt doc docker examples irc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	acct-user/buildbot
+	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
+	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP},crypt?]
+	>=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-0.8[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-migrate-0.9[${PYTHON_USEDEP}]
+	dev-python/future[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}]
+	>=dev-python/txaio-2.2.2[${PYTHON_USEDEP}]
+	dev-python/pyjwt[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	>=dev-python/zope-interface-4.1.1[${PYTHON_USEDEP}]
+	~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}]
+	crypt? (
+		>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
+		dev-python/idna[${PYTHON_USEDEP}]
+		dev-python/service_identity[${PYTHON_USEDEP}]
+	)
+	irc? (
+		dev-python/txrequests[${PYTHON_USEDEP}]
+	)
+	docker? (
+		>=dev-python/docker-py-2.2.0[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}
+	doc? (
+		>=dev-python/sphinx-1.4.3[${PYTHON_USEDEP}]
+		<dev-python/sphinx-2.1.0[${PYTHON_USEDEP}]
+		dev-python/sphinxcontrib-blockdiag[${PYTHON_USEDEP}]
+		dev-python/sphinxcontrib-spelling[${PYTHON_USEDEP}]
+		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
+		dev-python/pyenchant[${PYTHON_USEDEP}]
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/sphinx-jinja[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	)
+	test? (
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		dev-python/moto[${PYTHON_USEDEP}]
+		>=dev-python/boto3-1.12.48[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+		dev-python/pypugjs[${PYTHON_USEDEP}]
+		dev-python/txrequests[${PYTHON_USEDEP}]
+		dev-python/lz4[${PYTHON_USEDEP}]
+		dev-python/treq[${PYTHON_USEDEP}]
+		dev-python/setuptools_trial[${PYTHON_USEDEP}]
+		~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]
+		~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}]
+		~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
+	)"
+
+S=${WORKDIR}/${MY_P}
+
+distutils_enable_tests setup.py
+
+PATCHES=(
+		"${FILESDIR}/pypugjs-2.8.0.patch"
+)
+
+pkg_setup() {
+	DOC_CONTENTS="The \"buildbot\" user and the \"buildmaster\" init script has been added
+		to support starting buildbot through Gentoo's init system. To use this,
+		execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance.
+		The scripts can	run as a different user if desired."
+}
+
+src_compile() {
+	distutils-r1_src_compile
+
+	# missing files, so skip building
+	if use doc; then
+		einfo "Generation of documentation"
+		pushd docs > /dev/null
+		#'man' target is currently broken
+		emake html || die "Docs generation failed"
+		popd > /dev/null
+	fi
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	doman docs/buildbot.1
+
+	if use doc; then
+		HTML_DOCS=( docs/_build/html/ )
+	fi
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r docs/examples
+	fi
+
+	newconfd "${FILESDIR}/buildmaster.confd" buildmaster
+	newinitd "${FILESDIR}/buildmaster.initd" buildmaster
+	systemd_dounit "${FILESDIR}/buildmaster.target"
+	systemd_newunit "${FILESDIR}/buildmaster_at.service" "buildmaster@.service"
+	systemd_install_serviced "${FILESDIR}/buildmaster_at.service.conf" "buildmaster@.service"
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		ewarn
+		ewarn "Starting with buildbot-0.8.12-r2, more than one instance of buildmaster"
+		ewarn "can be run simultaneously. Note that \"BASEDIR\" in the buildbot configuration file"
+		ewarn "is now the common base directory for all instances. If you are migrating from an older"
+		ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory."
+		ewarn "The name of the subdirectory corresponds to the name of the buildmaster instance."
+		ewarn "In order to start the service running OpenRC-based systems need to link to the init file:"
+		ewarn "    ln --symbolic --relative /etc/init.d/buildmaster /etc/init.d/buildmaster.myinstance"
+		ewarn "    rc-update add buildmaster.myinstance default"
+		ewarn "    /etc/init.d/buildmaster.myinstance start"
+		ewarn "Systems using systemd can do the following:"
+		ewarn "    systemctl enable buildmaster@myinstance.service"
+		ewarn "    systemctl enable buildmaster.target"
+		ewarn "    systemctl start buildmaster.target"
+		elog
+		elog "Upstream recommends the following when upgrading:"
+		elog "Each time you install a new version of Buildbot, you should run the"
+		elog "\"buildbot upgrade-master\" command on each of your pre-existing build masters."
+		elog "This will add files and fix (or at least detect) incompatibilities between"
+		elog "your old config and the new code."
+	fi
+	elog
+	elog "In order to create a new instance of buildmaster, execute:"
+	elog "    emerge --config =${CATEGORY}/${PF}"
+}
+
+pkg_config() {
+	local buildmaster_path="/var/lib/buildmaster"
+	local log_path="/var/log/buildmaster"
+
+	einfo "This will prepare a new buildmaster instance in ${buildmaster_path}."
+	einfo "Press Control-C to abort."
+
+	einfo "Enter the name for the new instance: "
+	read instance_name
+	[[ -z "${instance_name}" ]] && die "Invalid instance name"
+
+	local instance_path="${buildmaster_path}/${instance_name}"
+	local instance_log_path="${log_path}/${instance_name}"
+
+	if [[ -e "${instance_path}" ]]; then
+		eerror "The instance with the specified name already exists:"
+		eerror "${instance_path}"
+		die "Instance already exists"
+	fi
+
+	local buildbot="/usr/bin/buildbot"
+	if [[ ! -d "${buildmaster_path}" ]]; then
+		mkdir --parents "${buildmaster_path}" || die "Unable to create directory ${buildmaster_path}"
+	fi
+	"${buildbot}" create-master "${instance_path}" &>/dev/null || die "Creating instance failed"
+	chown --recursive buildbot:buildbot "${instance_path}" || die "Setting permissions for instance failed"
+	mv "${instance_path}/master.cfg.sample" "${instance_path}/master.cfg" \
+		|| die "Moving sample configuration failed"
+	ln --symbolic --relative "/etc/init.d/buildmaster" "/etc/init.d/buildmaster.${instance_name}" \
+		|| die "Unable to create link to init file"
+
+	if [[ ! -d "${instance_log_path}" ]]; then
+		mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}"
+		chown --recursive buildbot:buildbot "${instance_log_path}" \
+			|| die "Setting permissions for instance failed"
+	fi
+	ln --symbolic --relative "${instance_log_path}/twistd.log" "${instance_path}/twistd.log" \
+		|| die "Unable to create link to log file"
+
+	einfo "Successfully created a buildmaster instance at ${instance_path}."
+	einfo "To change the default settings edit the master.cfg file in this directory."
+}
diff --git a/dev-util/buildbot/buildbot-9999.ebuild b/dev-util/buildbot/buildbot-9999.ebuild
index aab7babe0e90..5929de5695ce 100644
--- a/dev-util/buildbot/buildbot-9999.ebuild
+++ b/dev-util/buildbot/buildbot-9999.ebuild
@@ -55,10 +55,10 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	doc? (
-		>=dev-python/sphinx-1.4.3[${PYTHON_USEDEP}]
-		<dev-python/sphinx-2.1.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-3.2.0[${PYTHON_USEDEP}]
 		dev-python/sphinxcontrib-blockdiag[${PYTHON_USEDEP}]
 		dev-python/sphinxcontrib-spelling[${PYTHON_USEDEP}]
+		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
 		dev-python/pyenchant[${PYTHON_USEDEP}]
 		dev-python/docutils[${PYTHON_USEDEP}]
 		dev-python/sphinx-jinja[${PYTHON_USEDEP}]
diff --git a/dev-util/cargo-audit/Manifest b/dev-util/cargo-audit/Manifest
new file mode 100644
index 000000000000..46c139a4dd7b
--- /dev/null
+++ b/dev-util/cargo-audit/Manifest
@@ -0,0 +1,248 @@
+AUX 0.13.1-libressl.patch 1237 BLAKE2B b41a9296f6d886c7772ca9cc7afa58e9f601fbc1ebd5d3cdf34a832567d751aff9af9a370f0fbe2d8d240250f3f3aa640963d78741a8a5d535b68400f4224b06 SHA512 522353c087d728b73db8b7b1f2954b8d26e267f3d566353c11a267567bb00488c0883c6c04784fb09a28bb18ed7c7fe748d18c6dd9690b522c55576c3b6e0eaf
+DIST abscissa_core-0.5.2.crate 33957 BLAKE2B 8b6277c90a0debc33009c1cb0449668bcc11056d5561f481c2d908cbf4de5148ee40e33d9b9156e91a93748bd5be92e22846d0dde30e042e74d0d9574a6c777b SHA512 7e194a0330baa3ceac71be5b730f7c3f7dc276ca31ceffe52500b79491c81a02156fdef68cf122adb5a01da19bebc48187f1272e39925c25feb026023ce99352
+DIST abscissa_derive-0.5.0.crate 5121 BLAKE2B b515a366ee00ba0e515d028f4a7e927970b22931fe706864be7c95d95a779ab6175288e290db9f70e79a69a98aa869e066891232bcd0d54eee421a594d5093f7 SHA512 b419919bb4922bfaecfae36e5a2cfa79563fbb6c6d5887831fdc39810a380fbfaecd4ad7828087adb515cc3709f25345131c8d072c65c63278c0430916461bb8
+DIST addr2line-0.13.0.crate 29996 BLAKE2B 09eeded63eefb326ea111f80a228f60ae45e4dd1a0fa0fc8a74ab31f04aebd9cd66cdfad9ecf85b15c702f1b33e5a586fee95097d9a575ce52299069914c7fb3 SHA512 c796f763aa0ac9ae04b31beb813521d3743752d91235eb3ece1c205aa67874c1b66f1f4f473f1815144d8d94851691d285845a1d438990f81b61f5960cd67cd5
+DIST adler-0.2.3.crate 12168 BLAKE2B c7743569d700d7ec3185e0459a18181148f8cd7579f4da1fab30eb2e3c3cabbe5a7467f7760f0cba4b2fdeb62f8d988ee1f24637685d76db7acb56f679cfc996 SHA512 565849eba122eb94d240a0cba875035537058cc168f137a8a3b99392d753815d56fa0e1a1e851062632700b0e3d12caf67f5f768b9f727956a2e5b599029e9dc
+DIST aho-corasick-0.7.14.crate 113042 BLAKE2B 6ba517169dd0bfafe7dd7755e2f664d831a17c6a367f29cb54d22b8b61eb04c75b67dead9a7855bdeaa1afd8aa5049b7580617bebf0cdac61c0712eb3525db4e SHA512 0a11e7bd2d3b6868fb6f64b61f3feead4ea57ab3c5d75c6586b68765425219e631bf875e43f73e79888e71079b3d7e10af36af6f96b72515105df79f5922f296
+DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
+DIST arc-swap-0.4.7.crate 48625 BLAKE2B 922c640ccc1665ea07968ca22f0b44003d6211b47cafb00c23707b85eed9bd3c689c0a2ed46ec74125a1ee9881f3f9044dd6254b7912a331125e0e51cb31f079 SHA512 7d3f8ebaf16353b1534770ccf2424d4efc0a5c96e19fb15c167e6dc15586abe5a992105a4b534f3bc245478a6159c0e099d6f6c2e260d4f53b861b6d317e3a92
+DIST arrayref-0.3.6.crate 10035 BLAKE2B 88292fa4b3ad4fccd03772c2f0eca04cc13373fe094358bac57d7523c256d89f3087603e5bcb2a0b15d8b2ecd48e904a822b2cb800276a9c47ad6c6b660d9d34 SHA512 368341d00706c1250ff081b0d99c36c9af694a62ff4f4d8c837234340295771ca49c5439b24b6e1a4f2c3c5821764e98881dcb22d793f83de632fd5cb457671f
+DIST arrayvec-0.5.2.crate 27838 BLAKE2B 51e2eacae0ef148f3f52d21ae00794e540e7ce4c013fb496dd1347ad91ffbbca199381fffbb064225f829216f6c5e915edfa64833f91fabdd13c3f011d86491f SHA512 1896b5f64b4dbdcff8ad234bda4ea8129bcacf87839347304717e94ee9f369cf5f4371755e453ff7d72817edb8f7fdbc726d77cc4f28ed05148dc89c7714b004
+DIST ascii-0.9.3.crate 28283 BLAKE2B fce32863fd75ef1badd496db55387f1abfce5eac7a7a61ea07e1475f555fcfaeb2726ca80e69577c4cd05c366f8c46842f064fd9325955eacb8ad38d0cee990e SHA512 ee8ad37b0a3db9524db22a9abe0c348e30364f108039bf761aea8e3eed07c08849924a0a287fb17c019e14b654d2c6db3848112047a1fa8db58247c9e138dca8
+DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
+DIST autocfg-1.0.1.crate 12908 BLAKE2B 40c53cab298e4f26634c3acff3ece6a3371188d91dbf377ed664eabedcde20536edaa93daf406618f37edde019f049a6e7b9a47f627344587dbd126bee2b5e3a SHA512 630b348acb98b012e97804e6325d03c89abc22f2157762c59144c04e6c733daf550bdc7f0fe0b9f3b50e15dae8c1c3c4bdfce3d805b02f0fc987311f5332419b
+DIST backtrace-0.3.53.crate 71892 BLAKE2B 58df8a8954ac04c2aac2ba0d2a7b4bc54943fce911c195fafcd6b6a0fe2086db2a5f976de149c8be7e741761b6a5a9661fb96330b17db6e1981173acd8986ab3 SHA512 91c43e3778146e66bd0fbbf97e743a4f95293b1aac96e99e1b66e8ca1c5f314dd89eb892b27fe2721f95b3ffb4e4f19c07bce96e50d6328cb6a3d962eae06673
+DIST base64-0.12.3.crate 57545 BLAKE2B 5ff7e888f6b750ddfe302438d52766f5d6281b8c8ce73827a9ad1d64641704414649e6c1e02bce6abbb2858b9f859fce54a0e0e793549a474c4b49a724c8663f SHA512 ec6ad7cbd4980a12189690e9e24ec1db3c3def9e93672a415808904f68db2b5d8c5740e44207b2c629db5dd5d6ba6bd9dd342dd82367da6198e0313d86e54f02
+DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
+DIST blake2b_simd-0.5.10.crate 34093 BLAKE2B 6e725c9399714d1e199277e3f9882d636c1737af5b0b290f853573575005d053d2ab3a34843461747914a0c25d370f0d5a5cbb46765fe99308c1fd7666d471c7 SHA512 7471e0347267a4b88e9eea932b3001c420da0a472b2ea0f20dff974789955d6d95e19d51e3a8a312516c7fc4c83b6af17cc59ea2b8fcd4ef879ebac22534307a
+DIST block-buffer-0.7.3.crate 7179 BLAKE2B 549e8532358f9a77fdfbd5ef7a06d60f20f034fcf69072757811cb4a95f5cee5589bebd40fe87af36127254ec42ef3240cc7542828085f590fb774faab8f0e21 SHA512 74c8b89777a006bd72511b32df94f8bd78e2b53c30d85d39ea3c52acf199c357140fb6181f7f7ab5e30dd80d37181582cad740c95b89328a7a4b0f84f77ad6bf
+DIST block-padding-0.1.5.crate 7342 BLAKE2B 876421fa89251d011a455163baa49e0931e0692ed928fad71357fc93b87493eeab4cfcf8fc4aa94638a90a8dce8ec1ad95e9ba91da9557008e5fc19c1f618ab4 SHA512 acf5369cdae38b6b1a5c1561a9df18b8a39c8fd434fa50c49a8f73d2654a835269b7b22876354c903514c49c77aa860c68cd84d3c1efcb36bdfa8b01af300a9a
+DIST bumpalo-3.4.0.crate 129102 BLAKE2B b585c8d682acf555cbe695dfe150074e4afb1620736f28b29567070e445a12293b460d3c85ff88979abfc74fe7453010ebbcfd64bb2b2d575258d51fab2b1400 SHA512 955e49eeeb803547092b58c086a2582e905578179d93500c1f55dd3fb7a65349f33ddc4c2710c0ee804abbe4e1f2afbdeb998533d362177298a86a4f9a8822a5
+DIST byte-tools-0.3.1.crate 5526 BLAKE2B e87163b1f2abde9c6ad5002c37b21308a98a879dc7af14059839be7b5a019d2487ef03867f3f5cd436b7081cb78a930abce79b5cce23eb95cc60e05067e1b1df SHA512 18e0f248a1e9780706e3a184d63558f03f30002646abc6d46ef49db9d5f6768af3d24d210b688aa4ad33d41248429e4df46bc3926f27851f90c92d260e5c4baa
+DIST byteorder-1.3.4.crate 21943 BLAKE2B 278b24e036e920f84683f883991a967d997883bc80edefc5b69f52551794a37e5051786a1ac1b7a30bf2f5cad7318d781f189a7b2e496e2743df01262d5c33d6 SHA512 0618ce2cd6f3f6c586201d9aee8c8aaa08f99c9f9f215cf448b3cb6af1ac741845f5279953544caaec7fcf0beec1474bb991bee1ad0c0dac0c3f1d3ddd99e2d9
+DIST bytes-0.5.6.crate 46291 BLAKE2B 6d33ab47d04f2e469db2add31db118f95cad53002be7969738923d62a4fe3605ccbe9fbcae6d8741310c543625e80d9adac7d9e9fed01b71cb3943ddd015d920 SHA512 a1caa1f58754f4d2e54b8df8d0ca0083ee5282f5e4d3bb5b1735022933dd2e66fb3f39c7a82216bf7a7e29591695c2e10c8b7144c83ac598e34193f2425a32cc
+DIST canonical-path-2.0.2.crate 5536 BLAKE2B 63de79c5f5ce832c6c4db05c812a9f2dacd939e73140137ecd20d57d3cf08b4c8ed87e04691681cf4284669a0321f9eee7b7bc01b95e18b25ed229932601404a SHA512 8d7bc999da230d3ebc8b6434c0cb2aced6ff2a77bef7225a060af79b9ab169bbf8720c9efe76e5fc2fb8af82a859b9e79b79e17c3c11bce523b4baafdf522877
+DIST cargo-audit-0.13.1.tar.gz 155962 BLAKE2B 020ff8e4c314670dd828702f379c81500fdf5bc56e17e69a197346ea5df5b7d30fecde90fcfb22835275f4c32e83cf246dc72ba49d656f88b6e1a69538a9154a SHA512 615d451c370eb6d876d1c0de34ef86ab894b9ac3af4bf70d368ebbd51fea5bd53da24ab819a94a862849e5f31ff3cefe14b31e5911144cfd033e1aa54d43f8a6
+DIST cargo-edit-0.7.0.crate 57596 BLAKE2B e5867fc17ea420bc338cf48c99b333837919c8ad70aa1b70b2ca9941481ebfcf4e834f803528328f32075992fde558af3b02f82cf04170c664b30c314f7aaa40 SHA512 7dfb3cff30b2a79f2e72ff25a5fe27ec634af7c8de42a3e18fe25ed432445fbb4db5ae2646854d5f8172eea042f0ad4d34dadc2dfe5d1ea8c295dab0e62c44e0
+DIST cargo-lock-6.0.0.crate 62842 BLAKE2B 461b9a320ec93f9f241f5539e3837a2ef5ed807edd3641d2288918109e05af5820933ca919346354eb5c558a0ebd9a18d6e56e55d1fceedf4a7778001e1c176e SHA512 4f8dc86bf6b32783e4b767aaa1287c8d81713073edc411ce5338fa26af05f4d4e980c0c5595d316c479b6c468cdcef2fd2475e6e985ce98a36c11b63466787d1
+DIST cargo_metadata-0.11.4.crate 16419 BLAKE2B a953ac1a80ec0035521c116fb2e10fd43054c4c09468bf0107c0706b33ba99e235daea9e921890366919796670cb1050fe6ae93b4960d7b3acf086b70479995e SHA512 60b55dd03e5ffdc78c6cfa9a373701844338181853ce6ba4ff64e1261e69c27c9bada331992070eedf0342953fdb3592f3056adac30e9f39ce15d35f2cf50b62
+DIST cc-1.0.61.crate 53454 BLAKE2B 250a847faed1e7ae0a7d3d0f15511222a8cae499aed1e6736d65234d6915cd64abf0b01df5bcc38ff2800902854ed57b297fea2c63d41a480b02cb07863a7490 SHA512 c238590712c5359040ff9670fb60690d983b1a2aa53ab7031f552b4eb026c9e305f401ade77ee389eff90dbadfed6eb1978f67bfa143589a0e0ccf39edafb5d6
+DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
+DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
+DIST chrono-0.4.19.crate 155663 BLAKE2B c92c273fb6475bbb2546dfb75eaa23321bc8f9a5fa8a7c652f527649b96ff8718fa932f52b500b02a4acae7837df5bdb14f69cb821d4962be2790dbd1d023a54 SHA512 a119349bfc2243a249f1d18b1ae548a04b30fecb75913a56f26d1ff8c0eb53097a2674d9141e2094018191cbbc1620843fbddaf52999824e077c1157f0907980
+DIST clap-2.33.3.crate 201925 BLAKE2B bec9c866481c5b3fddeb314f68af9bce38fc421e42816182de3209e8ea3447b72cf033e6251eea27fe974eff8085b7d98cdd2911b5cc0ec6b4bf4c750deb8a25 SHA512 3eb0fd648e2e3f9e5ff69a5e6cf0d867304fe18523accd036f28a86de368e4774088a6936c108ccc045092c539fe7f7494ea96420ebf6b4bec16880cea84bedf
+DIST color-backtrace-0.3.0.crate 18057 BLAKE2B 0bd1b1bfa365a739f67168f711099ffa6571f5b4850441c14d1be4c7853bb0cdcdf3e7d35bbaa3710a605363e99d10de642dc35b9cce97b93bdb1bee402a856f SHA512 a3adb7ecd9bdf7c988d605d1a70db14f9fe62e6037bc9104477fef92defdec7872c2f2021e2f6ca3bdbde99165ba248e8512c73727e404b712a0220c361da954
+DIST combine-3.8.1.crate 103773 BLAKE2B c8ecccda28eb7253e14ef112707166f14892fec858941adb302a866eb0495878d091592c770307948fc040fe459a525af643db9798a601aaa331ca7959ebadd9 SHA512 12cf00c23fa6ce6a73d562214456799a9aa98eaf2defe9e4884dc729cdaca26efe2965ada3390892940644e6cae4644363a65ff5aca1bf1a1a684cfd4a8d7f60
+DIST constant_time_eq-0.1.5.crate 4936 BLAKE2B 882dbf33f20954205fcc5b6e39863db8969d184b697fd51ef462f6890c1a754e3fae67bcc7db685d8cc26abe6e3871d3b80aa542489ba9551a0c95a49f7a6dc2 SHA512 a4e0155a7ad72babcfd418d832d362b3fca7333aaaf36c246b00e948983837c3c93378b86e37c5fa7626fe137e3b6d77276ccc61624a7f4ab914605905a88a01
+DIST core-foundation-0.7.0.crate 25384 BLAKE2B fde852b7673cc972da8d2f8663c2c8372fda36fd577d19c9536f9df929f649ccf94150e1e23a57013bee3cd8cbb6fb894c4fb3a5744171bc6be607cb27e2757e SHA512 919041f431e21783193c0661b82cbd15946a56e24e5100a6a9dc02476ddc714595fb0416ae182981ebf6a8b27181e3178135c27388b41ec848423d739a265da6
+DIST core-foundation-sys-0.7.0.crate 17033 BLAKE2B 26d190931c7462ed8c13de82e86d4417e0d130f97295c8435ec666be08c7bdc37894ef25647043970fa40eae1c63503d2ad7660c2ac17ef35d7d35698652e18b SHA512 b77566aed2b572bdbce6f71ca9dcc942ef96b628a7ed9680c4d3e3ada4a9dce90c1b439a8c7c7f22d68e51becf1d22b3262e227cafdf8cfe5f42db0ffb9dadc7
+DIST crates-index-0.16.0.crate 14107 BLAKE2B 9d6dceced2984dbd004ef3c05c15ad2b5b6e15de18fb5682527915f50e56f418919ed2323c24bfc3cd57d380b9a1386f44405f1c2cfdc853b4530672538dc6c4 SHA512 7be24a9ce39a4f70dca3a7c7bed0dd285783f0ca844a50be2ba0a2c262bc17c92809439b5ce11f675aa575e4f495e7ce4b2e875825dffe88d9ff858a43bfa9d8
+DIST crossbeam-utils-0.7.2.crate 34338 BLAKE2B 3cb287c7741c4d5b0551331634a75b066f07fb4b55fa2b347370506467a05923254b1c4dca667de59ed91ff91f5496b37f40f13d3e9885a1b4f639f5b6748433 SHA512 e375f24c007bcf660d9e297527ed938f678a55696ca7b555b96fee7e0b94c31db2d3f4355675aa0baeadba68b9755ec92dc3a09a37b5db48e3723b926fd4a8f3
+DIST cvss-1.0.0.crate 19173 BLAKE2B e3751744d46dbc644e679a159cd290794432524973b7fab1b9b3faa9422ad73984832d4ffb20cdbb1c8986642501a609551f08164201d2274af5c6313b1c3b7b SHA512 be15903379fbc2ecfd984a557c684d17d147eb41a09ab89b49f13b6dc084b76c09cb21d8c664f302e94849fb6c2931ea351f968571d0d2dc8a2f6aec832b5508
+DIST darling-0.10.2.crate 17620 BLAKE2B 33d1fc3dc10fc971ea304efe5bf8084843241ca9c2a89e54e7c5227e53b1ad86749bd8693989ced6bf17805001909033aff92d600e7169a02dccf009fe60a88a SHA512 b312a74e577cb2f889315ae42513c7f26597faff306a40281189be2101339661772016a5e197466bd85ef94c275e811adee1b7c0772458126677d1998ed6fb15
+DIST darling_core-0.10.2.crate 44339 BLAKE2B 3ab3762840aa869baccf1030617a2a534c5d63019deb7ec5848cf4f80aa6304307ae32c4425264f1fda220a502110549812112d08f0f60261b30731ee47335af SHA512 a0af8e8ebb8584973c20eac01fe9ae828744b5e86cbe268262f8710a2e0ad568bbc6cd051d5225cc536a0a1fcb1886233063c8c18ea16b45c47207ce64af89d9
+DIST darling_macro-0.10.2.crate 1919 BLAKE2B 6f07815ff5b333b6c34df08f3aec2e5af5385e60a94bf9d169701be19935d2a9292ec7396905d2caadddba38d3f70bc5e5c3f1167690f045b778b8fc8cb00985 SHA512 43a0e9091fe12ec986e229a73bc41e23b1815fecfe62df8eed74d2ef33f5c329c444f1568d3c966554ff0bb29220146ba8f30d1c2d77ed7dea9adea10dacd152
+DIST digest-0.8.1.crate 9449 BLAKE2B a610eb0144fdd49dbd846a86e88781b69ccb6a4f918b09fb4562ee9e3d535d12a1e499e36e5eb894d1d81f7a06ca00296b3aa35063f434fdcf22ff202890650c SHA512 186c3ddc01fefff6a134ea0be633a9fe8067b8db34f31e9991069e7a9b82ed595a1105283a87e3021af2337ad332faf1b85a6bb513a4482df7d24e3e7a5ba055
+DIST dirs-3.0.1.crate 12245 BLAKE2B e58f9383d0bb78f27219337c83879ce355aa60290df659b9dc656e3febcc2577b8fd5234792fa354f1c7f2b651e590fe490384f79b0a8a332eff44e3b459d9cc SHA512 fe5eed57f7f3af0ebc53098f7d7295702a5339d7644d271a81bf5a966ae5b3e688eeabbf2b122e6e7daa1080dd30e48d8cbad969f6820b6cdb1680c84f0b9623
+DIST dirs-sys-0.3.5.crate 10643 BLAKE2B 8df1e6ca2c8e8560913bfb74e7bea1b12e1b13b6d337f3c76f517716622586cae8ff9999044e3265504a44f161526a79baffff2d123d3ea6c5cfebefcf498010 SHA512 ff7eb48943b61773dd2aa8dc10372186d613c225a2b39caf48966a1a5af087dd0177b8db80b1353a504af8aa1c8b4a0a849edf6c7e4389f6b753bfa3b7376833
+DIST dtoa-0.4.6.crate 15979 BLAKE2B 7ad070d30f933f169ab442069dd078022bfdb2d6227380e88e286cbba8b908378fd8dadc9f6a86fef985380d925f12ec81f90daf9d1a7accbc03c01d0046258a SHA512 f9ea608b069469736533a60b3f4091712992ebdc99c08af06adce4aea4a9aa9fcb477c3ab169d1c61afddb1f434096cd2f795fe2489f5f0535cc0400b9896b45
+DIST either-1.6.1.crate 13641 BLAKE2B e5f40c40a5edb6dcb07a10bf79183cbe42438f1f70f3932dce72f6f6e91f75f24d17d82bc447507def4dad4345ffc9dd9162dde778afb253bdb1218e91887949 SHA512 4bfe56920e30cbc8eb4f90162db618f7dca653b42db35ab6a7045d3fd9a24ceb1778b1f79613850bdb1a87ad3794fa0d73015e46c48d513f368d8c3776fc9ddf
+DIST encoding_rs-0.8.24.crate 1366911 BLAKE2B d487d36a6ebd6fb31d7ce07acf4870a271ef9384bbf08aafcbf9951e919ae63acd504886db07009d3163ae7ebbd7e8e9da0e7aaecb400b1534e112a1325f914d SHA512 bf94cff1b1a6e70b73d39aa531ab2f7de130a8fbe20726fb97d502a20cce6de3571a1f306f0f8bd6aa90ae535ca874377ef3db2d3669fa97cc12878155d527e0
+DIST env_proxy-0.4.1.crate 11256 BLAKE2B a8e3e4f8366a9a578da09903c1b1e9ba2c4e37700ec5600814c8a1dbff740a20dd6147bc1fbeed385137ce734477c734ba370fd6a824c64d571da374554370e5 SHA512 333232b0217eab986b4616061b1419e24fa95b55d6f58cbd3e6a8a280b1f8b6587ce5ae30cfad570e7cebb2327352c18b6a8ab27007dd870073308127d2cfe00
+DIST error-chain-0.12.4.crate 29274 BLAKE2B d082bcbce47411477e8b597cfcb76985cc7d6f1696926cb5314f4e84d2c8642939f5263e110aaef56353ec086a21874a8093bcea1d018be81c86ca42c2c30d71 SHA512 c0ee19a0ba2d79ff1843148d0a582045e68466a9dc429e5f3c8a3a75bc1b6e0d6de03ad69fce851bc0297e7db77b2c6817a13c37e1c3d4501ed41db8a454bf79
+DIST failure-0.1.8.crate 37582 BLAKE2B 007652720edab76efca83ef23a6f29dfec2a8949e88f697a4609257d158d345ebd617577df9cda69a25cae70e02f96479f427ee3059362771a4a1459bc4bd1c9 SHA512 a8762c978c286f921ef9c46dd17f57656739b339656ad237f6fb43062a8b2ad97cb98b977ae04735312d5328894b45c512fe42e33a9bdc4ea898330816b7a884
+DIST failure_derive-0.1.8.crate 4950 BLAKE2B c068f2a122e1137aa8a31e3a3c4c333f1e66f1b93df144f5a07772167f9085241292b85c55adf33851c319a418bac19fd31f4fb22b87ebbbf2814cbc815b77b3 SHA512 3f11adeb616a2d57e1a33ec2a5eb71c79a5df7946a27b74acc7c89a67c5dc6d01222731b37b405e33493570a98c96c7d2c7b8535928d7cf82536bcd9f0df809c
+DIST fake-simd-0.1.2.crate 5398 BLAKE2B 40437b18ca7b77258577f518232dcf67e2bf09b64234dc3f02b9eba0c5c1fede8f8d1dc7cbc112ce80e4f0bf317387d1b8046d41a4f83a7c54981fd2b71fc8e2 SHA512 d57242c54ea3283185eaecbf8d96a4c9decbada3ae3aceb516a79710be9bf038a6e06a29b9ba4ebcd41b8f42943a3024a983ea23e36b17edc445a8c4980f2893
+DIST fixedbitset-0.2.0.crate 13597 BLAKE2B cfbdb06fefda131509b04cfa780c9e9574ef0acb902479d7ef98f32ab45b18d78cb1cc94fba78bd023267a7f2a081aab29171f81a9e90912d4aad9f5fc17ba3d SHA512 44642b270d52f71637a87e5311f70ac77baa2a377f94254d1bd728b4ff02a3176f3a5d07732c0c4fb9bf303dbeecf327432ae01e2779d966cc13b5fb97cbc28c
+DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334
+DIST foreign-types-0.3.2.crate 7504 BLAKE2B 520818b702d990d296ecd31a8646850202509ccfa18edd0e1b260289619a6c351e758f317ec0824bd76eccb209b6f087057c25f1bd01a47897715013dd834867 SHA512 bf27b8243ed482c202d120383374f19ff09422535e24b9c1aebccc66529bf300ca17b8bbc76d67f98ac092e614497afe3add9dc68aa69c93074df05762f91232
+DIST foreign-types-shared-0.1.1.crate 5672 BLAKE2B d2e42e04b6657e7a69fe0bd20c672176629c743e49a55fd007bb30e289710b70045d445ae9cae0eeaa747ee708c90e8abd9b5fc39bad8ec0666befe1b696d4f1 SHA512 bafdb2143e136fb0818e2ffd90b5c862b7181647d6568947d4e4531012bbf7a57b597221ec7056c1b562dfc0c3b5dead26d1a4111ebc15e7863737a873518a4a
+DIST fs-err-2.5.0.crate 14257 BLAKE2B 4bb2d1393c9f1645ab1657e37672d26f6e792d2ce7c9d7345eb2e5a8a095fad2803cc1e9e4c9d818ec68eb4b931914f2d44b45d377f6cce444989f691097cd18 SHA512 55c073323889dd7c1bdb80dbed4a3f5c845bfe06f08c2d898e74ff85ddd9d31ba5c49c8a52301dde58b8596ac1008ccc4755dfa7dba4bfecc9a6f878f79fa5cf
+DIST fuchsia-zircon-0.3.3.crate 22565 BLAKE2B a4dac3457036efab8f79fe5d5b4545e4091e994d3dc63188f71fafbcc28bf98ef359dcd20add30ac1d990ab2e66159723302fb66697349c65fab0aa58d54535e SHA512 a43ee59452d49742111e506d6bdd8b8399a3a646e08648e25292864d7f71460c1dd1f2d77b8efa8ed09ac21fa4ff0442a2709f16d8833a3849bde0c388d83a93
+DIST fuchsia-zircon-sys-0.3.3.crate 7191 BLAKE2B 530bb5d475ac828843af248c6bbd24ca3b5dd8118c8884ccc6d7261818cff1c79038077114ffa04bc73a078177527824c4d9d20a9b022e4057afee3330258cff SHA512 978b7e8795a5877a68409ed3a1d7b4246263f8e7e7ce9ba8a022643be98f58f329cc1c234717df80a509db849da4394f39e90a8e2a6f56f8fa8dd3c07e7d4386
+DIST futures-channel-0.3.7.crate 29462 BLAKE2B cb69779cf006f9d4207dd394aa9723329a2712295d66951c6043fe4ed1c278688ff3e28fcacc19a0f583d6fd1b97511bd98e6854dcab2e2be69d8db8f589c202 SHA512 47fea5b0f0b1a912a8d38acc402ab1d82b733679b80b7f11bfe6fb2dfda59a2113ae68f6b78e485c6d021fa2bae95b3a8642e5c6e51a5a93096a46d1196a84de
+DIST futures-core-0.3.7.crate 13849 BLAKE2B 6b7a2b8318958ef6d57c4f38c0c5c769f1f0017a171e21ca0fa77959e4189caa76e501701aa57cbfb353453756825dcb29f64980adc88f8fcde5cfa34be0ade7 SHA512 bb3f7fd23022ffe6a5a2d288be4930c902118978881e9696f964fd0be7b946cc44420176cb514708bcc653293c437362baf62d687f1767d0f40fc0aafe7b3bca
+DIST futures-io-0.3.7.crate 9130 BLAKE2B 89a24834f94c1f1944a9d40d485e7111db96767a31d4f631b65f71211f02fd1581908260f77eecb3b295e7972f15f6c44ca3e437cd80def1cb7e1fd579d3dcf4 SHA512 d4776a2f8a3c4dfdcf6ed8b325d5ae7e271854ec3cffc5982b1a1246e58a3bcf441cbf021242279247438ff64ab0b373a1dcfe8599609eafd75552776f2e7d41
+DIST futures-sink-0.3.7.crate 7729 BLAKE2B 860825cbddb363f38e3cbc9ac516d7f3bef265e3a0ab47ab857d701a8afeb3fe7ecfb15a199f0cbff07c16a358fc4219bf9c0ff1d060226a923a3bf8e3f791a6 SHA512 1c0f8921beb91ba8d1f0aa2f906b8cd64ff3f603b76217e439f7a9a1600cce696c91b1f11b6edaea9f97398b9d35712d8fd86fb444435d1c491b730db9c243f7
+DIST futures-task-0.3.7.crate 11134 BLAKE2B 020c86892a192c216785932fe6597561369870e2d21ab71c3fceaca9da691f3dff8f35c5b4552703a3ff8ab6b518120f4463e14a23f03efdd6cdbf84e9a14e8b SHA512 80caaf5977134436b6019edb97fd9decc55961a85cdca3e63433a12f47be8d5960e8e1660e716772040aa5418d944ffa42e2502f23a9cb124c761d4684d328ef
+DIST futures-util-0.3.7.crate 133338 BLAKE2B a1a4194b2d6fd9cd5f7c773a74eaa05c82d212092f9312dcc45cd19755a34419b9fe44e9d7dea41d37058be46e211e342752df2727f2c2bb08ad136079147634 SHA512 b84a540865c0789710021933ca7628a35b0494acc81d550b8c0c26d6ba9dbd0c775765114e429a265300786ce70724be1acdc9730f77b069595238bda15fecf5
+DIST generational-arena-0.2.8.crate 20899 BLAKE2B 73cccc9e3b836ddd37e7f64b6389c7bec6763ac9c390a5a9b4adc9b35200e7d26d21ba0748fc808aafac52087f552a4c56e8e10ebf8d016507e1781c579f1e73 SHA512 a5e073a8d26aa32b617fb4130d2b9401c3a3d9ff51a2910f2de4de019ddfd2e5077f2489acb40330e640c573139c1c911ce59a36011bd439c011a3af922bdc1d
+DIST generic-array-0.12.3.crate 18017 BLAKE2B 0d24e12365b31ba77cff37db6841428abf7f37f9722d629c168fd96a3a88390999a95e27adbb6aae697ca99bb9ecb4728af49d4166ea2bf89ad5ee09bf2c943d SHA512 75f3c19d3aa9db42909298b207564b2df40e7e8b8d54ad18972a833748942b5293a0edb881de894b58b5210c870ad546752c200710c5549144d11a4a0d7417d8
+DIST getrandom-0.1.15.crate 24786 BLAKE2B 868817d62ee44fa5bbf54f9af0bd71a29503f92bc93e190a834f4ebdb8eb73dd29e175c661f9964298987949c0b82a53e99080cbe4090fc9c5453daea4b05595 SHA512 b26d9558554058f8a54b03f56f488db5ebad2d5cc84f737e489f8f532f8464ef9038d104173eb30acca61caa1f99e1ce267bc493c01ba1611b829e0a090cc87f
+DIST gimli-0.22.0.crate 704135 BLAKE2B 6005ac1e358ad80f8005f02d6e606c0c46d3bb4c71ee84090999d031ebe4fc1177530bc7c641156f104015c8ba9ecfd9988e0b3b33ddd53e977423ec07584b30 SHA512 71d806bb2e675ceed595a6367ae2d991f5a39cca89f371c393cc97d3c4c941e227faded1f83834e7599525aed821b91915268b500a4753fa002a898df79c399e
+DIST git2-0.13.12.crate 175580 BLAKE2B 18321da8e89b18dbec31bbee75cd779994363ff6e9f2dd15e6d85b301e495d769fd66ba4dc4ee5edd9c806d8acad94336e403899f2da147430c89cc984ab03c1 SHA512 aab4564c385e378d5df34b8b8aab12107bc9e4b3b1cec1b5206e32fe72fbd0a7a2fd4c40d0ce75deed6ee9a51edb0383f26af2a53e59a5384c74dac4162f312b
+DIST glob-0.3.0.crate 18724 BLAKE2B 1f1dd380e7d668a0c2cff9134279ebda958b4bccdd4a65ff01f9665b45ec4cce8ffbd47eb46e52cf516c5fd5803561e6bcb60cdee21ddfbb8601a95d45500620 SHA512 87098ffdbc518442995c422120cef71f83069c8f88a1970ecec5105b0f284ddd92bcee929f5c230d5b90ae1ead7e1214c3eea26f4a8b26715a00c1ab8b09bc46
+DIST gumdrop-0.7.0.crate 16558 BLAKE2B 1c6ae5fc20365b47b6a3e0179e935270d29c558c986e3b82a3f4201793ac86af04ca268aca222d8711f9b4b4b095fab0709e7b3636d3d93cecd97b9b7778d6e7 SHA512 c4123cb660f367fb46d0a38aa2f9213a05af7371334869f1cc1d84f10c145eced993f7c5c5dcf3ccd1ae716ea900801340f610d2d829addf573f28f9cae1e0bc
+DIST gumdrop_derive-0.7.0.crate 11381 BLAKE2B cac3aeba79db7c6ee7f17642021cd6141173af801176198e8da5e2d120a62b220235cd161cd7a6f2f5ef9f1af035b9c8901a1a2853bc525a242cc0183676b614 SHA512 1c9e718dcf6f6d9c297f149aa5baf4e825154a0ea898910f912ef757c59b01024270b0f3d8ab350f67e9a3eaa8e6074bed310081faaa08e890213b01ca742039
+DIST h2-0.2.7.crate 156989 BLAKE2B 2f75a2f82391c994299e01fae5958dc7e21b78e38b8ade83a0c90698f54d232e6f0068bed88b98314e702bff773e8753c600ecf6b638b5bc1c7e692ef636d289 SHA512 6157bcd335d303246478f45b8740dca687f693dbbb462a0ea9560af12d1fe12a9c680c57c1e7ea0b0842137ee66cde827f273e0faa619db3b6180c5587bd0fc9
+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 hex-0.4.2.crate 13385 BLAKE2B fb185e0888736515b8c1c4c00f831f1a4a7b2a04bc0262c80bb2425563b3ca8059fadeff8660ad738bcbb522d432dde98ed6b14aa1fb8c03cdcfec6ae282a55b SHA512 b37504fa6e41caa77c924b24893a7b505330aa8c39501b3ac283fbdffa9af2b89ccb9ae004ff415af1c813fb3da222dba62f17bb3b6210a259661e2312d099a5
+DIST home-0.5.3.crate 7890 BLAKE2B ed1cfadae63d1fb0a66f38aa5440dd09a98343e3afadcf1495bf69f3ce813774c9a49776c6b3641001b6007c01e24ffa6d2600c1bab05c4ea3353c74ddae2fd6 SHA512 cb3b7b24db30a8b29f36f90a0d345b2e187f9e76f22203e142a77c8308dcc62e97b5714fb0ed890210b31375cf30d3362b8d740fe189079a6d3a095be50dcb0b
+DIST http-0.2.1.crate 102231 BLAKE2B ffefa83d03344fbdbe2e41197c2df7663ba45e6795e7c8a0c503fd666fd0dfcd05976d85ec67685bcb8486b0fbc1a29ad98211a51240e0439aab8a670d976c0c SHA512 50ebafcec96555e04749b612e221521a09b3f04899f55b79c562e07bd0d3d0a5550cb50425d2d97cf6b8bbb64fae98b59693943cc27a5c52af132923d82460df
+DIST http-body-0.3.1.crate 5394 BLAKE2B 9dd7a35cd22d22060762e17f028e9353fd66fcdc81c0fcb2f0361dc7ac86bab18b89ba774f28e2e2b451aebd01a31b01029587a3d119c5a30ff176c203482367 SHA512 0c81b2d8512be3f07d5b08534d2a27424fd6abdf175e9bad9a657b9d95a48e2916c8713bea8de3154520c7ebd097324de246a1d2ca6595f2355e1c93fd9fe6ee
+DIST httparse-1.3.4.crate 23739 BLAKE2B 3abeb8bd0ca381ec3e7ef73ae51e1ff803583094d0cb12f5f4641fc4b8a312c3e1bf176a5d500a9770057fc9f9e925d437ce5173d99052d97439e773b70773c4 SHA512 97ff294eaf55684412d4e5a00c4077bd517fb1d51c420231281af09cc1dfa65a64adb4a18441db426db41cca91bd7032fbeb9fda02c1b0343466caa9dea8d457
+DIST httpdate-0.3.2.crate 10768 BLAKE2B b435d0a530fcab46496a921a565c3ad8654cb39ea038bc942c8fefab8dee2576e9b157f203b376e80a10690650c1c899eaa29e5af75888c8998b07d5d049fa97 SHA512 5cb56c85aac5acc0e9e2c72fe0913d2faaaaeab10a15c0479407ab779494bd81f8e3fc9675f5990186a34689e841427e83723a87a91a5204ff57188e89be98ea
+DIST hyper-0.13.8.crate 139668 BLAKE2B 1dfab4e7dc1d14ff38cc796d8dfa619300c5edc110db14bee994a4a26499e5bd19c3349ea9e89237575c0f9842caaff6f8b45d70c3eb74f0838b47bda0e8b26f SHA512 6cb97297374ffc2de46a0ffc4fda52b7076ee4f27dc8dbdd3709f24469049def3b09de76ed1185a52c4fa24f8ce2fc840f106cd01dba03e3094d5066eba3f4e2
+DIST hyper-tls-0.4.3.crate 14195 BLAKE2B 9dd7586f873554af044a6ae96858337a083d9ed5f39ccc89391a6fc6ac534a2c01ca5bc750139598329cce8bfca496cb0bcd5c4e13259d3c9014762e2272aac0 SHA512 4b16103a8490d9b39569b589747dbcad60cb5a904cfc1bbd19fd6770bb7a67ea3de0afbe46b3f08f107a8e6ad00bf74e2049d99b5d4d1cd04f1dcec4b0a3c301
+DIST ident_case-1.0.1.crate 3492 BLAKE2B bc79ebeefbb7e3ed1139e3f41d8d20fb175786bb123bdb9c1a92ea70effb4a0e5e798f24b068cd66a1bf20d53eea4bf24de495b5568c2d649ea804389a1327ab SHA512 81003a43f18da5997d644319274502e2066af9f9fd1400afda7cf2986b3ae0b7355b932302723cd3bda2d46b264340434d9279dea58425bad13785698d5808a9
+DIST idna-0.2.0.crate 257203 BLAKE2B d26117124891f90b5e36af291c9038e2f4d46402c41380a6a89758459fd73839137e6faa401502be12dd81292cd9e12ec82fc611c0ff7a150510d19010767558 SHA512 375d6d73537a5c9cebfc850a2b561d57e748d80059ca27fe5e35c058cc12a5938cfbb39a76cfe57fbe589f7e36f89ccd91ccdb8899458c322e277c299293bc7d
+DIST indexmap-1.6.0.crate 47565 BLAKE2B 4b2c50788be5c5416973133c10caf092468444af6c101eceb5d2f53ec3502d73c034205186974efb335a1d8aa9a797b191a871fcfd573251c95ad1d13c0c47cc SHA512 f91c0d3588da037a2dc728c9cd823b4acf7edfbe7d59b28dbe1f5802294f2677eacf0ccea41235daa30b3d8187a97938653a040d8c9d2d38513440b2e82fd85e
+DIST iovec-0.1.4.crate 8720 BLAKE2B aa1b4cd98ebe47901c0959cf1d8eb2586a803d0453e2a8bdd5c63442b32886dbcb37650aa218c748fd45c9fe3a7fdf20569eae5b19716487b139caae1526da4c SHA512 e23fcaac239807daea20ddcf2cdd4fb858ba1aa970ce6248f70f0fba5bff7ebdb27247c0997ac0ff2791178f86ff9657e473d8f64b86c644763e5b3474edd158
+DIST ipnet-2.3.0.crate 25031 BLAKE2B 064888a6e37ec67f70baa4d571708a9173cc788921260511d8092a0e32982a0de4cabfbd28e17da812e1a50249e2106e82f95981163a0bbe71158b1bbca4158b SHA512 ff77e4ca8ae0fe1a8e9969e8e131081a092b258f64a7211d550d3338ece61dbbed499786b5e97a8515c33797e8cf41b4e38d7832e0d1b18584b0e5231c75a22c
+DIST itoa-0.4.6.crate 12167 BLAKE2B a0ab539cfdaca0a61fc55afdb74ef3231d300452fabbc747cac16a51ec74b4ad5c877e2b2a35f3087693c7eb55b5c389b5bc037b960733ab2afa36ff781591c2 SHA512 9085ad30313a2904fc60a85afed99c7388a345ed50c988f4e7307b23b5f38b14bc9ff64edf02b85fda6c363e035ac314241d5dba4a6e2dcfef3d2648cadb9692
+DIST jobserver-0.1.21.crate 21228 BLAKE2B ab1a6496d609e19235f022e920495e708571116e90f8c036edb5f7ba270c2ac938f7571e89f3fb714043c87623d4cbf1d404067ccac6a8b41e4a6768039cf02b SHA512 944249819e1e3dd09495ead941330e9abe439647c1e66ab7e2140c0c9e100b63f4f792fe06aa3c86f509f057df297ee2d35df0ccdfd4bd6a115b6a44076237ad
+DIST js-sys-0.3.45.crate 67143 BLAKE2B ecae52ec5f1cc7a52baf3d82915de57f9351ddf5e9fa35d279336ee2d2d5547e640ab8387d8d85ce9ed2ef02ad63d985d26db0df81b482bd021f8a2bb260dc28 SHA512 34d27c11bbdbfd7745166045ee20c578d3b4b917b5017a24d55349b5064d4f4bfba68dfaf1f16ce7df06ca88f727afd61487e96cab0e480447fdbf920a0ff7e7
+DIST kernel32-sys-0.2.2.crate 24537 BLAKE2B dfc4a1e31d3ec9e2ac62b890839919fb7fed1444070c1dcd75bb75acfb53556d6cf2eddf5a6639e7852a3df2a0cc715c5ce1d3fc898ef16a1687020d98f715bc SHA512 682bc7c629aefd035966a2873518fd60719121cca7d63d89d6c97ff5306f24d8b5055a3c91b4eedaec22b1d5dd3fb8b48ff7341a05bbd72d86e06c422dab473b
+DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
+DIST libc-0.2.80.crate 513503 BLAKE2B d4bb5f789efa230ec9a7a2071652fc1e344669e5dfe3a2015694a1e8442cd5adc142f1374841a4f01984f132f0ad5f027913b201cd624f97e93d2bba31ad96a0 SHA512 69b2f4c67d29bd4fc8f6d0388036ac3ea0de2ba7387f56f4e4bd035696ba313fdce10d18107ef83490f574d6fff796b305d5f2c2bb03a7cf33b9136386e65b8c
+DIST libgit2-sys-0.12.14+1.1.0.crate 1603930 BLAKE2B 8fd9366e09a8d6ab9f3df865aea3d9ecd43e4c2a339597c939a09cc36c28146e6ca6cd94656a9d17519b008fe65bbf6901ed639308b857a68977de4695f477e5 SHA512 d0fe6243b07c0d0711e832f4efdd69701c27fafb7df82d6010f24f79393c80bff3fc5639707863f2a8073c57bbc9fdfa0eab32c64eb053799c1c1e08de5c9854
+DIST libssh2-sys-0.2.19.crate 473458 BLAKE2B 952b353b3f8a6cf9007aa1ba7483d692a1ef12fce29f41724d8547a7d5f2dc3cead52b9fbabfc5c1abf76c0249eb0f1d74839aab7e2a9aa859bfcd8156a2a730 SHA512 d545a025bd7cc774c0aa3afbda5a1f63872a89f9c8417a770e21264b3c217e7521dadb1ec8438664d2010f16767ddf881db67573e8187419a2acb74b5a28b162
+DIST libz-sys-1.1.2.crate 1339299 BLAKE2B c055fdcdeaff5d44cc95f6cef190094317644e4881f356e46b0c0347221ffb867afcd29ecd4d995bf397f714b705ce84cf34ab87010770e00b3aed1956fa46a0 SHA512 2342c738230ac570c61b466920e2ceafc0194381643540f094f6541917639a4f5b11d46d575bb03c7623ce109d376bafc3076a9d172233313e38cb6f49ed16db
+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 maplit-1.0.2.crate 8871 BLAKE2B 3cf975d35de2d2fbd50227a6d2c5e72227e99197b620c8f29be97bd3666ec162deeef0d9e6bd327a063f175201beeb73c4ed27272449b1df0b78238b2d36ca22 SHA512 917b5cf665e12b687035c895b60b2ae05622963f495f5693515fd24d56f49e95a06ffced68606d061bd20822c655100035930673fd4b0d4790168763b6961a9f
+DIST matchers-0.0.1.crate 5039 BLAKE2B 29fe248dc3e85b1c7ca5553f5b49dc2a904cbbcc44a2b6a426c0fe9aef56454ad31acddf9f14a447516bd7687107816c3d46b0f9691e96bc7c7b607cd34cae0b SHA512 a5143b4e6f9131582ffe3d77b14ef51a557cf48d794975706a9d51e0d477cbbd2022a2416e940771911cf99076696f9eefa2c866843f0ba7028206f933674c10
+DIST matches-0.1.8.crate 2216 BLAKE2B f18176110921b1cf6e58d52d12f1d1a3455ce2dc04421fbf1b392f66cdd81a88e924571fa27e307a06301d83b04f3b8a0ca3ae40d2da6f2decb8aac4e2801fbb SHA512 98b58f6a2694b03a7dd1be69ebf7e3ad14483fc8e4cb6e6c26a4937e4e660e843efb4dd04a7312dd9659ca02acd3775678f73b8faac44a76ffafaf873c22f590
+DIST maybe-uninit-2.0.0.crate 11809 BLAKE2B 5e517b8c59f9ae4f1a4f86b48679ea64d62450ec2519c8caaa914479ce9e5b3aff24707e2e37272ba74bb60499afdc602fff17756337b0c50a9184edbd8b8805 SHA512 3006fc009c7c743d9147a4122e677cdeb2546f7bb46963b2f266839614eb906f9d763c161044fd0bf3f7b54124ac0734ac9ae7f7151b1a7a5f45cbc739976434
+DIST memchr-2.3.3.crate 22566 BLAKE2B f952070b98ef30f0d2780a6efbeb36d295710734f678517d913a8002cafebbd3cfc38975fc4546d306efc11bc815764d14320af3b7a2360bd46fc2ab3db9efa5 SHA512 922e05da920d0d94226857788878ee5e31518cd80d95ae57e1d7ecd233942c37d01565525db2f1dfdfd5b3b1f81b2c73eee058cbfd745cb4e1519518318df248
+DIST mime-0.3.16.crate 15206 BLAKE2B 9a599ca82fd0dd6d3d2dea68a47b8441b1024d016ee1fb23cc6431b39ead20c9b3fe1ff3397af79c2c1b2cd277c440d4fff69f6b28c550ddbe15f680923c834b SHA512 cb1d691610cb82720e553247336fc5eab63407ad37febf2eb50aaa4e329cca70959ecd8bb8c7af5753acec2c8e86fc9a0f8ad9ad2de93fe9295ce84033d6054c
+DIST mime_guess-2.0.3.crate 27437 BLAKE2B 6f9176749241dc9b8c08eea3285ac1aeb40ab079f8184d93c436c00b205ab754d9c2b5c481774837bd1c4522b33338fb7ecabe88ee2da471478cdc1391d9281c SHA512 b08013ce235e66eaf49a88ab4c5cf4d1f1b95846c1bbdc1a73efea9052058860c7dbe2b028fe1b33c713621862fe9af2ed097558cbf5e08903ee406a44af162d
+DIST miniz_oxide-0.4.3.crate 50058 BLAKE2B bc7a152a984de061803c11255459ce3d8fa64dd5b38de9f2ed29213abc1922d68746ff523de3b99e0e95a8933ea75448a9fa1e14cbbe248549074cd5ce7b3c1d SHA512 8c0e2b3a585a0986a61977d4459adb1a7c396ab53f4f688dcbeb2a09c60878b0423f54fd1879c190f5c64690a2473ed2a07d4162a650f6c39f402f6b27e863b7
+DIST mio-0.6.22.crate 102782 BLAKE2B 8a088fb24797f4b16b6da28fee56a1c8bf1346959905c3501e3d78d16d169125c03495d9e21dc9da4fb6735a48af38b2883544d1c9ea2486d48542fde6ad47eb SHA512 b500b0271779942512c1d02756ee4caf4e00488f6929a06a7be8a46cc44318edaeb80abfaf6367d7201978a3529a6b5424679e07b719ee8194f0dc37aaf56ca5
+DIST miow-0.2.1.crate 21133 BLAKE2B a60f04feb5bd98eaafe6123f7579ffb0287b0a3d1de0dbe1b504141d76dfbc247891eb6dd87753ce5d6e2ae0406387ccc8684a91980c5ef1ad6610c29ec9e3bc SHA512 b2639b1976274b7a01ec3ff7fd019087775e3bc5365101b24db480bf9c9b66e8a1aa34405d44db6c2be753265a5124054eb37870b84cae2c63fb6b36bd5c6d72
+DIST native-tls-0.2.4.crate 32170 BLAKE2B ff0e24edcf4b1014e95990dcff7a5f2139bd3623b6b9809cf8fb95fe11720b8fbd0e563bfdfead36935e4d162b7c0829f51934d8ec191ad34bfe1d2ad2ede4a5 SHA512 810cda42159f302d315f05dde222e3ee20cfa30958d48bc547837f7d6df87a1b51d1239de90cc2901f48581be978c11f8e758fd69213a8a8fa85c71266302632
+DIST net2-0.2.35.crate 20660 BLAKE2B 8bfbbad0c8ccd364f1be6fd67b3087a0dbd7a6301b8133bd28cacca3d32a5baa9dcbbc81cf957bf1591b20512f283e3fd441190e33c3ddc09dea3f9bd5dba251 SHA512 5a5b4ee65654fec31d820a71bc50a0d81555ab661e4d3c1dcafb048588218d6ba347f1ce5423b092f078f3bce55f7c74e33193d1924086bb1d43a5e6efc80540
+DIST num-integer-0.1.43.crate 21966 BLAKE2B 9e88ee3413965cc05fdfcfcbc7e10225ec52de4f22b7078b9974eaddcd26869d72a9c68f7f19b8e95cd6e3edea8c0066fcde80742cbd3873ad8a0c19c80b399a SHA512 e0b1efbde64ce150a20fb937efdb89cc702b90d71448227f0212bda06ff88dd6beaa02d3c973ae5430d20fcb5a2e4b611d4b2b225f5d9936a803e5e67ad96fd2
+DIST num-traits-0.2.12.crate 43807 BLAKE2B 3913a6c73a928ccae330ae4592cbaf502bf3e6e43f1ba847a02d317003074a07d0d4334eac6e31a5a9220186c44e9ce80111d59203b78e50d4abfc6da4daeddc SHA512 98fe81a3747d619861c3b2789253465eed68c371d74f719885a4b5f09af1abdeb0a147baa52fe335dd4f471f82463aee65fdc9e44432dd67248d5f43e4b85377
+DIST num_cpus-1.13.0.crate 14704 BLAKE2B e7a26e597ad5e45309393a9500b031ba64a77831320cbb96d7861139a2f7a453b7ba06a3255439b43ac1e2e36269b0a350d514020d3cd82c2513b57934b3ebbc SHA512 e75ec298fa682be84bf4efb6cf40126da9233ef25f07e887c2fa7421ee78790204564e6406c8219466651f47421e27f69eca690bb9cdfc982b644d78cc10de3f
+DIST object-0.21.1.crate 174624 BLAKE2B 87c4cc5e26e81eb91c3a88f0d1c28c080eb99ad245389be5cbe17b27707857fc096d02e3051cadbdee191bddce2164e77c4f521dafd8ea55be032f0748c2a006 SHA512 a2d625a2990b5f2a67f84163f6bce721eee9f699c908c3975f2a73822c0218848fb1a77fa6812a400a35668f0ca562834f1225f6f6ebc74b9c6ed4f23ebfa670
+DIST once_cell-1.4.1.crate 24366 BLAKE2B ad569e1d79ec41800a62a84be50d1624efc19e2d08757964e84eaf8b1bc341988636723de8f0c87b37cf72dd4a4fed9a4623c6deb2577172c3d85fd6849685ea SHA512 7d075cb115e6146a9e08e27fe123865bb54fb73c1da6c84f3ac991ff9f6f83bbb55245a9741279a12b72f143e3ed4ada3da7b13764e7655dfe64b70c5d6c1958
+DIST opaque-debug-0.2.3.crate 5643 BLAKE2B fc0cf1ca373f2eef8a37f6d7eb02acc7cbe4d71f7844e01453c036c7595121272c207023f43ae5287b343756ca0a8bddc53c5e0186e95c75c019268a5f716087 SHA512 7aa44aedd3fa5a6ed3d60239c23dce4cb7b27693e110140e6b332579bf1c1b773244f12271ced975e53caf68f3f381a7edaada573efb982d2e13d638a3a6dd40
+DIST openssl-0.10.30.crate 191808 BLAKE2B a6c76278f0d5fa3cb27eacab96d6430dcfb04deeb37cb8c6ecdc9b446f1bc8c44a69dcd83f50a8c50c56a49e8950303e807f05e90de3040a616f9c47a2f0caaa SHA512 058e9a483a9d0936e77626698bea5049608a9cc4e59a406b39c0b678f78c9207c5604286473dab334fe1d10d850fabcd786c6b54888a7affadb594f9459f5dc9
+DIST openssl-probe-0.1.2.crate 6427 BLAKE2B 8df00c8ab6af7887a88dd1672bf2c40c6aed5867b0b8d07dacc94b80591814e2fee4ac5dc775ea0e98cc33641b9eeebb6d5979d34717ba400b907358ceb2a469 SHA512 4001eeea5c4f859559475b4b1df8248611bd44273116b31e7ef775e02918cc989825989868f331f0f0e387787680c1e4ba721ac0fd4695f7363005ccc0815d9a
+DIST openssl-src-111.12.0+1.1.1h.crate 5099166 BLAKE2B ebc8c7591837fe78d0475be4196c2726f7985aaa2f89958905f3e424f384db17dd468b5f50694fa1115f7b8db770f6bece06b053ee3b3aff4c892656f9e4beb7 SHA512 56091b8503bb5486b82b5d32b66770e1650beff2f6875908aa5c949922ef828b20f6766b28309a3d03eb3b2c255200d05d953f965738cdb636a3b045c5e8078c
+DIST openssl-sys-0.9.58.crate 47014 BLAKE2B a66f90a5cd9fc82ff22ad7481ca9e4a92c78852d25ee4151c09d5a4d23823942c28bed5d96d5130eeae005573d7120e7e5187a071ae81ff10572cebcc7db8b3f SHA512 098993619ea8effaa03ab61a0eaebc938d23cb8e5284b2dd45499972ae4c79abc36cbeeb51f34861a36816de9d02e2cece673f32fd042880669e99cfff181481
+DIST owning_ref-0.4.1.crate 12658 BLAKE2B 42bda4584b2f017e7b48bfc1fab9aaf59d49b8942eceaff6f6d95e5e1fd456d952693ef70ca1a496c48d3bfbf69604dd47adb97af31fdd803a6119f11503920d SHA512 15ecf5c53a675f7c96f850f54bea5fde63f8cfe22ad5c01941f67695154a39950087bd72bbd9a2f9e76825a3fb8dd1d20ba92335f265f4aa273e1086773b918c
+DIST percent-encoding-2.1.0.crate 9748 BLAKE2B f3ff35ac683724b15e40c85e0fb8ececb07b61beeea82b7020f02d27df05a8a3535f157b3cd688533e414d6541de7de8640ef4756706d8061af0fec94ba04ab3 SHA512 98af4dfa7c6a3cf0d5aa929c436f9eb1ba1b576a944513f1284e6df2ad06be7cab9eba145d888d50af88f8c970bacc702b323041bec6d4fa1dc34095186c628a
+DIST pest-2.1.3.crate 77986 BLAKE2B 210638cdc2cc5e389d2248fbc06b8163dd5ddd77974a04d32f674e7f959acb3c5efc7f26100b6ceb7c346ee06a39db0e11ad5b793a1bc09dba679e6a5a4aa2f1 SHA512 08a36d4571cc0e912ae87e1f2116424b3d4139b653dd9a446fec8ff39cd9a691e8305c86cf75d227b5349197ada4ce79912ac25f0726b98a0642981ac4673c83
+DIST pest_derive-2.1.0.crate 14049 BLAKE2B b85c5a625579e9bddf22ceda1ff808e33989d259f07ddfacaf833ee313029e1a8a01f824da915cfd3d57de57394608a9b506589d642be30e8d5e6a3afcac6a9e SHA512 4d554921b35b6c2491f56b859d389e93459552807df6ff989f9913a9314171e5b6eba93cf7e03528973d6025b663cde7b841d38fabd8197c33beddafaf83fbba
+DIST pest_generator-2.1.3.crate 14227 BLAKE2B 2fba3732d71e6036a911e6455d12ec7f4a1a14331b50f762fda1d6dd244269106130b72025d21e684bdadc0b5971c4b19ccf1f113067c26aa5f1ac71c78def8d SHA512 8be05ef3fd59dc4ccb7871388f8e3cb24cbc2f64eacf7a32fb887f1d8911b528ec545fe78bdd7beb03e2c04eb7fc0ad98ac9fce8579f95ea71cc280912f07c3b
+DIST pest_meta-2.1.3.crate 27818 BLAKE2B bd96b36d47e39d6f8cc6f07ab373d1bf8b8f9907afb8b3774f62677c800914f40a0b44531f50b065ae9d11ec77a940da865b5a574d0cb0d2dc51059f718fa826 SHA512 f31492b452b58c632c0c5c3e357ba2b41ae2b5816d0ec432c1a281dfc681c5b5c2ab4f194c1049938e671ac232d85667aab91323e986df4edf6093a4e2d47ac3
+DIST petgraph-0.5.1.crate 147173 BLAKE2B 3b74b2965ecdb37a82439111ad849581254698c8701d8d5bdb050f4a30cce05016511928443cf65dac394dd45584279a933435a77ef3c610a64c73cc5a68ff9a SHA512 c3d5f53b1a0900084b0693a6f3a849bb9b443b1b6fd1ad88bce8beb12ed1b45f2399b68db3366ba15f33c2d5682e052b733dbde76fb1b646b7bb1e660a38d8bd
+DIST pin-project-0.4.27.crate 50964 BLAKE2B bc0e87a7941452591f53bafba891c758541034ce83e3849e8c6f1894e46c92f0391f4fbaee6d160706a6e7b02b39e9ff755efed35431941c96a20bcd2f2c873f SHA512 ca6537b882f0c7ce0eb0ab98e9cecc1620f168306ab1fafa7a4db13e092339f172874a30ad598db18d697898b5ef82896fc70a1b6f8e08ff0068f52a3ef5aa3a
+DIST pin-project-1.0.1.crate 54113 BLAKE2B 25bf02111564c93a70553e268b2a79d09d69860baac03578ad7e1b6100713c7bdd9bff1f3c49dc698b7c6542f928195dff689bcdb2dc1d80a8c5f6cea2f47193 SHA512 d20d96278345f3d2a8f5ac5883dd54fb06065f8322a0cd90e1d22b1714f0f8d9c9556b5826f35c22ec6d5ab9edb43994944b63c2af59d69c60b8ad8d068e6e62
+DIST pin-project-internal-0.4.27.crate 29739 BLAKE2B 7bc74da03503b3d8b5868e4ec297da0b69affc30a80827d220bf19e97449f30cdbdddd9c13fb2361717d152905daf373655b3df4b336c97b2bfad89a55f25c0a SHA512 435644b294be873247f2bc351a7463eed995aefab8ebe30fc29ade1ae18564f7c92bd1ad2635e2eb9d018f4bbba0b25549435588913767f58862df1337f196c9
+DIST pin-project-internal-1.0.1.crate 26953 BLAKE2B 43db832e24f7b9d7d4b8e9fac0045eeb2437acb806906d6574a8009a5078ab5ec9109aaba2c26dd94e8a564fa1a94c30080dc08838981a63998f7686ca8b6fba SHA512 7cc83086aa89bb51417f241a70c5814441d23989ea6dfe44cc5edc8ee1b1514191c324230b814f0dc3f65f076e5dcb45d05a75165b1f18429715c6f0ef4ea6fb
+DIST pin-project-lite-0.1.11.crate 25308 BLAKE2B 19d66c06d39de9b510d6c1230d3a0619465aa7317cc583d4852184b2a6d9f804598b908816131fa9ff96e3074cbdc8bf7bf3f9f775a4bb76d686b10e8b6a4edd SHA512 c2621d3b8ce8605eda2a117f2a60a41a59185279efb8c8e1e0bf6ea1a73dd3c81ddab62d5dfdde995f26071342f0962d602fabd4ebe97d4ca6c7e6b4f3ad701b
+DIST pin-utils-0.1.0.crate 7580 BLAKE2B 457e1287202f16d1873b24bf4f1de1828300128c4ba3131758e64f9784d36d47365f22d85493c3a85d854f0d8dbb4c6cef3a0f5b064014dc03943e58b7ba9178 SHA512 828422b8440cc82ac6b0743e0112fa7540d437aed457564999092b1462cd7672cd6b1f0201b67075431aeedd3d9c5127468a3dd028744109944f7f023c82fd70
+DIST pkg-config-0.3.19.crate 15451 BLAKE2B dc23b5ef12719b4b3d2fc5c93c087399ba954a5e127be91b26619466d5d7422e71684d02905304dca65273d69b66338d94c0642e3810a14df845ef507ddc0bfb SHA512 42bc13c4e39c8f71690db527d815884acdfd2ccf5fbfea700c6ed60257e852cdcb1c443e7774409e51da53612b0ff0aa165554b99fd0cba973f94a8df52982d9
+DIST platforms-1.0.2.crate 21194 BLAKE2B d86526ffe62478188c2790452d37b1e720e239bdb41bd66300d4ebcadeadbf5c853a6d81685b1d599eeccd802498fb089149e1044cf4a7b8d36c69d8169efa60 SHA512 19350b75ee0423ff433668f09e1e715a6f0e210663a6038ee1e2613a447de3fdcefbca883eb92ddc05627b9cfb725a8010d967fff646779be143fb74db4d5a95
+DIST ppv-lite86-0.2.9.crate 20933 BLAKE2B 493fb977d0db8eb4699893ed1d05758ee7cf1b5610b767a2ec352f3f430edf3d1a3bacefae554fb16eb2786fe4fb9b574c7b9961458a938da9a79b9084f062a8 SHA512 d9fe88a221733197b43db2a2a608dd2acdd9aa37129af07ad2405d66171b6f9f4c1a61530013c7f9ad69194a2e52e7480ba80c696e97cf2adaea7677052cb010
+DIST proc-macro-error-1.0.4.crate 25293 BLAKE2B ef918c5efaf2545ab38787c8d0c07315af00431139e4dff66346bf798e3a429f91d12a79776c150412fdda0b158a72badd5e1044ac4d6917f8482d4b5a7110b7 SHA512 8a47bc9d3e24e9561d1e384d8f5a633284c2cf9b5e6733c5f9d1dbfe1870ccc8e2152482852e50b551cecb68e009148585b910ffb0508a7b4875598eaf8657db
+DIST proc-macro-error-attr-1.0.4.crate 7971 BLAKE2B 98e2925881c2be186e22c2c439697e91d43f807eb61a5d13e3b0b4321ed50a74f3d699942c04b89b6fea0f156bb5d19ebcf22f9cd4b98a7e6917c437600ed823 SHA512 2606afa9ec78d7dad4500c98d3a5ecbd02c6b53ab829c742bed7f57b322a95238ab4e01cf268746815f1424fd9b02eddfa30e72f98c66106f57765f3d3116495
+DIST proc-macro2-1.0.24.crate 37716 BLAKE2B e2bdbc7cc9ea254529e322f6a2eb44002b4994fc4a00df32012f66740e8e73ae70820dd40b7fcfcf024f3c7784ab9add5cc1db37f4c72d5af5c8f00164ebc145 SHA512 c3d23a5136c55d734084ce1d76d54f237fc1003074af102c2ad96d851ac496ffc7513ddc505a68af4051c9d6de09725a0ecb6e76ebcdd77a1c056f8f9242c9be
+DIST quote-1.0.7.crate 25170 BLAKE2B 9597c94ac365bb6e9d632738a88ece2da7818cb9f3fa0e755324e693eb513c76347032737025375a486319caad13c22ae13bcb257703eacdf2fdc755cbac0de2 SHA512 b7cb576c07419854f71072a88e4216f50d78196703d3d8a1068dfd0f2ccb1e417c3a865ec3be613b46e74e46654f64378f527800701f74d50352cb766a885953
+DIST rand-0.7.3.crate 112246 BLAKE2B ecc7c1bd70ac874c03bd8b7faa3016bb2d5ee5c19603280a12a45a81598f706e445971ee081e6ca410ab6f0f5f7a06d9315848cd556a2d8522a82024f6ff91e4 SHA512 f9b68ef9446f1ca2c8092c50990f15c1b4cb5529eeeac4df8d69755e0b7253c663c587775e7cb0a7298c31edb444975dda34926759306541f6d43d0d3cf57b7e
+DIST rand_chacha-0.2.2.crate 13267 BLAKE2B 7908867ceac98243ade22e1b38f1903fe0249324484d91c948a5058a1e099e5213f325c5ba3400898c8319158ed69f4ed064164f235470856a8191bd990d5a10 SHA512 1e2117442e4ffdd834dcbf0ea1829e73202c0ff9041d5969d81a59330242145f2753f2a56de2fdbff65f26cf0d227c7d08b2094ab2f946b764aef88106a6ac84
+DIST rand_core-0.5.1.crate 21116 BLAKE2B e74791f941a79971f2741172d489d546373c9abcb0dfbffcb7b97b858ec800b2e0c97df4ac636f3aa1b8dd6c14685edf317336d577f31b5c6cb7d89a157e547a SHA512 4f7500b35e165e6c817fdd67a50745d5497d24e554bb554705097e37258751e8755c4d6b8a69fcb5e1977708ba78620bc35d640e4e018fcd4e88d9dbdbebdcbf
+DIST rand_hc-0.2.0.crate 11670 BLAKE2B 55fd048f2524cecd4f0e17927a81111e3070a8cc6a5b0234a46445400ad5527194edf8c91fb5ad6538f4958d53044ab02424f61a38adb2931e2cb7568c458ee8 SHA512 bca185612bed5cee4da76fb68fe854105da276f5bf2da464e596d586b925df798cc692ed881e276ab77c36b4b0551930966c93656be122ad05899d87853533b0
+DIST redox_syscall-0.1.57.crate 17087 BLAKE2B 88e3ffcfd752e757f8fadfd4edca367f9185f09e609c329bb36f179183cf103dc182aae701c14afb717d2b4c3d72ba307b49fc671cc97aa7c9d03df1a7a1835f SHA512 c6e187087060084b7173ed0d9d0e982e4259d4f76522112268c02ff20751382e3bc8e119da6153170f5c54bd5b9cb028910f2f85c1c842099205dccd44659184
+DIST redox_users-0.3.5.crate 12644 BLAKE2B 093141c98164163dc66378f2ccb48a5f478c5b40b69ad4ecb89fe8967e4a309974088ea5f7a2b184b625fc03348f2e75b0809d3683696e9b74d5c4a5ac6a4e8d SHA512 d90f1816205a4f2eca59397f6866e5cd965af652940f56930f8bfbe2b50eda75cf78b09200bb69416a35cbeead3cbd4de354805568be2feef1ae4d691b9a6a3c
+DIST regex-1.4.1.crate 236871 BLAKE2B 1a232e6a83e02b4fd2189142eb2e20d3f06d8d484f9012661aea99c23bfc8d56a04b993cab6a3fe85d29aca38a1b3ad5a8ea6cd5bcf3439d5d173923af9d9d1f SHA512 eb8869031ac156f10e8d031c8f5e5fab66575663b7daf4a0e86523fb3dea43e11c7bffe802d5fb7896e017e61afa856783c0541a1d414d91f322b2fbfaf8e249
+DIST regex-automata-0.1.9.crate 114560 BLAKE2B 2bbaeaaa896479c817b7bac2f51108f8f74fda72178068c3b5e599b466899692fba8ff3ce8cd30f1f978a944a0df98f466f3d4bd340bf595d6f7048ba6f648a8 SHA512 53323733dc2f8c47ec33b5b3aefacac3a0042cff80c59c3a05ee02b581671dd9a6ebf6b0b5eeddf9cd249662731cabf5a684553daeff440bf8d1d4d296afbeb0
+DIST regex-syntax-0.6.20.crate 293727 BLAKE2B ea19fdee49290481d20230e58da22d32e0cb715a93a67f98687b6fa8bfca5fea77d82399485a6be15b2a24d21fa4635c60cfe05b7132128e36a770fe86bf3c8f SHA512 65cfd5c493a066801a290d3663d5ceec738558ac7f3af9f3c3773065d9b6b02df006bedc556ee0dc377c032cf934426dea817d06f9639b837d7864f966ec94d8
+DIST remove_dir_all-0.5.3.crate 9184 BLAKE2B ab7ef94e0230ddc9b363f038254a180881bbc20eb04a254f97e6f71ed491c99ba1c88f5e85632d450243882a4a0df63f3b8b183bc1fbca9caf30ec23d577b1d7 SHA512 50417d6d8a33912193a1ed37eb72b47431b12ae65d2780cdb7080c3d141e63819da13751c3fb737685cea322f70b36d413389c3dc01aa12b4dce615aefed0e2c
+DIST reqwest-0.10.8.crate 122553 BLAKE2B 416645701f008cdef24b464a786a0527892ce5f89f7a47fc593e073e3545ed6a57d0ed6082d1e5ed99c696ded6a6306a042fd7fa720f8afd85943be154a4f6ca SHA512 aac1df2e57096b85bf963bf9473d676fffdd524c4d4738c2c79f6a2e277e69ec8f896eddbb809a5ed0fd32f05a61320ce259b6d5dfc5262b8aa8cb678f9f76ce
+DIST rust-argon2-0.8.2.crate 28291 BLAKE2B 65b9727c348e1593bea85bdcd65b21ff0e667d87d1ff88692165d49948fb7b9294a4a4a20dbb824a68a2cdd59ce1c1483d6dfdc31d8f7800c7e34cae78297a0b SHA512 9ea8088ee1caba0cac453cc54f7e7327471282d0a8a65944b1c911f809bdeaad7e9379a399d215533e3c05538c9b5b7fe1f9845b01c580d76ada61ac8a24327b
+DIST rustc-demangle-0.1.18.crate 19913 BLAKE2B fd0b955e9f552d5a3759dec05bf5f971d151efdb8098b0b3fba0ac80f0034c4891c575ba1247b04d1271fbfc8a1585f4a65200ff3836946aecae1cd653c7a1e3 SHA512 93ebaf7630c99b6c83712452aca26a42d9a173aad8ba7e85954f65e7867486519013aae1afb0006a0507fc3d6a4688df783ca091779bc0f316c5b8c4be95b793
+DIST rustsec-0.22.2.crate 42887 BLAKE2B 5c3cf97ee435b98a52cb7c17685292f80454ad8e2c3b6108e03c6c628547bab0fa08a1969fcea94cffd0517e3ee469d4198e3b8555186020f2b75a48dd3b8999 SHA512 dfc38c660f9f77ae5c545f98718b01a0012374b47ecf076dc62db911dd1d02907bb070fffd338c14d0fccd90c881aeff554371022aa2661bb798580c7df3c1ca
+DIST ryu-1.0.5.crate 49570 BLAKE2B 3bfba4a5f290a429de7ac3b86823b2a973f40eb6f48c15329173d95964d31ada36f2618be4b36774a03f97f2ce61364900c6a3ad5465a294e2df311a1f4104ed SHA512 d1708ffa3112a684edf2956b6730ead040401d38f1457cde074eaaa59c249007dc8b925629e7f6df89f7ea757e9d0826649d685cc8ede0a04d50296048bf476c
+DIST schannel-0.1.19.crate 42755 BLAKE2B 11503202bb6c8fdff3cc716558a5c00ca7497f7aaa4890d332084754e0d1e1013719d5bd744d8aa12b8b042401f4828fda8453c104d5feeb9b437d7cc51b5273 SHA512 319d9931cdeaa0f6b50c46e413fed2b6e97b28fe8c4825d4e5ed0fe22083e686e124117bfab7c89bcce815a31a3478f8c230cdedae6a852a31719a0df34645b0
+DIST secrecy-0.6.0.crate 6607 BLAKE2B e94eec38aeb39f9c877b13aeabf9c93213851a7fcbc2cdbcb452aa1c4c7707baac358f7f24c80f18514fad4fab7f6526a32f04fc3213e0303a08322ece146d8b SHA512 2a049dc400617ddb7a9a24faa27d1c30e7dc713462cf5f26e95ea575ba7bcceb5ca13cbc76b77e927b5035bec8863362793cdb148c360ed9b6c55d6dd0226b3f
+DIST security-framework-0.4.4.crate 54841 BLAKE2B 75cc13b6053b491564b9e5329cf56c2da8800e61980a7030d51b09cabe2275a33844a4eb8b030dc96292c54211a37c2e638ec7c2dc4b1f650d57b4eb782b7413 SHA512 d17788d1300ce6d6a552f78b278f50056800aeeaadf7039576ce75e975aa371c2c9b86de2aa2c96e8b208d9240d246e0230f8788372f0e0f800d55a7ae8b7955
+DIST security-framework-sys-0.4.3.crate 10508 BLAKE2B fc49b876d89f479c8654059163566d4b7db870dcc21d7e1061ed92fb6e9e1e8751b292b726020f73cd931797436f7fac02ec26ae7306fc826e8c4063cacbc5f8 SHA512 a849f53a0d222299a83b38c55dec7d1282027c7dcd962c8e638afb9aa2f96bc961e93ca2bd34bce424f408d239e09b7baaacde8c2ab53e78860dc31f6bd76746
+DIST semver-0.10.0.crate 20503 BLAKE2B b27e780828e383a0baa0edf99d36952a847b10ffe174c22d2680ecf5f723354e0ff5253974b07981a6266cd74d373d1993eeb145ce795201bd8e43dd0e15299b SHA512 75e39076a551cd1f4e7c011e79ac762258b7995bb021298cf2fbc7b3bc9e6715ca3c5165429834738f1cfb5ea9fa3daf173ebe1e9e0f04135845c89675c89ad4
+DIST semver-0.11.0.crate 20826 BLAKE2B 9006a801dab95e7a28605f623984b467221c3207b64af251bce3fb4fa74f731c4a3b9f95081bac59f754fab215782856edd98dd763b66563010498b97e8f35d9 SHA512 bdbd8eba37071ec1d24d372cc34ac4d82b6d914e7396ed51276e80d4d299864507a9d837ef381f6c4868981b7ca35514050ab8d7a621d43697a9c4b4bd5d8573
+DIST semver-0.9.0.crate 17344 BLAKE2B ae782bc78f29e45577de8574ee58959c70b54bb0b6f45a5a7b09cc4d358d9a0a80bbefc6e0f2a330e2b55adfbbe5c1f64f4ec9bb94c4adf7bb3e4fc9c142db6c SHA512 03a2ea563456f812c301721c3572370fe4934a22db60079da0dd6ffa33fa789e5e2436ef09e62fc35e0b742b06fabc290992c74eed80419a353c9de9449928dc
+DIST semver-parser-0.10.0.crate 20247 BLAKE2B 0352445eefc48dc9b34ce51a89e98215b48135e594db28d72c7729789b738c109b462e8ccf915c098a9b00c4cb3ef2182c1f3e8c4e8b64d85af042b752b607b2 SHA512 5477b586de589fe7e908291a30208c0e1d68f2d19fc932f81903233616a5e21fffaa5e6560f329ba07e4007182997ed90e1c9d34fae310aa6ccf47ee42e49b6f
+DIST semver-parser-0.7.0.crate 10268 BLAKE2B e46b7cf9d292f8fc54561fca4df8534dc96f6be920a5c869c405ddb31b9d1a18eab0799207113cf4910a52cc0df5017ab1bc1883a7c3787ebf2d60f09ac0ab4f SHA512 17320468ec6b9862d595f358d70c09ac6e09db7885fe0ead7a1e596f79350a6306e8bfde5bbd6512008a7c5454da1c7ae55fe1e3bc1c1ff02ac9df54c0a6121f
+DIST serde-1.0.117.crate 74505 BLAKE2B 59c5243dc10c00762659ef6352dbec857966540810117990f49eb1d19de435284151f8f0211000c264e7f7c6d3d4ada45c695384d397b31daae32d95efa13048 SHA512 77001954c9f1f7eb11c7a6293454dc0c581e536f4a07368dfcf62b744f42b620a6de8c67ca89138291b964d17f198274e2372fb72a9905dbbafe56276c5a9d5b
+DIST serde_derive-1.0.117.crate 50712 BLAKE2B 59bf7592d80ab2085899e256e325e0e43c69ba2134ff423e0612f31cdc1629e9d519be538538546f21067ccc460d07619a3fb2312bb31263a63ec4f624fad788 SHA512 072c761421d10c1b25d545991c0ba9ef6dfaa1a6fa8797abd4a2a194b121588d25942ce662df9b4c5de2fea229d6c06c7963224ed80e3fa11fac07f6dee3f72d
+DIST serde_json-1.0.59.crate 114956 BLAKE2B 27552d21b80d88cc3c643b25e5f0105c0d79a7c74c5bc3c2cdcc68050103ad73b75f7ee9d1d5afb60adbae33c351091b180cb1f8aa17c80f06cce4fb4c57f2d8 SHA512 2f9bf96fa770f9be9c43fc889e1671e9bb883f49a820aa69a1709d9f679f21f01cef2b771eea4d1fe7994cf850af44577710521fffdc4cc46d0dc6f913842075
+DIST serde_urlencoded-0.6.1.crate 12540 BLAKE2B a8d697cbe24c0b1dab0c0a42a8e2277e197821427647147eb9ce1217dc41635004f6374f1a54b00e5a7b6ee54ffcb4a2c855f8ac3177645e7a8cc1bd9fe0415b SHA512 e48b87717549d1b99f5759aa12b5c76507b26a6176a69f0a3c7297145b50b539344b43a827345096783256ac8053bf700505091c6d9d0e430bf01a990803d444
+DIST sha-1-0.8.2.crate 12338 BLAKE2B 90702eff48c15b49195b547d797976837b0fc9028f76da626e094b80d5d630bedee637053dc57274c27d68b8b6f3c443f1aef37c06b7aad895630bd9d73039b2 SHA512 65ddb7bd8f0157d134e70f7c6d6abf7aea198cb97da17b418a265642c5930b8cbd9c8e0b97b557102787cc842cddc93213d669345c2aaac6a1e7146765b2d5cd
+DIST signal-hook-0.1.16.crate 27183 BLAKE2B e275b3516c8e4dfb5f61f8d85c255237e152347135170d9ced8b9d47988df2f98e4d430c3ff4a6f9cc856943c0f662238145a0eb09c7e0b62ba3f91ed53e8237 SHA512 74e77b4d8d3c69b75b8e2517dffde35f98b6eada8853bb349a2acb5517980559a7f30c0866f06751f981958c05928f0acf9a2282d1afe43059e5424f6fb78597
+DIST signal-hook-registry-1.2.1.crate 14735 BLAKE2B f49dc2ab4801ad1794bcb538eb2eab7c8698be7e004ac9b01987a870ad5f0e0696d9f1f2e5ec5f6153953121d6f2a1140a2ddda3d35ab67f31b4a3e0733701aa SHA512 91a5a22bd89f8c04cdb78809d6610ca39e1111a356e797206c42f7305d57f43a8f1e6d5ac60ca9e5f86299372e86ff692baeabc6d9913c56ee92d260ee1ae477
+DIST slab-0.4.2.crate 10136 BLAKE2B e30cad459bbbb69c4b56a573c47f4188714e0da298d87015c35a86c9315dc2d4308f27d7758846069b0cf94c93f10c44b0f8895427cdf1c93ae20adbb21b5977 SHA512 f9fd70d0cc5180393cebbe87fe984de0c103db1c2c2648fb7a0ee22cdabf37a7338fd511538f00e9a5564365cce2879afe19bf77c435870197bd6cafef5d6661
+DIST smallvec-0.6.13.crate 22760 BLAKE2B 83e573aadf1742122bbe1897bee09867d9225624474cf8c9a1bdd087a8e69eecf9567e8bdd2bcecdc8cc08f5f4c4f081bcf718ab062ee399c9a09b7f8c54948f SHA512 497e1a77414d545b44f099a69529c6c9a8be8cbc80a84bdc9e85428263518e6949b81498b9ce6ab2795508b1c3beb5e7e5aaa3623bbed2c041f8c3f4a0adfe33
+DIST smartstring-0.2.5.crate 27051 BLAKE2B b6a43fd2434051e29efc70576c0129b96f9c06564fe6c344d79b776d90e4060384ad523e1a6c21c3ca9e9d7edbc338705303022ad2ddc2c8b4adfc50cb53b58a SHA512 3833d6d695066a2041ab94d36301982547e5ab7868443dfc1af6d0c96430700b63ae323e8acde2562cdaaf133d63851c3a5a325b0756639e644c8d26b973c8ea
+DIST smol_str-0.1.16.crate 11147 BLAKE2B 3ddcc079805f92174604fbfbb33748be3655de30e67a61961938dd8ca538ed09e002234c13d632c020bb555c0075cfbc8030cc58ed2a15d748ce8a299deae296 SHA512 32edb8b19c16ca899a19a83a2209deecbfcc1d2eb19452f4caded9ed062a847dcdde72d197904345fdad273c2504ed36e1a1cf791403ad2cc7775bd1065563e3
+DIST socket2-0.3.15.crate 29282 BLAKE2B 9ebbdd90073120d0457469907b02ac15cdc1805114fee8475b7be23478ed0215dbbae4506219d95b073f56f668e5b6b808f262da5c9ebae1ddce496166104fdd SHA512 dcd2ba06911d56ceb6859cd4053d8d9d32d485c71af86978dab0d4fd53c96e486c8729f93842711e8e9f2b0f8f4604c904c5ef2426c96660dbc05b3bed237d64
+DIST stable_deref_trait-1.2.0.crate 8054 BLAKE2B 287a65c3e5b47213544a43e57c60a54add60b4c2e3c8d042407d860cc950ba7ca01a2e67ce56aed6744992b61ec1f9aed3321e3d88482e33129548b7d51df205 SHA512 a13cfb22723f1f2cf089b2d07d657846f50c37bc0438d1a76096bea30214cad226b7a422c21f9e191ce87071da8a141d61882aedf9e0203a5fffdfda86a5fb03
+DIST static_assertions-1.1.0.crate 18480 BLAKE2B 358dd5ac413d06f62da0388e2016c5fcb8ec68fd7dceb0dbbcb97665c032b7509b7e083c20701648b6a9174485f117c02682ae4bde7ef037e80a85cdf6a0c86e SHA512 46d0e35f77941dee6f60f574c130472248063dc38494c1c4f84f7c048244cc2a58a86fe17c0990e3f0f01406b75ed385a13d00058612b27cf0e867c8d31c92ee
+DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
+DIST strsim-0.9.3.crate 10266 BLAKE2B d850a2d5199cdc2deae94c02a1934933e22b943750871c624256f3722e78878cf15750abdef6cb27a5acbbe95ed0acfc33f960305d08f942f2a4b066e93e2684 SHA512 8d7468be0f19819a454720d2fc9a139cb9afde9984f73d334b9b77085b58008d6d8ed0786f88ef91b4967c503fa1fac0ddf2fdba01391629f7bcf1ef2fe36b51
+DIST structopt-0.3.20.crate 50699 BLAKE2B a88142017ade95e408477282e6a5447c95b51337d558cd0e098b42d0d64079992fd3d9de99a2c7f7264f09b40c6a3251e888562c8cca3ea5bc901eddef18b700 SHA512 cdbd409fb5443622184a21b108c6ed854676912dc599b0dfbe3a4d229184f3690739dc931c80e55aa43730ff8c66ea4b65e92f8739e81f26f3f45a4c75c7e845
+DIST structopt-derive-0.4.13.crate 20115 BLAKE2B dd2546903b8fc329c7f0a2cb950e6a20e1c61f49a713fec8e829cdf815ac81681625c0806b9a992e7d2c71923fa382abcfb37f53db1fa6e80169f32a48bcfbca SHA512 85fdd4ea10bff737022b289277d72ebdb6fd861a7cb41eaa28b5aeef99926de00a01fc83cebd79482186640a3f6e8c804d7aba294c6a401438d3e5b06b9dab38
+DIST subprocess-0.2.6.crate 44587 BLAKE2B aa51a05d4a57b7f23c6bc6262c27cf73e7a6b62e2fb0c329ea4fedb4ad6522acb59ed8572a26c01d3ab0b97d7241d8ac9c1c4dcbf601f5aac738f3f1815f7116 SHA512 4e02a7df1f6b15a10f385db54559eef3e6ce042ffb60b6a0022e4241349ec6230d96d71110b6dca1cd6c81552770a6e0646552e2ba047efe23d4ab3e1b3cbe70
+DIST syn-1.0.48.crate 225747 BLAKE2B f7bfc4c38dec562a6dc7ecb7120c6df5e25ddc8591762bf5018ee0efa506613c9462a79e0e9cbd952cf5fa083abc164608d594bf2a47d226de4b4bdf02da050c SHA512 16b022a418eb9a7e5d651197561c329f749050a1710ff03b1af9a5f580543d00a1724826e0ced044d6ee4ad55dc615fff5a71ad72755e1685c429dc5853d93b3
+DIST synstructure-0.12.4.crate 18105 BLAKE2B 8e7efdfa8681da8473903aa22e8cc55abcede012b29a91d65076042c89a21048b44b774ca5c3f788222dd32fa634ac20f58ce241eff610498cac19f659280d29 SHA512 ab3024644719c4afc9c06a4d3c499fd4934c104409d38197a46d62c9ce30414f88b3e7bcdd7f245cfd207489fb54ba41e5cfc1db94b0dd12fb01e9c00c861c47
+DIST tempfile-3.1.0.crate 25823 BLAKE2B a34721369923771d5f9a2fc64adaff2bff41da97a0ce79e01aaedb8d6670867220c671c0d23f7a8a9c71b09c0559efe4e7c9bab1f7f9d890866be1de1ce050a9 SHA512 a87ee51c36a81a8a8eb8f091eb57926682f38b707f7f641332d8752170e6c139a656ae49c6861f51e07c2fab5c86cc9b2ac158f5d89c6bff15d18934dd4e7ba5
+DIST termcolor-1.1.0.crate 17193 BLAKE2B c3a1a80269195f6bc92d141fce0885413c031980a4ad2f0f6e5a9051acfac10bad8a484362bfcaf3a60851a97d930e9602df4c00aec39431ea5a8a20d40a55c2 SHA512 41b05b047cbfdd5e3990eb36f635dc8ccf26a42bd5403d6d14a9f3c341e92b61c3b8d4d5f4fcd29071a97b3d96280ed59b4557b63a769390e2729fc82ab39702
+DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
+DIST thiserror-1.0.21.crate 16187 BLAKE2B 9599c8410f9a8c837d5e3a7eb1656e29dcb6c0b6edf4a09312caa01bf11613cc23d9c2aded04e3233c5abac97e7e6e4e46fa2f6311b93edd332a1dd5036b7760 SHA512 440c4e7486bbe813b8840a215859da9e1c8f95383fb894e5ad445c86d40005c62738aca14ba761636c17c5db206b71bc40a915035b2dd9023f8b5eff5e970e99
+DIST thiserror-impl-1.0.21.crate 13199 BLAKE2B 6f694e1282bfe3c5aba54b523afa25feee2a356d61d5031de046822fc9df1ae3942126ca7841f7ba8ddad0949e069a2e8be888099bde95576e2d01616b69bccc SHA512 70322106df1df17affca80481672210261a6344c484f4338f7470226914721e8a2157ea875744d4652b0ea1575dd4992a6d366a2da0524b2c84ce321a3badf45
+DIST thread_local-1.0.1.crate 12609 BLAKE2B 34206b5232262cda9cc0fb970e20f154d43ff1c4477a5ad5ff9200e6d874a6c7b2bcd99a2dae75a984b54574281e049ad35307ace0dd188f44c9a95fa93139cf SHA512 f2bfca4eee32a8fc88a01ff5bf24518c12142228d95916d13aae35ed6addd0b7da2235359f15220049ef197555344ac31a8833775e7a5bd49144db9c54b3165b
+DIST time-0.1.44.crate 28885 BLAKE2B 5e2ca11af9da0847239a086330d0cd00fcb5b63862f9dfec46f72a065bb35ec2236a21ee1c56bf65e3117105e7815cafe67e3725b8575373e875dfcea401d967 SHA512 736a38637be0193a06fa35d42b4873b04a0a35d84cd2af85b7f653a1b67b95078577134bb187b777730e73cce67f437b45ff5c72b8e3f1f8e2ed3420ea0324cf
+DIST tinyvec-0.3.4.crate 17586 BLAKE2B 2173653c5433ba8fda3afb7e88e9065e2b5cbae6b25753eb306423e8b0ac694074d678bc50a53b2ccc228a8e8b4d06de2ddeb63f0adf057feaff8a998820eb5b SHA512 91613078d89456fa233ee2fa3309f6b2b8d490771b62fdcc027336bfb20ee5fa3d8d3dec446ab397b5974127567d4f62186c6eea45bd9c767719bb770101ab2c
+DIST tokio-0.2.22.crate 400639 BLAKE2B ec18c498086c486cace708f9f2014dba24b1a8dca7f7fd9c57edea741cd94aa962a9bf05b9f964000c82ae69a7ed4b4b5f31005c2962a5776bce681c79d85a47 SHA512 e81ffd9dc23d83a3383c944b65636a36f578ea9d5257769017228eb3c413e0991fbec90e69a43b84e8349c4628e519947136a627152a4ef92cece9eb5d64dd24
+DIST tokio-tls-0.3.1.crate 22517 BLAKE2B 05be1ca4abb345fc859677bb1b4e49064324ef7858c5bff7301b4a5110e4a6339857f5d85037bbd66b433a3c2439eb3c15edc63648fe04df2da9bfe1c93b8e08 SHA512 46ac00d839415a8dc9d9709967414e3812606a23c2c1e0e9dc9aa6aff70b24afb44e4c5a231d0d857ea8d06d07c254c97a459713122006cf1afbc6d4f7b7b6dd
+DIST tokio-util-0.3.1.crate 27233 BLAKE2B 96e43dd3f6f6209a6436e6ef3a40739f44507312b02a83f0316c7500dd6a59b5a71af005a98818d9b1db0e33aed4a9330e4cf955855925c8a428132762985db2 SHA512 301a5d9a8a9537653e17d3360dc27d41c95aa28bcda3e0815923dca0ac735071b01b9fc8c1d53e826e0cd1e6e5f98cc233f1e9dea906ba06c6b5192608ae7ae8
+DIST toml-0.5.7.crate 54372 BLAKE2B 8147ee2e9412cb79f00585cc54b06943ab3fe3e852b4b033fb06ef13122b07216c0b2f7c84aa548f9b0cb11c2190da3c69ed8b91eacfbe1519a5d94398b358b9 SHA512 5537a103d2329feb55a470f39962d6484da515c2727d379be108a778c8fcc551065942133ad9f943f0fe96847a9d0dcbce009cd0ce1ef3df355e34fb1439dc77
+DIST toml_edit-0.2.0.crate 46438 BLAKE2B d1e4f75c8268048e782504f0da33841da39a016442ee4ff8fe4fb01d724328ef526b452bebb1c7ad5ed1625daa9fa4f0a2838856bae62a0ecaa4e6d11532d8fc SHA512 79407bedb0557e95cb770c81b867f9be61a4e0fe5b71ed1197986ecdef39bd3f337a2b05eed5fb106a548857e5839cddf66abfdcb9a3a6bc38a444d6ad848418
+DIST tower-service-0.3.0.crate 5321 BLAKE2B 267a8276baf4dd10c168f6db5b206ab9433be45532bd7fc5389952b3492e104fbe5301857f20044d7ba0c1af9572178d51a6f3dd723a6034a25e0c3dfd48e9a8 SHA512 9b46928c2ac13c738e56a1c4e9fdb512f17aa8f4e95669ae4fb9a9f9a4b094114d7869b923186779f87b45b2915ecf778f95dba415b6d4b2e6c20c34efdc6a6b
+DIST tracing-0.1.21.crate 65404 BLAKE2B 80f66cf67e7e1eb583ab0727a2d1b66fcfc9ceabda2b43623d09eef3514ef6ebd9f2a90011719c43285e6ed2b09ce78aafe288c2df428bd0a32d6bbaa18b258e SHA512 9310c0a26670ccc99dd330bf7f9c4e1f87c11c5b11fdc25d05b237eac457f37a2ef3136978945b2126eb37c54fc750466a7195e8c5fe727445fe46188b8fd3ae
+DIST tracing-attributes-0.1.11.crate 17279 BLAKE2B 29d7ddfd1a8a43b27d76b8842e48ad02ee6a222a42b830e2f07b9214ecd4fa32bb6cd3ddbff5975d84c57cc0af3fb392b7198a45a018af3360862638835af278 SHA512 669ce260373e950197da9119185cd6ccc3d68da1b3818757384529c5bf9757b89f6a7a797461b60bbb636bc9a2f93d02021b2af57cd40bd5b825fb056c3ad71f
+DIST tracing-core-0.1.17.crate 47774 BLAKE2B 6c13692d90ed3f84110c15a1834b5ca527cd950dd9a141b06ac2632bee718b67e46615e26567f58e4c3129b4d38abcfff515c6420c906ed4f957bacdeaadada8 SHA512 202fa2bf6999d1568f4ac4d92a2d29b3ea79b5d93bb57347927eda60c8d5b430b366889d45a4d5d22d4e1c46e62ffcc39b3091a91f79a26fd6b7827fcd7c230d
+DIST tracing-futures-0.2.4.crate 10274 BLAKE2B b0af839a01d49c387240f5c9a976c8258b80b24c21b395e2e8479860596709c098d11ded6daef458c5c906b90d76ca25b714a4f694710d8a4a6f48041931b4c7 SHA512 861606307c4ce5db60537ef66def5a41b5d4c7fe6f37b7b8b3f94dcce1398dac8d1665edae91b551408758f82334be293c747be59026d640448d9b270881612a
+DIST tracing-log-0.1.1.crate 12919 BLAKE2B e5daf5d2540828ab73aba40484f1964800b9a63900ba41cb625214a6f4b4bb9cefc27b55e910e891e0814da7093d1f40d68bf5bc1ecc94f089015f53a7488990 SHA512 11d5872768eb5af40342f6c529ba6afdc4841eabe6086838da1b88e9529bfccd0db106877ea6c9f93b201f81b315b7fe1a3fe985e995d409edaad466178f9e8d
+DIST tracing-subscriber-0.1.6.crate 45650 BLAKE2B 7ce100ef147d69a1ead743c57b22a22eafd4fc2afd31e23faaf6d7f7c81466bcaf2ff8425e0f894f4fd1c6489ea54a2f4a0495bf66db06150cd548a074a6a4cf SHA512 77af71bc8a540096a7e7555b6694339693ac6a706ab6a983cedebb15fb251595875fbf0e758629d9aac6b3f30e2dc5e819da6202d4e5c88499dc79b349f5e0e4
+DIST try-lock-0.2.3.crate 4158 BLAKE2B d8bb2fd8ba10285871ac3dee069474d4225e312c0a13b6bc238604c5207fe33437541abfdb507a6b400fc3359b78d39a7e9a5bebca426692b5dab4622b09c192 SHA512 ebae7ba9227e6fc20499b48ab85169943765342d4790bb4a31ac33a2be0af9401e2854c8e00b9d3b7e225d16875c90700b1c3fa99af07833d3b7a91b7a414fc3
+DIST typenum-1.12.0.crate 36037 BLAKE2B b5aa97daf856e4c0ecf6f543ce75c1203ea2a27b493e4e62b1a0a22fbccf79217382061833e518a5de296a00a4a5f3c0c1cc736a7fa40a947712fcddf0735ea7 SHA512 b88dac076d4102f2b1d74501cc2bedd4eb923458e060ab77b826093e3146bc48005ad7d3471921c4f5e8765f3f93f8f7c48e0eb00e2623ad439bd60bcf64d6ea
+DIST ucd-trie-0.1.3.crate 44615 BLAKE2B 491f604d63446dbccf5176333edd159ac56261a9aa76efecf57e9a11ae017a6cba975658a4ffdd310561704fb0831686fb7770b1142b4ac495f01e26de51b099 SHA512 54d43b3824669aa20b725c7747f4fb65bd24e620670c968c1bb0094a0503773acda921b50a0b200c1ea0f84e1e059883c1704bfa5a856d2e2ccda116fb8c3e2b
+DIST unicase-2.6.0.crate 23478 BLAKE2B 6e580108ac81b1cbee70e5bd331f43b12f266dae4f4f758bb8f5f073bd1af61943ee0de34cc27769525b19da8c24f8dea4941d0f5454594ab0cc8b78071ff053 SHA512 7e76a5f344e32c56cf87223585d87a56c79627b52bba0b29eb6de82de874b2964accededa8e9b5741f57944b6750fba5c61e679a50d4fd5a5646f431e2f4f188
+DIST unicode-bidi-0.3.4.crate 32228 BLAKE2B 853a85b29d1ac2025b7a28af64ead9387e3b4b1e790ad719d4374e349c1853ddbb5959a2890d9d6c94a5c28e4523fc3324deb6b1ed1aeb5e917f21b0e2516f6c SHA512 170ce083fa82bed13ecc62d85cb882fdd6491ae721e1633d3c1a5d3cee69422153afcf6695765c0e8fc7035440d0370d34afac9e978cb27f7506c07cba300e1e
+DIST unicode-normalization-0.1.13.crate 91691 BLAKE2B fa4ae7ce7f8e5dd43ab8e60dd48938340485de3537ad14c1dc1e7404a89d2b3022c4304cd85a4c649b8a27fa9c79e4a059d3e5d5c2011d920290d8719c74bc77 SHA512 710e002da7f59e933cbd09fee328193a1e19cce7b12426007ea32fc81ef2adefa5c4f2ad360ad684a937ab18d4be404a0a28c3de375628168fabd21ce1a6ba20
+DIST unicode-segmentation-1.6.0.crate 90703 BLAKE2B b7d63bb8b62cabc604084957aaff021df24a1291f0ebdcddc424cceefe10ad399ed53152211c3e7557e39e21255166f922256f9f8e1fb488d3bae368b49a378e SHA512 80c6f92d9b39602a05809dc63a7cb05a305441689b6056801097a882a36c9795aabd660f884f707daa7e7fe6ad4983f6e245c226962cc982dbfeea2ddfddf41e
+DIST unicode-width-0.1.8.crate 16732 BLAKE2B 5aa7b87eef1322e4151a3fcf981ade311b8fa030527d7561815950e58d3f15156163dfe34da6a708c37dccc3f7652bf7fc2cd899fe8bb0118b67c4113ff3a2d2 SHA512 0abba6da6981a2451e01d93bbd47652c46eb6fb07cc0214f33259fb29945bfd5ee2b302e883ddca8f68e921635f222701b7310e7da2a5e225f854980d1e474b0
+DIST unicode-xid-0.2.1.crate 14392 BLAKE2B 7f8f91b9c4df55f2137b754208d4f2997a290acfc9393ee2dcda8195eda25cb342e56ad123f56bb298d93db5248a749c18a982423c9a0e85ce93f7a1eb55d289 SHA512 91e862137e837baea82829431cfed36634fdb05339f00c756eb5a4b429ef0bb871f5133d11adf9a023fa22168c8a0cf194ff3669779f04f219d48fc4fac339d2
+DIST unreachable-1.0.0.crate 6355 BLAKE2B c41706721e8124c695259c12741ee95f98d3599871bb7fae2f8cb0d63a04f0cff11e01ab0376867de4de8707fd50fbd02f8b6d9c19bedda84bb5938876c5d803 SHA512 054e0a471d1068b7703853d838c7c381ac6865ac1f8abae08747581e3754416ccec5b80a5b04fedbcd01e68bfeba286b849e3b8ea67bbe62444f2974655e4948
+DIST url-2.1.1.crate 70383 BLAKE2B c4096cb1bd50e9ca97fcdae0ee8b58957e21507607eafa8d84ff71c3df1ba52c68299609776f7baa45c93b971f8b61162fd8afd4174a5c7b66f36dc673707fa0 SHA512 a16c3a625fa85be9305f8150d5711c3e3aaa1f33753e7ecb8368b176cf3ea96f51fde74598c8ea3a5db2effc338589fd2834b297a1fba4bed967fa39e670fabb
+DIST vcpkg-0.2.10.crate 11504 BLAKE2B ab7e64091fd2c12292282a0311716468bcf584dd3764cd0c4803d40702104a57ace0a138b06cb1429a166a61e069788b2c45c3286d3f4c5bbf6ac30e816add14 SHA512 4c790344fd3510eaaca5e1539cd676c60124b2ef157e85f89322f294ab6831c2acf6efed1529de4bb23d9abfd0b5f962eaf8d3221c827b0718834d152b28c141
+DIST vec_map-0.8.2.crate 14466 BLAKE2B 8f109fbff19604b82ea2aa61c952e2ce9b5597ccc8e1ef4e847648e2de08dece8c4debe92889edeccb8d393645fd0b62436b49d236ded7ad181c4a51239a9539 SHA512 4f1ef59bc2c437e79f1f84fe021bce5aa8ccd581f500f3d5776913d5f17d45b03ccee64f5bd03d47656318cfc9344a1f4311079d471fa409a8e4e94c143973f9
+DIST version_check-0.9.2.crate 11979 BLAKE2B 6568f8d4652fb470162bb2251be2260a6bf83e107a4f957ed91117938d5da48c42bedfb5e6622bcd6c37950805666b78984577bd8dae687dbb39e452078bd97c SHA512 b88a9d545ef103fe6d0eebe7ddcf328fc21fcb02c60828b347cfc35afd957669e652a94d880ef992450c167df3505838bc649e0d83896542fa13a149875acf26
+DIST void-1.0.2.crate 2356 BLAKE2B 41578fb5507f94e7d135f9595cec107ed00a926f4968df8b59792d1676ba5b6980cd67310f820fc37a9c14ebe43a171833fa8dfc09eac5dd42f2ebe808632a83 SHA512 1cc7d282600dc0164d7e410aa895d5dc99de1174991549c6733c94cc2027026517f66797751d737869eae58c560fa26edbf43f36b3015eb2fd99828fe40e0aa1
+DIST wait-timeout-0.2.0.crate 12441 BLAKE2B a99d3f57bc6e784ac06167f98b2dc2841f730dfab4fb9772b15e67707f756d6ba7daeb3e992d32291bed3daa85eaa8a8ddde64db5e1acf1cc4031fc9bdc82212 SHA512 db3b7aa2acfd44e64451042b8ba98eecab77a82aa5c58ed08dadb119ab36dee4e26d62baad7978ed56d5ad03019c96be5021455362290f56043981137bac8066
+DIST want-0.3.0.crate 6550 BLAKE2B d97ac51dd5e49bec27cd196711110679013bb7aca520235db3f38c7d4399a2a17b9cf599cd0811137df957f2341e75442d48483dc7aed6910f0eed7a78ddad37 SHA512 7e7af8ddcc6faed3e3d18384a000339617187b74b0adf111a02bc15fdb152c88007844d6fe6f35a47a13f3384a19ee4723b884623de7d45c6619d76aa6699404
+DIST wasi-0.10.0+wasi-snapshot-preview1.crate 26964 BLAKE2B 525db01649a5981ee82ad80a1a4bab9baffd235262452675619f36a1b454017a74593c53c129f8c30b865994bbe30ef19cebaad9d245ccf54b9b07ef70d5d8ec SHA512 88e2da617f50d9ebfb1e0c5857321fb86b5ee88ae8a8d199d3cc092e0f39688a2cb68503f7c6bb09dd6bc50a9a03597a1eb2e032150fbd0d0b8afa02ad771c88
+DIST wasi-0.9.0+wasi-snapshot-preview1.crate 31521 BLAKE2B 716bdd2ec46d0bc9911c5e5e29fc783840559931b2563d8619675fc11da9527ddbe653a0f1ce0b782ee0c5f7a3131aba2b0867d415f003aa9c2389357569e7dc SHA512 dbe641f796ee3a5daafcaafc911ecc6dff170340f477c2df7a61fb4858a85aefc2637c9e61973ecce66a987aa8e08a736273a4aad3ef47eaf61ed4268dbf9c47
+DIST wasm-bindgen-0.2.68.crate 159094 BLAKE2B eb7fa3c2f80e5ab7c0d8e99b11bfc025fd32c8347b9baee9f947570a85426dcdadd052248af7a0ab17bdfbe494f71037fa1980fc875d84c089b70a80d0321bce SHA512 a3e877a43242a35518b84852ac71f3cd6c9ca558234fc23bece38780a0abcbf9e7c6d07e20e81c1f6641835ed3b55dff8245fb75901205b0b5658f4e3b0c05ea
+DIST wasm-bindgen-backend-0.2.68.crate 23522 BLAKE2B ad87e1cbfe42d6b3f6c14f793dcec31fb0f9418454e0870a3951bf5f6b0eb9f39e5363129fbbdf986aa50e1fb2c13b03bbd9e21364204ace72460856fcfa7610 SHA512 aae99cefabc91417bda499b4fe8f136a81ffd44d5122f0c13ca5711eae26f2f8b16ef55c18dd4fd3f0e71edfff8610379adc458f978eaab057671b520de9d564
+DIST wasm-bindgen-futures-0.4.18.crate 13690 BLAKE2B 26d4ab68627911c26b96e1d55d715ef6d732a7286ba4caf603a87561f52061e4a29db69898452e63a4fefa94c5aff3cb8e739b8980fbe6b3ebffaabd1339f134 SHA512 2290fcebb33d5ca87ade68e39217e43a0b669f30fd63651e8dbd658d26a8666aace2fa43918ba879700aee49cf9014fe2c78af8526d7272d96890050b188fe19
+DIST wasm-bindgen-macro-0.2.68.crate 11630 BLAKE2B 407ec70043b1b6e7f454ac9d986d6df98ae19c9ab8ada98f4f968520b7cd75886cdeeeb739d61615bcf0d6ca3a757ba618f0ed9abc76308c461f159ac05ec61c SHA512 c70f536072ce9bcb109ea762c6235aea7eafd37eb3faad1b50184b733d09417b02f6f75b5c29fa46691b75b449316a039b79c630387f04903f6304453f98e772
+DIST wasm-bindgen-macro-support-0.2.68.crate 17793 BLAKE2B 619c0484ce4f97742972f1f6fed67643f570df3bad436cd2a93c5cd7477a8208082cafdad87e01caa1ba752bb200e65c61e49136e8037a9c52b9f06ca0c4ba9c SHA512 53d3e483a7df0a816eba308e5a9a736b5e812da9778889686994ed964888b4bb9a8b12cea448b1c68607e6a8b10596f8a81f4c85dc1311667cea5f445e7bb993
+DIST wasm-bindgen-shared-0.2.68.crate 6725 BLAKE2B 891ce0bf742bb32be1549c5b8822952f5cdd15ddd73aed164f753fef211c4087269fc3a859950045bf1e895e255b6f09b6788a7a5d43387365079f106580bf90 SHA512 cf161076d07dd7e91790bb1f773a6f53cf31cc0f9ffe7a650c98d2c6c98d02ba8d1b32fc2aa15128f739c86f49baf206444516c3f8b8df82238eabb72032be0f
+DIST web-sys-0.3.45.crate 630993 BLAKE2B a5a72bf3785902a65a7fd65b53d696b491e9438ba4dd78d4e97f3c3d62df4144716ca09822e074f27ae5506765c7c2d547a110ccaf5c4c214da6b5a4816425b8 SHA512 d208e2271f59691b13b94b952dbce966f54ca180d09c6725964541c00684787a3610623294f81032cc931273ac655dc6163b23fda736b603ff327abd603fbfc8
+DIST winapi-0.2.8.crate 455145 BLAKE2B 50f3c2a0cf4eeedd6891b11392e520c1cca139a71f8f736eabaf43aa7e4b1b5d57697918978220459572d373940edf971eb8302f292cbff832283e905076319a SHA512 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe
+DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
+DIST winapi-build-0.1.1.crate 669 BLAKE2B 6c8d8e0f81574c086f06fb3f234b0e6759d293d1d254857c3d491e4d43279e5c2f57f2fcfdc9d5d7b083280f4cc2a75a6ee9bc1541ec6ce8f8d904ded0567faf SHA512 8b0a239e205a5368892f41c870a8a7ea16e3468c364b03382bef7fa3a2e7159b09c07661e95b1227578f6d72c14879daa4444b28c51ae20ef15d985d59ca5a77
+DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
+DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd
+DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
+DIST winreg-0.7.0.crate 21225 BLAKE2B 5841db683dc0aa8b92de8ec43100403b029c8d3e544adcaab030d998e5af4644ea176ac0bcd97141d137450a7bd761a5291405202c445a326da7d4f240686230 SHA512 a0b7a2d239e30cea89a863b879831bc32b5f2988ef3f0586ddadda48827cafc82d3602d2f8df3c47dc1e80537149a1ca1dc1506f9fbf960d9ba081dff1bac731
+DIST ws2_32-sys-0.2.1.crate 4697 BLAKE2B 52a7a3f57bcd73156730ada4d78fe12a54a498c9064e0928e09de13a95bd9237f884538e5f9368b47a7ac3c425f0f798c26bad85f20bed4ea26c2fa16c779b97 SHA512 18356861fc595efe7d0180afb8ce7649da35a4f9ba456271d2068679ab258a861af32a2e016e241fbfbf5f6ef0eb33127b26eabfc11428af39506538faa4821f
+DIST zeroize-1.1.1.crate 15108 BLAKE2B 28f809ade86fc05d387e265bf76475da1c44d80e706301a8c899629589ea54370959b221d550b810e78ab6e52b9237f1030efb161e1cb6e892bd2cce5fe8c295 SHA512 748c8113abb0d70700a600088a51bf09620562db57dfbd5596af31d3a43b8fb587401755c4d9da689fb1443384492684eeb5acfc8c4db2d60b93f7214791f29b
+EBUILD cargo-audit-0.13.1.ebuild 5300 BLAKE2B 0ee244f4455aa3a63ce067862a6ef77fef1398cbe18a9b0e45099797ed8c4c06fe687acb64557b3c1d97dee7a1df3b2997b94f420d4f75d39a9dc4f005073ed9 SHA512 a811f12514864ee7f5c15bf1b92713a05c1cf3e67e175d2bcb4c93fedac5a7e60a8072dbabb6f72f748fd6df19c997636bf392a65d87fd0d808b207fe0f9b341
+MISC metadata.xml 529 BLAKE2B 2cd58aac115493d94918c1c95114bddab73554325b5e872ce639ebb09bfc5c28ab1706347701a77156ac4d6ab060153254cc6f8aaff006547d40995e53168b0a SHA512 8298dea40b5f42bbfdd36f9893f51357f6b8feec4e58d0ee41c18fc45b27a59f1870a57a6489253c717699da4131e1d3473df64f1341d436a89dab4fe94ea576
diff --git a/dev-util/cargo-audit/cargo-audit-0.13.1.ebuild b/dev-util/cargo-audit/cargo-audit-0.13.1.ebuild
new file mode 100644
index 000000000000..c2d0993d0da4
--- /dev/null
+++ b/dev-util/cargo-audit/cargo-audit-0.13.1.ebuild
@@ -0,0 +1,293 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CRATES="
+abscissa_core-0.5.2
+abscissa_derive-0.5.0
+addr2line-0.13.0
+adler-0.2.3
+aho-corasick-0.7.14
+ansi_term-0.11.0
+arc-swap-0.4.7
+arrayref-0.3.6
+arrayvec-0.5.2
+ascii-0.9.3
+atty-0.2.14
+autocfg-1.0.1
+backtrace-0.3.53
+base64-0.12.3
+bitflags-1.2.1
+blake2b_simd-0.5.10
+block-buffer-0.7.3
+block-padding-0.1.5
+bumpalo-3.4.0
+byteorder-1.3.4
+bytes-0.5.6
+byte-tools-0.3.1
+canonical-path-2.0.2
+cargo-edit-0.7.0
+cargo-lock-6.0.0
+cargo_metadata-0.11.4
+cc-1.0.61
+cfg-if-0.1.10
+cfg-if-1.0.0
+chrono-0.4.19
+clap-2.33.3
+color-backtrace-0.3.0
+combine-3.8.1
+constant_time_eq-0.1.5
+core-foundation-0.7.0
+core-foundation-sys-0.7.0
+crates-index-0.16.0
+crossbeam-utils-0.7.2
+cvss-1.0.0
+darling-0.10.2
+darling_core-0.10.2
+darling_macro-0.10.2
+digest-0.8.1
+dirs-3.0.1
+dirs-sys-0.3.5
+dtoa-0.4.6
+either-1.6.1
+encoding_rs-0.8.24
+env_proxy-0.4.1
+error-chain-0.12.4
+failure-0.1.8
+failure_derive-0.1.8
+fake-simd-0.1.2
+fixedbitset-0.2.0
+fnv-1.0.7
+foreign-types-0.3.2
+foreign-types-shared-0.1.1
+fs-err-2.5.0
+fuchsia-zircon-0.3.3
+fuchsia-zircon-sys-0.3.3
+futures-channel-0.3.7
+futures-core-0.3.7
+futures-io-0.3.7
+futures-sink-0.3.7
+futures-task-0.3.7
+futures-util-0.3.7
+generational-arena-0.2.8
+generic-array-0.12.3
+getrandom-0.1.15
+gimli-0.22.0
+git2-0.13.12
+glob-0.3.0
+gumdrop-0.7.0
+gumdrop_derive-0.7.0
+h2-0.2.7
+hashbrown-0.9.1
+heck-0.3.1
+hermit-abi-0.1.17
+hex-0.4.2
+home-0.5.3
+http-0.2.1
+httparse-1.3.4
+http-body-0.3.1
+httpdate-0.3.2
+hyper-0.13.8
+hyper-tls-0.4.3
+ident_case-1.0.1
+idna-0.2.0
+indexmap-1.6.0
+iovec-0.1.4
+ipnet-2.3.0
+itoa-0.4.6
+jobserver-0.1.21
+js-sys-0.3.45
+kernel32-sys-0.2.2
+lazy_static-1.4.0
+libc-0.2.80
+libgit2-sys-0.12.14+1.1.0
+libssh2-sys-0.2.19
+libz-sys-1.1.2
+linked-hash-map-0.5.3
+log-0.4.11
+maplit-1.0.2
+matchers-0.0.1
+matches-0.1.8
+maybe-uninit-2.0.0
+memchr-2.3.3
+mime-0.3.16
+mime_guess-2.0.3
+miniz_oxide-0.4.3
+mio-0.6.22
+miow-0.2.1
+native-tls-0.2.4
+net2-0.2.35
+num_cpus-1.13.0
+num-integer-0.1.43
+num-traits-0.2.12
+object-0.21.1
+once_cell-1.4.1
+opaque-debug-0.2.3
+openssl-0.10.30
+openssl-probe-0.1.2
+openssl-src-111.12.0+1.1.1h
+openssl-sys-0.9.58
+owning_ref-0.4.1
+percent-encoding-2.1.0
+pest-2.1.3
+pest_derive-2.1.0
+pest_generator-2.1.3
+pest_meta-2.1.3
+petgraph-0.5.1
+pin-project-0.4.27
+pin-project-1.0.1
+pin-project-internal-0.4.27
+pin-project-internal-1.0.1
+pin-project-lite-0.1.11
+pin-utils-0.1.0
+pkg-config-0.3.19
+platforms-1.0.2
+ppv-lite86-0.2.9
+proc-macro2-1.0.24
+proc-macro-error-1.0.4
+proc-macro-error-attr-1.0.4
+quote-1.0.7
+rand-0.7.3
+rand_chacha-0.2.2
+rand_core-0.5.1
+rand_hc-0.2.0
+redox_syscall-0.1.57
+redox_users-0.3.5
+regex-1.4.1
+regex-automata-0.1.9
+regex-syntax-0.6.20
+remove_dir_all-0.5.3
+reqwest-0.10.8
+rust-argon2-0.8.2
+rustc-demangle-0.1.18
+rustsec-0.22.2
+ryu-1.0.5
+schannel-0.1.19
+secrecy-0.6.0
+security-framework-0.4.4
+security-framework-sys-0.4.3
+semver-0.10.0
+semver-0.11.0
+semver-0.9.0
+semver-parser-0.10.0
+semver-parser-0.7.0
+serde-1.0.117
+serde_derive-1.0.117
+serde_json-1.0.59
+serde_urlencoded-0.6.1
+sha-1-0.8.2
+signal-hook-0.1.16
+signal-hook-registry-1.2.1
+slab-0.4.2
+smallvec-0.6.13
+smartstring-0.2.5
+smol_str-0.1.16
+socket2-0.3.15
+stable_deref_trait-1.2.0
+static_assertions-1.1.0
+strsim-0.8.0
+strsim-0.9.3
+structopt-0.3.20
+structopt-derive-0.4.13
+subprocess-0.2.6
+syn-1.0.48
+synstructure-0.12.4
+tempfile-3.1.0
+termcolor-1.1.0
+textwrap-0.11.0
+thiserror-1.0.21
+thiserror-impl-1.0.21
+thread_local-1.0.1
+time-0.1.44
+tinyvec-0.3.4
+tokio-0.2.22
+tokio-tls-0.3.1
+tokio-util-0.3.1
+toml-0.5.7
+toml_edit-0.2.0
+tower-service-0.3.0
+tracing-0.1.21
+tracing-attributes-0.1.11
+tracing-core-0.1.17
+tracing-futures-0.2.4
+tracing-log-0.1.1
+tracing-subscriber-0.1.6
+try-lock-0.2.3
+typenum-1.12.0
+ucd-trie-0.1.3
+unicase-2.6.0
+unicode-bidi-0.3.4
+unicode-normalization-0.1.13
+unicode-segmentation-1.6.0
+unicode-width-0.1.8
+unicode-xid-0.2.1
+unreachable-1.0.0
+url-2.1.1
+vcpkg-0.2.10
+vec_map-0.8.2
+version_check-0.9.2
+void-1.0.2
+wait-timeout-0.2.0
+want-0.3.0
+wasi-0.10.0+wasi-snapshot-preview1
+wasi-0.9.0+wasi-snapshot-preview1
+wasm-bindgen-0.2.68
+wasm-bindgen-backend-0.2.68
+wasm-bindgen-futures-0.4.18
+wasm-bindgen-macro-0.2.68
+wasm-bindgen-macro-support-0.2.68
+wasm-bindgen-shared-0.2.68
+web-sys-0.3.45
+winapi-0.2.8
+winapi-0.3.9
+winapi-build-0.1.1
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-util-0.1.5
+winapi-x86_64-pc-windows-gnu-0.4.0
+winreg-0.7.0
+ws2_32-sys-0.2.1
+zeroize-1.1.1
+"
+
+inherit cargo
+
+DESCRIPTION="Audit Cargo.lock for security vulnerabilities"
+HOMEPAGE="https://github.com/rustsec/cargo-audit"
+SRC_URI="https://github.com/RustSec/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	$(cargo_crate_uris ${CRATES})"
+
+LICENSE="Apache-2.0 Apache-2.0-with-LLVM-exceptions Boost-1.0 MIT MPL-2.0 Unlicense"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64"
+IUSE="fix libressl"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	dev-libs/libgit2:=
+"
+DEPEND="${RDEPEND}"
+
+QA_FLAGS_IGNORED="usr/bin/${PN}"
+
+# requires checkout of vuln db/network
+RESTRICT="test"
+
+src_prepare() {
+	default
+	pushd "${ECARGO_HOME}/gentoo/openssl-sys-"* > /dev/null || die
+	eapply -p3 "${FILESDIR}/${PV}-libressl.patch"
+	popd > /dev/null || die
+}
+
+src_configuire() {
+	local myfeatures=( $(usev fix) )
+	cargo_src_configure
+}
+
+src_install() {
+	cargo_src_install
+	einstalldocs
+	dodoc audit.toml.example
+}
diff --git a/dev-util/cargo-audit/files/0.13.1-libressl.patch b/dev-util/cargo-audit/files/0.13.1-libressl.patch
new file mode 100644
index 000000000000..84762ad45b15
--- /dev/null
+++ b/dev-util/cargo-audit/files/0.13.1-libressl.patch
@@ -0,0 +1,35 @@
+From 0493f57a9878fd4d92fc419358173fd31b95bda8 Mon Sep 17 00:00:00 2001
+From: Georgy Yakovlev <gyakovlev@gentoo.org>
+Date: Sun, 11 Oct 2020 22:09:39 -0700
+Subject: [PATCH] Support LibreSSL 3.2.x
+
+Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org>
+---
+ vendor/openssl-sys/build/main.rs        | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/vendor/openssl-sys/build/main.rs b/vendor/openssl-sys/build/main.rs
+index 49f26d2..2de8ea5 100644
+--- a/vendor/openssl-sys/build/main.rs
++++ b/vendor/openssl-sys/build/main.rs
+@@ -220,7 +220,7 @@ See rust-openssl README for more information:
+             (3, 0, _) => ('3', '0', 'x'),
+             (3, 1, 0) => ('3', '1', '0'),
+             (3, 1, _) => ('3', '1', 'x'),
+-            (3, 2, 0) => ('3', '2', '0'),
++            (3, 2, _) => ('3', '2', 'x'),
+             _ => version_error(),
+         };
+ 
+@@ -261,7 +261,7 @@ fn version_error() -> ! {
+         "
+ 
+ This crate is only compatible with OpenSSL 1.0.1 through 1.1.1, or LibreSSL 2.5
+-through 3.2.0, but a different version of OpenSSL was found. The build is now aborting
++through 3.2.x, but a different version of OpenSSL was found. The build is now aborting
+ due to this version mismatch.
+ 
+ "
+-- 
+2.28.0
+
diff --git a/dev-util/cargo-audit/metadata.xml b/dev-util/cargo-audit/metadata.xml
new file mode 100644
index 000000000000..016cac74ce62
--- /dev/null
+++ b/dev-util/cargo-audit/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gyakovlev@gentoo.org</email>
+		<name>Georgy Yakovlev</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>rust@gentoo.org</email>
+		<name>Rust project</name>
+	</maintainer>
+	<use>
+		<flag name="fix">Add support for 'fix' subcommand (experimental)</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">RustSec/cargo-audit</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/cargo-c/Manifest b/dev-util/cargo-c/Manifest
index c95d05f92472..d30b5cb1f930 100644
--- a/dev-util/cargo-c/Manifest
+++ b/dev-util/cargo-c/Manifest
@@ -131,5 +131,5 @@ DIST winapi-0.3.8.crate 1128308 BLAKE2B e0e8ef6121f222b0500525192ebb69b26b71cc16
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-util-0.1.3.crate 9913 BLAKE2B d310b3fbe45bf4a25971c4396f945119efbe8f5bd497f03ae04eaee7643d9d022af69c4d511ed6e89fd10bc56d4448b8b3a624491a67a87dcab4f156c31ab104 SHA512 55ed7996a8f63e2218e74e778e47450863b19170bf1f5375a36b094c5e34bb41b19f093157e40190e105a40cd1cd9bf90e95966fc3a7de71f6b74e272723a1b8
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
-EBUILD cargo-c-0.6.2.ebuild 3056 BLAKE2B 13ce79f0a218400224870b7b3d88012672f0def29c0fd5d0725c37f92e5c357f18892df1450a12f1e2b756ef337908715bb4da67a5fce5ffb2d6569884fcd44f SHA512 1fadbe52e451ab69e39104c4fbdfe5bff901823a05f203397856b5521541c8cb1791071b5be1425479053a46f73493f7383c8e54bdbd8e2c6a50de80be268c5f
+EBUILD cargo-c-0.6.2.ebuild 3051 BLAKE2B 049145dfd1f0ba27a92845082e12221cc9b04b5e6238ecff6490792ceb1861db0959224bba6e5c25bea273012724e420a23c95b4e6243d77c912e13b00936c35 SHA512 8b789d8bba907d3a46b17efc1471e8e8e25941b903727d5177994a0bee7904c5f5d73d332a9a940f37c1617c7d7879b5b4cc7c1f4ffa5d9c033d9b522f3e38d7
 MISC metadata.xml 326 BLAKE2B ec5622ca2c87640dfe5c409704f1674bc53ef0ce4d0778227d3816cd4a151f5f09e3de1f09814ce98f5e208e04a5cc0a6c28dd1b9bd81fa3857b688d8e9eebb9 SHA512 f28238739f1c2d04cb617ac31c2965fb110b560e5b9bbc6fa2749f22cd4cb353ef6cda1df1d718f165e4ae56f5bdf66da9104f6440d7d0009ba352a877c1f3c8
diff --git a/dev-util/cargo-c/cargo-c-0.6.2.ebuild b/dev-util/cargo-c/cargo-c-0.6.2.ebuild
index 9977f3dc4fad..9407e488e670 100644
--- a/dev-util/cargo-c/cargo-c-0.6.2.ebuild
+++ b/dev-util/cargo-c/cargo-c-0.6.2.ebuild
@@ -153,7 +153,7 @@ RESTRICT="mirror"
 # use cargo-license for a more accurate license picture
 LICENSE="Apache-2.0 MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc64 x86"
 IUSE="libressl"
 
 DEPEND=""
diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index 67584c56d068..530b8d0e9312 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1,8 +1,4 @@
-DIST catalyst-3.0.12.tar.bz2 621114 BLAKE2B 52306fb90f2ea3856ea26e436b4c520cc8ec65e22542ecd2ed20a54306655ea0eb3b607749fa42e6871256644e46e903b18d3159979ad40b95fc8ea1c05a1fbb SHA512 8bb50375ff8549ef790e2999ba71607281a6f631c7adec976f7e31302e8d16eaab41795d97474285e1506068117570fe350d77e4881169ae8051371bb8d54fda
-DIST catalyst-3.0.13.tar.bz2 621326 BLAKE2B f87a94b696d897fad8cab5e033a68a944dd5f73cbb110c3051432f9ae8baf8d341e456e1c9935345ac9102e99301c912abe706225023b3bdf28372095410cb26 SHA512 87f66b56056000ebee061003ae08d6e4e6b64aadbe89d71f6d50fe86e838e04d3f534dd3bc2f561fe42762de4108bf4d5536fab485fa260c251f90b45e97e8a9
-DIST catalyst-3.0.9.tar.bz2 873866 BLAKE2B 293a4d52c57e73269f1f82fed8ea72934a0f939b3b9d4fb9943f4971fd4155edecc6cf0170b917eba16f0125aac9861041b7e10f85f6110a35659a2f85fd3665 SHA512 c8c25ad1c76b0040bd84b491909d364306746c660afbbb8c6a074911779aabe89b60a12cc3ac5b9cd3398bdf8986b50d24d9979c3d12d2fa9de66ebf62ded309
-EBUILD catalyst-3.0.12.ebuild 1912 BLAKE2B f136ef07278a13065b7df59cd1917d5b4075cb4dc4ea17d28ea8c402d25c4061feb334c59f99741ec9edf0370bfe4debd4fc6e57dc0287c2c19e65b0b4c2aea5 SHA512 298b705f37e8edd9bfd45e690793ee0c6b608ada57ca2d1510e61fe7882abe4f8ae380c6fdcff1b4c3fa9b687fa87b97722471145afbfbb8374dcca94e96c408
-EBUILD catalyst-3.0.13.ebuild 1921 BLAKE2B 4722d977737cd728eba8b6170c1a7a52a51b907db54dd2555332e2ebb0e0979d484a5292ad35f67110080570bfc09bf256e14c8c60ba1ab08bbd8bc838e51d55 SHA512 1c3a43f3df8d90fbf3572ef655a34b74563d2ead70b62b4cdf61be25deb58713037a813c622ee041d4071282901d6ee65b29e2fb1c6dcc15d43bc5d089c9d4d4
-EBUILD catalyst-3.0.9.ebuild 1912 BLAKE2B f136ef07278a13065b7df59cd1917d5b4075cb4dc4ea17d28ea8c402d25c4061feb334c59f99741ec9edf0370bfe4debd4fc6e57dc0287c2c19e65b0b4c2aea5 SHA512 298b705f37e8edd9bfd45e690793ee0c6b608ada57ca2d1510e61fe7882abe4f8ae380c6fdcff1b4c3fa9b687fa87b97722471145afbfbb8374dcca94e96c408
-EBUILD catalyst-9999.ebuild 2197 BLAKE2B 4744840b79871f9a804cb70d550d99f7e98d6c37b8c6117457d1aefd99f00948e5be6bcd50e3f12b304d766acc8399db9061b5fe726a4e048f6ef2f5385f68a7 SHA512 9591efe950983a2c876f725af2cde13447206ea178bf1a62e8aa3365feaff7ae73aabc7e5c702c821b0ec3419d1951ac7b1ca0fcbb9d623ba5f0c561388ad1c7
-MISC metadata.xml 634 BLAKE2B 2616a9220096593cc1cb863a560101bb97a1672ad84093f951968ef0482950b6c72f8226e66a4e0d8bcc30dad6db9cb3511581f5d9e2f7cbf7c1ba9e7b30dd70 SHA512 ac7464e724232bf7a9211ab3c845b5b7ead26d8ff750a249c4e7646683926e4659581d3783b4e2de9b9324b8df71a6791221900629e633038a6f6aa1c8b59b25
+DIST catalyst-3.0.14.tar.bz2 621178 BLAKE2B 3fa87125f14661bb77432267f03c0966eff8f71f4ef334ce0a14218f7557dee270840afb79b6735a149851ed44b1ea2f6cf59d8274d74e049246d89874aa484b SHA512 938a63a83458fa5a26a4b4e62d18086ed813aec5638a9dd363ba553cb7aeb337c3b8ba0768f3b5a658aa54f2f375a7fe067279c739073d2420c3ad3a42830830
+EBUILD catalyst-3.0.14.ebuild 1913 BLAKE2B 76c621805e4cbb86e2bd52537091309fea71a6abef1190b274180210dbd6c363502d478d9c27f2981143e5068264e5b0b05633b857184e053669f11e44eba913 SHA512 be473d81fb31ae9aec8aa25608c426f98c877d4115a091c7fd7561e45e2dca3805c076b6eb088dee3988dc6925f186a67f3f951b5e75f2ea5d66014290d981f3
+EBUILD catalyst-9999.ebuild 2317 BLAKE2B 9e80914d109534080b36949a85afd9a4ca28d51e58b7c96bc5bbf359a3d18093ece3263650cf540584e4ad730f50ec7da2c1a8d8447950e46489be6a8d81e69d SHA512 45b47f8c3dfe12d15bad9b57e0fd4d885387e97bd44d8779dc9bcfe492d8240099185a434a25829eb6d43627e8a8ad3005403def3e3cd99fea2bbb1fc3173412
+MISC metadata.xml 512 BLAKE2B 27e0e3638c330c780f163608e5e62b71ed636a2e26291f97465c4506ae1b99345d081046bcab70b1bf56e36c5b9a6b8220b94da8433f2b313235c784ad6b9b5f SHA512 7d6683e83df2d311f3210af91880486ede8f7ddea57044e765f29694eb3e1b8df6f3d22c9a729c480ae9d49ebe3778cfe7a6509365f59eaae34f8438afe97afd
diff --git a/dev-util/catalyst/catalyst-3.0.12.ebuild b/dev-util/catalyst/catalyst-3.0.12.ebuild
deleted file mode 100644
index 39bbd3250f4c..000000000000
--- a/dev-util/catalyst/catalyst-3.0.12.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == *9999* ]]; then
-	SRC_ECLASS="git-r3"
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/catalyst.git"
-	EGIT_BRANCH="master"
-else
-	SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
-fi
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit distutils-r1 ${SRC_ECLASS}
-
-DESCRIPTION="Release metatool used for creating releases based on Gentoo Linux"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Catalyst"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="ccache doc +iso kernel_linux system-bootloader"
-
-DEPEND="
-	app-text/asciidoc
-	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
-	>=dev-python/pydecomp-0.3[${PYTHON_USEDEP}]
-	app-arch/lbzip2
-	app-crypt/shash
-	sys-fs/dosfstools
-	!kernel_FreeBSD? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) )
-	kernel_FreeBSD? ( app-arch/libarchive[xattr] )
-	amd64? ( >=sys-boot/syslinux-3.72 )
-	x86? ( >=sys-boot/syslinux-3.72 )
-	ccache? ( dev-util/ccache )
-	iso? ( virtual/cdrtools )
-	kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )
-"
-PDEPEND="system-bootloader? ( >=sys-apps/memtest86+-5.01-r4
-				sys-boot/grub:2
-				amd64? ( sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64] )
-				x86? ( sys-boot/grub[grub_platforms_efi-32] )
-				sys-boot/syslinux
-				sys-boot/shim )"
-
-python_prepare_all() {
-	python_setup
-	echo VERSION="${PV}" "${PYTHON}" setup.py set_version
-	VERSION="${PV}" "${PYTHON}" setup.py set_version || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	# build the man pages and docs
-	emake
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use doc; then
-		dodoc files/HOWTO.html files/docbook-xsl.css
-	fi
-}
diff --git a/dev-util/catalyst/catalyst-3.0.13.ebuild b/dev-util/catalyst/catalyst-3.0.13.ebuild
deleted file mode 100644
index 644bdda69629..000000000000
--- a/dev-util/catalyst/catalyst-3.0.13.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == *9999* ]]; then
-	SRC_ECLASS="git-r3"
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/catalyst.git"
-	EGIT_BRANCH="master"
-else
-	SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-fi
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit distutils-r1 ${SRC_ECLASS}
-
-DESCRIPTION="Release metatool used for creating releases based on Gentoo Linux"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Catalyst"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="ccache doc +iso kernel_linux system-bootloader"
-
-DEPEND="
-	app-text/asciidoc
-	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
-	>=dev-python/pydecomp-0.3[${PYTHON_USEDEP}]
-	app-arch/lbzip2
-	app-crypt/shash
-	sys-fs/dosfstools
-	!kernel_FreeBSD? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) )
-	kernel_FreeBSD? ( app-arch/libarchive[xattr] )
-	amd64? ( >=sys-boot/syslinux-3.72 )
-	x86? ( >=sys-boot/syslinux-3.72 )
-	ccache? ( dev-util/ccache )
-	iso? ( virtual/cdrtools )
-	kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )
-"
-PDEPEND="system-bootloader? ( >=sys-apps/memtest86+-5.01-r4
-				sys-boot/grub:2
-				amd64? ( sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64] )
-				x86? ( sys-boot/grub[grub_platforms_efi-32] )
-				sys-boot/syslinux
-				sys-boot/shim )"
-
-python_prepare_all() {
-	python_setup
-	echo VERSION="${PV}" "${PYTHON}" setup.py set_version
-	VERSION="${PV}" "${PYTHON}" setup.py set_version || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	# build the man pages and docs
-	emake
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use doc; then
-		dodoc files/HOWTO.html files/docbook-xsl.css
-	fi
-}
diff --git a/dev-util/catalyst/catalyst-3.0.9.ebuild b/dev-util/catalyst/catalyst-3.0.14.ebuild
index 39bbd3250f4c..09099da1323e 100644
--- a/dev-util/catalyst/catalyst-3.0.9.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.14.ebuild
@@ -20,7 +20,7 @@ inherit distutils-r1 ${SRC_ECLASS}
 DESCRIPTION="Release metatool used for creating releases based on Gentoo Linux"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Catalyst"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 IUSE="ccache doc +iso kernel_linux system-bootloader"
 
diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index 2c7b1791e8cd..27ca55eff349 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 if [[ ${PV} == *9999* ]]; then
 	SRC_ECLASS="git-r3"
@@ -12,39 +12,43 @@ else
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_8 )
 DISTUTILS_USE_SETUPTOOLS=no
 
-inherit distutils-r1 ${SRC_ECLASS}
+inherit distutils-r1 linux-info optfeature ${SRC_ECLASS}
 
 DESCRIPTION="Release metatool used for creating releases based on Gentoo Linux"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Catalyst"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
-IUSE="ccache doc +iso kernel_linux system-bootloader"
+IUSE="doc +iso"
 
-COMMON_DEPEND="
-	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
+BDEPEND="
+	app-text/asciidoc
 "
 DEPEND="
-	${COMMON_DEPEND}
-	app-text/asciidoc
+	sys-apps/portage[${PYTHON_USEDEP}]
+	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+	sys-apps/util-linux[python,${PYTHON_USEDEP}]
 "
 RDEPEND="
-	${COMMON_DEPEND}
+	${DEPEND}
 	>=dev-python/pydecomp-0.3[${PYTHON_USEDEP}]
 	app-arch/lbzip2
+	app-arch/pixz
 	app-arch/tar[xattr]
 	dev-vcs/git
 	sys-fs/dosfstools
 	sys-fs/squashfs-tools-ng
-	ccache? ( dev-util/ccache )
 
 	iso? (
 		virtual/cdrtools
 
+		amd64? (
+			sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64]
+		)
 		alpha? (
 			dev-libs/libisoburn
 		)
@@ -65,22 +69,19 @@ RDEPEND="
 			dev-libs/libisoburn
 			sys-boot/grub:2[grub_platforms_ieee1275]
 		)
+		x86?   (
+			sys-boot/grub[grub_platforms_efi-32]
+		)
 	)
-
-	amd64? ( >=sys-boot/syslinux-3.72 )
-	x86?   ( >=sys-boot/syslinux-3.72 )
 "
-PDEPEND="
-	system-bootloader? (
-		>=sys-apps/memtest86+-5.01-r4
-		sys-boot/grub:2
-		sys-boot/shim
-		sys-boot/syslinux
 
-		amd64? ( sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64] )
-		x86?   ( sys-boot/grub[grub_platforms_efi-32] )
-	)
-"
+pkg_setup() {
+	CONFIG_CHECK="
+		~UTS_NS ~IPC_NS
+		~SQUASHFS ~SQUASHFS_ZLIB
+	"
+	linux-info_pkg_setup
+}
 
 python_prepare_all() {
 	python_setup
@@ -100,3 +101,11 @@ python_install_all() {
 		dodoc files/HOWTO.html files/docbook-xsl.css
 	fi
 }
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog
+		elog "You may consider installing the following optional packages:"
+		optfeature "ccache support" dev-util/ccache
+	fi
+}
diff --git a/dev-util/catalyst/metadata.xml b/dev-util/catalyst/metadata.xml
index f89291ab2936..70cd8c55a588 100644
--- a/dev-util/catalyst/metadata.xml
+++ b/dev-util/catalyst/metadata.xml
@@ -4,10 +4,6 @@
   <maintainer type="project">
     <email>catalyst@gentoo.org</email>
   </maintainer>
-  <maintainer type="project">
-    <email>livecd@gentoo.org</email>
-    <name>Gentoo LiveCD Project</name>
-  </maintainer>
   <use>
     <flag name="ccache">Enables ccache support</flag>
     <flag name="iso">Pulls in the depends for building iso images</flag>
diff --git a/dev-util/catfish/Manifest b/dev-util/catfish/Manifest
index 83de53425eb3..981fbfb37c84 100644
--- a/dev-util/catfish/Manifest
+++ b/dev-util/catfish/Manifest
@@ -1,3 +1,5 @@
 DIST catfish-1.4.13.tar.bz2 221999 BLAKE2B b487947954832c691a5a1b3bd2a49e7ae1aedecbe2084b86b9ae1c8bd7c95f6d3746f80723d351bed3abac0e2396fcce134072345a908f5ba9f0dfebdd95108f SHA512 a90c695e7c1a2172ea7a5f7f1a292e95aa290693a24f3988a68f2fb4597183ff7526c98925fb3ef8517fbca508a1c3853e0de87ec023be9424d994d63e29c886
+DIST catfish-4.15.0.tar.bz2 256897 BLAKE2B 98ac6c1f5af7a48276438c08e0259eaae7f9a7d4f043a8c89b945d1d0a18e10f2faf3a210363cf46a97b4becc7492a6c1ce6b8e499b168729ce18ff80d5da828 SHA512 d2415194e3d803a99b1a0d80763db6f4e95c810d2bc679057e54105bb906ec1a0de32b64d8c0b2a36aad11d689401111c3466b1e8ad41760f4d6b67f979a81a3
 EBUILD catfish-1.4.13.ebuild 1128 BLAKE2B baa7858f58e4a1a65806a03482f840896adb5c2d3011981d9d0cc91314c54f3c7196b7eb3699697433690f23ba18ffd84501ca83c1162f5f87ad92457fd193ca SHA512 8cad083f1ab89a1401a12761ab4019c0c9a0b916e4696f6249b332eac1caca81db50c3ff9c51a8b328a733bbd070ef64a0ed544a8d48dc36e058cc73c3aa0a2b
+EBUILD catfish-4.15.0.ebuild 1198 BLAKE2B a21381714e70e071de203b18ed9534050fbfbac84977540228410de8d50c276e7168e815963cae51c866164fffe046926a70722d2840297bbb830e5ebb071df7 SHA512 1b62b7421f44a360af63682da7df7c1a1659a6e894a1384e771a03ff04941b671de569e3bce67bf5603d12c61ddd3bd552389b15118758137f067311d5cf2532
 MISC metadata.xml 216 BLAKE2B 9fe308faad3ff5d9aac2a6d04341fe2b775153198ea734e1b17d15eab6b9eb1f781686089a6487ebc2e9cceddfd3f8c4ad1513baaacf931802201aadbe9589f6 SHA512 780eab488d269f38416e3bfc9c02d1a6bc70cee7755ac7cdc9b0bc42a3a50bb8b0b403da139629767d2f0439b15edce7d7b4078a6f528a4e04cecc1aa9bd01e7
diff --git a/dev-util/catfish/catfish-4.15.0.ebuild b/dev-util/catfish/catfish-4.15.0.ebuild
new file mode 100644
index 000000000000..123c750a72e2
--- /dev/null
+++ b/dev-util/catfish/catfish-4.15.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1 xdg-utils
+
+DESCRIPTION="A frontend for find, (s)locate, doodle, tracker, beagle, strigi and pinot"
+HOMEPAGE="https://docs.xfce.org/apps/catfish/start"
+SRC_URI="https://archive.xfce.org/src/apps/catfish/${PV%.*}/${P}.tar.bz2"
+
+# yep, GPL-2 only
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="
+	>=dev-libs/glib-2.42
+	dev-libs/gobject-introspection
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/pexpect[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	x11-libs/gdk-pixbuf[introspection]
+	>=x11-libs/gtk+-3.22:3[introspection]
+	x11-libs/pango[introspection]
+	>=xfce-base/xfconf-4.14[introspection]
+	virtual/freedesktop-icon-theme
+"
+BDEPEND="
+	dev-python/python-distutils-extra[${PYTHON_USEDEP}]
+	sys-devel/gettext
+"
+
+python_install() {
+	distutils-r1_python_install
+	python_optimize
+	rm -r "${ED}"/usr/share/doc/catfish || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/dev-util/catkin/Manifest b/dev-util/catkin/Manifest
index a04b449af3d2..7d544817ec80 100644
--- a/dev-util/catkin/Manifest
+++ b/dev-util/catkin/Manifest
@@ -2,15 +2,12 @@ AUX 40catkin 89 BLAKE2B d8a24606f095c6afdbc9141a47fa250bd931b53f9e32ce885a7e1dee
 AUX catkin_prefix_path.patch 3297 BLAKE2B 60027c9564b6013f885bdd1f695e7279459cbf499536f381806116ef3d9d66a8507faa39008ee95d1d5662ec667dbe8ca3c1b284f0dd0fe561217a4876bfe960 SHA512 22c6e2440e1d7e48c46c0ad7f2006d621942b9c75d1d126ef1e110b36da321b79152aae8bf4d82c18250ce6da3337c697733ba130c1b2f116282ccb954d8d13f
 AUX catkin_prefix_path_util_py_v2.patch 2153 BLAKE2B 0ae7e9bf9c43652a148102d43eccf7026bb4ad2b00f61530d946d3831da783ab39cb67b844ce093cad97b8dbfdc2c74aaddb8df6771742726a8ef860099933b0 SHA512 4a801c57da530fde06dfed3482931a52c1dfeccf90951b40cde827dfb63e32d811f0963352cdcefe89eb84e6b15729cb2baa03a59ca7c11a44541e8c9c8880c8
 AUX distutils-v2.patch 795 BLAKE2B 830270d966c3006967424b94cd99d6a43803a85e8e68de4d609d60c68cbb610451b42a11d6906d944fb1f47ff669216f9f02e31f227b1379a6efb7b2e5e2f38d SHA512 c315382e77cbf3461e2a57ed6e3f270fe333396ebaff018a4177eb83ea9fd1565368ed51228686ba0ff6c2df6bed4eadece653664ff6bb7e32882eba6d3c3f7f
-AUX egginfo.patch 633 BLAKE2B 9308280ddb79b5a303dc6e022d81d4f6b599a669fca18a586a45bb5282f54603a1b201047532c38fdc734e917002709702caccfe3418772b8e4dc5ac928e234b SHA512 768505296427bbafb108aa2ce87cb127b0db8b889d3bc355267123d04cc956beb1eca9cd317d17633eaa50126e96d0aa3dce8d3aa0abc9aad4ee070b607a4224
 AUX etc.patch 654 BLAKE2B 0ec3289f09983127f60ce4e1a93ad82b9c928fffe3dc820dc3ffc33c4cbedf794d3e49dbe646c83f884072ad949ebdbbe334cced9fdaa3448b5b219669019913 SHA512 8e6026dac6d79fc30056a7c598a99ca4cafcad442eec2eb2f48219b184d610e4d5da5faea5284dd078101b4ef761533d034aba49fd1af95f7f365887bbf22739
 AUX gnuinstalldirs.patch 714 BLAKE2B 32364640271a4868d5a92fcc9ca803df8067ecda2c89c69eb88c168bab4acc099ef2a7efd3c56a77e34acef2ad308780b69c66eb49c272e4d3b1b776d1b4c594 SHA512 38e6e0a220f20a7909a760b558997086bac9dc4919158d58dc41e5dd7d3bf22b8eb9a48cb05503c594dfa0a9e4bdb70e8eec121f45f777fc7821ec6e3678b600
 AUX gtest.patch 1676 BLAKE2B 2f53c95833d47d6637d4aecd07212e33be66e576ed2d869c221b77f0215f6d3879b85b4d70ed554febea86ab9c5246486dc21ed40b5796d081b271057e9cf0a7 SHA512 844e37fc82055eb5e22404b6786910043365a8425a3852e760e3122cc99716083a21155ab9a685d800b034fe34538849cd94740dc851f15e3bafa0773820912b
 AUX package_xml.patch 1588 BLAKE2B 15a11031b704f307778e8cb85438851bfa38a2784abee9c544a10fa4e61036ffb45a391f40eacd7f97ec92abf060a1afc790d87cc1cfa40ddc07561db14c027f SHA512 7d6e1cb0076681c6cbb1332b05e6cd33bae4f780939e00412fd4b022f71b0418a4ff4f8e13d06f42fd21225e78d058818d680fef691dad4412d75ea0f0ef9f5e
 AUX tests.patch 1640 BLAKE2B cc0d89a779ad056806b1c721709c1318278cb836e539042071e83acaa0aaffed9c316ed482a821219c9c074c71ea15bad343a7f63b887b9b266982fe4afe7f71 SHA512 a53ff72bf5302107241d43a0daa8ff18c50b6e69c0e1ecf2a841ace8d37fe7f3e8cb4202b666ad3bdda1bcb7d79f39244308542e1992b9af94d97bcec7086913
-DIST catkin-0.8.3.tar.gz 215988 BLAKE2B 92d7bced93e2d33dafcfd902724f993aa15756139265b5594c15041c333568591193b86e1a4bee8c278f2739dd063f73b6ce675b8ab4fefd312b5daeea414c7a SHA512 14fd03627f3fb339a850ca73e7a49dfeb7312a85416473dff60995ea1d0f1050982929c297751502589a7320dd7eec5d922c86061166f9d475fc1108540db4ae
 DIST catkin-0.8.8.tar.gz 217566 BLAKE2B c17ed55e4f72f6645a778b5669e9b54090ea0425526d7540a6c8cf3af88ba10dfd91b927f53a83d9d2fac56e000c4c52e93216a36694475a91fabe00dd2d0168 SHA512 a90c552bebb46ade23171c85ca1cb23b295d156e731c29cd7602e544aef6231edb179d0fce52d06008d762bafd309456e0ef8976a3f67ed9ea861b905b1bb979
-EBUILD catkin-0.8.3-r1.ebuild 3207 BLAKE2B 98a247feda56bd8c6faf9534fdb5eedf31695a7a15be03194722ea6506e3330e11eb78ddb6e083d9dadb180f8796c91c7299c6ed3d2674d9d0dcb6d4e796bc5a SHA512 90e51c55e9221af64e256a3db88af93e83dcee4e184198d47be333bcf2400b1a49860b38fd87f470a61dc53f6729468750fe62351d1a929b531ed7ae672346d9
-EBUILD catkin-0.8.8-r1.ebuild 3152 BLAKE2B 006b96c6f47e160955e70516ef68f6d185db8d8a08a4898d9fde3e533db221c294b2c4bd9a483cbafa9dec60e8ce70a3d24759968a0b11c79fd2912348e3f6d1 SHA512 ff5b3b612883df9c9b58c704d6a57a408de662ec37805cb824b73f64754cee2b103c6da68afefdfc19b1e2a7d7fbeedb0faa347dcc95480fa197c32bf049f12e
-EBUILD catkin-9999.ebuild 3152 BLAKE2B 006b96c6f47e160955e70516ef68f6d185db8d8a08a4898d9fde3e533db221c294b2c4bd9a483cbafa9dec60e8ce70a3d24759968a0b11c79fd2912348e3f6d1 SHA512 ff5b3b612883df9c9b58c704d6a57a408de662ec37805cb824b73f64754cee2b103c6da68afefdfc19b1e2a7d7fbeedb0faa347dcc95480fa197c32bf049f12e
+EBUILD catkin-0.8.8-r1.ebuild 3156 BLAKE2B c3a3ade7d801d29c57b34c170f3c6ab2feaa11d37d3953b749a8b7a95e6e83fc59e0473c013b0a0802642c96f71fff56892b3ad2843e5c188b0cab4a3b1aa2e1 SHA512 43f7057474af922543f04d3a06da2acff5fbea5fd7046c1b813da33644a6f7fb7b7d7d6d9a1ff9f5bc59d31b2f575d227232ba5542ae01bca6d9acf5c98eaaba
+EBUILD catkin-9999.ebuild 3156 BLAKE2B c3a3ade7d801d29c57b34c170f3c6ab2feaa11d37d3953b749a8b7a95e6e83fc59e0473c013b0a0802642c96f71fff56892b3ad2843e5c188b0cab4a3b1aa2e1 SHA512 43f7057474af922543f04d3a06da2acff5fbea5fd7046c1b813da33644a6f7fb7b7d7d6d9a1ff9f5bc59d31b2f575d227232ba5542ae01bca6d9acf5c98eaaba
 MISC metadata.xml 324 BLAKE2B 393e10af3d1bef82391a91bbf6382d9d1cafcdfe8a681b3a24844427cee1e3aa36f27ffd0a37a65b8a476ce0b3f2a860f546adc32c480164c69f66673bb0b5f4 SHA512 598dc8dd4427079a7eeca415c192ec39e99e53bc41c06796d2355b8858363b71ee8f038646c61ddd82d27451eb48c6f93b47489cdb04ae7c8663a6b46c4f9b94
diff --git a/dev-util/catkin/catkin-0.8.3-r1.ebuild b/dev-util/catkin/catkin-0.8.3-r1.ebuild
deleted file mode 100644
index c11d65241502..000000000000
--- a/dev-util/catkin/catkin-0.8.3-r1.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/ros/catkin"
-fi
-
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
-
-inherit ${SCM} cmake-utils python-r1 python-utils-r1
-
-DESCRIPTION="Cmake macros and associated python code used to build some parts of ROS"
-HOMEPAGE="https://wiki.ros.org/catkin"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/ros/catkin/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-python/catkin_pkg[${PYTHON_USEDEP}]
-	dev-python/empy[${PYTHON_USEDEP}]
-	dev-util/cmake
-"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] dev-python/mock[${PYTHON_USEDEP}] )"
-BDEPEND="
-	dev-util/cmake
-"
-
-PATCHES=(
-	"${FILESDIR}/tests.patch"
-	"${FILESDIR}/distutils-v2.patch"
-	"${FILESDIR}/catkin_prefix_path.patch"
-	"${FILESDIR}/gnuinstalldirs.patch"
-	"${FILESDIR}/catkin_prefix_path_util_py_v2.patch"
-	"${FILESDIR}/package_xml.patch"
-	"${FILESDIR}/etc.patch"
-	"${FILESDIR}/egginfo.patch"
-)
-
-src_prepare() {
-	# fix libdir
-	sed -i \
-		-e 's:LIBEXEC_DESTINATION lib:LIBEXEC_DESTINATION libexec:' \
-		-e 's:}/lib:}/${CMAKE_INSTALL_LIBDIR}:' \
-		-e 's:DESTINATION lib):DESTINATION ${CMAKE_INSTALL_LIBDIR}):' \
-		-e 's:DESTINATION lib/:DESTINATION ${CMAKE_INSTALL_LIBDIR}/:' \
-		-e 's:PYTHON_INSTALL_DIR lib:PYTHON_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}:' \
-		cmake/*.cmake || die
-	cmake-utils_src_prepare
-}
-
-catkin_src_configure_internal() {
-	local sitedir="$(python_get_sitedir)"
-	mycmakeargs+=(
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-		-DPYTHON_INSTALL_DIR="${sitedir#${EPREFIX}/usr/}"
-	)
-	python_export PYTHON_SCRIPTDIR
-	cmake-utils_src_configure
-}
-
-src_configure() {
-	export PYTHONPATH="${S}/python"
-	local mycmakeargs=(
-		"-DCATKIN_ENABLE_TESTING=$(usex test)"
-		"-DCATKIN_BUILD_BINARY_PACKAGE=ON"
-		)
-	python_foreach_impl catkin_src_configure_internal
-}
-
-src_compile() {
-	python_foreach_impl cmake-utils_src_compile
-}
-
-src_test() {
-	unset PYTHON_SCRIPTDIR
-	python_foreach_impl cmake-utils_src_test
-}
-
-catkin_src_install_internal() {
-	python_export PYTHON_SCRIPTDIR
-	cmake-utils_src_install
-	if [ ! -f "${T}/.catkin_python_symlinks_generated" ]; then
-		dodir /usr/bin
-		for i in "${D}/${PYTHON_SCRIPTDIR}"/* ; do
-			dosym ../lib/python-exec/python-exec2 "/usr/bin/${i##*/}"
-		done
-		touch "${T}/.catkin_python_symlinks_generated"
-	fi
-}
-
-src_install() {
-	python_foreach_impl catkin_src_install_internal
-
-	doenvd "${FILESDIR}/40catkin"
-
-	# needed to be considered as a workspace
-	touch "${ED}/usr/.catkin"
-
-	python_foreach_impl python_optimize
-}
-
-pkg_postinst() {
-	ewarn "Starting from version 0.7.1-r2, dev-util/catkin changed the"
-	ewarn "installation path for package.xml files on Gentoo."
-	ewarn "In order for ROS to work properly, you will need to reinstall ROS"
-	ewarn "packages that have it installed in the old location:"
-	ewarn "		emerge -1O /usr/share/*/package.xml"
-	ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=595004 for more details."
-}
diff --git a/dev-util/catkin/catkin-0.8.8-r1.ebuild b/dev-util/catkin/catkin-0.8.8-r1.ebuild
index 46bed14e7929..4907543b6705 100644
--- a/dev-util/catkin/catkin-0.8.8-r1.ebuild
+++ b/dev-util/catkin/catkin-0.8.8-r1.ebuild
@@ -9,7 +9,7 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 	EGIT_REPO_URI="https://github.com/ros/catkin"
 fi
 
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8,3_9} )
 
 inherit ${SCM} cmake python-r1 python-utils-r1
 
diff --git a/dev-util/catkin/catkin-9999.ebuild b/dev-util/catkin/catkin-9999.ebuild
index 46bed14e7929..4907543b6705 100644
--- a/dev-util/catkin/catkin-9999.ebuild
+++ b/dev-util/catkin/catkin-9999.ebuild
@@ -9,7 +9,7 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 	EGIT_REPO_URI="https://github.com/ros/catkin"
 fi
 
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8,3_9} )
 
 inherit ${SCM} cmake python-r1 python-utils-r1
 
diff --git a/dev-util/catkin/files/egginfo.patch b/dev-util/catkin/files/egginfo.patch
deleted file mode 100644
index a33e066ced66..000000000000
--- a/dev-util/catkin/files/egginfo.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: catkin-0.8.3/cmake/catkin_python_setup.cmake
-===================================================================
---- catkin-0.8.3.orig/cmake/catkin_python_setup.cmake
-+++ catkin-0.8.3/cmake/catkin_python_setup.cmake
-@@ -143,7 +143,7 @@ function(catkin_python_setup)
- 
-   assert(PYTHON_INSTALL_DIR)
-   if(${PROJECT_NAME}_SETUP_PY_SETUP_MODULE STREQUAL "setuptools")
--    set(SETUPTOOLS_EGG_INFO "egg_info --egg-base ${CMAKE_INSTALL_PREFIX}/${PYTHON_INSTALL_DIR}")
-+    set(SETUPTOOLS_EGG_INFO "egg_info --egg-base \${DESTDIR}${CMAKE_INSTALL_PREFIX}/${PYTHON_INSTALL_DIR}")
-   else()
-     set(SETUPTOOLS_EGG_INFO "")
-   endif()
diff --git a/dev-util/cbindgen/Manifest b/dev-util/cbindgen/Manifest
index 366e82c5d83d..defb466bdbe6 100644
--- a/dev-util/cbindgen/Manifest
+++ b/dev-util/cbindgen/Manifest
@@ -1,42 +1,43 @@
 DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
-DIST atty-0.2.13.crate 4764 BLAKE2B 673eea1d377fc3aca792a3a8bd2a5c058f3041abc76a8760dd6acab7f19fa610f812c57d81a4dbf773675cad3df483904c66e66b45d83393402f747c6db60d89 SHA512 4554ca7dedb4c2e8693e5847ef1fe66161ed4cb2c19156bb03f41ce7e7ea21838369dabaf447a60d1468de8bfbb7087438c12934c4569dde63df074f168569ad
+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 c2-chacha-0.2.3.crate 13336 BLAKE2B 0b548907ce4c9ee502ec96307ca003d168e8bcf9007ec667661d158f33de36fc2e832cb3c36cadc2523f6ba8b9aeff4dcb16e7f95a9a34ae02e8bd5d00f65cf2 SHA512 302498f75d1befdb8bf8b61d0eff2762f0e86000c3909d819a377be2fec72e830bfb4530e24059906b499cef17ab56229f5627fb998ad9ba34a7c6c0de748538
-DIST cbindgen-0.14.4.crate 172123 BLAKE2B e86fe619d824b25884570c7a34bdb6ceb3d4906b2309a3c16b29b46284f7bd855991910000a54605eaf2786ce4f570b647a469a2d02831919d9c0a17feda694f SHA512 1d1dfbb159aad25ecbe77368ced803a0cf219a00238364d95b1866f371912e10932e9a6ccda7acd8541b270b1880bda4a29af095a8d83b79a792e31d1ce2bd78
-DIST cbindgen-0.14.6.crate 174606 BLAKE2B 9b1145513b8ff468b4afc51d44e038af48bf925901e1d8b12942e6ec19aed84e984de8024f2684965c6e68d68ae3c772b2a022d1cded9495011c2210156aeac7 SHA512 160165c1e273b571cedde7e7911c56d81408e1fb416d6415329a7a8b4f366a0dc66ceb8974da9ccf3d5dd20af86785cc57c8b788484b17da51372810c25b01bb
+DIST cbindgen-0.15.0.crate 181832 BLAKE2B 01ba21eb1c5bcd4e562ee2d43c839941a69fcc45d17b31800c54016d815c2fcd998176b96108d73b0146a62924315eec373c3749823a5219942e68cb483f888a SHA512 cb0868ccdd5ae8f46b3c07f7f06bfad0583f2eda5381e4404a679814dcaad62ce95c9c16c22f00dedfaa2b78f25f1e5f3404a3e515ab50cffac05d1e6f936e60
 DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
-DIST clap-2.33.0.crate 196458 BLAKE2B 3bb62d817afc77b421a6282746b9b61367d224de6b614c7ed66bde452ce1046728077dab3368a46635b5c74d82ba3196586d87c0201478ce5b89638910dadb1a SHA512 f1075031414d48e4340bfe308904a95a31b72460724773c52a0bc8c004e625a04c904a39fc5420cb8c26a633321f9b5f4f69019c7aae5ed89900b63ed8c21a91
-DIST getrandom-0.1.13.crate 24581 BLAKE2B a61df4369526f860eef6952a021c3f473562cc4171c373c105d8944c305370592cd98a6c28cc0f8d00496f6b47cb900a4498dad942d0b6f60b4d8163d8904f14 SHA512 534b01d28bc9e69a5ad1e84f34aa4154939c27d70c5f557f15e669fa8894c375486ee945a6a6d8adaf1b6b7accda0e24963f70e77dd51ee0638a6ae6daa38925
+DIST clap-2.33.3.crate 201925 BLAKE2B bec9c866481c5b3fddeb314f68af9bce38fc421e42816182de3209e8ea3447b72cf033e6251eea27fe974eff8085b7d98cdd2911b5cc0ec6b4bf4c750deb8a25 SHA512 3eb0fd648e2e3f9e5ff69a5e6cf0d867304fe18523accd036f28a86de368e4774088a6936c108ccc045092c539fe7f7494ea96420ebf6b4bec16880cea84bedf
+DIST getrandom-0.1.15.crate 24786 BLAKE2B 868817d62ee44fa5bbf54f9af0bd71a29503f92bc93e190a834f4ebdb8eb73dd29e175c661f9964298987949c0b82a53e99080cbe4090fc9c5453daea4b05595 SHA512 b26d9558554058f8a54b03f56f488db5ebad2d5cc84f737e489f8f532f8464ef9038d104173eb30acca61caa1f99e1ce267bc493c01ba1611b829e0a090cc87f
+DIST hashbrown-0.9.1.crate 77734 BLAKE2B d59002253112cf92173c3c1b305fd03fb7318ef187d7e033433baf6a354db046d1f3fe0387b3cf500fbcc0f83d2b2076527ba7cda2695f7627eca0bc3e3487c1 SHA512 dfa4742111f6fe757b7fa97f04c7b4a78ce9708c87e8e09ecf3c28f2566e48af9885fda380ed918cec37b5c696110fbdd30273aba6e7d2221c9e65f72af064fd
 DIST heck-0.3.1.crate 54666 BLAKE2B 99f7ceb44ea6af445749989730ce1e14156018ff046a136be2e6474b285088e1d90d6f8af9352affbbde5bac7e5a32971dd99f249f968105e9793b7de76def07 SHA512 134722192c46fd64b38d2fbec3a2511c560916e906491a72c4ec9d99b9f716dc58942fb99cac99b9a6ef2de5b5ad1d1c1155f292d091401b6873347d80c086d6
-DIST itoa-0.4.4.crate 11147 BLAKE2B bb6f1caf1e58dc313bd3cfa2cf81252cb2ebc15e1f4c9adfcdedf46c5fa79811d5b0cbd58f1e91d1f62bf85d7b941b0dba535814fb43b5b70a38db791b45717c SHA512 f5e04bd908457e7592243ce64a99c5283428b767f4cc17d77946770411b06fccb0250625263c3e84a02a018ea7e8a0e4216e1929a71988bab8e1dbf603d3801d
-DIST libc-0.2.66.crate 457815 BLAKE2B 5da379ea738b75189e106d4be821c999394043303b8bb6a9caecdb1b53e449f11a58edc4589193611b76e7baf00e155ba1077bcca4d0cfae30826e946a0075f0 SHA512 5bf5645a7cbe626108cd71e1d189286ed161fcd3ea12cd34f4e392be4cf93bf78feb6128b1101bedc41a71091398f26771f3efd3880f779ee0be00f706914975
-DIST log-0.4.8.crate 31297 BLAKE2B 31037fdc2fc94f4ab8a6e89a251b0bc29975027dc7efb7cc86a8e848dfc8e2ae50acdb177b7ba9f7c1f20ec01e50798f89abb772d67a33f1b060ac617cf9a8ab SHA512 0b71f97d5964134b5eea1332347e177806b2f171d0be5c410c0ff1539470b242ba9f0933fafd853e4171a43b5e373a150af18918924be431c7216022553a8a3b
-DIST ppv-lite86-0.2.6.crate 20522 BLAKE2B 6e1e4f3d0daa02148df390be19d3575626e66f6a78dbf27c1275f097c4307b80d8182f7795a270aa2c34d8c31c8c3eecc88e9507a6c9def0e91af11233aba90b SHA512 b9764a841364eb89157c828a183fdf6aeeb63d1d35e4f5dcba79e5d8e20eee8f22c845636c5c7bc980da1d141d838528d5f190546b23aa5e4e51e626a0ddce3d
-DIST proc-macro2-1.0.6.crate 35414 BLAKE2B abec56bdf8bf2109337e007c59c7c9c78ff0af3848c9b45567b2ee1d5120ace78fdf327c61becf917ef64366e5947792608631f197d182753eeeaf81ffd2a1cd SHA512 d0a6358eb6f9334128a5b47c096bfc57452e13d603c9514df433409069c00468fa2b3c76761d7f3696abb061c1c3ba24150e0cf9be2c5d571d580238d2d27853
-DIST quote-1.0.2.crate 23023 BLAKE2B 4091809b4fc9b8d0b56be814b127d6ffd7c1507becba85dc905606cbe85f46233dc4b429c1e865e7c7de336cb936d956169ceb5dd45b489b7722022ccf818a3a SHA512 67778dff9dc5c4edcdd6454b74ad9353bb6c0c4e51c16cb82f2e393a7d7a0cde084d3c93279b718a8398c40af0a9377ebfae5321e69e635efd8390c125b75ce4
-DIST rand-0.7.2.crate 111438 BLAKE2B c9e81a0b2bcf5a3d425865dad2babd90187da55b9c70fce4aea4ed2e2ffe9cfe4e66bb280f1acee11e1f1ad17d3a73e906ac6cd35e6a2124852b66093293bd48 SHA512 d29d10e9788f0f44b56b2981aca01a115eca1018e6afe2428fca088cc9432f27d014c6f1f0c819317052f4c64a9c54cee8834eb08e081f292ad65160dcdd014c
-DIST rand_chacha-0.2.1.crate 11475 BLAKE2B 698f830845e24b85fe52b11e9a1c621dcdbe4232bc22f3dc0b1d2fcd4427045f302f74134d9b451fc5b4f9ac559fb2bc06f3d0eec5eddb6fd6cf3e6d3030855e SHA512 30933fdb94ca8d4bf040a7e08a42944a0d7c2f3f6a9a3d547e74bc32f922b0eb79d85afb1f6c85c78dc115170e70bdf96b36f0478d61ba5651876d5350ad18f6
+DIST hermit-abi-0.1.16.crate 9889 BLAKE2B 1d1681d484019adb9c27336ef87fe9680c18a57de71ca9bb3022878411ce8f933bcb0f5d03f190425039a53a427ecbe75f8eea654661340ebbc165fbb61322b8 SHA512 b9aa336e195fdbb3c1a1fc7167f3efd284c2c3ab0613ec47f07b5cf5865b56cac3aa0da4936f6a336f036993344126b3d872875c362c516e0ca538d8e36195f9
+DIST indexmap-1.6.0.crate 47565 BLAKE2B 4b2c50788be5c5416973133c10caf092468444af6c101eceb5d2f53ec3502d73c034205186974efb335a1d8aa9a797b191a871fcfd573251c95ad1d13c0c47cc SHA512 f91c0d3588da037a2dc728c9cd823b4acf7edfbe7d59b28dbe1f5802294f2677eacf0ccea41235daa30b3d8187a97938653a040d8c9d2d38513440b2e82fd85e
+DIST itoa-0.4.6.crate 12167 BLAKE2B a0ab539cfdaca0a61fc55afdb74ef3231d300452fabbc747cac16a51ec74b4ad5c877e2b2a35f3087693c7eb55b5c389b5bc037b960733ab2afa36ff781591c2 SHA512 9085ad30313a2904fc60a85afed99c7388a345ed50c988f4e7307b23b5f38b14bc9ff64edf02b85fda6c363e035ac314241d5dba4a6e2dcfef3d2648cadb9692
+DIST libc-0.2.77.crate 507233 BLAKE2B f02ee13e41dfa6317a6cf7f0724f891cc9f98a68cd25e865e744ebbe49d93c86f16c2fd71ef4410ff28e0b386c5b4dff605c1236db83bdb91292ae48d0900782 SHA512 1e6dbd6f646a50fffd294ea56146c42dec6c4e027f2cd886ce2bbab9a5a2d036e4787f95201c448bef9ceddd52d863153c849343791d92900bf1378fbacee0f7
+DIST log-0.4.11.crate 36276 BLAKE2B 728647c829e96cb4fc795682facceebec887508e1ca14f13c0e7984db8ac39b3045885d1daa2f335de3e8f25c5cf1b519a1e7c8c6f4160a716bb8e39d085009f SHA512 e216fcb3c9635d8c4b67b05c1ada1e5de4e99dce89ab4c8f8033ddce6ac488605d8af09f93c42d25ebf8844feea22c93b71682e77a368ee01c686a15133fdeec
+DIST ppv-lite86-0.2.9.crate 20933 BLAKE2B 493fb977d0db8eb4699893ed1d05758ee7cf1b5610b767a2ec352f3f430edf3d1a3bacefae554fb16eb2786fe4fb9b574c7b9961458a938da9a79b9084f062a8 SHA512 d9fe88a221733197b43db2a2a608dd2acdd9aa37129af07ad2405d66171b6f9f4c1a61530013c7f9ad69194a2e52e7480ba80c696e97cf2adaea7677052cb010
+DIST proc-macro2-1.0.21.crate 36909 BLAKE2B b4759b2fbbb242aeebc7b8155c6d9f316c96672b37ce3540ae6acc579e6bafa01fe4cca37639125cc38e539000f1f6921d2c104bba80f0c2581a6ddf16d74223 SHA512 bc8ca2254c43c5d0eb799cab503fa89ff49d8e98aba5c9c1f960efd5286dd217351eac6774bdd96fbc392290c8de62ecaf4a6ed1e300715ff014ffd9326f9ae4
+DIST quote-1.0.7.crate 25170 BLAKE2B 9597c94ac365bb6e9d632738a88ece2da7818cb9f3fa0e755324e693eb513c76347032737025375a486319caad13c22ae13bcb257703eacdf2fdc755cbac0de2 SHA512 b7cb576c07419854f71072a88e4216f50d78196703d3d8a1068dfd0f2ccb1e417c3a865ec3be613b46e74e46654f64378f527800701f74d50352cb766a885953
+DIST rand-0.7.3.crate 112246 BLAKE2B ecc7c1bd70ac874c03bd8b7faa3016bb2d5ee5c19603280a12a45a81598f706e445971ee081e6ca410ab6f0f5f7a06d9315848cd556a2d8522a82024f6ff91e4 SHA512 f9b68ef9446f1ca2c8092c50990f15c1b4cb5529eeeac4df8d69755e0b7253c663c587775e7cb0a7298c31edb444975dda34926759306541f6d43d0d3cf57b7e
+DIST rand_chacha-0.2.2.crate 13267 BLAKE2B 7908867ceac98243ade22e1b38f1903fe0249324484d91c948a5058a1e099e5213f325c5ba3400898c8319158ed69f4ed064164f235470856a8191bd990d5a10 SHA512 1e2117442e4ffdd834dcbf0ea1829e73202c0ff9041d5969d81a59330242145f2753f2a56de2fdbff65f26cf0d227c7d08b2094ab2f946b764aef88106a6ac84
 DIST rand_core-0.5.1.crate 21116 BLAKE2B e74791f941a79971f2741172d489d546373c9abcb0dfbffcb7b97b858ec800b2e0c97df4ac636f3aa1b8dd6c14685edf317336d577f31b5c6cb7d89a157e547a SHA512 4f7500b35e165e6c817fdd67a50745d5497d24e554bb554705097e37258751e8755c4d6b8a69fcb5e1977708ba78620bc35d640e4e018fcd4e88d9dbdbebdcbf
 DIST rand_hc-0.2.0.crate 11670 BLAKE2B 55fd048f2524cecd4f0e17927a81111e3070a8cc6a5b0234a46445400ad5527194edf8c91fb5ad6538f4958d53044ab02424f61a38adb2931e2cb7568c458ee8 SHA512 bca185612bed5cee4da76fb68fe854105da276f5bf2da464e596d586b925df798cc692ed881e276ab77c36b4b0551930966c93656be122ad05899d87853533b0
-DIST redox_syscall-0.1.56.crate 17117 BLAKE2B 57b1b01ef3cbc6f55def6c9a0dcde16bd98e83badcef993e26ae3ce849abcd1b1c10f4da931c605970d77f92471734764a537e7329291a221343fde23f3591eb SHA512 17a3044327aa733c830dd74e210d6bda32622617d1c5af9d70d7647232d8569ad0b04ccb14042cbabb5d97ad98e3f1f5a9968a75387354ffb4d175e9577115a1
-DIST remove_dir_all-0.5.2.crate 8907 BLAKE2B 585f49f83db3ace90dd0b4fc77aab7525844194c82d36cc33ab8999aaa6226d24a130c30f55e2c46a08273cc554d9d4c8bc51958aa7dbf1045085b2e22639e4e SHA512 d19a45398a93adbcef9f233f6b3eaf4a63ae95f5bbae00c880b40c5edd34449e7f798ebcd4d11843c68ddfa15e11bed21d434b224e4a175dcb64ae011c13c8cd
-DIST ryu-1.0.2.crate 42001 BLAKE2B c25f0454bfac40de3150b8c263c6d2842e64f86f441a69ab5e5722a2383a9a07c7539837f6e50996619eb0c4a5da212556a4dd21a761a250785fe0a9c4e18a3c SHA512 c681e037f1eea488bad7fb5ecc79af52377bd4b9eeed95eb213201219d7f100702000f81947aff8f18641235fb62c138a30eb20c1f93ae518a4d9960a598bb64
-DIST serde-1.0.104.crate 73258 BLAKE2B 98d63f91c61ac4693e17e0b137379cffd6608933b84d2211509be6b3b25b181592d5e907549fac6ae2e4a45255b8003e1bfd0db683429ac3e78d8ee097d3d79c SHA512 638a1dacc158d69658a005e599adc19d6bc80d0c663f527b1ff906f729e70e027eacc4ea5b9b2c675ac990d5997f50f9d46d614ba95b0c73bb9606aba46b053a
-DIST serde_derive-1.0.104.crate 49658 BLAKE2B d4a9ecb4a8df87776a83d645778dc050803b16fd5c9889f28e231238223d424dd25b101412e89741fb47be624d1773acf97f6e38809c81110b696701975168df SHA512 303c3d126ca56b0a7126a87e9e1be8bd60bdb212ed21b5e1aee015313fd769f1d260869c41b0335bd467fd4e3fc6bb26f428c7c4b35e9a55c009797cfa745d1e
-DIST serde_json-1.0.44.crate 70325 BLAKE2B c8f5836e3448bbf5fd666b30e747b90f84eb7dbaaf078026456082b5403bbcc1931c70528abbf0e605872271861c1e7dabfe1f42d5a13c2b02f5abb28b342e61 SHA512 ce1c68bfd2ceaa8b7f45cd34cfbc71dcfe3905b06fa47032403c54aa9eed0e618cd526938eb78dbc201e9480dbd64b4bfb405f2119478229f5cea12056dcf5e4
+DIST redox_syscall-0.1.57.crate 17087 BLAKE2B 88e3ffcfd752e757f8fadfd4edca367f9185f09e609c329bb36f179183cf103dc182aae701c14afb717d2b4c3d72ba307b49fc671cc97aa7c9d03df1a7a1835f SHA512 c6e187087060084b7173ed0d9d0e982e4259d4f76522112268c02ff20751382e3bc8e119da6153170f5c54bd5b9cb028910f2f85c1c842099205dccd44659184
+DIST remove_dir_all-0.5.3.crate 9184 BLAKE2B ab7ef94e0230ddc9b363f038254a180881bbc20eb04a254f97e6f71ed491c99ba1c88f5e85632d450243882a4a0df63f3b8b183bc1fbca9caf30ec23d577b1d7 SHA512 50417d6d8a33912193a1ed37eb72b47431b12ae65d2780cdb7080c3d141e63819da13751c3fb737685cea322f70b36d413389c3dc01aa12b4dce615aefed0e2c
+DIST ryu-1.0.5.crate 49570 BLAKE2B 3bfba4a5f290a429de7ac3b86823b2a973f40eb6f48c15329173d95964d31ada36f2618be4b36774a03f97f2ce61364900c6a3ad5465a294e2df311a1f4104ed SHA512 d1708ffa3112a684edf2956b6730ead040401d38f1457cde074eaaa59c249007dc8b925629e7f6df89f7ea757e9d0826649d685cc8ede0a04d50296048bf476c
+DIST serde-1.0.116.crate 74443 BLAKE2B fec8b7ec294919b72d2ec8e97046f6ba6fae79736567ea7827808d362802bbb8b6542e528613744d9dc5e2765ea3de1a0b1d4f5da04a13e1eefb2724242b8acd SHA512 938cf3c4860a35746810cf46003ab754b02446f481ad91ad3a030c751ef593889f433019626c613add8834b71d855742482d7e7c471f423a4c7b324d809992f8
+DIST serde_derive-1.0.116.crate 50697 BLAKE2B 63450a51be3ba880b225fa9d0eaa1df125d63718e95af9345c4d37386ac94e997f25f80f15b6ba5aeb1eb4abc482532542de82049e64f66f6bfad729a90a6e3b SHA512 d0571b9b7346f031514a519da19e53f0fa0381052dc16a40f1a2913518a72558d6fce7712152fa9408cfade6ee7ebaf2c0c84aaee9cd9c961f88d1470747c16d
+DIST serde_json-1.0.57.crate 114723 BLAKE2B f6097bd4541b369d1d4c1f1d50c787489918bcb71f3786084d0b5e139358f0c66ecc8ed4ca9bd3474fdb44726d0e5d9a099900cec31392968eba80180715c5d1 SHA512 0ca0ed1cf47c87f907b241e696d6aa23b49bec876d3b9e0e011c20d145b797769631ff8ce8d57487633d1d8a8657e601884bc10b5670ce17c136b9579fd921de
 DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
-DIST syn-1.0.11.crate 193782 BLAKE2B 17e0b40ee69575efea77249343af2fa67af0990f08ac8efced152ebb88ad1301211306a2317ec163219d485a097878f8552ca353f43f35ffd5d172e6c92da0df SHA512 6b361c6cb27aebb3da5e81db270e7cd0fe8bfb11289c25ce46127214e222c2b64f53164c8869de41b77e9b780f967454ed5d7c5b73442ae292eadc4dea77494c
+DIST syn-1.0.41.crate 224979 BLAKE2B 19a47cfb286c0c055683fffcb87c7e04622d35a40ca92ff8558458b64d7c4a70710ebd6fb9b6f9e69aba3adfba76da72a131c5657a3c9f54e7110323edb4ea51 SHA512 0f0cf4adf8b4632a44420243e8cccbf7f8e4fc186a7eea8a775ef70932c9f6a3dbbe331c52e05f3b1ab0fa47a5f5d235d261ac01318ddd6ceb549d434f570e31
 DIST tempfile-3.1.0.crate 25823 BLAKE2B a34721369923771d5f9a2fc64adaff2bff41da97a0ce79e01aaedb8d6670867220c671c0d23f7a8a9c71b09c0559efe4e7c9bab1f7f9d890866be1de1ce050a9 SHA512 a87ee51c36a81a8a8eb8f091eb57926682f38b707f7f641332d8752170e6c139a656ae49c6861f51e07c2fab5c86cc9b2ac158f5d89c6bff15d18934dd4e7ba5
 DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
-DIST toml-0.5.5.crate 54805 BLAKE2B 2b319f37165164793866bc4a470ed99447fdccb59242c94e5311906dc764f54131f2bc14921caab56bf84706d12800fb26a58210e3e58728f4076edc9a66e771 SHA512 8f6a04dc24ea775a9a28cc948039f20540ec983c46b287ebfa820e29cc5867803765ce099283f79d3b4a22c513b386603dbd8130808cb3354bc63b5d4706cb33
+DIST toml-0.5.6.crate 54341 BLAKE2B a367d22daf6169dbdc9cd58c97f824ab76567679e1032af7a0f924ca53720d2f0989c14545d1f5d82e7f46293e3d27849459157d0cd77dc78e9d76dd6d200648 SHA512 718f5d3fde823ae5d7fbea31e3cd0eaa66f6a2bcd854093d0179dfc4328930a984deff466bcabf3c81caa323aa743c609136b8d036b80087b88e888ba7577f54
 DIST unicode-segmentation-1.6.0.crate 90703 BLAKE2B b7d63bb8b62cabc604084957aaff021df24a1291f0ebdcddc424cceefe10ad399ed53152211c3e7557e39e21255166f922256f9f8e1fb488d3bae368b49a378e SHA512 80c6f92d9b39602a05809dc63a7cb05a305441689b6056801097a882a36c9795aabd660f884f707daa7e7fe6ad4983f6e245c226962cc982dbfeea2ddfddf41e
-DIST unicode-width-0.1.7.crate 16644 BLAKE2B 8cc5ee2dfeeda8ffe3405a0d4f1576d2b3b8ede1a42cbefb0ba3bd0d71b53a92ceade86c4a06e9d5b31382955dc6e1152ae5cd279dc26dbc51f478dad1d0f64d SHA512 39b8a539c9009d0421f54ae68b139f21456c9cb03d743b58535a977f98bc9655cf42eaacfadbcff796c187a6f315ae16259ee22be9c2da5aa042172c6b464d84
-DIST unicode-xid-0.2.0.crate 14994 BLAKE2B e66b4255798f0ef1c81fb852613fee396a042d780d2158a171dbb5e7dedad0b3d2522f5401ae5d215f89ab8be4f5c371b046e4845693a65554c2a6eedc5d1e28 SHA512 590f727d8d8354023062ae5fe7ac5bed1bcf79d86b883effd7f33b3ea3b1c8922998a63d621ca6962a969e890fa6edd009871f21cd57b1969264f41ba3f78359
-DIST vec_map-0.8.1.crate 14959 BLAKE2B f5c179ccb4349d543747d5e3bb3edfca4bc9f3f64ba3c2d40fb1d9cba98433b7a0641387aafda6347c9b3603592c64bd820b217b46fbfcd37f802f298e5793ab SHA512 026cf10dc7ba98ae51dd312fc847cbaea41c25f0da5db6e0e22c2ecf75584bbf876d7bd96035fbbcf6696d702d5a3f25977e02a2d77cf519aa21e3ed05710e40
-DIST wasi-0.7.0.crate 33941 BLAKE2B de1e4e577a1237a233f81ff1a3bd7f888020a42d93a807187a154a3ae0593397358a8667a065f0cdd5497dd2a89889e418d33a0d42ab1631b3f99677e9ebd665 SHA512 1950e78df7f0ba21b917680633d092704f1fb906bd973de4ddc43cedb7bf449f6e881d50e3aa0d5595e8d58796915d582b69c116ef536f819b6f035affea18f0
-DIST winapi-0.3.8.crate 1128308 BLAKE2B e0e8ef6121f222b0500525192ebb69b26b71cc16f9ba92186f8ad6acc9de4cb8cc7c738f9c31f5bd223d2e34c93c496e8448c973d69797776004670c70abf69c SHA512 5a899ee5f09f30d742b8b8eba78da05cd9f4c664408fdeb9370373f8756a962a23e3f1c07619e745b3270138606c9a369076c02c3f5353f657df09d203d9a736
+DIST unicode-width-0.1.8.crate 16732 BLAKE2B 5aa7b87eef1322e4151a3fcf981ade311b8fa030527d7561815950e58d3f15156163dfe34da6a708c37dccc3f7652bf7fc2cd899fe8bb0118b67c4113ff3a2d2 SHA512 0abba6da6981a2451e01d93bbd47652c46eb6fb07cc0214f33259fb29945bfd5ee2b302e883ddca8f68e921635f222701b7310e7da2a5e225f854980d1e474b0
+DIST unicode-xid-0.2.1.crate 14392 BLAKE2B 7f8f91b9c4df55f2137b754208d4f2997a290acfc9393ee2dcda8195eda25cb342e56ad123f56bb298d93db5248a749c18a982423c9a0e85ce93f7a1eb55d289 SHA512 91e862137e837baea82829431cfed36634fdb05339f00c756eb5a4b429ef0bb871f5133d11adf9a023fa22168c8a0cf194ff3669779f04f219d48fc4fac339d2
+DIST vec_map-0.8.2.crate 14466 BLAKE2B 8f109fbff19604b82ea2aa61c952e2ce9b5597ccc8e1ef4e847648e2de08dece8c4debe92889edeccb8d393645fd0b62436b49d236ded7ad181c4a51239a9539 SHA512 4f1ef59bc2c437e79f1f84fe021bce5aa8ccd581f500f3d5776913d5f17d45b03ccee64f5bd03d47656318cfc9344a1f4311079d471fa409a8e4e94c143973f9
+DIST wasi-0.9.0+wasi-snapshot-preview1.crate 31521 BLAKE2B 716bdd2ec46d0bc9911c5e5e29fc783840559931b2563d8619675fc11da9527ddbe653a0f1ce0b782ee0c5f7a3131aba2b0867d415f003aa9c2389357569e7dc SHA512 dbe641f796ee3a5daafcaafc911ecc6dff170340f477c2df7a61fb4858a85aefc2637c9e61973ecce66a987aa8e08a736273a4aad3ef47eaf61ed4268dbf9c47
+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.14.4.ebuild 1006 BLAKE2B 1075624da79b47614713bfdd1e77c19c7f5ad948b76a0f276a137bd810713c42ab0ec6e0f29f21a9a28617f26eae17f40b2eb4e1bef6b2e201ab6de627d6ae78 SHA512 a69c65e6e254e2dca984bfe25d751e08ecd35aeace7ebb3be00e23441540a2a12fffac4116cba0ef16133b10970b9fbb81888d3300f4624b4b08fde3d2cbed18
-EBUILD cbindgen-0.14.6.ebuild 1009 BLAKE2B ac7582a71fc0e99c00cf6127de470165441efec75e8178efa2eec56816f8b9e0e7f1eec3ad00f98cf2f859df59c0087bd014b612b3d4f991af90428ab08febb3 SHA512 e6fea2fc881be76338599aa6c143283cf0f42b560ade3e1a69b6589992ed2ca22672366e7312600e99d82605917c69c2ae33428cbab94af81f55d2ebde2d6b8f
+EBUILD cbindgen-0.15.0.ebuild 1078 BLAKE2B 030a83c667ad7f0c5c31cbf4464ed3890b677d589b9b0467b45bcff7a65ba3cc1337b7052525ce971c1b4d075a298ac15c3d487e76bf542e4e72e197e6538a03 SHA512 6db7fe82e89d6349359f1bafb50f5e4dd8c80c891abbe3b0ed3380bee89918c072d796060f26a941f698f348a5fb2941e5f6189efa0ddbea2299c3af4b86395e
 MISC metadata.xml 334 BLAKE2B 5d7ffa9456ed3cca80fc3089f9bd508e652c600b8b013d03946b674409e45cd2ff52030e8c6a1dbc8fed2aef4caa9ab697c5a0a1b2fb4f0d8b44cf3c40d92f05 SHA512 a5e105a59463430347e5a44e36b8249faa1e84c73ae4e7fced96be371a7a59539d57accbf51065e9e5cf7e8108f69ab28d23f250182ba755e49a67991f4ff029
diff --git a/dev-util/cbindgen/cbindgen-0.14.6.ebuild b/dev-util/cbindgen/cbindgen-0.14.6.ebuild
deleted file mode 100644
index bcf078abdef2..000000000000
--- a/dev-util/cbindgen/cbindgen-0.14.6.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 2017-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-CRATES="
-ansi_term-0.11.0
-atty-0.2.13
-bitflags-1.2.1
-c2-chacha-0.2.3
-cbindgen-0.14.6
-cfg-if-0.1.10
-clap-2.33.0
-getrandom-0.1.13
-heck-0.3.1
-itoa-0.4.4
-libc-0.2.66
-log-0.4.8
-ppv-lite86-0.2.6
-proc-macro2-1.0.6
-quote-1.0.2
-rand-0.7.2
-rand_chacha-0.2.1
-rand_core-0.5.1
-rand_hc-0.2.0
-redox_syscall-0.1.56
-remove_dir_all-0.5.2
-ryu-1.0.2
-serde-1.0.104
-serde_derive-1.0.104
-serde_json-1.0.44
-strsim-0.8.0
-syn-1.0.11
-tempfile-3.1.0
-textwrap-0.11.0
-toml-0.5.5
-unicode-segmentation-1.6.0
-unicode-width-0.1.7
-unicode-xid-0.2.0
-vec_map-0.8.1
-wasi-0.7.0
-winapi-0.3.8
-winapi-i686-pc-windows-gnu-0.4.0
-winapi-x86_64-pc-windows-gnu-0.4.0
-"
-
-inherit cargo
-
-DESCRIPTION="A tool for generating C bindings to Rust code"
-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"
-QA_FLAGS_IGNORED="usr/bin/cbindgen"
diff --git a/dev-util/cbindgen/cbindgen-0.14.4.ebuild b/dev-util/cbindgen/cbindgen-0.15.0.ebuild
index 17e495dffdf7..c2d3d1844a1a 100644
--- a/dev-util/cbindgen/cbindgen-0.14.4.ebuild
+++ b/dev-util/cbindgen/cbindgen-0.15.0.ebuild
@@ -5,41 +5,44 @@ EAPI="7"
 
 CRATES="
 ansi_term-0.11.0
-atty-0.2.13
+atty-0.2.14
+autocfg-1.0.1
 bitflags-1.2.1
-c2-chacha-0.2.3
-cbindgen-0.14.4
+cbindgen-0.15.0
 cfg-if-0.1.10
-clap-2.33.0
-getrandom-0.1.13
+clap-2.33.3
+getrandom-0.1.15
+hashbrown-0.9.1
 heck-0.3.1
-itoa-0.4.4
-libc-0.2.66
-log-0.4.8
-ppv-lite86-0.2.6
-proc-macro2-1.0.6
-quote-1.0.2
-rand-0.7.2
-rand_chacha-0.2.1
+hermit-abi-0.1.16
+indexmap-1.6.0
+itoa-0.4.6
+libc-0.2.77
+log-0.4.11
+ppv-lite86-0.2.9
+proc-macro2-1.0.21
+quote-1.0.7
+rand-0.7.3
+rand_chacha-0.2.2
 rand_core-0.5.1
 rand_hc-0.2.0
-redox_syscall-0.1.56
-remove_dir_all-0.5.2
-ryu-1.0.2
-serde-1.0.104
-serde_derive-1.0.104
-serde_json-1.0.44
+redox_syscall-0.1.57
+remove_dir_all-0.5.3
+ryu-1.0.5
+serde-1.0.116
+serde_derive-1.0.116
+serde_json-1.0.57
 strsim-0.8.0
-syn-1.0.11
+syn-1.0.41
 tempfile-3.1.0
 textwrap-0.11.0
-toml-0.5.5
+toml-0.5.6
 unicode-segmentation-1.6.0
-unicode-width-0.1.7
-unicode-xid-0.2.0
-vec_map-0.8.1
-wasi-0.7.0
-winapi-0.3.8
+unicode-width-0.1.8
+unicode-xid-0.2.1
+vec_map-0.8.2
+wasi-0.9.0+wasi-snapshot-preview1
+winapi-0.3.9
 winapi-i686-pc-windows-gnu-0.4.0
 winapi-x86_64-pc-windows-gnu-0.4.0
 "
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index 4daf497c38d2..4a09f5d73c88 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -1,6 +1,14 @@
 AUX ccache-3.5-nvcc-test.patch 262 BLAKE2B b33b6372e8e6c597d7ed6c781f0a3ac22c435d1309fe387e62c5f9b61c783294ec81cfd1c8a0afc60e63148dcc89f95ebc6d313a0567431a8d05c96e3d59bae1 SHA512 651e26335df8eb551f95064d67925d6e7dd15c8a082b291cdea31fcbc2e5482b2358de71c205c668173b3dc5a75ef004d95dbdd92391e4a4aa6bc1283f5f3a72
-AUX ccache-3.7.10-objdump.patch 392 BLAKE2B 6c15a165aff5b2633b0c3571f8f89a3480d5608b006f9f3c0a80117d5c94039fc3e631d0f54c870df1904ac5c855d11007fb73178be8df7001be4f414d103ede SHA512 94f291d44a64ed9aff04da39467751aaf84262fd987c63e53213cbdedbaf30c36ff0aa0902e73418846153e8cdf5a912b021adf7c122bea9698cb296faa9ebf6
+AUX ccache-3.7.12-objdump.patch 302 BLAKE2B dfd85c0448ee685109079d0b6d84342941d777aee0d0eaa968abc9f089173f7d9e63b97dcbc1618431815238de1c231d2454d4577b7177e63230e4806cce4d3b SHA512 18461643d1404b341f9259aea8163c5306c81155350487bef22614586c7ba355bb846d2bc2ebe2746ac781d7267a474933ed3baf2196f1d62bb3fdeff5c8d094
+AUX ccache-4.0-atomic.patch 546 BLAKE2B 4cde3f7251e503925eaebda911d3d7da4bf9c0dff3d5fe543a39032eb9b7286d2e48a7198a674a64586cd8f7313928b404d77581809d2fe504b093efa156efa5 SHA512 3d172a6b87390ff2c0c1b419ead42b035bd618c01beee3aebcb1bc536a3e13eb71221e224f3992cfa299dae2037dbe65157a2ad16d7c406127c65e3bd62369af
+AUX ccache-4.0-avoid-run-user.patch 565 BLAKE2B b45dc881661843b86823dc4ec27459c92652c75a80aeed39964bff1ddecb31c36037259319288f0ae6d6729236852fe0a3f74c59b54c5d078837babd1886c05f SHA512 f37a5e7127e4a7c9192285e96dfa6f23280b55607a74bae68dd8400576ee75b6db795c34295fdc82c960d36a11104baa63ba8148ab34129264b6694664ba5e70
+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.11.tar.xz 354160 BLAKE2B 46fc5d65d6224bb796db7632b35ccca1089e5fed36eeb2ba231cf4c1aaa94be10bf0504f6ef565ce11673e527e09dee64583a764062ca7fea38364d790dd8cc1 SHA512 47b71b3ab4b89bf9b6f6d15941c22d2207b369922f51f9a8fbf4e86554325053dccce669e1c1ed3c0019a7e0a3d610f399e52d3fee68b56111aa7c1b24132c11
-EBUILD ccache-3.7.11.ebuild 1530 BLAKE2B 093cb80d04da0eff8e43fc8410ae9754e469a7bb13b6345e58b54e78403c51c5958d74ee427fe48a4b9af7106c6b06078bc883bd98f89d1272e68029dacffb6a SHA512 807892e4ce506421b26715df51fbfb92eb6101d25589f4c91dd7d7c83b20babd95371ce6d2fa9fe3258f3cadff2be8f96f24dbe9b1e674fafcbf5dd55d798fb7
+DIST ccache-3.7.12.tar.xz 354684 BLAKE2B b0b1028ede8206622c4b563cdc1351bdbe49ac11aa92d405c778af91db5bac029f7331371ef0a55bc3b1c7a0b60fbc5711277e048481bf0f4ad4b1be8acd3495 SHA512 0eb47869f86d36b3e5fad0d5073973f0444f3efe23fd14469a9e05154ea219228443098b1c5e4a8a0c5c78b4bfa7623735b50ebd6b8b4d0626766061850d6a62
+DIST ccache-4.0.tar.xz 383264 BLAKE2B ef4ca19860e2a0d313354cbd59a9eff441e86663820e8233dcf4b45a008ffa330b4a4c22eb11f3c6a7a98950d7d247034e60eb71c84ec4471f60fa19591651bd SHA512 1e55767bc2919109ae3c9b74f0adcd518e7e11df45c3981b2e9f8b04a780f9730457eeef1df137c65ab20e0959600c5317f06b58ffb82f5806c7c9f6cc305715
+DIST ccache-4.1.tar.xz 389240 BLAKE2B 265ed6cd9602a04db0fadf63266d0fe1e78a74c69a27f05854a287e4048934d6afd63e71987bc525217782075c1a158601c400f3418caa0eb9730f34275bd08c SHA512 e80075eeea3fef8215de0a793e02381bfb59d7e74237fa34a49306047c60f0de0e678396ad3a9e5d86d3ad2aa21bbe29c7f0055f06b3ba2470f6895ce2eedd7b
+EBUILD ccache-3.7.12.ebuild 1530 BLAKE2B 6ea1ab50007e06e65ec0a5115a05d052bd529ca672a7fa53661ff45b6c388f7b5807f2f2f2bd1ef93ee46668e6f31406aaee905a7c68afc6acc39352ebf2934e SHA512 e34c1ee340602cfdeb3e83d92a299af71a36c217037a8f703796b3595ab8c38ae84c63ba79117d583857a59b30218da7025f22469c7c52d4f06305b5542fd398
+EBUILD ccache-4.0.ebuild 2307 BLAKE2B bbde9b526f28bd20eae445589e12d533eefacd9a637c2e5f2d399bcaa4011610d8a728433fc399c01dc895cdbea750f53b8981ba57e4f6c10ccf9f77b2399863 SHA512 1d4be8c05062acdaeaf50b658ad2f690a75351b18dc3c80d904aa405a1db2228ab31bff856145c6a32152c088c68d016cc75e9f3ec0ba78cabe65a08b6c7e365
+EBUILD ccache-4.1.ebuild 1504 BLAKE2B 291541d21959b85e974c9fe00086a98dbebe35cbb5bfec6af37dd4e9b32c55512dabce472cfae2eccf003cf9903928c76e718fb0a5d71982173d73056ffbf94b SHA512 fdcf3c601b4e574f4e6f7b305c5b417b69d5cb9916c8838dbca86e4e87082ba7901002b8432e349ca4d93252dbbf093e660b25b81999e007ee6735e60e1473bf
 MISC metadata.xml 445 BLAKE2B 8ef8f120989420428ea85108180c659c72a7553f3f20ab96597d26aa04b059f491aeae8c887697a214c437f2dba30fbb934cb47c1db93821eda7dd489e6cb693 SHA512 41ffcad23c9f0274c48a058090d6404cd782dea6674b81615a6b3b7fa272ff5df4c68404fb4dcdb9d2275c13fb137f21f0f65232d5fb1ef6152cc25213893249
diff --git a/dev-util/ccache/ccache-3.7.11.ebuild b/dev-util/ccache/ccache-3.7.12.ebuild
index 04f64dcc7b6a..5dfae60d7ef7 100644
--- a/dev-util/ccache/ccache-3.7.11.ebuild
+++ b/dev-util/ccache/ccache-3.7.12.ebuild
@@ -28,7 +28,7 @@ RESTRICT="!test? ( test )"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.5-nvcc-test.patch
-	"${FILESDIR}"/${PN}-3.7.10-objdump.patch
+	"${FILESDIR}"/${PN}-3.7.12-objdump.patch
 )
 
 src_prepare() {
diff --git a/dev-util/ccache/ccache-4.0.ebuild b/dev-util/ccache/ccache-4.0.ebuild
new file mode 100644
index 000000000000..da46cf9b15a3
--- /dev/null
+++ b/dev-util/ccache/ccache-4.0.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake toolchain-funcs
+
+DESCRIPTION="fast compiler cache"
+HOMEPAGE="https://ccache.dev/"
+SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/ccache-${PV}.tar.xz"
+
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="test"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	dev-util/shadowman
+	sys-apps/gentoo-functions"
+# clang-specific tests use dev-libs/elfutils to compare objects for equality.
+# Let's pull in the dependency unconditionally.
+DEPEND+="
+	test? ( dev-libs/elfutils )"
+
+RESTRICT="!test? ( test )"
+
+DOCS=( doc/{AUTHORS,MANUAL,NEWS}.adoc CONTRIBUTING.md README.md )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.5-nvcc-test.patch
+	"${FILESDIR}"/${PN}-4.0-objdump.patch
+	"${FILESDIR}"/${PN}-4.0-avoid-run-user.patch
+	"${FILESDIR}"/${PN}-4.0-atomic.patch
+)
+
+# ccache does not do it automatically. TODO: fix upstream
+need_latomic() {
+	# test if -latomic is needed and helps. -latomic is needed
+	# at least on ppc32. Use bit of inodeCache.cpp test.
+	cat >"${T}"/a-test.cc <<-EOF
+	#include <atomic>
+	#include <cstdint>
+	std::atomic<std::int64_t> a;
+	int main() { return a.load() == 0; }
+	EOF
+
+	local cxx_cmd=(
+		$(tc-getCXX)
+		$CXXFLAGS
+		$LDFLAGS
+		"${T}"/a-test.cc
+		-o "${T}"/a-test
+	)
+
+	einfo "${cxx_cmd[@]}"
+	"${cxx_cmd[@]}" && return 1
+
+	einfo "Trying to add -latomic"
+	einfo "${cxx_cmd[@]}"
+	cxx_cmd+=(-latomic)
+	"${cxx_cmd[@]}" && return 0
+
+	return 1
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	sed \
+		-e "/^EPREFIX=/s:'':'${EPREFIX}':" \
+		"${FILESDIR}"/ccache-config-3 > ccache-config || die
+
+	# mainly used in tests
+	tc-export CC OBJDUMP
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLINK_WITH_ATOMIC=$(need_latomic && echo YES || echo NO)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	# TODO: install manpage: https://github.com/ccache/ccache/issues/684
+	cmake_src_install
+
+	dobin ccache-config
+	insinto /usr/share/shadowman/tools
+	newins - ccache <<<"${EPREFIX}/usr/lib/ccache/bin"
+}
+
+pkg_prerm() {
+	if [[ -z ${REPLACED_BY_VERSION} && ${ROOT:-/} == / ]] ; then
+		eselect compiler-shadow remove ccache
+	fi
+}
+
+pkg_postinst() {
+	if [[ ${ROOT:-/} == / ]]; then
+		eselect compiler-shadow update ccache
+	fi
+}
diff --git a/dev-util/ccache/ccache-4.1.ebuild b/dev-util/ccache/ccache-4.1.ebuild
new file mode 100644
index 000000000000..8f04356c74b3
--- /dev/null
+++ b/dev-util/ccache/ccache-4.1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake toolchain-funcs
+
+DESCRIPTION="fast compiler cache"
+HOMEPAGE="https://ccache.dev/"
+SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/ccache-${PV}.tar.xz"
+
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="test"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	dev-util/shadowman
+	sys-apps/gentoo-functions"
+# clang-specific tests use dev-libs/elfutils to compare objects for equality.
+# Let's pull in the dependency unconditionally.
+DEPEND+="
+	test? ( dev-libs/elfutils )
+"
+BDEPEND="
+	app-text/asciidoc
+"
+
+RESTRICT="!test? ( test )"
+
+DOCS=( doc/{AUTHORS,MANUAL,NEWS}.adoc CONTRIBUTING.md README.md )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.5-nvcc-test.patch
+	"${FILESDIR}"/${PN}-4.0-objdump.patch
+	"${FILESDIR}"/${PN}-4.1-avoid-run-user.patch
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	sed \
+		-e "/^EPREFIX=/s:'':'${EPREFIX}':" \
+		"${FILESDIR}"/ccache-config-3 > ccache-config || die
+
+	# mainly used in tests
+	tc-export CC OBJDUMP
+}
+
+src_install() {
+	cmake_src_install
+
+	dobin ccache-config
+	insinto /usr/share/shadowman/tools
+	newins - ccache <<<"${EPREFIX}/usr/lib/ccache/bin"
+}
+
+pkg_prerm() {
+	if [[ -z ${REPLACED_BY_VERSION} && ${ROOT:-/} == / ]] ; then
+		eselect compiler-shadow remove ccache
+	fi
+}
+
+pkg_postinst() {
+	if [[ ${ROOT:-/} == / ]]; then
+		eselect compiler-shadow update ccache
+	fi
+}
diff --git a/dev-util/ccache/files/ccache-3.7.10-objdump.patch b/dev-util/ccache/files/ccache-3.7.12-objdump.patch
index bad334a5c546..f5387104e453 100644
--- a/dev-util/ccache/files/ccache-3.7.10-objdump.patch
+++ b/dev-util/ccache/files/ccache-3.7.12-objdump.patch
@@ -1,15 +1,12 @@
 Allow ${CHOST}-objdump (or any other override)
 --- a/test/suites/debug_prefix_map.bash
 +++ b/test/suites/debug_prefix_map.bash
-@@ -24,9 +24,9 @@ objdump_cmd() {
+@@ -24,7 +24,7 @@ objdump_cmd() {
      if $HOST_OS_APPLE; then
          xcrun dwarfdump -r0 $1
-     elif $HOST_OS_FREEBSD; then
+     else
 -        objdump -W $1
 +        ${OBJDUMP-objdump} -W $1
-     else
--        objdump -g $1
-+        ${OBJDUMP-objdump} -g $1
      fi
  }
  
diff --git a/dev-util/ccache/files/ccache-4.0-atomic.patch b/dev-util/ccache/files/ccache-4.0-atomic.patch
new file mode 100644
index 000000000000..87b237c7dd56
--- /dev/null
+++ b/dev-util/ccache/files/ccache-4.0-atomic.patch
@@ -0,0 +1,21 @@
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -63,11 +63,17 @@ if(WIN32)
+   endif()
+ endif()
+ 
++option(LINK_WITH_ATOMIC "Add 'atomic' if needed" OFF)
++set(atomic_lib "")
++if(LINK_WITH_ATOMIC)
++    set(atomic_lib "atomic")
++endif()
++
+ find_package(Threads REQUIRED)
+ target_link_libraries(
+   ccache_lib
+   PRIVATE standard_settings standard_warnings ZSTD::ZSTD
+-          Threads::Threads third_party_lib)
++          Threads::Threads third_party_lib ${atomic_lib})
+ 
+ target_include_directories(ccache_lib PRIVATE ${CMAKE_BINARY_DIR} .)
+ 
diff --git a/dev-util/ccache/files/ccache-4.0-avoid-run-user.patch b/dev-util/ccache/files/ccache-4.0-avoid-run-user.patch
new file mode 100644
index 000000000000..07da25c6c341
--- /dev/null
+++ b/dev-util/ccache/files/ccache-4.0-avoid-run-user.patch
@@ -0,0 +1,18 @@
+Gentoo's sandbox does not whitelist this path by default yet.
+TODO: bug link.
+
+Until we have a sandbox whitelisting the path let's rely on ccache's default.
+--- a/src/Config.cpp
++++ b/src/Config.cpp
+@@ -833,11 +833,5 @@ Config::check_key_tables_consistency()
+ std::string
+ Config::default_temporary_dir(const std::string& cache_dir)
+ {
+-#ifdef HAVE_GETEUID
+-  std::string user_tmp_dir = fmt::format("/run/user/{}", geteuid());
+-  if (Stat::stat(user_tmp_dir).is_directory()) {
+-    return user_tmp_dir + "/ccache-tmp";
+-  }
+-#endif
+   return cache_dir + "/tmp";
+ }
diff --git a/dev-util/ccache/files/ccache-4.0-objdump.patch b/dev-util/ccache/files/ccache-4.0-objdump.patch
new file mode 100644
index 000000000000..af48e997f50b
--- /dev/null
+++ b/dev-util/ccache/files/ccache-4.0-objdump.patch
@@ -0,0 +1,12 @@
+Allow ${CHOST}-objdump (or any other override)
+--- a/test/run
++++ b/test/run
+@@ -133,7 +133,7 @@ objdump_cmd() {
+         # back to brute force and ignorance.
+         strings "$1"
+     else
+-        objdump -W "$file"
++        ${OBJDUMP-objdump} -W "$file"
+     fi
+ }
+ 
diff --git a/dev-util/ccache/files/ccache-4.1-avoid-run-user.patch b/dev-util/ccache/files/ccache-4.1-avoid-run-user.patch
new file mode 100644
index 000000000000..be7db76ecbf0
--- /dev/null
+++ b/dev-util/ccache/files/ccache-4.1-avoid-run-user.patch
@@ -0,0 +1,18 @@
+Gentoo's sandbox does not whitelist this path by default yet.
+TODO: bug link.
+
+Until we have a sandbox whitelisting the path let's rely on ccache's default.
+--- a/src/Config.cpp
++++ b/src/Config.cpp
+@@ -885,11 +885,5 @@ Config::check_key_tables_consistency()
+ std::string
+ Config::default_temporary_dir(const std::string& cache_dir)
+ {
+-#ifdef HAVE_GETEUID
+-  std::string user_tmp_dir = FMT("/run/user/{}", geteuid());
+-  if (Stat::stat(user_tmp_dir).is_directory()) {
+-    return user_tmp_dir + "/ccache-tmp";
+-  }
+-#endif
+   return cache_dir + "/tmp";
+ }
diff --git a/dev-util/cccc/Manifest b/dev-util/cccc/Manifest
index b7824ce1db3d..9c4e36cb2675 100644
--- a/dev-util/cccc/Manifest
+++ b/dev-util/cccc/Manifest
@@ -1,5 +1,7 @@
 AUX cccc-MFC-dialect.opt 560 BLAKE2B 65000ebbc99b306318aa2da34031879b7393649573b8509bc12ed6174d59208ea2a06e1af8d98eefb3d142d51e9b98bc9e2a058e8f8f3a68b17f76bb4dfcf6b2 SHA512 e37ded34821690e0b07e4e3da502bccdb5760a38a9f1fbacb6cec4de143cc9c0160684d9a41ce0c3ff8e2a7716889824594d6f8d374a631dbb0de91ccec53903
 AUX cccc-c_dialect.patch 2048 BLAKE2B d97bd8430fe1357779ebf221607ea724485cf5bf572c86f4adcb85ea6d29c41bfeeb562534bccd1787241c024951941921fe6936541c5ea1f72ea923e9612d12 SHA512 5fadc49a0da8ca51b74dd92e673b413b506c8b06dfeabb7da0e2ddf24e7766d58ebbcc00d018677f4b0ff77d10df8b974ff1afd4100c33152e8cad0538b61789
 DIST cccc-3.1.5.tar.gz 662760 BLAKE2B 57817ef9a44f002c017245d7dd3b1ef97fec59b59bce465d5e5e1cc12409b5602cfd8bf7ee938e526af9bcc11398639900d26848aa4f8c7f623669159de17117 SHA512 61544669a75ff7bd99c6ff5bb1e6ec163f2a09f4538493fe60e8f9f95eab7ba19ad6d39b6717ae010a223b8efe48c497a4feb8ead218e350ee2ab91b9c52c969
-EBUILD cccc-3.1.5-r1.ebuild 1415 BLAKE2B 2bd96fcfee18319519fea0992eae94f67c062386a66bfe20fa65ef157c54dc54193960b327723f12db617d379dc8ccc0b819face730cf49fb8267319b3869668 SHA512 b7c4e05f6d0bab14f6a16059850e016657b06539250647ea6f4c2ffa4bc339c27b15c1bce9905239393852f7d673b65cead2e37157b5ed3e67172144ec7ee5aa
+DIST cccc-3.1.6.tar.gz 663731 BLAKE2B 28c2a3c29d549bb10fb0e905a0c3397ab7fcffa5f4a0e8a7b9ab0e91cfbfffd7312891c646c00e4b7687b1fc4a5766b9c9d45fce0175dc403e816d2deab24545 SHA512 4966d590dd479448392611b57758a1b0378e91c505f258db643a256c3c60b9908574e22aecbc57635248694959d429de5f356328f298f1260920ef4b6fb306e4
+EBUILD cccc-3.1.5-r1.ebuild 1582 BLAKE2B 3161e81f0a1ee6c2358b668df1cb764d35375411fb37b3d5a6c3abb07f24ec8263a96cd1a2e795d928c7f0da6d7237cfb4ab973f2a0b9e7cacd3607be704366a SHA512 9302e88885e9abfb94991e1d7881ba8195af9dc172218e3f74ad30d0211ada2e4c2def1127c7873252f5130e8d79677b693711155d86106a3100dce48d1b4adf
+EBUILD cccc-3.1.6.ebuild 1582 BLAKE2B 3161e81f0a1ee6c2358b668df1cb764d35375411fb37b3d5a6c3abb07f24ec8263a96cd1a2e795d928c7f0da6d7237cfb4ab973f2a0b9e7cacd3607be704366a SHA512 9302e88885e9abfb94991e1d7881ba8195af9dc172218e3f74ad30d0211ada2e4c2def1127c7873252f5130e8d79677b693711155d86106a3100dce48d1b4adf
 MISC metadata.xml 694 BLAKE2B d8992216f3b05e4382fa843df2a71673946c1e81ef7325fef7ad39fa073c092cc86b1cd993582b40b230adb6902a406c30a7b9a00d557e7f2aafcf4e940e51cb SHA512 442e37fb776949e1f59ca7074ba1219e77e7e1be0003c5cace090342823227fca6a9a10ef607d133245985c717811005293bf2044fdb0bacfe2e114eea3ec2ad
diff --git a/dev-util/cccc/cccc-3.1.5-r1.ebuild b/dev-util/cccc/cccc-3.1.5-r1.ebuild
index 47a91aadc54e..b7c46d713a80 100644
--- a/dev-util/cccc/cccc-3.1.5-r1.ebuild
+++ b/dev-util/cccc/cccc-3.1.5-r1.ebuild
@@ -35,16 +35,16 @@ src_prepare() {
 src_compile() {
 	tc-export CC CXX LD AS AR NM RANLIB STRIP OBJCOPY
 	if use debug ; then
-		DEBUG="true" emake CCC=$(tc-getCXX) CC=$(tc-getCC) cccc
+		DEBUG="true" emake -j1 CCC=$(tc-getCXX) CC=$(tc-getCC) cccc
 	else
-		emake CCC=$(tc-getCXX) CC=$(tc-getCC) cccc
+		emake -j1 CCC=$(tc-getCXX) CC=$(tc-getCC) cccc
 	fi
 
-	use apidoc && emake CCC=$(tc-getCXX) metrics docs
+	use apidoc && emake -j1 CCC=$(tc-getCXX) metrics docs
 }
 
 src_test() {
-	emake CCC=$(tc-getCXX) test
+	emake -j1 CCC=$(tc-getCXX) test
 }
 
 src_install() {
@@ -52,16 +52,20 @@ src_install() {
 
 	dodoc README.md
 
-	use mfc && dodoc "${FILESDIR}"/cccc-MFC-dialect.opt
+	if use mfc ; then
+		docinto examples
+		dodoc "${FILESDIR}"/cccc-MFC-dialect.opt
+		docompress -x "/usr/share/doc/${PF}/examples"
+	fi
 
 	if use doc ; then
 		docinto html
-		dodoc cccc/*.html
+		dodoc cccc/*.html || die "html docs failed"
 		if use apidoc ; then
 			docinto html/api
-			dodoc -r doxygen/html/.
+			dodoc -r doxygen/html/. || die "apidocs failed"
 			docinto html/metrics
-			dodoc -r ccccout/.
+			dodoc ccccout/* || die "metrics failed"
 		fi
 	fi
 }
diff --git a/dev-util/cccc/cccc-3.1.6.ebuild b/dev-util/cccc/cccc-3.1.6.ebuild
new file mode 100644
index 000000000000..b7c46d713a80
--- /dev/null
+++ b/dev-util/cccc/cccc-3.1.6.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils toolchain-funcs flag-o-matic
+
+DESCRIPTION="Source metrics (line counts, complexity, etc) for Java and C++"
+HOMEPAGE="http://sarnold.github.io/cccc/"
+if [[ ${PV} = 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/sarnold/cccc.git"
+	EGIT_BRANCH="master"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/sarnold/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="apidoc debug doc mfc"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	apidoc? ( app-doc/doxygen[dot] )
+	"
+
+src_prepare() {
+	is-flagq -flto* && filter-flags -flto* -fuse-linker-plugin
+	use mfc && eapply "${FILESDIR}"/${PN}-c_dialect.patch
+	default
+
+}
+
+src_compile() {
+	tc-export CC CXX LD AS AR NM RANLIB STRIP OBJCOPY
+	if use debug ; then
+		DEBUG="true" emake -j1 CCC=$(tc-getCXX) CC=$(tc-getCC) cccc
+	else
+		emake -j1 CCC=$(tc-getCXX) CC=$(tc-getCC) cccc
+	fi
+
+	use apidoc && emake -j1 CCC=$(tc-getCXX) metrics docs
+}
+
+src_test() {
+	emake -j1 CCC=$(tc-getCXX) test
+}
+
+src_install() {
+	dobin cccc/cccc
+
+	dodoc README.md
+
+	if use mfc ; then
+		docinto examples
+		dodoc "${FILESDIR}"/cccc-MFC-dialect.opt
+		docompress -x "/usr/share/doc/${PF}/examples"
+	fi
+
+	if use doc ; then
+		docinto html
+		dodoc cccc/*.html || die "html docs failed"
+		if use apidoc ; then
+			docinto html/api
+			dodoc -r doxygen/html/. || die "apidocs failed"
+			docinto html/metrics
+			dodoc ccccout/* || die "metrics failed"
+		fi
+	fi
+}
diff --git a/dev-util/ccls/Manifest b/dev-util/ccls/Manifest
index cf463e682d82..064b506c281d 100644
--- a/dev-util/ccls/Manifest
+++ b/dev-util/ccls/Manifest
@@ -1,7 +1,7 @@
 AUX ccls-0.20190823.6-cmake-support-CLANG_LINK_CLANG_DYLIB.patch 1197 BLAKE2B c15211d1c4a63c9c75aef0cd4cf1a545a6b9a81e48fce9363e20483a7cb8d28bfa2ef978c127c324b2e089eb78bea214bdd7277e75a1a099ea03deb6571c5023 SHA512 c2ea4edd9ba56262e8122c8e0da11210f0c2ca6bfe6f404b0d0e745d5927dacdb1ad11824b5c78e8ea326365b50f55d9a229b3c6055c8b529cea9d6c4fc5fa9f
-DIST ccls-0.20190823.5.tar.gz 158118 BLAKE2B 09b4a985a284fe74adc408eb9e86094aaf4ebfaf50de3238a17299efabe4749326b8239356c2808ca500a44bef664b2a654e9b16c83c3ef04cd7cf90c56fe3ef SHA512 3c4ecac663eb463870153734fa6206701ede9d72bae3b6eae9c26adab2979ad79d2ac860c1ffb07f8cfcea4aa63afed90510734d91f830c99a86b3811959583f
 DIST ccls-0.20190823.6.tar.gz 158158 BLAKE2B f2957b310f1bddc17a498191d315327adbeed72ecf3a60f2abde2fe1af8341246670d779807dcfaf98217f648d4fbe5914e4f64108cfe7a3f68e62b00e96dcaa SHA512 c6df96e304f5b7381c67eda4c1bd05873a85fb0d0983b3abcc507987a402860aa6660079a0e7b125f5cda22047da936239480aa0b604cd2598f84a4b9e9c3bdd
-EBUILD ccls-0.20190823.5.ebuild 698 BLAKE2B fe14be8fc89c8cbafc63848c833b95e78488c270371d7e82816f798375d77e4b4f4099d3f811e34ca9fa8b607958336e8c613d04afba10b9f59cda9730eccc16 SHA512 f8aee0dd366fbf705e445df84882b516dc6abd09267cdb189745f0f7c7127abd3a92d0a403c81f02b3d5eaa59601f514ba8f98cba274947c5620d9db8177d1be
+DIST ccls-0.20201025.tar.gz 160524 BLAKE2B e4819b465a862195921ac33bdfd844b1921887a4f7211b7d826b8e8e49394dcb598681ba57b5f8c2eb35d5910e3689619ecaaa1fe080d8088937b0eecc2487c9 SHA512 485a42671265a0f76e87f456c6c96137a2f17c60e0c1f45a1979342c9b9fd373303a017126c8bc4649b75225cec7bb3c759a78fecc42f7403e913c6121d1e948
 EBUILD ccls-0.20190823.6.ebuild 803 BLAKE2B 9e6bea6e9dca2320d3bd808aef146d2fde415c332557ef9f5a5aff8315805ab3cf62bde6f72c6dfb8d389d778f036882df66caeabfa0ecd7178c342895a7fd86 SHA512 a4435fbd148b5e35b61e51502a5705444c24ccaabd50e57a2cd0fa3fcdfa579f18afa78819a67e55e7332a09ce6287d7e9702b48ecb0cc8f69d7168f50cafd80
+EBUILD ccls-0.20201025.ebuild 727 BLAKE2B b5259dba8a7f535857c185da4bb53004ca3eabd8295ab4fc3f0b9843cb21abcfe31ef5db7436405811436bdb80698d75368d64c1a6f14d6a97bcb1bd8c11c5d9 SHA512 bd20ed44f154d1f0e2d7d11a7560c47a849ce8d47bf18662368526655f56e539cab795326617d83d58a25e5f634b8b874da6d06133514f18d664f9d4c16f715c
 EBUILD ccls-9999.ebuild 727 BLAKE2B b5259dba8a7f535857c185da4bb53004ca3eabd8295ab4fc3f0b9843cb21abcfe31ef5db7436405811436bdb80698d75368d64c1a6f14d6a97bcb1bd8c11c5d9 SHA512 bd20ed44f154d1f0e2d7d11a7560c47a849ce8d47bf18662368526655f56e539cab795326617d83d58a25e5f634b8b874da6d06133514f18d664f9d4c16f715c
 MISC metadata.xml 323 BLAKE2B 0a85191d1996e2f30d149c30bb73ffc49f95600b8a08f5a8ee4a6aede0671d0b14f2de04173e4bb1ba0b9f6e09e79316d1f7de33b490d3ce815b8ab7b29f5f91 SHA512 da5bf276e9237df06298b14f68be2f57ef5ace58aea180623bc896a2f05dd5e6809b0409ac3ffba0e2c26d854b7d3b47f8e47caec0082e9397f5dc4037f549ad
diff --git a/dev-util/ccls/ccls-0.20190823.5.ebuild b/dev-util/ccls/ccls-0.20201025.ebuild
index d959663fa6f0..ac5830184a31 100644
--- a/dev-util/ccls/ccls-0.20190823.5.ebuild
+++ b/dev-util/ccls/ccls-0.20201025.ebuild
@@ -35,6 +35,7 @@ RDEPEND="${DEPEND}"
 src_configure() {
 	local mycmakeargs=(
 		-DUSE_SYSTEM_RAPIDJSON=ON
+		-DCLANG_LINK_CLANG_DYLIB=1
 	)
 	cmake_src_configure
 }
diff --git a/dev-util/cgdb/Manifest b/dev-util/cgdb/Manifest
index 2e0b4c02f0fd..0ea79c93c611 100644
--- a/dev-util/cgdb/Manifest
+++ b/dev-util/cgdb/Manifest
@@ -1,10 +1,6 @@
 AUX cgdb-0.7.1-respect-AR.patch 807 BLAKE2B 6689327f2a41f52d772b1d1f2714bac4f4cd40e994b51c6b12a8c9c5d40ed6616cb03128753e60bb773a6c6b46d26fb6d9d80c67c0ac8432e5f17e34b70105d8 SHA512 db51c83bec17cf05e9b8dfc7d92b253999e545c2c1a002db2f63edc0a08d0c831fa6b4b5177e972844755f4df455ec268e5b3554115f5fdeafa071d1df0dd4bc
 AUX cgdb-test.patch 2132 BLAKE2B 7308e2817a0956382a2949baad003ff0adf10989825170fcc953979d9f39da245584de4245d4d86b81e9cb74cccf11628ce3448a736cc3e89ae6e9dfabc3112e SHA512 8c5dde409035134ee75115c99a9b257a6c711750fbf662478d33911a015cccf4bf1a1ee6ec9d72d7075b0ce6dfae98a30ec60f4d2447f958ba322ced71be203c
-DIST cgdb-0.6.8.tar.gz 435115 BLAKE2B 31efcd8740dc0a0354c8d655cd7b77b18b25842dc39d1de42a92917305879394b425d7a7b0e555b368fc6a67f535fe9244c3fedeec9105c3622ace313b24c8c8 SHA512 ef3d94820bb5a37a8d7fbac48c8d144e0ac73c4f5a9d25bea33f2c4390080bb2dbdc5e7e21a5ef8a4980515cc48d80f140f7cf1f90eebac3f8bf1cc6168585ea
-DIST cgdb-0.7.0.tar.gz 319980 BLAKE2B bfc62f9214f6726e5df081119e85ccdeaea9a2310a9bb7a1746525ab998ea94ec1181efd3a1986ec0d33103c2f2b888e4d93c4ddaa4a996db4e47b0173c3b67c SHA512 83aeb919e96cd0981d8fe5cdd257df3e8d8bfbceea720ea66c1773b28c9f0ecb0e303e0585206c55242bc4438d505e328d43b4991c6ddc4e4202e048558c30d9
 DIST cgdb-0.7.1.tar.gz 314768 BLAKE2B 767a57d071fa4e3c75d231a1ec879d871669fcda9c733d157d380fa525dd321f1deb68d7ef7f424b3f36a115043a0a0faae271f24746f934e288ba7d9a4e7fa1 SHA512 050c7bad963d51c1a2cb309530319ca77e9d236f419fb0abac4ab5030ff1068d799fa626959a8b3036321711de98bddf40d264bf9367ff5697075e30ca8168c6
-EBUILD cgdb-0.6.8.ebuild 1030 BLAKE2B b9b63fab052fc0548adc68b7416180f02d71c868764c0828efaa47e16a2da1a0d0ae1f0a589dc597ab2f56b83c22f6d48bcd87da6573875f7e9c2ecdfc18b1dc SHA512 00d475449fe55161876abae492c79c1458f7bf3aedcd01a6476f007280179b3d2ef840efda5d2f15b66740624a51c20e3511f566656906ea32445a76a00374c2
-EBUILD cgdb-0.7.0-r2.ebuild 1557 BLAKE2B 3b8f53e8c96f607d701bdaace3842e3d5fd63ac32384f1902a574af942f2fe2022cfdc9881ceeb952be8a3b3f624779489bbef38ca2b609fecb08ee33dedc9dd SHA512 a0605eb5eafd3e8f7d48670f5397781a6d9b9a193726fc417fe9499209949ebb08c2cea93e10ab5e65658a7dc08ea74d95efb97824912c5394cd94d9796f06c9
-EBUILD cgdb-0.7.1.ebuild 1546 BLAKE2B 5acf8793b8f5354f908cbc409b163e09c6ce26be1674588df71ea887b0fbc115ebd6a097e85a5e1acf215ea8b07e59f38e25c5df6a33166da9cf385aab5f9b56 SHA512 21765d784f1ed6310de035fd1cbb145877df982a0a1e29381ca3edbdabba551dbefc82757bba63940bde2a9f807bf9ed6685d6ae6fee9f32a7f83b4047659477
+EBUILD cgdb-0.7.1.ebuild 1541 BLAKE2B 9ec609c8cd1a8f9b5c89e3ccb160119a5bfc3f31171f056aea03060789cf1813df45702c727600049d76324c548f9f292dc41423b2539b9a3391db9c4264a287 SHA512 647bef5ac18b1f0ba19bbf4e3b2148f760c564cd7f74e4a66721c2417ce46a1605331e29f19615fbc1e843419e8955b42da70494f2c78a770162466c5b072ce0
 EBUILD cgdb-9999.ebuild 1486 BLAKE2B 462a9e9fef68d24af10cf84bf7aff8585d87cd9d854aef53d0aa70dc5a7d166799006cd34a9d1f61b1ace6044576cc0230b3842aadea4037524b16524a693c20 SHA512 0813893bf020b8a77607712df53bdeb694f84b3b2254da0282131384dea8458f0c62f01355601d78ecb0ddc4a7c5e3fc22804f9fa1c3ff6397015d9dbe34400b
 MISC metadata.xml 491 BLAKE2B 6f0b7012dd97eba9ad20c893d489f2793c1381da6fb86e24c6259dc54244632c09be3b0f4ce2f8259e43d86d2d01546d0aaa565982bdc13b575742b1716d66f9 SHA512 fe06ce409d20619b30f9f4cdb28acc77edd1964d7177accbd3c9597d7930f1ec260847112a12e5184acb835e436c9d30a100c4613ed54b678c545dc8d3824a20
diff --git a/dev-util/cgdb/cgdb-0.6.8.ebuild b/dev-util/cgdb/cgdb-0.6.8.ebuild
deleted file mode 100644
index 357b17b658a2..000000000000
--- a/dev-util/cgdb/cgdb-0.6.8.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="
-		https://github.com/cgdb/cgdb.git
-		git@github.com:cgdb/cgdb.git"
-else
-	SRC_URI="https://github.com/cgdb/cgdb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-fi
-
-inherit autotools multilib-minimal
-
-DESCRIPTION="A curses front-end for GDB, the GNU debugger"
-HOMEPAGE="https://cgdb.github.io/"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-COMMONDEPEND="
-	sys-libs/ncurses:0=
-	sys-libs/readline:0="
-
-DEPEND="${COMMONDEPEND}
-	test? ( dev-util/dejagnu )"
-
-RDEPEND="
-	${COMMONDEPEND}
-	sys-devel/gdb"
-
-DOCS=( AUTHORS ChangeLog INSTALL NEWS README.md TODO )
-
-PATCHES=(
-	# Bug: #724256
-	"${FILESDIR}/${PN}-0.7.1-respect-AR.patch"
-)
-
-src_prepare() {
-	default
-	cp configure.{init,ac} || die "cp failed"
-	AT_M4DIR="config" eautoreconf
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf
-}
diff --git a/dev-util/cgdb/cgdb-0.7.0-r2.ebuild b/dev-util/cgdb/cgdb-0.7.0-r2.ebuild
deleted file mode 100644
index 8ff75bb5efdf..000000000000
--- a/dev-util/cgdb/cgdb-0.7.0-r2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="
-		https://github.com/cgdb/cgdb.git
-		git@github.com:cgdb/cgdb.git"
-else
-	SRC_URI="https://github.com/cgdb/cgdb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-fi
-
-inherit autotools multilib-minimal
-
-DESCRIPTION="A curses front-end for GDB, the GNU debugger"
-HOMEPAGE="https://cgdb.github.io/"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	sys-libs/ncurses:0=
-	sys-libs/readline:0="
-
-BDEPEND="
-	test? (
-		dev-util/dejagnu
-		app-misc/dtach
-	)"
-
-RDEPEND="
-	${DEPEND}
-	sys-devel/gdb"
-
-DOCS=( AUTHORS ChangeLog FAQ INSTALL NEWS README.md )
-
-PATCHES=(
-	# Bugs: #730138, #678006, #630512, #682386
-	"${FILESDIR}/${PN}-test.patch"
-	# Bug: #724256
-	"${FILESDIR}/${PN}-0.7.1-respect-AR.patch"
-)
-
-src_prepare() {
-	default
-	cp configure.{init,ac} || die "cp failed"
-	AT_M4DIR="config" eautoreconf
-}
-
-multilib_src_test() {
-	# Tests need an interactive shell, #654986
-
-	# real-time output of the log ;-)
-	touch "${T}/dtach-test.log" || die
-	tail -f "${T}/dtach-test.log" &
-	local tail_pid=${!}
-
-	nonfatal dtach -N "${T}/dtach.sock" \
-		bash -c 'emake check &> "${T}"/dtach-test.log; echo ${?} > "${T}"/dtach-test.out'
-
-	kill "${tail_pid}"
-	[[ -f ${T}/dtach-test.out ]] || die "Unable to run tests"
-	[[ $(<"${T}"/dtach-test.out) == 0 ]] || die "Tests failed"
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf
-}
diff --git a/dev-util/cgdb/cgdb-0.7.1.ebuild b/dev-util/cgdb/cgdb-0.7.1.ebuild
index 79f79a249163..fac42156fdd5 100644
--- a/dev-util/cgdb/cgdb-0.7.1.ebuild
+++ b/dev-util/cgdb/cgdb-0.7.1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} = *9999* ]]; then
 		git@github.com:cgdb/cgdb.git"
 else
 	SRC_URI="https://github.com/cgdb/cgdb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
 fi
 
 inherit autotools multilib-minimal
diff --git a/dev-util/checkbashisms/Manifest b/dev-util/checkbashisms/Manifest
index cebc129e9801..3bd9a103b6fc 100644
--- a/dev-util/checkbashisms/Manifest
+++ b/dev-util/checkbashisms/Manifest
@@ -4,9 +4,9 @@ DIST devscripts_2.20.1.tar.xz 854932 BLAKE2B b9523b2882625b66c7972db7c10f7d3f605
 DIST devscripts_2.20.2.tar.xz 854948 BLAKE2B ca36f2d8d4f3d975479134d02ee4c035f7f32e087be523560c2c06d7625047fcf78d0428d1e4addcfa38a299befdd23b88ab3fbbef2028f67f8b7c9f8851c29f SHA512 d9147604a718582a19c036a040c62612427163146048dbf9e3665545072e8132d08f51dccfd3f0a01453c0405a0326dad8f83afd10270eec5c69fa0612cb8510
 DIST devscripts_2.20.3.tar.xz 859612 BLAKE2B 074905e621234c60e26a014831a021b51f5f8fbdac4d6fa3a17aa98f994b4c171404a2326f5b00565f365469b41f1c7e5f03b6efa29f809b51bbabde209cafc2 SHA512 6d86deeecff82fc16df7d978678f5b88293164688078bf0732a7e6b844cf8845868be31c107518cf43b8dbcbadcd12a9691585f5725abd397f63ff9456fbdd8f
 DIST devscripts_2.20.4.tar.xz 860604 BLAKE2B 05c486ed024964ec03f9e5396e739389010a2c51a4d01be14b4959aa86bd09ca426bbfbfa7657c87e54aec8497fbfc90064073310fb1af916b32142ff63d3137 SHA512 49e9ae38ca3682f399a17f2108a7ee15198dc955d8c7c4c1b043456c19cb35b47b6116de9a2cfaccbdd7560e79426ca0953674e5a89ac226d21af2c1cf847e5c
-EBUILD checkbashisms-2.19.7.ebuild 859 BLAKE2B 93883a2fe97d48a2cd227d37bc7c79f0cf3c26a70fd0d96207742daf7b7b0bfb673a2e1a109668ed88c284a69f4f5126c74190c5abb239e911a6554e3a49da6d SHA512 3d6e002a45f43f2a8205e95cd5a4d2984cc50cbee3038a26bb0705996bbba678c470c0c0196652ec3da687a1d4e52dc1db996fe1af6c27818c7a58f534e14886
-EBUILD checkbashisms-2.20.1.ebuild 861 BLAKE2B 8535b63e8dbd03ad306b07b09863cb990bfedfa9a8cfa7017dc9a70b6b5a8c2ae7c17c78a444fa8f68858e8d8a1ab0fb5737e3947378469bb691d70afc19f08d SHA512 94d502d16ceb3acd0451e1f76f83906b298af427afcad8c145f5ca387d831a99db4ef21180338d3ed8619e1fc2952cf5c83c34ddb50612c8caaebb124948a90f
-EBUILD checkbashisms-2.20.2.ebuild 861 BLAKE2B 8535b63e8dbd03ad306b07b09863cb990bfedfa9a8cfa7017dc9a70b6b5a8c2ae7c17c78a444fa8f68858e8d8a1ab0fb5737e3947378469bb691d70afc19f08d SHA512 94d502d16ceb3acd0451e1f76f83906b298af427afcad8c145f5ca387d831a99db4ef21180338d3ed8619e1fc2952cf5c83c34ddb50612c8caaebb124948a90f
-EBUILD checkbashisms-2.20.3.ebuild 804 BLAKE2B 12da245b16710ca2222d9c2b46daa6361500a660d5bc4ba461c640d5a70cc52a50acdb6c025b7a1eff5ea722bd8ccf4120eae5254d47a95e4bf92a966f5e2582 SHA512 bd0bd9d526ec5ff8c2e6bac4a7a20a0165215aee3d512f4d98533eb5db9e54c67d1dd14c283687f2033a329b328b1e75bf907ca2ef55edeaa0b250a94e93f598
-EBUILD checkbashisms-2.20.4.ebuild 804 BLAKE2B 12da245b16710ca2222d9c2b46daa6361500a660d5bc4ba461c640d5a70cc52a50acdb6c025b7a1eff5ea722bd8ccf4120eae5254d47a95e4bf92a966f5e2582 SHA512 bd0bd9d526ec5ff8c2e6bac4a7a20a0165215aee3d512f4d98533eb5db9e54c67d1dd14c283687f2033a329b328b1e75bf907ca2ef55edeaa0b250a94e93f598
+EBUILD checkbashisms-2.19.7.ebuild 842 BLAKE2B be6ec30a86a521baba5ffea3003dd5e77973c71b83409d91448638c8a33de24f1e4ac5daf00dc215f124c8c3628868f735f3ee41f4d59054f899b18d3a49c8d4 SHA512 39a3a939f89146e7c1f673f7123ace5580b2f9ef31b254a3174f4ad9911a6bc46293bad1850e872f05d4ed798e16530fbbc0059b8b5279086c35a6a2d443d6a2
+EBUILD checkbashisms-2.20.1.ebuild 844 BLAKE2B 32ae094871d3c8854b76228ff850385b7ad6ef8acc540adf30daec20890014ff3ce9c28ff60a36172293b9349b765bf8a88f98e36cc064282862e5ccca5d78bd SHA512 69ae2da6c4f081fc81fe7a216f0d3f852a68ceb6ff54c2041130008bdc9cd1ba7cfe639cf4cf15f867dc024507d8a57f92a9d126bd3e7caf754f2e55564e717a
+EBUILD checkbashisms-2.20.2.ebuild 844 BLAKE2B 32ae094871d3c8854b76228ff850385b7ad6ef8acc540adf30daec20890014ff3ce9c28ff60a36172293b9349b765bf8a88f98e36cc064282862e5ccca5d78bd SHA512 69ae2da6c4f081fc81fe7a216f0d3f852a68ceb6ff54c2041130008bdc9cd1ba7cfe639cf4cf15f867dc024507d8a57f92a9d126bd3e7caf754f2e55564e717a
+EBUILD checkbashisms-2.20.3.ebuild 787 BLAKE2B 6bda04ce6fdbdbade2d28bef48d153adb73aa5f385b6cbcbe83966240cbfb2576372d0fa1ba7acd2c977376129ab8b1c9d4691c0882467f96d949fcae1842fad SHA512 67e1df0ec01650605b34329d075db5fe3489cd6f6b9907f52f17583727d86e2aa743f4fc123328207194f8259e220a4caaa6ec7dbbabec58fb4965ce4becf251
+EBUILD checkbashisms-2.20.4.ebuild 787 BLAKE2B 6bda04ce6fdbdbade2d28bef48d153adb73aa5f385b6cbcbe83966240cbfb2576372d0fa1ba7acd2c977376129ab8b1c9d4691c0882467f96d949fcae1842fad SHA512 67e1df0ec01650605b34329d075db5fe3489cd6f6b9907f52f17583727d86e2aa743f4fc123328207194f8259e220a4caaa6ec7dbbabec58fb4965ce4becf251
 MISC metadata.xml 433 BLAKE2B b54d1290789d3ce8931f832c8c1ca7a56fbdebe85c0a81c32a929168fdf2d5a7be0dea01881e8fcc583061db1a071d1787723c9342c77a5862e228f0203c178b SHA512 945c3b95a61d4219e98ce5be3aed255cb148867409aca572714e8679bf623ee0c3396966cd80d783ace60bae7e6c01b85fad6c7f7ac9056422d732ed07f54716
diff --git a/dev-util/checkbashisms/checkbashisms-2.19.7.ebuild b/dev-util/checkbashisms/checkbashisms-2.19.7.ebuild
index 39f37e6b3b9a..31676455d318 100644
--- a/dev-util/checkbashisms/checkbashisms-2.19.7.ebuild
+++ b/dev-util/checkbashisms/checkbashisms-2.19.7.ebuild
@@ -7,7 +7,7 @@ MY_PN="devscripts"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Perl script to check for commonly used bash features not defined by POSIX"
-HOMEPAGE="https://packages.debian.org/devscripts https://anonscm.debian.org/cgit/collab-maint/devscripts.git"
+HOMEPAGE="https://packages.debian.org/devscripts https://salsa.debian.org/debian/devscripts"
 SRC_URI="mirror://debian/pool/main/d/${MY_PN}/${MY_P/-/_}.tar.xz"
 
 LICENSE="GPL-2"
diff --git a/dev-util/checkbashisms/checkbashisms-2.20.1.ebuild b/dev-util/checkbashisms/checkbashisms-2.20.1.ebuild
index 26d0ab390329..f81681c580e3 100644
--- a/dev-util/checkbashisms/checkbashisms-2.20.1.ebuild
+++ b/dev-util/checkbashisms/checkbashisms-2.20.1.ebuild
@@ -7,7 +7,7 @@ MY_PN="devscripts"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Perl script to check for commonly used bash features not defined by POSIX"
-HOMEPAGE="https://packages.debian.org/devscripts https://anonscm.debian.org/cgit/collab-maint/devscripts.git"
+HOMEPAGE="https://packages.debian.org/devscripts https://salsa.debian.org/debian/devscripts"
 SRC_URI="mirror://debian/pool/main/d/${MY_PN}/${MY_P/-/_}.tar.xz"
 
 LICENSE="GPL-2"
diff --git a/dev-util/checkbashisms/checkbashisms-2.20.2.ebuild b/dev-util/checkbashisms/checkbashisms-2.20.2.ebuild
index 26d0ab390329..f81681c580e3 100644
--- a/dev-util/checkbashisms/checkbashisms-2.20.2.ebuild
+++ b/dev-util/checkbashisms/checkbashisms-2.20.2.ebuild
@@ -7,7 +7,7 @@ MY_PN="devscripts"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Perl script to check for commonly used bash features not defined by POSIX"
-HOMEPAGE="https://packages.debian.org/devscripts https://anonscm.debian.org/cgit/collab-maint/devscripts.git"
+HOMEPAGE="https://packages.debian.org/devscripts https://salsa.debian.org/debian/devscripts"
 SRC_URI="mirror://debian/pool/main/d/${MY_PN}/${MY_P/-/_}.tar.xz"
 
 LICENSE="GPL-2"
diff --git a/dev-util/checkbashisms/checkbashisms-2.20.3.ebuild b/dev-util/checkbashisms/checkbashisms-2.20.3.ebuild
index a0d64f24d4da..1d567b48dc59 100644
--- a/dev-util/checkbashisms/checkbashisms-2.20.3.ebuild
+++ b/dev-util/checkbashisms/checkbashisms-2.20.3.ebuild
@@ -7,7 +7,7 @@ MY_PN="devscripts"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Perl script to check for commonly used bash features not defined by POSIX"
-HOMEPAGE="https://packages.debian.org/devscripts https://anonscm.debian.org/cgit/collab-maint/devscripts.git"
+HOMEPAGE="https://packages.debian.org/devscripts https://salsa.debian.org/debian/devscripts"
 SRC_URI="mirror://debian/pool/main/d/${MY_PN}/${MY_P/-/_}.tar.xz"
 
 LICENSE="GPL-2"
diff --git a/dev-util/checkbashisms/checkbashisms-2.20.4.ebuild b/dev-util/checkbashisms/checkbashisms-2.20.4.ebuild
index a0d64f24d4da..1d567b48dc59 100644
--- a/dev-util/checkbashisms/checkbashisms-2.20.4.ebuild
+++ b/dev-util/checkbashisms/checkbashisms-2.20.4.ebuild
@@ -7,7 +7,7 @@ MY_PN="devscripts"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Perl script to check for commonly used bash features not defined by POSIX"
-HOMEPAGE="https://packages.debian.org/devscripts https://anonscm.debian.org/cgit/collab-maint/devscripts.git"
+HOMEPAGE="https://packages.debian.org/devscripts https://salsa.debian.org/debian/devscripts"
 SRC_URI="mirror://debian/pool/main/d/${MY_PN}/${MY_P/-/_}.tar.xz"
 
 LICENSE="GPL-2"
diff --git a/dev-util/clazy/Manifest b/dev-util/clazy/Manifest
index 1ae6ff77bd13..d146228f717e 100644
--- a/dev-util/clazy/Manifest
+++ b/dev-util/clazy/Manifest
@@ -1,4 +1,8 @@
 AUX clazy-1.7-gnuinstalldirs.patch 3167 BLAKE2B cc4d56ea57c66b7c8bde5eb9a9afbc491f0ee29f91ebab381150838943150fd92ac46dc099833baf8b75cbeb17bcfb790b2a6b7f2a1c0dc964892f9cf9ab76b8 SHA512 08addfc9fc6749e9afcea078c38d31c7f13247887f638d16c9797d4145d5b0fa363721534104fd9f955dd13a175981634b1c54e209019c37ba5da79b33ab6a45
+AUX clazy-1.7-llvm11-1.patch 17332 BLAKE2B 56f87865f455f020caf84386ed508da657b4a2c541d74a089f3a622bf52f517bf9805ceda3771a5137051ea4353b88d48b07d961f1c6390b46ff6795a7d799a8 SHA512 8e2c9b229677f8373b63d2664c79001c2494f031d9ea9f2f896b68f0f8ea65fe0fd6ccad6254304bbf66aa064c26aceabaf9b2b37c5b787f650b449e04c2a77f
+AUX clazy-1.7-llvm11-2.patch 1099 BLAKE2B edfb1cc1fe2cc864115772fc7e81b5e03a850a258c80c89b83970329fcb94864c85a98005b72386ea7c85e9b5bf54767e1260fe628c35b4a4408044de427f0db SHA512 76b8a189be601f40a4aa1beacbd33964e9d60da1361207be49be42e6e2085daa7c18c0ab09d8dcc4d40d3f03a3c45cedddf6c36ae263f54810c76e6d1e8fcbb0
 DIST clazy-1.7.tar.xz 371788 BLAKE2B 281acd0164cf76510e46883fff7269aa77e4b815d6d0ca5a54307165ff8f4355e095b82e0c41cdb0af391f4a15048a8d64b2a2a7b9dabc042b36ba1a380405cc SHA512 3dba993140f3d69aac8d9cf3fa49db990185928647193220b689773bbca70f9fd9ee7fc52022e6029b3c0c81800301a593bd79edee7e1fa6c5884782d390ced6
-EBUILD clazy-1.7.ebuild 1053 BLAKE2B b9196c366dbc8d16fcd4ebeae07cc1a36792def33149b12dd5da3750568879ee09d9b6c12bfbf0e0fe48192e2ee109ac59335dabb156b5e697fda6c12772d859 SHA512 2335f89afed13353d99a8598aa9f653b4c3bd55414711b3825c2df024b1ce2c307315fa763a928aacec8f6310e9557f31c5e4056ffae69c22325acdb686993b3
+DIST clazy-1.8.tar.xz 392328 BLAKE2B 9ece9d279b2bd7e4c15ad35d9943636a107abd47cf0ed0b20db305b1684610fb84c6f9c7f606f159f0b5a48b881506796f0addf12246f2e9929a08225fcc5c74 SHA512 c43a393721a5235ddcd653f9c322e0a215f86add3b1ce42f849677c108cd21209693c6e8f225171db88032c75596722109ee01bc53db4af90fe7652f27c1eba5
+EBUILD clazy-1.7-r1.ebuild 1078 BLAKE2B 5c83d2becd0459d44e5c979b55f34a774fc7186d2d1a2079926eb97e897f79e1e94f99e626b89c9bc6c5ce7f83147dd2f9715552f6093c9488ef586100f3817d SHA512 33e99ee100bf49ee03ee947b0ab17cdb0ca4e5cce46568e761ae298d6f46e8a71c997d25ab05352661b54584f89a256751c8b529ff71d20cd11df31e5e50f0e1
+EBUILD clazy-1.8.ebuild 1003 BLAKE2B 674376c6addfb20215e798f716fd224a0d66bd51e0b37fee6b7ad38d4f269b1b57d7d58dd9ebf2b118e13040639a6d03c83771d8d75650e692fe93b8fa0f87ba SHA512 90453e74bcc4ad088ffa7281f4f1381402671f56172970fe683385d67e5a3b374ebe7f8710209b48d9bdc0aaebe8306c29b388d75788380b9435aa24363b122e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-util/clazy/clazy-1.7-r1.ebuild b/dev-util/clazy/clazy-1.7-r1.ebuild
new file mode 100644
index 000000000000..ffa163aa4fac
--- /dev/null
+++ b/dev-util/clazy/clazy-1.7-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Compiler plugin which allows clang to understand Qt semantics"
+HOMEPAGE="https://apps.kde.org/en/clazy"
+SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="amd64 arm64 x86"
+IUSE=""
+
+RDEPEND="
+	>=sys-devel/clang-5.0:=
+	>=sys-devel/llvm-5.0:=
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gnuinstalldirs.patch
+	"${FILESDIR}"/${P}-llvm11-{1,2}.patch
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	sed -e '/install(FILES README.md COPYING-LGPL2.txt checks.json DESTINATION/d' \
+		-i CMakeLists.txt || die
+}
+
+src_configure() {
+	# this package requires both llvm and clang of the same version.
+	# clang pulls in the equivalent llvm version, but not vice versa.
+	# so, we must find llvm based on the installed clang version.
+	# bug #681568
+	local clang_version=$(best_version "sys-devel/clang")
+	export LLVM_ROOT="/usr/lib/llvm/$(ver_cut 1 ${clang_version##sys-devel/clang-})"
+	cmake_src_configure
+}
diff --git a/dev-util/clazy/clazy-1.7.ebuild b/dev-util/clazy/clazy-1.8.ebuild
index 14f32246c9c7..fdc21c991d41 100644
--- a/dev-util/clazy/clazy-1.7.ebuild
+++ b/dev-util/clazy/clazy-1.8.ebuild
@@ -6,12 +6,13 @@ EAPI=7
 inherit cmake
 
 DESCRIPTION="Compiler plugin which allows clang to understand Qt semantics"
-HOMEPAGE="https://kde.org/applications/development/org.kde.clazy"
+HOMEPAGE="https://apps.kde.org/en/clazy"
 SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
+S="${WORKDIR}"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 RDEPEND="
@@ -20,8 +21,6 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}/${P}-gnuinstalldirs.patch" )
-
 src_prepare() {
 	cmake_src_prepare
 
diff --git a/dev-util/clazy/files/clazy-1.7-llvm11-1.patch b/dev-util/clazy/files/clazy-1.7-llvm11-1.patch
new file mode 100644
index 000000000000..7b25b340a5c2
--- /dev/null
+++ b/dev-util/clazy/files/clazy-1.7-llvm11-1.patch
@@ -0,0 +1,343 @@
+From 30d6a2b64f5a05722fdc5d8e3754dbf13425cd62 Mon Sep 17 00:00:00 2001
+From: Egor Gabov <egor.gabov@waveaccess.ru>
+Date: Thu, 4 Jun 2020 17:10:21 +0300
+Subject: [PATCH] updated for compatibility with LLVM 10
+
+In LLVM 10 llvm::StringRef operator std::string() is marked as explicit.
+In this commit all implicit conversion from llvm::StringRef to
+std::string are changed by explicit.
+Also included header file clang/Basic/FileManager.h in src/MiniDumper
+because without this header, class clang::FileEntry in incomplete class
+---
+ src/FixItExporter.cpp                                 | 5 +++--
+ src/MiniAstDumper.cpp                                 | 1 +
+ src/Utils.cpp                                         | 2 +-
+ src/checkbase.cpp                                     | 2 +-
+ src/checks/detachingbase.cpp                          | 2 +-
+ src/checks/level0/qenums.cpp                          | 2 +-
+ src/checks/level0/qt-macros.cpp                       | 4 ++--
+ src/checks/level0/unused-non-trivial-variable.cpp     | 2 +-
+ src/checks/level1/detaching-temporary.cpp             | 2 +-
+ src/checks/level1/non-pod-global-static.cpp           | 2 +-
+ src/checks/level1/qproperty-without-notify.cpp        | 2 +-
+ src/checks/level2/missing-typeinfo.cpp                | 2 +-
+ src/checks/level2/old-style-connect.cpp               | 6 +++---
+ src/checks/level2/rule-of-three.cpp                   | 2 +-
+ src/checks/manuallevel/ifndef-define-typo.cpp         | 6 +++---
+ src/checks/manuallevel/qproperty-type-mismatch.cpp    | 2 +-
+ src/checks/manuallevel/qrequiredresult-candidates.cpp | 2 +-
+ src/checks/manuallevel/qt-keywords.cpp                | 4 ++--
+ src/checks/manuallevel/reserve-candidates.cpp         | 3 ++-
+ 19 files changed, 28 insertions(+), 25 deletions(-)
+
+diff --git a/src/FixItExporter.cpp b/src/FixItExporter.cpp
+index f3af2e5..44240cf 100644
+--- a/src/FixItExporter.cpp
++++ b/src/FixItExporter.cpp
+@@ -68,7 +68,7 @@ void FixItExporter::BeginSourceFile(const LangOptions &LangOpts, const Preproces
+ 
+     const auto id = SourceMgr.getMainFileID();
+     const auto entry = SourceMgr.getFileEntryForID(id);
+-    getTuDiag().MainSourceFile = entry->getName();
++    getTuDiag().MainSourceFile = static_cast<std::string>(entry->getName());
+ }
+ 
+ bool FixItExporter::IncludeInDiagnosticCounts() const
+@@ -89,7 +89,8 @@ tooling::Diagnostic FixItExporter::ConvertDiagnostic(const Diagnostic &Info)
+     // TODO: This returns an empty string: DiagEngine->getDiagnosticIDs()->getWarningOptionForDiag(Info.getID());
+     // HACK: capture it at the end of the message: Message text [check-name]
+ 
+-    std::string checkName = DiagEngine.getDiagnosticIDs()->getWarningOptionForDiag(Info.getID());
++    std::string checkName =
++        static_cast<std::string>(DiagEngine.getDiagnosticIDs()->getWarningOptionForDiag(Info.getID()));
+     std::string messageText;
+ 
+     if (checkName.empty()) {
+diff --git a/src/MiniAstDumper.cpp b/src/MiniAstDumper.cpp
+index 4766174..6124e6e 100644
+--- a/src/MiniAstDumper.cpp
++++ b/src/MiniAstDumper.cpp
+@@ -24,6 +24,7 @@
+ 
+ #include <clang/Frontend/CompilerInstance.h>
+ #include <clang/Frontend/FrontendPluginRegistry.h>
++#include <clang/Basic/FileManager.h>
+ 
+ using namespace clang;
+ using namespace std;
+diff --git a/src/Utils.cpp b/src/Utils.cpp
+index 001ced9..b0812fe 100644
+--- a/src/Utils.cpp
++++ b/src/Utils.cpp
+@@ -878,7 +878,7 @@ string Utils::filenameForLoc(SourceLocation loc, const clang::SourceManager &sm)
+     if (loc.isMacroID())
+         loc = sm.getExpansionLoc(loc);
+ 
+-    const string filename = sm.getFilename(loc);
++    const string filename = static_cast<std::string>(sm.getFilename(loc));
+     auto splitted = clazy::splitString(filename, '/');
+     if (splitted.empty())
+         return {};
+diff --git a/src/checkbase.cpp b/src/checkbase.cpp
+index 8b40e19..22a426c 100644
+--- a/src/checkbase.cpp
++++ b/src/checkbase.cpp
+@@ -188,7 +188,7 @@ bool CheckBase::shouldIgnoreFile(SourceLocation loc) const
+     if (!loc.isValid())
+         return true;
+ 
+-    string filename = sm().getFilename(loc);
++    string filename = static_cast<std::string>(sm().getFilename(loc));
+ 
+     return clazy::any_of(m_filesToIgnore, [filename](const std::string &ignored) {
+         return clazy::contains(filename, ignored);
+diff --git a/src/checks/detachingbase.cpp b/src/checks/detachingbase.cpp
+index 70311f4..1b094ee 100644
+--- a/src/checks/detachingbase.cpp
++++ b/src/checks/detachingbase.cpp
+@@ -57,7 +57,7 @@ bool DetachingBase::isDetachingMethod(CXXMethodDecl *method, DetachingMethodType
+ 
+     const std::unordered_map<string, std::vector<StringRef>> &methodsByType = detachingMethodType == DetachingMethod ? clazy::detachingMethods()
+                                                                                                                      : clazy::detachingMethodsWithConstCounterParts();
+-    auto it = methodsByType.find(className);
++    auto it = methodsByType.find(static_cast<std::string>(className));
+     if (it != methodsByType.cend()) {
+         const auto &methods = it->second;
+         if (clazy::contains(methods, clazy::name(method)))
+diff --git a/src/checks/level0/qenums.cpp b/src/checks/level0/qenums.cpp
+index 00075b5..db8910f 100644
+--- a/src/checks/level0/qenums.cpp
++++ b/src/checks/level0/qenums.cpp
+@@ -59,7 +59,7 @@ void QEnums::VisitMacroExpands(const Token &MacroNameTok, const SourceRange &ran
+         // We simply check if :: is present because it's very cumbersome to to check for different classes when dealing with the pre-processor
+ 
+         CharSourceRange crange = Lexer::getAsCharRange(range, sm(), lo());
+-        string text = Lexer::getSourceText(crange, sm(), lo());
++        string text = static_cast<std::string>(Lexer::getSourceText(crange, sm(), lo()));
+         if (clazy::contains(text, "::"))
+             return;
+     }
+diff --git a/src/checks/level0/qt-macros.cpp b/src/checks/level0/qt-macros.cpp
+index d3a587c..ab8e9f5 100644
+--- a/src/checks/level0/qt-macros.cpp
++++ b/src/checks/level0/qt-macros.cpp
+@@ -44,7 +44,7 @@ void QtMacros::VisitMacroDefined(const Token &MacroNameTok)
+         return;
+ 
+     IdentifierInfo *ii = MacroNameTok.getIdentifierInfo();
+-    if (ii && clazy::startsWith(ii->getName(), "Q_OS_"))
++    if (ii && clazy::startsWith(static_cast<std::string>(ii->getName()), "Q_OS_"))
+         m_OSMacroExists = true;
+ }
+ 
+@@ -58,7 +58,7 @@ void QtMacros::checkIfDef(const Token &macroNameTok, SourceLocation Loc)
+     if (preProcessorVisitor && preProcessorVisitor->qtVersion() < 51204 && ii->getName() == "Q_OS_WINDOWS") {
+         // Q_OS_WINDOWS was introduced in 5.12.4
+         emitWarning(Loc, "Q_OS_WINDOWS was only introduced in Qt 5.12.4, use Q_OS_WIN instead");
+-    } else if (!m_OSMacroExists && clazy::startsWith(ii->getName(), "Q_OS_")) {
++    } else if (!m_OSMacroExists && clazy::startsWith(static_cast<std::string>(ii->getName()), "Q_OS_")) {
+         emitWarning(Loc, "Include qglobal.h before testing Q_OS_ macros");
+     }
+ }
+diff --git a/src/checks/level0/unused-non-trivial-variable.cpp b/src/checks/level0/unused-non-trivial-variable.cpp
+index 4e4b830..93815f2 100644
+--- a/src/checks/level0/unused-non-trivial-variable.cpp
++++ b/src/checks/level0/unused-non-trivial-variable.cpp
+@@ -91,7 +91,7 @@ bool UnusedNonTrivialVariable::isUninterestingType(const CXXRecordDecl *record)
+     static const vector<StringRef> blacklistedTemplates = { "QScopedPointer", "QSetValueOnDestroy", "QScopedValueRollback" };
+     StringRef className = clazy::name(record);
+     for (StringRef templateName : blacklistedTemplates) {
+-        if (clazy::startsWith(className, templateName))
++        if (clazy::startsWith(static_cast<std::string>(className), static_cast<std::string>(templateName)))
+             return true;
+     }
+ 
+diff --git a/src/checks/level1/detaching-temporary.cpp b/src/checks/level1/detaching-temporary.cpp
+index fedfc81..60c7553 100644
+--- a/src/checks/level1/detaching-temporary.cpp
++++ b/src/checks/level1/detaching-temporary.cpp
+@@ -140,7 +140,7 @@ void DetachingTemporary::VisitStmt(clang::Stmt *stm)
+     StringRef className = clazy::name(classDecl);
+ 
+     const std::unordered_map<string, std::vector<StringRef>> &methodsByType = clazy::detachingMethods();
+-    auto it = methodsByType.find(className);
++    auto it = methodsByType.find(static_cast<std::string>(className));
+     auto it2 = m_writeMethodsByType.find(className);
+ 
+     std::vector<StringRef> allowedFunctions;
+diff --git a/src/checks/level1/non-pod-global-static.cpp b/src/checks/level1/non-pod-global-static.cpp
+index 5879bff..433b5c5 100644
+--- a/src/checks/level1/non-pod-global-static.cpp
++++ b/src/checks/level1/non-pod-global-static.cpp
+@@ -74,7 +74,7 @@ void NonPodGlobalStatic::VisitStmt(clang::Stmt *stm)
+     const SourceLocation declStart = clazy::getLocStart(varDecl);
+ 
+     if (declStart.isMacroID()) {
+-        auto macroName = Lexer::getImmediateMacroName(declStart, sm(), lo());
++        auto macroName = static_cast<std::string>(Lexer::getImmediateMacroName(declStart, sm(), lo()));
+         if (clazy::startsWithAny(macroName, { "Q_IMPORT_PLUGIN", "Q_CONSTRUCTOR_FUNCTION", "Q_DESTRUCTOR_FUNCTION"})) // Don't warn on these
+             return;
+     }
+diff --git a/src/checks/level1/qproperty-without-notify.cpp b/src/checks/level1/qproperty-without-notify.cpp
+index e1d6db4..3af9fee 100644
+--- a/src/checks/level1/qproperty-without-notify.cpp
++++ b/src/checks/level1/qproperty-without-notify.cpp
+@@ -69,7 +69,7 @@ void QPropertyWithoutNotify::VisitMacroExpands(const clang::Token &MacroNameTok,
+         return;
+     CharSourceRange crange = Lexer::getAsCharRange(range, sm(), lo());
+ 
+-    string text = Lexer::getSourceText(crange, sm(), lo());
++    string text = static_cast<std::string>(Lexer::getSourceText(crange, sm(), lo()));
+     if (text.back() == ')')
+         text.pop_back();
+ 
+diff --git a/src/checks/level2/missing-typeinfo.cpp b/src/checks/level2/missing-typeinfo.cpp
+index 98df2cd..03b44e0 100644
+--- a/src/checks/level2/missing-typeinfo.cpp
++++ b/src/checks/level2/missing-typeinfo.cpp
+@@ -74,7 +74,7 @@ void MissingTypeInfo::VisitDecl(clang::Decl *decl)
+         if (sm().isInSystemHeader(clazy::getLocStart(record)))
+             return;
+ 
+-        std::string typeName = clazy::name(record);
++        std::string typeName = static_cast<std::string>(clazy::name(record));
+         if (typeName == "QPair") // QPair doesn't use Q_DECLARE_TYPEINFO, but rather a explicit QTypeInfo.
+             return;
+ 
+diff --git a/src/checks/level2/old-style-connect.cpp b/src/checks/level2/old-style-connect.cpp
+index 0fe68c1..396cb70 100644
+--- a/src/checks/level2/old-style-connect.cpp
++++ b/src/checks/level2/old-style-connect.cpp
+@@ -274,7 +274,7 @@ void OldStyleConnect::VisitMacroExpands(const Token &macroNameTok, const SourceR
+         return;
+ 
+     auto charRange = Lexer::getAsCharRange(range, sm(), lo());
+-    const string text = Lexer::getSourceText(charRange, sm(), lo());
++    const string text = static_cast<std::string>(Lexer::getSourceText(charRange, sm(), lo()));
+ 
+     static regex rx(R"(Q_PRIVATE_SLOT\s*\((.*)\s*,\s*.*\s+(.*)\(.*)");
+     smatch match;
+@@ -293,7 +293,7 @@ string OldStyleConnect::signalOrSlotNameFromMacro(SourceLocation macroLoc)
+     CharSourceRange expansionRange = clazy::getImmediateExpansionRange(macroLoc, sm());
+     SourceRange range = SourceRange(expansionRange.getBegin(), expansionRange.getEnd());
+     auto charRange = Lexer::getAsCharRange(range, sm(), lo());
+-    const string text = Lexer::getSourceText(charRange, sm(), lo());
++    const string text = static_cast<std::string>(Lexer::getSourceText(charRange, sm(), lo()));
+ 
+     static regex rx(R"(\s*(SIGNAL|SLOT)\s*\(\s*(.+)\s*\(.*)");
+ 
+@@ -315,7 +315,7 @@ bool OldStyleConnect::isSignalOrSlot(SourceLocation loc, string &macroName) cons
+     if (!loc.isMacroID() || loc.isInvalid())
+         return false;
+ 
+-    macroName = Lexer::getImmediateMacroName(loc, sm(), lo());
++    macroName = static_cast<std::string>(Lexer::getImmediateMacroName(loc, sm(), lo()));
+     return macroName == "SIGNAL" || macroName == "SLOT";
+ }
+ 
+diff --git a/src/checks/level2/rule-of-three.cpp b/src/checks/level2/rule-of-three.cpp
+index 8db55d5..7583fcc 100644
+--- a/src/checks/level2/rule-of-three.cpp
++++ b/src/checks/level2/rule-of-three.cpp
+@@ -140,7 +140,7 @@ void RuleOfThree::VisitDecl(clang::Decl *decl)
+ 
+     const string className = record->getNameAsString();
+     const string classQualifiedName = record->getQualifiedNameAsString();
+-    const string filename = sm().getFilename(recordStart);
++    const string filename = static_cast<std::string>(sm().getFilename(recordStart));
+     if (clazy::endsWith(className, "Private") && clazy::endsWithAny(filename, { ".cpp", ".cxx", "_p.h" }))
+         return; // Lots of RAII classes fall into this category. And even Private (d-pointer) classes, warning in that case would just be noise
+ 
+diff --git a/src/checks/manuallevel/ifndef-define-typo.cpp b/src/checks/manuallevel/ifndef-define-typo.cpp
+index edb6cdf..e9c50a4 100644
+--- a/src/checks/manuallevel/ifndef-define-typo.cpp
++++ b/src/checks/manuallevel/ifndef-define-typo.cpp
+@@ -44,7 +44,7 @@ void IfndefDefineTypo::VisitMacroDefined(const Token &macroNameTok)
+ {
+     if (!m_lastIfndef.empty()) {
+         if (IdentifierInfo *ii = macroNameTok.getIdentifierInfo()) {
+-            maybeWarn(ii->getName(), macroNameTok.getLocation());
++            maybeWarn(static_cast<std::string>(ii->getName()), macroNameTok.getLocation());
+         }
+     }
+ }
+@@ -53,7 +53,7 @@ void IfndefDefineTypo::VisitDefined(const Token &macroNameTok, const SourceRange
+ {
+     if (!m_lastIfndef.empty()) {
+         if (IdentifierInfo *ii = macroNameTok.getIdentifierInfo()) {
+-            maybeWarn(ii->getName(), macroNameTok.getLocation());
++            maybeWarn(static_cast<std::string>(ii->getName()), macroNameTok.getLocation());
+         }
+     }
+ }
+@@ -66,7 +66,7 @@ void IfndefDefineTypo::VisitIfdef(SourceLocation, const Token &)
+ void IfndefDefineTypo::VisitIfndef(SourceLocation, const Token &macroNameTok)
+ {
+     if (IdentifierInfo *ii = macroNameTok.getIdentifierInfo())
+-        m_lastIfndef = ii->getName();
++        m_lastIfndef = static_cast<std::string>(ii->getName());
+ }
+ 
+ void IfndefDefineTypo::VisitIf(SourceLocation, SourceRange, PPCallbacks::ConditionValueKind)
+diff --git a/src/checks/manuallevel/qproperty-type-mismatch.cpp b/src/checks/manuallevel/qproperty-type-mismatch.cpp
+index f91159c..952d9f1 100644
+--- a/src/checks/manuallevel/qproperty-type-mismatch.cpp
++++ b/src/checks/manuallevel/qproperty-type-mismatch.cpp
+@@ -237,7 +237,7 @@ void QPropertyTypeMismatch::VisitMacroExpands(const clang::Token &MacroNameTok,
+ 
+     CharSourceRange crange = Lexer::getAsCharRange(range, sm(), lo());
+ 
+-    string text = Lexer::getSourceText(crange, sm(), lo());
++    string text = static_cast<std::string>(Lexer::getSourceText(crange, sm(), lo()));
+     if (!text.empty() && text.back() == ')')
+         text.pop_back();
+ 
+diff --git a/src/checks/manuallevel/qrequiredresult-candidates.cpp b/src/checks/manuallevel/qrequiredresult-candidates.cpp
+index 912dbaa..6375bd7 100644
+--- a/src/checks/manuallevel/qrequiredresult-candidates.cpp
++++ b/src/checks/manuallevel/qrequiredresult-candidates.cpp
+@@ -65,7 +65,7 @@ void QRequiredResultCandidates::VisitDecl(clang::Decl *decl)
+ 
+ 
+     if (returnClass == classDecl) {
+-        const std::string methodName = clazy::name(method);
++        const std::string methodName = static_cast<std::string>(clazy::name(method));
+         if (methodName.empty()) // fixes assert
+             return;
+ 
+diff --git a/src/checks/manuallevel/qt-keywords.cpp b/src/checks/manuallevel/qt-keywords.cpp
+index e792e95..b60752c 100644
+--- a/src/checks/manuallevel/qt-keywords.cpp
++++ b/src/checks/manuallevel/qt-keywords.cpp
+@@ -59,12 +59,12 @@ void QtKeywords::VisitMacroExpands(const Token &macroNameTok, const SourceRange
+     }
+ 
+     static const vector<StringRef> keywords = { "foreach", "signals", "slots", "emit" };
+-    std::string name = ii->getName();
++    std::string name = static_cast<std::string>(ii->getName());
+     if (!clazy::contains(keywords, name))
+         return;
+ 
+     // Make sure the macro is Qt's. It must be defined in Qt's headers, not 3rdparty
+-    std::string qtheader = sm().getFilename(sm().getSpellingLoc(minfo->getDefinitionLoc()));
++    std::string qtheader = static_cast<std::string>(sm().getFilename(sm().getSpellingLoc(minfo->getDefinitionLoc())));
+     if (!clazy::endsWith(qtheader, "qglobal.h") && !clazy::endsWith(qtheader, "qobjectdefs.h"))
+         return;
+ 
+diff --git a/src/checks/manuallevel/reserve-candidates.cpp b/src/checks/manuallevel/reserve-candidates.cpp
+index 389cac5..92e4491 100644
+--- a/src/checks/manuallevel/reserve-candidates.cpp
++++ b/src/checks/manuallevel/reserve-candidates.cpp
+@@ -78,7 +78,8 @@ static bool isCandidateMethod(CXXMethodDecl *methodDecl)
+     if (!classDecl)
+         return false;
+ 
+-    if (!clazy::equalsAny(clazy::name(methodDecl), { "append", "push_back", "push", "operator<<", "operator+=" }))
++    if (!clazy::equalsAny(static_cast<std::string>(clazy::name(methodDecl)),
++                 { "append", "push_back", "push", "operator<<", "operator+=" }))
+         return false;
+ 
+     if (!clazy::isAReserveClass(classDecl))
+-- 
+GitLab
+
diff --git a/dev-util/clazy/files/clazy-1.7-llvm11-2.patch b/dev-util/clazy/files/clazy-1.7-llvm11-2.patch
new file mode 100644
index 000000000000..4556f257bf3b
--- /dev/null
+++ b/dev-util/clazy/files/clazy-1.7-llvm11-2.patch
@@ -0,0 +1,28 @@
+From 25aa102cc49def9573ffbed88155589cd60a2e8f Mon Sep 17 00:00:00 2001
+From: Egor Gabov <egor.gabov@waveaccess.ru>
+Date: Fri, 5 Jun 2020 16:52:53 +0300
+Subject: [PATCH] updated for compatibility with LLVM 10 (clazy-standalone)
+
+In LLVM 10 llvm::StringRef operator std::string() is marked as explicit.
+In this commit all implicit conversion from llvm::StringRef to
+std::string are changed by explicit.
+---
+ src/checks/manuallevel/jnisignatures.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/checks/manuallevel/jnisignatures.cpp b/src/checks/manuallevel/jnisignatures.cpp
+index 81e61d4..5d4fe20 100644
+--- a/src/checks/manuallevel/jnisignatures.cpp
++++ b/src/checks/manuallevel/jnisignatures.cpp
+@@ -103,7 +103,7 @@ void JniSignatures::checkFunctionCall(Stmt *stm)
+         return;
+     }
+ 
+-    const std::string name = clazy::name(funDecl);
++    const std::string name = static_cast<std::string>(clazy::name(funDecl));
+ 
+     if (name == "callObjectMethod" || name == "callMethod") {
+         checkArgAt(callExpr, 0, methodNameRegex, "Invalid method name");
+-- 
+GitLab
+
diff --git a/dev-util/clinfo/Manifest b/dev-util/clinfo/Manifest
index c8aa245f9159..76a29df2038c 100644
--- a/dev-util/clinfo/Manifest
+++ b/dev-util/clinfo/Manifest
@@ -1,6 +1,8 @@
 DIST clinfo-2.2.18.03.26.tar.gz 38519 BLAKE2B 736036f4f84c170876b9b550bfe837c67a273cef9032af8734035edf5070d17d876d10f7d5c81889966df0a9ad4192c43c1501326188782cc674611ea57130ef SHA512 dec90a314e6c52e5501339dbe594cb57cfc8cae6855db7bb88b36984fd661e55f2cc8eb29fa546998862c806ec752bfc2b6a9e0d9d962370f84b0091605c1bcb
 DIST clinfo-2.2.18.04.06.tar.gz 41459 BLAKE2B e90a515fd9318aeced510cd97cc477e1925b37e2c389ffee0ec484563acc9f0f9a8880cb38575b299c4f63e1b4a6959064d7d0d45487f67d6fcf32ce91962a47 SHA512 4aa1623bd08602e2104b4ba3150f36a9e8e8fb25728d4a1792a9cc81a2a5952a4a78ccad0928f098ce4e8bc05f30d09267e01ccd81d541fdfb0bc7de46908faf
+DIST clinfo-3.0.20.11.20.tar.gz 49196 BLAKE2B b9ea6a8dc8624ec717e5f2817d52e8284da870c1c1784f1d817e014f856df0bccd37a1b3b3e7cd0dd20dc831b7625e38bef237560826aa03bbe7f9158298b290 SHA512 eb582cf91bb5642a43207e653fef06f89c458b53264e2ce182429fc697ae1e3f6e2b66daa13ca22c758c58e2201007eb3f34182bba9912f136dab9c9db63d851
 EBUILD clinfo-2.2.18.03.26.ebuild 616 BLAKE2B cd523e66a26b75509ae2362e0c501a412afade736f1cfe7560e1bb05015a43aaead9f0e72e5cc843c8a6dd1a4e9bc4693de15abd0b139f0a78929afb9c54f856 SHA512 8165ecb50cef7d2645fa2a599b4fe99bf498ad268d0e807052b888d84b5134ac3a4b97b3cb79707cbd08f648d910c88d610cac80c40396cacdeaf76cd99cf999
 EBUILD clinfo-2.2.18.04.06-r1.ebuild 616 BLAKE2B cd523e66a26b75509ae2362e0c501a412afade736f1cfe7560e1bb05015a43aaead9f0e72e5cc843c8a6dd1a4e9bc4693de15abd0b139f0a78929afb9c54f856 SHA512 8165ecb50cef7d2645fa2a599b4fe99bf498ad268d0e807052b888d84b5134ac3a4b97b3cb79707cbd08f648d910c88d610cac80c40396cacdeaf76cd99cf999
+EBUILD clinfo-3.0.20.11.20.ebuild 616 BLAKE2B cd523e66a26b75509ae2362e0c501a412afade736f1cfe7560e1bb05015a43aaead9f0e72e5cc843c8a6dd1a4e9bc4693de15abd0b139f0a78929afb9c54f856 SHA512 8165ecb50cef7d2645fa2a599b4fe99bf498ad268d0e807052b888d84b5134ac3a4b97b3cb79707cbd08f648d910c88d610cac80c40396cacdeaf76cd99cf999
 EBUILD clinfo-9999.ebuild 616 BLAKE2B cd523e66a26b75509ae2362e0c501a412afade736f1cfe7560e1bb05015a43aaead9f0e72e5cc843c8a6dd1a4e9bc4693de15abd0b139f0a78929afb9c54f856 SHA512 8165ecb50cef7d2645fa2a599b4fe99bf498ad268d0e807052b888d84b5134ac3a4b97b3cb79707cbd08f648d910c88d610cac80c40396cacdeaf76cd99cf999
 MISC metadata.xml 327 BLAKE2B 92f019eb0500214ac6f345ee38aeb8df84ebf69a503fcb9dc3284e23d9badc20fbd985aa9f60df6b4d9f515027a4e973b2439c568b0a63f5acac2be97de04dfc SHA512 20261dabbadf6a93f4b4a7d65c917872de7b81f689e111a3ea0076a066201eba82b2061cf5ae9956c00f5d6208bd4dcc922c72a3feb2643aedfa2dc998c0bf21
diff --git a/dev-util/clinfo/clinfo-3.0.20.11.20.ebuild b/dev-util/clinfo/clinfo-3.0.20.11.20.ebuild
new file mode 100644
index 000000000000..fc1ca3477ce1
--- /dev/null
+++ b/dev-util/clinfo/clinfo-3.0.20.11.20.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/Oblomov/clinfo.git"
+	inherit git-r3
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/Oblomov/clinfo/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="A tool to display info about the system's OpenCL capabilities"
+HOMEPAGE="https://github.com/Oblomov/clinfo"
+LICENSE="CC0-1.0"
+SLOT="0"
+
+DEPEND=">=virtual/opencl-3"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	emake MANDIR="${ED}"/usr/share/man PREFIX="${ED}"/usr install
+}
diff --git a/dev-util/clion/Manifest b/dev-util/clion/Manifest
index ca85e199aafc..036b1f4f4dd2 100644
--- a/dev-util/clion/Manifest
+++ b/dev-util/clion/Manifest
@@ -1,3 +1,3 @@
-DIST clion-2020.2.tar.gz 554215003 BLAKE2B 06ba16f3d2a3ebb4731e4ce40ec2ee56d3e823520d9b477a4ca7013391adb3e3c3e59b478810fa0ac9896e5277ec71642190e37be516990b0cbddd3178d2e245 SHA512 3b48a95a071919e3122e8bd8104202e07cf9cc9362df19f75003571771a134d4d5ec4520147c43b4fbd3144de8f67ddb904dbf88ef51714ec4d4882796b1272b
-EBUILD clion-2020.2.ebuild 2180 BLAKE2B e4bad956932168848c57a4b7ec72786d82276da81087a904e7482ee70d72993b67f78bab4c6277a9b00cb3be03eb3fa7cb2e5fc48dcf4f15c5cd4220a8274cfd SHA512 e0f1b2c48e545ea93fd0a2e16d81381de27aa02ca676015ab35d99eb7d775b69036d73f5bd293a023a7dcd0cb0de6ed3e9128ba5c342830f2e712ed7e4a15e09
+DIST clion-2020.2.4.tar.gz 554105965 BLAKE2B f2854abed5773647152d1631e6b3a5493683336b63b6435af7461f41e1e001e834cdf9a4113a6a0ba4e1fd956d5b8a7706ac7b1f28db59ce6a9e05718cbd07b2 SHA512 f0fc517588bf1d61227bd65aa71da3276a643b67ca5dfe4dfc7d6460db5498fe5f2a86a9d5a98d5d3dbef1624baf926093e2a07fab84431d0c9b8daaaffc8a4f
+EBUILD clion-2020.2.4.ebuild 2181 BLAKE2B 7295567cd18a4672aaf8cdd39c8c3795f38c5ce63763628524780eec2c209088ed407bb76c8409bd9aa2567387bbe370d75428bf6df1bb8454739ec6957a0192 SHA512 cf096417f6e0d4493b711add4e253f62ec7e8e9cb29cf1740daecf2b23804b639059ed3b75f09f80f39d188816b9a8803f3e7dca200ade1d182e42f052d04580
 MISC metadata.xml 458 BLAKE2B 1393fb2b8c1487a670f3c2fc7c2fe9246d8f18bc7d33e2d494f0ffc3a3492285dab041f3cf810d16e78a312dd3936eb9bad0838ff9a8c3b6a4b7d80b90764fc4 SHA512 c00a66b6722a62222d06c325df55a3d946267ce7a4a452855933d721b936cd05aae5e9acdb784fc8e97235ead35e6625522c579397f43e9755619b1a8dcaccc7
diff --git a/dev-util/clion/clion-2020.2.ebuild b/dev-util/clion/clion-2020.2.4.ebuild
index e0021195a585..1fd308530f3a 100644
--- a/dev-util/clion/clion-2020.2.ebuild
+++ b/dev-util/clion/clion-2020.2.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit desktop eutils
+inherit desktop wrapper
 
 DESCRIPTION="A complete toolset for C and C++ development"
 HOMEPAGE="https://www.jetbrains.com/clion"
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 87ba664e5a40..052353595534 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -20,11 +20,15 @@ AUX cmake.vim 217 BLAKE2B 5d2cf8b4101a7204fd27a9f21d82fea4d86fc4eeed54e062b54345
 DIST cmake-3.13.5.tar.gz 8618821 BLAKE2B 765678bc92821207c53bfb4ac995a791b938f20236c3a6fda873b8edd11cd1401b4f4c05f170b8f600f38bde5f1227c715499eee072a8de3bb29d4f5cd230226 SHA512 99e3a8f5bc147dd90b9cab11f06892d87f289aa1354ad323711fe96ebc9c32b1e887e8f9d3575a37831c4d2153a070ff9115c5e27a185d54170bad9dbbaabc26
 DIST cmake-3.16.5.tar.gz 9111262 BLAKE2B 5f996113a4979563d7b9f298b4b1a32d6f91eebaa79af42e1cbf247884e443de47e30030fd0f16c7755c4086e2bff0c0741911753ea7c889b68c393c0b98c876 SHA512 204ce83501c8068ff660c30a68641a354764135e1600a9a95b39476d072876e400961377e19bbe03a7b18412b36dcf21a693946a2a81cff5985e637e9f193671
 DIST cmake-3.17.4.tar.gz 9473549 BLAKE2B 2ce29415525b5292ae9e06d73570ed0af2173d8d15612f4d645f22d4f55cb99018663c374c4282731e09f8c6e4ffd59316d65f38aef9db5c34d874ca8992382b SHA512 6af879502e52388f3be02a4edfb006274840ad1afa8f28ffd6ec69b0310c7f718812b2272e5f77ffa422717f61407a6d482deb95941555c21c73fc5f62356a4e
-DIST cmake-3.18.2.tar.gz 8970663 BLAKE2B 10924eabbcd20bc3dc2cb6f2d619d824ed0a28fdf35ce6b92ed46d0d85320343d797b0c810aa90ab740477548e3390ed98ec5d2777f635920bff84eecb8e0531 SHA512 74915e643d09af1d8451e57120f2e5963f6fd34ca2cfa0cd573bd7f234924458105e7cc76952c022732de7566cd590141127b243933a564ac575a0dcbb8cc6e7
-DIST cmake-3.18.3.tar.gz 8976093 BLAKE2B 266432f8647828359e0f1a4390d62ac6449fcee5c7bc95d96fea62bc0ae94af9734edf6e0366efe95e3c65c5f29e16abbec0ae6b086781926ac0ae0a08a64b19 SHA512 28c0c310b6cd8117d4a8b9ad60064b22b00bdc170303b190994e9a3d4fe83fbd9cae6c8f36da62faf6c356b5acf430c78878f19210386ec26844b56334d3941e
+DIST cmake-3.18.4.tar.gz 8976659 BLAKE2B b121a641f5470c5e210bd0ee5506cdc2165ad186074b54bc81de72f36ff6b5748fe846794eff16a13c52e98ce246561fb1aab0f0fd1fdcf9173c4bdacd9cbb8f SHA512 2f0c5647ed58bf911d0bfeafc7f22a3de09aa3be86301158fa51c8560e994534d7500869067432ecf91e82213a0b36ddb5db11c5c55d2ca5e5647ac9f75717b9
+DIST cmake-3.18.5.tar.gz 8975784 BLAKE2B 62ea68b602e7e352c22ba6122aa010fb78fb5c4e484aa51bc336e750280d5fc03ffa439bd8005d2c43176f5a5db4ebfd419beca65cc59c5b8cd5666e38394fb8 SHA512 c15e0937a9c0ce0b6164c3d02a147e679ea57e1119cff4189a15de71429a7facb3c04eb8db467471876b5da5dbd4a25acb228efa7101fe78efd205f0d2c96343
+DIST cmake-3.19.0.tar.gz 9257338 BLAKE2B bcfbbc92e3b1a5ee540ad4d24a358eccd73bd36f43fa642536f73ffb51fc052150e41b356a4df8cd2b6b1e477f121adc8232d50f4f1464a31c91e8d2a8d6d3a2 SHA512 f9b880cf1e425101ea1e1015cb58fc006abc258b57a8b9734d5245ba0b4fca8acb9589ea495b3eb21d03e825a1fc3ff560d23b5b9c033266b4d858b1e561d54f
+DIST cmake-3.19.1.tar.gz 9256956 BLAKE2B 00874fa3099fe55e7a8c16f5225d30c56e05aaaa69930e0f10d1829bb373f83c17cb11ba538918089bd94162dbb4cc736b2024bd0e1e7102f3d8c462bfe71c1b SHA512 1a1c9a8546c80f8602babffc7fd398cea5d9163512ef74333f87e26a97ca35358bd0e90423768cfc971ebfed185e19d775737e557e0e982403b77a2ccbcd063a
 EBUILD cmake-3.13.5.ebuild 6250 BLAKE2B 51fd5c675042b869a8dd3f54ceaed2f3a2d9bc43aeb2894b1b8c9d995660bc81ed9b39f99bfbb376d0dd658942def7bc2c1ec3538efc36c1f43f65bc1ca5dd5b SHA512 638eece44d2cb688d92fd9fbedd189aee9b0b878b1fd054984e806d17083eda352695136bf0d800d9e2ecb7993917f2da4f1f1913e14c7686c4d7cff8c641f60
 EBUILD cmake-3.16.5.ebuild 5911 BLAKE2B f124d2d41b33a9a76749ced21fac3717eb50bba7065500986fdafc445bef3f17bf6e1faac7e863257ad5d8f571e4bdf17c9e750f5b83163401b491d85a2319f7 SHA512 4cfeb2154bd96b1f146b508ed038158a8cb58ead403011054702c4bdc1e2d99e677baa1b7ee6c33c4b317ca4992718cdc352b55724e73bf8edc758d2748e2603
-EBUILD cmake-3.17.4-r1.ebuild 6143 BLAKE2B e990986c2de9e11ea271e9d121675f7ed5b728bdf4e76ec40f9a64e967911ce6e934733824b2e5a70c20ba0075b446d82e36d0d5957f4ef09278d942368e59ac SHA512 3a77b31d45ce36509269bf0170f2c7df1cdb4133b615024e9b0391fb990e6e5c8649a108223575d33724962684dcd1ff65556dc1e11a8cccdc29a4096a72822c
-EBUILD cmake-3.18.2.ebuild 6130 BLAKE2B 57a06ffa279519744afa1854fabb28f90da78d31dc26ea6e78fd1f0e0401a4ce86bb5a45297679cb92df3928a79ee8740a5288ad1e8711d908601fadfa02b028 SHA512 8337e005af90f1a0f792b6f2a7d9098767024ad221aed57237e4ced1b20f98a5d16a7633ca86e1df83043a3e3b7d58c138104b58ebd170675146af37e619744a
-EBUILD cmake-3.18.3.ebuild 6130 BLAKE2B 57a06ffa279519744afa1854fabb28f90da78d31dc26ea6e78fd1f0e0401a4ce86bb5a45297679cb92df3928a79ee8740a5288ad1e8711d908601fadfa02b028 SHA512 8337e005af90f1a0f792b6f2a7d9098767024ad221aed57237e4ced1b20f98a5d16a7633ca86e1df83043a3e3b7d58c138104b58ebd170675146af37e619744a
+EBUILD cmake-3.17.4-r1.ebuild 6136 BLAKE2B 255ddfbb74512dbbbbf5ad397bbf6f78b9185ff2aa25e8b5ca9f12ffc57ba65a2906de692977c722c8a29f524169b72ff46ee7226ec8ba9d81f36c90357ae149 SHA512 c836b5851c424b9880967c248605cc1ba1e992946a1ba96f0622695902303bb40b1c0d6d015fb17dac7778b1fa388d277c9dfe964cfd0796b48c93fe8badd426
+EBUILD cmake-3.18.4.ebuild 6130 BLAKE2B 57a06ffa279519744afa1854fabb28f90da78d31dc26ea6e78fd1f0e0401a4ce86bb5a45297679cb92df3928a79ee8740a5288ad1e8711d908601fadfa02b028 SHA512 8337e005af90f1a0f792b6f2a7d9098767024ad221aed57237e4ced1b20f98a5d16a7633ca86e1df83043a3e3b7d58c138104b58ebd170675146af37e619744a
+EBUILD cmake-3.18.5.ebuild 6130 BLAKE2B 57a06ffa279519744afa1854fabb28f90da78d31dc26ea6e78fd1f0e0401a4ce86bb5a45297679cb92df3928a79ee8740a5288ad1e8711d908601fadfa02b028 SHA512 8337e005af90f1a0f792b6f2a7d9098767024ad221aed57237e4ced1b20f98a5d16a7633ca86e1df83043a3e3b7d58c138104b58ebd170675146af37e619744a
+EBUILD cmake-3.19.0.ebuild 6182 BLAKE2B baf789644fe5a895f2659aff3e0820ca512b003e21c69a471ec7a98ed3609ebdc32985487607c636400a7890c9edb1d1215d1cb4043ab5713b7c5cee2e9221a6 SHA512 5dbd0c14bb478245ce0e84a5d672ac9ccaa31f4f879791dca998e67a703661f658238e279dbe1ef4b3faa7ffc2b078b8397f79f146c1b41553aea2a2428fa905
+EBUILD cmake-3.19.1.ebuild 6182 BLAKE2B baf789644fe5a895f2659aff3e0820ca512b003e21c69a471ec7a98ed3609ebdc32985487607c636400a7890c9edb1d1215d1cb4043ab5713b7c5cee2e9221a6 SHA512 5dbd0c14bb478245ce0e84a5d672ac9ccaa31f4f879791dca998e67a703661f658238e279dbe1ef4b3faa7ffc2b078b8397f79f146c1b41553aea2a2428fa905
 MISC metadata.xml 460 BLAKE2B f1a7e1709a6b9975ffbc377c8b4d1ea8a01f52ccc139693c8e427150b7559ecc867b3e55fb4bc95fe342a2335fe5e13c69f4bd74ffbbf302c83872c65963e73e SHA512 fc562cd5f336101d16ca30a5b3e9b99a6e51ec9d7aa503f20ce278f44d5810286fcd6b46b18073cd88ba88ee5ab4f8a0bfccaa567df09ebb722a68ab721aa340
diff --git a/dev-util/cmake/cmake-3.17.4-r1.ebuild b/dev-util/cmake/cmake-3.17.4-r1.ebuild
index 5517cd95a3d6..27718c8a18dd 100644
--- a/dev-util/cmake/cmake-3.17.4-r1.ebuild
+++ b/dev-util/cmake/cmake-3.17.4-r1.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 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc emacs ncurses qt5 test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/cmake/cmake-3.18.2.ebuild b/dev-util/cmake/cmake-3.18.4.ebuild
index 7334e72c320d..7334e72c320d 100644
--- a/dev-util/cmake/cmake-3.18.2.ebuild
+++ b/dev-util/cmake/cmake-3.18.4.ebuild
diff --git a/dev-util/cmake/cmake-3.18.3.ebuild b/dev-util/cmake/cmake-3.18.5.ebuild
index 7334e72c320d..7334e72c320d 100644
--- a/dev-util/cmake/cmake-3.18.3.ebuild
+++ b/dev-util/cmake/cmake-3.18.5.ebuild
diff --git a/dev-util/cmake/cmake-3.19.0.ebuild b/dev-util/cmake/cmake-3.19.0.ebuild
new file mode 100644
index 000000000000..5dc94575a14f
--- /dev/null
+++ b/dev-util/cmake/cmake-3.19.0.ebuild
@@ -0,0 +1,215 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="emake" # TODO: Re-check with 3.19, see commit 491dddfb; bug #596460
+CMAKE_REMOVE_MODULES_LIST=( none )
+inherit bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing \
+	toolchain-funcs virtualx xdg-utils
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="Cross platform Make"
+HOMEPAGE="https://cmake.org/"
+SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
+
+LICENSE="CMake"
+SLOT="0"
+[[ "${PV}" = *_rc* ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc emacs ncurses qt5 test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=app-arch/libarchive-3.3.3:=
+	app-crypt/rhash
+	>=dev-libs/expat-2.0.1
+	>=dev-libs/jsoncpp-1.9.2-r2:0=
+	>=dev-libs/libuv-1.10.0:=
+	>=net-misc/curl-7.21.5[ssl]
+	sys-libs/zlib
+	virtual/pkgconfig
+	emacs? ( >=app-editors/emacs-23.1:* )
+	ncurses? ( sys-libs/ncurses:0= )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	doc? (
+		dev-python/requests
+		dev-python/sphinx
+	)
+"
+
+S="${WORKDIR}/${MY_P}"
+
+SITEFILE="50${PN}-gentoo.el"
+
+PATCHES=(
+	# prefix
+	"${FILESDIR}"/${PN}-3.16.0_rc4-darwin-bundle.patch
+	"${FILESDIR}"/${PN}-3.14.0_rc3-prefix-dirs.patch
+	# Next patch requires new work from prefix people
+	#"${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
+
+	# handle gentoo packaging in find modules
+	"${FILESDIR}"/${PN}-3.17.0_rc1-FindBLAS.patch
+	# Next patch needs to be reworked
+	#"${FILESDIR}"/${PN}-3.17.0_rc1-FindLAPACK.patch
+	"${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
+
+	# respect python eclasses
+	"${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
+	"${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
+
+	"${FILESDIR}"/${PN}-3.18.0-filter_distcc_warning.patch # bug 691544
+
+	# upstream fixes (can usually be removed with a version bump)
+)
+
+cmake_src_bootstrap() {
+	# disable running of cmake in bootstrap command
+	sed -i \
+		-e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
+		bootstrap || die "sed failed"
+
+	# execinfo.h on Solaris isn't quite what it is on Darwin
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		sed -i -e 's/execinfo\.h/blablabla.h/' \
+			Source/kwsys/CMakeLists.txt || die
+	fi
+
+	# bootstrap script isn't exactly /bin/sh compatible
+	tc-env_build ${CONFIG_SHELL:-sh} ./bootstrap \
+		--prefix="${T}/cmakestrap/" \
+		--parallel=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") \
+		|| die "Bootstrap failed"
+}
+
+cmake_src_test() {
+	# fix OutDir and SelectLibraryConfigurations tests
+	# these are altered thanks to our eclass
+	sed -i -e 's:^#_cmake_modify_IGNORE ::g' \
+		"${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
+		|| die
+
+	pushd "${BUILD_DIR}" > /dev/null
+
+	local ctestargs
+	[[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
+
+	# Excluded tests:
+	#    BootstrapTest: we actually bootstrap it every time so why test it.
+	#    BundleUtilities: bundle creation broken
+	#    CMakeOnly.AllFindModules: pthread issues
+	#    CTest.updatecvs: fails to commit as root
+	#    Fortran: requires fortran
+	#    RunCMake.CommandLineTar: whatever...
+	#    RunCMake.CompilerLauncher: also requires fortran
+	#    RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
+	#        debugedit binary is not in the expected location
+	#    RunCMake.CPack_DEB: breaks if app-arch/dpkg is installed because
+	#        it can't find a deb package that owns libc
+	#    RunCMake.{IncompatibleQt,ObsoleteQtMacros}: Require Qt4
+	#    TestUpload: requires network access
+	"${BUILD_DIR}"/bin/ctest \
+		-j "$(makeopts_jobs)" \
+		--test-load "$(makeopts_loadavg)" \
+		${ctestargs} \
+		-E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|DependencyGraph|Fortran|RunCMake.CommandLineTar|RunCMake.CompilerLauncher|RunCMake.IncompatibleQt|RunCMake.ObsoleteQtMacros|RunCMake.PrecompileHeaders|RunCMake.CPack_(DEB|RPM)|TestUpload)" \
+		|| die "Tests failed"
+
+	popd > /dev/null
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# disable Xcode hooks, bug #652134
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		sed -i -e 's/__APPLE__/__DISABLED_APPLE__/' \
+			Source/cmGlobalXCodeGenerator.cxx || die
+	fi
+
+	# Add gcc libs to the default link paths
+	sed -i \
+		-e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
+		-e "$(usex prefix-guest "s|@GENTOO_HOST@||" "/@GENTOO_HOST@/d")" \
+		-e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
+		Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
+	if ! has_version -b \>=${CATEGORY}/${PN}-3.4.0_rc1 || ! cmake --version &>/dev/null ; then
+		CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
+		cmake_src_bootstrap
+	fi
+}
+
+src_configure() {
+	# Fix linking on Solaris
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
+
+	local mycmakeargs=(
+		-DCMAKE_USE_SYSTEM_LIBRARIES=ON
+		-DCMAKE_DOC_DIR=/share/doc/${PF}
+		-DCMAKE_MAN_DIR=/share/man
+		-DCMAKE_DATA_DIR=/share/${PN}
+		-DSPHINX_MAN=$(usex doc)
+		-DSPHINX_HTML=$(usex doc)
+		-DBUILD_CursesDialog="$(usex ncurses)"
+		-DBUILD_TESTING=$(usex test)
+	)
+	use qt5 && mycmakeargs+=( -DBUILD_QtDialog=ON )
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	use emacs && elisp-compile Auxiliary/cmake-mode.el
+}
+
+src_test() {
+	virtx cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	if use emacs; then
+		elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+
+	insinto /usr/share/vim/vimfiles/syntax
+	doins Auxiliary/vim/syntax/cmake.vim
+
+	insinto /usr/share/vim/vimfiles/indent
+	doins Auxiliary/vim/indent/cmake.vim
+
+	insinto /usr/share/vim/vimfiles/ftdetect
+	doins "${FILESDIR}/${PN}.vim"
+
+	dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+	if use qt5; then
+		xdg_icon_cache_update
+		xdg_desktop_database_update
+		xdg_mimeinfo_database_update
+	fi
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+	if use qt5; then
+		xdg_icon_cache_update
+		xdg_desktop_database_update
+		xdg_mimeinfo_database_update
+	fi
+}
diff --git a/dev-util/cmake/cmake-3.19.1.ebuild b/dev-util/cmake/cmake-3.19.1.ebuild
new file mode 100644
index 000000000000..5dc94575a14f
--- /dev/null
+++ b/dev-util/cmake/cmake-3.19.1.ebuild
@@ -0,0 +1,215 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="emake" # TODO: Re-check with 3.19, see commit 491dddfb; bug #596460
+CMAKE_REMOVE_MODULES_LIST=( none )
+inherit bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing \
+	toolchain-funcs virtualx xdg-utils
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="Cross platform Make"
+HOMEPAGE="https://cmake.org/"
+SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
+
+LICENSE="CMake"
+SLOT="0"
+[[ "${PV}" = *_rc* ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc emacs ncurses qt5 test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=app-arch/libarchive-3.3.3:=
+	app-crypt/rhash
+	>=dev-libs/expat-2.0.1
+	>=dev-libs/jsoncpp-1.9.2-r2:0=
+	>=dev-libs/libuv-1.10.0:=
+	>=net-misc/curl-7.21.5[ssl]
+	sys-libs/zlib
+	virtual/pkgconfig
+	emacs? ( >=app-editors/emacs-23.1:* )
+	ncurses? ( sys-libs/ncurses:0= )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	doc? (
+		dev-python/requests
+		dev-python/sphinx
+	)
+"
+
+S="${WORKDIR}/${MY_P}"
+
+SITEFILE="50${PN}-gentoo.el"
+
+PATCHES=(
+	# prefix
+	"${FILESDIR}"/${PN}-3.16.0_rc4-darwin-bundle.patch
+	"${FILESDIR}"/${PN}-3.14.0_rc3-prefix-dirs.patch
+	# Next patch requires new work from prefix people
+	#"${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
+
+	# handle gentoo packaging in find modules
+	"${FILESDIR}"/${PN}-3.17.0_rc1-FindBLAS.patch
+	# Next patch needs to be reworked
+	#"${FILESDIR}"/${PN}-3.17.0_rc1-FindLAPACK.patch
+	"${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
+
+	# respect python eclasses
+	"${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
+	"${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
+
+	"${FILESDIR}"/${PN}-3.18.0-filter_distcc_warning.patch # bug 691544
+
+	# upstream fixes (can usually be removed with a version bump)
+)
+
+cmake_src_bootstrap() {
+	# disable running of cmake in bootstrap command
+	sed -i \
+		-e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
+		bootstrap || die "sed failed"
+
+	# execinfo.h on Solaris isn't quite what it is on Darwin
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		sed -i -e 's/execinfo\.h/blablabla.h/' \
+			Source/kwsys/CMakeLists.txt || die
+	fi
+
+	# bootstrap script isn't exactly /bin/sh compatible
+	tc-env_build ${CONFIG_SHELL:-sh} ./bootstrap \
+		--prefix="${T}/cmakestrap/" \
+		--parallel=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") \
+		|| die "Bootstrap failed"
+}
+
+cmake_src_test() {
+	# fix OutDir and SelectLibraryConfigurations tests
+	# these are altered thanks to our eclass
+	sed -i -e 's:^#_cmake_modify_IGNORE ::g' \
+		"${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
+		|| die
+
+	pushd "${BUILD_DIR}" > /dev/null
+
+	local ctestargs
+	[[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
+
+	# Excluded tests:
+	#    BootstrapTest: we actually bootstrap it every time so why test it.
+	#    BundleUtilities: bundle creation broken
+	#    CMakeOnly.AllFindModules: pthread issues
+	#    CTest.updatecvs: fails to commit as root
+	#    Fortran: requires fortran
+	#    RunCMake.CommandLineTar: whatever...
+	#    RunCMake.CompilerLauncher: also requires fortran
+	#    RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
+	#        debugedit binary is not in the expected location
+	#    RunCMake.CPack_DEB: breaks if app-arch/dpkg is installed because
+	#        it can't find a deb package that owns libc
+	#    RunCMake.{IncompatibleQt,ObsoleteQtMacros}: Require Qt4
+	#    TestUpload: requires network access
+	"${BUILD_DIR}"/bin/ctest \
+		-j "$(makeopts_jobs)" \
+		--test-load "$(makeopts_loadavg)" \
+		${ctestargs} \
+		-E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|DependencyGraph|Fortran|RunCMake.CommandLineTar|RunCMake.CompilerLauncher|RunCMake.IncompatibleQt|RunCMake.ObsoleteQtMacros|RunCMake.PrecompileHeaders|RunCMake.CPack_(DEB|RPM)|TestUpload)" \
+		|| die "Tests failed"
+
+	popd > /dev/null
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# disable Xcode hooks, bug #652134
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		sed -i -e 's/__APPLE__/__DISABLED_APPLE__/' \
+			Source/cmGlobalXCodeGenerator.cxx || die
+	fi
+
+	# Add gcc libs to the default link paths
+	sed -i \
+		-e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
+		-e "$(usex prefix-guest "s|@GENTOO_HOST@||" "/@GENTOO_HOST@/d")" \
+		-e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
+		Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
+	if ! has_version -b \>=${CATEGORY}/${PN}-3.4.0_rc1 || ! cmake --version &>/dev/null ; then
+		CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
+		cmake_src_bootstrap
+	fi
+}
+
+src_configure() {
+	# Fix linking on Solaris
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
+
+	local mycmakeargs=(
+		-DCMAKE_USE_SYSTEM_LIBRARIES=ON
+		-DCMAKE_DOC_DIR=/share/doc/${PF}
+		-DCMAKE_MAN_DIR=/share/man
+		-DCMAKE_DATA_DIR=/share/${PN}
+		-DSPHINX_MAN=$(usex doc)
+		-DSPHINX_HTML=$(usex doc)
+		-DBUILD_CursesDialog="$(usex ncurses)"
+		-DBUILD_TESTING=$(usex test)
+	)
+	use qt5 && mycmakeargs+=( -DBUILD_QtDialog=ON )
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	use emacs && elisp-compile Auxiliary/cmake-mode.el
+}
+
+src_test() {
+	virtx cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	if use emacs; then
+		elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+
+	insinto /usr/share/vim/vimfiles/syntax
+	doins Auxiliary/vim/syntax/cmake.vim
+
+	insinto /usr/share/vim/vimfiles/indent
+	doins Auxiliary/vim/indent/cmake.vim
+
+	insinto /usr/share/vim/vimfiles/ftdetect
+	doins "${FILESDIR}/${PN}.vim"
+
+	dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+	if use qt5; then
+		xdg_icon_cache_update
+		xdg_desktop_database_update
+		xdg_mimeinfo_database_update
+	fi
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+	if use qt5; then
+		xdg_icon_cache_update
+		xdg_desktop_database_update
+		xdg_mimeinfo_database_update
+	fi
+}
diff --git a/dev-util/codeblocks/Manifest b/dev-util/codeblocks/Manifest
index 059a2244de59..1a7aa472dc70 100644
--- a/dev-util/codeblocks/Manifest
+++ b/dev-util/codeblocks/Manifest
@@ -1,15 +1,16 @@
 AUX codeblocks-17.12-fix-crash-on-copypaste.patch 675 BLAKE2B 0c388b674e86b74cbb934be4acc00109bca252d4a6705a5811fa91d6323d7a2c861b1f36354cc17d5a0dee79d2a99543f5b28b9525fc79da2a51873e1eed08c8 SHA512 89a464fa8f86d5c2900bffaee43812d475015813c8870f21b95465b1b91a05744a779187b4e46d61242f1d8ad13cd965b7bcd614b88f2072e0c3e43a819a5c61
 AUX codeblocks-17.12-nodebug.diff 611 BLAKE2B 03de6a604b0971e7b91702fd9a1f66aee6d87538177947762ce7b112bf6e81e75349c76415f1a18ac4ee0b41fa4f1257085af1031988c3346a45402b7bfebe73 SHA512 d5332803a0d9cbcbcafa5fa18d90bea07ff43d8ff93922d577b3b2dddc6349a7b01c9100f6198905d531e31edd0f5ba0b5a88db38df981c567644f8e7e11022a
 AUX codeblocks-20.03-env.patch 1365 BLAKE2B 550b86319823c8453000d0a3a5e1c9a0845bbf08464d04b0055c98d72a055e966e0a30606e3496a00da829686129faf263f4f5edb36843dd5f1d882a4b87a2ce SHA512 c20b11f463517386b95ae1a2f1acc5fe75e15f1976ac004934d8b7a6441f40d5d58ba86292ff6713c0b71a6abe9c1d99554f8928b6aedc9c6452f0aa80ea894d
+AUX codeblocks-20.03_gcc11_compatibility.patch 797 BLAKE2B fae449efb5ea599e32fac23b67a11635a7c3ccab4d499676f922c95e25211093382b8cee0a7f78e90508613cd8b009350944df83188ac0b3bb106f86fe567298 SHA512 7d6c058212566e6a9bf329e585b29d261acdcb06061292ad900fe6c054b60ed1fb71168c092d62e15382dd582d0a3464ef44519ecbe708f5399aa91ef1d16d5c
 DIST codeblocks-17.12-fortran.tar.xz 3048 BLAKE2B 58fd3b95cea3303a41da31f5cffe08698fa51ff896c456224edd63d17ddfe8dd54b0c058bd2a68920cf15789bfe5e412054e4e603b1d644034d8cb43d3de3224 SHA512 78534706b6433ae93b680740b2e6c0b747119f6ac62477b901ceeb1900692465615e29f2837ceca48d127181fc6b653d6d49a85fdb8d2fb873ad5a915527936c
 DIST codeblocks-17.12_update_astyle_plugin_to_v3.1.patch.xz 3712 BLAKE2B 4a5f75c18b365030a08196dcb2808d8f42d8adf9442552d372cb3923629d9d5b74c98c77557f0af46965bb875543cc6f221a5197fa2b4dba12409225c6cc61d9 SHA512 b216f2659b8ce2a22fd2f9af456af71328b40428510b75f0bb36cec4695d28bbd3133b7385614a84862c2ab5c560d314cc8153ddab09019410e179f5d337669b
 DIST codeblocks-20.03-fortran-update-v1.7.tar.xz 12092 BLAKE2B df59ca9e00765f39f64d889ed22af61db8c2bb5f217dbda64d325327be8ef1ce318bc0b2538dd19ee911d84fccb6693f6e287f4d084e8243b34777f464ba5e61 SHA512 aec8062bbf0cd524b683ba9f2f6befec0bfb9f9b1f8ea61ffb679cf449f4ece20502f4fda101ab559151616fc7d7826e308a6468634502930f09ea3a8590c359
 DIST codeblocks-20.03-fortran.tar.xz 15828 BLAKE2B 3ad1be0ecdc61759edcbb12065a0d8065e5c4571bfdd99bcf6ad8cbda82f64def8ad7121770fe780c1837d06d58edb0209d2ab3b966ecd133c5d46f79c0cbb4e SHA512 06a9a87e560914ae49895843321c26581409e9213265d20476c9c4a8ad2dd9ff63cffdb416e7494bd74ce4a11578f11ef387dd851b1394a50baade8491caaa17
 DIST codeblocks-20.03.tar.xz 11799264 BLAKE2B cdaca38e26e0f1bf12e774cf737e0b6647f070d07f0ca5bec97926528a3511ecb8b3306fb6af473729384a5fe22d4870db8ca988895d619a1e7e2a1d9de2a41f SHA512 f97c1a02d31f0be4dc08b1f19b57bd0d3cba375ab5f33ab91b2a2df7817018f5b3e3063ed07199a3970644f1caa7c7e511db2034c73264f5f4963046d65b0097
 DIST codeblocks_17.12.tar.xz 15725976 BLAKE2B 871427b5d8a2296e04d640c35d9129deebf1bb35cd1573652099c02ad4495c4c1369ed382ba714848d6bd75304195a25f6a91bece398bedaffbee8ae3547c46b SHA512 f90e756ca6f532656eeed34c6259c6a96ae85d172fc11e39f696ded9189cab7171d0cead18524fbab50dd782f21adbc7d52e2ea90535a3ed0aef5946b8a476e1
-EBUILD codeblocks-17.12-r302.ebuild 2073 BLAKE2B a3b24b2ee38bc86119bad45038281ac8e7bdb22209841983ce0fc83be478e7292aef1e5e626e5c65b5ee1db4656e5957f992d47c1dfa71c53f786e3bd5ce9bfa SHA512 8df7ded166e72fd1d4bbabfb48c2fc3ce875d192e65f6e11fb6b8a4918cc41304ce7cab20c997ec04c98a2e722e806468f1bdda4a41e92c23b33d81f7653a917
 EBUILD codeblocks-17.12-r303.ebuild 2375 BLAKE2B 5cfbe24e5b2514baa89cbac19771d7dfbd160c21bbd3c83cdedd05a8a680e7a5e2a4f20849d20aa906244cf3699f43bc6452edbf678623cc943b18fca0064b55 SHA512 62a241a4617cd8c1f5d1416807c859ae3684b34323f08147e68d21834e6b25c844b63ed1d67738b9923d5f217071d1ec91c6485f7b31115f84a5b5b9ef7e67b6
+EBUILD codeblocks-17.12-r304.ebuild 2294 BLAKE2B f6f79076b52eea3a1c1230e3fcee4220215b3c3b09f2c533e359d51cf52d6433851634a7e94a30d1b467904760bc085ef9bbb449e61a33b9a724814c6ea128ac SHA512 24f38636a6945a7fcdcecdaf5e25a72fa4a8d035d974ff90117ec39f866583ef493aaf359acee65b3b4f839fb121657cc73cfd9d3260dce8a8c2388aa832bf8c
 EBUILD codeblocks-20.03-r1.ebuild 1811 BLAKE2B 9a62643660fa3a3f365fb66cab17a0f9bed43aecf0472809bdc968c7d6950819020e1f21d1d4d377c1717c34c547814b941b19ab12f37138d17158ff4ad83b84 SHA512 adbf6c9798619695333751ce85e43affe2d74eb923728895ec58acdd268513d05db10a96718ed69af91ce1ab8318148cd717308776c307533fac02c3b740ddbf
-EBUILD codeblocks-20.03.ebuild 1740 BLAKE2B 884f97f9a0d2e1b3557d934aa177552ba3b7b2dc5c02b5c5ea4033a46c5552483cf7f9ff690b1c74f1a0303bdc10438844c1f56f15e51f595c65d0aa670389f1 SHA512 53af7ec712e57f1a80fe3af696467a07ef18730a2a8e5ed8a24956f8fb862736e538fbe6e4775ad2118118236d90147214351a523a4d666cb07d4c451012c14c
+EBUILD codeblocks-20.03-r2.ebuild 1857 BLAKE2B 0794aa70ef9f62572b6f0ec79744abe252ee95f9e8c2f8961b7855352565af07f2016ee3f0785cc652176a40413d51eadfee37afaac9cc0fb0eaf639c554f565 SHA512 61849388191ec835109aa3160fbfb2b32bcdf12a69c121e092761368a5d711ece229ca45d3d9c944a481bd27e9bf08564033360e95a59fc9fb1a973f5b4348d6
 EBUILD codeblocks-9999.ebuild 1459 BLAKE2B 3add391f132cde04b2e936cd9b014d7ee091f0ce6105356ae1716d1a2a026bbd689c3959e5925c5add922e4d22878bd921fa44688b7aeae7e589911edee482a7 SHA512 0e00e64f4d3c7045b21015970e0c30551865d34439129ddaa3c41221d1414e45e68626d9a686b5e36fe6f46df2483bcb978aaaecb49a64d38da5853cb0c70ed5
 MISC metadata.xml 675 BLAKE2B db56c15590a97e891e387377cafcb743716d9c84f6adaaf43e3885993842e5456086ef1a59a6579fd5058d5d964cf49b34b7993d56cb5a2e78611a4e9edd0618 SHA512 459846c3e46109fb82d0f37d016fea29e3f69cbf8d03ae2ed2aa0beff443e4206082d9f2e53afc6cdac6862f76037dc652f2dc544d6b9bdf15f2de09d863c735
diff --git a/dev-util/codeblocks/codeblocks-17.12-r302.ebuild b/dev-util/codeblocks/codeblocks-17.12-r304.ebuild
index 47cecf4c74fc..88841742c92f 100644
--- a/dev-util/codeblocks/codeblocks-17.12-r302.ebuild
+++ b/dev-util/codeblocks/codeblocks-17.12-r304.ebuild
@@ -5,13 +5,13 @@ EAPI=7
 
 WX_GTK_VER="3.0-gtk3"
 
-inherit autotools wxwidgets xdg-utils
+inherit autotools wxwidgets xdg
 
 DESCRIPTION="The open source, cross platform, free C, C++ and Fortran IDE"
-HOMEPAGE="http://www.codeblocks.org/"
+HOMEPAGE="https://codeblocks.org/"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 SRC_URI="mirror://sourceforge/${PN}/${P/-/_}.tar.xz
 https://dev.gentoo.org/~leio/distfiles/${P}-fortran.tar.xz
 https://dev.gentoo.org/~leio/distfiles/${P}_update_astyle_plugin_to_v3.1.patch.xz"
@@ -19,7 +19,7 @@ https://dev.gentoo.org/~leio/distfiles/${P}_update_astyle_plugin_to_v3.1.patch.x
 # USE="fortran" enables FortranProject plugin (v1.5)
 # that is delivered with Code::Blocks 17.12 source code.
 # https://sourceforge.net/projects/fortranproject
-# http://cbfortran.sourceforge.net
+# https://cbfortran.sourceforge.io
 
 IUSE="contrib debug fortran pch"
 
@@ -38,7 +38,9 @@ RDEPEND="app-arch/zip
 DEPEND="${RDEPEND}"
 
 PATCHES=(
-	"${FILESDIR}"/codeblocks-17.12-nodebug.diff
+	"${FILESDIR}"/${P}-fix-crash-on-copypaste.patch
+	"${FILESDIR}"/${P}-nodebug.diff
+	"${FILESDIR}"/${PN}-20.03_gcc11_compatibility.patch
 	"${WORKDIR}"/patches/
 	)
 
@@ -47,6 +49,8 @@ src_prepare() {
 	if has_version ">=dev-util/astyle-3.1" ; then
 		eapply "${WORKDIR}"/codeblocks-17.12_update_astyle_plugin_to_v3.1.patch
 	fi
+	sed -i "s:appdatadir = \$(datarootdir)/appdata:appdatadir = \$(datarootdir)/metainfo:" Makefile.am || die # bug 709450
+	sed -i "s:appdatadir = \$(datarootdir)/appdata:appdatadir = \$(datarootdir)/metainfo:" src/plugins/contrib/appdata/Makefile.am || die # bug 709450
 	eautoreconf
 }
 
@@ -71,13 +75,9 @@ pkg_postinst() {
 	elog "The Symbols Browser is disabled due to it causing crashes."
 	elog "For more information see https://sourceforge.net/p/codeblocks/tickets/225/"
 
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
+	xdg_pkg_postinst
 }
 
 pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
+	xdg_pkg_postrm
 }
diff --git a/dev-util/codeblocks/codeblocks-20.03.ebuild b/dev-util/codeblocks/codeblocks-20.03-r2.ebuild
index c8915abb8e27..16fbd94b7720 100644
--- a/dev-util/codeblocks/codeblocks-20.03.ebuild
+++ b/dev-util/codeblocks/codeblocks-20.03-r2.ebuild
@@ -13,12 +13,13 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
-https://dev.gentoo.org/~leio/distfiles/${P}-fortran.tar.xz"
+https://dev.gentoo.org/~leio/distfiles/${P}-fortran.tar.xz
+https://dev.gentoo.org/~leio/distfiles/${P}-fortran-update-v1.7.tar.xz"
 
-# USE="fortran" enables FortranProject plugin (v1.6 updated to 2020-04-06 [r277])
+# USE="fortran" enables FortranProject plugin (updated to v1.7 2020-06-07 [r298])
 # that is delivered with Code::Blocks 20.03 source code.
 # https://sourceforge.net/projects/fortranproject
-# http://cbfortran.sourceforge.net
+# https://cbfortran.sourceforge.io
 
 IUSE="contrib debug fortran pch"
 
@@ -38,6 +39,7 @@ DEPEND="${RDEPEND}"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-env.patch
+	"${FILESDIR}"/${P}_gcc11_compatibility.patch
 	"${WORKDIR}"/patches/
 	)
 
diff --git a/dev-util/codeblocks/files/codeblocks-20.03_gcc11_compatibility.patch b/dev-util/codeblocks/files/codeblocks-20.03_gcc11_compatibility.patch
new file mode 100644
index 000000000000..46c8643e9c94
--- /dev/null
+++ b/dev-util/codeblocks/files/codeblocks-20.03_gcc11_compatibility.patch
@@ -0,0 +1,12 @@
+diff -Naur a/src/plugins/openfileslist/openfileslistplugin.h b/src/plugins/openfileslist/openfileslistplugin.h
+--- a/src/plugins/openfileslist/openfileslistplugin.h	2020-10-13 20:35:57.000000000 +0300
++++ b/src/plugins/openfileslist/openfileslistplugin.h	2020-10-13 20:37:37.000000000 +0300
+@@ -23,7 +23,7 @@
+     // Functor for the std::set predicate to sort the opened editor files according to their tab order
+     struct compareLess
+     {
+-        bool operator()(const ProjectFile* lhs, const ProjectFile* rhs) { return lhs->editorTabPos < rhs->editorTabPos; }
++        bool operator()(const ProjectFile* lhs, const ProjectFile* rhs) const { return lhs->editorTabPos < rhs->editorTabPos; }
+     };
+     typedef std::set<ProjectFile*, compareLess> OpenFilesSet;
+     ProjectFile* activeFile;
diff --git a/dev-util/colm/Manifest b/dev-util/colm/Manifest
index 7f99e5552070..5a38e8241b15 100644
--- a/dev-util/colm/Manifest
+++ b/dev-util/colm/Manifest
@@ -3,7 +3,7 @@ DIST colm-0.13.0.5.tar.gz 736026 BLAKE2B 75fb1748495ead2ac5527ce040efb76de264e10
 DIST colm-0.13.0.6.tar.gz 739981 BLAKE2B e5b00bc276fa3414cc9ec557a6e4ca93194f86cd6b3b1ad11611352962da1ef68aa1acd4aa62d47495ba04313dcc52e2a17588fefabf51572d19826c7bb70fe8 SHA512 5bcf2d7ff78e523385294f338a8c057807b416b2922e002311fcd8027132504f1aa99bc4dde2c4ea7ddbbc8806fddefda57f8a16f6d5c91a9c47566f86339c81
 DIST colm-0.13.0.7.tar.gz 746841 BLAKE2B 7f816bafc0d1a7ea826b6cc2f5bd5fa2bffcd0eca88d5eaab757201481804dc5fa6c80fa19a550ebd9ee50a00a621690c4eed1788e0d0d3dd600db95ed8240d3 SHA512 d15cc6afeeacc4f34171261e75a7daa285529b98940272566ca6d6661d0778b18930ca72e0bce8d0a56c36c3482adfe4375c32ec66d6e77ee32544bddf35024d
 EBUILD colm-0.13.0.4.ebuild 372 BLAKE2B 789e470189b8c31dce2145bd696f762569d5a8021090d3d09a0c300f63488e2de8412d1e250a16a9e37bafae61530d5ccc61a56e1998a5d485345f292d5bb3a5 SHA512 d1240148c5b89cdcff5750859b8bd920782f907f53d736f775def15c259e443d044900cd19d65445ff55ba6ab62a15b3a084a9a0734ddb1151a0f887a24a68b0
-EBUILD colm-0.13.0.5.ebuild 386 BLAKE2B 3e9d0c96638b21ecc8f7309e36a4d23dfc53147cc788ae20ea2b03e386fb61bfc1166ff843c8a2e4072267c86e0e629cb9b12d3cf00a8564e7d10486197726cc SHA512 3a2a5b53dd60eba3b15f39f02a94fcc81f8473f3eb001d5c612a571937ae908632c7d7aa16c97faedc53c2c1f7b7cbb67c69c4ad84d76d85afeeb220b5180440
+EBUILD colm-0.13.0.5.ebuild 493 BLAKE2B 1db4cd9d96b82533efaf02912860354d02afadc9db9efcd753717fa8640c31fa23b375cdd6db8d87872accf1cf89931a73f76ec454fb435d2ac6c3aec08d5b1d SHA512 78358f795c3344b0705c9a50906696781dc835c8b600f8dc2fe3c64e5f3451329405dc3cd1496893059b2d09f9f49f261f497c370a674840713d7d7459a47793
 EBUILD colm-0.13.0.6-r1.ebuild 495 BLAKE2B da89d4c288e2fac01b749a1021722d1a8e20d9ab2d9665a34b88d3711d7adeb080e16e8dcbed189ebf61508ecf595b5cd01411febc652a79f2e2689280c3d701 SHA512 f041d1089febd167ea240289d0c8e1876a74093204d3a866310ec4547a274ba4015a04f8329fcaf0d7df9f10ae362badbe18f04858a0fffbf675fcf4fdae1b63
 EBUILD colm-0.13.0.6.ebuild 390 BLAKE2B cdc09b52c1787783cfe49fe1361559b0c5317d9ce9db7b0116f393fd818c17027b257685b15ee06e0cdc7fc3d9779e977dcd97d88ba63306c8cce5dd2bb1ca4d SHA512 1943cd5be8929df9a5c119a7cc9362ba1936440fc2fd77f3a80b1c94e5107709af590987dc32067cdfbea0daf9486e235bdbb3c7035c1bcdc2b57731a536302a
 EBUILD colm-0.13.0.7.ebuild 526 BLAKE2B 7040619abb35bcb6c3ca60f5fedc1bbbfede531a0bddae09c377f810b4be50ff78095ae0e08fd9c5a6fe2a94e1a2762072abedf902d2524366fa847890a3a5c5 SHA512 a8bdb42222771ef619f0fdf55333cdd18eb77f5c7eac186cf8e56df47b07b52124ad38e223ea0cb19f463e11bc9aef304b11eafdb9a5f177a52d9634728a7766
diff --git a/dev-util/colm/colm-0.13.0.5.ebuild b/dev-util/colm/colm-0.13.0.5.ebuild
index a64627ad7bb8..ec66f5a78c62 100644
--- a/dev-util/colm/colm-0.13.0.5.ebuild
+++ b/dev-util/colm/colm-0.13.0.5.ebuild
@@ -10,6 +10,14 @@ SRC_URI="https://www.colm.net/files/${PN}/${P}.tar.gz"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="amd64 arm arm64 ~ia64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
 
 DEPEND="app-text/asciidoc"
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-util/complexity/Manifest b/dev-util/complexity/Manifest
index d1b34ab6a3a5..050129615ac3 100644
--- a/dev-util/complexity/Manifest
+++ b/dev-util/complexity/Manifest
@@ -1,3 +1,3 @@
 DIST complexity-1.10.tar.xz 422012 BLAKE2B 7010647a6de95bed56a724aa890a4d07f4a671ec0190eb9ebdff8d1db0bd1c73916dca17641dc539a5492dd3acf7c666b9c2812b82b980af8b4ebcd951dc15a4 SHA512 3c9a935b55981a420f5f81b055c921fee96f294bf052fa8f7b7299a538b154659161e24bcce549e2a20706273c48870477cb26c4b4120658de985ab653a90bf1
 EBUILD complexity-1.10.ebuild 459 BLAKE2B 451a5e6eb5fbfff3ff08dd4d8f31e55ea17b909608e7e2f8f4beb1f3637e2d1e566afda2f62d946b30fcd663508238a0d1fe361c8ce15754bfa5f064b23b2142 SHA512 1bd7ec4ed193f532ec48fa6c43d54ec3ac4768e129dfb1cf59c8233759d6d125f9b3f71ee2d003c9bb499c1acaf786f153ded6e2c62c126111ff7566ec49c38d
-MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/complexity/metadata.xml b/dev-util/complexity/metadata.xml
index a8fb43312942..6f49eba8f496 100644
--- a/dev-util/complexity/metadata.xml
+++ b/dev-util/complexity/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>jer@gentoo.org</email>
-<name>Jeroen Roovers</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/dev-util/cookiecutter/Manifest b/dev-util/cookiecutter/Manifest
index 84cc1fd14f0f..50cc535263f9 100644
--- a/dev-util/cookiecutter/Manifest
+++ b/dev-util/cookiecutter/Manifest
@@ -1,5 +1,5 @@
 AUX test_cli-1.7.2.patch 579 BLAKE2B 8a77388ddac5bf4aaf1f2f3d950318a8f3af582df9bca9004a6701c7347ff81abea25b0c33586153198906358583a2acf8e17b20248ad98215c44411739df581 SHA512 d5906423db6cf8254c411a5f33f4f0c6b9b2760bace1db5e131ac8ec47b740d5b78feb7caa450efcec6cfb05997ff8038fb9e3fff81585d9b64b455b492e5a52
 DIST cookiecutter-1.7.2.tar.gz 253484 BLAKE2B de1c773cd5e53532edc7af7aaeac6061b1a5293330b8162da0f31895b0c3a58a4e0f36d66bee3da328a6b0a59fb5bd917a2f3f6fcf7772a4c63db5cd0030caae SHA512 15cc145f143b4cac6e78b12e1c29e191d0c1c96b0187db05a4c8aac18310a5cb31d912073674ef4c01727c9b5a3b67f8c508842cb625db338b4034faa52a4a4c
-EBUILD cookiecutter-1.7.2-r1.ebuild 1308 BLAKE2B ba82714c298195bc877edb8eb4d678fd4c86b5708d55bf35fdf4d198e11be225844a2ab7bba63e1b2082face6c40d5ec3c573e4f3c00da91ccb33c4f109031fd SHA512 d83e174a34fca78e2d1acb7362bca5a345cb9572a696eb66e745495c083a904e7e274cfa5dc8c6f481f89b30e9328995a689f9a891c4e27e20ae366fd63829ec
-EBUILD cookiecutter-1.7.2.ebuild 1294 BLAKE2B d84b3f46a9c738d5d98ae1a66d8ae591b4c402fd9cde74c8b089aeaea9da468577356ad7fd17c2fe618a13a4c283cbc7c79d78e345e4fb2041da05e70bbb1349 SHA512 6f2c0623dc4fdad071361c430edad1a18a2f37cdcd63db1bd165e9ab2b455a98c27a3c7b38b06cfc054b87e2c3e7e5e15a7b2a6326925f00740f3b4aad192c08
+EBUILD cookiecutter-1.7.2-r1.ebuild 1301 BLAKE2B e2855d236883a6981b95da3047431fcfb18434c5abad20e7043033395ec4410b3be5c060a37f9a671034441077ff6bb2589ad8b34122bcd38d69447a17a9cfd7 SHA512 a82cf431f0780c088a24993364e5789d5e3f52d7b47fb4a135ed884a5208702048ea05174dd50be440426f4338376b7af53bb8d39996993ef6228e85434df35e
+EBUILD cookiecutter-1.7.2.ebuild 1288 BLAKE2B 26fd37e961d20434409eaa47c34078eb3251a893360cfc4ba4b9d787ce0064ed26e131fd406b2746800c7cdbac7408a6a03ef9dd69e1eaf949352e82aae37178 SHA512 a6cb4d5c575723816993cd2cf9bdade5187eaabe9abdd6bb8d010727ec410b1e96bfc4cc2c8c317c7619dab04fc182e2b2c8deea5905009011f3fcdb41c7d05d
 MISC metadata.xml 329 BLAKE2B 3030c112beee6c6e136abcd0390ad47553f874ba5ec6f5d19d87f84d5c9d930ac71d2219c064944601a09bce7c9b71ce1257d1664070f749f4447e2549521bee SHA512 4c36a71c316a8f5b946668fc160685a293c25a292917baad1345fdbafa5108166cf50343cd5fd3627447b5af5a1cf40848488eb0085708b0ca032ba7c44d4101
diff --git a/dev-util/cookiecutter/cookiecutter-1.7.2-r1.ebuild b/dev-util/cookiecutter/cookiecutter-1.7.2-r1.ebuild
index a50474701283..ff83044e0781 100644
--- a/dev-util/cookiecutter/cookiecutter-1.7.2-r1.ebuild
+++ b/dev-util/cookiecutter/cookiecutter-1.7.2-r1.ebuild
@@ -4,6 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6..8} )
+DISTUTILS_USE_SETUPTOOLS="rdepend"
 
 inherit distutils-r1
 
@@ -14,7 +15,7 @@ SRC_URI="https://github.com/audreyr/cookiecutter/archive/${PV}.tar.gz -> ${P}.ta
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
@@ -27,8 +28,7 @@ RDEPEND=">=dev-python/binaryornot-0.4.4[${PYTHON_USEDEP}]
 	>=dev-python/python-slugify-4.0.0[${PYTHON_USEDEP}]
 	>=dev-python/requests-2.23.0[${PYTHON_USEDEP}]
 	>=dev-python/six-1.10[${PYTHON_USEDEP}]
-	<dev-python/markupsafe-2.0.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]"
+	<dev-python/markupsafe-2.0.0[${PYTHON_USEDEP}]"
 
 DEPEND="${RDEPEND}
 	test? (
diff --git a/dev-util/cookiecutter/cookiecutter-1.7.2.ebuild b/dev-util/cookiecutter/cookiecutter-1.7.2.ebuild
index e8a6a081c8b4..f5576d37acd7 100644
--- a/dev-util/cookiecutter/cookiecutter-1.7.2.ebuild
+++ b/dev-util/cookiecutter/cookiecutter-1.7.2.ebuild
@@ -4,6 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6..8} )
+DISTUTILS_USE_SETUPTOOLS="rdepend"
 
 inherit distutils-r1
 
@@ -27,8 +28,7 @@ RDEPEND=">=dev-python/binaryornot-0.4.4[${PYTHON_USEDEP}]
 	dev-python/python-slugify[${PYTHON_USEDEP}]
 	>=dev-python/requests-2.23.0[${PYTHON_USEDEP}]
 	>=dev-python/six-1.10[${PYTHON_USEDEP}]
-	<dev-python/markupsafe-2.0.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]"
+	<dev-python/markupsafe-2.0.0[${PYTHON_USEDEP}]"
 
 DEPEND="${RDEPEND}
 	test? (
diff --git a/dev-util/cppi/Manifest b/dev-util/cppi/Manifest
index c6dff232117d..7ff7a1f86e98 100644
--- a/dev-util/cppi/Manifest
+++ b/dev-util/cppi/Manifest
@@ -1,3 +1,3 @@
 DIST cppi-1.18.tar.xz 515664 BLAKE2B a9f354f4aca8e46f362c733a6fbfc5984bae369d0dde2b9aafbceae2ebb33d0ab2311479820c98c64406533494a1e201e704e763cb8df06e8fd1f11761684a8b SHA512 eec4f67d857680c763802b04c3964ad12505dcffe80f12567a729bea30fdd459f99af0e0f6a8179952bb356b5dd753d862782bb3950fa07e54ffe723565df7de
 EBUILD cppi-1.18.ebuild 451 BLAKE2B eb55ab0f811b84ba31f2b4e7c764f4aa7b257b7619143de93acddc2a1d9751607b1c887dd47ef89388d170363c93ff8c8899ce59d96ae7d573ab72a2322bb5bc SHA512 65e5cd52f4449e0d0d35d0938fa427f34e71ba53a117b46c5bdd453f83dec951f3104c82b007d2058707ba479f610c241b5679afc3bc9d87e37ec1bdb797d175
-MISC metadata.xml 240 BLAKE2B 64fe413f69832b5396b621f50bc6f618ddea15ddd4044ac76da4557d7dc0d963ce6ba36c0d1c0a8911af48fd71a6e84c4981f15ac7bad40bbd801e52b568a23b SHA512 25affa2d6d2fe48707ae81553343451aff9797885b4232e73973a29d4cc1d28a937d024cefca49f92383f01eb8cb811546cd2334cbb78f8e66f1db1f63ff4572
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/cppi/metadata.xml b/dev-util/cppi/metadata.xml
index f9f8bbfd9405..6f49eba8f496 100644
--- a/dev-util/cppi/metadata.xml
+++ b/dev-util/cppi/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>jer@gentoo.org</email>
-	<name>Jeroen Roovers</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/dev-util/cpputest/Manifest b/dev-util/cpputest/Manifest
index 25d5819e6068..a039520a06a3 100644
--- a/dev-util/cpputest/Manifest
+++ b/dev-util/cpputest/Manifest
@@ -1,3 +1,3 @@
-DIST cpputest-3.8.tar.gz 2722956 BLAKE2B 1da16c06d242703462dcaf9c6c26eb875c2622bcce4113fd0b990805d06ee7401a6776d2f0451eda49e7914caa59a5665a92387684ffb6dbbe884cf0fe07bd86 SHA512 a9592bdc9ffab8b42026ef2010f504e7e37d77fc2f197f89d23f7c9285a101059a0ec66418b914db0383974616d31b26addd1938fb27f45c3e7d9496ed0a0fac
-EBUILD cpputest-3.8.ebuild 529 BLAKE2B b3dc56ad08d029b419d3e8b92841f3174a6474b7f804d09ec40b169fd56910095dadb1b1031266ff3740fb076850fa3c247ac0519f242e5bdc95dc2ee66955e1 SHA512 821a79f0e27f2c5e124e6fb98414dd34af57e4fb8dae12998ac438892c3e3b5e099c64b47dca26b1a0d53b29595a7277023bccf4d4983afd0e6020b9a5d928d1
-MISC metadata.xml 249 BLAKE2B 67563a054eb11e858f51664b12ef99626bb7facd85bf2b520d81f3d9cb3cbdfda23ea18f48099df41e6e696a6827d4b9ea87165d8296d74a94b4d07181f2ec9f SHA512 d80d51464fcbaca1ca6bafb02f89caf99c6cbcfbd5450bd3b8c7d62243aa88c89070349002adf95565571f114e5b90d1b7d605fa501a7e95565800987b9c0f8b
+DIST cpputest-4.0.tar.gz 1163749 BLAKE2B 2ae0f4658662ead0fe5a46a0ae521edf7677a7b64e3c7ce9bad374c4f953ea5a548cdfe1d9128821ab5031211c10f02d0728085e68db02e0d021ea16d8b38f1c SHA512 69f39fffdcd965c871e598118db38ddb74a3e75fd7a7965f8d236029fa891f6fcb6b671147c166ad08482bbd0737537fafe90aa8439a0ab62389f19150cc39d7
+EBUILD cpputest-4.0.ebuild 592 BLAKE2B 73d7c038ea6741080f10a88417eeb709dfeb31eb52909a7d1000f5f83ee3b446534c6daa0a01017ea44b3e0239a816897b5c098193ea5d2606635376403fe1b3 SHA512 de73bb6a00890c7359ab44ef539a849dd6cca1b7267d580dc302baf2ff1360478a6a5b25d3943572dbe08ea35fb33ae4c2bae1e54f623ef9d8cfbd11450dfba0
+MISC metadata.xml 450 BLAKE2B 6db81d287cbc9fcdc9ba0705d551c1acf638a54632702b36155ae2adf7f66410e8139f6b15d99d7f4f5ebf3e5d53aaa922bdd3d922def13bc1072cd2ef108b06 SHA512 fb8d104e5fb4433528a4b9a0a3dccfaae507dba49c0e0959db2b2f5efdc34e7cab0ecfb8c0101be1fa1d933bc36f9344d61f8f5c02ef8185c84473deee9e3221
diff --git a/dev-util/cpputest/cpputest-3.8.ebuild b/dev-util/cpputest/cpputest-4.0.ebuild
index dad5aebdc6dc..a3cf73658e60 100644
--- a/dev-util/cpputest/cpputest-3.8.ebuild
+++ b/dev-util/cpputest/cpputest-4.0.ebuild
@@ -1,18 +1,25 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-DESCRIPTION="unit testing and mocking framework for C/C++"
+inherit autotools
+
+DESCRIPTION="Unit testing and mocking framework for C/C++"
 HOMEPAGE="https://cpputest.github.io/ https://github.com/cpputest/cpputest"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
+SRC_URI="https://github.com/cpputest/cpputest/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
 DEPEND="test? ( >=dev-cpp/gtest-1.8.0 )"
 
 DOCS=( AUTHORS README.md README_CppUTest_for_C.txt )
+
+src_prepare() {
+	default
+	eautoreconf
+}
diff --git a/dev-util/cpputest/metadata.xml b/dev-util/cpputest/metadata.xml
index cbc1bd63f384..a927ffa0fb10 100644
--- a/dev-util/cpputest/metadata.xml
+++ b/dev-util/cpputest/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>jakov.smolic@sartura.hr</email>
+		<name>Jakov Smolic</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">cpputest/cpputest</remote-id>
 	</upstream>
diff --git a/dev-util/cproto/Manifest b/dev-util/cproto/Manifest
index 502b9a327651..d7679661c853 100644
--- a/dev-util/cproto/Manifest
+++ b/dev-util/cproto/Manifest
@@ -1,3 +1,5 @@
 DIST cproto-4.7o.tgz 168915 BLAKE2B a79d22014140531c263d0b389c50c263b13bf2e9bd2142da54ec712ec13f122539d92fbc3e40a52d52802e17e5b96a39c73e0ea3dd3c189e0e4563cf7b3feea3 SHA512 9a731be8bfa3f0da9c8a7c04a1c9bcf5ca52897325fa868306c35d818fc54348f83d93e2b2d792a2f682f935fb42d928d2828b1ff7fe3287a1806852e180a9f3
+DIST cproto-4.7q.tgz 175005 BLAKE2B 4138aeb87bff6cd59182939ca93c174cc23a67fd5830bbbb4f0e148edb7856acd7ec98390b46cc1c268c694347d6624a48d94e126751ddeec29fa8a305ed5d89 SHA512 014b51dfcc4b00cf0f71355901ce6ea5d5627846f4bce370559c4a7d9935abe8abc2f994a70793d4886ab93a24843152aa6c873515aa7d9a72d9c4a18fa1171e
 EBUILD cproto-4.7o.ebuild 423 BLAKE2B d205460265c89b02a212690d0a47be727127e263194d6b11edca1b1a345eaf105b912a8bae86a1ed9df3d3b73f22bfc72000b542fe3e729a5f84e7b71c847e9e SHA512 e0ad6a095b508bf6a7ec7f5665be0401571e8e3ae774117e0ab610a1199c8b1a545a8cd8270efdc573190d2db6e3764f1fbd30028dfa3b47e0b10f5d7697d358
+EBUILD cproto-4.7q.ebuild 425 BLAKE2B b7002236148e301e5d0f32749359ea81a90ad92f9a4a11ae85d306a05dbb35a6bfd62cc59cce5eba04f997fe9c22a6de17cc2becd3e2eb18a7eeedb878081c8e SHA512 fb275844de6b326b75424bf449b45f2054611c8783b0433991609fdf51341738ccbdd23f9aa663b3291ee8679ca424e2c45d740903b3542c4449912f89fd7639
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/cproto/cproto-4.7q.ebuild b/dev-util/cproto/cproto-4.7q.ebuild
new file mode 100644
index 000000000000..366331b7cb4d
--- /dev/null
+++ b/dev-util/cproto/cproto-4.7q.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Generate C function prototypes from C source code"
+HOMEPAGE="https://invisible-island.net/cproto/"
+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"
+
+DEPEND="sys-devel/flex
+	virtual/yacc"
diff --git a/dev-util/cucumber-core/Manifest b/dev-util/cucumber-core/Manifest
index 7e14ef62c879..078316e25819 100644
--- a/dev-util/cucumber-core/Manifest
+++ b/dev-util/cucumber-core/Manifest
@@ -1,3 +1,3 @@
 DIST cucumber-core-3.2.1.tar.gz 49868 BLAKE2B e5d18797fb6821fa9c300898bc8c14d57559b790d77a191d7147a987e27893ce89076716f82fa2048632e1b033ad607c748fe29f6b8fc600abd523290c4a9f50 SHA512 ba45e804d8454a6ef306eb90f32e6cdf3ee25fdd6613e9ba8308ecfce4044f27ee3dc012ad7f9ca481e94fe5e1d9deb9e0c46ca811a8e25bb27981a78c528ddb
-EBUILD cucumber-core-3.2.1.ebuild 994 BLAKE2B 881e8bec9db7ae780c1d00f4766c82f663ef333e4758481e2601fa40d8711aa74c1476f5a836819bb23c0c285f67555d888c8f7aee46a19b9de1400c1371cda7 SHA512 37fdf76493665f61fb4dc701b2cf0a6d88e93f179d834627a65a6258015eb3daf0df673e831b2a8f14b9c6f4912e86fe9a123c2e5680f926bf561e9632918dc7
+EBUILD cucumber-core-3.2.1.ebuild 993 BLAKE2B dd15d4ee6ccaa3dcb77b26393a521f2cf7a00551eb6ff601d039bef038d558cfaaa5055fb45296ec8bc01cf41200f7bb4b1b14750c2a48e30185a33832154a76 SHA512 2f210781b5a18d8e16d8958d34c8b19b7402445b58f485610a394607abe8a6fec1e7e7670495d9265e08360308839dd0446b2ebd908f92508620e27e043116bc
 MISC metadata.xml 304 BLAKE2B 1f2a69030fdeaccf7280372ef0e8abc7e1ab0456951e88d6f1839ba3615f8a6588bb3a96d05bffdbe343cf3a4b89fc32fdbefc83faeaf2a54e0cdca9c68e03bd SHA512 1e0e844510269d137017ff7ecbe1b98c9542f7264ec0e5b8858119f06887720645c0d968228825d91fcb69016b78d7f7c7d344482f08c3fe0dd6cc3df4f52902
diff --git a/dev-util/cucumber-core/cucumber-core-3.2.1.ebuild b/dev-util/cucumber-core/cucumber-core-3.2.1.ebuild
index 9df694e4baae..890793c28c85 100644
--- a/dev-util/cucumber-core/cucumber-core-3.2.1.ebuild
+++ b/dev-util/cucumber-core/cucumber-core-3.2.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/cucumber/cucumber-ruby-core/archive/v${PV}.tar.gz ->
 RUBY_S="cucumber-ruby-core-${PV}"
 LICENSE="Ruby"
 
-KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 s390 sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ppc ppc64 s390 sparc x86"
 SLOT="$(ver_cut 1-2)"
 IUSE="test"
 
diff --git a/dev-util/cucumber-expressions/Manifest b/dev-util/cucumber-expressions/Manifest
index d6755a742399..578c7201f41a 100644
--- a/dev-util/cucumber-expressions/Manifest
+++ b/dev-util/cucumber-expressions/Manifest
@@ -1,3 +1,3 @@
 DIST cucumber-expressions-6.0.1.gem 18944 BLAKE2B a30127598ff26ea60477bbdad9fc621d0cb1ebb09af3f38d329a15430a207616b6421a127c302ba8470089c8ee0daeccc8f38d4f951b6edb320cff1cc16760b9 SHA512 d9c6371d499ffbe9105038396cde0786cd889def866bf56284a66be77230aac03a74f565b2c3adb966a8d2c67e631ff83eaf426e4bc4b022cd7742bb3a030137
-EBUILD cucumber-expressions-6.0.1.ebuild 496 BLAKE2B 6913a6ec67836b41ec7e21ed66d6019496744410479514be0deab2b658317c6066fdde1040a6e1655fda44215c16d116be212baeff0f54654802258b03e06e89 SHA512 a2b6bb493d64023689d0b1f24b1685e39ada8292a734adc349632bbead0e37dc113ffb6bf164e6bd0f5930eca47ef82de970c049df69e078480a001af1038156
+EBUILD cucumber-expressions-6.0.1.ebuild 495 BLAKE2B 439b415e473cb7f1969c44302c0b940d48966eb8a2389bf76c6d6809b23bff5a15220a5dd59b1831bcfc6b47c8bd055521f5894ff9d41b1e54d07226c9f03124 SHA512 28c463afd8a01f3beed373de16c9f1df6e33738cc220dd6c9bef97b366c64ddceaba9bb1d2cf3f3c8c0b65ed05db835e6713e9af7eab4e43c572df742d12d0c0
 MISC metadata.xml 299 BLAKE2B 1f0765d5fb94004b9a72b4b9b4c50cb14b05e611c84016704210aa24909d554a6f817d475fb924573d2ec6ccbd389165d9689ee8ccb7212744292dfbc55a0749 SHA512 b655a45650726e475ccae46d7bc062ba32c527277160c9033382684f6a7aed520220c6a197f7abb9dfe18f8ebea051b5fdcbfd10c744031f123ac684ce3225c7
diff --git a/dev-util/cucumber-expressions/cucumber-expressions-6.0.1.ebuild b/dev-util/cucumber-expressions/cucumber-expressions-6.0.1.ebuild
index 4b02192d8c33..b05661e6d5d1 100644
--- a/dev-util/cucumber-expressions/cucumber-expressions-6.0.1.ebuild
+++ b/dev-util/cucumber-expressions/cucumber-expressions-6.0.1.ebuild
@@ -14,5 +14,5 @@ DESCRIPTION="a simpler alternative to Regular Expressions"
 HOMEPAGE="https://github.com/cucumber/cucumber-expressions-ruby#readme"
 LICENSE="MIT"
 
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 s390 sparc x86"
 SLOT="6.0"
diff --git a/dev-util/cucumber-messages/Manifest b/dev-util/cucumber-messages/Manifest
index 829b0bf6709c..bb46d5862a6e 100644
--- a/dev-util/cucumber-messages/Manifest
+++ b/dev-util/cucumber-messages/Manifest
@@ -1,3 +1,5 @@
 DIST cucumber-messages-13.1.0.gem 10752 BLAKE2B 53ee61ab3ebb9f746701d583abbc78b31f929dabe848b88288888df891c0c8a9c2fe1ca416de5cf84cd47bdcb5b7d821a1ddf77ac2e5684b5315fdcdd104dc6b SHA512 cbb7ef75f8ef33dcb6230b62408f4c53ddc490029d271de54c753205aac761b4f47fec72d1d579be9c804c1dd512f3a9359f84b2a633d9bec211bba81b39a9e1
+DIST cucumber-messages-13.2.0.gem 10752 BLAKE2B babc649d1ba76819b9d6dade7eb926a0a220da02efdcc6438077c03ae1ebdccb29f2dd7d806fe950c47a796fa0b254760db0cdd4e1ff4d489e750f861156c2fd SHA512 0ad0fd6bcca7965129c70996a35e65fe7cad23b767273c1eb1851fee5c83e26ecdc5e1d5bc63a85950d0248682f45bdcd373da562e4e3fd541e633890216edab
 EBUILD cucumber-messages-13.1.0.ebuild 498 BLAKE2B ea638bd90fb55c53d93616b7e5f5d6bcf447d0d47771006e58ba906d3af66319b11c746305f822a7c13c78d2deae663b9c284e48d60ecef65a6b159bd19a1085 SHA512 b125defb262a718a774d9a166836858cdefa9275b7facb079e6e0f62814a2c5f6c49ffc81e52293cb2d65b2692a2a7d285124a63c5152d6d9626ba0a166eb71f
+EBUILD cucumber-messages-13.2.0.ebuild 535 BLAKE2B b1b7bfeb3f57a58dc01305daa4d3f685e1bc3e82a2b1bcbc68a91b6b65e9701ed94c35eb214ba62740d61f926b223c8c6c3d53354b8d2892cab2bab25bfcd41b SHA512 72d0822f3abd401962b09d0af5fe453e48bae0603298e3662954f6622e4013086869f917d14bdc3e9fff46669f8e80656efa24580766ed396baa8fbe001609ea
 MISC metadata.xml 313 BLAKE2B 8043a2240cf0e24b0307a6f068bd8bcccc65471d59ac643f3c654227695ec7a2392a6c1ed9ce4c0ca7cdd926a26be275b248626509c79aeaad48930e00f00c62 SHA512 949342e57dd6165f4402bd068865400a7affcc6e7f73adac6f8e121caf1ef9564bc95b61fa9bd7f80d9ca8597e5b5e0f3200a210d496577d4ec2fa881fbc23bb
diff --git a/dev-util/cucumber-messages/cucumber-messages-13.2.0.ebuild b/dev-util/cucumber-messages/cucumber-messages-13.2.0.ebuild
new file mode 100644
index 000000000000..6bff67f90b06
--- /dev/null
+++ b/dev-util/cucumber-messages/cucumber-messages-13.2.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_EXTRAINSTALL="VERSION"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Protocol Buffer messages for Cucumber's inter-process communication"
+HOMEPAGE="https://github.com/cucumber/cucumber-messages-ruby#readme"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="$(ver_cut 1)"
+
+ruby_add_rdepend ">=dev-util/protobuf-cucumber-3.10.8:3"
diff --git a/dev-util/cucumber-rails/Manifest b/dev-util/cucumber-rails/Manifest
index 0a289d0c4c3b..6df2f5ef22e7 100644
--- a/dev-util/cucumber-rails/Manifest
+++ b/dev-util/cucumber-rails/Manifest
@@ -1,7 +1,9 @@
 DIST cucumber-rails-1.8.0.gem 43008 BLAKE2B ac2fbc89ea952add031429b281986de37b3a8511e398b34d49435c70221b3c454589c51acd5b1fcecdf0285a8e446d4c2c0e0a77216eb78f8fa222086fb6db36 SHA512 757f50719309418353cf1e6b42902ce6166806d2e2a9cd1a27842ffde3d8ce61af97de12f4ffa9e31a50693cc8c40ece9a74e5ec91973096e77860b56034d439
 DIST cucumber-rails-2.0.0.gem 41984 BLAKE2B e6dd46d1957478ede25ff226d7423d54fa6aa187f398483815fd9504b23308aca01d5336b62eca152e5384fbf23328d0cd1cd6d1200cd61dc4319508353a7b59 SHA512 d48472b4c6694c612a46ade99fa20add1ee1699cbcd14ddb91c0dcadab25c0f4c18c2f22f713ed8a00dcf765d583d4f46b7e9c99b0f94f0521296e3e4846ed95
 DIST cucumber-rails-2.1.0.gem 42496 BLAKE2B 7e2862ddb006becd6e74374e2075c9ac7aadc62600985c9742af76c90ede6a1506d714d7dd82ad364c2f70ce102f424471fadf9431253aee7937c2d9ee2e591e SHA512 43b7f09ec5829c4ce86579c5840830f6a3effb956cefa661ed66362bd2f71c1ebd97f90414198c8120df25803b309af94a6ab529f8ed48ecc7994e33cf49d26a
+DIST cucumber-rails-2.2.0.gem 136704 BLAKE2B 660037bb5938ad01aa0b1188e5e48522f9932662d6578f1c0a107cdacbd5cf8527e48b6ddb2c91d975577a71db0259a7250d762004ef0a49ebc063f45103aab0 SHA512 ca8a0ce9c9cdb1306b6a5f8e3d9ba68a2beb3d0a35a58fd6c51ba3ce76e2104045b2768054d27bb4bfcd437534aeb6d39fa2be87396f3a4084c0044201e96252
 EBUILD cucumber-rails-1.8.0.ebuild 1184 BLAKE2B 418d8325a0cd90834c31ef87e86d3fb7a7a8b6602fb73546e4c8b9cc86c492e6556055d5ef8bb2fdac12b97f9cd6b53594cf45e4892f8b356a209aaf57c3688c SHA512 fa921b40e01409ab7f3da2b5dc9b781059a2c8d05f6ef9d4e94360005f58e601d99423aae349af78c23ec17e390728f716375ac80784b2065e5c23d5f4ee91e8
 EBUILD cucumber-rails-2.0.0-r1.ebuild 1221 BLAKE2B c23a7bb31a02af2f57ddfa1820eae96c175ccd87bf7d15f74de8d0d824a6ae678b99bf1ea2bfbc8ac6f332f908418fa9ffd38739997ebb553495fcce5c0fec26 SHA512 8cc97442c6650b734bc458dcc972e6391994269a5ee03dea633548edae0b15e5e6782c06372b576d0673086bc852bbbf737235c9ec7ae3356ededf7a826e09b5
 EBUILD cucumber-rails-2.1.0.ebuild 1208 BLAKE2B ef4ed22a7df3bbdc445893f3a28d8be3b7bad1c1fdb7bbe4464c236d4c8da717c1be26ce65d1c03b6bd4ea75263421650c56509bcd8cd8d92c78b281e18e6f2b SHA512 890e64004bf2b4f84c11f3555e1246a0dfe4efe5c71ab9c660e289d9cf277acccabb0942290d2a197d6963c06917c97609c4ee663c86c5492bd2c70599f31609
+EBUILD cucumber-rails-2.2.0.ebuild 1189 BLAKE2B 34cb251f979f9070d60b1d9a47a2baa85f8a70ef79a35f5814c9cc6044332a82363ea48f51664989e671bc7f213afa3a96f5d3f72426c1ca5fcf82f92dd569f7 SHA512 a9de414f4a24b1e7207c76a73b2d14bc7e1dfd77b2aeb97c13cd7e0c2f36ea127e3aaea967605554f5b7393cc02e6b976dd9757a91d7d4daa864db596f823862
 MISC metadata.xml 299 BLAKE2B 1f0765d5fb94004b9a72b4b9b4c50cb14b05e611c84016704210aa24909d554a6f817d475fb924573d2ec6ccbd389165d9689ee8ccb7212744292dfbc55a0749 SHA512 b655a45650726e475ccae46d7bc062ba32c527277160c9033382684f6a7aed520220c6a197f7abb9dfe18f8ebea051b5fdcbfd10c744031f123ac684ce3225c7
diff --git a/dev-util/cucumber-rails/cucumber-rails-2.2.0.ebuild b/dev-util/cucumber-rails/cucumber-rails-2.2.0.ebuild
new file mode 100644
index 000000000000..d590e771b365
--- /dev/null
+++ b/dev-util/cucumber-rails/cucumber-rails-2.2.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26"
+
+# There are also cucumber features. They require a Rails project with
+# factory girl which we don't have packaged yet.
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="cucumber-rails.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Executable feature scenarios for Rails"
+HOMEPAGE="https://github.com/cucumber/cucumber/wikis"
+LICENSE="Ruby"
+
+KEYWORDS="~amd64"
+SLOT="$(ver_cut 1)"
+IUSE=""
+
+# Restrict tests since Appraisal is now mandatory to manage different
+# rails versions, even for the specs.
+RESTRICT="test"
+#ruby_add_bdepend "
+#	test? (
+#		>=dev-ruby/ammeter-0.2.2
+#		>=dev-ruby/rspec-rails-2.7.0:2
+#	)"
+
+ruby_add_rdepend "
+	>=dev-util/cucumber-3.0.2 <dev-util/cucumber-6
+	>=dev-ruby/nokogiri-1.8
+	>=dev-ruby/capybara-2.18:* <dev-ruby/capybara-4:*
+	>=dev-ruby/rails-5.0:* <dev-ruby/rails-7:*
+	>=dev-ruby/mime-types-3.2:3
+"
+
+all_ruby_prepare() {
+	rm Gemfile || die
+	sed -i -e '/[Bb]undler/d' Rakefile || die
+	sed -i -e '/files/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-util/cucumber-tag_expressions/Manifest b/dev-util/cucumber-tag_expressions/Manifest
index 4d89b495ba6a..56765c46ef77 100644
--- a/dev-util/cucumber-tag_expressions/Manifest
+++ b/dev-util/cucumber-tag_expressions/Manifest
@@ -1,3 +1,3 @@
 DIST cucumber-tag_expressions-1.1.1.gem 7680 BLAKE2B 31e1f23c5fc008390c9221307473022107b109d409d8385a111f4fed1911fad15660faa824bee71cd87a2e183ec41a6ac9b5f7ecf5f1c417ed51d649c76712e8 SHA512 9b46d681be78b428c7cd29ca1cae21dbd410f7ca9844ec6f94368170c133f8de662a55e4f4440045704107e5428306ab81d2a90020c64102ef42f647cd8a66a6
-EBUILD cucumber-tag_expressions-1.1.1.ebuild 464 BLAKE2B 2c61d877ac6cf821e272d3cfeb9d42b5db61287ea50296a7dbf28656a0816764324ff829924992615c34976717a253ad940164d692ace7f3adb6002f4754956f SHA512 486b6dd09a85e80c524ba94911ab445c87d1aaca2d806a1c6e7478520d42e7574b0a44150bb2e877b40856cce79c714612566715af2b4354d7769e1374e1afc8
+EBUILD cucumber-tag_expressions-1.1.1.ebuild 463 BLAKE2B 200b34d3031a97373d9735d5c6ab2760f3d3b4c0af3100ac4bc0c6b113880e4afe2359d8baf3d06ef99b5aa498e789009aae76ab7d65da1ac1c3e5815d7b3e78 SHA512 ad91772f8a311ce52b2b505960c3a84f3e9fe2a7b7e6a55ca924df1161ef982f6a5ea5073278b8e6e720eaa1d5c420643bcaaf41bee6e8681c51bfa7a47e6ccd
 MISC metadata.xml 299 BLAKE2B 1f0765d5fb94004b9a72b4b9b4c50cb14b05e611c84016704210aa24909d554a6f817d475fb924573d2ec6ccbd389165d9689ee8ccb7212744292dfbc55a0749 SHA512 b655a45650726e475ccae46d7bc062ba32c527277160c9033382684f6a7aed520220c6a197f7abb9dfe18f8ebea051b5fdcbfd10c744031f123ac684ce3225c7
diff --git a/dev-util/cucumber-tag_expressions/cucumber-tag_expressions-1.1.1.ebuild b/dev-util/cucumber-tag_expressions/cucumber-tag_expressions-1.1.1.ebuild
index 280ef3ff03fa..c35de6ca6a17 100644
--- a/dev-util/cucumber-tag_expressions/cucumber-tag_expressions-1.1.1.ebuild
+++ b/dev-util/cucumber-tag_expressions/cucumber-tag_expressions-1.1.1.ebuild
@@ -14,5 +14,5 @@ DESCRIPTION="Cucumber tag expressions for ruby"
 HOMEPAGE="https://docs.cucumber.io/tag-expressions/"
 LICENSE="MIT"
 
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 s390 sparc x86"
 SLOT="1"
diff --git a/dev-util/cucumber-wire/Manifest b/dev-util/cucumber-wire/Manifest
index 2b83c113d234..682a446617b5 100644
--- a/dev-util/cucumber-wire/Manifest
+++ b/dev-util/cucumber-wire/Manifest
@@ -1,3 +1,3 @@
 DIST cucumber-wire-0.0.1.gem 16384 BLAKE2B c35f478bbc8a8bccfbe1022d5b687a85c087bcadd5f494b807fa530d20b7e14f327ca2ab377c3f9abc28df60c7986576b59a246e5fb7537daadb016bb21420b7 SHA512 c6bae727814f6a2d1dfa8cfee9bc9e63e3bfa755f6bb070f907a24d52009dd29652ab21ea7719527a5423ddf4471208f91a388ec53555d7021abac7769b2109a
-EBUILD cucumber-wire-0.0.1-r1.ebuild 519 BLAKE2B 680fe7f8d7649d25f4ccfd783f046a943498459a6c4161603572f01172a479378a6f86368a1d37f34288fa94f5df737af95f6bb40c4cf6998ae36a3c4e2a0adc SHA512 23c363b10d3318b1ccc065a419d55f82469ea710b4d61702521f563abddb607934738e4418c312abf981d0c2a7bff9756d3bc48053f9d66ea82af7c02d0a8b5c
+EBUILD cucumber-wire-0.0.1-r1.ebuild 518 BLAKE2B 227945c512f4adc1bd033f029c2770ddd9b83fd0075ab2dcd90b8a1a0755fe94cbe2a3f75065f2a7b76278fd9d0c7ecf0575ec1d9d5af334637ec5793059220b SHA512 13d5f340fd9e66ac54cd3d471673848dde539c7f0280ba331eeb9263a18d695aff80efc9acd91c1878d17f39553ae8e2ae33cb0b13de40928bc93a42c349437f
 MISC metadata.xml 304 BLAKE2B 1f2a69030fdeaccf7280372ef0e8abc7e1ab0456951e88d6f1839ba3615f8a6588bb3a96d05bffdbe343cf3a4b89fc32fdbefc83faeaf2a54e0cdca9c68e03bd SHA512 1e0e844510269d137017ff7ecbe1b98c9542f7264ec0e5b8858119f06887720645c0d968228825d91fcb69016b78d7f7c7d344482f08c3fe0dd6cc3df4f52902
diff --git a/dev-util/cucumber-wire/cucumber-wire-0.0.1-r1.ebuild b/dev-util/cucumber-wire/cucumber-wire-0.0.1-r1.ebuild
index 89a7ca5d33f6..b57396addc44 100644
--- a/dev-util/cucumber-wire/cucumber-wire-0.0.1-r1.ebuild
+++ b/dev-util/cucumber-wire/cucumber-wire-0.0.1-r1.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Executable feature scenarios"
 HOMEPAGE="https://github.com/aslakhellesoy/cucumber/wikis"
 LICENSE="Ruby"
 
-KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 s390 sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ppc ppc64 s390 sparc x86"
 SLOT="0"
 IUSE="test"
 
diff --git a/dev-util/cucumber/Manifest b/dev-util/cucumber/Manifest
index e983f60ecdc4..82905e6d253a 100644
--- a/dev-util/cucumber/Manifest
+++ b/dev-util/cucumber/Manifest
@@ -1,5 +1,5 @@
 DIST cucumber-3.1.2.tar.gz 267995 BLAKE2B a55d15d2c5746efd2e9f3518025b3b6d69e7712920b5731e1174ff429a9d6161d9aad7c0065c5ddf8b97fd87c9e658ff86b961b175db2c930bba52d1904d6b62 SHA512 abf0b562476653c393bc5a3c1f9669d91a2e312bcceb98bd20ac3771a61eeb696721cba76299d12871f7c61fdca176310e3a334b53d10c31ef3e201948c762d0
 DIST cucumber-3.2.0.tar.gz 271886 BLAKE2B 0945336e2a4d14c21d22b3af18fb140663fa0c5acd7d29540cb6755fcc50b020640ffc573f4d4ed17af2758df3df410f93cf5067b736cb8005d9a6ae7fa4d397 SHA512 927ca314c56f83e270284921131ec62aa05053d29a77b230799bd1949751f64c964c0f87525c776d7fe260506ddb632b5cc8939df841d131f6a0af8a82110441
-EBUILD cucumber-3.1.2.ebuild 2749 BLAKE2B b77ae4ba191999be873d92ae9a3dbcd6e52151662f4579aa4a96c7c5444a4a03604cb054b555e4ddfa06a7795c5eefbdb8677648c2129221073354afb3fa35da SHA512 01528a0c4707e239bd19fe5ccf49847192b569d3d7d33e4c906be552a3b53d5ef5320cb8863dae0aa524aea30f3225351e66ae5f81f49e88c68d274c402636aa
+EBUILD cucumber-3.1.2.ebuild 2748 BLAKE2B a56582054e351d9a7b939bd51c2b5e4164de819b1f4e82b35dada50f1fe04bba9e66a579a70fe1135984ee342a7b9944d710876f1757ffdd60fa10ee7d1f54e3 SHA512 138b7f7f8246e9119c0a0076b8923b001fb451da532e77874bf2b731620b2143691f15067d178b65e2acb7746ce3b3749d08027d4a17eb1ad3e272f468e2106b
 EBUILD cucumber-3.2.0.ebuild 2871 BLAKE2B 200b9fcb52887dd4375e8bb4e47fa9947b3aa3981849b15cd998e115ff30b960367be3cbe8336309b6ebe994a73624b9cdb52f8afffcd2eee4abd224e587dff2 SHA512 85f7771a369cb51f38f32ff58f203b52114d19bfc0f58f98561e373cec129c73bced5e365878ea7bf7fd21468b277db55f4cb917400b4347f306102c59d7e8bf
 MISC metadata.xml 304 BLAKE2B 1f2a69030fdeaccf7280372ef0e8abc7e1ab0456951e88d6f1839ba3615f8a6588bb3a96d05bffdbe343cf3a4b89fc32fdbefc83faeaf2a54e0cdca9c68e03bd SHA512 1e0e844510269d137017ff7ecbe1b98c9542f7264ec0e5b8858119f06887720645c0d968228825d91fcb69016b78d7f7c7d344482f08c3fe0dd6cc3df4f52902
diff --git a/dev-util/cucumber/cucumber-3.1.2.ebuild b/dev-util/cucumber/cucumber-3.1.2.ebuild
index ae95a5270878..677acd29bcc3 100644
--- a/dev-util/cucumber/cucumber-3.1.2.ebuild
+++ b/dev-util/cucumber/cucumber-3.1.2.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/cucumber/cucumber-ruby/archive/v${PV}.tar.gz -> ${P}
 RUBY_S="cucumber-ruby-${PV}"
 LICENSE="Ruby"
 
-KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 s390 sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ppc ppc64 s390 sparc x86"
 SLOT="0"
 IUSE="examples test"
 
diff --git a/dev-util/cutter/Manifest b/dev-util/cutter/Manifest
index 5725fa06e4e3..65d17474bfac 100644
--- a/dev-util/cutter/Manifest
+++ b/dev-util/cutter/Manifest
@@ -1,6 +1,4 @@
 AUX cutter-1.10.3-python3-config.patch 1240 BLAKE2B 8b08b4a86f20196f42931ad8a36de42aea662b634c08911e762253303c3efa90fcf6f42582b23e273b5ed0761ef403b15b3270fe3d56506def9d398af2a7335e SHA512 44ee6b1b75b8a0349144ed9094fd5efc42f22415019583392910dfe0aca263d83192558e70b87945ff8c35f2eca988a4b5f45ab9f3f1bf1ad6f793d0510a4c77
-DIST cutter-1.11.0.tar.gz 1990964 BLAKE2B b996a3e4c55b3077a8aa54b3df5517d270410ab81f8a111865dc89dc6e61f2712ebd29c10be37a50d9bf143b98916bf48c5df9ed1bfaf936af714d4a12687052 SHA512 a69efee672fb0e142ac6c1fae287c463ec1e777a2ec6b604f412fd0c21b0614d2f05a289beb4602af70d6446f0a6263b353dcbd38d41a6466ae2cdbd14e0bea3
 DIST cutter-1.12.0.tar.gz 2323732 BLAKE2B fb40444b60c19f88dafb9447731b91031ad764359121b835ae03477bf52f17d12d1a0b651059072b6ffb7bf811d4493b3746ab9c48d8f09257b5338130edecbd SHA512 3d8dd9cb6f9e69f41e295795f3d1b7256c071abafd04bdecd619817b8fd04396770f69df753701ffb376a358f0df9bd38dff6a344df4e5ca92163275ad670531
-EBUILD cutter-1.11.0.ebuild 1010 BLAKE2B f32a25c06b13e03d1078c4e0ffc246f9eec070122e64d00c374a3953e1af59bd2aa7de296e12c9409e5c26f443fc7f478250624b4f6d915b590c0e0b34b6570c SHA512 538e627e00f896a81b52aa695ca6cfefca46c26561c8a78061554380bf03fe5d56250b1f65d7f571d1df49bd189d6cea5b7900c21c46d95eb5cb8b72c0719dba
 EBUILD cutter-1.12.0.ebuild 1005 BLAKE2B 238558e08802b077aa33e8aa5e6f8bd94955e289540379442bbd8b75e6c94e5b75764ccd5aa8c4c3693171fe97dc4a580e35eae31e81431bf4c43bbe4afafeb3 SHA512 bd275d96efb425990c87e5fd44ef47373ec8fdfe512c10cec01801ce29c8b442ec38c4656110ea0c1ba54d3ebe0fa7981f6792b5388723608af5de909419cea4
 MISC metadata.xml 451 BLAKE2B 1a4231b3e9d5deb080440e506f8395949488870f5565d44e579f1262efb62ebebd9acbb2293613ecc85853f0a469d322bd06c2aab2ae4a1c0a5e5e5218a3ac36 SHA512 39e84ad70a516e67d6f0491dc78cbb1479713bc2444d2ef751d34a33d26ae4db1a44de553fadaad6b3dce5b9fb1d3e8b7cca1001be25198d24f042ac8441e2d0
diff --git a/dev-util/cutter/cutter-1.11.0.ebuild b/dev-util/cutter/cutter-1.11.0.ebuild
deleted file mode 100644
index f7cbb90b3173..000000000000
--- a/dev-util/cutter/cutter-1.11.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9} )
-
-inherit qmake-utils xdg-utils python-single-r1
-
-DESCRIPTION="A Qt and C++ GUI for radare2 reverse engineering framework"
-HOMEPAGE="https://www.radare.org https://github.com/radareorg/cutter/"
-SRC_URI="https://github.com/radareorg/cutter/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="
-	${PYTHON_DEPS}
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	~dev-util/radare2-4.5.0
-"
-
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.10.3-python3-config.patch"
-)
-
-src_configure() {
-	local myqmakeargs=(
-		CUTTER_ENABLE_PYTHON=true
-		PREFIX=\'${EPREFIX}/usr\'
-	)
-
-	eqmake5 "${myqmakeargs[@]}" src
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/dev-util/cvise/Manifest b/dev-util/cvise/Manifest
index 81df35c64cbd..81560936ab07 100644
--- a/dev-util/cvise/Manifest
+++ b/dev-util/cvise/Manifest
@@ -1,5 +1,9 @@
 DIST cvise-1.6.0.tar.gz 243050 BLAKE2B 64c305426dbeaf2e3f3a92a902209b35fcc76b5f5a6d2e48fcc8e24d1325badc0839e70afa1381c6d1412c22a7e9dd41ca03d6ca714fa5082958378cc8863000 SHA512 9d4ee043c34748b600b49ac4f00463b853faff2809f8b581e9b07433a8f3bef4436d0e5d5a9dbff1b2d7c3a8ab1d6d4823e78787eb3e911a683808703b2e24b6
 DIST cvise-1.7.0.tar.gz 248515 BLAKE2B b1a2ca8abc7a09c240a7ae39400e3e60ca641dd0dff4edb34f43d755619ec47bb7a0d25fd6b4461bf80a3be14a63c6e56d0e3e758827ca7c2ef90370aba5d539 SHA512 2e0115355c0ca3cdf593ad4a8d0079ea0ea193234ff4fcae8bdc7c0244cc7b8672025682821279b826fda97f80dc71455390d709836acb671c19772f13156de5
+DIST cvise-1.8.0.tar.gz 248744 BLAKE2B 5196a2bb68c0f9ca1a8219ee0dccae80aa7adac64df5bc4c7601a8ef81048875bfa3d8fb2e8c407cfa8f238739733ad4fbdf08bb14a72ec208d562bd7e69ba84 SHA512 eaef3506f0fcd54953271494ebdbd043c028cd98c4a976bc2d978112c28d27d5d307527db52c2a3f8f153b52430ba9c61ad072dcae5a6e0b9bfb8be844a50bab
+DIST cvise-1.9.0.tar.gz 249042 BLAKE2B 357d429afc43691e616dba31621d1de89fb1f85fcbc177847b3367aac993ccd2c3bec20226e910a319d5d6194b32d0be9704e4fa7b8fce49f23788d10a378012 SHA512 518c48b7b9d9af9b856bfc46d4fb8064bca3730735bdabf2b3aa981a3f743fa6988594b7cbe39da71ac01fbadb4a45e5212d7c79b510fa36d86055978829495b
 EBUILD cvise-1.6.0.ebuild 1162 BLAKE2B 09b719db9f8c428bd94aeec9ccb8a03b150323a62a9d014ee82cced18733a89d2272ba049fe8446b3f008d77861281be70549d351d5cd173d7e1fddb12e3c5ed SHA512 af3c19d0f1d2ed513f0533e4861f109546a5da5c1b9dacb6b6f585dc568ca1d28a34530e04eb6acc3bb77a2b47ab84490793c78d834637771a59b8341bc7c2e2
 EBUILD cvise-1.7.0-r1.ebuild 1202 BLAKE2B e0b789b8fc805718c1fe3cb71ae4180bfc0b5af7049a8631ed64d5983a980c84310d17c534aa1f638c76fe2a1a3053a1739d7351c5fbd4f192f204c67857638d SHA512 d94a2453dbe52425d800587465d1f5eae79fbc9d33fab09bbf6479ec217ce9ef78c1afa78b40f7294b986137cd689ef72d4b1371f44735f61ecdafbcb185fd78
+EBUILD cvise-1.8.0.ebuild 1202 BLAKE2B e0b789b8fc805718c1fe3cb71ae4180bfc0b5af7049a8631ed64d5983a980c84310d17c534aa1f638c76fe2a1a3053a1739d7351c5fbd4f192f204c67857638d SHA512 d94a2453dbe52425d800587465d1f5eae79fbc9d33fab09bbf6479ec217ce9ef78c1afa78b40f7294b986137cd689ef72d4b1371f44735f61ecdafbcb185fd78
+EBUILD cvise-1.9.0.ebuild 1282 BLAKE2B 3784ed4ae498cd0df37b5134b8f068de2b51cc5067f8eb40b46f46af8668af1e2b3fa2d9350f5e89d9733e3b58c9712274807ee4bfc6d07ac8b3386aa6953e45 SHA512 2a6f63a13ba59f02534f53b7ebd0f42bde0bf078995e582b74e1399893038e130e14b1fdce7e8be9f2e267bdc9068985e7c5f7d2e934d956e6c30dfbd7621f41
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/dev-util/cvise/cvise-1.8.0.ebuild b/dev-util/cvise/cvise-1.8.0.ebuild
new file mode 100644
index 000000000000..16f63504e0d4
--- /dev/null
+++ b/dev-util/cvise/cvise-1.8.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+: ${CMAKE_MAKEFILE_GENERATOR=ninja}
+PYTHON_COMPAT=( python3_{6..9} )
+inherit cmake llvm python-single-r1
+
+DESCRIPTION="Super-parallel Python port of the C-Reduce"
+HOMEPAGE="https://github.com/marxin/cvise/"
+SRC_URI="
+	https://github.com/marxin/cvise/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="UoI-NCSA"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+LLVM_MAX_SLOT=12
+DEPEND="
+	|| (
+		sys-devel/clang:12
+		sys-devel/clang:11
+		sys-devel/clang:10
+	)
+	<=sys-devel/clang-$(( LLVM_MAX_SLOT + 1 )):="
+RDEPEND="${DEPEND}
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/pebble[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+	')
+	dev-util/unifdef
+	sys-devel/flex"
+BDEPEND="
+	${PYTHON_DEPS}
+	sys-devel/flex
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/pebble[${PYTHON_USEDEP}]
+			dev-python/pytest[${PYTHON_USEDEP}]
+		')
+	)"
+
+llvm_check_deps() {
+	has_version "sys-devel/clang:${LLVM_SLOT}"
+}
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	llvm_pkg_setup
+}
+
+src_test() {
+	cd "${BUILD_DIR}" || die
+	pytest -vv || die
+}
diff --git a/dev-util/cvise/cvise-1.9.0.ebuild b/dev-util/cvise/cvise-1.9.0.ebuild
new file mode 100644
index 000000000000..8bf58ae60526
--- /dev/null
+++ b/dev-util/cvise/cvise-1.9.0.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+: ${CMAKE_MAKEFILE_GENERATOR=ninja}
+PYTHON_COMPAT=( python3_{6..9} )
+inherit cmake llvm python-single-r1
+
+DESCRIPTION="Super-parallel Python port of the C-Reduce"
+HOMEPAGE="https://github.com/marxin/cvise/"
+SRC_URI="
+	https://github.com/marxin/cvise/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="UoI-NCSA"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+LLVM_MAX_SLOT=12
+DEPEND="
+	|| (
+		sys-devel/clang:12
+		sys-devel/clang:11
+		sys-devel/clang:10
+	)
+	<=sys-devel/clang-$(( LLVM_MAX_SLOT + 1 )):="
+RDEPEND="${DEPEND}
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/pebble[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+	')
+	dev-util/unifdef
+	sys-devel/flex"
+BDEPEND="
+	${PYTHON_DEPS}
+	sys-devel/flex
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/pebble[${PYTHON_USEDEP}]
+			dev-python/pytest[${PYTHON_USEDEP}]
+		')
+	)"
+
+llvm_check_deps() {
+	has_version "sys-devel/clang:${LLVM_SLOT}"
+}
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	llvm_pkg_setup
+}
+
+src_prepare() {
+	sed -i -e 's:-n auto::' setup.cfg || die
+	cmake_src_prepare
+}
+
+src_test() {
+	cd "${BUILD_DIR}" || die
+	pytest -vv || die
+}
diff --git a/dev-util/cwdiff/Manifest b/dev-util/cwdiff/Manifest
index 5e9e7d0c4d5c..80f849f00495 100644
--- a/dev-util/cwdiff/Manifest
+++ b/dev-util/cwdiff/Manifest
@@ -1,4 +1,4 @@
 DIST cwdiff-0.4.0.tar.gz 4468 BLAKE2B 3c2310c5f57d932d46df1e53a130f4df7f8c5206689df00412507949f7e613e13dbe72b006be1d9adc7c9d630fc91303c900f17914fefa66fd9fa9a9f11f4918 SHA512 b5deda44d94bd3aa93a68da136f4170996ee02c683c38329cbc16a108e0795e86c3543759e1d7adc3d512d4dcbc416436e733341e1b4f3d96325e999e84a4fbe
 EBUILD cwdiff-0.4.0.ebuild 823 BLAKE2B 5f508d00c906419e439b197dc15d2c04f1393397d49289b35cab57a5886a7e501c169e1741978b7fe6c936dafc7f678b8350d5693b868ce078f85696d3250ac0 SHA512 6028325f18dacb79f5f76b5ab448fdbf1c5417ec277d64c4a530c1f521342abcad99a9a4fde2160b5a3dcb2f1e70dd63e6ea6b7dbf64198a3a08a0fc9499c9b2
 EBUILD cwdiff-9999.ebuild 823 BLAKE2B 208bfbebcb8b642196ca2893cf33afc94e1f0b0b27294258d853a8bb880a403941e0ae461113cc920a3125c7eeac3ca1286f7a14f5675bf0dbb0a01c35bd43ce SHA512 f8699b6eea1d13d42d70c10954582773d0e50f86531767c11e34ce03f2cad9318d137c8d1294a4d27c81bfd9e20275f684b87354330420e8c32bc6c916be9560
-MISC metadata.xml 518 BLAKE2B 9455d9d70800cb227223da8642b5f23eda28a77d6bb8126e49d3bfb6fa761cabb2999c8dc5dd36a176aa98367d2d41ee935c5bb25f78522b5ee3235d329ca45b SHA512 08009caaf17aab80858770126cb2915890400c85f35121c5da2aee9bf9cd0640c3614a9b33c1afde6e270f212509d8604a7460a759027924420f1e508694d569
+MISC metadata.xml 436 BLAKE2B 148f2b63587f8fbed463d7477c160905e7c6a7424ac8efd7e653a13a3dea90235ce5af32da28e29e91e0ce6cb08e198dd22eee792eeee53a9c00f063814c0f6c SHA512 c55b7ab58723d522f9b35bcb02c9b3e5e292bb81787e3cecf72b90323761e1bfa832aa97dd25401fae8a6b74e71d7d12a0cc80763fb0d72cc865d21fc8bc6def
diff --git a/dev-util/cwdiff/metadata.xml b/dev-util/cwdiff/metadata.xml
index fb6f52b0def6..a5ddd5e7b250 100644
--- a/dev-util/cwdiff/metadata.xml
+++ b/dev-util/cwdiff/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Christoph Junghans</name>
 	</maintainer>
 	<use>
-		<flag name="a2ps">install <pkg>app-text/a2ps</pkg> for postscript output</flag>
 		<flag name="mercurial">install hg wdiff alias for <pkg>dev-vcs/mercurial</pkg></flag>
 	</use>
 	<upstream>
diff --git a/dev-util/debhelper/Manifest b/dev-util/debhelper/Manifest
index eb15c128390d..f01f32de1c4d 100644
--- a/dev-util/debhelper/Manifest
+++ b/dev-util/debhelper/Manifest
@@ -6,4 +6,4 @@ EBUILD debhelper-13.1.ebuild 1530 BLAKE2B 39d9f9b5772bc7806940fe0bf8f14e265ecbe9
 EBUILD debhelper-13.2.1.ebuild 1530 BLAKE2B 39d9f9b5772bc7806940fe0bf8f14e265ecbe9fa1a9a68e09394ad1ea6396a14b9562346f79a340c7ed3d21e54a9245720ddcd102449958554ac1e2d86f4e28a SHA512 b838f7546ecddbbecf8f07c11f0f7a92c69069297173c080a2fce21fcb06d525e0d54900698b005fc2f5f0b819ed5808f71d2ce1d4a16c66adbee7eb43cc6d7e
 EBUILD debhelper-13.2.ebuild 1530 BLAKE2B 39d9f9b5772bc7806940fe0bf8f14e265ecbe9fa1a9a68e09394ad1ea6396a14b9562346f79a340c7ed3d21e54a9245720ddcd102449958554ac1e2d86f4e28a SHA512 b838f7546ecddbbecf8f07c11f0f7a92c69069297173c080a2fce21fcb06d525e0d54900698b005fc2f5f0b819ed5808f71d2ce1d4a16c66adbee7eb43cc6d7e
 EBUILD debhelper-9.20160814.ebuild 1530 BLAKE2B 8a4529891546c0553fc545b41c0721ab899ff6f62ca5b71e8950c306bc5bdb6f9971fec6534c3b4aa03270154290e6e41b91916deb67a58f6a5fce24c57cca9e SHA512 b466001b990d497caccfdbbd88cd6e28e2e55e399923b33d1050bf667d7a050ccede8c4c2bf2df7460177d4a2094247e2ffcfd34c29d580f40ab432e89a96525
-MISC metadata.xml 260 BLAKE2B f88f6dac92c60982c9aa64365826d2bc8b5d1933190d4cdb44323f59c2a431add04feceb4e66470e9dd20ae0fab1ac1b5641c8bed429a2d6205b3c7acd6c7738 SHA512 b7f7421081083b48e0aa1d7cff7a776b18d670a32a2af64341332c39d0f531735f86857555e70327e257d51f6e0c97b3e293075bf59b9048ce0c0ec097c36735
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/debhelper/metadata.xml b/dev-util/debhelper/metadata.xml
index 6fcc384cc403..6f49eba8f496 100644
--- a/dev-util/debhelper/metadata.xml
+++ b/dev-util/debhelper/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>deb-tools@gentoo.org</email>
-	<name>Gentoo Debian Tools Project</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/dev-util/debootstrap/Manifest b/dev-util/debootstrap/Manifest
index c409005be6b0..8fb756d17ef0 100644
--- a/dev-util/debootstrap/Manifest
+++ b/dev-util/debootstrap/Manifest
@@ -1,4 +1,4 @@
 DIST debootstrap_1.0.123.tar.gz 78175 BLAKE2B e507ee76817eef20cfea4e37eaf893f8e64acaa791806ebd55bec97b8e60eb3c59b68bfe5e6023dc6e73706bde2468db46b84f0176ec46d086c3ea9423a206c7 SHA512 3b23f61528d4993750ba22b8765c10cfb9695793177017d9e4faf546da076be6660c5d6e0d1bf30bafe14f6d70f886190d3ec42a0057b895f40e860475eea794
 DIST devices.tar.gz 47835 BLAKE2B 03bfe097fda12a7a0aa19d3308c0d44382ad945defea05a63b17a72e4051ef94f0e60e75bde35baeace81da59d9f04126f6e463163609475b9c0fdf518f533ef SHA512 994ec8d72e3d52d2d872f7ff0da2336e4cbd3a5fa73bb6cdb9e06f5e7f5b8c69cea639c738fdba1186f382d6dcf62e7746fface664bfbd744aac24b16f034432
 EBUILD debootstrap-1.0.123.ebuild 1194 BLAKE2B 06c3a88040d43367bc9aafc397b229b66631c37271be119296e3f28ce6f6df74ce4b1107bda675984600ccd500dbdbcc67b1530c5ae053fa67dd4b50dd1945a8 SHA512 ab3d4519277c356d21072a269e1a687a61c841ce920f25f6a6d0605d88500f5764b0b7195f8adf5ac1e34ec382ba175edba25781faa6b1e8ec24a9fe77ea7088
-MISC metadata.xml 258 BLAKE2B c36fff5f8f795a075268afaf56f3ca4d8c75dc6997bd32bf2dade7b1903a27eb31a1f3c248b60fafcf77024a9300e8d0a6f8b5a6ace6aefbbec9374a295c430b SHA512 07739557f72a6f241bb1d2e4f61ca138e5dab6996ccaa4b4072057f0aa3ad2adfdfffe65683becd9d467729efc574bf158d846a8b3a7782cb180a13f0033b6b0
+MISC metadata.xml 251 BLAKE2B e9e9d48943645d8b737bc1f7ab0efb05db0f8eddad759c9bb40d07dc008fbfb8f5cca2020de71a9ff6945f5d66292ac02355773545010cd49c77fe6dd5ab7b40 SHA512 1b6a6955118c1a74cc89a77d6de9be8f4ff9c7137c186753462670a5b93457dfd034ad5d1f4d2507ac95cc149c2a042fa5324220b58702a56b09d91de40151c9
diff --git a/dev-util/debootstrap/metadata.xml b/dev-util/debootstrap/metadata.xml
index e2792cd33e75..efcd58fe0b9b 100644
--- a/dev-util/debootstrap/metadata.xml
+++ b/dev-util/debootstrap/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-<email>deb-tools@gentoo.org</email>
-<name>Gentoo Debian Tools Project</name>
-</maintainer>
+	<maintainer type="person">
+		<email>gyakovlev@gentoo.org</email>
+		<name>Georgy Yakovlev</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-util/debugedit/Manifest b/dev-util/debugedit/Manifest
index fd29c8827c5a..51c639b86f58 100644
--- a/dev-util/debugedit/Manifest
+++ b/dev-util/debugedit/Manifest
@@ -1,5 +1,3 @@
-DIST rpm-4.15.1.tar.bz2 4243893 BLAKE2B 352695e1fdac231127c9a2a775ff1aa05c1f3acbb10b0678e06011f9e4a5124e48cc19dce83417866e0f3c92bfd94e9c52b8c1884151ee77559bea1020d3623e SHA512 6c66835da5a54349bcfba5cc69831c8c57568aabd53c5c2820ec78c361be5116fecd41777b097e9c49458f984a7beb054fa8ed453ff7263cad4a29a11f780767
 DIST rpm-4.16.0.tar.bz2 4341683 BLAKE2B 5161e5dcc6d9a1f1d4b8e44740fb368050b808fd9e8b8276fb17b530a4642e1b9ad104b5a30c0071215aef7f823eeab10988dd41f73af1c52d575529c374b5eb SHA512 177119c3ac3d48980db55bb4ba0fdbb2a911968e5efc690bfa8cc343f850fc90531cc0dee6dd8e45d2b14f0d951ced35bd8893d24011b7f270745d281ddf4e3d
-EBUILD debugedit-4.15.1.ebuild 1765 BLAKE2B 463b1295cb2cf4d8fd4914546610844495065a62d164b099b3352761b2329cb016d9fa15a1cfab3d8f348a1d9c9392eb4debac627b58af9402cc01d99244eba1 SHA512 29e6a33ff92e86ba3c7eb52eb593c97af3ca52fdf9df999984cdbe7ea2c2a3039619738b0877af42ff1b77515fac2249d603827abbe7c9bba86368f959242a29
-EBUILD debugedit-4.16.0.ebuild 1770 BLAKE2B 9657d25e12679c563a0dd2f6220a58844c043f28ead997e6add996cff70e78964f6f3b88afbb65e7c1a683b4d7250919ebbc822001744adcc46b4e1324300823 SHA512 86a515866fa7f33aeb896b9ee67451bdb8d2850a34fcfca719307bacc002e99039fb24e3d6c6f088da1a6e59ca6c71ae764baca4c875e076315852be9100f1b8
+EBUILD debugedit-4.16.0.ebuild 1765 BLAKE2B 463b1295cb2cf4d8fd4914546610844495065a62d164b099b3352761b2329cb016d9fa15a1cfab3d8f348a1d9c9392eb4debac627b58af9402cc01d99244eba1 SHA512 29e6a33ff92e86ba3c7eb52eb593c97af3ca52fdf9df999984cdbe7ea2c2a3039619738b0877af42ff1b77515fac2249d603827abbe7c9bba86368f959242a29
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/dev-util/debugedit/debugedit-4.15.1.ebuild b/dev-util/debugedit/debugedit-4.15.1.ebuild
deleted file mode 100644
index ffc8eec35d4e..000000000000
--- a/dev-util/debugedit/debugedit-4.15.1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic
-
-MY_P=rpm-${PV}
-DESCRIPTION="Stand-alone debugedit from RPM"
-HOMEPAGE="https://rpm.org
-	https://github.com/rpm-software-management/rpm"
-SRC_URI="http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	sys-libs/zlib:=
-	>=dev-libs/popt-1.7
-	>=dev-libs/elfutils-0.176-r1
-	dev-libs/nss
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	eapply_user
-
-	# cheat it into believing we're bundling db
-	mkdir -p db/dist || die
-	touch db/dist/configure || die
-	chmod +x db/dist/configure || die
-	echo 'install:' > db3/Makefile || die
-
-	# TODO: why do we need to do this?
-	mkdir rpm || die
-	find -name '*.h' -exec cp {} rpm/ ';' || die
-}
-
-src_configure() {
-	append-cppflags -I"${EPREFIX}/usr/include/nss" -I"${EPREFIX}/usr/include/nspr"
-	local myconf=(
-		# force linking to static librpmio
-		--disable-shared
-
-		# disable linking compression libraries
-		ac_cv_header_bzlib_h=no
-		ac_cv_header_lzma_h=no
-		--disable-zstd
-
-		# fake some libraries we don't use
-		ac_cv_header_magic_h=yes
-		ac_cv_lib_magic_magic_open=yes
-
-		# use nss as crypto provider
-		--with-crypto=nss
-
-		# disable other stuff irrelevant to debugedit
-		--disable-bdb
-		--disable-nls
-		--disable-plugins
-		--disable-python
-		--without-acl
-		--without-archive
-		--without-cap
-		--without-external-db
-		--without-hackingdocs
-		--without-lua
-		--without-selinux
-	)
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	emake -C misc
-	emake -C rpmio
-	emake debugedit
-}
-
-src_test() {
-	:
-}
-
-src_install() {
-	dobin debugedit
-}
diff --git a/dev-util/debugedit/debugedit-4.16.0.ebuild b/dev-util/debugedit/debugedit-4.16.0.ebuild
index d2c338794406..ffc8eec35d4e 100644
--- a/dev-util/debugedit/debugedit-4.16.0.ebuild
+++ b/dev-util/debugedit/debugedit-4.16.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-util/devhelp/Manifest b/dev-util/devhelp/Manifest
index 2b06cce709fa..9b1713f661a4 100644
--- a/dev-util/devhelp/Manifest
+++ b/dev-util/devhelp/Manifest
@@ -1,7 +1,5 @@
 AUX 3.30.1-optional-gedit.patch 1259 BLAKE2B ccca312359fcf0105a3ae934e0b51582f597eb84b34ceb82967d5939c735537b261148202f6fb277ad102a1337794b2416dd158d7432a4d13159721c2bdf3abb SHA512 e7a0a659711063d0ac37814bed3c8e43cb1d7bddd313fa87b7cba2a1d2eaae45ad6fb430f247c190f0f4f15813135c572779f44dfad8bf223aead214f4e8566d
 AUX 3.30.1-optional-introspection.patch 1266 BLAKE2B 95bc2dece601e561c95d420e3bb564b318c7498ac67e30ae9f40909bd781445c4c8c2e1e1dbee2932c530d24f19357c49a7ba59caeffb767aec66b1feef6605e SHA512 959319c7e36f1dbe1dbfa858f53a91b6f6f1c4e469a7a3b237bd8ec96a7636fb719084f5bf9c0146b253eaf7f9512db4a077ec1e40065a827597131515d889e6
-DIST devhelp-3.34.0.tar.xz 288352 BLAKE2B 26c8c05c161e5607492fc26f012280468ed247ad4c166013e9df5fc1c76d59f98034a157cb58be9554ec65f46520b7d0d2ba78de00134570e84ca5a5ba0dc504 SHA512 34ed48ed323827b01f7d32e186da856c788ddfe37d6836082a81e6c8e4cd7bfc2265309cc3b298a0aea542b85e9261987d47a5a4396d865ec7e4cc13a9d05814
 DIST devhelp-3.36.2.tar.xz 302996 BLAKE2B 61131c7bedfe6803c04315138b017145e7ad7cc2939022a4cfcd0c65f4f3144db705a4a918a4ecd6a6fcea2a5dce64a891d951ccfc21dec0421991455b81ad16 SHA512 8852546b8ff337c2448a88b931803029825e34a6cf906370c683ac004866a548c9de79c934fde36ec04584f0bdc59eee4184b9ed8a480303eb78b9c9d43eb55e
-EBUILD devhelp-3.34.0.ebuild 1773 BLAKE2B 90531b17151b31a31c55fd24201520ee20dc3cb59a9784d7bd81dfc8168fc9187bee1a718d93ec3983071732df5e802cfdbbae9f83776009a3a27d84aaa8ee15 SHA512 5b5685d1acb9f1ec30ba6728d3d7b77787d7f56177b26dee74a52218c2f8f6b666f492b6e6e20147de1c91bbb9d7102429e14d71a18722efeaaecbfcb70eaf0d
 EBUILD devhelp-3.36.2.ebuild 1786 BLAKE2B df3ef1448328837b7a8b8584c2e2a75cb0271ff7e3f98df682b053078788ec2388bfe0471c5c98dc6f03e17500837c566db5d64e31890a53019f3680b6d572f0 SHA512 b80881b6c705bc8c298e895ed159aacd6948a5767ccbef69f49a2783888ab1cd8372d4dd7d51773864d549b79e61222061fb8c3c051fcbbca0b903eb43b4d13e
 MISC metadata.xml 337 BLAKE2B b031370d8a469a93790b021e5d5f1bbd368ad0c13b144e4fb593d0abbe04d2408f6a7083ae1a1580ef5fdeaf26c59bcbcfcc0d5731f2fd42bde769cf1fb1ece2 SHA512 76931a5e5bff4c6f32aa55e27ff6ef6e320f79c21f1e3c3b3af4733dc0c141a7b782dfa38227fca4d6d50b763dcc3fd191581862ada051951b3185c596ca6753
diff --git a/dev-util/devhelp/devhelp-3.34.0.ebuild b/dev-util/devhelp/devhelp-3.34.0.ebuild
deleted file mode 100644
index 01b5ad885657..000000000000
--- a/dev-util/devhelp/devhelp-3.34.0.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit gnome.org gnome2-utils meson python-single-r1 xdg
-
-DESCRIPTION="An API documentation browser for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Devhelp"
-
-LICENSE="GPL-3+"
-SLOT="0/3-6" # subslot = 3-(libdevhelp-3 soname version)
-KEYWORDS="amd64 ~arm ~ppc64 ~sparc x86"
-IUSE="gedit gtk-doc +introspection"
-REQUIRED_USE="gedit? ( ${PYTHON_REQUIRED_USE} )"
-
-DEPEND="
-	>=dev-libs/glib-2.56:2
-	>=x11-libs/gtk+-3.22:3[introspection?]
-	>=net-libs/webkit-gtk-2.20:4[introspection?]
-	>=gui-libs/amtk-5.0:5
-	gnome-base/gsettings-desktop-schemas
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-RDEPEND="${DEPEND}
-	gedit? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			app-editors/gedit[introspection,python,${PYTHON_SINGLE_USEDEP}]
-			dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-		')
-	)
-"
-# libxml2 required for glib-compile-resources
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-libs/libxml2:2
-	dev-util/glib-utils
-	dev-util/itstool
-	gtk-doc? (
-		>=dev-util/gtk-doc-1.25
-		app-text/docbook-xml-dtd:4.3 )
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/3.30.1-optional-introspection.patch
-	"${FILESDIR}"/3.30.1-optional-gedit.patch
-)
-
-pkg_setup() {
-	use gedit && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dflatpak_build=false
-		$(meson_use gedit gedit_plugin)
-		$(meson_use gtk-doc gtk_doc)
-		$(meson_use introspection)
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	use gedit && python_optimize "${ED}"/usr/$(get_libdir)/gedit/plugins
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/dev-util/dialog/Manifest b/dev-util/dialog/Manifest
index 10df045f1e5f..0b48f6e29d49 100644
--- a/dev-util/dialog/Manifest
+++ b/dev-util/dialog/Manifest
@@ -4,4 +4,4 @@ DIST dialog-1.3-20200327.tar.gz 547962 BLAKE2B b335d8b57d9a9f3a7e303aa3b2c647360
 EBUILD dialog-1.3.20170131.ebuild 1222 BLAKE2B 90d747aafd4d02ff63aafe1db9baffab452b5ff5de89268a9c424c52c066df7eca6cca608d07db498fa8c1a5c8c0b0772936a51f53049a8e50aee65584da37e9 SHA512 ecf076dc1c237d77da2a012dc9ccaf54292e4921337840edac4fe6357ed3f77a048e43a1358a4a7651f7e13c25db0c38ae71ab0bc5ada90be01868dbdb2e1b67
 EBUILD dialog-1.3.20200228.ebuild 1187 BLAKE2B 70ccc9a8ede219b1697e80a1536f004d3ab39f1bbed7044304a80968817dad2517d476d3ef0749710d7478a01322c4639ea15cef8fb9bb086d5b890a393bca89 SHA512 72a7c529a10ad2806177ee0a01476d4cc34240f4d2acc6ef2a61760315742387b507969df6edd021390ef4d196b62bb1a4886199b843ab6ada1e7d2a0d96cdf5
 EBUILD dialog-1.3.20200327.ebuild 1187 BLAKE2B 70ccc9a8ede219b1697e80a1536f004d3ab39f1bbed7044304a80968817dad2517d476d3ef0749710d7478a01322c4639ea15cef8fb9bb086d5b890a393bca89 SHA512 72a7c529a10ad2806177ee0a01476d4cc34240f4d2acc6ef2a61760315742387b507969df6edd021390ef4d196b62bb1a4886199b843ab6ada1e7d2a0d96cdf5
-MISC metadata.xml 341 BLAKE2B 84cb58bb0ffe236825ae28f7f277c172eb8e8ec279aec915cdac1078342272a180aceb72400817be94b01568c24c4588d6423baa2be02c70a9971840a7e62650 SHA512 b194bfc5daa545724eaa7ec7dcc5618ec87249158d5e8fcb01a76375960b2d9dd012e596c0fc8e0d9c94eb39175a6b4424257cf0828cc73956c7a68ff4749da8
+MISC metadata.xml 351 BLAKE2B 7f75a5909f8c405476b601ef0074a04daf1d837279462addc59c9f6b2b1449e46fd1d09d6a43ab12a6b89a2bc34a08c0d39cd10b9ed33914ac0c3af918ff6614 SHA512 b4a6309807d74355be8a695b9882da53be8c90bca68c6bab292280341ada808b5c9ebbdc50ec7bb97f25e9467edab2a4dd83cee02e0e74a88ce342f760e91d6e
diff --git a/dev-util/dialog/metadata.xml b/dev-util/dialog/metadata.xml
index 7c5b4a32485b..0c448e73a433 100644
--- a/dev-util/dialog/metadata.xml
+++ b/dev-util/dialog/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
-<email>livecd@gentoo.org</email>
-<name>Gentoo LiveCD Project</name>
+<email>base-system@gentoo.org</email>
+<name>Gentoo Base System Project</name>
 </maintainer>
 <use>
 <flag name="minimal">Disable library, install command-line program only</flag>
diff --git a/dev-util/diffball/Manifest b/dev-util/diffball/Manifest
index f91699ea95f3..747edd6b9764 100644
--- a/dev-util/diffball/Manifest
+++ b/dev-util/diffball/Manifest
@@ -1,5 +1,5 @@
 DIST diffball-1.0.1-bug_543310_stack_buffer_overflows.patch 2945 BLAKE2B 17aa01d64464edccc490e7714dc9db8767d19b0c8b6d14223359d266d38e47aae822454aa14446c038b2b3477a4d8a8db228be7e28666528883ebf02ac2cb65b SHA512 be9a44cd9abfb41f32683d0363375902477f739f9c0dd23b30cfcd9fc6fced61111a2b101cb46db2d6320b4d70ed04627a1c178d44f23530f248bcb87e6efd32
 DIST diffball-1.0.1-bug_708736_cseek_xz_reset_avail_in_out.patch 1041 BLAKE2B de4ac71445f30546eeaaa28201640f3295bc288d83b75b8f84d3134f070249248c777edfe9b0dc705ff7990e6d4dce37d53aa1a9e153bc9a71cff6192b09f8f3 SHA512 eaa9f55b1de0d82a7c21280c4d7e6effcb90944c65f42e0230ef18044f6651512befd425128619c4ca3641111be3cef1418f1800e1854cced24433e1deffe5e7
 DIST diffball-1.0.1.tar.gz 86387 BLAKE2B 1e2c6d522b00a643666e88d19d2d6986ce02c7835378dfc9799e43fa291683bf08e129546a85c332b04ab549788ae4ac3b4d57fd6140a29a9556bece4293cbf9 SHA512 3344f03a65e2b44615eaf9210d26a4438712684c438fcea9caabe89688fe3b3d5436703f0ed63412a18a63acb49ca0dacff190fa002ea76b346bbccba3388ee4
-EBUILD diffball-1.0.1-r2.ebuild 1197 BLAKE2B 9169b0789296b6b1c3aadcabb17b5dca02245fe35efa19ca3744c870624c4f12a8644e43820b060ca6797ded6df8fb298f605c55df83d64cc7881832302bf903 SHA512 33c2758bb3538ea061e91e7438661a5757f6a2ca0bdfdd76b42ab39c6c74c5c428f1de7e9375b32415c8c6a259116ca017a1eb5a974034ed5b43e9f53534556f
+EBUILD diffball-1.0.1-r2.ebuild 1309 BLAKE2B 9a58ebb7721fc03400f5f7138197dd40f9ec4d57813715f8e52a81c1711cb756746f2855ace605e01a2ee2cb3105611ec79f779b77d57653ef77f36db5fc8805 SHA512 6b9923eaf40fb34960d9b63f287fae7a72102340b6523c0868a12cfea1790fc3de1787e051344976e8a88e4c4a2d31241b6b19602d0a9f9c304fd528bde6e806
 MISC metadata.xml 325 BLAKE2B d2fe2133512a06976ca331af0d318fbe888fac115af9e2635a3f682eb1ffcc0c9088e87437c39803cfa5183aaa2a5df091113efa6f7259e91960340ce095717d SHA512 8c9cb7fc1861a080e525eed799e80650b9c8ec4b0416959c9b754099cec1c26651beb5364992b8a3c80ed3285bff74f0a0b72a4032e3b243cab0191d8fd8856a
diff --git a/dev-util/diffball/diffball-1.0.1-r2.ebuild b/dev-util/diffball/diffball-1.0.1-r2.ebuild
index 315c3c7a4696..789ab5f84495 100644
--- a/dev-util/diffball/diffball-1.0.1-r2.ebuild
+++ b/dev-util/diffball/diffball-1.0.1-r2.ebuild
@@ -16,18 +16,19 @@ SLOT="0"
 KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="debug"
 
-RDEPEND=">=sys-libs/zlib-1.1.4
+RDEPEND="
+	>=sys-libs/zlib-1.1.4
 	>=app-arch/bzip2-1.0.2
 	app-arch/xz-utils"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 # Invalid RESTRICT for source package. Investigate.
 RESTRICT="strip"
 
 PATCHES=(
-	"${DISTDIR}/${P}-bug_543310_stack_buffer_overflows.patch"
-	"${DISTDIR}/${P}-bug_708736_cseek_xz_reset_avail_in_out.patch"
+	"${DISTDIR}"/${P}-bug_543310_stack_buffer_overflows.patch
+	"${DISTDIR}"/${P}-bug_708736_cseek_xz_reset_avail_in_out.patch
 )
 
 src_prepare() {
@@ -38,5 +39,14 @@ src_prepare() {
 }
 
 src_configure() {
-	econf --disable-static $(use_enable debug asserts)
+	econf \
+		--disable-static \
+		$(use_enable debug asserts)
+}
+
+src_install() {
+	default
+
+	# no static archives
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-util/difffilter/Manifest b/dev-util/difffilter/Manifest
index 263ca3575135..5971e336c873 100644
--- a/dev-util/difffilter/Manifest
+++ b/dev-util/difffilter/Manifest
@@ -1,4 +1,4 @@
 AUX difffilter-0.3.3.man1 7592 BLAKE2B 9df9c1d7c59f129d714820c3b102adec0dfef3d17c944aaf19bede55d1746a4112d75da118bd3b1b4e5c2b639e482dc0e76c39efe14c9a7df997d7160d77f457 SHA512 6fb0ee29cc6700a9cde54c46b526d8d944a5cacefb57b0f6f579055033b007250f476a3cb86fbe3ba0b500418cf6601dd4978d03dc898ffbf897e070e91dc0c9
 DIST difffilter-0.3.3.tar.bz2 291226 BLAKE2B 95a43e025668318c1d8e216ae4259e874983f899da8bff402b2fa60c7d8d1f7cb203854b76dfe12b2577f6e2ce8f86cedb93fe50b596c1782a436346069b5eb0 SHA512 ac9aa95dd7e41b6c49c1416be9d1929a41b629587ecb90f3dcadd3982a46d8eb49d181f8f1b1645322113becd9a4b708d0df1e27f6fb9064ffb06b37e5f101f8
 EBUILD difffilter-0.3.3-r1.ebuild 546 BLAKE2B 77ac90aacd7ff195972105a493e579bbc1d9879d1baa157877543593d3249351565180afda3344ad7b43c975aa0f8323d8e9a3a3aec4a6afa024f5b29aee3b63 SHA512 f0604b58c54a538ceb3d7b6da737cb1f7411c260f374f0bdc1b7315eecbcb41b6d3b8118b47555ea155a6111cae4373767045d97e69f69d2c44d323f9de774a4
-MISC metadata.xml 210 BLAKE2B 5fe5983d28e12b1e05d7cdaea69fdd87becfb2dd9a9b0353caab5f617a2f806227181e7100f623c8c814be524625c2739db8a93226b35b3cd9ec6d72db9895e6 SHA512 267d83ef7ae9579f44c22fe568d6d2064e426acdd07c00a69c735801e588ae0fb1988ae60199e349d444ddb5393a6a0a6836df89b2205fc85e25144ecbf56148
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/difffilter/metadata.xml b/dev-util/difffilter/metadata.xml
index fed47a353275..6f49eba8f496 100644
--- a/dev-util/difffilter/metadata.xml
+++ b/dev-util/difffilter/metadata.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type='person'>
-<email>jer@gentoo.org</email>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest
index 9514a0791619..6bab87904b11 100644
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@@ -1,3 +1,3 @@
-DIST diffoscope-155.tar.gz 1571389 BLAKE2B 320f352d6d0dcdf231ac246188f698eacbf08bc3b3194e28c09e5e38a143e0718408309483087d81a57a9f5810aadd545caa8cb32390441f1f5b79f7639a768d SHA512 785e08aa9b2420d0e1fed63804c199b198344d991f04ebb402e18de45f8154ea7bf68a2e4b1551744600f5e99f750e798b89c5cc2fad09d56a8b018b0559c2ee
-EBUILD diffoscope-155.ebuild 2161 BLAKE2B fb5e4e91fc32b56175d45b589cd3c11bdb42b5b1c33910843d489ea311d4eade3860c777a94398908fe2c94a0bf8a15b91df62b4f7ce7dfb43b76ad452bc8184 SHA512 4713e398d39141876170b6864e497321743b868eaf62f181dcb8341f95a012f72c46db35c51ff08ff375b1439efc2b411f61e36b50950aecac333af0d0df377c
+DIST diffoscope-161.tar.gz 1564306 BLAKE2B 2e07cd91061f9556e9838a96424c8066216384644eca578f305d9b947fa5dd689ad90d5b46f1c709fc2b639ca7f317ae0812252be23571cc857b66e97ea98627 SHA512 8da2134514c7570bb8e60ebbd5cbe6a7f5c0a5b29cac7b41588d9bc823b1a07b8fe8d5006364b75e34f5dbdc75352cf4322a8f9c3370257b60a962b12391c307
+EBUILD diffoscope-161.ebuild 2161 BLAKE2B fb5e4e91fc32b56175d45b589cd3c11bdb42b5b1c33910843d489ea311d4eade3860c777a94398908fe2c94a0bf8a15b91df62b4f7ce7dfb43b76ad452bc8184 SHA512 4713e398d39141876170b6864e497321743b868eaf62f181dcb8341f95a012f72c46db35c51ff08ff375b1439efc2b411f61e36b50950aecac333af0d0df377c
 MISC metadata.xml 2137 BLAKE2B 6ff55f85ebf3f769c10c3e17a69900918abe142e491b7b8460bed8fe6a036763a743324bf1a10e7a3772761b38c9632ff1352e9c6677ef691f81acc29dc321e9 SHA512 e782e12dc91d86612768a2e0c498f54a9728691a76008ee1e6cdbc4d8719c2593344f6c37786982abb0de7b85d743d7614652a2e8c9cd9fef053c3a32e1e484c
diff --git a/dev-util/diffoscope/diffoscope-155.ebuild b/dev-util/diffoscope/diffoscope-161.ebuild
index 572dad5645e4..572dad5645e4 100644
--- a/dev-util/diffoscope/diffoscope-155.ebuild
+++ b/dev-util/diffoscope/diffoscope-161.ebuild
diff --git a/dev-util/docker-ls/Manifest b/dev-util/docker-ls/Manifest
index f9ab1b2a4796..a0bb546f47e0 100644
--- a/dev-util/docker-ls/Manifest
+++ b/dev-util/docker-ls/Manifest
@@ -1,3 +1,3 @@
 DIST docker-ls-0.3.1.tar.gz 7308660 BLAKE2B eaedd07cef81da01c2d0c629867f5c3841900f839cecc9049c81b11bbbcb864ff4e8048068688832660961221b499710db45cbe417f326ec019f473dff0d6a4a SHA512 8ae831222e03b7dcb90121c2e6dea7bdc442418aa6dcc3905db82f6fd1ceb78a048d6fc2a2ef9bf0dea21a6e9d601ad77e25c077de7632057994f614d484fb99
-EBUILD docker-ls-0.3.1.ebuild 1347 BLAKE2B 0f3795a9d68db30770000123e0bcfd24f695eea8642ee69ceed114636f1eb41befeab3916f41f7672f5f5eeb5f20b11b41240e7172c7faa87cbbe5290c899d39 SHA512 dc20c433d8696b0b111630d0bce4a976f841b116d06d89fef96e543ec5faf86ad5af3ee523f4592071c28ca8ada0efe540445501cfc5f5279aa7e6bb15907fea
+EBUILD docker-ls-0.3.1.ebuild 1351 BLAKE2B e89b9f857ddefade7c200913d879e807f32e32e9da2ddcc7dc19d1f081d2fb78dc66ed093140ea748e24650164a0671a99b87f92db717bc6beab4231ccbd1d16 SHA512 22bf7455ba8a43f84fbf2af83a2e9434723399751b8dd768f710690ecf30fcadb298d7c453560ead2188634474e9d6c86d56d3c16a7cbab4770f5d5230a7efb6
 MISC metadata.xml 245 BLAKE2B 6032e31aa98a3b51173eed0e5f5e110951fc7782dc921bd64369326613cdf94fbde87ec10c29f309fb4528790698ef105223ccfb5674e7cff05e5e72c10e1d63 SHA512 1808e8e5e1cc6bbb7f336471e940eb2b42489781d60cb302db6182b0ce7aa6a01148332f2d0ce32c32a57060e369c3a99330d7a02f292646acfd9dc40954709e
diff --git a/dev-util/docker-ls/docker-ls-0.3.1.ebuild b/dev-util/docker-ls/docker-ls-0.3.1.ebuild
index 554c4d8b4715..fdbda2478b64 100644
--- a/dev-util/docker-ls/docker-ls-0.3.1.ebuild
+++ b/dev-util/docker-ls/docker-ls-0.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ EGIT_COMMIT="d80310976c9707e261e57ebfa9acf4e0b1781460"
 inherit golang-build golang-vcs-snapshot bash-completion-r1
 
 ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
 
 DESCRIPTION="Tools for browsing and manipulating docker registries"
 HOMEPAGE="https://github.com/mayflower/docker-ls"
diff --git a/dev-util/doxy-coverage/Manifest b/dev-util/doxy-coverage/Manifest
deleted file mode 100644
index d2b0fd6de1de..000000000000
--- a/dev-util/doxy-coverage/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST doxy-coverage-151229.tar.gz 3633 BLAKE2B 02e99a841294ec9acdef1a85948d39bd1c8c5a39cc66e1ed48734ba3fd57a5bb027b4b44675d1bafc0cb42777ddd94f17cf99b8c8cc86c61f23c331653e43b53 SHA512 897c36adb6551ad177429d771b6eb7871a8b024d3cb5915d412b13f92cf8e52b87ba3237093345d51fa5dfbf80a800ab69907518b1a5570d1f056a2de43353fe
-EBUILD doxy-coverage-151229.ebuild 639 BLAKE2B b23e7faf5457d00accd5cf86f97601aef1347371291aa9db9be81166dac7e50a311bee946e222caabf430bd4a18f790f34ded7085a75812d023fb7e679ed5b3a SHA512 31dfa6b729ab9a69a6ef53a354c63388fd57dd66275112dda4f5fbab29d7191821d2fd80b5261f3c3ad667709f0848562d028f5c42e8d25521e587bf2eab2156
-MISC metadata.xml 405 BLAKE2B 90494442a57563acf15505d646a7311b568980bfeb0f02a09d079e0be2f83d2e0d04331a3f18c38db6e06f3f89ce8256f586af9497431a3e57e7c2c2e517e8ee SHA512 770c698b430f7c7bd93f0dcdbcdb21128da96680825c72e00e7607e8b68e4d159e63bb3f752e168b94041e1e1257bbacaeef11ce0161ad7c1803b211e1ed1580
diff --git a/dev-util/doxy-coverage/doxy-coverage-151229.ebuild b/dev-util/doxy-coverage/doxy-coverage-151229.ebuild
deleted file mode 100644
index 06ba7c658193..000000000000
--- a/dev-util/doxy-coverage/doxy-coverage-151229.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-r1 vcs-snapshot
-
-COMMIT="29a0bbf43bfecb6872cdca0e4a11733954d25196"
-DESCRIPTION="Source Code Documentation Coverage Measurement"
-HOMEPAGE="https://github.com/alobbs/doxy-coverage"
-SRC_URI="https://github.com/alobbs/doxy-coverage/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND=""
-RDEPEND="${PYTHON_DEPS}"
-
-src_install() {
-	default
-	python_foreach_impl python_newexe "${PN}"{.py,}
-}
diff --git a/dev-util/dwarves/Manifest b/dev-util/dwarves/Manifest
index e39e66e9b478..4c3bdfeb719e 100644
--- a/dev-util/dwarves/Manifest
+++ b/dev-util/dwarves/Manifest
@@ -1,4 +1,9 @@
 AUX dwarves-1.10-python-import.patch 399 BLAKE2B 7abd98ec5711ec4ce9230a2d0bb06328174a4a67b62ba14b2413b83b6d44676d372930d4796b9ece230c4de9185d35cb31a086ca340871e50e29d584ab9a7487 SHA512 c2f5c1e99ef2ffeaf0e7962cbdf28817f6896b27ff6894571823c81ba08b9e9440af1a5b6ad82770b8e8d6ec99ec2ef8f46a98b67fea7cd4ed7e8c22e716e314
 DIST dwarves-1.17.tar.xz 309028 BLAKE2B 600d095359fa1ef208cc83655761505a07512faf9957144cc5fdd9e69bef98be3afc8b29a4c13aa0246aa43fdc9b4906de95f37c86fc6790ece52a79e3b13695 SHA512 8916ea24316efe1eb322d045fb2d81c230905f2fe33942eac641e9e0311f33a3bcf55be454eac32781799c255303bafacd8f1bd1b3ec08f0dae4d5f38d8186ba
-EBUILD dwarves-1.17.ebuild 936 BLAKE2B 52c32717be8cd449941f32e9745bb6a7876f40e37738a3cf56de8673d98e3c81e51fb1c865157a74208633fc88a72becfc25d3787b669e087d72418200c2420e SHA512 fdca096be1fc9d4ca6ef133b38119f1ffdec68a578c7cd854eb4dae588e5d009e8faa0e5aa9d1f7295bd7144589d5411fc321faf3f3006b41001e573934b77f8
+DIST dwarves-1.18.tar.xz 324912 BLAKE2B bdce2903608a1229e2fc7e8a01bc41249a17a1a003fc3616910959fc43b430569cd737a220edfab2473485cd2dc0519b4add0e0e3a690e51ad35c4fa082752a5 SHA512 01647607ce0f4dfceb464367f2dd8a432f33eb5d0e003b6bbb07b38bd992a2992844309b04aee2a0388658c41d8b2059d03064c6e450fe7c347c5bca445d7938
+DIST dwarves-1.19.tar.xz 686136 BLAKE2B f7fe50be30fa9b247bf0f35d5dec6aa8f1bed44eaaf8a2cde8da6f65a870212c2d257740a6d4f94da24f365ad49259d53c4f5447921b22754c63184001029620 SHA512 b378a504da5b00c6280b9efda7348c2d61015ce6477f3e4e4466f58d9bf6837457cd0aa9263b7d921093cca5ee26c4fab9950f7f75ca05d27ae646b3bfe22f9a
+EBUILD dwarves-1.17-r1.ebuild 920 BLAKE2B 91acee3b36ffd28dbfaaded896eaaa359a449d35e7da153d522631f07c9b82b3a7b8ff62ed77c0da99e0acb59f291273ddf6c3b2f1b6bb8f871d59bc85437d94 SHA512 8b2170782552b168c7e0b6a2bdb4d406e9f4556a182141aadc3f0b090e889efb7791b12d595d13a4115c8c04d4ebff7cf306a68b0d83f4ff7b418a77503d4ce7
+EBUILD dwarves-1.17.ebuild 935 BLAKE2B fb1d1b416c9cc5796f128f8ba3e5f70b317e4897846df208937ce85d20ec571c973323a47d5e9f65bbf303fb9bd59ee47e37a14e468e11c2da282d596d9779ed SHA512 bd4893cfe8408cdfbd2c0201f6a085c745ab8a339158ffc4dbe1504d7747994ad89abf0dbd97bd384976481abc9c361309c953e67a586498864b6f490aed0582
+EBUILD dwarves-1.18.ebuild 920 BLAKE2B 91acee3b36ffd28dbfaaded896eaaa359a449d35e7da153d522631f07c9b82b3a7b8ff62ed77c0da99e0acb59f291273ddf6c3b2f1b6bb8f871d59bc85437d94 SHA512 8b2170782552b168c7e0b6a2bdb4d406e9f4556a182141aadc3f0b090e889efb7791b12d595d13a4115c8c04d4ebff7cf306a68b0d83f4ff7b418a77503d4ce7
+EBUILD dwarves-1.19.ebuild 920 BLAKE2B 91acee3b36ffd28dbfaaded896eaaa359a449d35e7da153d522631f07c9b82b3a7b8ff62ed77c0da99e0acb59f291273ddf6c3b2f1b6bb8f871d59bc85437d94 SHA512 8b2170782552b168c7e0b6a2bdb4d406e9f4556a182141aadc3f0b090e889efb7791b12d595d13a4115c8c04d4ebff7cf306a68b0d83f4ff7b418a77503d4ce7
 MISC metadata.xml 671 BLAKE2B 78a2fa86c0acc136403b1477db4e2deb3bde1ceed636ced96705cdaccb7e42f76e8fbd202c3fa258c1f33b14827f95b5ce343f8f4df981be66e0ad3a8dd226b8 SHA512 0cdd2c3e4e76a9017120a409aec1f70327363ee146e5fb74684d0e08e2836f0079cb97be1c4874445b271b98c13daf04f75ee481ef21607aac8976a78437af11
diff --git a/dev-util/dwarves/dwarves-1.17-r1.ebuild b/dev-util/dwarves/dwarves-1.17-r1.ebuild
new file mode 100644
index 000000000000..063b96dc5e59
--- /dev/null
+++ b/dev-util/dwarves/dwarves-1.17-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+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 ~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_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.17.ebuild b/dev-util/dwarves/dwarves-1.17.ebuild
index f1c8095ab8b1..509c01159892 100644
--- a/dev-util/dwarves/dwarves-1.17.ebuild
+++ b/dev-util/dwarves/dwarves-1.17.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://git.kernel.org/cgit/devel/pahole/pahole.git/"
 
 LICENSE="GPL-2" # only
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="amd64 ppc64 x86"
 IUSE="debug"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-util/dwarves/dwarves-1.18.ebuild b/dev-util/dwarves/dwarves-1.18.ebuild
new file mode 100644
index 000000000000..063b96dc5e59
--- /dev/null
+++ b/dev-util/dwarves/dwarves-1.18.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+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 ~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_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.19.ebuild b/dev-util/dwarves/dwarves-1.19.ebuild
new file mode 100644
index 000000000000..063b96dc5e59
--- /dev/null
+++ b/dev-util/dwarves/dwarves-1.19.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+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 ~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_configure() {
+	local mycmakeargs=( "-D__LIB=$(get_libdir)" )
+	cmake_src_configure
+}
+
+src_test() { :; }
+
+src_install() {
+	cmake_src_install
+}
diff --git a/dev-util/edb-debugger/Manifest b/dev-util/edb-debugger/Manifest
index cdb90d65b4cc..f12b2c88ff0b 100644
--- a/dev-util/edb-debugger/Manifest
+++ b/dev-util/edb-debugger/Manifest
@@ -1,5 +1,6 @@
+AUX edb-debugger-1.2.0-gcc-11.patch 1849 BLAKE2B 5d9fa2dbd7738752bf95453442f0c1726fa395c2126bc0e4c8a2b7d9970e73c88334627938baf07d229937aac4de8ed13bf764e57d636df607262982fe1ae7a2 SHA512 e3eefa58075bb509b0d4721cd3484e4dd5ef38c180b5cc93c1ebef77a7c6f39eb0260566afbf288f65d8edc9c778e3c4fe872cfa961c9c33e8b268324aeb1736
 AUX edb-debugger-1.2.0-qt-5.15.patch 635 BLAKE2B b5f575f009bd81e5a9e7feb580e706b06e67f11dc0aba8a7c7473f2d1dd944bf6d56079e405403c8b64ee52c5e9e45d019c0219b2a90689cfab1fad41c3c70a3 SHA512 dc1a56a5b4e2d86bf4dd96bebd3e4272fe3c933fe462810028905e32be1056b7720c78443a5b7f82b266f204b10dd0fd8e3c77b68859dc1666cf73ec5047c6d6
 DIST edb-debugger-1.2.0.tgz 608773 BLAKE2B d67136b3bfb153f0e5ba0aef514756f39d63692636adcad3569e79237613004f2a4c425b4bed875408473a7caa6280b3bfc590e8eeb4beb5bafaa2326da892bc SHA512 c04b8d3972497ac170c740f2625301ee7d3ea52b81b29084628aa0091d7cd7df12a34ae707be629cde6e0dea54254bfde25e290aba1d6bad2635eff704282ea9
-EBUILD edb-debugger-1.2.0.ebuild 1177 BLAKE2B a6e07e0b1974427a26d25d628a3760ed9ec842f85aa302f43ed8eac4bac9245f0b47424e5a31f5ca150e5f940d1fd3e5826eace94cf21abc67352df5fbbe003a SHA512 90a923b2b7c9d5e3ae9daa30102993396f30400a7b9fa422d031991a29b0288c2752af5d73272b609fa8a6a0fd62c64ef98fea2937208412d68697f51a0d5761
+EBUILD edb-debugger-1.2.0.ebuild 1220 BLAKE2B 6a0bcf405c881062268b85b047b13fc71d3b2d0f134b97dbd0544ffa54761f84d20414276295048c3cbe2618e13e41cfb0007d18c6497691bdd4f1963d873dfb SHA512 bfba99aa6125d3ce9b968ad03550c7502d6d5c6f95354a858e4aa1cfe5a35cb7eba873a317caefa5d84f7a6f00c6d2e5ea8c3e7427be70b6930f2a162b89f267
 EBUILD edb-debugger-9999.ebuild 932 BLAKE2B 060e1be8043c1fd6f12684b197f60cd88de8f8d35c1227246de4bba18546b23f16ddcd60cdf92a54a48cda5ab1640e9e199a1429edf52bdf935ebf18f120df19 SHA512 1c09eaaecff1866de7307512ced499f0eb10f1f3defc8663111d9cfa64f6a7ef3b846365f8e9e18e14d19fde18909e1a5bbbdc60a674f1918f0476316399d929
 MISC metadata.xml 358 BLAKE2B eae911d14bc54d81aaf32eee088708b75027fe67c1dd9458ffeb1af3ecc429bbfa51805aab9a3ecbf8bfbc8e221b6411423852fc2fc61381ca381a61869521be SHA512 da7c4e88f58521bf9521b060b328498aa8e30be151671f5d81bbc15695e23b9a0bd75f7a98cee91866ccc4347d0fc18dd76259a8ac244bf5d0e9826b6cb8ca1e
diff --git a/dev-util/edb-debugger/edb-debugger-1.2.0.ebuild b/dev-util/edb-debugger/edb-debugger-1.2.0.ebuild
index 9fd3eb915ec0..4d27f38f9869 100644
--- a/dev-util/edb-debugger/edb-debugger-1.2.0.ebuild
+++ b/dev-util/edb-debugger/edb-debugger-1.2.0.ebuild
@@ -34,7 +34,10 @@ DEPEND="
 	${RDEPEND}
 "
 
-PATCHES=("${FILESDIR}"/${PN}-1.2.0-qt-5.15.patch)
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.2.0-qt-5.15.patch
+	"${FILESDIR}"/${PN}-1.2.0-gcc-11.patch
+)
 
 S=${WORKDIR}/${PN}
 
diff --git a/dev-util/edb-debugger/files/edb-debugger-1.2.0-gcc-11.patch b/dev-util/edb-debugger/files/edb-debugger-1.2.0-gcc-11.patch
new file mode 100644
index 000000000000..68d58b2b90eb
--- /dev/null
+++ b/dev-util/edb-debugger/files/edb-debugger-1.2.0-gcc-11.patch
@@ -0,0 +1,48 @@
+https://github.com/eteran/edb-debugger/pull/776
+
+From a46587a77c33256d56077a2d0709291b3ab12505 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyfox@gentoo.org>
+Date: Fri, 11 Sep 2020 07:57:39 +0100
+Subject: [PATCH] x86-generic/PlatformThread.cpp: avoid non-constant offsetof
+
+On gcc-11 edb-debugger build fails as:
+
+```
+.../x86-generic/PlatformThread.cpp:332:79: error: 'n' is not a constant expression
+  332 |         return ptrace(PTRACE_POKEUSER, tid_, offsetof(struct user, u_debugreg[n]), value);
+      |                                                                               ^
+```
+
+The change workarounds by avoiding non-constant expression:
+https://gcc.gnu.org/PR95942
+
+Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
+---
+ .../unix/linux/arch/x86-generic/PlatformThread.cpp          | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+--- a/plugins/DebuggerCore/unix/linux/arch/x86-generic/PlatformThread.cpp
++++ b/plugins/DebuggerCore/unix/linux/arch/x86-generic/PlatformThread.cpp
+@@ -318,7 +318,8 @@ edb::address_t PlatformThread::instructionPointer() const {
+  * @return
+  */
+ unsigned long PlatformThread::getDebugRegister(std::size_t n) {
+-	return ptrace(PTRACE_PEEKUSER, tid_, offsetof(struct user, u_debugreg[n]), 0);
++	size_t drOffset = offsetof(struct user, u_debugreg[0]) + n * sizeof(user::u_debugreg[0]);
++	return ptrace(PTRACE_PEEKUSER, tid_, drOffset, 0);
+ }
+ 
+ /**
+@@ -328,7 +329,8 @@ unsigned long PlatformThread::getDebugRegister(std::size_t n) {
+  * @return
+  */
+ long PlatformThread::setDebugRegister(std::size_t n, unsigned long value) {
+-	return ptrace(PTRACE_POKEUSER, tid_, offsetof(struct user, u_debugreg[n]), value);
++	size_t drOffset = offsetof(struct user, u_debugreg[0]) + n * sizeof(user::u_debugreg[0]);
++	return ptrace(PTRACE_POKEUSER, tid_, drOffset, value);
+ }
+ 
+ /**
+-- 
+2.28.0
+
diff --git a/dev-util/flatpak-builder/Manifest b/dev-util/flatpak-builder/Manifest
new file mode 100644
index 000000000000..fffe44bd91b1
--- /dev/null
+++ b/dev-util/flatpak-builder/Manifest
@@ -0,0 +1,3 @@
+DIST flatpak-builder-1.0.11.tar.xz 459500 BLAKE2B aa5edebaa6a52a7dbf5cd68bfc356617e13556036979575369ee65e919b267f0ec6838524668793c394b9024f97309d71ceb094c26e3893dedc8884ea8d18d1f SHA512 27c15ecccee79c6a7545f11d7c8cd7b80d4e99dc9c48818dd722934dfbe61e02b258b3db59946badfe5e1e189b39b509a2dbff1404a31a42c29ed4993fb5ec26
+EBUILD flatpak-builder-1.0.11.ebuild 848 BLAKE2B cc0a9f7a81a13c5e0c5f5f07df5b13571edfae7026c3025d2f2ff285c91c6ca7e54eb960452820887231e33d5fd9cbaca3c00b7814e3fd3a58840b97bfb6ad1c SHA512 9f7751f07dce91715778bf31cabc4fb1a715e4ad4b2b143ac2361f5cb0b90d8251d117849f90f5fc5fa455f8be1570099bfcb1224f94d91cf6f0d69006c9354a
+MISC metadata.xml 403 BLAKE2B d8d7cbeb2dda2306a054545112f0fe022b9c3f6c9d8e302369dbedeabc9b071ca4437d7ea54278cd1eaf773b66732d23e491ecbfccb00b4c32f38dbbffd00e11 SHA512 7bc33c6ae92ae2497792390dfef7d60213c21b6da44188e2b02e71855f646a2e3476ee9ccc8d0bfe9c08048c24d033eccaa00ee4b559285663f848d614b0951f
diff --git a/dev-util/flatpak-builder/flatpak-builder-1.0.11.ebuild b/dev-util/flatpak-builder/flatpak-builder-1.0.11.ebuild
new file mode 100644
index 000000000000..a8017f003f1d
--- /dev/null
+++ b/dev-util/flatpak-builder/flatpak-builder-1.0.11.ebuild
@@ -0,0 +1,41 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+SRC_URI="https://github.com/flatpak/${PN}/releases/download/${PV}/${P}.tar.xz"
+DESCRIPTION="Tool to build flatpaks from source"
+HOMEPAGE="http://flatpak.org/"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="doc +yaml"
+
+RDEPEND="
+	>=sys-apps/flatpak-0.99.1
+	>=dev-util/ostree-2019.5:=
+	>=net-libs/libsoup-2.4:=
+	>=dev-libs/elfutils-0.8.12:=
+	>=dev-libs/glib-2.44:2=
+	>=dev-libs/libxml2-2.4:=
+	dev-libs/json-glib:=
+	net-misc/curl:=
+	yaml? ( dev-libs/libyaml:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=sys-devel/gettext-0.18.2
+	virtual/pkgconfig
+	doc? (
+		app-text/xmlto
+		dev-libs/libxslt
+	)
+"
+
+src_configure() {
+	econf \
+		$(use_enable doc documentation) \
+		$(use_enable doc docbook-docs) \
+		$(use_with yaml)
+}
diff --git a/dev-util/doxy-coverage/metadata.xml b/dev-util/flatpak-builder/metadata.xml
index 9e05095ffffb..f5e4a2806dcb 100644
--- a/dev-util/doxy-coverage/metadata.xml
+++ b/dev-util/flatpak-builder/metadata.xml
@@ -2,11 +2,13 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>junghans@gentoo.org</email>
-		<name>Christoph Junghans</name>
+		<email>zmedico@gentoo.org</email>
+		<name>Zac Medico</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">lobbs/doxy-coverage</remote-id>
-		<bugs-to>https://github.com/alobbs/doxy-coverage/issues</bugs-to>
+		<remote-id type="github">flatpak/flatpak-builder</remote-id>
 	</upstream>
+	<use>
+		<flag name="yaml">Use libyaml for yaml support</flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-util/flawfinder/Manifest b/dev-util/flawfinder/Manifest
index 7887a0a13ce9..ef76a83ab166 100644
--- a/dev-util/flawfinder/Manifest
+++ b/dev-util/flawfinder/Manifest
@@ -1,3 +1,3 @@
 DIST flawfinder-2.0.11.tar.gz 256777 BLAKE2B e2aa109a0cc435da7a8ba5f40b5dc6474e27ec340785c0070fce4a648fb5a186f6f0f5ab4e53c8e06c91fb1cb15179ecdb605a7f7477968e4d5595fc46cbd7c8 SHA512 4236da49914fa6317eb2fae1b3fd7ba08aa96a34bc5245bfd15b6532049193cbd0367bb3620e32252ce71cdd1128bec4b20c0e88b02c55d0ede1bb5bb091ddeb
 EBUILD flawfinder-2.0.11.ebuild 784 BLAKE2B 9ed1d3fa43c50a760c79ce800ab2d48e0148eb20bc5b00d3404c22c58c02fdf032de953ef2777d5f82a203646f793a6d1ea254314f6690f0fe9d3ad7f20c82fc SHA512 6849ef5a067cafec819f9c28e1d51c7934a9683432dec14ff99c14dc82aaadacea4b1aab9ffdd3b5d5c1cd5285246347217da6d787c163bc4d561d22241463e0
-MISC metadata.xml 622 BLAKE2B b86d650364e1cd87b7fadc99bfc02e6acb360147c849846bfc94b3e827042aca129c745240ef8e04e3270ec6468dd5654ef9dbc55eeeb59d0251a73ab9d5f888 SHA512 5eda245e47619da4309fe11fd709daf8aedfefe97624ffcdd898bb4915c29e8dbf07b25543071ea9fe15af604a96f030ba816e26580c7166fd9689a1062e8e2b
+MISC metadata.xml 608 BLAKE2B 7f1407feb1709c799430f428b77c8746c7f9128e1fc419da67d13ff6095f9977f90a655c048160e5c15546219f91d8e80c2c22f8b57ea405b23da5f408a03a98 SHA512 19db01e5347dc2ee7d9fadc3899ae7c361f59cc23277862120240c556ea74bff78ff2b6b2b4417c6c1cadad8a773646e4385e99aae7cfdacb2b7ff3d5d479f5b
diff --git a/dev-util/flawfinder/metadata.xml b/dev-util/flawfinder/metadata.xml
index 4b7937bc629a..293ded822179 100644
--- a/dev-util/flawfinder/metadata.xml
+++ b/dev-util/flawfinder/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 	<maintainer type="person">
 		<email>ramage.lucas@protonmail.com</email>
-		<description>Lucas Ramage</description>
+		<name>Lucas Ramage</name>
 	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
diff --git a/dev-util/gdbus-codegen/Manifest b/dev-util/gdbus-codegen/Manifest
index 0e3a8cc26211..9997612c45e2 100644
--- a/dev-util/gdbus-codegen/Manifest
+++ b/dev-util/gdbus-codegen/Manifest
@@ -1,9 +1,9 @@
 AUX gdbus-codegen-2.56.1-sitedir.patch 1898 BLAKE2B 2d3530f2c0e249254d170a7c0f1965cc9953af8b29a96bf7658a74595e740a4dc9b2dad804f16a855b2afa2f9a72eb02aabe42e1a94b166ecb43e0213125eeb1 SHA512 3983f2021da8045bb25a0f2e761a651d67d5b5f41e5d26ad3e5950f5e74587a6226ae5d1c21e6c7561b16d8cd6f17ca2a693369fc5b2cbb5d4d686a52b29942b
 AUX setup.py-2.32.4 192 BLAKE2B 574320d89095d1452a3eee4404b5ebb19fbed32febf2a15422d276bc8dfb6790c41b7214aad3f88ee4927b58de639146cbf633f735df693bd437ea19eae79435 SHA512 45e823f507db103543f024ad557d35f7c09fb51db8a78b978c762ca77d941cdecc5837d2b248fc2c5da6a93b56fe8ded359efd98fb0a74fdf9533783d8eebcfa
 DIST glib-2.62.6.tar.xz 4703424 BLAKE2B 0a27245be2575c574dcc730dd051a8c284f421dbc46579aadc5fbbacb8f934af4374b61bb26085e5c9ab78a868c567818f3fb9d67adddce37f5c4fec00e0d276 SHA512 8e3972a371f3c1a50b7d245b30e4f740583ad72ba4ab325e0e15e0732be44dfb69b603fb39dcf4989255a23a181e9ea5dd25982dd94c386cd9f21952243ad6f5
-DIST glib-2.64.4.tar.xz 4779456 BLAKE2B 2ff69c794689c97011103459cb109e6ca7021db20a605cf3942f57e7b73eda9971034b8f65f03191f357169affb278dfa9bff309b4ca44605fd5a0ba0d135d2a SHA512 f21fe33068a5cabdbfef54ef635b3f810b389416c3b4b66ae4975e84841834f7b7640d2518d52cb7341641af5761919eebd5e7b25bd2946f3bdd002c4902b090
 DIST glib-2.64.5.tar.xz 4778456 BLAKE2B 7fdee0e16a7ac820f4c4f7dc66d37add464d3005e89e6013302d3ef103319331811d68e9b42db072b82242c3d7badfbd085b69333e770012def89dc8aae7a2eb SHA512 a87537274619b6de88a0e68555059036ac18c748b5005c8d84728646b0db342fde0b8c5b303b9ad79f64d71ea4ed990d52a4fbd68cda3ca74aed5fe4d497e060
+DIST glib-2.66.0.tar.xz 4839236 BLAKE2B 930bf071bb4b1e744ca46cb5267d42772488030f848c7b11c5424fcef087ac27d070d20cf403ae504e573ce49faf26ce9101656391d3915ae04422d021d5561a SHA512 358e6a840b722139593eb7825c3aa70153eb26036e05d13d3286bcc6d2e962c2b4ddcb0fe5c6728b89bfffbd178101e72c576081ae714326a272a9fc34ed953e
 EBUILD gdbus-codegen-2.62.6.ebuild 2043 BLAKE2B a55f20184ac1bafd3aa391b2d0c79ccefd5c6dc64f7c4619ee505f16f645c479fda199e6c54cd41ac666c5e68ab9431109f642655250b3f16f28c1d8dffc6da6 SHA512 9ad9a9475d431ba44a913f2b0423fa35623105d87ec8eb583b9eb0c67aa8358681b8d7ef1f5856e6c15d873bb29d1d5397788e44ba2e6bd5fbb734c1c503717e
-EBUILD gdbus-codegen-2.64.4.ebuild 2203 BLAKE2B 0a90d086b969979fe5a05fdc64b2024e40a1ab7b324511d99938b9eba2411fea9143e065425d35d6ed4d51ba35aa8c038931087149fd2ad342e99219d0a26586 SHA512 6203b819948ec11d8f7c54720fb486d02bc32c2cf03485d8000ae7769238fd81885d5cec4b04a8afe613635329923779b2a31457cfd89035e9b15ba82899aeb0
-EBUILD gdbus-codegen-2.64.5.ebuild 2205 BLAKE2B 872daa764448aa62fc772b093925a728e93753eba5fc5f744a538a54c9bd768327c39c8213ccd4345b82c4d10e850a408be4a376d34245ff45aa6969bd0bd3bc SHA512 693855710cd8d6aa0bb0df70357b45766e195411f736184583e4185dcd5bfe7b24dc5fae334923b81501310c0edf07defd715412c7689adc1efc23bcc53240ef
+EBUILD gdbus-codegen-2.64.5.ebuild 2201 BLAKE2B 24a877d49166197adb71f8c323ff4324852585e5c155c90d116eefd4ef8fdffd6599d836b8c745143c38aa92a7c84b80a8b9b0fa79042d7b81e1d39bd3d9257c SHA512 93a9475d91d276c7766a5214f29aa085b7f965b2705b1dd61d5a798766e8469c1a62065cb928eeed371d4b7afef6bd1d9c81c1d5a4835d7659083b15fa91c8e7
+EBUILD gdbus-codegen-2.66.0.ebuild 2212 BLAKE2B 07cc625a31740b5e6404a9e5bf91a8344d6e37176bb971085dbdcc83959324b8e6f8fd6ca908a962fab205fc27136aef7c37bdb7d72eee95a6636a7f56fa4596 SHA512 4bc6e71c8f2d093e3db6c8a834a809b4152a7ad7c07902b13f70f7dd8b88612520eb2a7f3a6bdeaa061a721e91e7509445e705f2d077880040d1796433bae525
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.64.5.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.64.5.ebuild
index 63279f3aefd2..34a868d371b5 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.64.5.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.64.5.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://www.gtk.org/"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="${PYTHON_DEPS}"
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.64.4.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.66.0.ebuild
index 89884a3a7129..38da7d52d767 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.64.4.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.66.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 GNOME_ORG_MODULE="glib"
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 PYTHON_REQ_USE="xml"
 DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_USE_SETUPTOOLS=no
@@ -15,7 +15,7 @@ HOMEPAGE="https://www.gtk.org/"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="${PYTHON_DEPS}"
diff --git a/dev-util/geany-plugins/Manifest b/dev-util/geany-plugins/Manifest
index 1f87017c94e4..bd16013bddd1 100644
--- a/dev-util/geany-plugins/Manifest
+++ b/dev-util/geany-plugins/Manifest
@@ -1,4 +1,7 @@
 AUX geany-plugins-1.36-libgit2-0.99.patch 2345 BLAKE2B 8cbaf858dd62c692279b863a8c594fd768c43ef4042fc10093eb608f6c6f7f71d3fadbebf41e98ab1045303b3e921b20aa453467c314132807fb285aab5560bd SHA512 49897e68b7617e429fc98cee9bc6dc47b60f2e526563ab7b3a58fe4aa8c04bec522ad357225ff5d75378a551c8eee4374382c25381ca368769137b045fbbae6b
 DIST geany-plugins-1.36.tar.gz 4693634 BLAKE2B a7c319a77cb92a55a0a53063ab75d9375f7d2a0e419eb3e0acd063b8fda4b4d9798c103ce53b80090c73bd86804c58f815aaf8d0eecc0d7fbf7ad1c8470cb9b5 SHA512 b3e58b42432d17c27289fa20d10b833a2d7f5d8c72b51abe5b1ebdabcb952b18e0984b15ef6ac9753102d839f3174f28798269e1e94bf032bdaa189e98d72b2d
+DIST geany-plugins-1.37.tar.gz 4711239 BLAKE2B 7f4fd121f6f0784aecf2dcc04d208c89e502b23debcbc40889f93c1421e414c33c8634376cfe01e91c370f70818d33b373b88698f5cb0ee23dff5edee9d781cf SHA512 47f8d7170593114c773067a8132c724471cbf881582a0a739da578ca42533783d8ecbccb04e039f2990ceed440bbd2d94e4be4a28e336c7f74b8e11a15ba4ce9
 EBUILD geany-plugins-1.36-r2.ebuild 3041 BLAKE2B e25759bbd4f9a48e3fbafb3c4b90ea1e8b648ed137d226976003796df82b769da8f9752e573b6276d940235bd1c8993329b2a56a0ad34c5f2eee99e6ecb98f55 SHA512 51ae6f610441056d9572133c18e61d7f01f7c1cd6258e8e18e4828525cbe05d8e2dc5129291ae23aef52a45d7c75e70ba47a5e98a153a80c900c8913723ca516
-MISC metadata.xml 1224 BLAKE2B e4c6548dff83825d2a2a7fcc0b0996f49aef25bf89468e6f333a5c524b09fc536854a0e3096e08a0026651fbaae70af1c9e09bba8a35fd4fd44cdd3a08a3217c SHA512 f8f2e26977703798922688da150a4dfd397ab06e0e35b28d7b84634a7bd1c2fe96937b586a83ead23a701feed2d3b4e75951d28529a2be980992f8c23565bfba
+EBUILD geany-plugins-1.37-r100.ebuild 3060 BLAKE2B 507bb742cb0c583a2992867ae1e2548679b90225a8045027e45b3598b281054ae4bf1046d1f3f190c2d9ceeddf0b3231abe830ab48f4743dc9c53ef3b9203a53 SHA512 b6e7c462bd77c681d81de54c0dcd6b9e97042d3ad65fe18ee414f2b5062229a8e9a6d681eea74fa1a52d93ee123641cad81ef2342cc137846a803547ad664724
+EBUILD geany-plugins-1.37.ebuild 2992 BLAKE2B 0c9d6f96df55650387d8077e6da25367f4077445ed77071199e8f2e21ccdf10419fd656ed7aa34177b498c9748c2bb77adbf27c956854fccafe642564997945c SHA512 48402ae37f4eb61a1b437d36235e97b95e775a8b8ee0b458454f11c4265bfae3528c5e25dc82958ef4638d08415078419b71f9b49a3305081268ec6420cc24e4
+MISC metadata.xml 1278 BLAKE2B d7069dbc82acd4fae0939c09f867e557a1b214d4ebe48add0cb483aeeec073ae362d35033c0017117e614793de109790c0c17c399327ac4e823f378948301e8f SHA512 5effdf6d8adbb1d63835c55d9a5e97a5596c59027b7c250dbdd6e0d88c7bedc6c1a4c1d8150cd00da538d40bcceb7b819c50080262737255eb2e5463904a4eb3
diff --git a/dev-util/geany-plugins/geany-plugins-1.37-r100.ebuild b/dev-util/geany-plugins/geany-plugins-1.37-r100.ebuild
new file mode 100644
index 000000000000..3c2413baa959
--- /dev/null
+++ b/dev-util/geany-plugins/geany-plugins-1.37-r100.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-1 )
+
+inherit lua-single
+
+DESCRIPTION="A collection of different plugins for Geany"
+HOMEPAGE="https://plugins.geany.org"
+SRC_URI="https://plugins.geany.org/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="gtk2 ctags debugger enchant git gpg gtkspell lua markdown nls pretty-printer scope soup workbench"
+REQUIRED_USE="gtk2? ( !markdown ) lua? ( ${LUA_REQUIRED_USE} )"
+
+DEPEND="
+	dev-libs/glib:2
+	>=dev-util/geany-1.37[gtk2=]
+	!gtk2? ( x11-libs/gtk+:3 )
+	gtk2? ( x11-libs/gtk+:2 )
+	ctags? ( dev-util/ctags )
+	debugger? (
+		!gtk2? ( x11-libs/vte:2.91 )
+		gtk2? ( x11-libs/vte:0 )
+		)
+	enchant? ( app-text/enchant:= )
+	git? ( dev-libs/libgit2:= )
+	gpg? ( app-crypt/gpgme:1= )
+	gtkspell? (
+		!gtk2? ( app-text/gtkspell:3= )
+		gtk2? ( app-text/gtkspell:2 )
+		)
+	lua? ( ${LUA_DEPS} )
+	markdown? (
+		app-text/discount
+		net-libs/webkit-gtk:4
+		)
+	pretty-printer? ( dev-libs/libxml2:2 )
+	scope? (
+		!gtk2? ( x11-libs/vte:2.91 )
+		gtk2? ( x11-libs/vte:0 )
+		)
+	soup? ( net-libs/libsoup:2.4 )
+	workbench? ( dev-libs/libgit2:= )
+"
+RDEPEND="${DEPEND}
+	scope? ( sys-devel/gdb )
+"
+BDEPEND="virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+src_configure() {
+	local myeconfargs=(
+		--disable-cppcheck
+		--disable-extra-c-warnings
+		$(use_enable nls)
+		--enable-utilslib
+		# Plugins
+		--enable-addons
+		--enable-autoclose
+		--enable-automark
+		--enable-codenav
+		--enable-commander
+		--enable-defineformat
+		--enable-geanyextrasel
+		--enable-geanyinsertnum
+		--enable-geanymacro
+		--enable-geanyminiscript
+		--enable-geanynumberedbookmarks
+		--enable-geanyprj
+		--enable-geanyvc $(use_enable gtkspell)
+		--enable-keyrecord
+		--enable-latex
+		--enable-lineoperations
+		--enable-lipsum
+		--enable-overview
+		--enable-pairtaghighlighter
+		--enable-pohelper
+		--enable-projectorganizer
+		--enable-sendmail
+		--enable-shiftcolumn
+		--enable-tableconvert
+		--enable-treebrowser
+		--enable-vimode
+		--enable-xmlsnippets
+		$(use_enable debugger)
+		$(use_enable ctags geanyctags)
+		$(use_enable gtk2 geanydoc)
+		$(use_enable lua geanylua)
+		$(use_enable gpg geanypg)
+		$(use_enable soup geniuspaste)
+		$(use_enable git gitchangebar)
+		$(use_enable markdown) --disable-peg-markdown # using app-text/discount instead
+		$(use_enable pretty-printer)
+		$(use_enable scope)
+		$(use_enable enchant spellcheck)
+		# Having updatechecker… when you’re using a package manager?
+		$(use_enable soup updatechecker)
+		$(use_enable workbench)
+		# GeanyGenDoc requires ctpl which isn’t yet in portage
+		--disable-geanygendoc
+		# Require obsolete and vulnerable webkit-gtk versions
+		--disable-devhelp
+		--disable-webhelper
+		# GTK 2 only
+		--disable-geanypy
+		--disable-multiterm
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	find "${D}" -name '*.la' -delete || die
+
+	# make installs all translations if LINGUAS is empty
+	if [[ -z "${LINGUAS-x}" ]]; then
+		rm -r "${ED}/usr/share/locale/" || die
+	fi
+}
diff --git a/dev-util/geany-plugins/geany-plugins-1.37.ebuild b/dev-util/geany-plugins/geany-plugins-1.37.ebuild
new file mode 100644
index 000000000000..a1018068f128
--- /dev/null
+++ b/dev-util/geany-plugins/geany-plugins-1.37.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A collection of different plugins for Geany"
+HOMEPAGE="https://plugins.geany.org"
+SRC_URI="https://plugins.geany.org/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="gtk2 ctags debugger enchant git gpg gtkspell lua markdown nls pretty-printer scope soup workbench"
+REQUIRED_USE="gtk2? ( !markdown )"
+
+DEPEND="
+	dev-libs/glib:2
+	>=dev-util/geany-1.37[gtk2=]
+	!gtk2? ( x11-libs/gtk+:3 )
+	gtk2? ( x11-libs/gtk+:2 )
+	ctags? ( dev-util/ctags )
+	debugger? (
+		!gtk2? ( x11-libs/vte:2.91 )
+		gtk2? ( x11-libs/vte:0 )
+		)
+	enchant? ( app-text/enchant:= )
+	git? ( dev-libs/libgit2:= )
+	gpg? ( app-crypt/gpgme:1= )
+	gtkspell? (
+		!gtk2? ( app-text/gtkspell:3= )
+		gtk2? ( app-text/gtkspell:2 )
+		)
+	lua? ( dev-lang/lua:0= )
+	markdown? (
+		app-text/discount
+		net-libs/webkit-gtk:4
+		)
+	pretty-printer? ( dev-libs/libxml2:2 )
+	scope? (
+		!gtk2? ( x11-libs/vte:2.91 )
+		gtk2? ( x11-libs/vte:0 )
+		)
+	soup? ( net-libs/libsoup:2.4 )
+	workbench? ( dev-libs/libgit2:= )
+"
+RDEPEND="${DEPEND}
+	scope? ( sys-devel/gdb )
+"
+BDEPEND="virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+src_configure() {
+	local myeconfargs=(
+		--disable-cppcheck
+		--disable-extra-c-warnings
+		$(use_enable nls)
+		--enable-utilslib
+		# Plugins
+		--enable-addons
+		--enable-autoclose
+		--enable-automark
+		--enable-codenav
+		--enable-commander
+		--enable-defineformat
+		--enable-geanyextrasel
+		--enable-geanyinsertnum
+		--enable-geanymacro
+		--enable-geanyminiscript
+		--enable-geanynumberedbookmarks
+		--enable-geanyprj
+		--enable-geanyvc $(use_enable gtkspell)
+		--enable-keyrecord
+		--enable-latex
+		--enable-lineoperations
+		--enable-lipsum
+		--enable-overview
+		--enable-pairtaghighlighter
+		--enable-pohelper
+		--enable-projectorganizer
+		--enable-sendmail
+		--enable-shiftcolumn
+		--enable-tableconvert
+		--enable-treebrowser
+		--enable-vimode
+		--enable-xmlsnippets
+		$(use_enable debugger)
+		$(use_enable ctags geanyctags)
+		$(use_enable gtk2 geanydoc)
+		$(use_enable lua geanylua)
+		$(use_enable gpg geanypg)
+		$(use_enable soup geniuspaste)
+		$(use_enable git gitchangebar)
+		$(use_enable markdown) --disable-peg-markdown # using app-text/discount instead
+		$(use_enable pretty-printer)
+		$(use_enable scope)
+		$(use_enable enchant spellcheck)
+		# Having updatechecker… when you’re using a package manager?
+		$(use_enable soup updatechecker)
+		$(use_enable workbench)
+		# GeanyGenDoc requires ctpl which isn’t yet in portage
+		--disable-geanygendoc
+		# Require obsolete and vulnerable webkit-gtk versions
+		--disable-devhelp
+		--disable-webhelper
+		# GTK 2 only
+		--disable-geanypy
+		--disable-multiterm
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	find "${D}" -name '*.la' -delete || die
+
+	# make installs all translations if LINGUAS is empty
+	if [[ -z "${LINGUAS-x}" ]]; then
+		rm -r "${ED}/usr/share/locale/" || die
+	fi
+}
diff --git a/dev-util/geany-plugins/metadata.xml b/dev-util/geany-plugins/metadata.xml
index 6a11d0ae3243..db5b9d2b0d41 100644
--- a/dev-util/geany-plugins/metadata.xml
+++ b/dev-util/geany-plugins/metadata.xml
@@ -10,6 +10,7 @@
 		<name>Gentoo Proxy Maintainers Project</name>
 	</maintainer>
 	<use>
+		<flag name="gtk2">Use GTK+2 instead of GTK+3</flag>
 		<flag name="gtk3">Use GTK+3 instead of GTK+2</flag>
 		<flag name="ctags">Enable ctags plugin</flag>
 		<flag name="debugger">Enable the debugger plugin which interfaces with <pkg>sys-devel/gdb</pkg></flag>
diff --git a/dev-util/geany/Manifest b/dev-util/geany/Manifest
index 8d043cff3aa3..696b482db216 100644
--- a/dev-util/geany/Manifest
+++ b/dev-util/geany/Manifest
@@ -1,4 +1,8 @@
 DIST geany-1.36.tar.bz2 4644521 BLAKE2B 80eeceee31a49e9728a358904ad40e353d3407a22492340e6aa9a82091d32fa004f4494d3ae027732174e7cf7f6fae620b511680e06e58c5b71dd259125900c4 SHA512 15005772b64e8321d7fa8552363df425eb25e9d7b0760c561c8fb3f34d7acae2bf25da8e04fda38a2a1b64cc31ff613b7ff2786d432ff014050c138c7473c810
+DIST geany-1.37.1.tar.bz2 4689173 BLAKE2B fe17674294e314204b490d0586bc360229a95348236f48a9d25bb49b0d1face415a11e60925501f22018ad047061521258d90af55d8d250499bbf6a09b02028a SHA512 9dafaa540ba4d37ae66f3cc1c4d9670aa8ea30e74e960f0ad010dcbcd1647d1dc2eea4ae7454f589fc6ec0ded0da2de98d85fecc92d8d1ff36cd62d3255a47f4
+DIST geany-1.37.tar.bz2 4689385 BLAKE2B b726fffc18cc780fb399472a93a1787ec06ec47caf5dfe9a89f88e5939f071bdb90f337c7dbb9f8681c8383a89fa9d4a8c42d9361771a3e8bb7103cab4629f21 SHA512 ffaa906eaa6198d24e91e21dafc4acc0811c8d90f714a36f646d70aa9f4eee7c53c29a063c39db41857de3c7729282ca7f88419ddc6b67b73ac35e91a376ea62
 EBUILD geany-1.36.ebuild 1690 BLAKE2B 5ce4cc4e24de8e0e8aa738912558fadd6aba5e5d7d9588d412ab941bfa16497d78450d1aaf5244ff8af65b2eb77adb01e2e19d82ef72471af2e68bfd9b17f31d SHA512 29f31f63d8187082d9d4be721ff96774380e7196b342dd1d9fd25be7b7e39a37bd93bc9b6d2d14e0fa2f3012433d3f68a72e7637797dbe1e44234d003795ac98
-EBUILD geany-9999.ebuild 1684 BLAKE2B d7189974c07cd414eb5ccf9643166827b8e54198a3ece8bba836c5881664cfcd6518c5f9e4cacdd56c75559579aba7dda204c8766ece74c6bc14e1921d4d4180 SHA512 0f9a0c235765833d275ee3d100eb38dcc9272de31ef1f142fb6c0ebdff70ac6205201353fc84ffbbe3fedf877b735d937fecdf83178a42bfd3a062cd1960ffed
-MISC metadata.xml 1978 BLAKE2B 04d6567b9c02f927e912c8d35bdea73c8015dcc4a6c7f47d91b50086c619e2e25a472170f46a4d1053cb942a33d66f85da1e837bc7f4397678534702cef964fd SHA512 f070310d9266a11c4b91c4f644534f3ff9d7538c2d97e6daa009d403cb2c8aae2856ed51646315906a51399b6e51a1f32fbd12f5ab616b597c4fc7c97c5f5152
+EBUILD geany-1.37.1.ebuild 1714 BLAKE2B 6d66deeb5ffc669dfbc0a83e45928c0c0a4bfbf68411684c6e069f74c9c7d4713578f4f480b96c77954019b5e0c50bb8707ee26aafb40f915f912ad63ba5a456 SHA512 f2cea29289f870630fcabca0e10bb1445760f6458bed833dbe5ff0808c5fe03b0cafc4ac3d3de47b49484b02f38e5f6bd31aea6e63f55c4c415ad316984db909
+EBUILD geany-1.37.ebuild 1714 BLAKE2B 6d66deeb5ffc669dfbc0a83e45928c0c0a4bfbf68411684c6e069f74c9c7d4713578f4f480b96c77954019b5e0c50bb8707ee26aafb40f915f912ad63ba5a456 SHA512 f2cea29289f870630fcabca0e10bb1445760f6458bed833dbe5ff0808c5fe03b0cafc4ac3d3de47b49484b02f38e5f6bd31aea6e63f55c4c415ad316984db909
+EBUILD geany-9999.ebuild 1714 BLAKE2B 6d66deeb5ffc669dfbc0a83e45928c0c0a4bfbf68411684c6e069f74c9c7d4713578f4f480b96c77954019b5e0c50bb8707ee26aafb40f915f912ad63ba5a456 SHA512 f2cea29289f870630fcabca0e10bb1445760f6458bed833dbe5ff0808c5fe03b0cafc4ac3d3de47b49484b02f38e5f6bd31aea6e63f55c4c415ad316984db909
+MISC metadata.xml 2032 BLAKE2B 54b3618b43f780191a7beac778aaf9663fbd5f9c92053db9d0be5fe9f15762be554b5e3cd2f3fd474af947dbe4b24eb8b010aefb564cd99a28c323fb0bc08401 SHA512 e7c85e1609236337edba5c321cde1e7d816e672c84cd55bcc98cf76231b04b3c2419d95ea9a040f5f28784a6016cff7f0e75d8b24c1f7fcfe8dc20a60e6c90bf
diff --git a/dev-util/geany/geany-1.37.1.ebuild b/dev-util/geany/geany-1.37.1.ebuild
new file mode 100644
index 000000000000..2dde606ada78
--- /dev/null
+++ b/dev-util/geany/geany-1.37.1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# eutils required for strip-linguas
+inherit eutils xdg
+
+LANGS="ar ast be bg ca cs de el en_GB es et eu fa fi fr gl he hi hu id it ja kk ko ku lb lt mn nl nn pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN ZH_TW"
+NOSHORTLANGS="en_GB zh_CN zh_TW"
+
+DESCRIPTION="GTK+ based fast and lightweight IDE"
+HOMEPAGE="https://www.geany.org"
+if [[ "${PV}" = 9999* ]] ; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/geany/geany.git"
+else
+	[[ "${PV}" == *_pre* ]] && inherit autotools
+	SRC_URI="https://download.geany.org/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+LICENSE="GPL-2+ HPND"
+SLOT="0"
+
+IUSE="gtk2 +vte"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND=">=dev-libs/glib-2.32:2
+	gtk2? (
+		>=x11-libs/gtk+-2.24:2
+		vte? ( x11-libs/vte:0 )
+	)
+	!gtk2? (
+		>=x11-libs/gtk+-3.0:3
+		vte? ( x11-libs/vte:2.91 )
+	)"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	sys-devel/gettext"
+
+pkg_setup() {
+	strip-linguas ${LANGS}
+}
+
+src_prepare() {
+	xdg_src_prepare #588570
+
+	# Syntax highlighting for Portage
+	sed -i -e "s:*.sh;:*.sh;*.ebuild;*.eclass;:" \
+		data/filetype_extensions.conf || die
+
+	if [[ ${PV} = *_pre* ]] || [[ ${PV} = 9999* ]] ; then
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-html-docs
+		--disable-pdf-docs
+		--disable-static
+		$(use_enable gtk2)
+		$(use_enable vte)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+}
diff --git a/dev-util/geany/geany-1.37.ebuild b/dev-util/geany/geany-1.37.ebuild
new file mode 100644
index 000000000000..2dde606ada78
--- /dev/null
+++ b/dev-util/geany/geany-1.37.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# eutils required for strip-linguas
+inherit eutils xdg
+
+LANGS="ar ast be bg ca cs de el en_GB es et eu fa fi fr gl he hi hu id it ja kk ko ku lb lt mn nl nn pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN ZH_TW"
+NOSHORTLANGS="en_GB zh_CN zh_TW"
+
+DESCRIPTION="GTK+ based fast and lightweight IDE"
+HOMEPAGE="https://www.geany.org"
+if [[ "${PV}" = 9999* ]] ; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/geany/geany.git"
+else
+	[[ "${PV}" == *_pre* ]] && inherit autotools
+	SRC_URI="https://download.geany.org/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+LICENSE="GPL-2+ HPND"
+SLOT="0"
+
+IUSE="gtk2 +vte"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND=">=dev-libs/glib-2.32:2
+	gtk2? (
+		>=x11-libs/gtk+-2.24:2
+		vte? ( x11-libs/vte:0 )
+	)
+	!gtk2? (
+		>=x11-libs/gtk+-3.0:3
+		vte? ( x11-libs/vte:2.91 )
+	)"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	sys-devel/gettext"
+
+pkg_setup() {
+	strip-linguas ${LANGS}
+}
+
+src_prepare() {
+	xdg_src_prepare #588570
+
+	# Syntax highlighting for Portage
+	sed -i -e "s:*.sh;:*.sh;*.ebuild;*.eclass;:" \
+		data/filetype_extensions.conf || die
+
+	if [[ ${PV} = *_pre* ]] || [[ ${PV} = 9999* ]] ; then
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-html-docs
+		--disable-pdf-docs
+		--disable-static
+		$(use_enable gtk2)
+		$(use_enable vte)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+}
diff --git a/dev-util/geany/geany-9999.ebuild b/dev-util/geany/geany-9999.ebuild
index f8bb6955d661..2dde606ada78 100644
--- a/dev-util/geany/geany-9999.ebuild
+++ b/dev-util/geany/geany-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 # eutils required for strip-linguas
 inherit eutils xdg
 
-LANGS="ar ast be bg ca cs de el en_GB es et eu fa fi fr gl he hi hu id it ja kk ko lb lt mn nl nn pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN ZH_TW"
+LANGS="ar ast be bg ca cs de el en_GB es et eu fa fi fr gl he hi hu id it ja kk ko ku lb lt mn nl nn pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN ZH_TW"
 NOSHORTLANGS="en_GB zh_CN zh_TW"
 
 DESCRIPTION="GTK+ based fast and lightweight IDE"
@@ -22,19 +22,19 @@ fi
 LICENSE="GPL-2+ HPND"
 SLOT="0"
 
-IUSE="+gtk3 +vte"
+IUSE="gtk2 +vte"
 
+BDEPEND="virtual/pkgconfig"
 RDEPEND=">=dev-libs/glib-2.32:2
-	!gtk3? (
+	gtk2? (
 		>=x11-libs/gtk+-2.24:2
 		vte? ( x11-libs/vte:0 )
 	)
-	gtk3? (
+	!gtk2? (
 		>=x11-libs/gtk+-3.0:3
 		vte? ( x11-libs/vte:2.91 )
 	)"
 DEPEND="${RDEPEND}
-	virtual/pkgconfig
 	dev-util/intltool
 	sys-devel/gettext"
 
@@ -58,7 +58,8 @@ src_configure() {
 	local myeconfargs=(
 		--disable-html-docs
 		--disable-pdf-docs
-		$(use_enable gtk3)
+		--disable-static
+		$(use_enable gtk2)
 		$(use_enable vte)
 	)
 	econf "${myeconfargs[@]}"
diff --git a/dev-util/geany/metadata.xml b/dev-util/geany/metadata.xml
index 36e14323b610..044b068dfd6d 100644
--- a/dev-util/geany/metadata.xml
+++ b/dev-util/geany/metadata.xml
@@ -35,6 +35,7 @@
 		symboles.
 	</longdescription>
 	<use>
+		<flag name="gtk2">Use GTK+2 instead of GTK+3</flag>
 		<flag name="gtk3">Use GTK+3 instead of GTK+2</flag>
 		<flag name="vte">Enable Terminal support (<pkg>x11-libs/vte</pkg>)</flag>
 	</use>
diff --git a/dev-util/gengetopt/Manifest b/dev-util/gengetopt/Manifest
index 52d4eeb058ae..26df9be9e10a 100644
--- a/dev-util/gengetopt/Manifest
+++ b/dev-util/gengetopt/Manifest
@@ -1,4 +1,4 @@
 AUX gengetopt-2.22.6-docdirs.patch 364 BLAKE2B 06919d379a6f0e13271d89dda845dcc920a7581ff380d52318ec11f658327c73c1102326108080b9129610fe89b80aec39c01e0923c1449ae2d00123f4e8609d SHA512 f2bb3ba6e63c32deeda6d0408621a480b0902d2e93a3ceecbe3e79f72c79f3269bbd2e2fd3cd6bcb248bd81d0105dcd8520d44d523c53ce58843bc38a9cb21f6
 DIST gengetopt-2.23.tar.xz 584860 BLAKE2B efd94e28d35319f3a04af4f97b87fd8a07bef93856da0dcfad54ab4800d43510f7948bbb7440f39abfe242aede5657abd874bf4ab4dd311336e10f37e7960cb5 SHA512 3749191d35acbeff6680f2a4d0516706a0491053f632aaa44ead7c3a42e56f9870bd7c4a85a1886f2052e17d86a2853e2f65d445e0c9920e41f1dc354f003712
-EBUILD gengetopt-2.23.ebuild 665 BLAKE2B eb8e13898a5f9aa73f26699911f491e6a7c36b9128287f11145be7e1967fccea2c27392990288f3293300a358c818e9b497569dfb5dc576c081f5f2186f54cf9 SHA512 a025ad74ec1e1f8b4d6047b03e8f29f7609ea6e9434772e78b4a43cea287414f23a81319d39a95e3d466cf4750afae93d8ee69c9e30c0a334c297dee540611aa
+EBUILD gengetopt-2.23.ebuild 664 BLAKE2B 98c4ee0e597308e0f17b422522bd02a751494616c6385f9976c795dd7f0cc005e947a2f48a872335ea87d787dafcd8b3643e021bd9f3db9a5782e49536e33771 SHA512 5587a5732f944fda17b10a62b2cd17d3832f11e0bd1183dee2d9a6b993f70fd6a3b9042e895a5a89355e65c04f309bf4c7d15a2d453cfd0c5ed711bc9906ad9d
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/gengetopt/gengetopt-2.23.ebuild b/dev-util/gengetopt/gengetopt-2.23.ebuild
index eb7a7add915a..6066b5d5aad4 100644
--- a/dev-util/gengetopt/gengetopt-2.23.ebuild
+++ b/dev-util/gengetopt/gengetopt-2.23.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~x64-cygwin ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 x86 ~x64-cygwin ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris"
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.22.6-docdirs.patch
 )
diff --git a/dev-util/gertty/Manifest b/dev-util/gertty/Manifest
index 348e09fc2636..b9338ef7f672 100644
--- a/dev-util/gertty/Manifest
+++ b/dev-util/gertty/Manifest
@@ -1,4 +1,4 @@
 DIST gertty-1.6.0.tar.gz 122570 BLAKE2B 8c3628f9b0b56aaff30f183a1ab0d852b8ee487927833f41b8aa61f94f8d14eaf3a8d515d5edcb3fa7dd18ca36f42a977d12790c52d6c629a720b4f29252b030 SHA512 0fe5224f5b4b06910bba0d19453ea0f273f6ea0688b9aa092e11f929b71801581f6d7cead1d64c00912ee3363b98d4b36e903fa992a7ce36f190a4f3c09375d2
-EBUILD gertty-1.6.0-r1.ebuild 1196 BLAKE2B db6f3fe1f1d925a5eeb74ff585607aabf8372b6daff87df416fbbbf5a48adeab45e2dd1ef99d3d3e6a1c68811b9a6872655ee8da454f3baa579d2ab77f1d27e8 SHA512 7e3bcc4e9a5672d87d3167ed0537c1e1b993539bedd4e0c5892251ff321413628f77acb893f69803532aa3a0349708946bb943639ba01729495373b3f00b5cc1
-EBUILD gertty-9999.ebuild 1198 BLAKE2B cb47a966e5b1b43910aca40e8895db4fa38ab880e889ff189419836332d62d98e097e8030c822a19933465658494c00e9b2cf204787c985136781f75165eb478 SHA512 8d6056ecb66c49bce7c605c6d15574517cb7ea7247909fb17fa01926c9beca12febe64cc9fc30f78ae048b93aa3ccc7361f68d24a13d34bed2be88d62eae0b31
+EBUILD gertty-1.6.0-r1.ebuild 1204 BLAKE2B e4142086651d40c8c2f5a9215c04382adf1a78ced243c954380f5ffd895bd82745534c48ed3f4d3607663f749f6c372b514f3c19e6aad350e5b5266c1f41617c SHA512 aec9f4fe2f499f8d6d4d1e64d467cffcdd6f87154e304eb3f141fcbfbb86560797798f94cf411c675b6edea3d36bd3140ffd1720bf2d8ec2698ec8b2ba881178
+EBUILD gertty-9999.ebuild 1206 BLAKE2B ed8a4e0cbed48a43a8c332ce4fffb50b94a3924749ce1a407ae54c1350e29ac84d52b2e950e8ad2b5355669e6465bca90b6643849bf0773190ca53719114d953 SHA512 24fd7af89d12b23d98a40b39f03724f8b1a1c579b330aa4a2c5e0303f78ca6ea8b56c0bfffb9990c81ac23d3394d0a2d5619068a80e99f2a0ae7f251d0f624c8
 MISC metadata.xml 379 BLAKE2B b46a401263c266a0900d16e3c63e3bf5dd2a6b9d85d81e119ad88270530fb1a5345d6853683bfebe22738192e12f18c0bbd02390bcf540ac1a122ba5f4fba675 SHA512 a37a6ec1e287489f1c8f9058829b927d7ebdca15024fe01643cc888ae45e4567ee9a7897f4d0e4d0facfea89605f2db9c04170b974cf8e9ce9aed43e405d3b84
diff --git a/dev-util/gertty/gertty-1.6.0-r1.ebuild b/dev-util/gertty/gertty-1.6.0-r1.ebuild
index 74a745757acf..6dcac9474c90 100644
--- a/dev-util/gertty/gertty-1.6.0-r1.ebuild
+++ b/dev-util/gertty/gertty-1.6.0-r1.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_6 python3_7 )
+PYTHON_COMPAT=( python3_6 python3_7 python3_8 )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
 
@@ -21,12 +22,9 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
 
-CDEPEND=">=dev-python/pbr-0.11[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
+DEPEND=">=dev-python/pbr-0.11[${PYTHON_USEDEP}]"
 RDEPEND="
-	${CDEPEND}
+	>=dev-python/pbr-0.11[${PYTHON_USEDEP}]
 	>=dev-python/urwid-1.2.1[${PYTHON_USEDEP}]
 	>=dev-python/sqlalchemy-1.0.4[${PYTHON_USEDEP}]
 	>=dev-python/GitPython-0.3.7[${PYTHON_USEDEP}]
diff --git a/dev-util/gertty/gertty-9999.ebuild b/dev-util/gertty/gertty-9999.ebuild
index c22ac8ed0f14..727fb88a68e9 100644
--- a/dev-util/gertty/gertty-9999.ebuild
+++ b/dev-util/gertty/gertty-9999.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_6 python3_7 )
+PYTHON_COMPAT=( python3_6 python3_7 python3_8 )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
 
@@ -21,12 +22,9 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
 
-CDEPEND=">=dev-python/pbr-0.11[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
+DEPEND=">=dev-python/pbr-0.11[${PYTHON_USEDEP}]"
 RDEPEND="
-	${CDEPEND}
+	>=dev-python/pbr-0.11[${PYTHON_USEDEP}]
 	>=dev-python/urwid-1.2.1[${PYTHON_USEDEP}]
 	>=dev-python/sqlalchemy-1.0.4[${PYTHON_USEDEP}]
 	>=dev-python/GitPython-0.3.7[${PYTHON_USEDEP}]
diff --git a/dev-util/git-delta/Manifest b/dev-util/git-delta/Manifest
new file mode 100644
index 000000000000..d50e48df95a8
--- /dev/null
+++ b/dev-util/git-delta/Manifest
@@ -0,0 +1,123 @@
+DIST adler32-1.0.4.crate 5105 BLAKE2B 344a5258e77328a24a545e32f9bc653fa25b7ea43803ed7861db261bce227aa1599520a42acea3de1f2acebb8fa9fad251e2688413b752eafe2401ca1a2ee34a SHA512 5990e1e277a1c3aae5adef5e4601b807a756a40e88578bb91f1c70d70babfa97fb3f2c1b963482ec8e18c16d5e722bf90fb42f9646c8dd840373f28965a2d123
+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 atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
+DIST autocfg-1.0.0.crate 12870 BLAKE2B 79e495d53298574afd3b292da7c9c363dcb3ea434fd44258efaf3628e95ebfc731f03083f8a1060272a2a3478a6452cdc41539e2dac08465cc6e6283844bf260 SHA512 451fc63148792ba1952b884170e3481359b01bacca5ec0456f43ca58f8e092b8f81c9764f8b00d4104059ff608089be5858220ee868127c064cc890c767ec3a3
+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 bincode-1.2.1.crate 15489 BLAKE2B 98d8a7b3653dc75aed07a637707a8a0d7b574c9a7e9ab8aa39d6f235d003ee15dc4abdd76e3ba171b10aafc98dc16f9ef8413f4154c30848ca0c12d4972f527e SHA512 b86915db2079128d6abe52c8f3fa0ec21815faa988bf678a162c2caaeb0d2ecf2f5df496d5dab08f399578b4f0258f252e890d9ab9e8347c50e5d7a2ab374db7
+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 cc-1.0.54.crate 51972 BLAKE2B f3760987ea93e71254939a42bc795cfd68b994494c2d5820fbd6bda29e31b3a28d55ed9aaddb35f720b26b1bfc01f3369af81990b68da06a7c46c17eb014636c SHA512 4562c89b52786cd16a66c1970a4005485299ff0c21c61fd22a08fada933e5ecf3fcc1686f6e4f5a8ec4827ac00ed24c1c4ab4931ec5e9a12d2e5c283f6096b77
+DIST cfg-if-0.1.9.crate 7353 BLAKE2B 5556f3fdbf49708e6e4f08f2c536ee093b5f04dcf1fe4f68355189d129c416c338820143b5cf5f215323b38175ee0fd34eef4b2ff58179b190a63a9728fe2839 SHA512 45f7322217d291b3905ffdc45cadd5a7a7baf440f9a82a5b5596192ed0ac54353a3ecae0326d5807aae99bc4d79e0406d71bd65745ec8d9f8815a7c9436d648c
+DIST chrono-0.4.11.crate 139811 BLAKE2B d327f6be0a890ed74f2a2330777dcefbcf87e0291e47ef9c63aea46050f38c89a9b2e7a4716ac92202fab66aedc98ae81e090f1921a1aa51fa7ba18cb1cf24a9 SHA512 bedb698ae2994fc6fcf858b86a122cdaccd150996eb3e4313f876599cfa2180c2f687cca78ba30860365e04b75911fcdb19b5930fc155d1c17f06ec8197d3da9
+DIST clap-2.33.0.crate 196458 BLAKE2B 3bb62d817afc77b421a6282746b9b61367d224de6b614c7ed66bde452ce1046728077dab3368a46635b5c74d82ba3196586d87c0201478ce5b89638910dadb1a SHA512 f1075031414d48e4340bfe308904a95a31b72460724773c52a0bc8c004e625a04c904a39fc5420cb8c26a633321f9b5f4f69019c7aae5ed89900b63ed8c21a91
+DIST cloudabi-0.0.3.crate 22156 BLAKE2B e12054fd474754031f8f5038d5e2829e1586db974d38230cfd8774db591a58dfdcaea9fb61fc0b35366889d348b2c73ceaabbb462f1abeeffeaab167013c986f SHA512 691ed793e9b35ba382f03897f4c0efc31a528394862a27b814ba8993ad30bbe0ebc9808484baf580e8b69d9c13ad1612776a1efd0f6981545b420139ff83592c
+DIST console-0.12.0.crate 21278 BLAKE2B ee79ab5478a6f49d4c42389f2e9d17a5fe97749728fa548330a49b0869e8d839576eb4fc3874c60b873a3de8be9bdb7f928da6303c2ab0e68e9381052abd9e82 SHA512 f35d40ef5f91d99eddaa498b8e043f884fd624afd39215a7f207ca79b99d9eb563b47595974af345ce68542d76d58da17c358ce60231bcb0a1dcb9da31f7c6c7
+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 crossbeam-utils-0.6.6.crate 32836 BLAKE2B 48290733712549c46bcf99641ddff571cf2fff72b2a70e86a554899987fd71a61a8ab6a15c75e468164755fcc3218a1db54a4fa406f766f9a9f03bcb3d9bcd02 SHA512 771ac1a55a043600e7d8b720f9b5a32da2ec09efaa4dec4202f7b78a505eb391a842b7abc91516ccd287c3207c634b342b0bc8ebb3c0c7a0d73b7fb29badc9f5
+DIST dirs-3.0.1.crate 12245 BLAKE2B e58f9383d0bb78f27219337c83879ce355aa60290df659b9dc656e3febcc2577b8fd5234792fa354f1c7f2b651e590fe490384f79b0a8a332eff44e3b459d9cc SHA512 fe5eed57f7f3af0ebc53098f7d7295702a5339d7644d271a81bf5a966ae5b3e688eeabbf2b122e6e7daa1080dd30e48d8cbad969f6820b6cdb1680c84f0b9623
+DIST dirs-sys-0.3.5.crate 10643 BLAKE2B 8df1e6ca2c8e8560913bfb74e7bea1b12e1b13b6d337f3c76f517716622586cae8ff9999044e3265504a44f161526a79baffff2d123d3ea6c5cfebefcf498010 SHA512 ff7eb48943b61773dd2aa8dc10372186d613c225a2b39caf48966a1a5af087dd0177b8db80b1353a504af8aa1c8b4a0a849edf6c7e4389f6b753bfa3b7376833
+DIST either-1.5.3.crate 12278 BLAKE2B ffbe3878098daadcef9a554b60b2904d8d4814ea38cb915ee0003d3cd11243e04813dfb41384545e7b180f7d542c7aa2c0a351b736d4f449e70fa11d0a09cca1 SHA512 5e283412597bc3a1341d42c6cfe824606e056aaac82cbf3f662e7074ab74f1f80befe9de1b1011ce2dc970a0ec159ade5ed5b3e71c9984facee6314eac20d0f2
+DIST encode_unicode-0.3.5.crate 42677 BLAKE2B d8044f314f03f93965bc4de11c065f08112d33c4e1b42d9054476dd7ea925e22fb7b32fa855250be2053a00d877bbdb83a293c0aede3aa6e48d978b61f0f57df SHA512 e9849cffcffbf66e28b609e86b0d26b1267f6e2858c6564f93b071b1257aa505732dc3b7ae5bcb347874514fb8c21a606282bdcf69de842f8b96e79547f434a2
+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 fnv-1.0.6.crate 11131 BLAKE2B 220cf5463749b21e1560419ab9b1f235de08dd548c4a9a7fa6190d9516ce7db884f877b67174ee50b66b22be80d3be73ccafca80e06e94e0fa6e96fbb94475f6 SHA512 f1356b3da25f76cb3ccb4336ff54d4967f1dc7523eae6cba21a4349b8ce563516f6a2aa10d626cd5bb6046b55ac2f246e61e4e526a03fad5e78d0ea174841844
+DIST fuchsia-cprng-0.1.1.crate 2950 BLAKE2B 8519407ab5d1f04d03cc946a07050db4dd7bc70e03894e35b9e66910a3be11224084a86ba45103fdec845e94b7ba4defbd7c5217b035a0796c0c4a94b9562cd7 SHA512 ea9f5beb0dfcb023c22cfc2b37ce52dfcf3a2cbbed0f79ffffc332878858386805c65dce8469a431002367562d857a6c064e075688540c27fcb4056a110059d2
+DIST git-delta-0.4.4.tar.gz 1024790 BLAKE2B c0a74299196c4dde617db74832d4db906b8b3eab2a1b302ee81ce5a9fe2df4daf8306768d00d9914153159aa8fc0d5aaaebd9ddbeec3c79ce41bed8c92702308 SHA512 1d42f87efef0ba065860fd2c3d2db3cfc1e97580b4bd031e91393a21479ab61d5c7afc99eb232eb16bf8db6853072b714027c720fd2d452be74e0ef0a5d1dc34
+DIST git2-0.13.11.crate 173742 BLAKE2B c14fa5ff6c6d7dcb78a2c7abc3ac8254e50fdfc21926484596f6e259a8fee825b4b11b4a592e923a079cda019059c2feb787c82e4bc23e0de1c18a2b68f8d71e SHA512 2cacde47dfbf9df7a46d8d25fcd182f3ef239c4dd987e7f21b3e49e29671bcbae84f387014610559b2bacdad0708a9ec2804b67befb1ec139848a625508e93a9
+DIST heck-0.3.1.crate 54666 BLAKE2B 99f7ceb44ea6af445749989730ce1e14156018ff046a136be2e6474b285088e1d90d6f8af9352affbbde5bac7e5a32971dd99f249f968105e9793b7de76def07 SHA512 134722192c46fd64b38d2fbec3a2511c560916e906491a72c4ec9d99b9f716dc58942fb99cac99b9a6ef2de5b5ad1d1c1155f292d091401b6873347d80c086d6
+DIST hermit-abi-0.1.12.crate 9217 BLAKE2B aecc8c743241596ef4dceaa61b4ac36ee0a2501e97eac976c733638cbc8a3c4926b9e231404a67a3687aae03049ad8ebb10fdba2d8c72002c0c08a2f8f76e3ec SHA512 7c2c7950f2b70dc64ef7c111b7790d7128b49c91aba9c063e11a3e09070b28171de6b77d1f31b4ca0c1642e61bf4b9d50e41d72b9c9228bdd1749347eb753df2
+DIST idna-0.2.0.crate 257203 BLAKE2B d26117124891f90b5e36af291c9038e2f4d46402c41380a6a89758459fd73839137e6faa401502be12dd81292cd9e12ec82fc611c0ff7a150510d19010767558 SHA512 375d6d73537a5c9cebfc850a2b561d57e748d80059ca27fe5e35c058cc12a5938cfbb39a76cfe57fbe589f7e36f89ccd91ccdb8899458c322e277c299293bc7d
+DIST indexmap-1.3.2.crate 47144 BLAKE2B 70330e3a7bca371051f871b029938c1c3d6507739cdfaf348347a811a69ee923ea9f5884b6375b0b95d7f06472e18be3652ce110ae91cf723d609a01cd4f9dde SHA512 f3a618bbc0274cc9c8e25183448b1f65db11107bc72debbeb178040ab3f5609e4771df00bcd0a9b8cd5f395b982f7d031dae7c3bb8ee71d7abba19fa21534dfb
+DIST itertools-0.9.0.crate 96429 BLAKE2B 36d3b1dec7ece85639337f1a40a00330a5216ea8c460d13e52f0f9fea71bed5b3914cc4a7e05b407ed41e0dbc2292ae5873b3481297edcd92ec547866d044b8c SHA512 1c6650060750f3073140c4a77fc4d1acffa7d18320012807df0e20ab06ddb39afa7f086d89626e3909f89dc1f0408c9ccee4dd9454ca1f7a6a145bb213e7c5ce
+DIST itoa-0.4.4.crate 11147 BLAKE2B bb6f1caf1e58dc313bd3cfa2cf81252cb2ebc15e1f4c9adfcdedf46c5fa79811d5b0cbd58f1e91d1f62bf85d7b941b0dba535814fb43b5b70a38db791b45717c SHA512 f5e04bd908457e7592243ce64a99c5283428b767f4cc17d77946770411b06fccb0250625263c3e84a02a018ea7e8a0e4216e1929a71988bab8e1dbf603d3801d
+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 libc-0.2.60.crate 409744 BLAKE2B 1d2dfb912a0a01d93ef10d57ee7d2259c0b82ec29b34a0f1c4065c6be080685f556407cee896bd74b01136a59d9c583258818118c81e9ecec5a6387569affe77 SHA512 649bb508f5e2800712618e76686c12dd3e7956ce2197d620b1b53427496296889f2743cf060e53400b33ea86982dff2c7d7c85b151fc1233895fb4c7f786b39c
+DIST libgit2-sys-0.12.13+1.0.1.crate 1555713 BLAKE2B 2b8455575182d4e56be1dfe392b4a55cb04b2d61c18982623dfec182ff348ac7ebe42cfce97bcf8e4f17cf55efb6a85b7e31553d4ccd1911c91748cbe8d0df6c SHA512 fc8a1e85ab4d23a408ff5f0af9cea16db6a9a30a68885340431ce7e26bc4e13ae50c96cd09485c9f3bc3f74ab57cc16e3b50f0a73ed8c67571afed289bbbd913
+DIST libz-sys-1.1.0.crate 1324239 BLAKE2B cab82119fdeed84c3c4d37080b2065002dfe9de7b9bfa63256a61ff98cf06fc08e9f1edf02288589085d0f7a400335338b50f9c5f7bca5d2c71fdad433e802a8 SHA512 2d7ca1dc376d77c8b4b764d02bb6371c72ab6f07def5f50b22d77d19631e5a1f67d2e1a51c4cf7766fb365cda2286692181c6a05f55126404033347f307b9283
+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 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 miniz_oxide-0.3.6.crate 44717 BLAKE2B 49d69fee6911ada1effe8ed73072d7815ed94a2705276698a178fc77ebf8c9e92eb286d7d71727a894f46e605afacd620d48d6aecf8975d2366e46e2c8c8bfb8 SHA512 d041b41617ae0e614f85bcfeca31d0c9d031c24942f786f43166e34ebc37bd67e3b9a44779e74b119e3d95d288d0842736ba709dd2faa3cb418415e2c86ccc93
+DIST num-integer-0.1.42.crate 19463 BLAKE2B 91ea6900dba5a38bc7ac4de0db8706f5335baab636937e9efdb1b82ff0e8ece4451503de3ac9e473a4dd7c70d599066f14840789fa88aeedafa585f0f98ed61a SHA512 8c7e0529888e18b872a634e8983034b0357143aa72914b45c02ee87447204296970e9b1ed078d9436ecc779f25360b1a1cfaae5a9bf7c8ffc68793d7c25593b2
+DIST num-traits-0.2.11.crate 42000 BLAKE2B 78584a3e8011391b47c7ce45c5a63da5fee88aebc2ee7ae8d788e22b1d6cf46e31e70b7bf6ae094d35ed8dd5ea4f91472e6050c526acff3f181ee383fee139a1 SHA512 12d73656db34456a30de7538daa1efb6e6f61353a0e274aca388bf184732402d8eb8ca19282fbf51975e0541b5c8d764a0148abe346061dc81922d5eb12592e9
+DIST onig-6.0.0.crate 30200 BLAKE2B 9e9ea6ff6345db408a09ee78e57acf12ba698bdd90c8a41c7c9a9e17df048570f6241de2ec3be8fcea661be66665a3ad70526e24113b09ee97d87700b1eed782 SHA512 f5ab1586c23a96b813300d0478c6f4d401f3a6e44c562f72cc251225374811d3d89ec77b2660a10b5b52d71e4c1656f1f9fb9ab640d227af308401162663be69
+DIST onig_sys-69.5.0.crate 614674 BLAKE2B 3f98097a709b1e95e84404b81ea104a4800e0b9f0713e988c6417c36e578b8148a8b5bb8c6dacd2d59d760ed79d8cf1f93f2ae2cec7ee8abfcb607e5dbb92538 SHA512 644019ca67a89790bab5cb173f5499bf3b0af5a4c39e027e79a63e5752f471c6bff86f679e1c86502b6c3cf795c23cd461a87c36b2eb687dfe21e9d232bcb7ac
+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 plist-1.0.0.crate 39489 BLAKE2B b7a968fdf07cab728f64f60a002b1cbf14946431e42f39af4e851469834c58b20b6555d80b51325552368cdacbba27d62c34f7c02da599eb1d06153e52b22de9 SHA512 e8d5e70fe882ce0c471f6a13ea0db897e10594ca28c8113814d7c38a3ed92c90f734ea45646ea12bd6f59c17e060d2269229d191ba9fc3d514e0fa7ce2bfb855
+DIST proc-macro-error-1.0.2.crate 23699 BLAKE2B 2d8310300002d1dc3fa68391190c5536e1faf6be05f1dd2ed1429d530dc527f431bdb93a994f2e68ff6120523b0d10a4a2ab35a0703f3013b404d0b82ab68372 SHA512 a9ec65c02f853f05f6adbfd398a82e84dac5bc376f041ede65a47b510914f5def1ae480c1a7e68aa6fab836efb6bda0d712d45243472b73c12d1ce7cdf8c3583
+DIST proc-macro-error-attr-1.0.2.crate 6974 BLAKE2B 4b8fb0c70873eb487dbfbcd37d5a5dae6d877a910f3523d9985a511ea97795082548f03bef926ca91028340dada954217926e7b9d8cc70765343f6d86c1e7c01 SHA512 1fe7ea1e005ab4d6b777b2caa4a5c2ad7655b5375fa987b0b2cfbec6a0673d844aee2dc273dd327687dcdf21a165261e78175eed69e881dfbe1f2992eb505c78
+DIST proc-macro2-0.4.30.crate 34731 BLAKE2B 0a27a06151b54e4ba50f08803a5de44d9c7702ed72cab1b775408696057246e3336dee3a61560886cb24fc4cf582339c8bde7d9211e4e0524f2c719b774339be SHA512 73a8de3f1d76a8baf2d45afc1497bba8c0cbf231bf9b6750b9cee2473f492d5f3957ac149998da720acc8287c96d604971b51dcdfa629523bbdd97c297856ac0
+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 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_users-0.3.1.crate 12557 BLAKE2B 42810692ff093b9ce056e5b539834ec3fcecdd5cea6a1ec750fa456c4293ce483a9de6105eeddc6b6f41c591c7f292b744b4f12de65eb634ac4b855e6fb450a6 SHA512 086a01e32fa5b5fbccd2d84e23141e3ee5a50e5ddd6135b579c75db5a0eb7df676dfaa8e2582038ef19c09d123fc68e9d0e99667d4ea46f5011d4e7fcf5692a5
+DIST regex-1.3.9.crate 236683 BLAKE2B 29bd39b138a8168015bb7a6b36bb5f7f9918b7c00bca28a720f3dffd5b805d3374a6648a04792585e85922e099faf547e5d02aeb23008b7802424351633ea23a SHA512 425713d3eeb4132d4056e6c1a08bc2fa5032b9971987c531b5707a9b5670ae15f037bd68921f1545580801957d1ea283eff87e533477364c7f76823800202f74
+DIST regex-syntax-0.6.18.crate 294440 BLAKE2B 355d6a2704e1267064719927269facce1f1c8897566d41e54741183969cde5e56c38d0c0b610b99dea3635de20fa00ebfb8748ceea331af6984198d927a93b73 SHA512 9cd999837890a87d0cc6bc351029a422bd52e5c621763e5c11ae9dcf1ba5edebabcd9e6d70db0b1656072a6109d439101412b3aab0d6ad357ae02ee7039a010e
+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 safemem-0.3.1.crate 6931 BLAKE2B 4f8a0301ea9d8bc6c74d9e379a2b9526a7d39fa03252b53f69e1baecdaf4ad23fc8c6e21bd36f2754b0dd9dcf608365c2ba450ca023188476ec92b4a7d6612cf SHA512 e2555f4c78d8ebf0457d38fbe881b708c5f2c8625c00a1d00054915ec4c4e65e3e84de7281928176ccb0c9a63a8a6468d791744ed4650e9d628b51d8b62bee66
+DIST same-file-1.0.5.crate 9861 BLAKE2B 3f65c5cfa1ba526157f838ce10695c56dc9241b044890629a3bd7f589f3049b04944d70ce10f371f6844343222954fbed5674c04eb6a7b934a3a6761fc897825 SHA512 33be985579210b64eed7e26f24a695e2a59992ae51723e5aa026ba34dbb05be4c377bb25db9797dca1f70aa4be58f33cae32a89b61fe6b9353de9fb902ba2dcc
+DIST serde-1.0.98.crate 72417 BLAKE2B f0a49162951fe9e69b02dcd1f24ddf37aee08e23128de15e4a4490f07bda9f1c56d9abe3b90422152989d4485e78ce9e0da2ac8800d401922fe4732640755845 SHA512 a949d803c7c66312f280483c532c705f8b3a2b4d058b717195ffc539ce9e92bff707a585cb9e2f52c16152107edab40ff8bc4cf825c06f6b73f1fa189cb9dba7
+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 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-derive-0.4.12.crate 19742 BLAKE2B e1da17d19b5244ebc32522827e7acfe4133bb919374639f775864f7bd4b52fa16374640d4022f839ac682954cfd07c692d70329a347281d9dec4035bf89c7afa SHA512 ef65a34b9a9f23be853340413cd5847434b2c3279a401f938a0a82d5499f9c17968b85f13c60a058a69fbe78c7c24380fca31f0e7ef86d986fe15a082353d98b
+DIST syn-0.15.43.crate 184065 BLAKE2B f0f1f97fecc71c91da6ef9d8c5be43f0a320fbf5d7ea6d1d6ec6743735790adea03b0058b8c544b1b06ad7618b7c7b56c64ceff5ccbfd2cc2240772cbd46e720 SHA512 b2b022706c802a601b92e21601113205b147c8129b9c0e6fa86d0c4f823fc3ac3c1bcb48f678fb2396c76759580254b16f10267d8d22a98a733dded34ebbadae
+DIST syn-1.0.11.crate 193782 BLAKE2B 17e0b40ee69575efea77249343af2fa67af0990f08ac8efced152ebb88ad1301211306a2317ec163219d485a097878f8552ca353f43f35ffd5d172e6c92da0df SHA512 6b361c6cb27aebb3da5e81db270e7cd0fe8bfb11289c25ce46127214e222c2b64f53164c8869de41b77e9b780f967454ed5d7c5b73442ae292eadc4dea77494c
+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 terminal_size-0.1.13.crate 8094 BLAKE2B b46de1f0dfdd6f4dd44c21a5cd7936cd9fef67d96be44775c29f3850e39b94f200c719bd0c0c31727725f1741ee9640a83c1f3083a45ed665db7f03e50793826 SHA512 75efac1092c6919efc7d427e3cf7d4c36a4d12b3d5c38ee35f94ddf2fb0efcc16fb92e608382905475d5de3078e9c64a29ec77816572797fdfb53a6708eaf266
+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 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-segmentation-1.6.0.crate 90703 BLAKE2B b7d63bb8b62cabc604084957aaff021df24a1291f0ebdcddc424cceefe10ad399ed53152211c3e7557e39e21255166f922256f9f8e1fb488d3bae368b49a378e SHA512 80c6f92d9b39602a05809dc63a7cb05a305441689b6056801097a882a36c9795aabd660f884f707daa7e7fe6ad4983f6e245c226962cc982dbfeea2ddfddf41e
+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 url-2.1.1.crate 70383 BLAKE2B c4096cb1bd50e9ca97fcdae0ee8b58957e21507607eafa8d84ff71c3df1ba52c68299609776f7baa45c93b971f8b61162fd8afd4174a5c7b66f36dc673707fa0 SHA512 a16c3a625fa85be9305f8150d5711c3e3aaa1f33753e7ecb8368b176cf3ea96f51fde74598c8ea3a5db2effc338589fd2834b297a1fba4bed967fa39e670fabb
+DIST utf8parse-0.2.0.crate 13392 BLAKE2B 05296f48fe429a871f42e729e3540ec3a974a69892c6bc9da95e23c0aee2163c9b115a9614eb1943363076793e17ac4c89e28066a9816cab30c451524a5832c0 SHA512 1f6a2eca32e42c8e4b53d28c4fea54c426ed66fc01447b3cf8fc0fd75694453eadbe3ba000ac8ee0347d16dbfec47681254117949109081798eab5370886827c
+DIST vcpkg-0.2.9.crate 11279 BLAKE2B fc36eff275a69d9dc959cefa730b8ad53f4f277391d4858658ca1fe0bc5ebc4f3f311e46d5e5a8fe4a404fa135362f3115830798b7746d6b562e26f966659df0 SHA512 fc0cf61329f1ca0c16357749edf10a468b5e07cc8353cbbdb1af275b1ef450b07291280e128c7768cc57e23e5f20ef6bcff78a9af7d3ca44d486a709f081f83b
+DIST vec_map-0.8.1.crate 14959 BLAKE2B f5c179ccb4349d543747d5e3bb3edfca4bc9f3f64ba3c2d40fb1d9cba98433b7a0641387aafda6347c9b3603592c64bd820b217b46fbfcd37f802f298e5793ab SHA512 026cf10dc7ba98ae51dd312fc847cbaea41c25f0da5db6e0e22c2ecf75584bbf876d7bd96035fbbcf6696d702d5a3f25977e02a2d77cf519aa21e3ed05710e40
+DIST version_check-0.9.1.crate 11459 BLAKE2B 72f002c00504f635b7d2d7ee7137e07ba9c182d2e41d32a51851896f6bf6742c5524b7f66946437ba581ccf80b9c9a57280dd4b02df0918569ac710511940fc1 SHA512 b9cf363169df2022a961f5bed4fb7da07513e0283a85aa69752f6ac567e942611ed2216ac61799db1a199e2bdf0fd9b994e35d4a40c6cd80cd26b97cbfe977cf
+DIST vte-0.8.0.crate 23854 BLAKE2B 27fdd36358b5d10f2b30e2dd8d0f0f3201263ca86bb5e734966cc67099a125df91512c39ed8dc06206dd3db90f02cabf7ba85c6471c402999c7529c2d607031b SHA512 c4545c8e12bdb78674434eb8414dac9d2885c2547f302d19533eeb77dc2dc8d97f077ace4905f8f105269e68b808bd01a1a825ddb86fe5947c8a4acf18ea4ee7
+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 winapi-0.3.7.crate 1075776 BLAKE2B 694cea6d0d14fbe85ba718c0ca7b9db79ba8f943b44f4741d77000617de43314a2c657285736a032c138b5d2095b06146a2ac8d84b8efe2307ef44bb7073c604 SHA512 6871b93ad8d48e39b90cb7b31b3132f84665f965b4dfe06fcebdfb873e7d099007cf3d7a50e832a941c3425ad2f39c3ab48a77151e60863685b97fc05c71d134
+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-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 yaml-rust-0.4.3.crate 45768 BLAKE2B 6af7374439000dc5e8795b26fccb1bc691040846f844e10765fe5df06237f5cf52752b0f9d25ed7c6f62337f628ee7be2e024f8aeb6b55a7c76f0d3b2ad0489c SHA512 31b0236fe041706befa938cdeb9c74940daccd2f80bdbd4e0e890901c868ecffc39367a41914c8bb98373d1002904f18b18ff13a08bbecd19dec634c08b7a7a3
+EBUILD git-delta-0.4.4.ebuild 3126 BLAKE2B a5c661998ff49b86949fa804c2daf8898c6bc53803c6cb73575dc67b73951347e1b5ea51132a4f57151c00f0d8ca96b508d51a934b79bfcdcb407a4601894ff4 SHA512 d5076097c1612941e1978a8c70d874413e3e790ec78e42910fbe3e5f308a30a12d11d99a359aab1928ea94649a99a273fee8806825c851cb33d456fe2afc7628
+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
new file mode 100644
index 000000000000..f0c7d558abdc
--- /dev/null
+++ b/dev-util/git-delta/git-delta-0.4.4.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2020 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/metadata.xml b/dev-util/git-delta/metadata.xml
new file mode 100644
index 000000000000..0a276916cf10
--- /dev/null
+++ b/dev-util/git-delta/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>sam@gentoo.org</email>
+    <name>Sam James</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">dandavison/delta</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-util/gitlab-ci-linter/Manifest b/dev-util/gitlab-ci-linter/Manifest
index 039be153669b..23c2b73cc76a 100644
--- a/dev-util/gitlab-ci-linter/Manifest
+++ b/dev-util/gitlab-ci-linter/Manifest
@@ -48,5 +48,5 @@ DIST gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod 25 BLAKE2
 DIST gopkg.in%2Fini.v1%2F@v%2Fv1.52.0.mod 23 BLAKE2B 4e15082dd2b6e386e93baa78307538fba456343420c52605d453c6309f256e8062ea4b821d70c926096ae58a8feb33c6b796726d2dcc886c58e8293f99ac92a7 SHA512 7650ff592e6f5a0393f794fbdf17a28ad228a2d29ca79685c9ab8d9ec395554f1691b2a0d061e6248cf542f89be4d9a68884f7b24de7c8ddfef9c02cfeedda73
 DIST gopkg.in%2Fini.v1%2F@v%2Fv1.52.0.zip 60570 BLAKE2B d278fe137f1b7c3954aa7bf2a9b140bc5c9e1e92c30808e906a7db89c1f52c41558a26834f3f9e40470b0db9fe0378dd13edebc9d011a56607f9d8439377cd2c SHA512 1650d20c77a249a2cb3fd391ca2b0fdadccc9fcbadd33c82c347303f71aecc1306d0f8261986c71bdb8f33200de9803e055cbf6e17c55e98255e9db7e82a16bc
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
-EBUILD gitlab-ci-linter-2.2.0.ebuild 3104 BLAKE2B 61929c407f9e79d5ca3f2c80f4c7f6460473f4e3f6c3f891156301c50c03e05777ee40258a361c2ffa7748559aa7173154ba19814dbcec4f2adae2efdbe1ded6 SHA512 bf6455d4e4ec03aa5b30be9a88ed5c9c2597e55f1b2f7a40d3b7864d090bfc9956c9ecd0e49c86b91d89d99babdb3feeed9aaf6217f0253300fb3b2d577b6027
+EBUILD gitlab-ci-linter-2.2.0.ebuild 3103 BLAKE2B 808d778b9422f697ef303f1f35ba299ba9116cf25c2d3a0fcccbd14051ce5ec58d646034f66f8c8ba3576d78272d4146bbce662f63f586942bbf6bffe6f62594 SHA512 a83e554c728fbcdb15d45c82d3954ea5d52fd39749a91a1b1f00b91d5bd158a81b9bebe1033a9e5578bdce76fc51e98796407af23f986692952d20ebc770a2dc
 MISC metadata.xml 257 BLAKE2B 8a445824133c1734e7b46cdd3a60bb4ac98fb4159b48856d0e296c796c700a2d9ec9ae3c94072f07aaaed98ac22088892b03c358e577df9cfbafa40194e756ee SHA512 9d6339780243409ea9233a9f5faa5c1f5b13431d35792fc6986ed5c3e9ae2e21139f44c11140519ea6cf10ab6db1d06408c1305af9e99cbbd1f2d4b27361a13c
diff --git a/dev-util/gitlab-ci-linter/gitlab-ci-linter-2.2.0.ebuild b/dev-util/gitlab-ci-linter/gitlab-ci-linter-2.2.0.ebuild
index 9ea4cb00364c..c08020267b60 100644
--- a/dev-util/gitlab-ci-linter/gitlab-ci-linter-2.2.0.ebuild
+++ b/dev-util/gitlab-ci-linter/gitlab-ci-linter-2.2.0.ebuild
@@ -63,7 +63,7 @@ SRC_URI="https://gitlab.com/orobardet/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 S="${WORKDIR}/${PN}-v${PV}"
 
diff --git a/dev-util/glade/Manifest b/dev-util/glade/Manifest
index 8d0ae21db1c0..dcf900c9bfc7 100644
--- a/dev-util/glade/Manifest
+++ b/dev-util/glade/Manifest
@@ -1,6 +1,4 @@
 AUX glade-3.14.1-doc-version.patch 853 BLAKE2B b7cad3cc9d49cfe24189ba21bffaec2c524d3c7953d722b3b03d57ad68297fee6757330c1a2d90f36bcfe52d1d9ef4d95b81eeb19109bc8957f671ac40d31573 SHA512 cc9aec06f6acdfdf538de7043f9f753768e0e4c26fa9eef7e52b4e42aa6fd3836185c18ffd51abfc2aa3e6f5b2472e68914112230d2b8856e8a3c61e9d865ecf
-DIST glade-3.22.2.tar.xz 3550008 BLAKE2B e1217e221b36938937c57ae465a3707eeadc52bc9127b3af2fb6514e572676e3e284811d5332876dce110fd321e2bb33b9ac8b0afbd97dd747725eb73309dc15 SHA512 cb82684423ae055bc8e84a8705529ecdc72957563f444633c2c5c24a922130de84c212537323b6ed259f0e29349b52dff608822610b87babb8fc3cb468a5f4b0
 DIST glade-3.36.0.tar.xz 4466808 BLAKE2B ebc93c9471225782bcbcbafc4a475638e77ad763d607188d95e8ac77b3de70f76fefe963027bb6b32ae71adeb1daafdb1a2c98363b25030d83f20f767613f68e SHA512 c984613ade26e3fe68a700a48cccadf5ac96eb716a6e90aad36f3de684faeb607d9aaf112d74a048cd33e222a02388ee6583ca915648486f0259cc805e16d243
-EBUILD glade-3.22.2.ebuild 2315 BLAKE2B f928f40ffcbfe130cfa95f66efc38c25ee98527d1955863247c0c725ec0a73c1d487b15706764c80c7d5023a9afb3c46fc68469e9bb21d17186d988c45560511 SHA512 ef69855f9ad86b60e889b571ff0d7dff359eecccb547b8be85d4717b0a1fa7c0c84a990909826c953ce62916b3403b062bb9eb58807f727579e4923c1da0f11a
-EBUILD glade-3.36.0.ebuild 2295 BLAKE2B f25eb520062b263521bb5f36d500593a3d5c93b7c9404744a4acfe506b3d37e0b1203dbe170a78056031865f92785932adc0436a9f7af1a148ec0623aed76d7f SHA512 bf1f9cd681f6358c9e5f2eb4d7beabfc9192881dac89a8b14d6fe85d10583d8b56136f10d7beccf1d1c41987f1d5ede0e98d88da601fc19e33487dc9835c43a6
+EBUILD glade-3.36.0.ebuild 2293 BLAKE2B c72f4e91e14cd01efe01d47e4070ff262437aee981523744fcc626e07a93950ab2490cb6b40e125e9d59ea2ec4ada381b99718e7a23ed1f4f4b76c5bb164981d SHA512 abbbc0518764471a3af1c6ae874bffd743569f6d532ecb73ea3c36f5015e6e0c798518638a450925f5a65d645bd5c270a46cbe9e64510c41d768fc4ffc737475
 MISC metadata.xml 358 BLAKE2B 33f3b46ab877b311931205095fb2b357fe7fe2da8820944d32e8a16f2dbcf99033f95a17f4cefa4aa6d0f731c72d0f65683a8cc3b947ebf09d084f92e796f887 SHA512 8840ebde12f26a2caf856e75f3f706e3c9a7a7a771d0deeae99ca6b16f4bbeaf119bae7776a8a0bef8b7422f52ebd6498a8b5e862af4548886249386dcb44480
diff --git a/dev-util/glade/glade-3.22.2.ebuild b/dev-util/glade/glade-3.22.2.ebuild
deleted file mode 100644
index f05b9e1e1172..000000000000
--- a/dev-util/glade/glade-3.22.2.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit gnome2 python-single-r1 virtualx
-
-DESCRIPTION="A user interface designer for GTK+ and GNOME"
-HOMEPAGE="https://glade.gnome.org/"
-
-LICENSE="GPL-2+ FDL-1.1+"
-SLOT="3.10/6" # subslot = suffix of libgladeui-2.so
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86"
-
-IUSE="debug +introspection python webkit"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	dev-libs/atk[introspection?]
-	>=dev-libs/glib-2.53.2:2
-	>=dev-libs/libxml2-2.4.0:2
-	x11-libs/cairo:=
-	x11-libs/gdk-pixbuf:2[introspection?]
-	>=x11-libs/gtk+-3.20.0:3[introspection?]
-	x11-libs/pango[introspection?]
-	introspection? ( >=dev-libs/gobject-introspection-1.32:= )
-	python? (
-		${PYTHON_DEPS}
-		x11-libs/gtk+:3[introspection]
-		$(python_gen_cond_dep '
-			>=dev-python/pygobject-3.8:3[${PYTHON_MULTI_USEDEP}]
-		')
-	)
-	webkit? ( >=net-libs/webkit-gtk-2.12.0:4 )
-"
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	dev-libs/libxslt
-	>=dev-util/gtk-doc-am-1.13
-	>=dev-util/intltool-0.41.0
-	dev-util/itstool
-	virtual/pkgconfig
-"
-# eautoreconf requires:
-#	app-text/yelp-tools
-#	dev-libs/gobject-introspection-common
-#	gnome-base/gnome-common
-
-RESTRICT="test" # https://gitlab.gnome.org/GNOME/glade/issues/333
-
-PATCHES=(
-	# To avoid file collison with other slots, rename help module.
-	# Prevent the UI from loading glade:3's gladeui devhelp documentation.
-	"${FILESDIR}"/${PN}-3.14.1-doc-version.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		--enable-gladeui \
-		--enable-libtool-lock \
-		$(usex debug --enable-debug ' ') \
-		$(use_enable introspection) \
-		$(use_enable python) \
-		$(use_enable webkit webkit2gtk)
-}
-
-src_test() {
-	virtx emake check
-}
-
-src_install() {
-	# modify name in .devhelp2 file to avoid shadowing with glade:3 docs
-	sed -e 's:name="gladeui":name="gladeui-2":' \
-		-i doc/html/gladeui.devhelp2 || die "sed of gladeui.devhelp2 failed"
-	gnome2_src_install
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	if ! has_version dev-util/devhelp ; then
-		elog "You may want to install dev-util/devhelp for integration API"
-		elog "documentation support."
-	fi
-}
diff --git a/dev-util/glade/glade-3.36.0.ebuild b/dev-util/glade/glade-3.36.0.ebuild
index f9cb7d282148..f69c4dc585e4 100644
--- a/dev-util/glade/glade-3.36.0.ebuild
+++ b/dev-util/glade/glade-3.36.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://glade.gnome.org/"
 
 LICENSE="GPL-2+ FDL-1.1+"
 SLOT="3.10/12" # subslot = suffix of libgladeui-2.so
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86"
 
 IUSE="+introspection python webkit"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-util/glib-utils/Manifest b/dev-util/glib-utils/Manifest
index c2dd7a2db025..43ddf2e140a5 100644
--- a/dev-util/glib-utils/Manifest
+++ b/dev-util/glib-utils/Manifest
@@ -1,7 +1,7 @@
 DIST glib-2.62.6.tar.xz 4703424 BLAKE2B 0a27245be2575c574dcc730dd051a8c284f421dbc46579aadc5fbbacb8f934af4374b61bb26085e5c9ab78a868c567818f3fb9d67adddce37f5c4fec00e0d276 SHA512 8e3972a371f3c1a50b7d245b30e4f740583ad72ba4ab325e0e15e0732be44dfb69b603fb39dcf4989255a23a181e9ea5dd25982dd94c386cd9f21952243ad6f5
-DIST glib-2.64.4.tar.xz 4779456 BLAKE2B 2ff69c794689c97011103459cb109e6ca7021db20a605cf3942f57e7b73eda9971034b8f65f03191f357169affb278dfa9bff309b4ca44605fd5a0ba0d135d2a SHA512 f21fe33068a5cabdbfef54ef635b3f810b389416c3b4b66ae4975e84841834f7b7640d2518d52cb7341641af5761919eebd5e7b25bd2946f3bdd002c4902b090
 DIST glib-2.64.5.tar.xz 4778456 BLAKE2B 7fdee0e16a7ac820f4c4f7dc66d37add464d3005e89e6013302d3ef103319331811d68e9b42db072b82242c3d7badfbd085b69333e770012def89dc8aae7a2eb SHA512 a87537274619b6de88a0e68555059036ac18c748b5005c8d84728646b0db342fde0b8c5b303b9ad79f64d71ea4ed990d52a4fbd68cda3ca74aed5fe4d497e060
+DIST glib-2.66.2.tar.xz 4836456 BLAKE2B 5484a7fe497dbe06df7ce11dbc8836c95dbb01e6e309516b82158f2915eeee36ccbe6e904cb6ae9a5a0223ccc0b52f6e64d61a418bf790538bc90388430977b2 SHA512 30278c066c6b209f45fcfdb9ffc4732236451464506b93c0fff0964ff8aac58c15be85c3793c686d4740d9d97857984bc0ab71e38d5da11c5fd860e569fb6cb9
 EBUILD glib-utils-2.62.6.ebuild 2390 BLAKE2B 6160cd993d8ea330b68812082a1e14c6d9c64e4adc2832bb68693e8a8eacc7598541f19e049a7601027b5fc1624485dcdc9745c7095b07d3b004a99a7f612d44 SHA512 4840e214e3283609722803ac6e52b015cce5e1f74168e318bf78bd0f0d2e7332f35063939c843ed39d03b0c9822a6aa738183bd0e0b6ea1067aae5c6b2a57a03
-EBUILD glib-utils-2.64.4.ebuild 2392 BLAKE2B 476a8576c9fefdee405d0b50dff35b0f8a129bfafee709f76183a2fc291571f0979d7e02a4d0eaaa03e26387c42eda2b5af41293bf7ec5edd3ef816998a98b61 SHA512 68a0504dc5838d35df675774b5f862e7c7cde323f3060576f0200469d21134daf84404618844ea501812d081a9826e9f9b42aacb0ff5ecd3149bacd24ec9fb69
-EBUILD glib-utils-2.64.5.ebuild 2394 BLAKE2B 038afba03a85892f5cf5a4ff3cb6e1a1f4de412987be28a8852c7f31028027374f9ffab2ab2088148fd2a282c9040c248900ab478eca9b75337f829d229af86b SHA512 b81197d03d0b477ec54541524492b2d7234eb4817f3e7e5664ea7b844367789c1610bf92a4979cf291a7ac3002a4a988f10270a224e239807cacd4f98f5768d4
+EBUILD glib-utils-2.64.5.ebuild 2392 BLAKE2B 712bf35068847530523ade60b5d0943a5d8d28dcc0f4ac87d816245d924189716d2b97a73591a687092d99a7a704caea1e53b07abcdc989a70260a2655fca72c SHA512 495167c4c8b091b7f1ed5dfab873bac852d8a7056342c35ac18881ddc310f6ff8970e2625f5773ffa8c38b3a60e944452f8016d275d8296c856c5932559e777d
+EBUILD glib-utils-2.66.2.ebuild 2401 BLAKE2B 520f38ab480c4e463a1a6f141221556b6d20d0857b5c91525170bac962b268dd904f31bb42a60693dcde317ff30a18cbb12300aa027db4e333ea33445ee4e384 SHA512 42cc368b74c34714a28b9189f29cd7a891d0c5fe908f16c12683c0030d5e12724cf3cbdd7ada38d6b5512a0e982a7f44ccfcca0717a3bf250accdf62ef985776
 MISC metadata.xml 332 BLAKE2B 1e3c081ae9a2c8ae53cee6c3ae133cbd5e8543a68c03d4a4f7e164437502d996ea9364789e93114687271e1f472bcf13a418cca5b74ecb95a51849f0a5f3dafa SHA512 f7680d9be4071b841f50ece99b5041dc492901d84ae05383c1ff05b6a73bab804b153a50eb70f5417137f6e2041230c5ba8eaede10f7a0bf8a899508642588c6
diff --git a/dev-util/glib-utils/glib-utils-2.64.5.ebuild b/dev-util/glib-utils/glib-utils-2.64.5.ebuild
index bdb4ef5fb8be..56e015526f0b 100644
--- a/dev-util/glib-utils/glib-utils-2.64.5.ebuild
+++ b/dev-util/glib-utils/glib-utils-2.64.5.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 GNOME_ORG_MODULE="glib"
 
 inherit gnome.org python-single-r1
@@ -15,7 +15,7 @@ SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 
 RDEPEND="${PYTHON_DEPS}
 	!<dev-libs/glib-2.56.2:2
diff --git a/dev-util/glib-utils/glib-utils-2.64.4.ebuild b/dev-util/glib-utils/glib-utils-2.66.2.ebuild
index 9ca1d0e8da9d..03ff214270c2 100644
--- a/dev-util/glib-utils/glib-utils-2.64.4.ebuild
+++ b/dev-util/glib-utils/glib-utils-2.66.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 GNOME_ORG_MODULE="glib"
 
 inherit gnome.org python-single-r1
@@ -15,7 +15,7 @@ SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 
 RDEPEND="${PYTHON_DEPS}
 	!<dev-libs/glib-2.56.2:2
diff --git a/dev-util/glslang/Manifest b/dev-util/glslang/Manifest
index 6dd7879db40f..fc276ee0db9c 100644
--- a/dev-util/glslang/Manifest
+++ b/dev-util/glslang/Manifest
@@ -1,12 +1,14 @@
 AUX glslang-7.12.3353_pre20191027-fix-relative-includes.patch 663 BLAKE2B 4d0e8efd9152610b16813d45251a83b8b685c07d3491c6bc1a1c2656ecabde2eed8840a53712bfd9aa9e6f047f332f56ead1e3c0d8185a81c4de0eb286f5d048 SHA512 db8bf5424aca0eb215db3059665eb7e6ffbbab029979de9f5b574e577274f6d0ca8a27acde10bd53769561eaae2996ec6da1a4916b2c39e82f343c33b120915f
 AUX glslang-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-files.patch 4974 BLAKE2B 9bb7807618a2dd6c322244557bf93809c21631be064bde4fc659724c45cb27d3e615fecde8692658edc1e3d229b4daadfa2b51732ebddb5d49f85abdb3af5399 SHA512 a07654d40172d6669d3ee3c3685463dbd58cc163ce726a20db18237ab710044b011e511defc8828f7ccd8b4fc128bb38f75669686085f7572ce8cc98887266d3
+DIST glslang-10.11.0.0_pre20200924.tar.gz 3246618 BLAKE2B e4353a9cf06273f6a5fc79004c5f97df3da3444a793ddefb6adee96cbcf541d6088bf2f2edc65dea53363cbcb254f7da80fefb8a93b8650adf2ed283b243fa24 SHA512 01551b2347f25e6135ef82f5ae838dbf275cb3f20300659b830c85fded334a8dea3928c017ff7d48d58d89ddf93f5429191f0a326f310db9ee989f622e23477f
 DIST glslang-7.12.3353_pre20191027.tar.gz 3119760 BLAKE2B 4a7eda7bf89b1589cb8a712660589e2746ff13ce3cac589a5651486fbdaa149b0fd8fceb791af0e43c9342aa9ca31459f66d0236c31d22959e519e8eb4457018 SHA512 6f247dbf9a50cdfe7b6ffbf79f73c46c57f8f61ef10037e0775ddd6faf4c5fd4b9b6b6761ecf26cc71c3711a650ee8619e2f0a33dfcf8ca8dc2974e497a685a7
 DIST glslang-8.13.3559.tar.gz 3122936 BLAKE2B 856e6068a06407195f97478b3e6bd91aa619213d8468a8c9ff7ee8e7a36a904e4896e34e021e8e4e047fab6ea406d89206849058a659de8075c52a06118b0e7b SHA512 d2f09888dd1b6edb4f324502627aeca0c78411f61ab50e672fa2a6d9ae46611849e1d13b9c6069b77f31092d843abcf3d74ed7cfc3c9144ced80e65876f4b781
 DIST glslang-8.13.3560_pre20200404.tar.gz 3185684 BLAKE2B fac831212b46b22f10657ee44afc788d174779dd36e9d5f045f8e84ab3cca448aee89aab13771a29598b242653d6a29e4eb8fd8965e1c03ceec599e7ab1fafa9 SHA512 ec5b89d918cf55bb0a166f59eeea3662d54f29a986f979a9b04ab35bc8e02e5b01d13c24f336666669115f90d3d97eb91abe7ba4b9108590ec9b8a78e976223f
 DIST glslang-8.13.3743.tar.gz 3183453 BLAKE2B 2e8fc3693477be8bd6f8000a0eb032b314f5903991dc5a73dbd913a92aa0d6878e45f29f0a01ca5e8453b566d8a503a3cf4256def7f90a4cb561391b047c2a1d SHA512 19169c4ffa511113978af8e8efc57b290d4aa962a4c2429dbea1af72204787c6ce20ffbbb452dc04bef5416e00510819d84463a2e76295b9a59b409e12af6792
+EBUILD glslang-10.11.0.0_pre20200924.ebuild 889 BLAKE2B 70980aaf60163f39d478a9c2e6b3037f9d5fe62541e174554984765958152cd67010c59c2e10953fb084a53f034c2dc286d8babf88093c35e19bc51ff2c0669c SHA512 24d05f0e30ef28a112a218738116fe0a3537a049286950a1ed56a3be44bcff9a3075f530bc93b603bae74eadb82fefca2646425fe3a739e7eeb216ecd3c01c94
 EBUILD glslang-7.12.3353_pre20191027-r2.ebuild 848 BLAKE2B c21ffc390e783a2abae679b7c10b20b0f6b2c7c0240638a54b2717c0e65289006b367ddc96115f6234a3c999515314736011649283c14ec73aec8c37abd26710 SHA512 d6b739906ffc084106aa5dcd0182980c91a0874b1425f1eaa2b05e206597e2f7c807f87c02c8fca0db5c1f9860a378579cbfb4646f429bca72de672c151e87ee
 EBUILD glslang-8.13.3559.ebuild 759 BLAKE2B 64a7cb4e904a835110d41ce432dbb04a2e60efd884daa5daea7f36eaa6356126793239889b0b69ce87ebdcaea2987550b84405c58553dd87276a579a61b788f2 SHA512 0a362fa37d32551a976a8ced67b9dee1556b3c8f5c90cdb7446643c4ea4f07e388bfc9594e9de9ad3daa5f8c638db3373ef6592566ed72349dd892c5a24777b6
 EBUILD glslang-8.13.3560_pre20200404.ebuild 870 BLAKE2B a79d014151d18393e8fc95cd4bf3ca7eb859ba7250665ea97d3f77c60973dd496c0ca82a1c0f90d5870bcb6b2e87d5fb29ee9bc968b70b9df6900cdc90827f6b SHA512 47ad53da564d55ab780b5a69abcc232798f2c48b9babf9391416abf34a8f7871ffbb27d6893cf98caf56cf079b3885f06e8b6e60a3407a5e051938beef7b8cd7
-EBUILD glslang-8.13.3743-r1.ebuild 852 BLAKE2B acd69f5e3f528b6f4e8a99939a97f22d7768461e94efa8138cf1dcf148ced8c6cad554dee59d03ba0b1194c991c6317cbed12d8f7d2e783f29fe584afc0b67c2 SHA512 2f12024cfd1ba3e9edd96e1a307812dc49311d535987625ab42ae110a8393c4b90c975526f03d186cdd38bd79b90eb12fe553c1e4c6eedfa3bccdcd3cae03db0
+EBUILD glslang-8.13.3743-r1.ebuild 849 BLAKE2B 1d1c72d989d355232f47950c46c56ce92b3b78c12f1d6d9bbbc382f868b5534723037a8e03f1b65add39ee352fe37559a48092577b41b60e230cf9574b017c58 SHA512 e4bc4ecace4c588b787c40b959660e7fb93be18210aedb712e7cdc4ab0153067124d138286747f99f7eaa68083e3be977d5605349dca54ff1710963578cceb85
 EBUILD glslang-9999.ebuild 758 BLAKE2B f4f9a1e734aff4245c035d872d6c3a04abebf472730398d666bddab58cda002843b4dd9f06eac7d652c4db176cc9333e025ad27ddd1752a509786e12e341f9d1 SHA512 dc7eed08504ce61a142ad4ab3e6a9cdef360163dc5deb29dc61823ddf25f4915abfc0e127900c0acaeea3173e46c2fc152eaff41bdb6313861b04c052c57925f
 MISC metadata.xml 330 BLAKE2B fd98c615a1b5c3364e122b66d18e9667ff1bae51218e2474862a0376f352421cfbe7aa3b4f9751ff8e8f24510f4a6e3f0e1977ca759b566b54f48fa45243980c SHA512 9658890a6aa3ae0c91e71416c3996d9c8064bb970521b5c444d617fc4a51ef2edb62aa7d44b25ef96768417de0c5478999e74405c6d9ff847816311990c945ee
diff --git a/dev-util/glslang/glslang-10.11.0.0_pre20200924.ebuild b/dev-util/glslang/glslang-10.11.0.0_pre20200924.ebuild
new file mode 100644
index 000000000000..47b7b64c6e30
--- /dev/null
+++ b/dev-util/glslang/glslang-10.11.0.0_pre20200924.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS="cmake"
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit cmake-multilib python-any-r1
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/${PN}.git"
+	inherit git-r3
+else
+	SNAPSHOT_COMMIT="bacaef3237c515e40d1a24722be48c0a0b30f75f"
+	SRC_URI="https://github.com/KhronosGroup/${PN}/archive/${SNAPSHOT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	S="${WORKDIR}/${PN}-${SNAPSHOT_COMMIT}"
+fi
+
+DESCRIPTION="Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator"
+HOMEPAGE="https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/ https://github.com/KhronosGroup/glslang"
+
+LICENSE="BSD"
+SLOT="0"
+
+RDEPEND="!<media-libs/shaderc-2020.1"
+BDEPEND="${PYTHON_DEPS}"
+
+# Bug 698850
+RESTRICT="test"
diff --git a/dev-util/glslang/glslang-8.13.3743-r1.ebuild b/dev-util/glslang/glslang-8.13.3743-r1.ebuild
index 95e57fdafa69..09634fb83a93 100644
--- a/dev-util/glslang/glslang-8.13.3743-r1.ebuild
+++ b/dev-util/glslang/glslang-8.13.3743-r1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	SNAPSHOT_COMMIT="${PV}"
 	SRC_URI="https://github.com/KhronosGroup/${PN}/archive/${SNAPSHOT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+	KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86"
 	S="${WORKDIR}/${PN}-${SNAPSHOT_COMMIT}"
 fi
 
diff --git a/dev-util/gnome-builder/Manifest b/dev-util/gnome-builder/Manifest
index 3527b789dcf2..560e5e3cd346 100644
--- a/dev-util/gnome-builder/Manifest
+++ b/dev-util/gnome-builder/Manifest
@@ -1,8 +1,3 @@
-AUX 3.34.1-optional-vala.patch 1249 BLAKE2B dcec506c976b6438cec14d941b911cdc11fe0941c4a1a1590e6069fc42dcf12d6e76fedcc0b356e2ac6e5f4558851bb041fa3de4b54d7d9161cf2232965ead21 SHA512 e037dddb89330807c48228600d43ef34569e9fbfbb4b75b9ca2561d7d5ee25d1953ea94afb85ee3555eeefdd3105cd402c2b231584ae241ba661ca0ced28c046
-AUX libgit2-1.0-compat.patch 968 BLAKE2B c17cfba66245c6dd15973a094a89b5fe23493e2f83521c80c214b0ca9edde99fe8982ff73cc779de07b8a4fd548c8a85ca7570d2828299cf7b1e9e599ff9c5cf SHA512 da367d649bf14e1a4b8d0d59e446e6198939fc25f49484eb05d0f9195cd1136d098d581781e872e80f385996a7b043fd5756fea12fd24a931bece04b8ba3698a
-DIST gnome-builder-3.34.1-patchset.tar.xz 44680 BLAKE2B 91e91ac8d0fcf6b54d32ce9f1dc209ac22db790a29d724dad20e337fe1962f3d407b59e7f976f1e88277833849c962a470346bb5a308e39b637e6e9ca1dc2c2a SHA512 a114346b093976db227087743a7bbe2ca9523b64a67c95729bfeb7c3c346b3bfb4d02f5e11d36bbbaf506bc7a7f140883bdea7c78407243287bc400dfda43b57
-DIST gnome-builder-3.34.1.tar.xz 11974748 BLAKE2B c34a31c50b327d02632ff18d48ad59f925306901e8874e0c7811b9258c56027403de0d9dc1877c696d96037bdfcdcc27f56f59a41d232e47b330382b1dbf67e9 SHA512 886c732f20563818dcf1deb96d4277fe96a9499b999cfbc7a64286e816e9a36bb978932d36a1e764b54c2d36891b7546fa058f51e036b0fa101c0872f4ce51d8
 DIST gnome-builder-3.36.1.tar.xz 12026976 BLAKE2B d833665bb71b1549fe789d05dbd89db588ae4cc7187e532f38f3bd9e779bccab644d9f9bfc4c84bd484ac678bcf8594e4aa4edff29ea8c87c5c557fc3e422a4f SHA512 284da6e5a9e766cb6f6122f1134c779cde8406b006728ae1fff3518020ef4b96239aa5037cd2d35cfe4728ea088d61c4eeabc39ea753a16208fdaba7b04e63c2
-EBUILD gnome-builder-3.34.1-r1.ebuild 7373 BLAKE2B 92642b4c86bb5eb125ce98e2e1e0ebd88e899fd8190de1ead83f1407a78baedbbd7c99978b34e0e6cf4b070dd5a06c5e0488c0a1b2142aae8ec955ab7268f284 SHA512 c56c98b53de6d4de9e3100caf907d0d72df9c8ed4df585578713c69c8cae66eb323b4fc92fc2339d41df5dfacb71eed476494c66a288d317a28b4f66963e28e0
 EBUILD gnome-builder-3.36.1.ebuild 6736 BLAKE2B 5d431790f425c8030785833770b60e374a80faf3e9c11c3a7ec5874c66bc5701820d430af57bd43f3335d87bfa1d2417a1402f6639376462342f2d5de1124050 SHA512 91ff5b073bca65e41dc5834b1363bec51c1217d9432c4f05f16990852673d1da36de188758a0115446e43114c5c6cd089a7f28beb8cabd7d893122a657029fc6
-MISC metadata.xml 1085 BLAKE2B 0b2bdcfec562b85e54880c819a0345c2aedf4f8b1c0bc34b7b4e3e8551697dcbb3ed93da1e016f3a164bb677459e8d628ba943252e51e842152282c3757f0232 SHA512 58890d32c2d04d63eaae8489ea68054ffc50df5bf9970af6b159b2dfbc99b8ed2d2db80aa29907463c137caf5eb8aa129c1470d1e19ccbf398ff8789f7f63987
+MISC metadata.xml 976 BLAKE2B 088592bf7fc4c650b17862e771d3283aced4d7a5003f66938dd5830c4a8b88884fb46362e50745b09f9903347dad3233b1ba8339bdaa66c7ea9f70024071a3b8 SHA512 136ec6b271c0084e86f8b7e309f46cd89d382e96d815269f50f0dae33795084d17790daf360fb760a17a2d4885a4a5aae5f8563449160ebec49bf4c9f69438a8
diff --git a/dev-util/gnome-builder/files/3.34.1-optional-vala.patch b/dev-util/gnome-builder/files/3.34.1-optional-vala.patch
deleted file mode 100644
index 6116de17267d..000000000000
--- a/dev-util/gnome-builder/files/3.34.1-optional-vala.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 84249e315c4a95b3ef9421dbf8492e10422e40d9 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Thu, 12 Mar 2020 13:28:38 +0200
-Subject: [PATCH] build: Make vapi generation optional
-
----
- meson_options.txt | 1 +
- src/meson.build   | 2 ++
- 2 files changed, 3 insertions(+)
-
-diff --git a/meson_options.txt b/meson_options.txt
-index 8984e9f69..27f9a368b 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -13,6 +13,7 @@ option('channel',
- 
- option('help', type: 'boolean', value: false)
- option('docs', type: 'boolean', value: false)
-+option('vapi', type: 'boolean')
- 
- option('network_tests', type: 'boolean', value: true, description: 'Allow networking in unit-tests')
- 
-diff --git a/src/meson.build b/src/meson.build
-index 113a142ad..b0510270b 100644
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -134,6 +134,7 @@ libide_gir = gnome.generate_gir(gnome_builder,
-            extra_args: gnome_builder_gir_extra_args,
- )
- 
-+if get_option('vapi')
- configure_file(
-           input: 'libide.deps',
-          output: 'libide-' + libide_api_version + '.deps',
-@@ -165,3 +166,4 @@ libide_vapi = gnome.generate_vapi('libide-' + libide_api_version,
- 
- # Must be after vapi generation
- subdir('plugins/vala-pack')
-+endif
--- 
-2.20.1
-
diff --git a/dev-util/gnome-builder/files/libgit2-1.0-compat.patch b/dev-util/gnome-builder/files/libgit2-1.0-compat.patch
deleted file mode 100644
index 3e857eaac933..000000000000
--- a/dev-util/gnome-builder/files/libgit2-1.0-compat.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 582bf0281358437cc35d96d363f0af81a1b21068 Mon Sep 17 00:00:00 2001
-From: Igor Raits <i.gnatenko.brain@gmail.com>
-Date: Tue, 3 Mar 2020 13:17:31 +0100
-Subject: [PATCH] plugins/git: Fix compatibility with libgit2 0.99.x
-
-Signed-off-by: Igor Raits <i.gnatenko.brain@gmail.com>
----
- src/plugins/git/daemon/ipc-git-repository-impl.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/plugins/git/daemon/ipc-git-repository-impl.c b/src/plugins/git/daemon/ipc-git-repository-impl.c
-index abcca5476..f2631945d 100644
---- a/src/plugins/git/daemon/ipc-git-repository-impl.c
-+++ b/src/plugins/git/daemon/ipc-git-repository-impl.c
-@@ -34,7 +34,7 @@
- #include "ipc-git-types.h"
- #include "ipc-git-util.h"
- 
--#if LIBGIT2_SOVERSION >= 28
-+#if LIBGIT2_VER_MAJOR > 0 || (LIBGIT2_VER_MAJOR == 0 && LIBGIT2_VER_MINOR >= 28)
- G_DEFINE_AUTO_CLEANUP_CLEAR_FUNC (git_buf, git_buf_dispose)
- #else
- G_DEFINE_AUTO_CLEANUP_CLEAR_FUNC (git_buf, git_buf_free)
--- 
-2.26.2
-
diff --git a/dev-util/gnome-builder/gnome-builder-3.34.1-r1.ebuild b/dev-util/gnome-builder/gnome-builder-3.34.1-r1.ebuild
deleted file mode 100644
index 93fea980b04c..000000000000
--- a/dev-util/gnome-builder/gnome-builder-3.34.1-r1.ebuild
+++ /dev/null
@@ -1,193 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-VALA_MIN_API_VERSION="0.36"
-DISABLE_AUTOFORMATTING=1
-FORCE_PRINT_ELOG=1
-
-inherit gnome.org gnome2-utils llvm meson python-single-r1 readme.gentoo-r1 vala virtualx xdg
-
-DESCRIPTION="An IDE for writing GNOME-based software"
-HOMEPAGE="https://wiki.gnome.org/Apps/Builder"
-SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
-
-# 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 vala"
-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
-RDEPEND="
-	>=dev-libs/libdazzle-3.33.90[introspection,vala?]
-	>=dev-libs/glib-2.61.2: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[vala?]
-	>=x11-libs/pango-1.38.0
-	>=dev-libs/libpeas-1.22.0[python,${PYTHON_SINGLE_USEDEP}]
-	>=dev-libs/template-glib-3.28.0[introspection,vala?]
-	>=x11-libs/vte-0.40.2:2.91[introspection,vala?]
-	>=net-libs/webkit-gtk-2.12.0: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_MULTI_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 )
-	>=dev-util/sysprof-capture-3.33.1:3
-	sysprof? ( >=dev-util/sysprof-3.33.4:0/3[gtk] )
-	vala? (
-		dev-lang/vala:=
-		$(vala_depend)
-	)
-" # We use subslot operator dep on vala in addition to $(vala_depend), because we have _runtime_
-#   usage in vala-pack plugin and need it rebuilt before removing an older vala it was built against
-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? ( dev-python/sphinx
-		dev-python/sphinx_rtd_theme )
-	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 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 language server via rls; 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
-
-PATCHES=(
-	"${WORKDIR}/patches" # gnome-builder-3-34 branch 2020-01-22 (commit bf485934b37) + cherry-picked meson link_whole fixes
-	"${FILESDIR}"/${PV}-optional-vala.patch
-	"${FILESDIR}"/libgit2-1.0-compat.patch
-)
-
-llvm_check_deps() {
-	has_version "sys-devel/clang:${LLVM_SLOT}"
-}
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	use clang && llvm_pkg_setup
-}
-
-src_prepare() {
-	use vala && vala_src_prepare
-	xdg_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dtracing=false
-		-Dprofiling=false # not passing -pg to CFLAGS
-		-Dfusermount_wrapper=false # meant for flatpak builds
-		-Dtcmalloc=false
-		-Dchannel=other
-
-		$(meson_use vala vapi) # TODO: doesn't work anymore; crude patch included
-		$(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)
-		$(meson_use vala plugin_vala)
-	)
-	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
-		rm -r "${ED}"/usr/share/doc/gnome-builder/en/.doctrees || 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/gnome-builder/metadata.xml b/dev-util/gnome-builder/metadata.xml
index e1647c887759..21138d9f8fb7 100644
--- a/dev-util/gnome-builder/metadata.xml
+++ b/dev-util/gnome-builder/metadata.xml
@@ -12,6 +12,5 @@
 		(such as setup of Git for New Project, direct cloning for Open Project and changed lines indicators in the editor gutter)</flag>
 	<flag name="glade">Provide integration with <pkg>dev-util/glade</pkg> UI designer for Gtk</flag>
 	<flag name="sysprof">Provide an integrated profiler via <pkg>dev-util/sysprof</pkg></flag>
-	<flag name="vala">Provide an autoindenter, autocompletion, diagnostics, and symbol resolver for Vala</flag>
 </use>
 </pkgmetadata>
diff --git a/dev-util/goland/Manifest b/dev-util/goland/Manifest
index a7ef8c62d780..bb130c6f422c 100644
--- a/dev-util/goland/Manifest
+++ b/dev-util/goland/Manifest
@@ -1,3 +1,3 @@
-DIST goland-2020.1.3.tar.gz 378277738 BLAKE2B e77e834f8ecdffd13face6620bd39e671b931f39967e7e7853dc9c4383cbba0bda2f4dd04915c690de8bfcf8dc49dcbc459d4363392dc572c82c0c546970939c SHA512 31e58b3ec942600d1d6b4ae4e5a29ad557c67ef0aefede80b9e39060150667400fccf7be74c6efbb56168ef9cbf2127cf9d9da269bc39d181c92a86788bba12a
-EBUILD goland-2020.1.3.ebuild 2504 BLAKE2B e50db652814195f564e98c9398c2b5a6694044a5e66799fc77e5d097f6a77e199e9a4d92f6d0b7747069a652d88c20647a87204142ff30ea7c56c9235d84232b SHA512 9d0f3229470a40d4539afa7993e3c6bece0b65c8920dbeee10d45167219ab3bb2e37d81028b93c692b4a0b11887dda0a43deb8c4998b24d24b9514a31eb81c97
+DIST goland-2020.2.3.tar.gz 427140538 BLAKE2B 0bc742e4fc4c5860b364cc34b4a17fa3147881a8e110fea43440e8cf89755b24840a86c770984b3e5d640229fa7806e2739acd6bbf5c7aee83af4404c92fb517 SHA512 742a7e134f01b882778b980f19f35f9310bf5e926ab4de1994af626f453ede74ea6fb5d2ed19c8077f6c152bc0836b1d4f36c5e3752b5cdd5b143a0f72ed4e79
+EBUILD goland-2020.2.3.ebuild 2504 BLAKE2B e50db652814195f564e98c9398c2b5a6694044a5e66799fc77e5d097f6a77e199e9a4d92f6d0b7747069a652d88c20647a87204142ff30ea7c56c9235d84232b SHA512 9d0f3229470a40d4539afa7993e3c6bece0b65c8920dbeee10d45167219ab3bb2e37d81028b93c692b4a0b11887dda0a43deb8c4998b24d24b9514a31eb81c97
 MISC metadata.xml 244 BLAKE2B 2ac557d4fb04230c7b4f706b52203ab6dc62d90aebc8e916561e6e3f6e41bf61bac231a0e7afe07fb18752177c6163b79fee124a171c3e8933041f4648db3a22 SHA512 da08729fbf0eceb858cadc8413dd857600ab595860ca483054e4d1422e3cacc52ce94f89d633a25c25d6b30df4a48ac7de011731418072238adb43bc8e7b3f3f
diff --git a/dev-util/goland/goland-2020.1.3.ebuild b/dev-util/goland/goland-2020.2.3.ebuild
index d487b813e0a4..d487b813e0a4 100644
--- a/dev-util/goland/goland-2020.1.3.ebuild
+++ b/dev-util/goland/goland-2020.2.3.ebuild
diff --git a/dev-util/gprof2dot/Manifest b/dev-util/gprof2dot/Manifest
index 0580284d23b0..4d102bb95c75 100644
--- a/dev-util/gprof2dot/Manifest
+++ b/dev-util/gprof2dot/Manifest
@@ -1,10 +1,3 @@
-AUX gprof2dot-0_p20130517-py3-xrange.patch 431 BLAKE2B 634ad067782bc67ee0dfe89af8831037ec93d905ea37debfb79640b372370375f9969b84d213a9d914b643580418b068107b4f667213189136ab35d74a47d4db SHA512 d855f0c0736f984360c48dc5a26e50502ae06e8b3450624e3e67efbf6659e67891cc78e4419aeaad8a85b2a94c09090f2b6cd04048913b1c971be8d874c50bfe
-DIST gprof2dot-0_p20130517.tar.xz 1080464 BLAKE2B 49fdcc79bc91505cc1d2b8233099766c0b305af145e8f668011429743777b965084baa713664d9fe0c0d17d2ee741b13101c5162baf07c609d1b0b7dd04de6c5 SHA512 1907cb889d1776723ca944d588fa4185afdeee11cc85ec40c03832568d91612bab708160c69036fc45fef05bca62c5bc8f6ef19cbb45c6bfd1952dda94c54a4b
-DIST gprof2dot-2016.10.13.tar.gz 22264 BLAKE2B 612cdaf8491e40223cf856104e49554675f2f83f8fc4ca9932f5b36167408ea51c2020c7c958a014b25010002230b0a6e4d5c70d6791fc445182fc61a9ff7eab SHA512 0568f1afb4e5c9da9e6c3c58d9a3613c90110c338c573e2c088a99f1db4d076a287d1209a132b86334a01404701d6ca0d9b0553e7ce850278956ea79acc2c388
-DIST gprof2dot-2017.9.19.tar.gz 23558 BLAKE2B 3de2a0e7c9731987a1382df9d67badcb19514983fa83af432bb83b5e59762c12fe865af9cb7778ccd37015992384e87b71b53211c33555039ee3f7dffc4e7c9c SHA512 652b38c6cbee47795d866a539e69ff4b2e67e221c8c082c6ecf480a15c24fe6d77e80b7daa5d24e76d27a4ff90836f80e716cb4d51d48d41aea5f661e3ac3598
 DIST gprof2dot-2019.11.30.tar.gz 31388 BLAKE2B 1781f59e5daa8315d3fd9defb6e28290272c4ddca01312e9af4acac494f3c7b29a437e3411b0bbb218f2eedbb2acf83d4dfa9c1d47f20b2eedc0fd607f1e4a02 SHA512 06fa8feed23e21d7827bbac19c887f65b9ca6a0cfd5b54c4da373ca33ecf0f11835b961dd1c2237ac2bf9764a8122d3ed9c7f9981c127a14ae74a733fc1275b1
-EBUILD gprof2dot-2013.05.17.ebuild 1080 BLAKE2B bff3974d227147ad72aa22a748e8a3acead60d6ca2be2f4ec9551bbb6803a736efbb2c52abc732c79ecb254c3ef5a360a660ce223c36c3c63e226e5255587f97 SHA512 56088ad9e3bae2256ca328d346e42d1509389aace2563b370d6485f7c3200a798d9332e6117eeed2cb26a1502390db916d6743852fa442178fa4fa4fb08d9b83
-EBUILD gprof2dot-2016.10.13.ebuild 486 BLAKE2B 52348251e5397763a615aa08c4dddc647b7df54809a354312ae8c1208d50ec78ffcdcd1717a57e4f7c2a535eccce29a23fb8a1238f258d69097d6d054907f593 SHA512 f4cb8b6d436a5f1f71d5858c82ebd4380f3b12d084c4ca59f58c316e8cf8d4b10362c7f8bab64d5acb03c9ec09a4ea16efc2f90ee25fede282d7d50fb1e2a551
-EBUILD gprof2dot-2017.09.19.ebuild 549 BLAKE2B 66a1849cb2059e9994764db9e5c665ad107f0fa8f86de7de911b942677cbfde7087633e7040b1ee8778859dacf7f068ddda92ddd6ab8076ade4cfcf565725fb1 SHA512 d9cb190759353475a93c5d69bc62f7077eb060fa161785d37d8258bd1afda8801eefce246ddbb1a2fd011c05c649e4b691f722a0c9627b69b18f8a1da75303fa
-EBUILD gprof2dot-2019.11.30.ebuild 555 BLAKE2B 1a853df45bb9f9f8ad338d6eb6b5a81a80591c05ee28b2507cdab073d0b6a14e4dd0898520c976d65b1cf6a00d085c2f8fdf7b8baf4d9cb4299597ab4d2b3adc SHA512 930eae53aedec869530ce404aeb1f278ff41529e37e4e5574c89ffc51fd012cdf719a281f63e8e5fbef67e2a6d015df0c451ab087337f16dac54d479377b641d
+EBUILD gprof2dot-2019.11.30.ebuild 588 BLAKE2B 7e1ed5291ca8e6e2ca5211573b40985adb98fac00f4f92ea42dbedb5e1c931d1ed8be8e7dbb7f91cb71686e3564ecaf95b6a0e2df590eb6aea296a5add0ae22c SHA512 8f119ce709066da1d158cd2805e061aa25da19cd5771dae79c46f07699ba8298476d24ec01c31e721a98b7a3aa2ab1785268f29bccfb497916aeddf965bfa29a
 MISC metadata.xml 333 BLAKE2B d1735f6673a0258eadd2d185548fba581c8613d4c8709e388bab630e81d9e835aa1fac22495b400a8db3e9895ba655e273657bd9329c9a9a8022c5bd7ada2f3e SHA512 503d8f740b27ef37b79be92c4652c60f49087634451e0d418da990c7b1f9c911aca461f2578e66e3e09f7db0588e57e304949a04b279fe782ead8222e1324a28
diff --git a/dev-util/gprof2dot/files/gprof2dot-0_p20130517-py3-xrange.patch b/dev-util/gprof2dot/files/gprof2dot-0_p20130517-py3-xrange.patch
deleted file mode 100644
index 228b1d8230d7..000000000000
--- a/dev-util/gprof2dot/files/gprof2dot-0_p20130517-py3-xrange.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- gprof2dot.py	2013-05-29 19:18:46.217823810 +0300
-+++ gprof2dot.py	2013-06-16 12:12:28.095478734 +0300
-@@ -39,6 +39,7 @@
-     def compat_keys(x): return list(x.keys())  # keys() is a generator in Python 3
-     basestring = str  # No class basestring in Python 3
-     unichr = chr # No unichr in Python 3
-+    xrange = range # No xrange in Python 3
- else:
-     PYTHON_3 = False
-     def compat_iteritems(x): return x.iteritems()
diff --git a/dev-util/gprof2dot/gprof2dot-2013.05.17.ebuild b/dev-util/gprof2dot/gprof2dot-2013.05.17.ebuild
deleted file mode 100644
index 73751e27c68e..000000000000
--- a/dev-util/gprof2dot/gprof2dot-2013.05.17.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python3_6 )
-PYTHON_REQ_USE='xml'
-
-inherit eutils python-r1
-
-MY_PV=0_p${PV//./}
-MY_P=${PN}-${MY_PV}
-DESCRIPTION="Converts profiling output to dot graphs"
-HOMEPAGE="https://github.com/jrfonseca/gprof2dot"
-SRC_URI="http://www.hartwork.org/public/${MY_P}.tar.xz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${MY_P}-py3-xrange.patch
-}
-
-_make_call_script() {
-	cat <<-EOF >"${ED}/$1"
-	#! /usr/bin/env python
-	from gprof2dot import Main
-	Main().main()
-	EOF
-
-	fperms a+x "$1"
-}
-
-src_install() {
-	abi_specific_install() {
-		local sitedir="$(python_get_sitedir)"
-		insinto ${sitedir#"${EPREFIX}"}
-		doins ${PN}.py
-		python_optimize || die
-	}
-	python_foreach_impl abi_specific_install
-
-	dodir /usr/bin
-	_make_call_script /usr/bin/${PN} || die
-	python_replicate_script "${ED}"/usr/bin/${PN} || die
-}
diff --git a/dev-util/gprof2dot/gprof2dot-2016.10.13.ebuild b/dev-util/gprof2dot/gprof2dot-2016.10.13.ebuild
deleted file mode 100644
index 96341ae1bef6..000000000000
--- a/dev-util/gprof2dot/gprof2dot-2016.10.13.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_6 )
-PYTHON_REQ_USE='xml'
-
-inherit distutils-r1
-
-DESCRIPTION="Converts profiling output to dot graphs"
-HOMEPAGE="https://github.com/jrfonseca/gprof2dot"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
diff --git a/dev-util/gprof2dot/gprof2dot-2017.09.19.ebuild b/dev-util/gprof2dot/gprof2dot-2017.09.19.ebuild
deleted file mode 100644
index 244b2deda55d..000000000000
--- a/dev-util/gprof2dot/gprof2dot-2017.09.19.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_6 )
-PYTHON_REQ_USE='xml'
-
-inherit distutils-r1
-
-MY_PV=${PV//.0/.}
-MY_P=${PN}-${MY_PV}
-DESCRIPTION="Converts profiling output to dot graphs"
-HOMEPAGE="https://github.com/jrfonseca/gprof2dot"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
diff --git a/dev-util/gprof2dot/gprof2dot-2019.11.30.ebuild b/dev-util/gprof2dot/gprof2dot-2019.11.30.ebuild
index 66133a680114..b1c471e71f2a 100644
--- a/dev-util/gprof2dot/gprof2dot-2019.11.30.ebuild
+++ b/dev-util/gprof2dot/gprof2dot-2019.11.30.ebuild
@@ -5,6 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE='xml'
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
 
diff --git a/dev-util/gtk-doc/Manifest b/dev-util/gtk-doc/Manifest
index c5ace0c630ea..bb017954ab13 100644
--- a/dev-util/gtk-doc/Manifest
+++ b/dev-util/gtk-doc/Manifest
@@ -3,5 +3,5 @@ AUX 61gtk-doc-gentoo.el 283 BLAKE2B 116d2b43d42b05130482c5bff7a10f13930a0d04f348
 AUX gtk-doc-1.8-emacs-keybindings.patch 582 BLAKE2B 9591f8f58dbd2c5897abf020f96a3ad8124830c274bfa581756ccaa43c67002264cc6d5a04c0316e4bb2dfa75a3cb08b5de6217a81a295b3a31e18dae8d1ad7d SHA512 360e97c0d2603c17dd1c1ca92739eb5ac229f3bcda6dc76267b95cac73db1008a52164ac9cba5a0e43f7b6359b5e6d3b242fde757fa1b7409051bade5f6f35a6
 DIST gtk-doc-1.32.tar.xz 762000 BLAKE2B e87b0ed5dffd04acc7569171343839a742a874438248546b1b85ca71102d5a546f41b450c5cedf54ecab5b7b6585a4dac36d7600b21b5cce491470a50f82d3b0 SHA512 6d28395968c2951f1685570e5778b5add76d1b9cff8fcb8632b200b3ba251602a1ea59b1def84fc28560988b87fc0dbbc6947af88d268db6ff23e9c28aea3b28
 EBUILD gtk-doc-1.32-r1.ebuild 2340 BLAKE2B bd2c6091b9237fe011e29429bf7a515d3e9149667fd8e553319d04da49f0a8983dac1a3aebf0f5aa7df589e03398f1dcbb816fc3381cd10cf2f8da328e4afbd3 SHA512 e70e382d6f2f73de8a9205055f9766b1b18318c4707044c595f6ea8b4f75a53afe0f09c7cf5774a8820ec234f9b31196b2d1a2fa18be6cf6112cb35ea05f8368
-EBUILD gtk-doc-1.32-r2.ebuild 2553 BLAKE2B 6f61412042686035c1bee011016aa814a35a9af1071d783fafbf6da5c277e0af41463dfaff1ac4c9fed4034f5af9126b88f15b67f0bf4659fdae80a188140a54 SHA512 b5bcc057ca0d04ed452b97a8bc73df0cdbd4853c619cb1a6b65d6a406e0631c1e85b243df688b9f7c82f1fbcd56cc2c8c84a15a13192aaeec52403e406453052
+EBUILD gtk-doc-1.32-r2.ebuild 2551 BLAKE2B f0a5da533e9b648396efe547e6f540327a026ffb958ce6d4fb3a37d455fccb34b78114f018432f5c2bcf35c9d8d60847e40dd878985af4e9071b2485af0ed445 SHA512 473663a2dcc0176c426845c6604725afd5a5eae98f7670c0381faa2b95d953ebdf9cdd1d26d92bf1ffc13f3125c025d1fc63a54e6b2b35544ffe51b06722c9de
 MISC metadata.xml 490 BLAKE2B 9b4d27b146f567501af858fd704d7713e8eea66caac0b5878d685814b48825f4222a6286acd3a8ec4d8e698ace318c52c74e301dc8eb3eec41bca3d83d24a130 SHA512 0d33e970b5924c264711c8a77aa966ff8f1e6cd2695d34088c0f9af825cd72603173e07e39fb6d6bd22098d76c048b3dc03dd83916b092f2c68c58f94aa95b7a
diff --git a/dev-util/gtk-doc/gtk-doc-1.32-r2.ebuild b/dev-util/gtk-doc/gtk-doc-1.32-r2.ebuild
index a772e4e095ff..ac05cc2f848b 100644
--- a/dev-util/gtk-doc/gtk-doc-1.32-r2.ebuild
+++ b/dev-util/gtk-doc/gtk-doc-1.32-r2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.gtk.org/gtk-doc/"
 
 LICENSE="GPL-2 FDL-1.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 
 IUSE="debug doc emacs"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-util/gtk-update-icon-cache/Manifest b/dev-util/gtk-update-icon-cache/Manifest
index f28ad6881b46..9f24caf344da 100644
--- a/dev-util/gtk-update-icon-cache/Manifest
+++ b/dev-util/gtk-update-icon-cache/Manifest
@@ -1,7 +1,5 @@
-DIST gtk-update-icon-cache-3.24.16.tar.bz2 91713 BLAKE2B 883c1437ecbff8cdec545fb3a59270569de32f59c48cb7e2401332a2547ccf41487ff2778e382815695eca34cf88baddc955acf8b2b7b7ab1edf06dec5be8683 SHA512 53bdaa8d29e1c343cf9e5d0acddd852d1a3d43a9c03e8e7c186245f5ab536742b39bd7c76b9fee3a2b5342ab573be621d59f7282f41b08097061c8f5df158c06
 DIST gtk-update-icon-cache-3.24.20.tar.bz2 91769 BLAKE2B 4fb1d4e06117924377e2e3f28f733ffd4f929414e6e36855a4486d6aa2a63f3a37cf5710c8dffdb6c32470c24861070a3160b8373dfa10a3831d098446f5701f SHA512 2ba23145e3cd46d3cd7129c68355c6918a271688935b828be110049e6a912879d25f88a8105c8dd1484de8b0c89d220bb6e8f4282aaf083602ad88e2cef9a54e
 DIST gtk-update-icon-cache-3.24.21.tar.bz2 91918 BLAKE2B b9cf0f944f13c3280ad615a6453e8fe80424b481d66af7bfd98826354f124f67c3a75afece07cd38cb8722eb1beeeb23b1cb7e23ae8d68f2dca195a155c69508 SHA512 207449dc92b029f735f40cf4e9cc59dd02103bab7c382a69feb7162873e2cf7b1fa6a7ce818533888305424667795da86be55e5befc89f8bfc8809d6aa6cd92a
-EBUILD gtk-update-icon-cache-3.24.16.ebuild 894 BLAKE2B c3534d66ac52481507d5a722eba0b98eb780cc18be33e18e336228def9d67d0a41a067507e83d3cfddac74c57fe2d33f26f1caeca77565f64a1a6197e0c664df SHA512 a3173194e30215c653e2d10fc7e864c2a9f70a35f0bd0d8e3e72d5eed8e8f98552de249bd5c4ff59320fd4bd0be7aac90896434ec7b70a44de12e3c1afb899dc
 EBUILD gtk-update-icon-cache-3.24.20.ebuild 895 BLAKE2B eab694de369f6703304e6d838a1a73e0ddeb996253b65a8a14368e52919ae75c2ee040f261152b19040d71c23108ac027b7a6f6f0cbacc8cdd5325c2b5a66750 SHA512 3e228071261e416f164201cef33c5e68d8e8936ffb89985ab93614d2d325cf419dd2ab2f331225180258575581407b54c0caa47d263b45f631787db78898085f
-EBUILD gtk-update-icon-cache-3.24.21.ebuild 898 BLAKE2B a9e3cbbea413340ea543d66bd2410952141541a1b18ee08279b3c8a01dbdf63137cfa198346081742a94b464de335846b26a8564200edeb046ae3482ec58f4ff SHA512 c7ef0b03df2b25164e23ff2e0ca0ff41adecb65b4c860acb6ab09f0557b249a235e62a663fad9f105d21d8cbc1d5099f4385d7f512c2b5096db98bc753b20d80
+EBUILD gtk-update-icon-cache-3.24.21.ebuild 894 BLAKE2B c3534d66ac52481507d5a722eba0b98eb780cc18be33e18e336228def9d67d0a41a067507e83d3cfddac74c57fe2d33f26f1caeca77565f64a1a6197e0c664df SHA512 a3173194e30215c653e2d10fc7e864c2a9f70a35f0bd0d8e3e72d5eed8e8f98552de249bd5c4ff59320fd4bd0be7aac90896434ec7b70a44de12e3c1afb899dc
 MISC metadata.xml 647 BLAKE2B 2846e4ac0b5816fe7699b197958118535cac7092930d7b6ba63c23b126242102edd832d60b13baeed23bf8781babe1058f06fece732c4ecd58c9b01b621042ae SHA512 7301a9425528d65112ec9dd1eca7291473905493b1b550119c6984141b3b216c4f3825d3b2a395a8375aa8b481b29d841153bd279d593586d5ea7d77ce46d7d3
diff --git a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.16.ebuild b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.16.ebuild
deleted file mode 100644
index c82aa749e296..000000000000
--- a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.16.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit meson
-
-DESCRIPTION="GTK update icon cache"
-HOMEPAGE="https://www.gtk.org/ https://gitlab.gnome.org/Community/gentoo/gtk-update-icon-cache"
-SRC_URI="https://gitlab.gnome.org/Community/gentoo/${PN}/-/archive/${PV}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE=""
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-# man page was previously installed by gtk+:3 ebuild
-RDEPEND="
-	>=dev-libs/glib-2.53.4:2
-	>=x11-libs/gdk-pixbuf-2.30:2
-	!<x11-libs/gtk+-2.24.28-r1:2
-	!<x11-libs/gtk+-3.22.2:3
-"
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.3
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
diff --git a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.21.ebuild b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.21.ebuild
index d2d9dc11c043..c82aa749e296 100644
--- a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.21.ebuild
+++ b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.21.ebuild
@@ -13,7 +13,7 @@ LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE=""
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # man page was previously installed by gtk+:3 ebuild
 RDEPEND="
diff --git a/dev-util/gyp/Manifest b/dev-util/gyp/Manifest
index ee97450eddd0..021a58ec9618 100644
--- a/dev-util/gyp/Manifest
+++ b/dev-util/gyp/Manifest
@@ -1,4 +1,4 @@
 DIST gyp-20200512145953.tar.xz 443884 BLAKE2B 74ff269e3e8aa51e6b34f795892f6e8922d098a81b4d855619520d3d366e79b611931cddf4ee2ec60a7e040af11ac8eba7582ad10e24de627df5a4aa4eba6474 SHA512 35bf2af22f2e632b3d6e546e5017df8effd0c7ad80beed9b95ed1e2f294d70215889bc6a0147506461254e951d70189dc48824af10a6620e996945d2cf5586ee
-EBUILD gyp-20200512145953.ebuild 1289 BLAKE2B 1c4f2b4adc041fccaace6c4341aa6fdd7b98733a871d65398514bf6032525d9809089be4b522fe469a856c4a390b45a096f3352764f7e677752b8f1a9ab1efc7 SHA512 135cc599f3a6a5bd15ba7303260b5cbdda8a5ae1520d8ad136fb1443b71df63ffa4ea5e3fcbefdcf4157a2a299328ea2adb25197501173a70a2d3ef5faf6f951
-EBUILD gyp-99999999999999.ebuild 1266 BLAKE2B f4020ae01454a7141fa18ce8a8c66aed1143462992bc54e553e33a5189a1e4f7f687c3c134b62abac3d3c90abc470c493d92e040da5f87841d2108a2ef996fa9 SHA512 a7ad2fb23ac45acd63a8a42926f46c1a4fab63f7e03b6c3cbdfcf72b1b683fc0104fc31af89c7d433bf85d6b5f9366d29d67116071a798de42ff2db8b1219a63
+EBUILD gyp-20200512145953.ebuild 1605 BLAKE2B 01ac4411cccbc243f96a0bbc1241a8f126e324004db0ab0ff576c8a7b6f386ace0dce51fb0e6eac87e793ed3851700ddaa97b5b2a9ae599cc3df7a7a8e2e3316 SHA512 f234adc429a697b3925ac91702b4b3cb398f3b2b03339efc6d645519f52752cf0d08d1825bec9b7a9149db37e82231c2b166172fd0608044d98d0eb3cf377354
+EBUILD gyp-99999999999999.ebuild 1582 BLAKE2B a1ebaba4e2bd2ada60cfc78599e298fea52d4f59c99054b3f779948712749086a8e63184f94fd76d12306e9afe04bb11783c89993068ec6146097ecdda961c02 SHA512 d478ca981d03d2f6d18ab4f1a7a63b433260ee2ff03546ea750d9636bb83865c32596330c97df6a50ca1b032b477dc36f5b2fd7c1b91d70100e1612a03cfad8b
 MISC metadata.xml 415 BLAKE2B bee460235492c13da7eb83441f00a502d900c169b48c91802a8891f9856c5f87aa225e61d8efd90ac2aade3ec52a93db293e3927b73c9b9b2708f723370d8585 SHA512 378e53a81fa2177409ae4557c336ddfb62b8657bf2d756ae651011d5dc5e94604d52aece3cdda38fbd0f123d5a1f83b721ccee3ecc5870cc562670fd748631c9
diff --git a/dev-util/gyp/gyp-20200512145953.ebuild b/dev-util/gyp/gyp-20200512145953.ebuild
index 9ee7379992fa..04041f153491 100644
--- a/dev-util/gyp/gyp-20200512145953.ebuild
+++ b/dev-util/gyp/gyp-20200512145953.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=(python{3_6,3_7,3_8})
+PYTHON_COMPAT=(python{3_7,3_8,3_9})
 DISTUTILS_SINGLE_IMPL="1"
 DISTUTILS_USE_SETUPTOOLS="rdepend"
 
@@ -35,8 +35,16 @@ python_prepare_all() {
 	distutils-r1_python_prepare_all
 
 	sed -e "s/'  Linux %s' % ' '\.join(platform.linux_distribution())/'  Linux'/" -i gyptest.py || die
+	sed \
+		-e "s/import collections/import collections.abc/" \
+		-e "s/collections\.MutableSet/collections.abc.MutableSet/" \
+		-i pylib/gyp/common.py || die
 	sed -e "s/the_dict_key is 'variables'/the_dict_key == 'variables'/" -i pylib/gyp/input.py || die
 	sed \
+		-e "s/import collections/import collections.abc/" \
+		-e "s/collections\.Iterable/collections.abc.Iterable/" \
+		-i pylib/gyp/msvs_emulation.py || die
+	sed \
 		-e "s/os\.environ\['PRESERVE'\] is not ''/os.environ['PRESERVE'] != ''/" \
 		-e "s/conditions is ()/conditions == ()/" \
 		-i test/lib/TestCmd.py || die
diff --git a/dev-util/gyp/gyp-99999999999999.ebuild b/dev-util/gyp/gyp-99999999999999.ebuild
index bf36a597b2c0..f163e0f3957b 100644
--- a/dev-util/gyp/gyp-99999999999999.ebuild
+++ b/dev-util/gyp/gyp-99999999999999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=(python{3_6,3_7,3_8})
+PYTHON_COMPAT=(python{3_7,3_8,3_9})
 DISTUTILS_SINGLE_IMPL="1"
 DISTUTILS_USE_SETUPTOOLS="rdepend"
 
@@ -35,8 +35,16 @@ python_prepare_all() {
 	distutils-r1_python_prepare_all
 
 	sed -e "s/'  Linux %s' % ' '\.join(platform.linux_distribution())/'  Linux'/" -i gyptest.py || die
+	sed \
+		-e "s/import collections/import collections.abc/" \
+		-e "s/collections\.MutableSet/collections.abc.MutableSet/" \
+		-i pylib/gyp/common.py || die
 	sed -e "s/the_dict_key is 'variables'/the_dict_key == 'variables'/" -i pylib/gyp/input.py || die
 	sed \
+		-e "s/import collections/import collections.abc/" \
+		-e "s/collections\.Iterable/collections.abc.Iterable/" \
+		-i pylib/gyp/msvs_emulation.py || die
+	sed \
 		-e "s/os\.environ\['PRESERVE'\] is not ''/os.environ['PRESERVE'] != ''/" \
 		-e "s/conditions is ()/conditions == ()/" \
 		-i test/lib/TestCmd.py || die
diff --git a/dev-util/heaptrack/Manifest b/dev-util/heaptrack/Manifest
index 30f6da1cc0e8..42c24e96cff4 100644
--- a/dev-util/heaptrack/Manifest
+++ b/dev-util/heaptrack/Manifest
@@ -1,2 +1,2 @@
-EBUILD heaptrack-9999.ebuild 1320 BLAKE2B 865b073c0d5d219a2342caa4c1adb428c866fbedba69c7a9b632919fd0f7404d529f046b3653793b630c93ea9bcf611896885122410de2f1c06cb584bc0498c8 SHA512 6cbc94fb41d412c33968d32b40e6441198a1b19a396b14528b69464551b4264eb215b894a42e29b2aa016efc0467ab8a45c4e444683519eb90abc9911302cbbc
+EBUILD heaptrack-9999.ebuild 1295 BLAKE2B 700d336e4bf13b2149d6a919d847632a4e2e9981ea40d0cc2c271223ecd7b888f1df7df26a09f42d6582a97a8d69346b699f737016c392fe20dd77dadf1f328e SHA512 1ee5c61bd545dfdbb9a98063e7c31d4a59366175d36386b1fc2e84526e421ca8ad792662eac3b0fa70d7f8d5ff759392ff14fab5753ee6bfe342f50593e64a09
 MISC metadata.xml 326 BLAKE2B c32180909f5265666e505be682fe6144947ee00dc109524bb554f4ebb53ee729b50ddd7fb3a96ddf34d2e5dda7dcb0f85b8a4fdc464412e9df3fef3c6a75ed91 SHA512 dc0e30a1312d9703faa5771706a153f04d0ef59a86deddcf4551788d5c4aef1b8c090e38af13e31b28e875b91d9c2e165eb866fff1c7d343fde6b97f63cb4b39
diff --git a/dev-util/heaptrack/heaptrack-9999.ebuild b/dev-util/heaptrack/heaptrack-9999.ebuild
index 8f57020d1b4c..626643eac8ca 100644
--- a/dev-util/heaptrack/heaptrack-9999.ebuild
+++ b/dev-util/heaptrack/heaptrack-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit cmake kde.org xdg-utils
 
 DESCRIPTION="Fast heap memory profiler"
-HOMEPAGE="https://kde.org/applications/development/org.kde.heaptrack
+HOMEPAGE="https://apps.kde.org/en/heaptrack
 https://milianw.de/blog/heaptrack-a-heap-memory-profiler-for-linux"
 
 LICENSE="LGPL-2.1+"
diff --git a/dev-util/hfstospell/Manifest b/dev-util/hfstospell/Manifest
index 54d9e7ba6083..41fb9259851f 100644
--- a/dev-util/hfstospell/Manifest
+++ b/dev-util/hfstospell/Manifest
@@ -1,4 +1,3 @@
-AUX hfstospell-0.5.1-gcc-10-fix.patch 935 BLAKE2B fdfb569d85a19b1ad939984b74b6857ae71527967a88c6be58baf6b281fe46a7fa33504387f2f344faa4bf1c03272e8760fd3b5939a8cef8d977ff1f16f55583 SHA512 73527efa09cb17a5941ac3b2f89525e45d817621dfd7eb2f6ecfa3d77e1327214234b8736d53782b3f2e593c57d94ffbe9302aeae041472e7ea99d8a2400bcf3
-DIST hfstospell-0.5.1.tar.gz 152056 BLAKE2B fa589908312bd4a4b40b88b221ee5f6bdc281d6151984a87b237372b0141157db87b3494e357d74a17f0ee137fd5ce35ec8caddb12d5bffe15930a74345cd3ee SHA512 bd8ffdd3ee822da2a57a3405b139ec1e635dc8bb293dbd9abd05912b8929df29633304e64b97522e4590a3907ddfa3aefec3e4da5ab709b9be1857cc2ecd2018
-EBUILD hfstospell-0.5.1.ebuild 740 BLAKE2B 4e1dbe72f1cd3ac7c392844fce52895eed3e265a3adf126e7d2222e47c14d7d52540790682f0a22ff94054ea880223e9b695e064b7864a149c7082b4d912154a SHA512 8b0df520dd729576530c090a8269d3057f77be1af7fb172ba9d64f8c5a4e58c9c035b2c7062622d230a60cf6a42c0ca091ec5e6693422de96c8583f7069e012d
+DIST hfstospell-0.5.2.tar.gz 152115 BLAKE2B 667c01672fd6fd6ee743a6542677ffe74e3900c27ab2754f8fa7dcc57081074bd98e8d82827fe176b2a6c9abc4565efcb3204df43110906f5a333405ec8a6bf2 SHA512 307aff3aec91ac6ffed3ebabdc2baa1a6e913431f57a80a0d0254be57fbd72e28d7592c35e0d72e5979f7e0b4c585f11b8eb91183b0877f9670a9cd5206c0140
+EBUILD hfstospell-0.5.2.ebuild 679 BLAKE2B 02dd2bda990c8e01596828dd21891332242fac8df412c48276082bc4813f9e20abdd7220a779a0aa0a2ec0e5a69263316ea3e80bff116703fe2ad51172df59d5 SHA512 ba79bce0a5b5820397db178d670825e88c4905792df3cc83adcd89d0178262b636370433b4a7f87c738e02379c5977c29f2807f7c449e60ce82815c91f5f07bb
 MISC metadata.xml 254 BLAKE2B 938f68b7b21ad386a35540a09e4bb956e241dfc963d4823c3c0cd46d3449ff4fb5a1cead67ad7c35a460503d30bdbde35822535f1c2d46f2939ee190f328b846 SHA512 26047ebb40fc49bfb4393121c5c5af69caee617a1d75676be84b0f5af75564828aeeef4503c7681eaaf7e48f6c662574874336296c18e002dca8e925162a1d4c
diff --git a/dev-util/hfstospell/files/hfstospell-0.5.1-gcc-10-fix.patch b/dev-util/hfstospell/files/hfstospell-0.5.1-gcc-10-fix.patch
deleted file mode 100644
index 0998beebe7d7..000000000000
--- a/dev-util/hfstospell/files/hfstospell-0.5.1-gcc-10-fix.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From a9d5afb14aa71893f142dfd3ae735e8930aa0f8a Mon Sep 17 00:00:00 2001
-From: Martin Liska <mliska@suse.cz>
-Date: Mon, 16 Mar 2020 11:32:10 +0100
-Subject: [PATCH] Fix a typo in wide string conversion function (#49).
-
-Revert a hunk from:
-04e4843e4c66beb61b756f3ceb2ac94628142185.
----
- main.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/main.cc b/main.cc
-index abecf46..e4fd676 100644
---- a/main.cc
-+++ b/main.cc
-@@ -61,7 +61,7 @@ static bool suggest_reals = false;
- #ifdef WINDOWS
- static std::string wide_string_to_string(const std::wstring & wstr)
- {
--  int size_needed = WideCharToMultiByte(CP_UTF8, 0, &wstr[0], (int)§wstr.size(), NULL, 0, NULL, NULL);
-+  int size_needed = WideCharToMultiByte(CP_UTF8, 0, &wstr[0], (int)wstr.size(), NULL, 0, NULL, NULL);
-   std::string str( size_needed, 0 );
-   WideCharToMultiByte(CP_UTF8, 0, &wstr[0], (int)wstr.size(), &str[0], size_needed, NULL, NULL);
-   return str;
diff --git a/dev-util/hfstospell/hfstospell-0.5.1.ebuild b/dev-util/hfstospell/hfstospell-0.5.2.ebuild
index b3e56cf85239..f269ab5ace37 100644
--- a/dev-util/hfstospell/hfstospell-0.5.1.ebuild
+++ b/dev-util/hfstospell/hfstospell-0.5.2.ebuild
@@ -22,8 +22,6 @@ BDEPEND="virtual/pkgconfig"
 
 S="${WORKDIR}/hfst-ospell-${PV}"
 
-PATCHES=( "${FILESDIR}/hfstospell-0.5.1-gcc-10-fix.patch" )
-
 src_prepare() {
 	default
 	eautoreconf
diff --git a/dev-util/howdoi/Manifest b/dev-util/howdoi/Manifest
index 75e83775e43b..a5a917dba8fd 100644
--- a/dev-util/howdoi/Manifest
+++ b/dev-util/howdoi/Manifest
@@ -1,7 +1,9 @@
 DIST howdoi-1.2.1.tar.gz 13112 BLAKE2B 33492547fab53085aebff295202e8ad88d41850503155b944f38382137d6ec8fbcd4f6050583b16c01c3701683ccf18c6929c525b5d8f34bf6f2ed9410668f36 SHA512 83af30118087105392ddb95b05d9e7442f5ee5df981faa9143770dedb8927c164a4f30f37ccd219a826340f0f8cd81fc5eb9a3b12e5d3956786294699b6e2f9b
 DIST howdoi-2.0.5.tar.gz 23910 BLAKE2B aace040311845cd8c958d5186ea804a9b0d746694563e2acebd2dbc5630ccbeff66c8a1848245b0f4c127ca611218a0b56e4051d6991e8cd796017a8b5022c46 SHA512 5ad8a99758774c28b26afe5a5ee0f1d2fd6f8ea1afcae5f29b3a02ab3c25758b8cd8aaeccd3afd10a3d02495c6616966cad5da03327c94979e89fc3c601bd367
 DIST howdoi-2.0.6.tar.gz 25113 BLAKE2B 0b83b28d1d0a75a20e49fea0bdd0b3eebae10fee17b2ca195289b8ed014befa7bf17a3c8221dd90d0a2de166f9fab9be24619aa24c886120f2f1d2ee4afe0d84 SHA512 3153ec28f5c3c1c78b786a50da3a328586dc05f5a6fe0bcb33621baf13ae8cda55e15c3538c772dba309cd5a24f631c36c09924ff535cfc8494743b631e01fb5
+DIST howdoi-2.0.7.tar.gz 25167 BLAKE2B 5923aaae6d6aaee4da7e02cd283d6e794c31d600d2834d1354e0d90194ac573d80140517ba7289bbf97b01923b6ed8c9c2ab6abe0beea0534fc41ecf24196c24 SHA512 9f8278e6ea688c40fee5227aa23375cb7dc7339d579953c73dbf7111087550ece412e26508e129f377e2326ce4635c38d96ad99f98c8c6f1131a01bbaf062275
 EBUILD howdoi-1.2.1.ebuild 613 BLAKE2B eb1915c84777fe6f247c2abef28ae2130648c377ed539bb80b984f19b7eba421fe9cd3e097c2fc390810d0a6cebf7f68286a6f104ed6c354d963e49595f14808 SHA512 cf39a6512968c9bf70684e59421471ce8cc7b5958a94588b4a2462761a216eb4133b9087ff9d48bd2cbd4983e55834996022d76115dded1a5c8377581add7dbe
 EBUILD howdoi-2.0.5.ebuild 655 BLAKE2B 9db2a97feddd4f5460a4bdd4a62861f1aef99caf76602d34de731b586f44e62080e3eeae7b77f57b715e01c5dd2f8a027733cedb48a08dc8f33108bc10af3949 SHA512 56a487f4271914cf55c3267ab705e2ea620b6e10ff550bb87f7f4800eabdc64560ff1f26323b72cf06b2db430c0b897de07d2b047c6ca237d4c09a1323765478
 EBUILD howdoi-2.0.6.ebuild 655 BLAKE2B 9db2a97feddd4f5460a4bdd4a62861f1aef99caf76602d34de731b586f44e62080e3eeae7b77f57b715e01c5dd2f8a027733cedb48a08dc8f33108bc10af3949 SHA512 56a487f4271914cf55c3267ab705e2ea620b6e10ff550bb87f7f4800eabdc64560ff1f26323b72cf06b2db430c0b897de07d2b047c6ca237d4c09a1323765478
+EBUILD howdoi-2.0.7.ebuild 689 BLAKE2B 29f1642be822e240bfb107a4e537dd767c3913312ef1ebb95531c8279ead5fcbe4a699d42b5cfa8fe88b6ad5299fed798beb1d45a369eda918ca185bfd706031 SHA512 45c2c8b3bc67b23c6297156da4d26592e5aba510baf5ec315aad927d55c60f2eda99ea967b04afc0feb3a5c2d3fcdfced5916e8a437dd58f45650561cdb1d6a8
 MISC metadata.xml 343 BLAKE2B 34cc8c4f7372fc0492d8b328ccae1b94946bc5593d20a181d6e32d3fc8e79471f517eea7509cf32172ef55092d898ed65350167d465b22bf127f62fbab6dc1c5 SHA512 f83f432490f25508a138dfbce3a67a120937fa12fee712cbdda9302d238805f3bd18034cc52d473d28b990221bb73748c9305f31cdc9912aed91a79f86386efa
diff --git a/dev-util/howdoi/howdoi-2.0.7.ebuild b/dev-util/howdoi/howdoi-2.0.7.ebuild
new file mode 100644
index 000000000000..ded420b714d1
--- /dev/null
+++ b/dev-util/howdoi/howdoi-2.0.7.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS="manual"
+PYTHON_COMPAT=( python3_7 )
+inherit distutils-r1
+
+DESCRIPTION="A code search tool"
+HOMEPAGE="https://pypi.org/project/howdoi/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="
+	dev-python/appdirs[${PYTHON_USEDEP}]
+	dev-python/cachelib[${PYTHON_USEDEP}]
+	dev-python/keep[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	>=dev-python/pyquery-1.4.1[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.24.0[${PYTHON_USEDEP}]
+"
diff --git a/dev-util/hxtools/Manifest b/dev-util/hxtools/Manifest
index 6d1fcac2ff27..33fcb6c611e7 100644
--- a/dev-util/hxtools/Manifest
+++ b/dev-util/hxtools/Manifest
@@ -1,5 +1,3 @@
-DIST hxtools-20180301.tar.xz 301516 BLAKE2B 6b768e316de6d9b724cdca5beef1ec14e3482aaf1aa34abc138861782266eac32565cdf7713cc65d3863fb1b3463a21446165ecc7df4f39c4fed168d8efdd3df SHA512 10b6a59367a9d5127116a81ae46c4c0f10dd4cecd60ff78b2dfeb2a304c7a34112df2355b9f939558c8e27d0e255e2df6277da9cc558d4368bcbe4d7130d5326
-DIST hxtools-20190428.tar.xz 219012 BLAKE2B a1c2cc48eadb6d2c9016803469a87a18e447705f463f3a059dd9e501a228eaa20355ce1ce36d2c9988c1fb1ff64727ce6e4c0e098b24a88ca591649df36375bf SHA512 268da9c5c09830affe35052769ed2bee2fc4e8f7de3b9ad5eda7a8865ccac88bc1392a6c83b7d4c5faab2b07d7c77c6e77808a8c184bd3e530288c577b5de567
-EBUILD hxtools-20180301.ebuild 802 BLAKE2B a35cb67d8dacdb559df4dafed8ce2ebfa2482030fe5e513a0802ccec0b0192d92bda8a09dc0ecf7dbce5dee39463a92667fa67183a773f0572ffc9f16d4746a9 SHA512 d86fd5d656bf6646c2469f2d83c39370943dba1bced7ecabaa5629be4a0ce4a6b8c6a0958af2480543b00b18d9237c42d3106ed76e2a607e92afffecefdc4029
-EBUILD hxtools-20190428.ebuild 954 BLAKE2B d5c6a67ee016488bd2708b13196ecce4848ad0caf2d42206d49fb1f033deea75c1099ea468b5f462105399c84e8be9746c3d98bc4af76fcb45984eeb5903e69b SHA512 2c1cad1964d1ccf8cc03cd20953dc3ede1572f5fec20e55ce46d3a386aba4dca6a742961f464a6f2251e30894ee9ab8e6f30204b56cb25a4ba4ab9b0904914ce
+DIST hxtools-20201116.tar.xz 208540 BLAKE2B 4797657be631308083e75cde3a9ca7f3b73ed5d1ba48822b208a2abe5888d497109c4482957657b11bcd8abf09134162ab8d9a7d4d8e1d58c0522505c07ac5ea SHA512 3ff9dc1f42bea168f43575b2d8f565589a28cf18ed411772ccf179a0ebd9cf3bdb0c280646eacbcc528f5aae894c5835e80f5c9513f97688848ee3cc2625adc4
+EBUILD hxtools-20201116.ebuild 953 BLAKE2B bb1dde152a80e12bfd776b0f788c248435bace3ae21517adcac13c40c4faac0ac4d01a2f231686e1ef55bb9133e83751d051e88874db96f3c495b8baf78c0b71 SHA512 0a9b338b1a6859e43efb17345215773ae4348ca3b4dd0b95e7dc924a7bcccd18dbee8b60c8748ef7598798f91af4f416c399c24c11620d95c068b26862d798d7
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-util/hxtools/hxtools-20180301.ebuild b/dev-util/hxtools/hxtools-20180301.ebuild
deleted file mode 100644
index 38fb9a949d55..000000000000
--- a/dev-util/hxtools/hxtools-20180301.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A collection of tools and scripts"
-HOMEPAGE="http://inai.de/projects/hxtools/"
-SRC_URI="http://jftp.inai.de/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-lang/perl
-	>=sys-apps/util-linux-2.19
-	sys-libs/libcap
-	>=sys-libs/libhx-3.12.1
-	>=sys-apps/pciutils-3
-	x11-libs/libxcb:0=
-"
-DEPEND="${RDEPEND}"
-
-src_install() {
-	default
-
-	# man2html is provided by man
-	rm -rf "${ED}"/usr/bin/man2html
-	rm -rf "${ED}"/usr/share/man/man1/man2html*
-
-	# Don't collide with dev-util/cwdiff
-	mv "${ED}"/usr/bin/cwdiff "${ED}"/usr/bin/cwdiff.hx || die
-	mv "${ED}"/usr/share/man/man1/cwdiff.1 "${ED}"/usr/share/man/man1/cwdiff.hx.1 || die
-}
diff --git a/dev-util/hxtools/hxtools-20190428.ebuild b/dev-util/hxtools/hxtools-20201116.ebuild
index 070a3a18b3d6..10d8f9635463 100644
--- a/dev-util/hxtools/hxtools-20190428.ebuild
+++ b/dev-util/hxtools/hxtools-20201116.ebuild
@@ -4,20 +4,19 @@
 EAPI=7
 
 DESCRIPTION="A collection of tools and scripts"
-HOMEPAGE="http://inai.de/projects/hxtools/"
-SRC_URI="http://jftp.inai.de/${PN}/${P}.tar.xz"
+HOMEPAGE="https://inai.de/projects/hxtools/"
+SRC_URI="https://inai.de/files/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
 
 RDEPEND="
 	>=sys-apps/pciutils-3
 	>=sys-apps/util-linux-2.19
-	>=sys-libs/libhx-3.12.1
+	>=sys-libs/libhx-3.12.1:=
 	dev-lang/perl
-	sys-libs/libcap
+	sys-libs/libcap:=
 	x11-libs/libxcb:0=
 "
 DEPEND="${RDEPEND}"
diff --git a/dev-util/idea-community/Manifest b/dev-util/idea-community/Manifest
index 237311f4e7d9..793fb0a6b192 100644
--- a/dev-util/idea-community/Manifest
+++ b/dev-util/idea-community/Manifest
@@ -1,8 +1,10 @@
 DIST ideaIC-2.1.202.6948.69.tar.gz 529563846 BLAKE2B df3771c8ca85a276a1ed9db5e9483f922a98f25ab82061cc54dee791f84d44dcd7d813180d587a3a9f3cd91d10b83881a3d42da11ecee3be77dccbe2ee7e98c5 SHA512 bc32e01297785bfcf2a57f97e697b7ec8f894f49c5f27959ed3fd5bab6ade0cff8f0091847809f7ee5f7b7299c2bda3e4bdb83cadc68a7a3056242dd83c1c4b9
 DIST ideaIC-2.2.202.7319.50.tar.gz 529375561 BLAKE2B 08a77a1326b81e9d6299779bf48fb0b9be389572143bd92591bcdf6ede79ecf86b725dde634e1b8bd412dc0b886bde29169bb236fbc902ba509b468e79073e90 SHA512 f68fe18a824fd47b3b21f0a3dcd172652858aafa9f81d1db908b3adc82f925677d2ce48d0a06ad58354c06b30e01c36fff910b4eb7d5ec89c408a6a1ff017e8e
+DIST ideaIC-2.3.202.7660.26.tar.gz 529860795 BLAKE2B 6704910e1ab456dde957eb14545ae2b6a0f9007091b875b65329b3e3ac354ddce326cdc5f0820ef3340cb291ffd2f40ac8f35fcfe6a042e3c4947c6e5a9f9852 SHA512 71ba86615024af4bd3c5ff61598c08122d0c2a7f093766e22e9ed65f1fed73ae7e7eeb8e57cb9c0021e20a268811e8c0a08eace0d4c3e370c092a92e7d572dc2
 DIST jbr-11_0_2-linux-x64-b164.tar.gz 131483925 BLAKE2B fb9c55094aeb4a9e6b89ef41699252355895fa4bf55eaa0d3c0a637b6485b5a91a0445b5f4af1872b62cd67b639f7354e05770970d41dcfa58ffeda7ae43c5b6 SHA512 4f32940166cc8ad5a138866e18d4cbfcd07f4326a85c051b7a622c9dcb8ee4b6d493331ef24d0c01999134fa2a9bad901f026982c16780fdc5e6b9308821db34
 DIST jbrx-8u202-linux-i586-b1483.37.tar.gz 80726147 BLAKE2B e4e5a076a541fd7153e861193ff4247c02ecbc144396ed28737afa7440f7771569b8d968b7c67b3dac333a89ff0b54cc9e5e76d1651b174cc7c0c21b1deb033c SHA512 53693f2ce994f4891807873ae3fe46ce60bee000b78be03c5d3df06b436328abe5b5d7e75d43e57f35f24187f49915187d034b39589e29806f55deeb14a029f2
 DIST jbrx-8u202-linux-x64-b1483.37.tar.gz 81812743 BLAKE2B 86ddf0c8dc992a27e680caa821f54fa4d647a8bff78b9fdbef82996bfbba828a2f68f1a00ed64bd92ce24a62bfc6c0240837c396644c6e91244cb0d980b6c704 SHA512 cd31a3c4da7b8c65e9ae89326c2c8b260b51890258d30f64b1e8a7c6c1442bb2cb68ea2aa80387ce0c1a8f50e3533e8231f72c5935b639e3cf82bc1ffedee8e9
 EBUILD idea-community-2020.2.1.202.6948.69.ebuild 4693 BLAKE2B ac564614a230e6539459a2122d5ca9b9ce842697a06c44b4b10eef9cdab283a5e8967d39a40cf24c1ec2e1252f97d6569806aa3807aaca8c3a9f686aedf372e5 SHA512 e07f7c5957113f18a57281cfbe75c136b141c82d1ec6487cc0a1eb47f2b87c181f203111ae86505df7d5f2c73791ce03c68e48ae09916caf87188aa121656f7c
 EBUILD idea-community-2020.2.2.202.7319.50.ebuild 4693 BLAKE2B ac564614a230e6539459a2122d5ca9b9ce842697a06c44b4b10eef9cdab283a5e8967d39a40cf24c1ec2e1252f97d6569806aa3807aaca8c3a9f686aedf372e5 SHA512 e07f7c5957113f18a57281cfbe75c136b141c82d1ec6487cc0a1eb47f2b87c181f203111ae86505df7d5f2c73791ce03c68e48ae09916caf87188aa121656f7c
+EBUILD idea-community-2020.2.3.202.7660.26.ebuild 4693 BLAKE2B ac564614a230e6539459a2122d5ca9b9ce842697a06c44b4b10eef9cdab283a5e8967d39a40cf24c1ec2e1252f97d6569806aa3807aaca8c3a9f686aedf372e5 SHA512 e07f7c5957113f18a57281cfbe75c136b141c82d1ec6487cc0a1eb47f2b87c181f203111ae86505df7d5f2c73791ce03c68e48ae09916caf87188aa121656f7c
 MISC metadata.xml 758 BLAKE2B ab45d0a8508bed2b64d02ca83d0aaffab9dfceb13a6a188accbb18f0648593ef1a9cfa03f375292b9858c05b17f003f4c6c2261b9d962ddaf679eebe7cea2eda SHA512 15ad0429ec342e939f3406e83b736ec9a273cb4ba33998a83584cee7af4ad0433a5a4758c8d01feb24efef51e4a4d9761db18d0bfc054bf9a0980ac8806eb459
diff --git a/dev-util/idea-community/idea-community-2020.2.3.202.7660.26.ebuild b/dev-util/idea-community/idea-community-2020.2.3.202.7660.26.ebuild
new file mode 100644
index 000000000000..97ec35a8801d
--- /dev/null
+++ b/dev-util/idea-community/idea-community-2020.2.3.202.7660.26.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit eutils desktop
+
+SLOT="0"
+PV_STRING="$(ver_cut 2-6)"
+MY_PV="$(ver_cut 1-3)"
+MY_PN="idea"
+# Using the most recent Jetbrains Runtime binaries available at the time of writing
+# As the exact bundled versions ( jre 11 build 159.30 and jre 8 build 1483.39 ) aren't
+# available separately
+JRE11_BASE="11_0_2"
+JRE11_VER="164"
+JRE_BASE="8u202"
+JRE_VER="1483.37"
+
+# distinguish settings for official stable releases and EAP-version releases
+if [[ "$(ver_cut 7)"x = "prex" ]]
+then
+	# upstream EAP
+	KEYWORDS="~arm64"
+	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${PV_STRING}.tar.gz"
+else
+	# upstream stable
+	KEYWORDS="~amd64 ~arm64 ~x86"
+	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${MY_PV}-no-jbr.tar.gz -> ${MY_PN}IC-${PV_STRING}.tar.gz
+		jbr8? ( x86? ( https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbrx-${JRE_BASE}-linux-i586-b${JRE_VER}.tar.gz -> jbrx-${JRE_BASE}-linux-i586-b${JRE_VER}.tar.gz )
+		amd64? ( https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbrx-${JRE_BASE}-linux-x64-b${JRE_VER}.tar.gz -> jbrx-${JRE_BASE}-linux-x64-b${JRE_VER}.tar.gz ) )
+		jbr11? ( amd64? ( https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz -> jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz ) )"
+fi
+
+DESCRIPTION="A complete toolset for web, mobile and enterprise development"
+HOMEPAGE="https://www.jetbrains.com/idea"
+
+LICENSE="Apache-2.0 BSD BSD-2 CC0-1.0 CC-BY-2.5 CDDL-1.1
+	codehaus-classworlds CPL-1.0 EPL-1.0 EPL-2.0 jbr8? ( GPL-2 )
+	jbr11? ( GPL-2 ) GPL-2 GPL-2-with-classpath-exception ISC
+	JDOM LGPL-2.1 LGPL-2.1+ LGPL-3-with-linking-exception MIT
+	MPL-1.0 MPL-1.1 OFL ZLIB"
+
+#Splitting custom-jdk into jbr8 and jbr11 as upstream now offers downloads with
+#either (or neither) bundled
+#Defaulting to jbr8 to match upstream
+IUSE="+jbr8 -jbr11"
+REQUIRED_USE="jbr8? ( !jbr11 )"
+
+DEPEND="!dev-util/${PN}:14
+	!dev-util/${PN}:15"
+RDEPEND="${DEPEND}
+	>=virtual/jdk-1.7:*
+	dev-java/jansi-native
+	dev-libs/libdbusmenu
+	=dev-util/lldb-9*"
+BDEPEND="dev-util/patchelf"
+RESTRICT="splitdebug"
+S="${WORKDIR}/${MY_PN}-IC-$(ver_cut 4-6)"
+
+QA_PREBUILT="opt/${PN}-${MY_PV}/*"
+
+# jbr11 binary doesn't unpack nicely into a single folder
+src_unpack() {
+	default_src_unpack
+	if use jbr11 ; then
+		mkdir jre64 && cd jre64 && unpack jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz
+	fi
+}
+
+src_prepare() {
+	if use amd64; then
+		JRE_DIR=jre64
+	else
+		JRE_DIR=jre
+	fi
+
+	if use jbr8; then
+		mv "${WORKDIR}/jre" ./"${JRE_DIR}"
+		PLUGIN_DIR="${S}/${JRE_DIR}/lib/${ARCH}"
+	else
+		PLUGIN_DIR="${S}/${JRE_DIR}/lib/"
+	fi
+
+	rm -vf ${PLUGIN_DIR}/libavplugin*
+	rm -vf "${S}"/plugins/maven/lib/maven3/lib/jansi-native/*/libjansi*
+	rm -vrf "${S}"/lib/pty4j-native/linux/ppc64le
+	rm -vf "${S}"/bin/libdbm64*
+
+	if [[ -d "${S}"/"${JRE_DIR}" ]]; then
+		for file in "${PLUGIN_DIR}"/{libfxplugins.so,libjfxmedia.so}
+		do
+			if [[ -f "$file" ]]; then
+			  patchelf --set-rpath '$ORIGIN' $file || die
+			fi
+		done
+	fi
+
+	patchelf --replace-needed liblldb.so liblldb.so.9 "${S}"/plugins/Kotlin/bin/linux/LLDBFrontend || die "Unable to patch LLDBFrontend for lldb"
+
+	sed -i \
+		-e "\$a\\\\" \
+		-e "\$a#-----------------------------------------------------------------------" \
+		-e "\$a# Disable automatic updates as these are handled through Gentoo's" \
+		-e "\$a# package manager. See bug #704494" \
+		-e "\$a#-----------------------------------------------------------------------" \
+		-e "\$aide.no.platform.update=Gentoo"  bin/idea.properties
+
+	eapply_user
+}
+
+src_install() {
+	local dir="/opt/${PN}-${MY_PV}"
+
+	insinto "${dir}"
+	doins -r *
+	fperms 755 "${dir}"/bin/{format.sh,idea.sh,inspect.sh,printenv.py,restart.py,fsnotifier{,64}}
+	if use amd64; then
+		JRE_DIR=jre64
+	else
+		JRE_DIR=jre
+	fi
+	if use jbr8 || use jbr11 ; then
+	if use jbr8; then
+		JRE_BINARIES="java jjs keytool orbd pack200 policytool rmid rmiregistry servertool tnameserv unpack200"
+	else
+		JRE_BINARIES="jaotc java javapackager jjs jrunscript keytool pack200 rmid rmiregistry unpack200"
+	fi
+		if [[ -d ${JRE_DIR} ]]; then
+			for jrebin in $JRE_BINARIES; do
+				fperms 755 "${dir}"/"${JRE_DIR}"/bin/"${jrebin}"
+			done
+		fi
+	fi
+
+	make_wrapper "${PN}" "${dir}/bin/${MY_PN}.sh"
+	newicon "bin/${MY_PN}.png" "${PN}.png"
+	make_desktop_entry "${PN}" "IntelliJ Idea Community" "${PN}" "Development;IDE;"
+
+	# recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
+	mkdir -p "${D}/etc/sysctl.d/" || die
+	echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf" || die
+}
diff --git a/dev-util/ignition-cmake/Manifest b/dev-util/ignition-cmake/Manifest
index 83ef2c102dbe..f231f26b881e 100644
--- a/dev-util/ignition-cmake/Manifest
+++ b/dev-util/ignition-cmake/Manifest
@@ -1,7 +1,9 @@
 DIST ignition-cmake-0.2.0.tar.bz2 69508 BLAKE2B df51c53f2e09af260cc4ce245400f821ed29c83791a088cc3e059caf5e08f073f0d297bdc66947f77e81742c6c2a8f15a177cc082b2fb20c5f12daf59d3cf851 SHA512 fa9ada51a6cb88a1bdba5ee5732402abeb63e8f6dc044b73c9b0ccb180492f570ddf4a6f9ef891aef6be83b4fcce50ac509c724f5b8a3c99d5a30fc8d0433ca0
 DIST ignition-cmake-0.4.0.tar.bz2 119136 BLAKE2B 8e7891d71fdb605b3f9d81f4dc79d99abf531f6492d4e511868c0d88472f97732ed3f5a4d10c364fd32c637332c51136b6270934538d2f04e437044a70a0d4ef SHA512 04781babcc09ff70b503dc2085e0c050b88260986f63fd68171878f92edb975a4d8c57848407600e132bc338158365c6c1802fce16bb89ae3a83b553a77bb8ac
 DIST ignition-cmake2-2.2.0.tar.bz2 178241 BLAKE2B 92e84a7493fb731a92889d6988a02edf348859ab7554a2adb2d0b9dc3ee0ba2dd9066cd33eb78e7091c69640e9b0c1821ce68def1653489080926e0ed498c3e9 SHA512 4f1df282d59231eb3a35ce0faf086b78b3dd47dd9182b856f75af70957bc3e84ab2e17913ebb4df36d1f0143d5b094dbb24c8b8c3e2c3161b0fdb831b8000419
+DIST ignition-cmake2-2.5.0.tar.bz2 181864 BLAKE2B 0b82db50cbbc617370be39cafc93ecccc800ab84e3cf0b4c48a720b1bdc74cb88a57c98f5aa4ae2aa9ed31d0f39a79f38141eb4d4962bfde0ef65ad1291f87c0 SHA512 238261be7495adab0abdf21e6774c537944bf8c88719cba42d0b498e85bf56cc0ec9b67255c18dac71666670a88e5d8785f7bc14c7c53ff221c02e474a41c41c
 EBUILD ignition-cmake-0.2.0.ebuild 439 BLAKE2B 3ad5cb7e810c2f44a170e152eadb91ccbdd4d8e83cd680ee08967fd2331376fc3321da60a8b03f1937fb062d3ce036f55ba22e1cd2f3cab435be5e55bc5157c2 SHA512 d6b9aea2003fdf8e45c9a19ed75346fea237d004e341f0e010a7d5e8c542722170c8bb8e54e168ec1c56240c0ab429b0a669a6dea83fea8695b31636c5ac6d5d
 EBUILD ignition-cmake-0.4.0.ebuild 439 BLAKE2B 3ad5cb7e810c2f44a170e152eadb91ccbdd4d8e83cd680ee08967fd2331376fc3321da60a8b03f1937fb062d3ce036f55ba22e1cd2f3cab435be5e55bc5157c2 SHA512 d6b9aea2003fdf8e45c9a19ed75346fea237d004e341f0e010a7d5e8c542722170c8bb8e54e168ec1c56240c0ab429b0a669a6dea83fea8695b31636c5ac6d5d
 EBUILD ignition-cmake-2.2.0.ebuild 537 BLAKE2B a2cddb072ebd100819d3ab1da857e74c2d16c873bfbaf742a256570c7e8abbb081c6e2ce6f525101c1bc82a061267c0fe6199ba6babdf8a8b3101493f91eb9b1 SHA512 903a700b7d13359b10c45c3a8aa9b307d633310745dae76d5b83c4e50ee86b48e370a55bd811fa1e2f10fd9dbed212fa19f4be2130d407eba0c88227ab489025
+EBUILD ignition-cmake-2.5.0.ebuild 534 BLAKE2B 71c79a5574779293e99bdbd9786cffd0276d681c5e096d7a2bb3359777d6e474a41aa6699c2e68b1337e0818a1128874a8427ec490a63595c4a077ea82435e54 SHA512 521849aef3c5fdfab5c03736ba889e03d630e542c35361394c198bae6097252ba4a947cb61133dab089a5d610f470ab5ff3eea0ffb2938058e29e8e912fc6c21
 MISC metadata.xml 343 BLAKE2B 536ab78631c87736b53a743176498918523743a53aba4ef92acda61a623962309d0a76618158ec211cc33c6cfbc0ce02bc8342539bc5696fe04d5654db87ce84 SHA512 82518150642d903e8f9b18e1b175bc4a694a90d02877e4d5af83b0a8bdbba1ce2063ca27a6e6161211df3c82588d9f2c28b7aa0e0e84326c1ea63242bc34e739
diff --git a/dev-util/ignition-cmake/ignition-cmake-2.5.0.ebuild b/dev-util/ignition-cmake/ignition-cmake-2.5.0.ebuild
new file mode 100644
index 000000000000..1c4eede9e5ac
--- /dev/null
+++ b/dev-util/ignition-cmake/ignition-cmake-2.5.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="CMake modules to be used by the Ignition projects."
+HOMEPAGE="https://github.com/ignitionrobotics/ign-cmake"
+SRC_URI="https://osrf-distributions.s3.amazonaws.com/ign-cmake/releases/${PN}2-${PV}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		"-DBUILD_TESTING=OFF"
+	)
+	cmake-utils_src_configure
+}
diff --git a/dev-util/include-what-you-use/Manifest b/dev-util/include-what-you-use/Manifest
index 8de2eac1e4ce..9e8814d96fc5 100644
--- a/dev-util/include-what-you-use/Manifest
+++ b/dev-util/include-what-you-use/Manifest
@@ -1,3 +1,5 @@
 DIST include-what-you-use-10.0.tar.gz 598644 BLAKE2B 36c81bd493edfdfdc4df31c2dcb49d5acd3f6016f706e0c9d2f031d668ca16d71797d40b04fc9dc25a21738f7075320406fd666db74a0baa3832c149fe674e0e SHA512 e54a7c7e3a6d3e0de7c263d1f26b373d95b8fab5f1f7e76f52d80341bda2bad0fb12238a325dc1e2f6d3ab5e6d8e0b4ed60b5a19dc82e06d480bcb461f9aefba
-EBUILD include-what-you-use-10.0.ebuild 1286 BLAKE2B 1742f6da93355f96388c2f3f22d8d5f320dd224f6b3a174672a81bc200f02836dd613e97159da3186944b0b299c3b0032281144636d83601d8fa756dca3c75ce SHA512 d93c70b87a04a10ff5e0015c39236769f6dd1c2b39e60b471840d2a2e481efeaf8fcf60808875c77735c1d2cffdf55203514afaeebbcde14e7f34af12d639e6c
+DIST include-what-you-use-11.0.tar.gz 603435 BLAKE2B 7bfa37349cc4bf5d07033c28d9d3851f0ce2093f1703a0392ac633ab2761dfdfb7cd923099177747e3389d2d41330351242c6f936399acf73119c201d8776978 SHA512 db15efa9b92015322e9a188be6cf16a5c6fd71271c94fde45245676f2a8f6ffe4c7837e3b0bb5f9be6cbe78aab245129816a3b046c44c261a2b7ab5c3a9ea7b9
+EBUILD include-what-you-use-10.0.ebuild 1270 BLAKE2B b85c42b52e2f08cc0730d0f51750722215ef912f9a3af117f710ad3ceabdfddd028f46566bf90ce846029a4f5dbf163a3ffc0a755f9679a4417b7307b4933eff SHA512 4c93b659eaa5b3d546b6ee24f2d5a6bc7bdfeefd4c30465fdd5b4c1a4415a453db62eee2d3d2f6c2ca93517e91bdbb4a6698efcab85b049eda387819ac8aecba
+EBUILD include-what-you-use-11.0.ebuild 1270 BLAKE2B 76cfb185e08461cf93e93aad38237f58cf88e7fdb0f8e40cab96bea6e6098eb18fc84eb0ae129c846798794964f789222e4facc6b90f16ec6c8ed99b6583c8ed SHA512 e3ef6622e68e43b16cca32dac3f8d9edd12af1d61c8046fcbaa50e0f23fd709a87bc362a7e24014146683988dcd6780d9d5f2e3b65ce6878f3433c64072cde06
 MISC metadata.xml 357 BLAKE2B f14a0380bab03b4bb916602ed495cf9c29a4ca5839f71dca0d5f4f14eeb5fd0ddaa66dfcb15d94cbeec2a9021a9e5522ef7ae531b5b6f111b769462596da4216 SHA512 03c298d184adee1c8bd96855ba3856dbc6797f6f866397485cc10c3e02956f7bb04811a086e9cf50bbd6f996011d08ca2d272aa4b06f13ee62af5a585f67b492
diff --git a/dev-util/include-what-you-use/include-what-you-use-10.0.ebuild b/dev-util/include-what-you-use/include-what-you-use-10.0.ebuild
index da2675ad0e22..b36d998aca9b 100644
--- a/dev-util/include-what-you-use/include-what-you-use-10.0.ebuild
+++ b/dev-util/include-what-you-use/include-what-you-use-10.0.ebuild
@@ -3,11 +3,11 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
-inherit cmake-utils flag-o-matic llvm python-single-r1
+inherit cmake flag-o-matic llvm python-single-r1
 
-# Sometimes the tag is clang_9, timetimes it's IWYU-0.13
+# Sometimes the tag is clang_9, sometimes it's IWYU-0.13
 UPSTREAM_PV=0.14
 
 DESCRIPTION="Find unused include directives in C/C++ programs"
@@ -36,7 +36,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 	python_fix_shebang .
 }
 
@@ -50,7 +50,7 @@ src_configure() {
 		# as llvm/clang itself.
 		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix "${LLVM_MAX_SLOT}")"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_test() {
diff --git a/dev-util/include-what-you-use/include-what-you-use-11.0.ebuild b/dev-util/include-what-you-use/include-what-you-use-11.0.ebuild
new file mode 100644
index 000000000000..662b79bec3f4
--- /dev/null
+++ b/dev-util/include-what-you-use/include-what-you-use-11.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit cmake flag-o-matic llvm python-single-r1
+
+# Sometimes the tag is clang_9, sometimes it's IWYU-0.13
+UPSTREAM_PV=0.15
+
+DESCRIPTION="Find unused include directives in C/C++ programs"
+HOMEPAGE="https://include-what-you-use.org/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${UPSTREAM_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+LLVM_MAX_SLOT=11
+
+RDEPEND="sys-devel/llvm:${LLVM_MAX_SLOT}
+	sys-devel/clang:${LLVM_MAX_SLOT}
+	${PYTHON_DEPS}
+"
+DEPEND="${RDEPEND}"
+
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+S=${WORKDIR}/${PN}-${UPSTREAM_PV}
+
+pkg_setup() {
+	llvm_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	python_fix_shebang .
+}
+
+src_configure() {
+	local mycmakeargs=(
+		# Note [llvm install path]
+		# Unfortunately all binaries using clang driver
+		# have to reside at the same path depth as
+		# 'clang' binary itself. See bug #625972
+		# Thus as a hack we install it to the same directory
+		# as llvm/clang itself.
+		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix "${LLVM_MAX_SLOT}")"
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	"${EPYTHON}" run_iwyu_tests.py
+}
diff --git a/dev-util/indent/Manifest b/dev-util/indent/Manifest
index f64290de2ef2..dd5285291a0d 100644
--- a/dev-util/indent/Manifest
+++ b/dev-util/indent/Manifest
@@ -8,4 +8,4 @@ DIST indent_2.2.11-5.debian.tar.xz 6540 BLAKE2B c4d0805f39e1af503bcfcc49a8e9e679
 EBUILD indent-2.2.11-r1.ebuild 1231 BLAKE2B 89908894927dbcf9a423998aca2f3d5052a6912bad1ff67a68dafee6bd651b402a388873dab797efb196c2a4cb8208b9a0f259b0b1af5be64ba16267885e9571 SHA512 1ddfa9c9624bf7409a063fbf2707a095e120f64c3b2a86abd86ad0e8b9b2200e0a2ba2cf7bacf221d3d9c1553fa71971c94ff4e19bc59fa90ee87bf198177fa7
 EBUILD indent-2.2.11_p5.ebuild 1392 BLAKE2B de097169420daf098c4a3a1f88cd973f0047bc282e3ae5e08be60ea27c18eef908d91d44d418b395ac79af0c6caa4f4fc742a4423d7f3162c5e9ea37a7c77af7 SHA512 9b1b34cdc5fbdc205fa448ba9ddb47a313c2842eb6f0872078c0b1769fe98a8fc491f6b2d4af4c425dacc1f105f2dbe88eb1b27682d339f9cc98185ea1fede1a
 EBUILD indent-2.2.12.ebuild 1123 BLAKE2B 042021ce75527202ed59073fbb4810152ca10955b49baa3ffa0bb874dbea56aaa284a0d1864f02ca0c604a02d328cd74ff6622f6bdc98d844ffd227a541053ef SHA512 cc85dba62c15974d85fe6d3533fd579a394d1b60dd4706b5222f370a204a3a7e2e6dbd61115c00a66a5f9aad8a0817a4492abce0cd4cff062f2bc337502e264f
-MISC metadata.xml 240 BLAKE2B 64fe413f69832b5396b621f50bc6f618ddea15ddd4044ac76da4557d7dc0d963ce6ba36c0d1c0a8911af48fd71a6e84c4981f15ac7bad40bbd801e52b568a23b SHA512 25affa2d6d2fe48707ae81553343451aff9797885b4232e73973a29d4cc1d28a937d024cefca49f92383f01eb8cb811546cd2334cbb78f8e66f1db1f63ff4572
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/indent/metadata.xml b/dev-util/indent/metadata.xml
index f9f8bbfd9405..6f49eba8f496 100644
--- a/dev-util/indent/metadata.xml
+++ b/dev-util/indent/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>jer@gentoo.org</email>
-	<name>Jeroen Roovers</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/dev-util/intel-graphics-compiler/Manifest b/dev-util/intel-graphics-compiler/Manifest
index 2a621c9b9340..3ee576e800ad 100644
--- a/dev-util/intel-graphics-compiler/Manifest
+++ b/dev-util/intel-graphics-compiler/Manifest
@@ -2,6 +2,6 @@ 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
-EBUILD intel-graphics-compiler-1.0.4111.ebuild 1949 BLAKE2B c479aa3914b8d8e03a00d76c21b5ba6bf4e3ce9ef572cbf478eb77c9dce877b6df7b78e6b4aadccebdb811b5dee7b1bf88ae87becb6a010880fd84629f10f272 SHA512 87b2d259c3ec9e1746efc29b242a9908818751b50fc2309bda3c88bdf178d488b88e0feb35209fb6fe424465fe66a3d33254d911751d7a2ac98a6d70965505e7
+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
-MISC metadata.xml 340 BLAKE2B 6c0e5d932084dffd300a1dc70b29eb0871dfe2187ed8591a5a2f8cba001bf681e908c58a6f9471f7b08842ff538365258305da91004ed63ff97314a07fda529f SHA512 d24016b4ae0ffb05be475f86bb8d72ab4a85475655f409b8826dcd69726e048aa048e321f26ac36f2f52aec40abbfa66a95354a711332df94dc3e57e6c396a0c
+MISC metadata.xml 262 BLAKE2B 6c3ab6eb29647b8d630b1421eca7289613438d56dfa180f85efefbb922d8d2772a26ac2360715dbce23f5b5acff73ccc5cf8d85c90a666c0475f232ed1a6a2ad SHA512 58cf8c27cd031f7653e54b8187dd99b885b5ff336c8db4692a9ee64ecbc6f503d2c41921410114d30c1ec49da925bfc67f5f7da61dd6f89a0257eb1f35c9b6ec
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.4111.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.4111.ebuild
index 4b31c121d43e..2ce45fda5adf 100644
--- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.4111.ebuild
+++ b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.4111.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/intel/${PN}/archive/igc-${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="debug"
 
 LLVM_MAX_SLOT=10
diff --git a/dev-util/intel-graphics-compiler/metadata.xml b/dev-util/intel-graphics-compiler/metadata.xml
index b124b9c53046..9293e0f2fc0d 100644
--- a/dev-util/intel-graphics-compiler/metadata.xml
+++ b/dev-util/intel-graphics-compiler/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">intel/intel-graphics-compiler</remote-id>
 	</upstream>
diff --git a/dev-util/jenkins-bin/Manifest b/dev-util/jenkins-bin/Manifest
index 816da60394b7..6f8b786a42c8 100644
--- a/dev-util/jenkins-bin/Manifest
+++ b/dev-util/jenkins-bin/Manifest
@@ -3,10 +3,12 @@ AUX jenkins-bin.confd 998 BLAKE2B 5c44e37118e15fdd76fc7eb0e10e06683828d3efe08687
 AUX jenkins-bin.init2 1782 BLAKE2B 25c78b64308be71d605f3c4f2d33c5cf1074ab431e23a170f7d36002d668def7dbd56b0b45590692047d7d88c6884ec1cc40cb4f077f7edcb853300301805002 SHA512 e0fd85f653bbf5ac80dc929cb265ac86a08047f9102d57f2ac6194cd31794310a3c062824423552a3ee65e298506332436fca037f96963358dc511982f900be8
 AUX jenkins-bin.service 499 BLAKE2B 28a90d5cf40e46880570e87acbc6d78766460faebc6e9a79b8c446fc05babf1de405cf79e29f527f0e9e0bf91093836fb6a50c7040320f59e78bf1971cd14ed3 SHA512 4ede5e0d55bf9d53239a1b8c152d1a3e38510982d6ff01c9c4288d63b8312ab7412979e0af3466638c7ef2803b711d49344692c14e72baa85d8eb4caa15f7506
 AUX jenkins-bin.service2 566 BLAKE2B 38511fddc783a70ae3deab70526c737a883ef090bcfb20216658b0775667022782f3ee8a6638515b46e6a4df96228fb2368521c74a0ddca2f121e9170549df8e SHA512 87b59349edcb1503e6c91440327092732f0dddb8cc35e4576c81da55e08a2ad67d462a4d871c46da4f3ed037de8b9109d766ba36ca9acf244506d129766ed5cb
-DIST jenkins-bin-2.235.5.war 66477424 BLAKE2B d4917468af085358c98bd5cfe9c31232584a18a74d01e962d594dc2ea3db75d4efabf411dbf568837b56e8230d831f3c88ea4e54f1a965f570772265989a9be7 SHA512 2c9d720dfb87f68dc57e5b2b750d2cbeb24efe65decfee13f4e96b578d3b460e0e00e713a90ee9a32dc1e5c2976455f3598f1c023a279da50b0622284529487e
-DIST jenkins-bin-2.249.1.war 67394283 BLAKE2B c63120bd478d6cdc772935445c37e222ef274f5108023e18a598fb131e380aa5fb17baeab7d7d1cc0d01b776cb5693d28e0f2fa1d48b253ff490e66f0131cec5 SHA512 19a7d0e496b257c9b2c0d7862cff2c9c6221fc87cfa8da6064d316c4fb81a51a10f67a4fb10d30ba645c5f97346d440d45389a8de13c7854474fc816bf23aaac
-DIST jenkins-bin-2.252.war 67396384 BLAKE2B 6476b03a8dcc73f61f151c6187ebd275ed3fb8f352478e0e135406d9dcab150a360ba6b7b9a8ca82d0ed24e5294bd77755497ba7ec9df72b0487f8341eb9d9e5 SHA512 c9a0b1676155f66e0cfbc97762c663ce4d968d2be296e03aa29d4670dfcea6e432340bf424076951c268b28766fbba84efaff397b2ba50fadb9ca04f5bb52236
-EBUILD jenkins-bin-2.235.5.ebuild 1105 BLAKE2B 161bf3f0ad77e74702cfdd1db69cfaa54f6e267e814b358d3fdcac2ca5c7210410d1cf87d03a9e6f987d2ede8459d37f6bf352bc2a7fcd7f2167edf81542aff9 SHA512 d86e52237449bda33bc052d7b1dd3bc15306c4b771c485d34843973a7a7df6c0d0593ab156837cc64a018466222fd0c09bb331bb5c820807f5038300517e2283
-EBUILD jenkins-bin-2.249.1.ebuild 1105 BLAKE2B 161bf3f0ad77e74702cfdd1db69cfaa54f6e267e814b358d3fdcac2ca5c7210410d1cf87d03a9e6f987d2ede8459d37f6bf352bc2a7fcd7f2167edf81542aff9 SHA512 d86e52237449bda33bc052d7b1dd3bc15306c4b771c485d34843973a7a7df6c0d0593ab156837cc64a018466222fd0c09bb331bb5c820807f5038300517e2283
-EBUILD jenkins-bin-2.252.ebuild 1098 BLAKE2B 0bfaac37afbe842e4e1a5572a0f56a77b4bc5915be4cb9a79cd7a56105562e8877c9686a2963c347c2feb06dea8e4aad271bcda9a9e50f17433485f189d39981 SHA512 381e5dd3c921892b0df7497fa6028ced0df8c84a2a0731142c01023cf2d63d60233f24f19e62d40699c606ea162210f54641b6742ad63d6a6c99bd29b24c0835
+DIST jenkins-bin-2.249.2.war 67399569 BLAKE2B df3d954988370a47d90363a01de97f17a92cb4d93049ceacea80f7d2a92195cd1e95b1f3780521efa166aee1058949f0e8861b887d6da5b0f0126a2579d22595 SHA512 0300369b3c427420a9c41ee17f3e098c77f14b25597059d740fdbea03f3679ce56d9e154d7765601274cd9dc866939595f7728bc2b8b8a0ef3ea131378648a98
+DIST jenkins-bin-2.249.3.war 67400032 BLAKE2B eb9ffde454bf9ee2140655a985c6f383cb2e3d21f172075cf19171871564d356afd38b8ed6119cb3bd43801843d499242c0ae99087c5c4f7cb2db1b8b80b70a4 SHA512 5d65dee8c128ba2a307ade0750a0ad9b71136b1102a36df0a34a1217ce62df9c0c60449e0f5dd8861369b553000ef65f8bb0afb54a3c8e4315400dede58e779b
+DIST jenkins-bin-2.264.war 67272894 BLAKE2B 8cf8afc038420bbf101bf8c81cdb37e9ba25f631ccbe0f98d8897f12a93abf8355dca1ec23f254e14b16dbd8e88507a37b545c4854f2e8f3684bda871d8e171f SHA512 9bf29d7ae084c30c02931ba065e7d712a3cab4e4519587a1edc68e7205dac7a91934ca910536dd8d2c268575547fea2cdcc43229c726ed495658210cea7747a5
+DIST jenkins-bin-2.267.war 70971700 BLAKE2B 1470144d6be6cfc33d7b84c51ebb3f762b3e590427a362596302b87510d694b479608ff290b64a433aa98266d3c47b1294a505525cfdeae3547e58cc65f0d172 SHA512 39c042b3ca9d48c040d0a9d9ac9d65aff2f579888e24b800bc1e1b77b7175528aed31f2675b3417577b0b0eef7c17b6faa2d7b794360a17a6a4c8ba867007185
+EBUILD jenkins-bin-2.249.2.ebuild 1105 BLAKE2B 161bf3f0ad77e74702cfdd1db69cfaa54f6e267e814b358d3fdcac2ca5c7210410d1cf87d03a9e6f987d2ede8459d37f6bf352bc2a7fcd7f2167edf81542aff9 SHA512 d86e52237449bda33bc052d7b1dd3bc15306c4b771c485d34843973a7a7df6c0d0593ab156837cc64a018466222fd0c09bb331bb5c820807f5038300517e2283
+EBUILD jenkins-bin-2.249.3.ebuild 1105 BLAKE2B 161bf3f0ad77e74702cfdd1db69cfaa54f6e267e814b358d3fdcac2ca5c7210410d1cf87d03a9e6f987d2ede8459d37f6bf352bc2a7fcd7f2167edf81542aff9 SHA512 d86e52237449bda33bc052d7b1dd3bc15306c4b771c485d34843973a7a7df6c0d0593ab156837cc64a018466222fd0c09bb331bb5c820807f5038300517e2283
+EBUILD jenkins-bin-2.264.ebuild 1105 BLAKE2B 90abfb2e3e72792cf968489f1da72a5bf90a6f622ac0003fcd56e5cda7a1ae79cd7effb539a7526fabcf85a6453499c831cfaced13db2ad5762b93cd0e2925f7 SHA512 0f1b7d69bb9e1dd47a42c5a0c925bb55f04692c2097b16d64f08d6d49f6b4267b81c766cca359c9ab55b411372741a2af1029ded72e93a600d44dbda7ad02110
+EBUILD jenkins-bin-2.267.ebuild 1105 BLAKE2B 90abfb2e3e72792cf968489f1da72a5bf90a6f622ac0003fcd56e5cda7a1ae79cd7effb539a7526fabcf85a6453499c831cfaced13db2ad5762b93cd0e2925f7 SHA512 0f1b7d69bb9e1dd47a42c5a0c925bb55f04692c2097b16d64f08d6d49f6b4267b81c766cca359c9ab55b411372741a2af1029ded72e93a600d44dbda7ad02110
 MISC metadata.xml 397 BLAKE2B b1a7fd87c8d5857ab102ec3d3bf5830c26c6988bb97caf89018b05e159f038c9c3a092b4f35788929d05042ac5cfd694bd03a8381686b9472880d0d205a451cd SHA512 4087fd799f4019f09103fb32d7f120e74d94715205bcc66858d11b9457774acaed37f3ad97ca0328f4ec28230a409dcfb0cbaceec142eb0a5fd3241ca35f8810
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.235.5.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.249.2.ebuild
index 8ab8d5db213a..8ab8d5db213a 100644
--- a/dev-util/jenkins-bin/jenkins-bin-2.235.5.ebuild
+++ b/dev-util/jenkins-bin/jenkins-bin-2.249.2.ebuild
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.249.1.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.249.3.ebuild
index 8ab8d5db213a..8ab8d5db213a 100644
--- a/dev-util/jenkins-bin/jenkins-bin-2.249.1.ebuild
+++ b/dev-util/jenkins-bin/jenkins-bin-2.249.3.ebuild
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.252.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.264.ebuild
index e3e0cd1a4eda..231d58c8748f 100644
--- a/dev-util/jenkins-bin/jenkins-bin-2.252.ebuild
+++ b/dev-util/jenkins-bin/jenkins-bin-2.264.ebuild
@@ -11,7 +11,7 @@ LICENSE="MIT"
 SRC_URI="http://mirrors.jenkins-ci.org/war/${PV}/${PN/-bin/}.war -> ${P}.war"
 RESTRICT="mirror"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux"
 IUSE=""
 
 RDEPEND="media-fonts/dejavu
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.267.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.267.ebuild
new file mode 100644
index 000000000000..231d58c8748f
--- /dev/null
+++ b/dev-util/jenkins-bin/jenkins-bin-2.267.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit user 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
+	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
+}
+
+src_install() {
+	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/kbuild/Manifest b/dev-util/kbuild/Manifest
index 8508a42803e7..56f94e2a510e 100644
--- a/dev-util/kbuild/Manifest
+++ b/dev-util/kbuild/Manifest
@@ -9,6 +9,6 @@ AUX kbuild-unknown-configure-opt.patch 355 BLAKE2B 78c170c4d34d76a07925c08580245
 DIST kbuild-0.1.9998.3149-src.tar.xz 2314792 BLAKE2B 84aa1dbbaefc64a3ecc954c383d0516d88efd1a1791180164dd7bc3b26cd82a4a8c35c4b308e9fc960f114c40e77ea4a27acd94b62883c379acefb324a7c3f72 SHA512 74808e6279c01739170535655edbbffb73809f60b18c7ee63a110af7af651628789b9e5d253821f5685f8e8c072890c4669493e64886f53587b810ea0f67826c
 DIST kbuild-0.1.9998.3407-src.tar.xz 2351596 BLAKE2B ed562a739831c465ba66b2c357b1ab52cb072e61fa597d96d9e66e1b57a7f790c7e37fc82ef7ff49114b0cb4cb623e558d96864e98ca36bd42fe16e58e863dc7 SHA512 0a1fddff595f7ccfdb65a1a660c82860f132796b42149b8b40808d0df489312dcd96402236150c8ec5ec32c1cc142ce7af1150e10fdb83bf798e4d690dd64314
 EBUILD kbuild-0.1.9998.3149.ebuild 1866 BLAKE2B ae4ec9b87e0d988980b8e387e42cc8b13b2530de64090e8d2ab5817af68d6d7e752486a7158f69c4e99b2c322b48cd15398093e54b6a89b94e61f50f7e212167 SHA512 f5d669c42ceaba1e409eb5b94d8c95162afcc764b4b4a9b2b7fda835d11f80ebcc28e59359deb9b5d4fa8e035c2413c5fac2e698e43efe400d6b945cbd0f97ca
-EBUILD kbuild-0.1.9998.3407.ebuild 1734 BLAKE2B 9e451e9732dc6f034c8427d92b14edb0c10259286ac821eaaf7f11decabff54861db7e939ca6dd46744e3bf438d0e24f5962952debf8d2db00050e1e0f6cbaef SHA512 cc2a319dad42642666e36c32dcf93740bf1f124c5becb90773564a3db49be49c08e970152ba0763acb0365f43355ae33d309f0d0e6f159065411697cd6ae90da
+EBUILD kbuild-0.1.9998.3407.ebuild 1733 BLAKE2B dc5061e34ec9a0029cf9e3ef2b5dfb5febeec4b0aa7dccf0ccfe3f23453f518cf8f8d38755b100428eee7904e7eb2ab5d335d63ed40e3483c9752cf65fa1be80 SHA512 2a9068af1f65acf8e92977f9610db700a9dfc42475a83d8a9dc1234d260eb80464cc83f7452886b3012a99cde773893660dfc80f85fa701975e54bd92f6ddbda
 EBUILD kbuild-9999.ebuild 1062 BLAKE2B 458a2dfe2a3b753783c49aeb819672e5c0d59858f5b67817b0544c56805d03cb3c75178c582981456e82909792f2fbf8e1873817cb94101076145c7388b2cbae SHA512 492ad0ab9e132b6379ce58eae3670114e1009cc32cf191869e153f4e72d52be17cf58347eaf4e39520909c463632d90d879860b6b361d0dd56568496e369f304
 MISC metadata.xml 251 BLAKE2B 2e2f0363feb3f8ad15ed8d2ef5130493f501acf64faf4fe567079d18a6066c0a1136f6c0cf53ba4ec854a38b5d4211e48e0a2ddac6677ca02266a3f993e36965 SHA512 0ccc4891c6c5de39cbe83d8391b0345611be252a2b1fedea6644ba1cfb283140a8250f32cd26b701db9c60d42782b214d03574592ef3b585bb15d2ffcb5f016e
diff --git a/dev-util/kbuild/kbuild-0.1.9998.3407.ebuild b/dev-util/kbuild/kbuild-0.1.9998.3407.ebuild
index 80d8104de03a..bad5450abfbb 100644
--- a/dev-util/kbuild/kbuild-0.1.9998.3407.ebuild
+++ b/dev-util/kbuild/kbuild-0.1.9998.3407.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~polynomial-c/${MY_P}.tar.xz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 # We cannot depend on virtual/yacc until bug #734354 has been fixed
diff --git a/dev-util/kdevelop-php/Manifest b/dev-util/kdevelop-php/Manifest
index 7176a02e2954..9bba277287fa 100644
--- a/dev-util/kdevelop-php/Manifest
+++ b/dev-util/kdevelop-php/Manifest
@@ -1,5 +1,3 @@
-DIST kdev-php-5.5.2.tar.xz 1060684 BLAKE2B 682b9f0aa479849966e125e789bd53c4747b050a8d6be287082ffaa3ea496d9b29e80070c96869ae546ab37cfb996922f9ce715c4c7de66f97b1a083f2ed1ace SHA512 5f92f2183af50ddc27c36065eb927d26b01b9f350e2ec8c3cf4136b1ab7c7933d77512669d71ae6bbf6c0fdf044987773427f37bd5bd96a9cf143038147e7709
 DIST kdev-php-5.6.0.tar.xz 1063760 BLAKE2B 72b3a6e77d6f569877687490f654daf79c14e2f7b374aadabbf54d7cad129c15051e72d816073d961582efa33d8354c51b2d3efa77a930ed2c81db4c5cd6668c SHA512 b6838e8eb44df1a0b2d94503c28636ce36dd63e91a8476b1f523b7457f1f831987eb3d079cbb7ed629c5c8143cd6a6f5832579ab7dc38f38162198c2cc068cdc
-EBUILD kdevelop-php-5.5.2.ebuild 1237 BLAKE2B a4870331cffa24769de5a8399cd2b90d76721e2c64b81a693164a04b28b51b5593deef87e5a1fcbd92fda9c8501dbcfaf38f8d5c60db36ede9d20d747c1810d9 SHA512 25fb5fa92f563a0b420eb1cf268cd79bdf56e33f482de93034f3f91fc9376ed426bc9beea36d1a82fb496ee998a5b9c1a4aac01eec7a7b4fccd5c1934d9d3c9b
-EBUILD kdevelop-php-5.6.0.ebuild 1267 BLAKE2B 6529609b0ad11478f4518c5cd8bf150c001b85461e0dc047311bce1b97629ed7bfe5085f75b2af0979ae2ee8c3a0345f2be6e37393ade3e776bc4cd63e65bb1e SHA512 1502bc787557c5fa6b2dbf388b9b8044486b6db73d98510364ea831c872b44a5edeeb3866aeac42895010f22ade4f05e2b88c399210abc4ea4605d4262df2631
+EBUILD kdevelop-php-5.6.0.ebuild 1265 BLAKE2B 351649e8c90a6a4345c365badf879e79ce7e6948d51d19098f12f26f169e20cd1a276426274dbda2753189c210078a7e3e4a11085e013e5ba68eb7bb1e723bcb SHA512 983a12755cf9a998a549ea9c58d52b9d9f03242c60fbb2beb28b40a1a9bf55c4b90ebccfdd4f3db2912b617f4ab79a6fd818e4968864d2508941eb668a7d8519
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-util/kdevelop-php/kdevelop-php-5.5.2.ebuild b/dev-util/kdevelop-php/kdevelop-php-5.5.2.ebuild
deleted file mode 100644
index c6c31a235060..000000000000
--- a/dev-util/kdevelop-php/kdevelop-php-5.5.2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 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_NAME="kdev-php"
-KFMIN=5.60.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="PHP plugin for KDevelop"
-HOMEPAGE="https://www.kdevelop.org/"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="5"
-IUSE=""
-
-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}"
-
-# remaining tests fail for some, bug 668530
-RESTRICT+=" test"
-
-src_test() {
-	# tests hang, bug 667922
-	local myctestargs=(
-		-E "(completionbenchmark|duchain_multiplefiles)"
-	)
-	ecm_src_test
-}
diff --git a/dev-util/kdevelop-php/kdevelop-php-5.6.0.ebuild b/dev-util/kdevelop-php/kdevelop-php-5.6.0.ebuild
index e795d53fbb99..6b995a558833 100644
--- a/dev-util/kdevelop-php/kdevelop-php-5.6.0.ebuild
+++ b/dev-util/kdevelop-php/kdevelop-php-5.6.0.ebuild
@@ -17,7 +17,7 @@ DESCRIPTION="PHP plugin for KDevelop"
 HOMEPAGE="https://www.kdevelop.org/"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-2 LGPL-2"
diff --git a/dev-util/kdevelop-python/Manifest b/dev-util/kdevelop-python/Manifest
index 7ca2039e007b..f327010c1dd9 100644
--- a/dev-util/kdevelop-python/Manifest
+++ b/dev-util/kdevelop-python/Manifest
@@ -1,5 +1,3 @@
-DIST kdev-python-5.5.2.tar.xz 1076188 BLAKE2B 87ab49aef61459268c947cee543bc8eb0b8729f3e4f798c1de4b06b8db6c3d5920c23c2b9ca4e4645edc323b15392d418058a314f164f803e2f65eb8fd2d9ecb SHA512 2558e4ad7485abe8473b703a3d80a1faea9e4152eb7be314ea8c3d46c841f457983206b1bc55f454496b81a468a2f8718086e1b0db3e9e880c50011407e7866e
 DIST kdev-python-5.6.0.tar.xz 1069480 BLAKE2B 0ceb8c1a4bd279b621844eb94eeecef4272b13e77764afeb6403d8a757d6873caf2cc5ad5a1a1eef901365c90dc11298bab21274b684c6b49c8e55388c9504bb SHA512 c6a866a563f3304aab860f66d752a617f8a0822c2e3b0f4131b8e8603f2ed86b5141ad308f967ffc5e9458693f389281a8918feea9fc584d7b4213fa265479be
-EBUILD kdevelop-python-5.5.2.ebuild 1248 BLAKE2B 87a2468e90fe316b7ae048b260dd546af28c8020a5ec0d151f2880d82e5928ef0d70e1a9f27e6eefb61320c526fefef3afbd5a4d99fc8441f0f98decad76819b SHA512 27e09b1304f54c736c676416f512e13deaf36d55cea2aa972997ad4e6e06cf633478bf7401c48ff796a15aff5179a7faee4f019d491074f33f05488e88b89791
-EBUILD kdevelop-python-5.6.0.ebuild 1278 BLAKE2B 1ce4f12c5d65b32bfd530d022e923836d884196c7af648057e0aa92df5cd46280d4da4f42b698f4582e815a8e2e28016597bba91518142053ac8a1ddfbdf6c41 SHA512 9800b1f2dba10a5fb941c431b9aa484b7c55dc24f602461bcbcb14f8d456ab0e44d7757d0b953d271f47ba339088af342a542df01df4a45830bdd845110f399d
+EBUILD kdevelop-python-5.6.0.ebuild 1276 BLAKE2B 6a870a67a788a65eb90a4b5aad84b2a88141b525effa74b6ca8f2334966316cb03ccd1d984e2e4dc20cd30c523aef0013e5b1d7bb1f94d09fbda731d4078f1b5 SHA512 26b9e8c4681030a3586829d5b2411208f67d8a88840a06de3225b563b6bf105e9e000d9394f190e658918eac947dc68a94625fbc59fb62d12f9af2ed3632a127
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-util/kdevelop-python/kdevelop-python-5.5.2.ebuild b/dev-util/kdevelop-python/kdevelop-python-5.5.2.ebuild
deleted file mode 100644
index 4d844c56f1fd..000000000000
--- a/dev-util/kdevelop-python/kdevelop-python-5.5.2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-KDE_ORG_NAME="kdev-python"
-PYTHON_COMPAT=( python3_{6,7,8} )
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org python-single-r1
-
-DESCRIPTION="Python plugin for KDevelop"
-HOMEPAGE="https://www.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}"
-
-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}]
-	')
-"
-
-RESTRICT+=" test"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	ecm_pkg_setup
-}
diff --git a/dev-util/kdevelop-python/kdevelop-python-5.6.0.ebuild b/dev-util/kdevelop-python/kdevelop-python-5.6.0.ebuild
index c28ff73f8873..ca25c8a9974a 100644
--- a/dev-util/kdevelop-python/kdevelop-python-5.6.0.ebuild
+++ b/dev-util/kdevelop-python/kdevelop-python-5.6.0.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Python plugin for KDevelop"
 HOMEPAGE="https://www.kdevelop.org/"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-2" # TODO: CHECK
diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
index 6857e2fb60d9..9d812a333b9d 100644
--- a/dev-util/kdevelop/Manifest
+++ b/dev-util/kdevelop/Manifest
@@ -1,5 +1,3 @@
-DIST kdevelop-5.5.2.tar.xz 7049088 BLAKE2B 93df5c982b8e141a5027b5eeddce55a4c4b915fa5f6b36b71c0125820ffb6692db1dfe3243b4b0333be01658f0d44a0767d9e63ad549a6bc54b0e19c42c215fc SHA512 d4e0b3369ed4762beea18e43275c75b801fa4efd8265734a6b676e579f17408dc5ace4aae1b8f7eccbc70e88f6d80ecaecfc4d2c633f77f80ad0b9d066995ca2
 DIST kdevelop-5.6.0.tar.xz 7116544 BLAKE2B c548c695dab41c93aef31549bd479f1ca832a3fac9cde044523bf590d536473f36a87521ac678d37008ff451c091b843f65ccce154d9b1ca59efac2b48a81515 SHA512 c96a79d92972d606778d76f74f9dfddb9a0da9f41b462ada1a52842aa14306ad3cb183cda8103a9a3cf56d0dd5c1f18d5fad6b65cd8ae42f2fc407aaa6dc88f7
-EBUILD kdevelop-5.5.2.ebuild 4359 BLAKE2B 966aa4775d2bc00c8bdd88b90fce198ebc72b2b5d13f043739d71f7b602dca401686b14f251528fe03c76f6e80fd190242c3629bd30324cfd71f1bef9ee394dc SHA512 e105de2cd8514c35ccf551a6dccbeb10cd72b4e46892b9f8fc6ff534cd850914d3fde9a5b428e02b0185d160e4e5000c6258bb6a63bf9c42e3fb89de60812cf9
-EBUILD kdevelop-5.6.0.ebuild 4333 BLAKE2B c652afd42d3c24b1c2eb93c69b8407104e10a1bc362cd5b909d33b79eb5506c93c0d044133924b446222b960fe16a73f193ba814890b07a43feede53ca467fac SHA512 fa09c51affe9acfd57bd59b56a18e5c26da2fd2f2355132fcc8db751eb49e5d7a73c2d9baf8b8296edf66380899f1cc5cfb6c0bb0b57d056670e6f334081a541
-MISC metadata.xml 698 BLAKE2B edf6f5784cae9be6ea0013e2f4b85234c748ff5b716511cea8b401e7267178a821d27bbd5b66d38833e018c6a90855ed28390be385818e67f25105674b73aacd SHA512 62228270953a089d69530e11f5dd9a55c86f9758d6d86f9a3eb46a1a6e3efaca38c066bacff5b5f49a409d6c65be96e84f1be63cf6aa3fc7bc04706b674501f0
+EBUILD kdevelop-5.6.0-r1.ebuild 4068 BLAKE2B 321d5d5dc48e2213b26a6d68d2910fe33004435a2f948d9c59e2d5b388d5680476a73d62bda5010007cfd77ab939b8604e4417768ad15b83f9c0aab3c51742a7 SHA512 f56ee8296e0b90aa33f3fd523e7b72147e8cdba68e13811ced1949a857617f13495976275c135c82c1aebf6ce106e725f2949d5398ba6f682f9be3011d13e2b5
+MISC metadata.xml 554 BLAKE2B 4e34566d1ec19cb7589766d89dafabfb0b50698afdcffd9c217108cb0f5940d27c367f44cf1f6be491814f3874c67e96ebf9cbf517670091e6fa36f3a8471bd9 SHA512 33f889291d1c2b4ddf7ad8fdd33d74758090e401b093d3f7691bfe6569ab068720811747380275db58b2160fd1b301126576721d0c2c61f04e917560af2c33ac
diff --git a/dev-util/kdevelop/kdevelop-5.5.2.ebuild b/dev-util/kdevelop/kdevelop-5.5.2.ebuild
deleted file mode 100644
index 18f5ab2c9edd..000000000000
--- a/dev-util/kdevelop/kdevelop-5.5.2.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="true"
-KFMIN=5.60.0
-QTMIN=5.12.3
-VIRTUALDBUS_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and much more"
-HOMEPAGE="https://www.kdevelop.org/"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	KEYWORDS="amd64 ~arm64 x86"
-fi
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="5/55" # look at KDEVELOP_SOVERSION inside CMakeLists.txt
-IUSE="+gdbui hex +plasma +qmake reviewboard subversion webkit"
-
-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/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
-	)
-	webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 )
-	!webkit? ( >=dev-qt/qtwebengine-${QTMIN}:5[widgets] )
-"
-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 )
-	!dev-util/kdevelop-clang-tidy
-"
-
-RESTRICT+=" test"
-# see bug 366471
-
-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 KF5SysGuard)
-		-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)
-		$(cmake_use_find_package !webkit Qt5WebEngineWidgets)
-	)
-
-	use reviewboard || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KDEExperimentalPurpose=ON )
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-
-	if ! has_version "kde-apps/konsole" ; then
-		elog "For konsole view, please install kde-apps/konsole"
-	fi
-
-	if ! has_version "dev-util/cppcheck" ; then
-		elog "For static C/C++ code analysis support, please install dev-util/cppcheck"
-	fi
-
-	if ! has_version "dev-util/heaptrack[qt5]" ; then
-		elog "For heap memory profiling support, please install dev-util/heaptrack"
-	fi
-
-	if ! has_version "dev-util/clazy" ; then
-		elog "For static C++ Qt code analysis support, please install dev-util/clazy"
-	fi
-
-	if ! has_version ">=dev-util/meson-0.51" ; then
-		elog "For the Meson Project manager plugin, please install dev-util/meson"
-	fi
-}
diff --git a/dev-util/kdevelop/kdevelop-5.6.0.ebuild b/dev-util/kdevelop/kdevelop-5.6.0-r1.ebuild
index 5a3edac39a3b..78c011af5798 100644
--- a/dev-util/kdevelop/kdevelop-5.6.0.ebuild
+++ b/dev-util/kdevelop/kdevelop-5.6.0-r1.ebuild
@@ -6,21 +6,21 @@ EAPI=7
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="true"
 KDE_ORG_CATEGORY="kdevelop"
-KFMIN=5.70.0
-QTMIN=5.12.3
+KFMIN=5.74.0
+QTMIN=5.15.1
 VIRTUALDBUS_TEST="true"
 VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
+inherit ecm kde.org optfeature
 
 DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and much more"
-HOMEPAGE="https://www.kdevelop.org/"
+HOMEPAGE="https://kdevelop.org/"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 fi
 
 LICENSE="GPL-2 LGPL-2"
-SLOT="5/55" # look at KDEVELOP_SOVERSION inside CMakeLists.txt
+SLOT="5/56" # look at KDEVELOP_SOVERSION inside CMakeLists.txt
 IUSE="+gdbui hex +plasma +qmake reviewboard subversion"
 
 COMMON_DEPEND="
@@ -121,25 +121,13 @@ src_configure() {
 }
 
 pkg_postinst() {
-	ecm_pkg_postinst
-
-	if ! has_version "kde-apps/konsole" ; then
-		elog "For konsole view, please install kde-apps/konsole"
-	fi
-
-	if ! has_version "dev-util/cppcheck" ; then
-		elog "For static C/C++ code analysis support, please install dev-util/cppcheck"
-	fi
-
-	if ! has_version "dev-util/heaptrack[qt5]" ; then
-		elog "For heap memory profiling support, please install dev-util/heaptrack"
-	fi
-
-	if ! has_version "dev-util/clazy" ; then
-		elog "For static C++ Qt code analysis support, please install dev-util/clazy"
-	fi
-
-	if ! has_version ">=dev-util/meson-0.51" ; then
-		elog "For the Meson Project manager plugin, please install dev-util/meson"
+	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
 	fi
+	ecm_pkg_postinst
 }
diff --git a/dev-util/kdevelop/metadata.xml b/dev-util/kdevelop/metadata.xml
index b3d54d197519..f1d816c7dad8 100644
--- a/dev-util/kdevelop/metadata.xml
+++ b/dev-util/kdevelop/metadata.xml
@@ -10,6 +10,5 @@
 		<flag name="hex">Enable hex editor plugin via <pkg>app-editors/okteta</pkg></flag>
 		<flag name="qmake">Enable support for QMake build system</flag>
 		<flag name="reviewboard">Enable reviewboard support</flag>
-		<flag name="webkit">Enable deprecated <pkg>dev-qt/qtwebkit</pkg> instead of <pkg>dev-qt/qtwebengine</pkg> for integrated documentation</flag>
 	</use>
 </pkgmetadata>
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index ab1b0f123a2d..ffd2c374f1de 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -1,13 +1,11 @@
 DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
-DIST llvmorg-11.0.0-rc3.tar.gz 122766783 BLAKE2B 052fdc864fed52692141284ebdc41d52d21fbeaf24ac5ed3e67701537baa683bae61b1c06de68322e0578a27a1f5a8856088cdc001d2b8d34d2ec88ae65ff739 SHA512 a28ce74775373c63fe23b3116cd25db0efb95c6fdb60e56f2522659a404a59576f3d9429a109cb0f90534927259289aa1c712673f36f92272d642bf8dce5699f
-DIST llvmorg-11.0.0-rc4.tar.gz 122768150 BLAKE2B e92417b6e1775a10c196534518036de6393e3cb9e0e656d4f864e7870be8fb0dad3f4cf170345e653ba60f36172df117977d5dfebe3d9ee7ec2c160d3dc9c5cd SHA512 ed2aee9f6d0bb887f27840158e9f95d94c9ad3981a0388a33fcd3e405f5072134a02999075238b6a2b8803149aa08ac790214605b186c2cc2d4827ba53c00de1
+DIST llvmorg-11.0.0.tar.gz 122743665 BLAKE2B 3f95570240789fd68ddb747df817f5c6cdc9da40911bbe9ee3531c15ada9165e5002b1c2f778cf8735858485ea05a8754e3d3a5f4b15bdd6cb33d64a14692984 SHA512 b6d38871ccce0e086e27d35e42887618d68e57d8274735c59e3eabc42dee352412489296293f8d5169fe0044936345915ee7da61ebdc64ec10f7737f6ecd90f2
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD lldb-10.0.0.ebuild 2477 BLAKE2B 21be1f15644d0c00a5c9fb21d0874b2784116b16a36190947b1df9d4a962a9cefae2e386c741b91b3e60709e1cb8fa8d8327f38c310198641a0c91aaecda9d0b SHA512 61bff2bfcdb91f14c8a4f70b59136df0b39fbdc86aa43e090f116e11e8e03ff0af15d3ca0b0ae7dfd516207e3457b670f08c1cf4198ecd979c5e1c2b4f7fb117
-EBUILD lldb-10.0.1.ebuild 2336 BLAKE2B aadc50c6e94522732e3760d608f4904dff90036a6c0eec0e30ae32b40bcdef8e54d00f21aae73b2aa5097a59fcf16cac5c57d4b82dc727d771ba0965749a5788 SHA512 8e0503d60572f67878527a3879c53935cad6ae1d5533ce45f3c33253e3d9535b203ce2720f7ab8b3535708da4c1723e1379c9a9833648714756ff02067aee822
-EBUILD lldb-11.0.0.9999.ebuild 2316 BLAKE2B 556a0c1160097a9fd6853dbe9fc992cb8f76d3fe0a0e05728d70732b9e4815617d9f821b9e4f1332d14015ff6a8d2d4b34f70c9866cd7f31c6e6dd17cda96485 SHA512 44b9aa5f5895ef8002f7caec77dd3947e9833f5fbd56c567d83464b7a611f5aa9c002649115d037c7502cb915d8199c4603f38221fce8a1acc96fb52fca4a3a9
-EBUILD lldb-11.0.0_rc3.ebuild 2316 BLAKE2B 556a0c1160097a9fd6853dbe9fc992cb8f76d3fe0a0e05728d70732b9e4815617d9f821b9e4f1332d14015ff6a8d2d4b34f70c9866cd7f31c6e6dd17cda96485 SHA512 44b9aa5f5895ef8002f7caec77dd3947e9833f5fbd56c567d83464b7a611f5aa9c002649115d037c7502cb915d8199c4603f38221fce8a1acc96fb52fca4a3a9
-EBUILD lldb-11.0.0_rc4.ebuild 2305 BLAKE2B 6696e6bda2b6f5a3165abbe23902804c98cf3f7b59b483c1b07d91a501581ab9c8343320a5b4c08bdcfad29d2b3f41ba6e2da317ea52a9bc9e8a2d1f7b944591 SHA512 e5b1d9a3b63961e53dbb12aebb4349a1e177ca1cdb357ebe55604b33a269f7195f42ae91173e9664d3e9511506d85ba688821fbb0409733bc1889cd16526e6b4
-EBUILD lldb-12.0.0.9999.ebuild 2305 BLAKE2B 6696e6bda2b6f5a3165abbe23902804c98cf3f7b59b483c1b07d91a501581ab9c8343320a5b4c08bdcfad29d2b3f41ba6e2da317ea52a9bc9e8a2d1f7b944591 SHA512 e5b1d9a3b63961e53dbb12aebb4349a1e177ca1cdb357ebe55604b33a269f7195f42ae91173e9664d3e9511506d85ba688821fbb0409733bc1889cd16526e6b4
+EBUILD lldb-10.0.1.ebuild 2335 BLAKE2B 1e8212cd840aa2898451bca1c2670f443707738b4c8ca9c673f9e940fa918d0f742b04273f9d2899791aebb2db499bf210605f9ed90479029d4c25add49a310c SHA512 86f5ded28593601e21abf270a0dd0ff703c1ef863534cae87ec72f67ddf8de4fc3394b7088be9d38dfb39a79c1593a57b3df4f5a167e96e6aa1a34c2b1c8f656
+EBUILD lldb-11.0.0.9999.ebuild 2375 BLAKE2B 1be4c3300661c9b6adcc94c7b47954506de3ceda677f0c7df84a4a98f46a61338bdbe9d21688cff76abc3d07f23ef83f1e62c943e999b3b955f70be81ae1d862 SHA512 47d27d3edc618f93850199aaf89cbd081f2346ba6b9a370571901994f66519f780babe6e63f189b8b6a3153c311866527777256100599379d81a277456c64d45
+EBUILD lldb-11.0.0.ebuild 2383 BLAKE2B 86df01e0663b79c93b5816c6cbf4ec9a995cded9350d100bbdbad9b9ab7529fedf0244274718a919a003209ad0c48580192a06aeb19f3ca4c06bea0c9d35f9b7 SHA512 ddc49fda9558b794f08ed9c3b0f91ea3fffc67ab171354a7f229790a7b2f05d0b144da8bbc686571a5f9dc1f0fbf5fc502bf99ec3f8897d4537b0ba9ad69a7e4
+EBUILD lldb-12.0.0.9999.ebuild 2364 BLAKE2B 8675e540428b1f3618cb35e1ae3a624c9c1f1d0c65177921c0cd2c77013732b8f7b933241e3984ca764ae87799126eb420b89dc34ba028745cef42a645a53afb SHA512 a3742b37d65b30e9fea09dc3a80e2e944fbd642364842c9f9bc8f665549bad8ac30afb3c678d1346b836f9f90b794c213d4fde59907df95a79b32f23419d4b51
 EBUILD lldb-9.0.1-r1.ebuild 2391 BLAKE2B c0e73cf6e7c6fc153855681daa373618baffa2d45bd290855633d957464e99d86112918eec8aa0b43a975750e8ccd87fbffe2594b0110ac406eab8579c654f72 SHA512 8edadff2f01c15b75d894e30546a00826f140a81bc0ebfb5fb214eb5d133d8390b18a3075746fe94f061b36fcea9fb981ecd6de3d0567f73736c388af62c6320
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-util/lldb/lldb-10.0.1.ebuild b/dev-util/lldb/lldb-10.0.1.ebuild
index 8f08cb60395e..3a5ffa439468 100644
--- a/dev-util/lldb/lldb-10.0.1.ebuild
+++ b/dev-util/lldb/lldb-10.0.1.ebuild
@@ -14,7 +14,7 @@ llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
+KEYWORDS="amd64 arm arm64 x86"
 IUSE="libedit lzma ncurses +python test"
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
 RESTRICT="!test? ( test )"
diff --git a/dev-util/lldb/lldb-11.0.0.9999.ebuild b/dev-util/lldb/lldb-11.0.0.9999.ebuild
index a5b3aee8c3df..f16add65dbfc 100644
--- a/dev-util/lldb/lldb-11.0.0.9999.ebuild
+++ b/dev-util/lldb/lldb-11.0.0.9999.ebuild
@@ -34,6 +34,7 @@ RDEPEND="
 	!<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 "
@@ -68,6 +69,8 @@ src_configure() {
 		# ncurses with complete library set (including autodetection
 		# of -ltinfo)
 		-DCURSES_NEED_NCURSES=ON
+
+		-DPython3_EXECUTABLE="${PYTHON}"
 	)
 	use test && mycmakeargs+=(
 		-DLLVM_BUILD_TESTS=$(usex test)
diff --git a/dev-util/lldb/lldb-11.0.0_rc4.ebuild b/dev-util/lldb/lldb-11.0.0.ebuild
index 4b16c5b83278..e142e13561da 100644
--- a/dev-util/lldb/lldb-11.0.0_rc4.ebuild
+++ b/dev-util/lldb/lldb-11.0.0.ebuild
@@ -14,7 +14,7 @@ llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="amd64 arm arm64 x86"
 IUSE="libedit lzma ncurses +python test"
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
 RESTRICT="test"
@@ -34,6 +34,7 @@ RDEPEND="
 	!<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 "
@@ -68,6 +69,8 @@ src_configure() {
 		# ncurses with complete library set (including autodetection
 		# of -ltinfo)
 		-DCURSES_NEED_NCURSES=ON
+
+		-DPython3_EXECUTABLE="${PYTHON}"
 	)
 	use test && mycmakeargs+=(
 		-DLLVM_BUILD_TESTS=$(usex test)
diff --git a/dev-util/lldb/lldb-11.0.0_rc3.ebuild b/dev-util/lldb/lldb-11.0.0_rc3.ebuild
deleted file mode 100644
index a5b3aee8c3df..000000000000
--- a/dev-util/lldb/lldb-11.0.0_rc3.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-inherit cmake llvm llvm.org python-single-r1 toolchain-funcs
-
-DESCRIPTION="The LLVM debugger"
-HOMEPAGE="https://llvm.org/"
-LLVM_COMPONENTS=( lldb )
-LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest )
-llvm.org_set_globals
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS=""
-IUSE="libedit lzma ncurses +python test"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	libedit? ( dev-libs/libedit:0= )
-	lzma? ( app-arch/xz-utils:= )
-	ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
-	python? (
-		$(python_gen_cond_dep '
-			dev-python/six[${PYTHON_MULTI_USEDEP}]
-		')
-		${PYTHON_DEPS}
-	)
-	~sys-devel/clang-${PV}[xml]
-	~sys-devel/llvm-${PV}
-	!<sys-devel/llvm-4.0"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	python? ( >=dev-lang/swig-3.0.11 )
-	test? (
-		$(python_gen_cond_dep "
-			~dev-python/lit-${PV}[\${PYTHON_MULTI_USEDEP}]
-		")
-		sys-devel/lld )
-	${PYTHON_DEPS}"
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLLDB_ENABLE_CURSES=$(usex ncurses)
-		-DLLDB_ENABLE_LIBEDIT=$(usex libedit)
-		-DLLDB_ENABLE_PYTHON=$(usex python)
-		-DLLDB_ENABLE_LZMA=$(usex lzma)
-		-DLLDB_USE_SYSTEM_SIX=1
-		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
-
-		-DLLDB_INCLUDE_TESTS=$(usex test)
-
-		-DCLANG_LINK_CLANG_DYLIB=ON
-		# TODO: fix upstream to detect this properly
-		-DHAVE_LIBDL=ON
-		-DHAVE_LIBPTHREAD=ON
-
-		# normally we'd have to set LLVM_ENABLE_TERMINFO, HAVE_TERMINFO
-		# and TERMINFO_LIBS... so just force FindCurses.cmake to use
-		# ncurses with complete library set (including autodetection
-		# of -ltinfo)
-		-DCURSES_NEED_NCURSES=ON
-	)
-	use test && mycmakeargs+=(
-		-DLLVM_BUILD_TESTS=$(usex test)
-		# compilers for lit tests
-		-DLLDB_TEST_COMPILER="$(type -P clang)"
-
-		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
-		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-		-DLLVM_LIT_ARGS="$(get_lit_flags)"
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check-lldb-lit
-	# failures + hangs
-	#use python && cmake_build check-lldb
-}
-
-src_install() {
-	cmake_src_install
-	find "${D}" -name '*.a' -delete || die
-
-	use python && python_optimize
-}
diff --git a/dev-util/lldb/lldb-12.0.0.9999.ebuild b/dev-util/lldb/lldb-12.0.0.9999.ebuild
index 4b16c5b83278..9e83aa0a2497 100644
--- a/dev-util/lldb/lldb-12.0.0.9999.ebuild
+++ b/dev-util/lldb/lldb-12.0.0.9999.ebuild
@@ -34,6 +34,7 @@ RDEPEND="
 	!<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 "
@@ -68,6 +69,8 @@ src_configure() {
 		# ncurses with complete library set (including autodetection
 		# of -ltinfo)
 		-DCURSES_NEED_NCURSES=ON
+
+		-DPython3_EXECUTABLE="${PYTHON}"
 	)
 	use test && mycmakeargs+=(
 		-DLLVM_BUILD_TESTS=$(usex test)
diff --git a/dev-util/lxqt-build-tools/Manifest b/dev-util/lxqt-build-tools/Manifest
index 951af615275a..86254de90c6f 100644
--- a/dev-util/lxqt-build-tools/Manifest
+++ b/dev-util/lxqt-build-tools/Manifest
@@ -1,3 +1,5 @@
 DIST lxqt-build-tools-0.7.0.tar.xz 24436 BLAKE2B b3bc9a62c530e682cff5412400d0fb14958d6aabddaef8c76b0073b01d356a9e7b227436428a3810f6b442dd77e57f4efb080a4902261679ad2c7898cf3098cb SHA512 7b6fd30e6ae8355ae36be55f8f7d47d78f507c11ebd9cbdd1d2ce5f14db68b845ad0bb8ca05fa1122bfd4c41f6dc792dff5100dcb8e61167517c3704527c7cde
+DIST lxqt-build-tools-0.8.0.tar.xz 25340 BLAKE2B c83524a5688cf38521406e50ad08e93b20d246c0fe779929905cd5aaff67ece6b7dae483d1d4f21657b913ab2ffc7ec821a3025ac6fe3585028146d1746f7565 SHA512 7c235df623ae8c88fa551f38bf24d0621958ce3586296a798b50bbce87084cb624298f4e5aaaa40d3244afae17b7fa373d2b8b6084377f9d7a355fc4bfcbb531
 EBUILD lxqt-build-tools-0.7.0.ebuild 521 BLAKE2B eb7b9f78ca0768842c4bf5cab81eb36e03a83f12212d87544afdbe2c3281478449c1abf0f464ad1243fb9362302ff6f8650c0720d9ee8448b40b996e30fa39a7 SHA512 f09c1e84e0f31a3732596bc641ebd165f2dcb0785be533c31c8db54b49ef8a9ab564b3c0f14e0c34c3a33308997cab10c814fcd478fef521f4a2157acc51f753
+EBUILD lxqt-build-tools-0.8.0.ebuild 523 BLAKE2B 4ed1b96274339d24add91d6de7e2b6a07a57de60281abb6ef79a06e6f416dbc0aa17522d0ab300633114c6c9c968ee11fbd14179ad4e6469b7b0d1b44c3f30a8 SHA512 40e6ac6134676eec50e89eab19fe24eea7e085caadcc866d8091254530045ac2f9cc6079f7cf2e6126892ea8cc5189fafd1d54291364bd244fe696fe227a1fce
 MISC metadata.xml 322 BLAKE2B 8b119aeafbe57841b2e072a7a009dd20383a752d6cce052c5b2e6c98c2341baad6e74fbb8798ffbf5c17719a37ff4d25efda922fcc32bf851b82e520af69777b SHA512 ffd6f030759c5c9e6f2aa42550a0de265550a03872c7b11c12ac4429a7dd1c3cbdb7cb470238273a313e9fcddbc5072b7dc4909811c4ab7609c0acc2e385a948
diff --git a/dev-util/lxqt-build-tools/lxqt-build-tools-0.8.0.ebuild b/dev-util/lxqt-build-tools/lxqt-build-tools-0.8.0.ebuild
new file mode 100644
index 000000000000..ce1e2b0aad19
--- /dev/null
+++ b/dev-util/lxqt-build-tools/lxqt-build-tools-0.8.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="LXQt Build Tools"
+HOMEPAGE="https://lxqt.github.io/"
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
+else
+	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+
+DEPEND="
+	>=dev-libs/glib-2.50.0
+	dev-qt/qtcore:5
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-util/massif-visualizer/Manifest b/dev-util/massif-visualizer/Manifest
index 3fdc4980cd50..6bfb7a7774f9 100644
--- a/dev-util/massif-visualizer/Manifest
+++ b/dev-util/massif-visualizer/Manifest
@@ -1,4 +1,4 @@
 AUX massif-visualizer-0.7.0-fix-window-icon.patch 815 BLAKE2B 253bd14bef04a2f1abe531d0dffaec837502a4ae56db341a875888160553a3246cd71fcb01977844482eccbf123dbb4fc4ddcb4b50c06230ce7544dfebb4cb57 SHA512 ecb5d0aceefd82bc05da91fe2e76f999078e41f10821534e512a52f13f43ac247ddf88e7f5d0952e5d8aa07c2714f7ea8f2e31b8361a2a0eb1de5a25692dd984
 DIST massif-visualizer-0.7.0.tar.xz 257380 BLAKE2B fa6cce5377c2c8eb8d170970304384ec7d745ebf7e324ebe42fb4f57f230e1f39bc9078bf89ea5de7d84e0e669a61e4e6f027ebd7ebec31ab0479336f1cd72f7 SHA512 058412e34c0899a34fb4080a602cb0c70a9ac707f27b72a79fb412ea35a6e8c66ce06df15b3153fdc1a70a27232f98b508c7441b657eb73466962b33f9b2f561
-EBUILD massif-visualizer-0.7.0-r1.ebuild 1250 BLAKE2B 00bc35aa4dca405a16de8ea3af8a31fefabe51f20b308af7b8d43941be129e991186de6696adcf7483e5c8560ed7e8adf1ad4885bd592da9b60e31065dd65399 SHA512 eef1b7978ce6f3aabe2f55bbe6d06b5a9d008d7df63a1bbc66943f83f2b597f119b877493ded2d6bb46870bbccdc3e073c2f9afe05da1df544e59f81afe0c967
+EBUILD massif-visualizer-0.7.0-r1.ebuild 1225 BLAKE2B fb8e39bce9d2cc4f969609cbbd22fee946fd22ea53a75b4a1683e1533be1bb84ac6101b3a5960e5e3159a1cd1a29e6463d6cd9aea8bb3b806d985f4414e609e1 SHA512 dedc996eb3121ac102c7c318e260fb42dc2b7c7f1dc4d9a0c37f3b26de06b96fc7d9222647d803d86bbf7c908c8a8255db0e1837c20f053191f545ee52f81b13
 MISC metadata.xml 370 BLAKE2B 8b260169231c67d50430301c4d6b3f87a07b59cc3d6a961a05d7f2e6987128ca7f5582d3b09812fdd6a0079b32f539ba0107b4338905766cba81ca79fd31c155 SHA512 a47938e506c035d69c8e69a4edb2e2587f76e9bd348aa0d9e88455cdf8c0d988b276e9f81c67c2039bef153051dcebd7b62b6b3d6bff1ebbbc572f87bbcd6382
diff --git a/dev-util/massif-visualizer/massif-visualizer-0.7.0-r1.ebuild b/dev-util/massif-visualizer/massif-visualizer-0.7.0-r1.ebuild
index 8ea3099d0c62..4db22eeda5f1 100644
--- a/dev-util/massif-visualizer/massif-visualizer-0.7.0-r1.ebuild
+++ b/dev-util/massif-visualizer/massif-visualizer-0.7.0-r1.ebuild
@@ -9,7 +9,7 @@ QTMIN=5.12.3
 inherit ecm kde.org
 
 DESCRIPTION="Tool visualising massif data"
-HOMEPAGE="https://kde.org/applications/development/org.kde.massif-visualizer"
+HOMEPAGE="https://apps.kde.org/en/massif-visualizer"
 SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
 
 LICENSE="|| ( GPL-2 GPL-3 )"
diff --git a/dev-util/mdds/Manifest b/dev-util/mdds/Manifest
index 2eef11ccbca0..60689188f16b 100644
--- a/dev-util/mdds/Manifest
+++ b/dev-util/mdds/Manifest
@@ -1,6 +1,9 @@
 AUX mdds-1.5.0-buildsystem.patch 1006 BLAKE2B a6205a749a5a619443a060912bd863c93f74eb88cc68e62b077bdbab0a3e67e2f9ab35774ec5fcd23599b5b10478f529ebd2f89806fe926786d63967f83a9075 SHA512 eb03daf08605c9e54326621af3be39214659627fc4922c9cd3f031073f78a0823c2f1bb7267eb671c189b0326f9ff5d1fe3f60cda14fe9a7ac58d293972d67b9
 AUX mdds-1.6.0-bashism.patch 2041 BLAKE2B 3b67fed97b47e4ce284125df1caad1486d6b2d981877eb9b9fcd0ace4f682f176408b6f7d69306557c2713e76a4b879ebf74e4c767caa8fa68cb17a134a5954f SHA512 de2d1851b20267bc7391bdc2fc41d21147f069fddcfe378ac10838ebdee87d01f424dc355cdbc19b6064fdd41de376c4fdf492da11a16e0678878b4335a5cbd2
+AUX mdds-1.7.0-bashism.patch 2061 BLAKE2B 766eb3b27b55f058175894d01c91d4b9fa544c8ba15fab79eafb0e333ddf86ed328fa928d21add6bb2da9a31420f35de3a97e960723ce2766b898313434c56d5 SHA512 4994df435477e600aba80c8c7e80cf2b8a76f4d20b19090b61ce94aadfa3d9ff0b75d26fc88094a6b1aa5742fd5ddc70a535dcb6456c890416ac9393aeab0738
 DIST mdds-1.6.0.tar.bz2 350406 BLAKE2B 70a99d779f318140f37bb3f873f1845c153f389a9e671a4d9ee4d1f0e762db312d536392061923c3c02494df6945a5a7743480eca1020d9cda6f3495888d7b00 SHA512 7c66894748e998f24374a5c6ea342ae2736e4bdba53be89510a1674690517ed7303786e1290fcfa26b07f236788c192ad29790129c228074397ab43699cdb290
+DIST mdds-1.7.0.tar.xz 313220 BLAKE2B 02ab09ad1338223da2911c05fc8d67c9d0d5414d1dcedac066dc95a2b0853f3801347c9791a5fc5700d666933be78efc52f735453769f9f2123ce06eca1fa67f SHA512 ac2bfe5186d499a79f4379c1dc7cc869bbbd9a59d4943399409dd4dd1ef7e3567a993deda5d5a06ad67dbd94b0a534439805837f2f405c5aca0aeb197178291a
 EBUILD mdds-1.6.0.ebuild 1376 BLAKE2B a09be0bf7519a5c7b09185473ac3ddd4de4c1ee17703555646034086fdb2c1101e52e6dbfd635174398da9e9fa16593826e66c64138accc0e6c263f993b8a89c SHA512 d52c9d2155fcc405f87399af47d6dcd1b9832d336dcd7e7fc70358bb7478a81f4a2c2b341d7edef39ee3bafb0ee48f0421ab1589573242df10ed28ba39317cc5
-EBUILD mdds-9999.ebuild 1335 BLAKE2B 024a30569d7cadc3f178a643534805777a306e28a5bbf2e3183aee55b220c0cb8846e88269c846552bd5d1ae660092015980a85015d7a57f1da98ac5f4ba61ff SHA512 9bdd6daf40a0c42f3b1d108176bd3fa2efbe1f81f8b78c8d0f96105ac3db86a9d01453f45a85ba3f01893bcfbfa1c29a55cae1214016c7a616eb8c4e6d3f73d5
+EBUILD mdds-1.7.0.ebuild 1372 BLAKE2B f032869d8a76a81c0c69306c50744808fc496f152e3ffc6c009c2dfd2f3b248cfce16a31b94f69a8e1d5fa6b7d2541fcabf583da8989919f7e9d74d2a21871b5 SHA512 7d5cd45025533c21387c50d034d61acd72c838859fd94b669340c4d7e082dcfd9543a60a96d4c9c3c873c55a38fe93967a9fb2d490e43fb65be3256e66c2b230
+EBUILD mdds-9999.ebuild 1331 BLAKE2B c100cdb0e2f8cfbcdd67ad7789c34d7528d8d3a01f8c328e20b10021286ad36b5d5dab9e21cf3c185c65d2a1d284c4a04fec29fe5c91da3172d74130d3390a8c SHA512 694a84b819dcab0fa40ebfb2d6b90949c23feaeb7350e771057d48ace29356d66551d40470d6f45442c87a4c145bcfc916caa4bbb23a2c39e2333171ca722504
 MISC metadata.xml 456 BLAKE2B 18fd8f49cbbb2b86b19ef2aaa0dcc1ae57c16597e4357c7f18eeb529972931234fa165e3d1a8a65f1f5b004fed57bfb09896a6b5505fd71d2ffe7cd2a2a42f3b SHA512 51aa3106f9bb7b962e7225e88fb56335b0bef35dc1749866a4e44290ca0cac510be348aa6b5542f536a8b3bdc83dbf39c4af6b79dc603047a7a6ba6980842d71
diff --git a/dev-util/mdds/files/mdds-1.7.0-bashism.patch b/dev-util/mdds/files/mdds-1.7.0-bashism.patch
new file mode 100644
index 000000000000..3e94f32e8f8b
--- /dev/null
+++ b/dev-util/mdds/files/mdds-1.7.0-bashism.patch
@@ -0,0 +1,75 @@
+From 65da7c25f4d8204b1379a0afb46d82dc1b263ab0 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Thu, 28 May 2020 18:36:07 +0200
+Subject: [PATCH] Fix bashisms in configure.ac
+
+---
+ configure.ac | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 00ab937..2282165 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -32,7 +32,7 @@ AC_ARG_ENABLE(debug-stdcxx,
+ ]
+ ,debug_stdcxx=yes)
+ 
+-AS_IF([test x"$debug_stdcxx" == "xyes"], [
++AS_IF([test x"$debug_stdcxx" = "xyes"], [
+   CXXFLAGS="$CXXFLAGS -D_GLIBCXX_DEBUG"
+ ])
+ 
+@@ -42,7 +42,7 @@ AC_ARG_ENABLE(release-tests,
+ ]
+ ,release_tests=yes)
+ 
+-AS_IF([test x"$release_tests" == "xyes"], [
++AS_IF([test x"$release_tests" = "xyes"], [
+   CXXFLAGS="$CXXFLAGS -DNDEBUG -O2"
+ ])
+ 
+@@ -56,11 +56,11 @@ AC_ARG_ENABLE(loop-unrolling,
+     [enable_loop_unrolling="$enableval"],[enable_loop_unrolling=yes]
+ )
+ 
+-AS_IF([test x"$enable_loop_unrolling" == "xno"], [
++AS_IF([test x"$enable_loop_unrolling" = "xno"], [
+   CXXFLAGS="$CXXFLAGS -DMDDS_LOOP_UNROLLING=0"
+ ])
+ 
+-AS_IF([test x"$enable_gcov" == "xyes"], [
++AS_IF([test x"$enable_gcov" = "xyes"], [
+   CXXFLAGS="$CXXFLAGS --coverage -O0"
+ ])
+ 
+@@ -69,7 +69,7 @@ AC_ARG_ENABLE(openmp,
+     [enable_openmp="$enableval"],[enable_openmp=yes]
+ )
+ 
+-AS_IF([test x"$enable_openmp" == "xyes"], [
++AS_IF([test x"$enable_openmp" = "xyes"], [
+   CXXFLAGS="$CXXFLAGS -fopenmp -DMDDS_USE_OPENMP=1"
+   LDFLAGS="$LDFLAGS -fopenmp"
+ ])
+@@ -79,7 +79,7 @@ AC_ARG_ENABLE(sanitizer-coverage,
+     [enable_sanitizer_coverage="$enableval"],[enable_sanitizer_coverage=no]
+ )
+ 
+-AS_IF([test x"$enable_sanitizer_coverage" == "xyes"], [
++AS_IF([test x"$enable_sanitizer_coverage" = "xyes"], [
+   CXXFLAGS="$CXXFLAGS -fprofile-instr-generate -fcoverage-mapping -O0"
+ ])
+ 
+@@ -122,7 +122,7 @@ AC_ARG_ENABLE([werror],
+ 	[enable_werror="$enableval"],
+ 	[enable_werror=no]
+ )
+-AS_IF([test x"$enable_werror" == "xyes"], [
++AS_IF([test x"$enable_werror" = "xyes"], [
+ 	CXXFLAGS="$CXXFLAGS -Werror"
+ ])
+ 
+-- 
+2.26.2
+
diff --git a/dev-util/mdds/mdds-1.7.0.ebuild b/dev-util/mdds/mdds-1.7.0.ebuild
new file mode 100644
index 000000000000..6bd8e95ff762
--- /dev/null
+++ b/dev-util/mdds/mdds-1.7.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://gitlab.com/mdds/mdds.git"
+	inherit git-r3
+else
+	SRC_URI="https://kohei.us/files/${PN}/src/${P}.tar.xz"
+	KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+fi
+inherit autotools toolchain-funcs
+
+DESCRIPTION="Collection of multi-dimensional data structure and indexing algorithm"
+HOMEPAGE="https://gitlab.com/mdds/mdds"
+
+LICENSE="MIT"
+SLOT="1/1.5" # Check API version on version bumps!
+IUSE="doc openmp valgrind test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	doc? (
+		app-doc/doxygen
+		dev-python/sphinx
+	)
+	valgrind? ( dev-util/valgrind )
+"
+DEPEND="dev-libs/boost:="
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.5.0-buildsystem.patch"
+	"${FILESDIR}/${P}-bashism.patch" # bug 723094
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable doc docs)
+		$(use_enable valgrind memory_tests)
+	)
+	if use openmp && tc-has-openmp; then
+		myeconfargs+=( --enable-openmp )
+	else
+		myeconfargs+=( --disable-openmp )
+	fi
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	tc-export CXX
+	default
+}
diff --git a/dev-util/mdds/mdds-9999.ebuild b/dev-util/mdds/mdds-9999.ebuild
index 64e78d4d68f9..37a5d8728339 100644
--- a/dev-util/mdds/mdds-9999.ebuild
+++ b/dev-util/mdds/mdds-9999.ebuild
@@ -7,12 +7,12 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://gitlab.com/mdds/mdds.git"
 	inherit git-r3
 else
-	SRC_URI="https://kohei.us/files/${PN}/src/${P}.tar.bz2"
+	SRC_URI="https://kohei.us/files/${PN}/src/${P}.tar.xz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 fi
 inherit autotools toolchain-funcs
 
-DESCRIPTION="A collection of multi-dimensional data structure and indexing algorithm"
+DESCRIPTION="Collection of multi-dimensional data structure and indexing algorithm"
 HOMEPAGE="https://gitlab.com/mdds/mdds"
 
 LICENSE="MIT"
@@ -60,6 +60,5 @@ src_configure() {
 
 src_test() {
 	tc-export CXX
-
 	default
 }
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index dc7b7f320490..f04734c840d6 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -1,8 +1,4 @@
-AUX 0.54.2-multilib-clang.patch 8033 BLAKE2B 724d87eef8d560eb733b9873d28afaa6dd49c23867440d182d427a9a569bcd6852c5007675fde77724f6e05d1a4beb371fb0b474e8aeec2dbae0a7e8ca3a78b8 SHA512 1251222bc107abc1b5b0acfa6c52b4bfcdd47baf2651b291f162b39d384b61383627a7ab4d925ad2df1f36307e79e4806c6e05eb889e98a58688657e40ada29a
-AUX 0.54.2-prefix-dont-strip-rpath.patch 1118 BLAKE2B c28bbb0293c2d15a493bd09c902cd6bb3f48c6d279063f326796919f9d06d0dc99e5a7e975742ad8fe4da3dc5bc9b07329d0ae7cb3186431c12aa93709aaa665 SHA512 bb41c4d06c04af4249c9c5ba5724c982a5edb1fe16118120ed53e52ed82cde0bd0ea43454799c986dd008b48a3bbdb7dac820260d9835b020323babc6ec617ed
-DIST meson-0.54.3.tar.gz 1690919 BLAKE2B 5d71731fb33397f470e2440d4d45f828d28d56351843a35b575f8b386f0b1c90faf654289e22ba7c2c4bf6c3be72d3dc8a2257d4a688bcbf9a1f2522394e7728 SHA512 2e62bf992bf337ae5a01f7a0fb842ea0cefcdbc81f5675235e41d8182f37df2e003b0a8a90d650c6cca4ff79898f7888474f75e5103a48d7ca14f51a024e4f2b
 DIST meson-0.55.3.tar.gz 1740465 BLAKE2B 7d121f5d2bf487ae3c38be5ddccde6900134b9d0ea47868aac5625449e18a1a97ae0012849b795187221632cd3ac343097ef29b282753a1e8bd871c393d5c0e8 SHA512 afb0bb25b367e681131d920995124df4b06f6d144ae1a95ebec27be13e06fefbd95840e0287cd1d84bdbb8d9c115b589a833d847c60926f55e0f15749cf66bae
-EBUILD meson-0.54.3.ebuild 2405 BLAKE2B 3aa48813a3a17a008558606a36b8bb96bc8476e5d6de900b112e3511508f894692e600670383ce3920c6690df1e785cce39ded1589c034a092b564f9bfac03e8 SHA512 41aff80d144a6b19efb255bc1c2a05039256e4423b0bfb0f6f1f098bed677fdd554cd3498e6cf2d01d35f81f2a302ce1424b7b8d0860aed21aa984ea52c9296d
-EBUILD meson-0.55.3.ebuild 2286 BLAKE2B 278d16f6f840de9f634f4c8b74b71fb67916b2f89513454c038969a277437bb2db84653345facd71bceefbc70c05a85c526a905646bd9fb88019108e8c5ffbc4 SHA512 fb6207e6e33c2630d29b13fcd044ea2c86843c0802867c0e8c7313e8c2f6c5b8e1464b8409374ff75b0011fa14dc61c325c451efa468399da9d2b6691b8fb58b
+EBUILD meson-0.55.3.ebuild 2277 BLAKE2B 7a1ce68178a9fa08fcc8138c5b4fb914236e8673c66a9a55c23f86c6ec3c1ac09e46abe9ef4d069d08566c9c87308891886267552014cd8ea387068f4664cd24 SHA512 0e8164a4ce931f22ea681dc968b5d398a6dd28965487a065819e647d41e89f556620367eba58168caf095f439db1c55bf0e55f6a8c8bcaea0690bc0a83e01d83
 EBUILD meson-9999.ebuild 2286 BLAKE2B 278d16f6f840de9f634f4c8b74b71fb67916b2f89513454c038969a277437bb2db84653345facd71bceefbc70c05a85c526a905646bd9fb88019108e8c5ffbc4 SHA512 fb6207e6e33c2630d29b13fcd044ea2c86843c0802867c0e8c7313e8c2f6c5b8e1464b8409374ff75b0011fa14dc61c325c451efa468399da9d2b6691b8fb58b
 MISC metadata.xml 423 BLAKE2B d1d1b815b9d2fabe5aaa28b469272420bc1eb0c070de7431ec0d7bc7202b00ca216e6a347e0ebda22fd079d9f0514734c0e0e345788a7e00c8f1ad594259b4a8 SHA512 5c03d82f2fd8009680d4d98c3f62c10dfddb2d66d03e8f9d9ad8e417d0359e43f77ecca067735b31b63ceb778fdcc508196e99d793990286234ff21892e4dab4
diff --git a/dev-util/meson/files/0.54.2-multilib-clang.patch b/dev-util/meson/files/0.54.2-multilib-clang.patch
deleted file mode 100644
index b3aa3693e697..000000000000
--- a/dev-util/meson/files/0.54.2-multilib-clang.patch
+++ /dev/null
@@ -1,181 +0,0 @@
-From 9dc3ca2c1c9fbb47e731551c6432df144f725261 Mon Sep 17 00:00:00 2001
-From: Yevhenii Kolesnikov <yevhenii.kolesnikov@globallogic.com>
-Date: Thu, 21 May 2020 18:58:47 +0300
-Subject: [PATCH] compilers: add fetching of define list for clang
-
-Simmilar to gcc, the list of pre-processor defines can be fetched with
-`-dM -E` option. The way cpu_family is determined on linux relies on
-this list.
-
-Fixes incorrect value of cpu_family on linux, when crosscompiling:
-
-```
-CC="clang -m32" meson ./build
-```
-
-Signed-off-by: Yevhenii Kolesnikov <yevhenii.kolesnikov@globallogic.com>
-Co-authored-by: Dylan Baker <dylan@pnwbakers.com>
----
- mesonbuild/compilers/c.py            |  5 +++--
- mesonbuild/compilers/cpp.py          |  5 +++--
- mesonbuild/compilers/fortran.py      |  2 +-
- mesonbuild/compilers/mixins/clang.py |  9 ++++++++-
- mesonbuild/compilers/objc.py         |  2 +-
- mesonbuild/compilers/objcpp.py       |  2 +-
- mesonbuild/environment.py            | 26 +++++++++++++++++++++++++-
- 7 files changed, 42 insertions(+), 9 deletions(-)
-
-diff --git a/mesonbuild/compilers/c.py b/mesonbuild/compilers/c.py
-index 1bc9e84998..aac99b4269 100644
---- a/mesonbuild/compilers/c.py
-+++ b/mesonbuild/compilers/c.py
-@@ -86,9 +86,10 @@ class ClangCCompiler(ClangCompiler, CCompiler):
-     _C18_VERSION = '>=8.0.0'
- 
-     def __init__(self, exelist, version, for_machine: MachineChoice,
--                 is_cross, info: 'MachineInfo', exe_wrapper=None, **kwargs):
-+                 is_cross, info: 'MachineInfo', exe_wrapper=None,
-+                 defines: T.Optional[T.List[str]] = None, **kwargs):
-         CCompiler.__init__(self, exelist, version, for_machine, is_cross, info, exe_wrapper, **kwargs)
--        ClangCompiler.__init__(self)
-+        ClangCompiler.__init__(self, defines)
-         default_warn_args = ['-Wall', '-Winvalid-pch']
-         self.warn_args = {'0': [],
-                           '1': default_warn_args,
-diff --git a/mesonbuild/compilers/cpp.py b/mesonbuild/compilers/cpp.py
-index f4bcfa9f89..478a68c13c 100644
---- a/mesonbuild/compilers/cpp.py
-+++ b/mesonbuild/compilers/cpp.py
-@@ -155,10 +155,11 @@ def _find_best_cpp_std(self, cpp_std):
- 
- class ClangCPPCompiler(ClangCompiler, CPPCompiler):
-     def __init__(self, exelist, version, for_machine: MachineChoice,
--                 is_cross, info: 'MachineInfo', exe_wrapper=None, **kwargs):
-+                 is_cross, info: 'MachineInfo', exe_wrapper=None,
-+                 defines : T.Optional[T.List[str]] = None, **kwargs):
-         CPPCompiler.__init__(self, exelist, version, for_machine, is_cross,
-                              info, exe_wrapper, **kwargs)
--        ClangCompiler.__init__(self)
-+        ClangCompiler.__init__(self, defines)
-         default_warn_args = ['-Wall', '-Winvalid-pch', '-Wnon-virtual-dtor']
-         self.warn_args = {'0': [],
-                           '1': default_warn_args,
-diff --git a/mesonbuild/compilers/fortran.py b/mesonbuild/compilers/fortran.py
-index c155b5b4f3..af83c0e564 100644
---- a/mesonbuild/compilers/fortran.py
-+++ b/mesonbuild/compilers/fortran.py
-@@ -424,7 +424,7 @@ def __init__(self, exelist, version, for_machine: MachineChoice,
-                  **kwargs):
-         FortranCompiler.__init__(self, exelist, version, for_machine,
-                                  is_cross, info, exe_wrapper, **kwargs)
--        ClangCompiler.__init__(self)
-+        ClangCompiler.__init__(self, [])
-         self.id = 'flang'
-         default_warn_args = ['-Minform=inform']
-         self.warn_args = {'0': [],
-diff --git a/mesonbuild/compilers/mixins/clang.py b/mesonbuild/compilers/mixins/clang.py
-index 1c0ee452f4..0ee10ad5d5 100644
---- a/mesonbuild/compilers/mixins/clang.py
-+++ b/mesonbuild/compilers/mixins/clang.py
-@@ -42,9 +42,10 @@
- }  # type: T.Dict[str, T.List[str]]
- 
- class ClangCompiler(GnuLikeCompiler):
--    def __init__(self):
-+    def __init__(self, defines: T.Optional[T.Dict[str, str]]):
-         super().__init__()
-         self.id = 'clang'
-+        self.defines = defines or {}
-         self.base_options.append('b_colorout')
-         # TODO: this really should be part of the linker base_options, but
-         # linkers don't have base_options.
-@@ -56,6 +57,12 @@ def __init__(self):
-     def get_colorout_args(self, colortype: str) -> T.List[str]:
-         return clang_color_args[colortype][:]
- 
-+    def has_builtin_define(self, define: str) -> bool:
-+        return define in self.defines
-+
-+    def get_builtin_define(self, define: str) -> T.Optional[str]:
-+        return self.defines.get(define)
-+
-     def get_optimization_args(self, optimization_level: str) -> T.List[str]:
-         return clang_optimization_args[optimization_level]
- 
-diff --git a/mesonbuild/compilers/objc.py b/mesonbuild/compilers/objc.py
-index 52d258dcdb..d351c8826a 100644
---- a/mesonbuild/compilers/objc.py
-+++ b/mesonbuild/compilers/objc.py
-@@ -86,7 +86,7 @@ def __init__(self, exelist, version, for_machine: MachineChoice,
-                  **kwargs):
-         ObjCCompiler.__init__(self, exelist, version, for_machine, is_cross,
-                               info, exe_wrapper, **kwargs)
--        ClangCompiler.__init__(self)
-+        ClangCompiler.__init__(self, [])
-         default_warn_args = ['-Wall', '-Winvalid-pch']
-         self.warn_args = {'0': [],
-                           '1': default_warn_args,
-diff --git a/mesonbuild/compilers/objcpp.py b/mesonbuild/compilers/objcpp.py
-index c8b422b35d..10555b4551 100644
---- a/mesonbuild/compilers/objcpp.py
-+++ b/mesonbuild/compilers/objcpp.py
-@@ -84,7 +84,7 @@ def __init__(self, exelist, version, for_machine: MachineChoice,
-                  is_cross, info: 'MachineInfo', exe_wrapper=None,
-                  **kwargs):
-         ObjCPPCompiler.__init__(self, exelist, version, for_machine, is_cross, info, exe_wrapper, **kwargs)
--        ClangCompiler.__init__(self)
-+        ClangCompiler.__init__(self, [])
-         default_warn_args = ['-Wall', '-Winvalid-pch', '-Wnon-virtual-dtor']
-         self.warn_args = {'0': [],
-                           '1': default_warn_args,
-diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
-index 8fad6288b1..cb6ae7d514 100644
---- a/mesonbuild/environment.py
-+++ b/mesonbuild/environment.py
-@@ -726,6 +726,28 @@ def get_lcc_version_from_defines(defines):
-         minor = defines.get('__LCC_MINOR__', '0')
-         return dot.join((generation, major, minor))
- 
-+    @staticmethod
-+    def get_clang_compiler_defines(compiler):
-+        """
-+        Get the list of Clang pre-processor defines
-+        """
-+        args = compiler + ['-E', '-dM', '-']
-+        p, output, error = Popen_safe(args, write='', stdin=subprocess.PIPE)
-+        if p.returncode != 0:
-+            raise EnvironmentException('Unable to get clang pre-processor defines:\n' + output + error)
-+        defines = {}
-+        for line in output.split('\n'):
-+            if not line:
-+                continue
-+            d, *rest = line.split(' ', 2)
-+            if d != '#define':
-+                continue
-+            if len(rest) == 1:
-+                defines[rest] = True
-+            if len(rest) == 2:
-+                defines[rest[0]] = rest[1]
-+        return defines
-+
-     def _get_compilers(self, lang, for_machine):
-         '''
-         The list of compilers is detected in the exact same way for
-@@ -1043,6 +1065,8 @@ def sanitize(p):
-             if 'clang' in out:
-                 linker = None
- 
-+                defines = self.get_clang_compiler_defines(compiler)
-+
-                 # Even if the for_machine is darwin, we could be using vanilla
-                 # clang.
-                 if 'Apple' in out:
-@@ -1063,7 +1087,7 @@ def sanitize(p):
- 
-                 return cls(
-                     ccache + compiler, version, for_machine, is_cross, info,
--                    exe_wrap, full_version=full_version, linker=linker)
-+                    exe_wrap, defines, full_version=full_version, linker=linker)
- 
-             if 'Intel(R) C++ Intel(R)' in err:
-                 version = search_version(err)
diff --git a/dev-util/meson/files/0.54.2-prefix-dont-strip-rpath.patch b/dev-util/meson/files/0.54.2-prefix-dont-strip-rpath.patch
deleted file mode 100644
index 1fe2e1ac4cc1..000000000000
--- a/dev-util/meson/files/0.54.2-prefix-dont-strip-rpath.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-https://bz-attachments.freebsd.org/attachment.cgi?id=204611
-https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=238128
-
-Stripping RPATH on Prefix is really bad, because it means the default
-RPATH entries disappear, and any installed binaries don't work (get
-kernel traps).
-
-Extracted the minstall patch from the FreeBSD full patch.
-
---- a/mesonbuild/minstall.py
-+++ b/mesonbuild/minstall.py
-@@ -488,8 +488,11 @@
-                         printed_symlink_error = True
-             if os.path.isfile(outname):
-                 try:
--                    depfixer.fix_rpath(outname, install_rpath, final_path,
--                                       install_name_mappings, verbose=False)
-+                    if install_rpath:
-+                        depfixer.fix_rpath(outname, install_rpath, final_path,
-+                                           install_name_mappings, verbose=False)
-+                    else:
-+                        print("RPATH changes at install time disabled")
-                 except SystemExit as e:
-                     if isinstance(e.code, int) and e.code == 0:
-                         pass
diff --git a/dev-util/meson/meson-0.54.3.ebuild b/dev-util/meson/meson-0.54.3.ebuild
deleted file mode 100644
index e91ba990d3a4..000000000000
--- a/dev-util/meson/meson-0.54.3.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 2016-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/mesonbuild/meson"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-inherit distutils-r1 toolchain-funcs
-
-DESCRIPTION="Open source build system"
-HOMEPAGE="https://mesonbuild.com/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	test? (
-		dev-libs/glib:2
-		dev-libs/gobject-introspection
-		dev-util/ninja
-		dev-vcs/git
-		sys-libs/zlib[static-libs(+)]
-		virtual/pkgconfig
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/0.54.2-multilib-clang.patch
-)
-
-python_prepare_all() {
-	local disable_unittests=(
-		# ASAN and sandbox both want control over LD_PRELOAD
-		# https://bugs.gentoo.org/673016
-		-e 's/test_generate_gir_with_address_sanitizer/_&/'
-
-		# ASAN is unsupported on some targets
-		# https://bugs.gentoo.org/692822
-		-e 's/test_pch_with_address_sanitizer/_&/'
-
-		# https://github.com/mesonbuild/meson/issues/7203
-		-e 's/test_templates/_&/'
-
-		# Broken due to python2 wrapper
-		-e 's/test_python_module/_&/'
-	)
-
-	sed -i "${disable_unittests[@]}" run_unittests.py || die
-
-	# Broken due to python2 script created by python_wrapper_setup
-	rm -r "test cases/frameworks/1 boost" || die
-
-	use prefix && eapply "${FILESDIR}"/0.54.2-prefix-dont-strip-rpath.patch
-
-	distutils-r1_python_prepare_all
-}
-
-src_test() {
-	tc-export PKG_CONFIG
-	if ${PKG_CONFIG} --exists Qt5Core && ! ${PKG_CONFIG} --exists Qt5Gui; then
-		ewarn "Found Qt5Core but not Qt5Gui; skipping tests"
-	else
-		# https://bugs.gentoo.org/687792
-		unset PKG_CONFIG
-		distutils-r1_src_test
-	fi
-}
-
-python_test() {
-	(
-		# test_meson_installed
-		unset PYTHONDONTWRITEBYTECODE
-
-		# test_cross_file_system_paths
-		unset XDG_DATA_HOME
-
-		${EPYTHON} -u run_tests.py
-	) || die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	insinto /usr/share/vim/vimfiles
-	doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax}
-	insinto /usr/share/zsh/site-functions
-	doins data/shell-completions/zsh/_meson
-}
diff --git a/dev-util/meson/meson-0.55.3.ebuild b/dev-util/meson/meson-0.55.3.ebuild
index 38ccf9179e21..ddf27ccdc725 100644
--- a/dev-util/meson/meson-0.55.3.ebuild
+++ b/dev-util/meson/meson-0.55.3.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 inherit distutils-r1 toolchain-funcs
diff --git a/dev-util/mpatch/Manifest b/dev-util/mpatch/Manifest
deleted file mode 100644
index 3ed4a2b9cd85..000000000000
--- a/dev-util/mpatch/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST mpatch-0.8.tar.bz2 115774 BLAKE2B 3fc3f14e3ee4e8506685b04fcaa434326f550d07f247a8fa2b8afacd7496566fad70a479049f6b65ae572ff77326eb4a506ec458b2c6b7ce73b7afb9f463e6eb SHA512 1a05d23c923e29cc87dcc0994affd87b9b0b9257f2d410fb28ed2fe5337676274e9c8548df286a81479afa231a80805ac09f3e0e9b6c8942ebef443fbc4f96f1
-EBUILD mpatch-0.8-r1.ebuild 583 BLAKE2B 5f05f06c56afff602ec573b916d89cac57c6bc6d0c460315b1b2e90eafb25bb1dd4bb5a855f396bde321a705f124fbcc9325331b0ab3de9959b8281dde4090c1 SHA512 d4f0431040ace5d36ef47ebbda0f6de511f1ba6cc05a99db812ef32d5934bcde6502089d1628f3dcf6112b5f86e306c8e1cba66dd27693182cc4b524d37fd27b
-MISC metadata.xml 268 BLAKE2B 914b6995ad966e2b83ec718b2598969b181c119d8805241b0046f69e161ac22a9f769204f4783240056804008475aa406cbd91b9de499ec7840f9595158bd291 SHA512 ffda1db3fd6ac952f41a970e2e496c6a9fd0b12ed11cdf363fd269c3b00f627c6e70421fd545aad61d69594af2e5f43d8ebc197232a39b596d012818fe758850
diff --git a/dev-util/mpatch/metadata.xml b/dev-util/mpatch/metadata.xml
deleted file mode 100644
index a4e0d354f696..000000000000
--- a/dev-util/mpatch/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-    <maintainer type="person">
-        <email>robbat2@gentoo.org</email>
-        <name>Robin H. Johnson</name>
-    </maintainer>
-</pkgmetadata>
diff --git a/dev-util/mpatch/mpatch-0.8-r1.ebuild b/dev-util/mpatch/mpatch-0.8-r1.ebuild
deleted file mode 100644
index ae679e718905..000000000000
--- a/dev-util/mpatch/mpatch-0.8-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1
-
-DESCRIPTION="Patch-like tool which can resolve common causes of patch rejects when applying"
-HOMEPAGE="http://oss.oracle.com/~mason/mpatch/"
-SRC_URI="http://oss.oracle.com/~mason/mpatch/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_install() {
-	distutils-r1_src_install
-	dobin cmd/qp cmd/mp
-}
diff --git a/dev-util/ninja/Manifest b/dev-util/ninja/Manifest
index 5bce4224ee91..ef6b741fcb0a 100644
--- a/dev-util/ninja/Manifest
+++ b/dev-util/ninja/Manifest
@@ -1,9 +1,8 @@
 AUX ninja-1.10.0-readme.patch 1334 BLAKE2B 22543d95e66045b5b2c489cbb823c9c75ca20d415bef6af311cc076c0a1dd329c4056bc68b644b07aab42d4e165aabdb0227463532a06e3abaff1b5a37ee0c5e SHA512 b968751a9bf3df633461a919bc35a5b9d0a210a18afe7c81c04b01676723495ea9b90eee7206f395012e37f2b5503fc2d6e63e92649b4fa13c4f0dc4b1d5f229
-AUX ninja-1.9.0-musl.patch 1997 BLAKE2B 5fa4e9b171a87ebb8fb618a2b4b0c47668d0aaf0a2b3a5b08a3be5649235228d2cd38c3891d52b1d1e0217f16b1e13175a1a077567c07e83ba8cd36aae96c7aa SHA512 78b29a57ec3c4feedf2bcfe9370b30cecd5302f29e8e14c6a3bc01becb555be6330aafba12f9225625af0644ea1f534feba8396d32bb944253a9daa5dd0e98d8
 AUX ninja-cflags.patch 738 BLAKE2B ec025836197d41d96cfcab0a7363ab3bda50cb7fc3f91f096ccfaa16babdc353269738aef92e68a261f43ba617720f677766f7044acb1a01dd7e07d6c9eca13e SHA512 97935accbef92e6eeda7d38bae6978016f4423e3989fcfb13c6de55644133ddef43db49811fc85d2649d68473d8b81e1bfb70f59a5e63d2607741d90152a4f42
 DIST ninja-1.10.0.tar.gz 210313 BLAKE2B 0a3db145deaea8a990958ad2e812bc18ed014aaba94911a2905b082745a0d08f10ce1113badabaa362f3834540b7bd3858f07e2a5fce268c66d3d6c73e974e76 SHA512 5ed47ef1ff18a03eb73296629679a8617a08ee443e10e28ae9cb24e4506f84fe1eb142888adea9a62364b626b35817def8c55ba956c9b3cbc7b82d3e62293044
 DIST ninja-1.10.1.tar.gz 211216 BLAKE2B cb27beeef903ff7c5a00f2ac85b36e66d9c41bcb271edbb6c6d827d5b2b652bacfe3d429a3f966d22fd97495323f83692abf7835f3d6ed3af51a3df9fef180c1 SHA512 9915767a6ffc7147903f346082b5c31fcaeb1e45742754cfaaa642e8ec4c1bd9ec26692a59eb4e2118c397336712a6548e6a16408e094001f8f0c173e67afcc2
 EBUILD ninja-1.10.0.ebuild 2687 BLAKE2B e025b310f8ba38be99d226155b365e3a62d5230fbccbe24f045a396b313ee3e8cff7785a9cc3a1e2c55586a4953863d37c7a64fcb0a9a26a1924a335c4b8ca7c SHA512 d25cbb60faa8cf707c4850ae431cb9f46c024ddb32683b226c906294b2dc40f3cd5df5faacc2a6ee968a98cd1df6bdd6ee958e8e3c536b90bafaa96d311115db
-EBUILD ninja-1.10.1.ebuild 2657 BLAKE2B f7ce3fd75ba0221b701aee7845ebda0476365284914291f2568cf563126819dbb4b1c9ac46d4066ff3db5e3b3823d294d373d33ba58ffe499ea043a0db07f846 SHA512 9228921ff8ac1a4c27f1b03931198c0577d5e79064b24b62d911b5c16cce8a55548c08bb5b2da2416b11259785cbac6dde06dbcc3857b2190896d363ca9f6c3d
+EBUILD ninja-1.10.1.ebuild 2649 BLAKE2B 780f566a6a8e8b7580276897047de0969ea104459eba255de5f9c1a7e805fac28c120594eedbbb99a20d08eaa501641c720b2ff2f93ace0b6b18df87dd51d1de SHA512 cb202c83509546f6d9a64851b3ec80cb08e4e6740dfe91a553ca6a5453b99f829bfb76b1c40c4ca13ed39d0f5e132f6c47615f03a2313e77c79a683f7dadd7a7
 EBUILD ninja-9999.ebuild 2605 BLAKE2B 63f1a467b6a02f99b2db9555d7bfe54c0f7232e7c0e1551f0b440d1e77926876eb9c461540b57788d43499246f8d595244313ecee2b99146e01d4f7a8503c785 SHA512 e4028a3e3fbc58b02faa9e1b857ca45985490e6beb446474fe00acc781101b9c2a76cd777d5f3f71f072ceea32050b6bb1a9d7f97b149898a80315df4b644d6f
 MISC metadata.xml 340 BLAKE2B 7cf71b1a09f74328ea74362db4250bf038c0455dcd5f65676ceb5d80a61b5c2923696ecfeccf9d6cd264633e7dc00daa80bf960cc67e5b889d18d487d8e89b97 SHA512 4b78365b98eb9b8a1ef27115261dbf426942cccb7be03c8264e2728e60dedfec8fa51ee3f43488043be5af21b28a74c1c81f4767bcc58574873c2223172447b2
diff --git a/dev-util/ninja/files/ninja-1.9.0-musl.patch b/dev-util/ninja/files/ninja-1.9.0-musl.patch
deleted file mode 100644
index f6aeb428974d..000000000000
--- a/dev-util/ninja/files/ninja-1.9.0-musl.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 567815df38a2ff54ad7478a90bd75c91e434236a Mon Sep 17 00:00:00 2001
-From: makepost <makepost@firemail.cc>
-Date: Mon, 24 Dec 2018 03:13:16 +0200
-Subject: [PATCH] Use st_mtim if st_mtime is macro, fix #1510
-
-In POSIX.1-2008, sys_stat has a st_mtim member and a st_mtime backward
-compatibility macro. Should help avoid hardcoding platform detection.
----
- src/disk_interface.cc | 14 ++++----------
- 1 file changed, 4 insertions(+), 10 deletions(-)
-
-diff --git a/src/disk_interface.cc b/src/disk_interface.cc
-index d4c2fb087..dc297c449 100644
---- a/src/disk_interface.cc
-+++ b/src/disk_interface.cc
-@@ -202,19 +202,13 @@ TimeStamp RealDiskInterface::Stat(const string& path, string* err) const {
-   // that it doesn't exist.
-   if (st.st_mtime == 0)
-     return 1;
--#if defined(__APPLE__) && !defined(_POSIX_C_SOURCE)
-+#if defined(_AIX)
-+  return (int64_t)st.st_mtime * 1000000000LL + st.st_mtime_n;
-+#elif defined(__APPLE__)
-   return ((int64_t)st.st_mtimespec.tv_sec * 1000000000LL +
-           st.st_mtimespec.tv_nsec);
--#elif (_POSIX_C_SOURCE >= 200809L || _XOPEN_SOURCE >= 700 || defined(_BSD_SOURCE) || defined(_SVID_SOURCE) || \
--       defined(__BIONIC__) || (defined (__SVR4) && defined (__sun)) || defined(__FreeBSD__))
--  // For glibc, see "Timestamp files" in the Notes of http://www.kernel.org/doc/man-pages/online/pages/man2/stat.2.html
--  // newlib, uClibc and musl follow the kernel (or Cygwin) headers and define the right macro values above.
--  // For bsd, see https://github.com/freebsd/freebsd/blob/master/sys/sys/stat.h and similar
--  // For bionic, C and POSIX API is always enabled.
--  // For solaris, see https://docs.oracle.com/cd/E88353_01/html/E37841/stat-2.html.
-+#elif defined(st_mtime) // A macro, so we're likely on modern POSIX.
-   return (int64_t)st.st_mtim.tv_sec * 1000000000LL + st.st_mtim.tv_nsec;
--#elif defined(_AIX)
--  return (int64_t)st.st_mtime * 1000000000LL + st.st_mtime_n;
- #else
-   return (int64_t)st.st_mtime * 1000000000LL + st.st_mtimensec;
- #endif
diff --git a/dev-util/ninja/ninja-1.10.1.ebuild b/dev-util/ninja/ninja-1.10.1.ebuild
index 4fa91eecab51..f9153242f055 100644
--- a/dev-util/ninja/ninja-1.10.1.ebuild
+++ b/dev-util/ninja/ninja-1.10.1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/ninja-build/ninja.git"
 else
 	SRC_URI="https://github.com/ninja-build/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A small build system similar to make"
diff --git a/dev-util/nvidia-cuda-toolkit/Manifest b/dev-util/nvidia-cuda-toolkit/Manifest
index 258f6757eb31..733d47cdfd83 100644
--- a/dev-util/nvidia-cuda-toolkit/Manifest
+++ b/dev-util/nvidia-cuda-toolkit/Manifest
@@ -5,6 +5,7 @@ DIST cuda_10.1.168_418.67_linux.run 2526901749 BLAKE2B ed2207400730600c63895cc89
 DIST cuda_10.1.243_418.87.00_linux.run 2572375299 BLAKE2B df9cb4faeeeeecc536e72697c6c73d544219f1b23cacb7fed646b0908fc7e573e85920861d56f76776ba637d84964cd1c789a0fe0d6541a4e0adf618b6c74d3c SHA512 f92b19d0242969a65a6e6db43bc293e442abc07a9e168c9e995692e1a401679504598c782e511be3879e1650b90f71a50bbc63c9ee45654c26b5007cdf33c4fe
 DIST cuda_10.2.89_440.33.01_linux.run 2645419389 BLAKE2B 236aa70a7b45e3636c2c229fffa7d1ca0699ab4365865a73edab607a209c42c2899133dd6a83c61c5929fa754668ad15aec4d847639af1c00a8e6657c8487c77 SHA512 ad8da539ff5df7caf411d1e497ff3d6978cfa8a1fd9150fa4846089e92a604ea56be8631f3efdfe7229a655b8d2d28e6edb32f5731530a77d6f00241cc7aab6e
 DIST cuda_11.0.3_450.51.06_linux.run 3112522594 BLAKE2B f458aeebee3f7145f46c5607d1743d350ed96e9b8fd824fd94d2c998bcd8ccf3ef924cf37e95ce002ba92f464edd5004164497e820084953613ec2deb6edb144 SHA512 e7014c868c0bf40c000b1fd14d156265773a399782937cc85a2b09cd62abddcacdc20b412e1cc91c3877d01563cf054b1e021f047b32cfff4ab516e7167382dd
+DIST cuda_11.1.0_455.23.05_linux.run 3498245611 BLAKE2B 754d974acf309a0f2f969bb3312949aa5469b3ec6ebfc4a89f244420cecebc22dc19fb9f63ec7d5c177eeb533a8984cb6bfa8d271ba36d02aacce22d42442ba4 SHA512 b5d64f20dbb51f12c558be4a724c18ddcd6d18670036efb63d19bb8009300463b8051dd1a2d2d7768bf3076681954ea690af399651da832ba00867a3f4a9acdf
 DIST cuda_6.5.14_linux_32.run 76788277 BLAKE2B 75e79dce6cac5155bde8a3cafa945047c489b10272f8a3b94bf55d499df4b9c8b82506a81a20f9fd816bd4fd0514e515a6435399db1cb62b027c76490bd4dfae SHA512 89649ee0f4543b37037b7c8f5ed0b8bd502512afb4d93e3158b3df4786123be05a5288986b5abbfe15c14eb010777d2527b715225bea96a354a898c34e4a2fcc
 DIST cuda_6.5.14_linux_64.run 972320904 BLAKE2B 4a4361fb7a90989ec4b4aa433189e7b358e5a2272fb9b9c59429e0014ac14e3b8de1b247ee98dc30c3f3ee4cc009eca4fdd86027bd3b9527a683353d60bdf5c6 SHA512 fecca731b86955f5bc7b09d88b02951e3ee5d4b1f1cf5f92658227a029b87cd35d6ac22956a5fa0afe62dcdc57191f1d12bb08c9f7cc05128727cd8455947b1e
 DIST cuda_6.5.19_linux_32.run 81882112 BLAKE2B cf55ef7c969503c156431fc56301ed4e9a1234ae0cb867f12649636069f35e56bf6fc9df7482b6baade45d78c8baa2d98c41a28696da59294e0f575c4a0344ce SHA512 1ce9bd6b472b7e4f1fb181eb340dfcb757714d59a89aaa02146cfe1a97c8ccb7eb7699b4ec823276f277eb4d82d95050eaba17e7ed5fd2e47b9b5d78531c5d4e
@@ -21,6 +22,7 @@ EBUILD nvidia-cuda-toolkit-10.1.168-r2.ebuild 3925 BLAKE2B e43bab5926ca764929328
 EBUILD nvidia-cuda-toolkit-10.1.243-r3.ebuild 4238 BLAKE2B 07fdf4e6eb0ac919a73b0f9d72e7859446f6c9a4f2500430537e79d8cb6f512659c2a56624bec7d7913723f9e6000ecf83746da30e745a43f7631a17648aecbb SHA512 3a5e9a96999c0f23b05f2b3c7452b0f662985e7e3a0ae94cf0619ffd12c96387d540fc2fa58ba2e69933f6fc046387668b06003a1e9d6efec127254ec3043d34
 EBUILD nvidia-cuda-toolkit-10.2.89-r2.ebuild 3992 BLAKE2B 858d1b4db64e393f061a36c3e8f22dfa83bb2e4d083ca5d987eb80b1e74ed2fb51923ecc49a4e32f52291d6ef84e1d82ab257bb345d11225e92be1368b5f4f9d SHA512 047735e7b92f12a7152b950c88d8c6b09da7772a31f4b133c8af5c8295f55d81b312b796b481dd7f6ae6767d3f2632a280533c6bcd5a22ec705dfcbd3933a94b
 EBUILD nvidia-cuda-toolkit-11.0.3.ebuild 6553 BLAKE2B dffab99d248356bc4d08f987901a0cad7941fa6b71eb684b9297a61637dfc8e964986d1dca719ae61fe2920265e5639f7afe559ac1f15cf919aeca01e37ced90 SHA512 f69720ca2b578e030a8c07b7663602aef82678274d0671d4dd1302d50ea177cd8ccd09963ff63f1e84c1f58cf5de5672e9d675c21db0b8a1500674bbd09595fb
+EBUILD nvidia-cuda-toolkit-11.1.0.ebuild 6333 BLAKE2B d436666ae256fc1256f87ca382a325df9d34cf2a0e74f1d867cc87449b0b0635eed7bb814bd079e832540f11fe4702749815f01235347e2e05a612aa6e2fe761 SHA512 2356fbfdc33d79ae3d9de86bd6e67dc2f79ed3d5b9debf26e2d090e6dcf62d72c48a804c0faa8f7627e78af1159aba9d2db837c78b91a696227756df39a13e74
 EBUILD nvidia-cuda-toolkit-6.5.14.ebuild 3902 BLAKE2B fb559c6ca55638853cede289104f9528bc939f10c20b9c67d168caf6cc3962c06e56f25961a17acfef4c143a95648efbc7d37f2362ef4af3f40d9d289ef88dcf SHA512 c810885c9fd7747d61078fedcefe4180da8aaa4ee7fa8822908f7d8dc649fd488781ea570f9f078c6a91ac7949cef3f112e8fe8a6bca3bb0d662abbe0ba755e9
 EBUILD nvidia-cuda-toolkit-6.5.19-r1.ebuild 3928 BLAKE2B a3cc31983db891d496f5172bce661a5f1fd77a10afe0fb4ea1e243121530fc5560257c5846cc240da52986c7e6157feaace7047d0c675d0653144f5a42263a21 SHA512 9705c2ee7e76b5a66b20e08ca84c4ff998405a0816bbdd2e3d56eed21115ca154219d079943966525c71460baafdaf2858e2c7c6e08c44eff45db1be4d8c1f0f
 EBUILD nvidia-cuda-toolkit-7.5.18-r2.ebuild 3439 BLAKE2B d1f61624448cdcd69db1a592d6fa4a78004fa8021b591efaa64dcd46263a2803f4983782b87ec9a3a89834e4ed99ab26f7dd706dee2a631887b1ac96b2080d4d SHA512 0c191cb31f5349a7a09c88c1d06e52ce025421a61a2c2bfc925a058b33f855585ccf20d538943c8e7f4d77fd1bb926d16fed76efa467e0a4380ba4b7f93f2c7f
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.1.0.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.1.0.ebuild
new file mode 100644
index 000000000000..8f77d9e9c6eb
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.1.0.ebuild
@@ -0,0 +1,228 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit check-reqs cuda toolchain-funcs unpacker
+
+DRIVER_PV="455.23.05"
+
+DESCRIPTION="NVIDIA CUDA Toolkit (compiler and friends)"
+HOMEPAGE="https://developer.nvidia.com/cuda-zone"
+SRC_URI="https://developer.download.nvidia.com/compute/cuda/${PV}/local_installers/cuda_${PV}_${DRIVER_PV}_linux.run"
+
+LICENSE="NVIDIA-CUDA"
+SLOT="0/${PV}"
+KEYWORDS="-* ~amd64 ~amd64-linux"
+IUSE="debugger nsight profiler vis-profiler sanitizer"
+RESTRICT="bindist mirror"
+
+BDEPEND=""
+RDEPEND="
+	<sys-devel/gcc-11_pre[cxx]
+	>=x11-drivers/nvidia-drivers-${DRIVER_PV}[X,uvm]
+	debugger? (
+		dev-libs/openssl-compat:1.0.0
+		sys-libs/libtermcap-compat
+		sys-libs/ncurses-compat:5[tinfo]
+	)
+	vis-profiler? (
+		dev-libs/openssl-compat:1.0.0
+		>=virtual/jre-1.6
+	)"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="opt/cuda/*"
+
+CHECKREQS_DISK_BUILD="6800M"
+
+pkg_setup() {
+	# We don't like to run cuda_pkg_setup as it depends on us
+	check-reqs_pkg_setup
+}
+
+src_prepare() {
+	local cuda_supported_gcc
+
+	# ATTENTION: change requires revbump
+	cuda_supported_gcc="4.7 4.8 4.9 5.3 5.4 6.3 6.4 7.2 7.3 8.2 8.3 8.4 9.2 9.3 10.2"
+
+	sed \
+		-e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \
+		"${FILESDIR}"/cuda-config.in > "${T}"/cuda-config || die
+
+	default
+}
+
+src_install() {
+	local cudadir=/opt/cuda
+	local ecudadir="${EPREFIX}${cudadir}"
+	dodir ${cudadir}
+	into ${cudadir}
+
+	# Install standard sub packages
+	local builddirs=(
+		builds/cuda_{cudart,cuobjdump,memcheck,nvcc,nvdisasm,nvml_dev,nvprune,nvrtc,nvtx}
+		builds/lib{cublas,cufft,curand,cusolver,cusparse,npp,nvjpeg}
+		$(usex profiler "builds/cuda_nvprof builds/cuda_cupti" "")
+		$(usex vis-profiler "builds/cuda_nvvp" "")
+		$(usex debugger "builds/cuda_gdb" "")
+	)
+
+	local d
+	for d in "${builddirs[@]}"; do
+		ebegin "Installing ${d}"
+		[[ -d ${d} ]] || die "Directory does not exist: ${d}"
+
+		if [[ -d ${d}/bin ]]; then
+			local f
+			for f in ${d}/bin/*; do
+				if [[ -f ${f} ]]; then
+					dobin "${f}"
+				else
+					insinto ${cudadir}/bin
+					doins -r "${f}"
+				fi
+			done
+		fi
+
+		insinto ${cudadir}
+		if [[ -d ${d}/targets ]]; then
+			doins -r "${d}"/targets
+		fi
+		if [[ -d ${d}/share ]]; then
+			doins -r "${d}"/share
+		fi
+		if [[ -d ${d}/extras ]]; then
+			doins -r "${d}"/extras
+		fi
+		eend
+	done
+	dobin "${T}"/cuda-config
+
+	doins builds/EULA.txt
+	# nvml and nvvm need special handling
+	ebegin "Installing nvvm"
+	doins -r builds/cuda_nvcc/nvvm
+	exeinto ${cudadir}/nvvm/bin
+	doexe builds/cuda_nvcc/nvvm/bin/cicc
+	eend
+
+	ebegin "Installing nvml"
+	doins -r builds/cuda_nvml_dev/nvml
+	eend
+
+	if use sanitizer; then
+		ebegin "Installing sanitizer"
+		dobin builds/integration/Sanitizer/compute-sanitizer
+		doins -r builds/cuda_sanitizer_api/Sanitizer
+		# special handling for the executable
+		exeinto ${cudadir}/Sanitizer
+		doexe builds/cuda_sanitizer_api/Sanitizer/compute-sanitizer
+		eend
+	fi
+
+	if use vis-profiler; then
+		ebegin "Installing libnvvp"
+		doins -r builds/cuda_nvvp/libnvvp
+		# special handling for the executable
+		exeinto ${cudadir}/libnvvp
+		doexe builds/cuda_nvvp/libnvvp/nvvp
+		eend
+	fi
+
+	if use nsight; then
+		local ncu_dir=$(grep -o 'nsight-compute-[0-9][0-9\.]*' -m1 manifests/cuda_x86_64.xml)
+		ebegin "Installing ${ncu_dir}"
+		mv builds/nsight_compute builds/${ncu_dir} || die
+		doins -r builds/${ncu_dir}
+
+		exeinto ${cudadir}/${ncu_dir}
+		doexe builds/${ncu_dir}/{ncu,ncu-ui,nv-nsight-cu,nv-nsight-cu-cli}
+
+		exeinto ${cudadir}/${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64
+		doexe builds/${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/{ncu-ui,ncu-ui.bin,CrashReporter}
+		dobin builds/integration/nsight-compute/{ncu,ncu-ui,nv-nsight-cu,nv-nsight-cu-cli}
+		eend
+
+		local nsys_dir=$(grep -o 'nsight-systems-[0-9][0-9\.]*' -m1 manifests/cuda_x86_64.xml)
+		ebegin "Installing ${nsys_dir}"
+		mv builds/nsight_systems builds/${nsys_dir} || die
+		doins -r builds/${nsys_dir}
+		exeinto ${cudadir}/${nsys_dir}/target-linux-x64
+		doexe builds/${nsys_dir}/target-linux-x64/nsys
+
+		exeinto ${cudadir}/${nsys_dir}/host-linux-x64
+		doexe builds/${nsys_dir}/host-linux-x64/{nsight-sys,nsight-sys.bin,nsys-ui,CrashReporter,ImportNvtxt,QdstrmImporter,ResolveSymbols}
+		dobin builds/integration/nsight-systems/{nsight-sys,nsys,nsys-exporter,nsys-ui}
+		eend
+		# TODO: unbundle qt5
+		# TODO: unbundle boost
+		# TODO: unbundle icu
+		# TODO: unbundle openssl
+		# TODO: unbundle mesa
+		# TODO: unbundle libz
+		# TODO: unbundle libstdc++
+		# TODO: unbundle libSshClient
+		# TODO: unbundle sqlite
+		# TODO: unbundle libpfm ?
+	fi
+
+	# Add include and lib symlinks
+	dosym "targets/x86_64-linux/include" ${cudadir}/include
+	dosym "targets/x86_64-linux/lib" ${cudadir}/lib64
+
+	newenvd - 99cuda <<-EOF
+		PATH=${ecudadir}/bin$(usex vis-profiler ":${ecudadir}/libnvvp" "")
+		ROOTPATH=${ecudadir}/bin
+		LDPATH=${ecudadir}/lib64:${ecudadir}/nvvm/lib64$(usex profiler ":${ecudadir}/extras/CUPTI/lib64" "")
+	EOF
+
+	# Cuda prepackages libraries, don't revdep-build on them
+	insinto /etc/revdep-rebuild
+	newins - 80${PN} <<-EOF
+		SEARCH_DIRS_MASK="${ecudadir}"
+	EOF
+	# TODO: Find a better way to add +x permission to installed executables
+	# TODO: Add pkgconfig files for installed libraries
+}
+
+pkg_postinst_check() {
+	local a="$(${EROOT}/opt/cuda/bin/cuda-config -s)"
+	local b="0.0"
+	local v
+	for v in ${a}; do
+		ver_test "${v}" -gt "${b}" && b="${v}"
+	done
+
+	# if gcc and if not gcc-version is at least greatest supported
+	if tc-is-gcc && \
+		ver_test $(gcc-version) -gt "${b}"; then
+			ewarn
+			ewarn "gcc > ${b} will not work with CUDA"
+			ewarn "Make sure you set an earlier version of gcc with gcc-config"
+			ewarn "or append --compiler-bindir= pointing to a gcc bindir like"
+			ewarn "--compiler-bindir=${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/gcc${b}"
+			ewarn "to the nvcc compiler flags"
+			ewarn
+	fi
+}
+
+pkg_postinst() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		pkg_postinst_check
+	fi
+
+	if use profiler || use nsight; then
+		einfo
+		einfo "nvidia-drivers restrict access to performance counters."
+		einfo "You'll need to either run profiling tools (nvprof, nsight) "
+		einfo "using sudo (needs cap SYS_ADMIN) or add the following line to "
+		einfo "a modprobe configuration file "
+		einfo "(e.g. /etc/modprobe.d/nvidia-prof.conf): "
+		einfo
+		einfo "options nvidia NVreg_RestrictProfilingToAdminUsers=0"
+		einfo
+	fi
+}
diff --git a/dev-util/opencl-headers/Manifest b/dev-util/opencl-headers/Manifest
index 2a9289ef7aea..80945d4b88a2 100644
--- a/dev-util/opencl-headers/Manifest
+++ b/dev-util/opencl-headers/Manifest
@@ -1,5 +1,5 @@
 DIST opencl-headers-2020.03.13.tar.gz 48540 BLAKE2B 5befbf7b1ed9df7e45789f1a5c3ec15a2bb0bee4cf50f89e424b6c69534c045c0774fd6f6424d5311c5415c9e6714033b6c70d3c641f60c037a9c3fab3e00bb6 SHA512 4bf368325f6034b2c59b9d3a22f7c12eec078e5e5a0bdcc3f1f5870e211bf7d03ae7137897262440a9c98a35592f4405d85fae1b53246e56b5544af51bf9b39a
 DIST opencl-headers-2020.06.16.tar.gz 54769 BLAKE2B 8b8bf4e1948a38e12cbaba8a5df22757136655c72059af3c1e4526db529e272198fb84d805a79b275bf8432eec6a0f102f062f203e5d43b29bb482d109d05b08 SHA512 702c64648cd5d220aaeea1fc7f8a552f3ec75d1a867e1e9db7295452b288f22c2794e7b9a9bce7f01362b1fc2466940eef45aa7e88dd0e5a4570450a79c66391
 EBUILD opencl-headers-2020.03.13-r1.ebuild 607 BLAKE2B dc2f65912fb55daeda19f5bf83b09713304eb2e6d9fcaed827e4298e7492436f467b3348dc053e8317364597e44534cee464b057a81e2ffb125fe1a02caaf05f SHA512 27dc174b9cea161c162a2b1511f4f252c1f39fee0c9ad254afcc486d7104ad64034a430981e05490ba1b91672b06767be7682b2b9449af1ea9f17f319ff63080
-EBUILD opencl-headers-2020.06.16.ebuild 609 BLAKE2B 9c9e9b5811b0526f2884dac2a3a525168004e080c8ab45f32fd136981bfaf13482239dc54e1f2eeba8647ac688fd92cfeeb4495748ebbd71f9d1502e9ef9f1f8 SHA512 b6f5014c64795d56055ee41a9fa0da3f226571d1f164f62d9522f9c656aada3ff2980ee0339ca31d157ba04b44a410df2e44005cf47ea1c967c69353dab99506
+EBUILD opencl-headers-2020.06.16.ebuild 607 BLAKE2B dc2f65912fb55daeda19f5bf83b09713304eb2e6d9fcaed827e4298e7492436f467b3348dc053e8317364597e44534cee464b057a81e2ffb125fe1a02caaf05f SHA512 27dc174b9cea161c162a2b1511f4f252c1f39fee0c9ad254afcc486d7104ad64034a430981e05490ba1b91672b06767be7682b2b9449af1ea9f17f319ff63080
 MISC metadata.xml 1055 BLAKE2B bda38a579f6d6369a25342297ec81205dee40d42fc81ccaedb68b0d5b90ae6cd9d3b32eb3fad7d6f4f67f4da5d1dceeb5e9167f94d5619176376778dfa831f97 SHA512 4e75ba94c11582a73e4896f759ce965047357ff123408a2ba3d502c2598269a4273cadb7f02d8b1335a119f2e450fc1c5c07271a3a7c4383d378118af2eed7e2
diff --git a/dev-util/opencl-headers/opencl-headers-2020.06.16.ebuild b/dev-util/opencl-headers/opencl-headers-2020.06.16.ebuild
index 917c0cad3500..cffb61d415a4 100644
--- a/dev-util/opencl-headers/opencl-headers-2020.06.16.ebuild
+++ b/dev-util/opencl-headers/opencl-headers-2020.06.16.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 # To avoid file collisions in /usr/include/CL/
 DEPEND="!app-eselect/eselect-opencl"
diff --git a/dev-util/ostree/Manifest b/dev-util/ostree/Manifest
index a4a2e4940a00..0e4a1753993b 100644
--- a/dev-util/ostree/Manifest
+++ b/dev-util/ostree/Manifest
@@ -1,6 +1,7 @@
-DIST ostree-2018.9.tar.xz 1951732 BLAKE2B c6fba1321fe21bff569fe1dadd1aa649f23059a35dc906c3a0b7dcca29f7acbe8338e19541d8f7d854452bf6a6b1ac293d4350c7056a9b13b9ed1eacf358d4b3 SHA512 407b6b67add54e80a55fc35f08bde56561009db93ec202a10dd1ec1e66bd32b439c1d66c759e4e173e44fce6fbc2c162cae928a477c9d7abafbf007ed8f7bfb5
 DIST ostree-2019.5.tar.xz 1972452 BLAKE2B a8b015118855b8b0097f535ac074aeffc599c3f6f654967043e8e4de339d2a51e85ad1b4b3f3b22e18d39235e6ad9c1973334a2c4fc9b5c694f2ff40d68ae703 SHA512 27150802ed9af16e698ed163f6ad235f0f99a1410df52b4b1e266585fe665880c0b9490bf245b5593cb277007b7229d808be7403dd964c58aded6e567349c912
-EBUILD ostree-2018.9-r1.ebuild 3497 BLAKE2B b4a027cf64a64083caec1a5c48538d73194366a1e46e4ded6aff322c7007eb5a13b2247295ce59ab5b40e54ffdce3201646ec250778a0247845e1a9e0ecb4b55 SHA512 46a2e9cb4e2d962fb5fb330a7412d9c651c13fc965e800c6d92cb8cc15a4b98b8843e5b6d37d791b7235402a11a192909ac621070c30bd559878039d537375ff
-EBUILD ostree-2018.9.ebuild 3266 BLAKE2B b433adf09f65abdc163f517b97731790a7c2ef9570dc14cedfba8ffd151990c9a3cee2977ff17862228d3547e831c0aecc80446068f4787ca1f0d704d921a56b SHA512 cfc839b02b9007498d7b3ded28c651bc52c1015c4b7fc3e5e3cc7f4a0ef072d15a55fc962b76282e331ef26c99700457317d216cb37f4a48fcb30ce73adc350f
+DIST ostree-2020.6.tar.xz 2014456 BLAKE2B 97d84c6838993edfbabb598bce800332ab1c8b22c0431839f7129f2f57afdd71c1b8ea8b8d6c1dc2cbf8d7f6828d624394b5e8c533f7a98eb1b1c3aeedff92cf SHA512 1d8f8ccaa3e543a6f494d3be2a3651ad340846f0c314e003955260b7bd1d8c0421acf102ec2ca6580379c354bf4cfac0940e4e95b724b7aaf9dc8116085aa538
+DIST ostree-2020.7.tar.xz 2022004 BLAKE2B 2113117ce8553b7ffcfea17e1cb3a9c697d39b4933b48c30729af72fc833bb00f39e7e3a327efeebaac1df307b1f62ccf16a7772e12ad77737e2219c87623824 SHA512 f42dca3c9e1810c0421ab99588f27c625733b71ef811534b66e0c0c4afafbad5bf475e08feaf87c2f8414c38f127fd344adbb57a4b75001077aedbfe92af3706
 EBUILD ostree-2019.5.ebuild 2220 BLAKE2B c56fbde79b750df4de06f3ed175ad15011070c9b36bacc7bad3d2efc676b485c3c72b5b138e69ef0bf1f43293ef23f71699d5b9609a94d1a8aef4a267c81a3ef SHA512 829b080ab7ec39f2de945ef3c0ae23bdba3b17b544e2556809e4a25537e454ff5eee26674068eab80e8c326688020d26ba43c01f2059fc4aaaee67538d929ded
-MISC metadata.xml 1889 BLAKE2B 58b5a7ce03d273da942cc88468ccc1e8758c2f1e3004a0424567f56e5e6fb589f457e50a1edc759e77b9177aa9472441f68911c8cc5ed39c2c4d5b8b56839521 SHA512 697a3f44a7df7b1e7425afedece72693c77821a6c55a3d5bf735a724ccb1a6655dfabd4262b3136b7af0856eeaf8404adb0c203826f0f8422035c6d66ebb11d4
+EBUILD ostree-2020.6.ebuild 2248 BLAKE2B 94d7161089cac60244f39487f9ce2af3e231f0f312f4807f68b1bfc54b8719870b13f025060c76a8219aad10b57f5a08d6a4cee1164307e565235404bf226c1a SHA512 6db643fa64b224e5df5b6422ab420319f63e7a67d02c66fc4f976d4b2067dfadd98e4cf54bde6d3701c1554ae06a826fe1f411ae5f8d494f757fad50c7dcda09
+EBUILD ostree-2020.7.ebuild 2595 BLAKE2B afbac77b5c3c5e5167bb1cb0396a488c8b90185a0ca8f34bd2f53849d4978417f664110649452001aa3867b4b81972de872b9431e95e14c799298736dd8cff29 SHA512 f1a0b6b50c44ee0c6899a477e58f463c4ba6597a560f05cfdd437193a6d73a3bd81377485ad62d72f7fa3f5de3418d744592fbdb8c9a43d1729bae49264be198
+MISC metadata.xml 1989 BLAKE2B 783f5a34c80ba2bb20cb1660a72741d8f0275dce984b67038cdd7b05fe144fe97a134562dabaa53263c378d7f2bb0459f8cdc31fb13884cc03136133116c672b SHA512 31f848aeca7afb1b3f2d5f4e1d1ddea40715acf7835ae2e1dd8111153087ffdb02c3e423a9418fb790e4459385b19b16609cc413d70443f49030111a9df760c8
diff --git a/dev-util/ostree/metadata.xml b/dev-util/ostree/metadata.xml
index da0ad42b602f..6aff9bd9b75d 100644
--- a/dev-util/ostree/metadata.xml
+++ b/dev-util/ostree/metadata.xml
@@ -32,10 +32,12 @@
 	<use>
 		<flag name="archive">Use libarchive</flag>
 		<flag name="dracut">Install dracut module</flag>
+		<flag name="gpg">Enable GPG support</flag>
 		<flag name="grub">Enable grub configuration generator</flag>
 		<flag name="http2">Use http2</flag>
 		<flag name="httpd">Enable ostree trivial-httpd entrypoint</flag>
 		<flag name="libmount">Use libmount</flag>
+		<flag name="sodium">Use libsodium for ed25519</flag>
 		<flag name="soup">Use libsoup for networking</flag>
 	</use>
 	<upstream>
diff --git a/dev-util/ostree/ostree-2018.9.ebuild b/dev-util/ostree/ostree-2018.9.ebuild
deleted file mode 100644
index 6f86406b9deb..000000000000
--- a/dev-util/ostree/ostree-2018.9.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Operating system and container binary deployment and upgrades"
-HOMEPAGE="https://ostree.readthedocs.io/en/latest/"
-SRC_URI="https://github.com/ostreedev/${PN}/releases/download/v${PV}/lib${P}.tar.xz -> ${P}.tar.xz"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="archive curl doc gnutls grub introspection libmount selinux ssl soup systemd zeroconf"
-RESTRICT="test"
-
-S="${WORKDIR}/lib${P}"
-COMMON_DEPEND="
-	app-arch/xz-utils:=
-	app-crypt/gpgme:=
-	dev-libs/glib:2=
-	dev-libs/libassuan:=
-	dev-libs/libgpg-error:=
-	dev-libs/openssl:0=
-	sys-apps/util-linux:=
-	sys-fs/fuse:0=
-	sys-libs/zlib:=
-
-	archive? ( app-arch/libarchive:= )
-	grub? ( sys-boot/grub:* )
-	ssl? (
-		gnutls? ( net-libs/gnutls:= )
-		!gnutls? ( dev-libs/openssl:= )
-	)
-	libmount? ( sys-apps/util-linux:= )
-	selinux? ( sys-libs/libselinux:= )
-	soup? ( net-libs/libsoup:= )
-	systemd? ( sys-apps/systemd:= )
-	zeroconf? ( net-dns/avahi:* )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	app-text/docbook-xsl-stylesheets
-	sys-devel/bison
-	dev-libs/libxslt
-	|| ( dev-util/glib-utils dev-libs/glib:2 )
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	curl? ( net-misc/curl:= )
-	introspection? ( dev-libs/gobject-introspection )
-	doc? ( dev-util/gtk-doc )
-"
-RDEPEND="${COMMON_DEPEND}"
-
-src_prepare() {
-	default
-	sed -Ee 's:(XSLT_STYLESHEET = ).*:\1/usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl:' \
-		-i Makefile.in Makefile-man.am || die
-
-	# The ostree-finalize-staged.path file is missing in ostree-2018.9.tar.xz.
-	[[ -e src/boot/ostree-finalize-staged.path ]] && die
-	cat > src/boot/ostree-finalize-staged.path <<-EOF
-		# Copyright (C) 2018 Red Hat, Inc.
-		#
-		# This library is free software; you can redistribute it and/or
-		# modify it under the terms of the GNU Lesser General Public
-		# License as published by the Free Software Foundation; either
-		# version 2 of the License, or (at your option) any later version.
-		#
-		# This library is distributed in the hope that it will be useful,
-		# but WITHOUT ANY WARRANTY; without even the implied warranty of
-		# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-		# Lesser General Public License for more details.
-		#
-		# You should have received a copy of the GNU Lesser General Public
-		# License along with this library; if not, write to the
-		# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-		# Boston, MA 02111-1307, USA.
-
-		# For some implementation discussion, see:
-		# https://lists.freedesktop.org/archives/systemd-devel/2018-March/040557.html
-		[Unit]
-		Description=OSTree Monitor Staged Deployment
-		Documentation=man:ostree(1)
-
-		[Path]
-		PathExists=/run/ostree/staged-deployment
-
-		[Install]
-		WantedBy=multi-user.target
-		EOF
-}
-
-src_configure() {
-	unset ${!XDG_*} #657346 g-ir-scanner sandbox violation
-	econf \
-		--enable-man \
-		$(use_with archive libarchive) \
-		$(use_with curl) \
-		$(use_enable doc gtk-doc) \
-		$(use_enable introspection) \
-		$(use_with selinux ) \
-		$(use_with soup) \
-		$(use_with libmount) \
-		$(use ssl && { use gnutls && echo --with-crypto=gnutls || echo --with-crypto=openssl; }) \
-		$(use_with systemd libsystemd) \
-		$(use_with zeroconf avahi)
-}
diff --git a/dev-util/ostree/ostree-2018.9-r1.ebuild b/dev-util/ostree/ostree-2020.6.ebuild
index 77065eb10dda..9e56361e7f19 100644
--- a/dev-util/ostree/ostree-2018.9-r1.ebuild
+++ b/dev-util/ostree/ostree-2020.6.ebuild
@@ -23,16 +23,16 @@ COMMON_DEPEND="
 	app-arch/xz-utils
 	curl? ( net-misc/curl )
 	soup? ( net-libs/libsoup )
-	dev-libs/glib:2
 	dev-libs/libassuan
 	dev-libs/libgpg-error
+	dev-libs/glib:2
 	dracut? ( sys-kernel/dracut )
 	grub? ( sys-boot/grub:2= )
 	introspection? ( dev-libs/gobject-introspection )
 	ssl? (
 		gnutls? ( net-libs/gnutls )
 		!gnutls? ( dev-libs/openssl:0= ) )
-	sys-fs/fuse:0
+	>=sys-fs/fuse-2.9.2:0
 	sys-libs/zlib
 	libmount? ( sys-apps/util-linux )
 	selinux? ( sys-libs/libselinux )
@@ -57,39 +57,6 @@ src_prepare() {
 	sed -Ee 's:(XSLT_STYLESHEET = ).*:\1/usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl:' \
 		-i Makefile.in Makefile-man.am || die
 
-	# The ostree-finalize-staged.path file is missing in ostree-2018.9.tar.xz.
-	[ -e src/boot/ostree-finalize-staged.path ] && die
-	cat > src/boot/ostree-finalize-staged.path <<-EOF
-		# Copyright (C) 2018 Red Hat, Inc.
-		#
-		# This library is free software; you can redistribute it and/or
-		# modify it under the terms of the GNU Lesser General Public
-		# License as published by the Free Software Foundation; either
-		# version 2 of the License, or (at your option) any later version.
-		#
-		# This library is distributed in the hope that it will be useful,
-		# but WITHOUT ANY WARRANTY; without even the implied warranty of
-		# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-		# Lesser General Public License for more details.
-		#
-		# You should have received a copy of the GNU Lesser General Public
-		# License along with this library; if not, write to the
-		# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-		# Boston, MA 02111-1307, USA.
-
-		# For some implementation discussion, see:
-		# https://lists.freedesktop.org/archives/systemd-devel/2018-March/040557.html
-		[Unit]
-		Description=OSTree Monitor Staged Deployment
-		Documentation=man:ostree(1)
-
-		[Path]
-		PathExists=/run/ostree/staged-deployment
-
-		[Install]
-		WantedBy=multi-user.target
-	EOF
-
 	eautoreconf
 	default
 }
@@ -102,7 +69,7 @@ src_configure() {
 		$(use_with curl)
 		$(use_with dracut)
 		$(use_enable doc gtk-doc)
-		$(use_enable introspection)
+		$(usex introspection --enable-introspection={,} yes no)
 		$(use_enable http2)
 		$(use_enable httpd trivial-httpd-cmdline)
 		$(use_with selinux )
diff --git a/dev-util/ostree/ostree-2020.7.ebuild b/dev-util/ostree/ostree-2020.7.ebuild
new file mode 100644
index 000000000000..65675eb0f6bb
--- /dev/null
+++ b/dev-util/ostree/ostree-2020.7.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools systemd
+
+DESCRIPTION="Operating system and container binary deployment and upgrades"
+HOMEPAGE="https://ostreedev.github.io/ostree/"
+SRC_URI="https://github.com/ostreedev/ostree/releases/download/v${PV}/lib${P}.tar.xz -> ${P}.tar.xz"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+LICENSE="LGPL-2+"
+SLOT="0"
+
+IUSE="archive curl doc dracut gnutls +gpg grub http2 httpd introspection libmount libressl selinux sodium ssl soup systemd zeroconf"
+RESTRICT="test"
+REQUIRED_USE="httpd? ( || ( curl soup ) )"
+
+COMMON_DEPEND="
+	archive? ( app-arch/libarchive )
+	app-arch/xz-utils
+	curl? ( net-misc/curl )
+	soup? ( net-libs/libsoup )
+	dev-libs/libassuan
+	dev-libs/glib:2
+	dracut? ( sys-kernel/dracut )
+	gpg? (
+		app-crypt/gpgme
+		dev-libs/libgpg-error
+	)
+	grub? ( sys-boot/grub:2= )
+	introspection? ( dev-libs/gobject-introspection )
+	ssl? (
+		gnutls? ( net-libs/gnutls )
+		!gnutls? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:0= )
+		)
+	)
+	>=sys-fs/fuse-2.9.2:0
+	sys-libs/zlib
+	libmount? ( sys-apps/util-linux )
+	selinux? ( sys-libs/libselinux )
+	sodium? ( >=dev-libs/libsodium-1.0.14 )
+	systemd? ( sys-apps/systemd:0= )
+	zeroconf? ( net-dns/avahi[dbus] )"
+
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	doc? ( dev-util/gtk-doc )"
+
+RDEPEND="${COMMON_DEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	sys-devel/flex
+	sys-devel/bison
+	virtual/pkgconfig"
+
+S="${WORKDIR}/lib${P}"
+
+src_prepare() {
+	sed -Ee 's:(XSLT_STYLESHEET = ).*:\1/usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl:' \
+		-i Makefile.in Makefile-man.am || die
+	eautoreconf
+	default
+}
+
+src_configure() {
+	local econfargs=(
+		--enable-man
+		--enable-shared
+		$(use_with archive libarchive)
+		$(use_with curl)
+		$(use_with dracut)
+		$(use_enable doc gtk-doc)
+		$(usex introspection --enable-introspection={,} yes no)
+		$(use_with gpg gpgme)
+		$(use_enable http2)
+		$(use_enable httpd trivial-httpd-cmdline)
+		$(use_with selinux )
+		$(use_with soup)
+		$(use_with libmount)
+		$(use ssl && { use gnutls && echo --with-crypto=gnutls || echo --with-crypto=openssl; })
+		$(use_with sodium ed25519-libsodium)
+		$(use_with systemd libsystemd)
+		$(use_with zeroconf avahi)
+	)
+
+	if use systemd; then
+		econfargs+=(--with-systemdsystemunitdir="$(systemd_get_systemunitdir)")
+	fi
+
+	unset ${!XDG_*} #657346 g-ir-scanner sandbox violation
+	econf ${econfargs[*]}
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+	rm -f "${ED}/etc/grub.d/15_ostree"
+}
diff --git a/dev-util/packer/Manifest b/dev-util/packer/Manifest
index 6a8ac76a0ea5..7d4dbbcf9b95 100644
--- a/dev-util/packer/Manifest
+++ b/dev-util/packer/Manifest
@@ -2,8 +2,10 @@ DIST packer-1.4.0.tar.gz 9794922 BLAKE2B 2e1d817e0a3f549255ecd8693d6d99b2e45df2e
 DIST packer-1.4.5.tar.gz 13705057 BLAKE2B d23527e8bb0104e3f0206f5a82eb93fbe15a9542409bcce13cefd49fa83a47c0262f48e74ff951990211de9f85fc32efd41bbd4ed286b3462aed86df68afebc8 SHA512 b2a3ae27612c78fcfcb2ac655437faf2cff6e587fd10033b39ddaca8b92b634b93ecd0ae7e3ee43253ee716a2c0f7da532b3ae0ce33c59d1d3896f9187d9a657
 DIST packer-1.5.6.tar.gz 16037500 BLAKE2B 9409aad981b3494a442fc6854481853494b12b74532ed3ac8d210d4e275a8f4f18bfb6dcfd7c36c4e97b3d5ba0263155fc8f08592b0123705c5d341d9183e6eb SHA512 993f54a1bf98abd5bc450bafaf202fbbfbad009b661d49783ff82cba9891b8556340801680c0fdc33b90396a3101a2ed93a11798ad51c10d7bd5f81fef4f5a31
 DIST packer-1.6.1.tar.gz 17334870 BLAKE2B c6db96de6a96c337ca2b2e7f273be21b4410e272817622af849346f38fab7212119aec1fcfd71b0c67bb00e8aad879485fd21cd42d7054eab4a37251fccc3ae7 SHA512 3b4b21eac425fec44a47a5799dcb5387099de06b777906a4b7c5bf169c71d8b82ab4296a21c8b60daefa4546d5a814b8d9f23e4d2afcf0eb91c3338d8f327ce7
+DIST packer-1.6.5.tar.gz 17900733 BLAKE2B b267f5b861de9eb4fc88ab747560aef30825897e1f42038ff443185c6591afec039e12a4639ca22598704a7ada68b8af373c67f7391f9884566fd0f431b3c0ee SHA512 17df612ccac44f6ee987cfee0f5b0422768302a40e7e4177c47e427fd0aa09be136ceda40272e6a1cbdeb52587b5c93f2fe7158f787e19399149ee514fec001d
 EBUILD packer-1.4.0.ebuild 792 BLAKE2B 98101308b1243d57463057ac8be281bab376eb32c5b78156f3d00645335a5de62b71e3422fc14b4c8d4b33994563773e47970a9c671e4341c28e77e731680a0c SHA512 0529bbe8e372bcc7e89ceb7b2f3b3d6a14122d1b1c0276dde64f230430049c3c41f1d443df65ce1413713abf138d7f0eeec81b91909ef92aa675dc5facc59135
 EBUILD packer-1.4.5.ebuild 674 BLAKE2B 8a7aaa2252962053ab87a9c7c7aca766b7dc2328b74f545f55e04136bae9289eb3786cc42b1291578ec6eb2554e3813f6fec426246ddcb5cf7c2a19cfeacdc0a SHA512 0bb54a2f36020864c0ccafed3f6aa525a414ab9cdf3ad6417a6b791af6cfcfa2d7b6cbc1089275ce6a2368cbf5887fcb80a343e4d85fb184de657bec5a228951
 EBUILD packer-1.5.6.ebuild 674 BLAKE2B e434094f73b06347d1cba9e315290b26a2f6f32bfea078bcf4a657ff8769f413bf3724cf4fe12e439e5e162644d870cfdd282601b297bd195748a9a69b5fc579 SHA512 7088a701f7a71c9080a1d236d56091118d135b8f833fe998cf571ec95d931d65701aa86370b2cfb5d0e0bd0df56591598ab7fb893330e0577dd1af98d708ca8a
 EBUILD packer-1.6.1.ebuild 674 BLAKE2B e434094f73b06347d1cba9e315290b26a2f6f32bfea078bcf4a657ff8769f413bf3724cf4fe12e439e5e162644d870cfdd282601b297bd195748a9a69b5fc579 SHA512 7088a701f7a71c9080a1d236d56091118d135b8f833fe998cf571ec95d931d65701aa86370b2cfb5d0e0bd0df56591598ab7fb893330e0577dd1af98d708ca8a
+EBUILD packer-1.6.5.ebuild 697 BLAKE2B d3a064c070aeafd3284eb74b3ad93e7d2e3295426de77ef28d674ba273e6d91cafc12d7d95b0086dd7a0e2cf9a100f688e65fba0da102cd9f26b24f4e936febb SHA512 e67cb808d480047f76da9bae46fe5ce0066c04fa1f5f41ad30bff603e24af50d06bbef6e2092ef5bd203f6e16e92de6e9777e686c24f46742503bd60cf037860
 MISC metadata.xml 1377 BLAKE2B a2c25ec31f167d12a441da18cfa141e1d19001e2fbb0cd4df5d8c613edd0ebbc95190541b6586380dba6f62f6f4c4715ec729b22d4f30ffbfe1a7fccb13f5a8b SHA512 0f949311fffa40abd1cf6722068b210e1d06270d25698dbf17554722fcdff847dfedd6e47650a5091d2afa1ecf960e50937a2058150051a4af98a485ac9435b2
diff --git a/dev-util/packer/packer-1.6.5.ebuild b/dev-util/packer/packer-1.6.5.ebuild
new file mode 100644
index 000000000000..f7b69386e57d
--- /dev/null
+++ b/dev-util/packer/packer-1.6.5.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit go-module
+
+DESCRIPTION="A tool to create identical machine images for multiple platforms"
+HOMEPAGE="https://www.packer.io"
+SRC_URI="https://github.com/hashicorp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD-2 BSD-4 MIT MPL-2.0 unicode"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DOCS=( {README,CHANGELOG}.md )
+
+RESTRICT+=" test"
+
+src_compile() {
+	go build \
+		-ldflags "${go_ldflags}" \
+		-mod=vendor \
+		-work -o "bin/${PN}" ./ || die
+}
+
+src_install() {
+	dobin bin/packer
+
+	einstalldocs
+
+	insinto /usr/share/zsh/site-functions
+	doins contrib/zsh-completion/_packer
+}
diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest
index 21b581209cda..e2bafcb53a7c 100644
--- a/dev-util/perf/Manifest
+++ b/dev-util/perf/Manifest
@@ -5,8 +5,11 @@ AUX perf-5.4.7-propagate-cflags.patch 1502 BLAKE2B d35f94d10ecc2d384cae9084a7f84
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
 DIST linux-5.7.tar.xz 112690468 BLAKE2B b2b71e231507429b178b6b89be546c4a3ee2757f5d2c58b6137d383f16034a587225a75a9dbca6a01a433056ebe078487132c224e909a2971c9634687e47b1d1 SHA512 45bde01593f6147c8c169b9e46b4b56eee998142552ae0ff82f1dd21b1fd54f3b32f6283f6bd77ea717d374672167849e468c157f235d2f12f7d7816e4623bf6
 DIST linux-5.8.tar.xz 114459324 BLAKE2B 7bd97f8fa4527840754434414c07283e89731dc8ebb1e95fa5bc1469a60af1122582c0d3b6e262e77882f023190068df3537bd8b65964b3caa820bb2c8e579c7 SHA512 45a53ecf351096ef6e98242cca4228b8da9b9139ecc6963695791ea6fb7a9484a4e1c19dcca7ce7cbfdfa49de0451b70973bb078f12bdae9cbaddbc3f8092556
+DIST linux-5.9.tar.xz 115507140 BLAKE2B e8d11472d63a9f8409ca12a2e8c97c6963a3d4516b5a398b627d6ece565584526f9b5a1377a2fa4bd184c09c7db94c987428bc5d52df0c788464a67e9e8d6dcb SHA512 d3d92ce4246bad74c9a784212f160d98449b1e8793970c2c308276568d852b8effe0528686bdb87d55d691f09a826abf7938d69bdd4759ce65ddd5c05ffe4eca
 DIST patch-5.4.20.xz 776552 BLAKE2B bad2a95ed8521ac5c379fe91e16d60b2a38de19b9239755084621e5230677b232ec4cf9e2e8161c0022daff43fdbb37d5b5b5bfdc9e932ef3a860bcd17f640f8 SHA512 65fbcdbd41e35c17601ff15bbe33933be2ab7a694aa181a0b802cc11c1c653c9b688dbb382076cbad05983a0c07467955c035ae25f5175f7ce5bc24339303d77
+DIST patch-5.9.9.xz 502816 BLAKE2B 104fa2ecaac3c543662b891de22cb881a917320317d58dcaeb6b6826e3f0296126ab5177cc7a44a438c15d3ae9cab116ff6926cce9d5e4d310df99fca0d9b909 SHA512 87852bc4d08cd5e82c7de9a8c8d50c1b4c67eed7157bfe1034d279370ff21a194f082f126d49812f84ec726100c5d97b3d908994e92c2cbfd231a4ac851babe3
 EBUILD perf-5.4.20.ebuild 6651 BLAKE2B e1a091114d71ba1c01f838b8d5ff372e2adad012769b973a2e79d662f6c5f6ed6fd97b2f7be880bfc57fbb99c549c487a084bf2450a935dc34ef22725268047a SHA512 e14917b4e051d3734fa515f3dbf61a2fe2cfdbe5b3aed29b9ce3b05e70609a13276d5f8fd0522f0b4addca16abdd986fb70b16d2b51f1204d02df848b64e6138
 EBUILD perf-5.7-r1.ebuild 6481 BLAKE2B 049d8502779dcc2b3f80cff18ab9795855495ce13342ab0394f29c22d552f45652c7faf0b19e24953180d5851167c875b397540375e3db0f66141863851387ab SHA512 66b7922dd0b77f2ee974695bbc6c2330c06b523b1cbc0d0dac0bf16f32489cb4266152267b70ee6130ad252075fac7f3858e5dc222e06d6ab2a8f2a10344f52e
-EBUILD perf-5.8.ebuild 6481 BLAKE2B 049d8502779dcc2b3f80cff18ab9795855495ce13342ab0394f29c22d552f45652c7faf0b19e24953180d5851167c875b397540375e3db0f66141863851387ab SHA512 66b7922dd0b77f2ee974695bbc6c2330c06b523b1cbc0d0dac0bf16f32489cb4266152267b70ee6130ad252075fac7f3858e5dc222e06d6ab2a8f2a10344f52e
-MISC metadata.xml 1355 BLAKE2B adf93b8b750786b9c181b5f4b4477883a365a07201da711d9ea535321d45b9c656397c46bd5f64a740d83e8acf4f2fea837a5a1eac754e9aa9f09692fe1d4d2b SHA512 3e489bb5b3556255d68bcffb3d7a377951da0470ea8e0a89dbc952d0029083fba7f7fd3c6f8a725bfa44c6e4d51871e2376b251f44a4295302be167d55dffb9f
+EBUILD perf-5.8.ebuild 6647 BLAKE2B 961f9690951c762298aa6d87371ce27079bf5387e3f470d6ffa90e8233fa9e1823aeb975658079ce165893420d4a980082414dc28befce63fb522a2250fe3c3e SHA512 39ebe613bafbeb9a2d7544e60e68b15645d51b8514b05e96f4fae8e2f4da0e7bb66059dcefb55e75c2e07c0bda2539468d70dc09d2e08b28fc1bc53c79337258
+EBUILD perf-5.9.9.ebuild 6860 BLAKE2B 1803c9d7d4f1387a1c1d68d16618d2575631566d60a77420aa44809d910a5f1f1982c3a3bfad1e31f3aafa9dfacf4b81536b5837cb542f920007a2b715ff172c SHA512 26d047b194db438875a348317c90fe71550f9523b3c81a26de48b91e0157b89e83ce8a239c63dad622e67f58c7337398c476d88d8aec402f8a5bff07b450a8e9
+MISC metadata.xml 1506 BLAKE2B 3f82b3824ed6e126239ccedc332b79b450a695df6149b094b05674e6bf99c1300919fd7046bc47b62a39f879cfaa72d1f496f46c2f6b76aded8ef154b3ae5a2d SHA512 ba7560b91456c4930c44427865859512166e747002fb4e5331530a2fd2b40f0828870ec59f21abb2836b6c51c70ddf77a820d475f7f8f97a03737c7178b5d8d6
diff --git a/dev-util/perf/metadata.xml b/dev-util/perf/metadata.xml
index 6755b7632512..279962a1a529 100644
--- a/dev-util/perf/metadata.xml
+++ b/dev-util/perf/metadata.xml
@@ -1,41 +1,42 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>naota@gentoo.org</email>
-	</maintainer>
-	<maintainer type="person">
-		<email>dlan@gentoo.org</email>
-		<name>Yixun Lan</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>amadio@gentoo.org</email>
-		<name>Guilherme Amadio</name>
-	</maintainer>
-	<use>
-		<flag name="clang">Enable builtin clang and LLVM support</flag>
-		<flag name="demangle">
-			Enable C++ symbol name demangling, using libbfd from
-			<pkg>sys-devel/binutils</pkg>. When this flag is enabled, the
-			package will have to be rebuilt after every version bump of
-			binutils.
-		</flag>
-		<flag name="doc">
-			Build documentation and man pages. With this USE flag disabled,
-			the --help parameter for perf and its sub-tools will not be
-			available. This is optional because it depends on a few
-			documentation handling tools that are not always welcome on user
-			systems.
-		</flag>
-		<flag name="numa">Enable NUMA support</flag>
-		<flag name="perl">
-			Add support for Perl as a scripting language for perf tools.
-		</flag>
-		<flag name="systemtap">
-			Add support to define SDT event in perf tools.
-		</flag>
-		<flag name="unwind">
-			Use sys-libs/libunwind for frame unwinding support.
-		</flag>
-	</use>
+  <maintainer type="person">
+    <email>naota@gentoo.org</email>
+  </maintainer>
+  <maintainer type="person">
+    <email>dlan@gentoo.org</email>
+    <name>Yixun Lan</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>amadio@gentoo.org</email>
+    <name>Guilherme Amadio</name>
+  </maintainer>
+  <use>
+    <flag name="clang">Enable builtin clang and LLVM support</flag>
+    <flag name="demangle">
+      Enable C++ symbol name demangling, using libbfd from
+      <pkg>sys-devel/binutils</pkg>. When this flag is enabled, the
+      package will have to be rebuilt after every version bump of
+      binutils.
+    </flag>
+    <flag name="doc">
+      Build documentation and man pages. With this USE flag disabled,
+      the --help parameter for perf and its sub-tools will not be
+      available. This is optional because it depends on a few
+      documentation handling tools that are not always welcome on user
+      systems.
+    </flag>
+    <flag name="libpfm">Enable <pkg>dev-libs/libpfm</pkg> support</flag>
+    <flag name="numa">Enable NUMA support</flag>
+    <flag name="perl">
+      Add support for Perl as a scripting language for perf tools.
+    </flag>
+    <flag name="systemtap">
+      Add support to define SDT event in perf tools.
+    </flag>
+    <flag name="unwind">
+      Use sys-libs/libunwind for frame unwinding support.
+    </flag>
+  </use>
 </pkgmetadata>
diff --git a/dev-util/perf/perf-5.8.ebuild b/dev-util/perf/perf-5.8.ebuild
index d0b9058a60c1..b7df33f4c961 100644
--- a/dev-util/perf/perf-5.8.ebuild
+++ b/dev-util/perf/perf-5.8.ebuild
@@ -215,7 +215,11 @@ src_install() {
 	rm -rv "${ED}"/usr/share/doc/perf-tip || die
 
 	if use gtk; then
-		mv "${ED}"/usr/$(get_libdir)/libperf-gtk.so \
+		local libdir
+		libdir="$(get_libdir)"
+		# on some arches it ends up in lib even on 64bit, ppc64 for instance.
+		[[ -f "${ED}"/usr/lib/libperf-gtk.so ]] && libdir="lib"
+		mv "${ED}"/usr/${libdir}/libperf-gtk.so \
 			"${ED}"/usr/libexec/perf-core || die
 	fi
 
diff --git a/dev-util/perf/perf-5.9.9.ebuild b/dev-util/perf/perf-5.9.9.ebuild
new file mode 100644
index 000000000000..4ab143e4afea
--- /dev/null
+++ b/dev-util/perf/perf-5.9.9.ebuild
@@ -0,0 +1,250 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit bash-completion-r1 estack eutils llvm toolchain-funcs prefix python-r1 linux-info
+
+DESCRIPTION="Userland tools for Linux Performance Counters"
+HOMEPAGE="https://perf.wiki.kernel.org/"
+
+LINUX_V="${PV:0:1}.x"
+if [[ ${PV} == *_rc* ]] ; then
+	LINUX_VER=$(ver_cut 1-2).$(($(ver_cut 3)-1))
+	PATCH_VERSION=$(ver_cut 1-3)
+	LINUX_PATCH=patch-${PV//_/-}.xz
+	SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH}
+		https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
+elif [[ ${PV} == *.*.* ]] ; then
+	# stable-release series
+	LINUX_VER=$(ver_cut 1-2)
+	LINUX_PATCH=patch-${PV}.xz
+	SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
+else
+	LINUX_VER=${PV}
+	SRC_URI=""
+fi
+
+LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
+SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="audit clang crypt debug +demangle +doc gtk java libpfm lzma numa perl python slang systemtap unwind zlib"
+# TODO babeltrace
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+	doc? (
+		app-text/asciidoc
+		app-text/sgml-common
+		app-text/xmlto
+		sys-process/time
+	)"
+
+RDEPEND="audit? ( sys-process/audit )
+	crypt? ( dev-libs/openssl:0= )
+	clang? (
+		<sys-devel/clang-10:*
+		<sys-devel/llvm-10:*
+	)
+	demangle? ( sys-libs/binutils-libs:= )
+	gtk? ( x11-libs/gtk+:2 )
+	java? ( virtual/jre:* )
+	libpfm? ( dev-libs/libpfm )
+	lzma? ( app-arch/xz-utils )
+	numa? ( sys-process/numactl )
+	perl? ( dev-lang/perl:= )
+	python? ( ${PYTHON_DEPS} )
+	slang? ( sys-libs/slang )
+	systemtap? ( dev-util/systemtap )
+	unwind? ( sys-libs/libunwind )
+	zlib? ( sys-libs/zlib )
+	dev-libs/elfutils"
+
+DEPEND="${RDEPEND}
+	>=sys-kernel/linux-headers-4.19
+	${LINUX_PATCH+dev-util/patchutils}
+	java? ( virtual/jdk )
+"
+
+S_K="${WORKDIR}/linux-${LINUX_VER}"
+S="${S_K}/tools/perf"
+
+CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS"
+
+pkg_pretend() {
+	if ! use doc ; then
+		ewarn "Without the doc USE flag you won't get any documentation nor man pages."
+		ewarn "And without man pages, you won't get any --help output for perf and its"
+		ewarn "sub-tools."
+	fi
+}
+
+pkg_setup() {
+	use clang && LLVM_MAX_SLOT=9 llvm_pkg_setup
+}
+
+src_unpack() {
+	local paths=(
+		tools/arch tools/build tools/include tools/lib tools/perf tools/scripts
+		scripts include lib "arch/*/lib"
+	)
+
+	# We expect the tar implementation to support the -j option (both
+	# GNU tar and libarchive's tar support that).
+	echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
+	tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
+		"${paths[@]/#/linux-${LINUX_VER}/}" || die
+
+	if [[ -n ${LINUX_PATCH} ]] ; then
+		eshopts_push -o noglob
+		ebegin "Filtering partial source patch"
+		filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} \
+			> ${P}.patch
+		eend $? || die "filterdiff failed"
+		eshopts_pop
+	fi
+
+	local a
+	for a in ${A}; do
+		[[ ${a} == ${LINUX_SOURCES} ]] && continue
+		[[ ${a} == ${LINUX_PATCH} ]] && continue
+		unpack ${a}
+	done
+}
+
+src_prepare() {
+	default
+	if [[ -n ${LINUX_PATCH} ]] ; then
+		pushd "${S_K}" >/dev/null || die
+		eapply "${WORKDIR}"/${P}.patch
+		popd || die
+	fi
+
+	# Drop some upstream too-developer-oriented flags and fix the
+	# Makefile in general
+	sed -i \
+		-e "s:\$(sysconfdir_SQ)/bash_completion.d:$(get_bashcompdir):" \
+		"${S}"/Makefile.perf || die
+	# A few places still use -Werror w/out $(WERROR) protection.
+	sed -i -e 's:-Werror::' \
+		"${S}"/Makefile.perf "${S_K}"/tools/lib/bpf/Makefile || die
+
+	# Avoid the call to make kernelversion
+	sed -i -e '/PERF-VERSION-GEN/d' Makefile.perf || die
+	echo "#define PERF_VERSION \"${PV}\"" > PERF-VERSION-FILE
+
+	# The code likes to compile local assembly files which lack ELF markings.
+	find -name '*.S' -exec sed -i '$a.section .note.GNU-stack,"",%progbits' {} +
+
+	# Fix shebang to use python from prefix
+	if [[ -n "${EPREFIX}" ]]; then
+		hprefixify ${S_K}/scripts/bpf_helpers_doc.py
+	fi
+}
+
+puse() { usex $1 "" no; }
+perf_make() {
+	# The arch parsing is a bit funky.  The perf tools package is integrated
+	# into the kernel, so it wants an ARCH that looks like the kernel arch,
+	# but it also wants to know about the split value -- i386/x86_64 vs just
+	# x86.  We can get that by telling the func to use an older linux version.
+	# It's kind of a hack, but not that bad ...
+
+	# LIBDIR sets a search path of perf-gtk.so. Bug 515954
+
+	local arch=$(tc-arch-kernel)
+	local java_dir
+	use java && java_dir="${EPREFIX}/etc/java-config-2/current-system-vm"
+	# FIXME: NO_CORESIGHT
+	# FIXME: NO_LIBBABELTRACE
+	emake V=1 VF=1 \
+		HOSTCC="$(tc-getBUILD_CC)" HOSTLD="$(tc-getBUILD_LD)" \
+		CC="$(tc-getCC)" CXX="$(tc-getCXX)" AR="$(tc-getAR)" LD="$(tc-getLD)" NM="$(tc-getNM)" \
+		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
+		prefix="${EPREFIX}/usr" bindir_relative="bin" \
+		tipdir="share/doc/${PF}" \
+		EXTRA_CFLAGS="${CFLAGS}" \
+		ARCH="${arch}" \
+		JDIR="${java_dir}" \
+		LIBCLANGLLVM=$(usex clang 1 "") \
+		LIBPFM4=$(usex libpfm 1 "") \
+		NO_AUXTRACE="" \
+		NO_BACKTRACE="" \
+		NO_CORESIGHT=1 \
+		NO_DEMANGLE=$(puse demangle) \
+		NO_GTK2=$(puse gtk) \
+		feature-gtk2-infobar=$(usex gtk 1 "") \
+		NO_JVMTI=$(puse java) \
+		NO_LIBAUDIT=$(puse audit) \
+		NO_LIBBABELTRACE=1 \
+		NO_LIBBIONIC=1 \
+		NO_LIBBPF= \
+		NO_LIBCRYPTO=$(puse crypt) \
+		NO_LIBDW_DWARF_UNWIND= \
+		NO_LIBELF= \
+		NO_LIBNUMA=$(puse numa) \
+		NO_LIBPERL=$(puse perl) \
+		NO_LIBPYTHON=$(puse python) \
+		NO_LIBUNWIND=$(puse unwind) \
+		NO_SDT=$(puse systemtap) \
+		NO_SLANG=$(puse slang) \
+		NO_LZMA=$(puse lzma) \
+		NO_ZLIB= \
+		WERROR=0 \
+		LIBDIR="/usr/libexec/perf-core" \
+		"$@"
+}
+
+src_compile() {
+	# test-clang.bin not build with g++
+	if use clang; then
+		pushd "${S_K}/tools/build/feature/" || die
+		make V=1 CXX=${CHOST}-clang++ test-clang.bin || die
+		popd
+	fi
+	perf_make -f Makefile.perf
+	use doc && perf_make -C Documentation
+}
+
+src_test() {
+	:
+}
+
+src_install() {
+	_install_python_ext() {
+		perf_make -f Makefile.perf install-python_ext DESTDIR="${D}"
+	}
+
+	perf_make -f Makefile.perf install DESTDIR="${D}"
+
+	if use python; then
+		python_foreach_impl _install_python_ext
+	fi
+
+	if use gtk; then
+		local libdir
+		libdir="$(get_libdir)"
+		# on some arches it ends up in lib even on 64bit, ppc64 for instance.
+		[[ -f "${ED}"/usr/lib/libperf-gtk.so ]] && libdir="lib"
+		mv "${ED}"/usr/${libdir}/libperf-gtk.so \
+			"${ED}"/usr/libexec/perf-core || die
+	fi
+
+	dodoc CREDITS
+
+	dodoc *txt Documentation/*.txt
+
+	# perf needs this decompressed to print out tips for users
+	docompress -x /usr/share/doc/${PF}/tips.txt
+
+	if use doc ; then
+		HTML_DOCS="Documentation/*.html" einstalldocs
+		doman Documentation/*.1
+	fi
+}
diff --git a/dev-util/pkgconf/Manifest b/dev-util/pkgconf/Manifest
index 534c6a62b146..b1ca88c4a624 100644
--- a/dev-util/pkgconf/Manifest
+++ b/dev-util/pkgconf/Manifest
@@ -1,8 +1,8 @@
 DIST pkgconf-1.6.3.tar.xz 291216 BLAKE2B 04bf58590e2f0b37bac7b24b3d595ad08680e85647548cbd642495398d95706f9f738af5c6f9b9ad8801567caa20ade85d4c4d74179f08313420683cb1b34263 SHA512 437c5a5c9866e2047e62e0592639930b2420d4afd41d98cef51f3475165418a39e916477860025314828a6ee0a4eefc10fdf26bda66f80c291f324d9674fa5c1
 DIST pkgconf-1.7.2.tar.xz 292944 BLAKE2B dd0197afb75590e18b6ec8c76f9a7109edc3a0934b6b9ef7bf4006ffa73b0083d2a4aa120f2f3bd0a0e9d5fd564fd7d387aedeaa297fe72c63bc440518a51c6d SHA512 b0376178e93743fd844bdc94b5fa2678521ffe5022323e20f3c5196d500a87c3546d0edc2ac22e92cb528348116e2826d6f144bd7bd18d3f0afaa5cda74f25cd
 DIST pkgconf-1.7.3.tar.xz 293148 BLAKE2B b0fdad9e86c7e2aaf5f268de779730e55e14d6f0ddbec50f354b888aa9ca284f6d1d4c462f00b815cd6e0e17a3b41025ce77485f66a7d527f519a7b80283774d SHA512 37b6c4f9f3b93970e35b6970fde22fbbde65e7fa32a5634b3fdfc25cc1f33843582722ad13d9a8e96fd6768406fcbe86bf5feb76996ddd0bb66d6ff91e65f0b6
-EBUILD pkgconf-1.6.3.ebuild 1650 BLAKE2B 6411c28961a337ac9b48554a91df80d7ac108c2338b5159f4037bf8b585b987e793967316232c50d941583129ec6dc13f4a711c44bd5ff8a5f8512879fa90652 SHA512 f7cd4151e7317aa38c6df9220893493d741b3882ef89ceb437194f1bcf3df2e80b4c6a59b1ef75796f5aa8137aa40136b53c8f30a74c0f3841800f5d750f5814
+EBUILD pkgconf-1.6.3.ebuild 1667 BLAKE2B 17a7957cfa6994523620d43977f569d1e82c229ce67f478a3531e03b94bc40bbb0c1a76f1d01fe38b6369c700e0f8f79aa4c3aa92f4a9ef4cc1a0d139cb391f8 SHA512 bb283e3c29ca6bed10c5c4357c8e9456b7fc169881d8d708155e56bcfca2ebe5dc90a27f3e6c4b8a8289d6b15e7605d6faeafe651d8da0ed1e4ceaf1cd2eaef5
 EBUILD pkgconf-1.7.2.ebuild 1676 BLAKE2B 415269c2b15399d877263b95ea77f56f065ec2fc4047228dabeeea5e65df62cf91a47cd23dfa2865a67101e419b36b63c88df2ea804c0ce7cf87d836dcaf0fb3 SHA512 367c84f00478c27a93e3be87243af32693a072fc7e12ecb2ff0d0baf08ddcc16c2ec080904c58c8fdf7864d04fd33e0a79284274d357dcd349d75258662a5139
-EBUILD pkgconf-1.7.3.ebuild 1676 BLAKE2B 415269c2b15399d877263b95ea77f56f065ec2fc4047228dabeeea5e65df62cf91a47cd23dfa2865a67101e419b36b63c88df2ea804c0ce7cf87d836dcaf0fb3 SHA512 367c84f00478c27a93e3be87243af32693a072fc7e12ecb2ff0d0baf08ddcc16c2ec080904c58c8fdf7864d04fd33e0a79284274d357dcd349d75258662a5139
-EBUILD pkgconf-9999.ebuild 1676 BLAKE2B 415269c2b15399d877263b95ea77f56f065ec2fc4047228dabeeea5e65df62cf91a47cd23dfa2865a67101e419b36b63c88df2ea804c0ce7cf87d836dcaf0fb3 SHA512 367c84f00478c27a93e3be87243af32693a072fc7e12ecb2ff0d0baf08ddcc16c2ec080904c58c8fdf7864d04fd33e0a79284274d357dcd349d75258662a5139
+EBUILD pkgconf-1.7.3-r1.ebuild 1777 BLAKE2B 80bea4f66676f4fae0d03f8b6e8cddd628c5c5bd6ec70384228906fcea57f15f03289cce73210903368741534b96f5b08e7a10363c33bbf7da601e55c123e699 SHA512 d1882bc7898119485ff5c133189146eb96478cc7f630d19931ca55208d38d6b703c557dc6f6265759d1b8f6e5a731b7e4534caa95395a99ccce50d0714dfecf4
+EBUILD pkgconf-9999.ebuild 1766 BLAKE2B c470aa4fc8eeb6c2e61c636eab8d9b1684eda76d1d7f2c5734e5159ae9ab4f905adbdb372166ba38ab13bc5bf83c92022c07023a0ca7ac512baa0c348086ff1a SHA512 c101e8a92926436c40a82da763c6a92a43e503b10014cd59ed202b1ea257de52f12e5c8d1bd91ea23aa07880e11a0bf8fbaea89009cf563fa9495e3b8b8a9efe
 MISC metadata.xml 605 BLAKE2B 316f82c4daabf91792e48e82973daaf0b0af972f7760636990e64c94e5e68b41b7cf65fa5d15387ce81a25926a5ffea19519ffe29a1ae487046d973708495b75 SHA512 68a71f55636e987c721da3c54451c75068e3261a0b462189fed45309bb4c286d0ec00a8a29962969b54ac8e31a13a34167cfc3fd44f5da8b84e4ce36eb5b4b10
diff --git a/dev-util/pkgconf/pkgconf-1.6.3.ebuild b/dev-util/pkgconf/pkgconf-1.6.3.ebuild
index 114a0bfd9d0a..1338eee18e3d 100644
--- a/dev-util/pkgconf/pkgconf-1.6.3.ebuild
+++ b/dev-util/pkgconf/pkgconf-1.6.3.ebuild
@@ -54,7 +54,7 @@ src_prepare() {
 
 multilib_src_configure() {
 	local ECONF_SOURCE="${S}"
-	econf
+	econf --disable-static
 }
 
 multilib_src_test() {
diff --git a/dev-util/pkgconf/pkgconf-1.7.3.ebuild b/dev-util/pkgconf/pkgconf-1.7.3-r1.ebuild
index 40e4e28319d4..858af22520ed 100644
--- a/dev-util/pkgconf/pkgconf-1.7.3.ebuild
+++ b/dev-util/pkgconf/pkgconf-1.7.3-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://git.sr.ht/~kaniini/pkgconf"
 else
 	SRC_URI="http://distfiles.dereferenced.org/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 fi
 
 DESCRIPTION="pkg-config compatible replacement with no dependencies other than ANSI C89"
@@ -30,11 +30,7 @@ BDEPEND="
 	)
 "
 RDEPEND="
-	pkg-config? (
-		!dev-util/pkgconfig
-		!dev-util/pkg-config-lite
-		!dev-util/pkgconfig-openbsd[pkg-config]
-	)
+	pkg-config? ( !dev-util/pkgconfig )
 "
 
 MULTILIB_CHOST_TOOLS=(
@@ -54,7 +50,12 @@ src_prepare() {
 
 multilib_src_configure() {
 	local ECONF_SOURCE="${S}"
-	econf --disable-static
+	local args=(
+		--disable-static
+		--with-system-includedir="${EPREFIX}/usr/include"
+		--with-system-libdir="${EPREFIX}/$(get_libdir):${EPREFIX}/usr/$(get_libdir)"
+	)
+	econf "${args[@]}"
 }
 
 multilib_src_test() {
diff --git a/dev-util/pkgconf/pkgconf-9999.ebuild b/dev-util/pkgconf/pkgconf-9999.ebuild
index 40e4e28319d4..a29e166995b7 100644
--- a/dev-util/pkgconf/pkgconf-9999.ebuild
+++ b/dev-util/pkgconf/pkgconf-9999.ebuild
@@ -30,11 +30,7 @@ BDEPEND="
 	)
 "
 RDEPEND="
-	pkg-config? (
-		!dev-util/pkgconfig
-		!dev-util/pkg-config-lite
-		!dev-util/pkgconfig-openbsd[pkg-config]
-	)
+	pkg-config? ( !dev-util/pkgconfig )
 "
 
 MULTILIB_CHOST_TOOLS=(
@@ -54,7 +50,12 @@ src_prepare() {
 
 multilib_src_configure() {
 	local ECONF_SOURCE="${S}"
-	econf --disable-static
+	local args=(
+		--disable-static
+		--with-system-includedir="${EPREFIX}/usr/include"
+		--with-system-libdir="${EPREFIX}/$(get_libdir):${EPREFIX}/usr/$(get_libdir)"
+	)
+	econf "${args[@]}"
 }
 
 multilib_src_test() {
diff --git a/dev-util/promu/Manifest b/dev-util/promu/Manifest
index 2d2000d0f3e0..5e99e9c3077a 100644
--- a/dev-util/promu/Manifest
+++ b/dev-util/promu/Manifest
@@ -1,3 +1,5 @@
 DIST promu-0.5.0.tar.gz 643970 BLAKE2B b61e8421b5e68f3cd0ec125faadf64c7491f54cfe03de9d6497cb627e5d548b58fafe735c76a5a86a55489aea56dffb6e02d52acd1ca977ea32ec974f34475ac SHA512 b895c0b5b5a33bd0c2372e8c1c698b8548b1b7086849161ffa99bf9718f4b7f3a57bcf218681d84e4cc5ef31ef39df7e6c59345a84441369ec3ec402999ac4de
-EBUILD promu-0.5.0.ebuild 680 BLAKE2B 4a27ba78a6a643c87aab31023b9ac82038bdd2d876bccecc6fc6863682feb7cfee801ecd31fbd99f050acad23a35065f7c8c5129d950837931d333df80163577 SHA512 4c3c1d54cacda62778366d6842c47bfe948acc3a61dc102e0ef73b5f5a46112f7219112d8c03ed511189e2f764e963daa624150053f2409629ad34f7a72959ba
+DIST promu-0.6.1.tar.gz 1704561 BLAKE2B 40947a8a2cd470456db2c47f1208ef7dc009b102fbc0c2a749f99271881ae6f4009d616d977f504a60795e7844271350e5e44423e12bb8633e441dd3ade45b24 SHA512 58983905a0da911f2142e2cf89b241320abfdbe62568378355786f606b3e319322722c25d3fc7b7bd127dc916df9f79684ba3f28455a59b5ee73f7c455fba351
+EBUILD promu-0.5.0.ebuild 692 BLAKE2B 1e48f2a5623f23f99dcaed0df8cf52414881eadd5fce9a1c531d9ce4136bc85bd63d58d4d02fe3a19403c94bd3c8ee86e2c54bc2ca76d8fe31952cf6866eed32 SHA512 94c364c71829fb9ec92f9a7f64bda1dc394260eab987836f0761ac7c8eab94210ea07d938cc317a3c8e57d7f9caabd158d082de5691e9db7ab36dca6aa7ac589
+EBUILD promu-0.6.1.ebuild 693 BLAKE2B 0ed2a35210a3b0bd27ea8f00e90e67e0271c6cf7ff67859de047f0de34c7da468a07cd91a17ccbafedf1f2237771efe52e2a4580b5ae9a3354b8a0d08572e657 SHA512 4456dbb1baf97f51df4de0a961483dce892f81d7a4804092e80cc1372c1c0b14735ed5371eb919913512b137acbcf8b7e8c97219c76ef808968d0eb9382fd2b9
 MISC metadata.xml 325 BLAKE2B a6e231de6312601f0f92df0d3422b3527b0869cb484ab20933c5fcfba14a3545b122c83e855df882da09b9016109473230f3c7e8b48e9597ffe755916a3890b4 SHA512 51a31843f4341e22ae270e21d32a672ef5ca9739aa8a2066f9d9da2d0451e3f27c890ee1809bae98a68a73a9b4ab9114c4eb056a1fcabda35ea092bf76e9156a
diff --git a/dev-util/promu/promu-0.5.0.ebuild b/dev-util/promu/promu-0.5.0.ebuild
index 199f7360e01d..b4fa942d188e 100644
--- a/dev-util/promu/promu-0.5.0.ebuild
+++ b/dev-util/promu/promu-0.5.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/prometheus/promu/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0 BSD BSD-2 MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 IUSE=""
 
 RESTRICT+=" test"
diff --git a/dev-util/promu/promu-0.6.1.ebuild b/dev-util/promu/promu-0.6.1.ebuild
new file mode 100644
index 000000000000..61b8d779f6c1
--- /dev/null
+++ b/dev-util/promu/promu-0.6.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+
+EGIT_COMMIT="d3d03a28b678b6e3af03a86d1998bfc051a9d896"
+
+DESCRIPTION="Prometheus Utility Tool"
+HOMEPAGE="https://github.com/prometheus/promu"
+SRC_URI="https://github.com/prometheus/promu/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+RESTRICT+=" test"
+
+src_prepare() {
+	default
+	sed -i -e "s/{{.Revision}}/${EGIT_COMMIT}/" .promu.yml || die
+}
+
+src_compile() {
+	go build -mod=vendor . || die "compile failed"
+}
+
+src_install() {
+	dobin ${PN}
+	dodoc -r {doc,{README,CONTRIBUTING}.md}
+}
diff --git a/dev-util/qdevicemonitor/Manifest b/dev-util/qdevicemonitor/Manifest
index bf9722c3435f..941eba9e9dcd 100644
--- a/dev-util/qdevicemonitor/Manifest
+++ b/dev-util/qdevicemonitor/Manifest
@@ -3,6 +3,6 @@ AUX qdevicemonitor-1.0.1-endl-is-deprecated.patch 839 BLAKE2B 87f40970a9f4f068fd
 AUX qdevicemonitor-1.0.1-qt-5.11.patch 734 BLAKE2B 4aa5ca1b4581b5f65ac434595a2d61cbc7efbfe82e15b62e8e384da20442975cf4c4122505508f1551aac95366e6fd38c00f089ed241ccfd7c6e292132999276 SHA512 5a02bd095a027cb36d30bec0d169ab700fa13489fa2c65791e7714222e366dd3fa12a7c78e87a381440d2f6d54a5743e2e035a79a0b69acf5ed2f35317e5e1cf
 AUX qdevicemonitor-1.0.1-screen-geometry-is-deprecated.patch 1316 BLAKE2B ae704d2ebd35b4919f71a1ad0b8386aa3ae525edc31fa89eb286803356f8d27c1629d9c17e56af2c3378cd30c0771b9a40b498bec3ef27bc024744686e51cbd6 SHA512 78de2233a32b9aee0d37b836b5c15b9228f81a18414f9b5b78ba92b7c00642ddb1c1ba47de49daba88619f0d3c3e13a9ad7af05ca440951f69e7b8e320ef6a8a
 DIST qdevicemonitor-1.0.1.tar.gz 955052 BLAKE2B 9efbc2d5575b09056d2e52e3d6208a2cb70ba2cab0cede574faab9845decbf9758d3cc1ce41905ba0a915de12c8ac474fb2933522fa5e5be5543ab7c780ca5b9 SHA512 c393d8e33aa6234c2b62af8c25e5fc2e6ccacf9734b77500a512fbd584ecde723b9d5717dbe268d65565d3d30801d297236b3546263ba2689ba246d2b13b8f55
-EBUILD qdevicemonitor-1.0.1-r2.ebuild 1115 BLAKE2B 7a4b815218506b0338ccaed0b9e54475308b3b76609aa552c8e422dab44c9070f2fd0959003bda15bae966c3017c7773ce3e7cd5d64f2ff421592a989da3d0eb SHA512 4460208b426c43fe396ddf6bd473a85cc3dabcf5ebc04ae90e131236f207f37e147a32978598b8e866cff427b553a828710d4d2237732a321807918cdba7a623
+EBUILD qdevicemonitor-1.0.1-r2.ebuild 1135 BLAKE2B af435aa2a1fede750d5bb0b465bd5e54d99c157981c12b1427f4e8d76f32d0218a96becec4a56283e727d17edbac71c5da67d8102b4d58aa7bec9f8fabfaeafc SHA512 f3cdd756461c34ea4bd31c8c8cb0c62ee7389a87c23f85dacae929f19d056a8a43c9d68744a5d33ff130423bb0b828b4a4a2d020d19fa826e8f290bc07bb5aba
 EBUILD qdevicemonitor-9999.ebuild 915 BLAKE2B e05fb16f77410c0478ad212b0ae18616cc8c98072b1c06e81163df9fa55694af652eeaf6d5aba943ceb9c999187210922827d12d4cd41425279e1ecad8ef5fdc SHA512 4088257b67415a9ec932ab62b2ecdaada1c544df2f828279249a49b5346a8fa3dd906561cf2549212e0caebcac8b43c7c8cf725d01c9c778193a0de9b3f16be9
 MISC metadata.xml 462 BLAKE2B 73aba43e52e799e289409d8c39de41eac87c5049a13ec1bac10ba66c309ff286d09708b30d8ee5362bb9be7e04053ec85d13628329286bfbfa374a2694e84c02 SHA512 c5211a1c7bb8b223854560f45bbdf117e92aa17a513b59ccbea2670c7334e3e1850244c636348f61f0200380601a38a8c0a833c36f9d291984ef0ec643fd41ec
diff --git a/dev-util/qdevicemonitor/qdevicemonitor-1.0.1-r2.ebuild b/dev-util/qdevicemonitor/qdevicemonitor-1.0.1-r2.ebuild
index 0dbd37d4f29c..29ec20c4ba08 100644
--- a/dev-util/qdevicemonitor/qdevicemonitor-1.0.1-r2.ebuild
+++ b/dev-util/qdevicemonitor/qdevicemonitor-1.0.1-r2.ebuild
@@ -24,6 +24,7 @@ RDEPEND="
 	app-pda/usbmuxd
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
 	dev-util/android-tools"
 DEPEND="${RDEPEND}"
 
diff --git a/dev-util/radare2/Manifest b/dev-util/radare2/Manifest
index a94b34f9324b..3c775cfa37a4 100644
--- a/dev-util/radare2/Manifest
+++ b/dev-util/radare2/Manifest
@@ -1,6 +1,4 @@
-DIST radare2-4.5.0.tar.gz 8265716 BLAKE2B 5288b393eb40f0f9355ad44a102a768924775ce11d126477d89a77d4dbb885556371125ea9f54ce81216bcef25387b816ab679b99a2e6c31c7f48db13ccc4774 SHA512 84d4ffc28f499f4360f57f31ad1b1f4b2a14e7fcbde7198bfb9ec4a85ac6606ceb5b28602624d6419b14b1586afd50330ace6232a183d7bfb876fefe07ea7bf4
 DIST radare2-4.5.1.tar.gz 8266567 BLAKE2B 0d23c1d47dd79ffd9398ca7b2c8b383ba6a7e3ec662046d1111ab34cabcdaaf1fdd449686433b3229e3c22c31c705530b0a85bbd22b5fc79891a5ad292ba0ff1 SHA512 f08a4cd1e0d65643463d9f9dbb1aacfe793c7b411ec820a18b75a5975d265cfc2cf91e593522c8823aa369098ded21415939acb07c84d8acd102889bf5aed899
-EBUILD radare2-4.5.0.ebuild 1279 BLAKE2B ed2ae3822a315473903b7dc937aa77bc21263df3e7895caf57268059d3b32a41e612d08748b8b693a7b2c4e5c206b6bbb7e5546091063e2ae1c0bbfd4aff0813 SHA512 7754bfe01014c55e12a870fcd078748c8e1ee5ba2746f704aeff189712b53ebb295e0d524267abe7e667fd2f3e911061c05c8ad8fbd66be501a235298ec90330
 EBUILD radare2-4.5.1.ebuild 1279 BLAKE2B ed2ae3822a315473903b7dc937aa77bc21263df3e7895caf57268059d3b32a41e612d08748b8b693a7b2c4e5c206b6bbb7e5546091063e2ae1c0bbfd4aff0813 SHA512 7754bfe01014c55e12a870fcd078748c8e1ee5ba2746f704aeff189712b53ebb295e0d524267abe7e667fd2f3e911061c05c8ad8fbd66be501a235298ec90330
 EBUILD radare2-9999.ebuild 1159 BLAKE2B 60bd15815bc419615783ddd99a7a606c38cacc1c1727a32c1ab6c327172af4922dd1a67c226ad91877fe6a288b4a3240665e8832faa26aed06e18f6ed3577c84 SHA512 656e5f0b705f533d34ebbae4e43943c55d1b6fc8cb7abb808a1be8576719687993ef64aca6c134bd84fe611037d61bc985cfe5bc8c3074e7a93536d4f4721eab
 MISC metadata.xml 361 BLAKE2B f92dfa8905623cd3a34f0b61766ae071d09801460b8b2a13bf4c3bb0a4715446b61b79309101b032511851f9d7a15973bca97ce9d1ed667266e2d6a3485933a2 SHA512 fb01d7b5abd1966cf270227640d1e4197a09930afb6f03e18bf4f79ba74e73fd86782b99efbb710b697315c25b63e575ec6120fb1cedaa19d4562831f41f81a4
diff --git a/dev-util/radare2/radare2-4.5.0.ebuild b/dev-util/radare2/radare2-4.5.0.ebuild
deleted file mode 100644
index 302e356bc8b9..000000000000
--- a/dev-util/radare2/radare2-4.5.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 eutils toolchain-funcs
-
-DESCRIPTION="unix-like reverse engineering framework and commandline tools"
-HOMEPAGE="http://www.radare.org"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/radareorg/radare2"
-else
-	SRC_URI="https://github.com/radareorg/radare2/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="ssl libressl"
-
-RDEPEND="
-	dev-libs/capstone:0=
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_configure() {
-	# Ideally these should be set by ./configure
-	tc-export CC AR LD OBJCOPY RANLIB
-	export HOST_CC=${CC}
-
-	econf \
-		--without-libuv \
-		--with-syscapstone \
-		$(use_with ssl openssl)
-}
-
-src_install() {
-	default
-
-	insinto /usr/share/zsh/site-functions
-	doins doc/zsh/_*
-
-	newbashcomp doc/bash_autocompletion.sh "${PN}"
-	bashcomp_alias "${PN}" rafind2 r2 rabin2 rasm2 radiff2
-
-	# a workaround for unstable $(INSTALL) call, bug #574866
-	local d
-	for d in doc/*; do
-		if [[ -d $d ]]; then
-			rm -rfv "$d" || die "failed to delete '$d'"
-		fi
-	done
-}
diff --git a/dev-util/rbtools/Manifest b/dev-util/rbtools/Manifest
index 490a523db136..1c0a103d2ff3 100644
--- a/dev-util/rbtools/Manifest
+++ b/dev-util/rbtools/Manifest
@@ -1,5 +1,5 @@
 DIST RBTools-1.0.2.tar.gz 199085 BLAKE2B 469bc0a4d440437126af936c370d40eefa4c59717a955cd1853a1fc437554c251508fabc797b8c6631327fd14d43545cab3710fdbe50b1ad87d4df41d6cc96ba SHA512 2b05c310b877ad57589dedbad638956b81cc539bc793ccbe6f17608f6b979a0f2767998b1e941ef826a435cf0b034cbb2b7fdb6b937d83d5bb2fa9d2f45f70a1
 DIST RBTools-1.0.3.tar.gz 206634 BLAKE2B a058e9f501e5139fd550478dced02883f4fe49e3cfd9da961dfa53dd9552dee59e6a74d873f259ea3ce05884cfb0bf3e1a83d7ddcb696a0dc57139346ce81d91 SHA512 2462da124fb70df05712626451baa0294e82171bc860fce7dc0ddda7bee4ba6749d387c873b08c50f6936c539a13cd15c33bb02b7fd0f69a38c56723e24acbc8
 EBUILD rbtools-1.0.2.ebuild 738 BLAKE2B 7e597356b71c8919b80bab4c2753035fccdc66a8e68d5e6dc9a96b00db123fdf023479022c353e965534e821df08b570233e235410dd7618a8bac295119365ac SHA512 a91727a260eaa5669427b6afcd43638b0b4d6b13b954911ee3d8478052234c728dd9856e261aee9ee9a9fddf5fec22653346ed805017dc518fc129f76a77c9d4
-EBUILD rbtools-1.0.3.ebuild 740 BLAKE2B 2f214588fd5001c5594bb7b40211114e4399f0c9944f3f36178f3bf1d157502f6af861b8570b34a755ffe624d8660aeea06ecf158e0e7698eecb3201eb4432ee SHA512 f9dcf9d8731eba3681ca7bd19ce1bd7d301bbad06c11f462a4c6fbf783dd4578cebbcfe233c0fcecc8621ed16b023000022684d4e41efea3ef98ecd8bb7dd1d8
+EBUILD rbtools-1.0.3.ebuild 738 BLAKE2B 4770f27abb57ac0eabdfd689ed28a88ff9f4dde2a1e241f591cc6ff27a7eb25d6a21f5bf94eebe6a12fb7cecaa8f99130d9fc076c08f05a51ac250d1f6391de0 SHA512 bcc312c64cfed756cac4347f86642a2633bb3d003dd74ec9c1b4c9699ec79e30fdfe4af422457e809994b06231c67989e7e055819947bf2849fe558b3a8085f6
 MISC metadata.xml 217 BLAKE2B 92b85ca7d657eea200ee74bdafd4df6885c04b125bfdfb86650e2e1066c858aa8623f8b2a362780a200d7e33076129c9aab38a12f189c82d5ce1a9ae81257195 SHA512 1b17a615b7471a1e46b4c291aa7ff84348628ec0c3603e21db1994eb1e82ae28dc7e97321de022ccb7e4d2f411f4e7bcef5a79e93a4229126b9b58fb5d503478
diff --git a/dev-util/rbtools/rbtools-1.0.3.ebuild b/dev-util/rbtools/rbtools-1.0.3.ebuild
index 4ef4c539a64b..54e4b29bf4d8 100644
--- a/dev-util/rbtools/rbtools-1.0.3.ebuild
+++ b/dev-util/rbtools/rbtools-1.0.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://downloads.reviewboard.org/releases/${MY_PN}/$(ver_cut 1-2)/${MY
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-util/re2c/Manifest b/dev-util/re2c/Manifest
index 18113c832a29..75f1424b4aaf 100644
--- a/dev-util/re2c/Manifest
+++ b/dev-util/re2c/Manifest
@@ -1,6 +1,3 @@
-AUX re2c-1.3-lexer-overflow.patch 1244 BLAKE2B d9f51ea520ca437f4a1cb9c9f788d0c5c76d48358ee2c9d8a821c40c53d7df8e34f97cfda0ccd17e4220600043349afb9d737a2444d58ece8d381f1d30807855 SHA512 19a9011c58107c136ef49a51a712125274f841f884ca76c5f2e25464b24c3a6477ff45752df20c5f508e21a2a55c7f4ce19bc6c7d9b7baecc07fced76ce87de1
-DIST re2c-1.3.tar.xz 1239280 BLAKE2B ae2a8fc323408dd31d39c352bd622d89d19178b7993618ea043bbfd32509fb7573d2b5b50663e100d24fc275fa479982cb1f66ed49638edca61f551fb653176d SHA512 c7084ab2399fb6b96cef74c1393715d90830f43b82b96af46feb71ef008c0215381c3dbea0b003ff810d869db6021e28001b9d588ad55c616642244b2da09c0e
 DIST re2c-2.0.3.tar.xz 1288996 BLAKE2B 76913a79ad9c237843ccbe86dd05db755da19fc89351b64d6ece6a9a8d53860f1cc12493748fca5b7391cddff4f4668295fb2613c257c128870ea2e7163811ed SHA512 893c533e9847a6236d55ae65e413ddc48b7531b89f5552a3ad79beeac079317ceca4c35710f3c2d88a6de5a3c0a5070a24a8cffb1b4277578a41697ea0e3bf8c
-EBUILD re2c-1.3-r1.ebuild 772 BLAKE2B 9a1c3ec7e9b1ab137802f9e95003820792cf7da85eca0d9ab46f30afd7d2883ca15ef070691d4364b151247295fea16e702d01fb1209e1346787613491e44a3e SHA512 0e26075418517031ee56bc22909db4968e1c15c1fb8417a510cd43803257c5363ef6c574b3ee9dd34cc6985bd294e0202a6de4164ecc90e080015a3eb1180755
-EBUILD re2c-2.0.3.ebuild 777 BLAKE2B 902099d5c0d1b9ddcf5824c5485a5f1db3bbf458c5054a8985c366b5c932304ff608506470fb2dcbe52574e408e0bd21e5e37ae13af0204e0e14ec6bf1f42978 SHA512 20637a4dd995ca88cc0325706e0b9daf84af791db322eaa71ba445f68ad62be74b78db6ea4c1337600cf23716301dd0280eb2b081eb3317924665c68ff46c437
+EBUILD re2c-2.0.3.ebuild 773 BLAKE2B fcf5a6abb8c8cc2f660f66c8ffde26869b3083ee0e4d194d8f789d123c8dbc9134b3b0fa24f568b27ef08db2043395aeff3e6eb0291587c7e8c4934c50e09da4 SHA512 2f36266f0db7c19e75bf10ac7c92a0da6568b64db782afe13cee0852fed1733b7e66d0189ed4eb8cabe7449c3f91b83144c648e52df39569b0c1f450bff12d8c
 MISC metadata.xml 476 BLAKE2B b2dad245e1cdcbb73e8b6e53442f7e9ec41337746c50f026c0fda68d57ebe10fb6193a26fcf9fca11e23570f44b104bd40d22fa1283fa91034f7cb792d436463 SHA512 e3018ee81606a018d66169cd142a17a34248587b77deb4baeb6daae6aca2d9a70095fb5dc2180d146043030631172f6fa17b3c8ddd5bebe85eebf6f3be79f9ab
diff --git a/dev-util/re2c/files/re2c-1.3-lexer-overflow.patch b/dev-util/re2c/files/re2c-1.3-lexer-overflow.patch
deleted file mode 100644
index 4222ef430c32..000000000000
--- a/dev-util/re2c/files/re2c-1.3-lexer-overflow.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-https://bugs.gentoo.org/718350
-
-From c4603ba5ce229db83a2a4fb93e6d4b4e3ec3776a Mon Sep 17 00:00:00 2001
-From: Ulya Trofimovich <skvadrik@gmail.com>
-Date: Fri, 17 Apr 2020 22:47:14 +0100
-Subject: [PATCH] Fix crash in lexer refill (reported by Agostino Sarubbo).
-
-The crash happened in a rare case of a very long lexeme that doen't fit
-into the buffer, forcing buffer reallocation.
-
-The crash was caused by an incorrect calculation of the shift offset
-(it was smaller than necessary). As a consequence, the data from buffer
-start and up to the beginning of the current lexeme was not discarded
-(as it should have been), resulting in less free space for new data than
-expected.
----
- src/parse/scanner.cc | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/src/parse/scanner.cc
-+++ b/src/parse/scanner.cc
-@@ -155,13 +155,14 @@ bool Scanner::fill(size_t need)
-         if (!buf) fatal("out of memory");
- 
-         memmove(buf, tok, copy);
--        shift_ptrs_and_fpos(buf - bot);
-+        shift_ptrs_and_fpos(buf - tok);
-         delete [] bot;
-         bot = buf;
- 
-         free = BSIZE - copy;
-     }
- 
-+    DASSERT(lim + free <= bot + BSIZE);
-     if (!read(free)) {
-         eof = lim;
-         memset(lim, 0, YYMAXFILL);
--- 
-2.26.1
-
diff --git a/dev-util/re2c/re2c-1.3-r1.ebuild b/dev-util/re2c/re2c-1.3-r1.ebuild
deleted file mode 100644
index d90e052b5214..000000000000
--- a/dev-util/re2c/re2c-1.3-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="tool for generating C-based recognizers from regular expressions"
-HOMEPAGE="http://re2c.org/"
-SRC_URI="https://github.com/skvadrik/re2c/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="debug"
-
-PATCHES=("${FILESDIR}"/${P}-lexer-overflow.patch)
-
-src_configure() {
-	econf \
-		ac_cv_path_BISON="no" \
-		$(use_enable debug)
-}
-
-src_install() {
-	default
-
-	docompress -x /usr/share/doc/${PF}/examples
-	dodoc -r README.md CHANGELOG examples
-}
diff --git a/dev-util/re2c/re2c-2.0.3.ebuild b/dev-util/re2c/re2c-2.0.3.ebuild
index d421fae7440c..aba4c616a4d6 100644
--- a/dev-util/re2c/re2c-2.0.3.ebuild
+++ b/dev-util/re2c/re2c-2.0.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/skvadrik/re2c/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug"
 
 src_configure() {
diff --git a/dev-util/redo/Manifest b/dev-util/redo/Manifest
index 342b35c87cc4..8e1b89948490 100644
--- a/dev-util/redo/Manifest
+++ b/dev-util/redo/Manifest
@@ -3,4 +3,4 @@ DIST redo-0.42c.tar.gz 195232 BLAKE2B b24969d71b247d02642340cebbf325e2ae68d4893d
 EBUILD redo-0.42a.ebuild 1213 BLAKE2B c6d164192bb11fc89a85285e7ebfbd6b665be255ae93e66866fded161077350b6f2dd69c84ae8779bf4f1bb991d654b92bd7bc99753a1f9849a1c8723aa6e67b SHA512 a455891117bdd88c6bfca6952ffb13ebc27d7fe5a52d437356b1540a57e9dec0b54ae7fbdb50f86c305a280e10c9b2dc714011bf8780583dbf4d3c72f1dcae5a
 EBUILD redo-0.42c.ebuild 1213 BLAKE2B c6d164192bb11fc89a85285e7ebfbd6b665be255ae93e66866fded161077350b6f2dd69c84ae8779bf4f1bb991d654b92bd7bc99753a1f9849a1c8723aa6e67b SHA512 a455891117bdd88c6bfca6952ffb13ebc27d7fe5a52d437356b1540a57e9dec0b54ae7fbdb50f86c305a280e10c9b2dc714011bf8780583dbf4d3c72f1dcae5a
 EBUILD redo-99999.ebuild 1165 BLAKE2B 39a1599939c4273cd1fa0c7541c55c02667932f7c68787abd10be5379ced05c860ffb9f2e2d2b298321b61c98e2e7aac7bb4144ddcc1c6f6e43aaa8076aac8f2 SHA512 a13fb769e4ddc7ad348e5063b9042c638ee6b37fcc0a48e91c3452923bac0ec4f5db744c096a454fc8f71b3fcdf5aed6067d307a2727eb98b58f7d0f6c297356
-MISC metadata.xml 210 BLAKE2B bb9591af5406abbf589664053ab6e5cb38933fe6ef97c11609405392b050b26cff8e94e04e85e5798124abd46283bee67b2a74923a5041616df15aaa9cff6da9 SHA512 f7cbe57a24b67a28696f91061ad8bd61d7d4cf3d59d20c3dcc6a4921e29672d00ecf3ece70a8813399d2467ebd626f8f829300e81fc722e9aaa527e213a5fb54
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/redo/metadata.xml b/dev-util/redo/metadata.xml
index 5ba62861f1c4..6f49eba8f496 100644
--- a/dev-util/redo/metadata.xml
+++ b/dev-util/redo/metadata.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>jer@gentoo.org</email>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/dev-util/rej/Manifest b/dev-util/rej/Manifest
index 713d1d453398..2123c25a2c10 100644
--- a/dev-util/rej/Manifest
+++ b/dev-util/rej/Manifest
@@ -1,3 +1,3 @@
 DIST rej-0.16.tar.gz 422796 BLAKE2B bfbf3b82d71247797485006ed3c032f4db078bfe9fc67c0c01ae15a3b85e913a0bd05867c91a9f3577eeae43c9c708aecab786a9912a24194d3faf7686a6dee5 SHA512 e216edf5559141c571f56265a499dbb4273b47e3a05305a13233d3fc7d9d02aca4a2305317fb467fee1b08ecba147dbe72516d71ba189f1dfeedb45faa525d46
 EBUILD rej-0.16-r1.ebuild 563 BLAKE2B 4869ab11c29f4e0405bcda1c36e7cfe95ec36fb13933dae8cced713732311f181257303f0b174f43c6eb17a8314c4435837ae30120608b3c6a0b0caaae8a4940 SHA512 97c413bcdd2357722a44ac91ab889ed2b9ecbf8bd61736185f495557e80e30ae8402ba0993f62214244337cbe0745ace7eb1c87f263225e6a6fefe867e196b6d
-MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/rej/metadata.xml b/dev-util/rej/metadata.xml
index a8fb43312942..6f49eba8f496 100644
--- a/dev-util/rej/metadata.xml
+++ b/dev-util/rej/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>jer@gentoo.org</email>
-<name>Jeroen Roovers</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/dev-util/rocm-cmake/Manifest b/dev-util/rocm-cmake/Manifest
index 929e50fc5d10..84540b8b8872 100644
--- a/dev-util/rocm-cmake/Manifest
+++ b/dev-util/rocm-cmake/Manifest
@@ -1,4 +1,6 @@
 DIST rocm-cmake-3.8.0.tar.gz 15823 BLAKE2B 321d31769cee254f9f9048104c7837fc6eb4a224d53e3e3ec18d5fa283f33cb116ece739a19f791cf62ac84f533933233461fd9e470b5c413363aa58fe23b57a SHA512 52e71033ef85b526edc00c1c11681c888ca7a50cf70a69f111ac2d7d32821340d8c812714a525711ff7ec54c8e7cbb79c4cb620a6e559699c509397ebf1b5886
+DIST rocm-cmake-3.9.0.tar.gz 15815 BLAKE2B 86fedeb90ee27367b5fcfe842009055ef073932823fe54c9c6b7dfc7d08e92165c6cb4befebee347645777948b8c24de0c90f2547648cadbd34d39de2da540ef SHA512 bda392023494929ae743a81afdb4b802a3f7728a101ec06dd49c2e1d1165a2306d25beda6a4ea7dfc0aeeeee3f8bad8949d5c897618a362262570d6582c789db
 EBUILD rocm-cmake-3.8.0.ebuild 731 BLAKE2B 463d3a82ab60695d46d43566435db7d3c8e09848a9d43b3c810a6c82628fa882deb81e94b134ec7b5661e4530dff9a9dd407043348bbcb100ad2d7318277a904 SHA512 6fdd1d769eaf846f8e582fa24316da54e6d4210a7b08094300930941d3bee8b671919a4589fb28d3ddb5df61f5ce6969b858de6a0c5fc9de7530e9351df9cd29
+EBUILD rocm-cmake-3.9.0.ebuild 731 BLAKE2B 463d3a82ab60695d46d43566435db7d3c8e09848a9d43b3c810a6c82628fa882deb81e94b134ec7b5661e4530dff9a9dd407043348bbcb100ad2d7318277a904 SHA512 6fdd1d769eaf846f8e582fa24316da54e6d4210a7b08094300930941d3bee8b671919a4589fb28d3ddb5df61f5ce6969b858de6a0c5fc9de7530e9351df9cd29
 EBUILD rocm-cmake-9999.ebuild 731 BLAKE2B 463d3a82ab60695d46d43566435db7d3c8e09848a9d43b3c810a6c82628fa882deb81e94b134ec7b5661e4530dff9a9dd407043348bbcb100ad2d7318277a904 SHA512 6fdd1d769eaf846f8e582fa24316da54e6d4210a7b08094300930941d3bee8b671919a4589fb28d3ddb5df61f5ce6969b858de6a0c5fc9de7530e9351df9cd29
 MISC metadata.xml 371 BLAKE2B 41c8b543a5928a1a337a4858ecb042011010df6e199b8c61cdbc8cb0f79e924cbd7ee8e7c2acf324d17d91176e2ef94b171f61faca35aef5469ad33326dba27c SHA512 ede90d9d5bbf97823fe93004207fd61a79dcea2651d00b5f520cb395868a17e238278cdd13113d1b2945de5ac9db9a1471c37812467dea201bf78fb662db58ab
diff --git a/dev-util/rocm-cmake/rocm-cmake-3.9.0.ebuild b/dev-util/rocm-cmake/rocm-cmake-3.9.0.ebuild
new file mode 100644
index 000000000000..a8e68baa5599
--- /dev/null
+++ b/dev-util/rocm-cmake/rocm-cmake-3.9.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/rocm-cmake/"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/RadeonOpenCompute/rocm-cmake/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/rocm-cmake-rocm-${PV}"
+fi
+
+DESCRIPTION="Radeon Open Compute CMake Modules"
+HOMEPAGE="https://github.com/RadeonOpenCompute/rocm-cmake"
+LICENSE="MIT"
+SLOT="0"
+RESTRICT="test"
+
+src_prepare() {
+	sed -e "s:set(ROCM_INSTALL_LIBDIR lib):set(ROCM_INSTALL_LIBDIR $(get_libdir)):" -i "${S}/share/rocm/cmake/ROCMInstallTargets.cmake" || die
+	cmake_src_prepare
+}
diff --git a/dev-util/rocminfo/Manifest b/dev-util/rocminfo/Manifest
index 9742c2cc651e..c4d537d27406 100644
--- a/dev-util/rocminfo/Manifest
+++ b/dev-util/rocminfo/Manifest
@@ -1,6 +1,8 @@
 DIST rocminfo-3.7.0.tar.gz 15104 BLAKE2B 728ce471e52dadca8b59aa3196c2f75933650e3002335014accd7f8eada19d4936a7404f908d50747a0e51faa8a65764200072cf598f9d0855a3052db8290160 SHA512 25a6a9216366e310ece9db50a21bc0eb7741760a7b46fa1818ee102557000348f430f9269e2ba9e872437dfafcb31ac563476e2bf83a10705fde8dd5fc854404
 DIST rocminfo-3.8.0.tar.gz 15103 BLAKE2B afa6a2cd3315b18f2711cf1de4701e672beac76d08548453f9377c865f2b108f4f50340f545a9040450c7acded3ac093d334908a7ceddba35c847136fe92aa77 SHA512 c75fa7a4116b9cfa75d6b7ff3920c85ad19fea09ab5f6a7abebde9cd184763905aea8684574f6b1919044806af8ab35a81d7f6010cbd0fb18b36699a182b5f39
+DIST rocminfo-3.9.0.tar.gz 15106 BLAKE2B 0be734ee03298a83892fb237f7b171c7bb5779d153efa2f49ceadd27a32709fd7f6fe4895d43c7d55763be6a5ddf22a4ab9c6b42e4f28946b0d35d44cd897d54 SHA512 aaa2feaad1e0c8583f5211d629934c270f30c046d4e4067c142ea5ddc4fba95c6719d38cd623d1f5190962ccbbfc63196a3f4618d84e9b223bc6ee8cc5544530
 EBUILD rocminfo-3.7.0.ebuild 614 BLAKE2B 06e1e5b14bd58c8ca3519a9b446fec7e6ce46043cbb0bfedd6bc22b9e45d3c41d03a135c742c5451aa3b23d3a811fe76dcd0d71ba29f8ea37b62b4626414c8c3 SHA512 523379bff77eee0cb15ff6fa529f724698fb4e3ea590af72555db46ae51644ecfc3c4ece36db2a3864314f66ec4bbe8fed954cccf4d1fb2afcbb8115b020a840
 EBUILD rocminfo-3.8.0.ebuild 614 BLAKE2B 06e1e5b14bd58c8ca3519a9b446fec7e6ce46043cbb0bfedd6bc22b9e45d3c41d03a135c742c5451aa3b23d3a811fe76dcd0d71ba29f8ea37b62b4626414c8c3 SHA512 523379bff77eee0cb15ff6fa529f724698fb4e3ea590af72555db46ae51644ecfc3c4ece36db2a3864314f66ec4bbe8fed954cccf4d1fb2afcbb8115b020a840
+EBUILD rocminfo-3.9.0.ebuild 614 BLAKE2B 06e1e5b14bd58c8ca3519a9b446fec7e6ce46043cbb0bfedd6bc22b9e45d3c41d03a135c742c5451aa3b23d3a811fe76dcd0d71ba29f8ea37b62b4626414c8c3 SHA512 523379bff77eee0cb15ff6fa529f724698fb4e3ea590af72555db46ae51644ecfc3c4ece36db2a3864314f66ec4bbe8fed954cccf4d1fb2afcbb8115b020a840
 EBUILD rocminfo-9999.ebuild 606 BLAKE2B 74046413f39f646c076f8cbc9d0a5d1373c3be8e303bd50767d6019d3b1a58a06d05ef0dbdacdcd079aeb519c28fc163c38246608024b9fc4225c99051d3b6df SHA512 20dcaa312421446d3ee1882f85babfdfd51a51dd598eae824b36d7fc8969da717f05685d436c59b61d2d1744479672a4de544667379a7fb9163c5e9637fab70c
 MISC metadata.xml 369 BLAKE2B 6549050343e744050fde68092a20018b058f5d2411b4f7dcb5ade0e7ea56e7f8f9f6a00040882f1384f01ed2f5b74a1d453c276c8d35aaa12021225f0c7c6346 SHA512 4b7e636a59c30446dfb02d82d80804706dbc04b464f7d7ce37340be1076a9723cb5ec164972dc07a325b69fefb1dc3026055fb5b87588b6b6fbaf4e9dfbc2ef9
diff --git a/dev-util/rocminfo/rocminfo-3.9.0.ebuild b/dev-util/rocminfo/rocminfo-3.9.0.ebuild
new file mode 100644
index 000000000000..6de4e9b7cca0
--- /dev/null
+++ b/dev-util/rocminfo/rocminfo-3.9.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/rocminfo/"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/RadeonOpenCompute/rocminfo/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/rocminfo-rocm-${PV}"
+fi
+
+DESCRIPTION="ROCm Application for Reporting System Info"
+HOMEPAGE="https://github.com/RadeonOpenCompute/rocminfo"
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+
+RDEPEND=">=dev-libs/rocr-runtime-${PV}"
+DEPEND="${RDEPEND}"
diff --git a/dev-util/rosdep/Manifest b/dev-util/rosdep/Manifest
index aa768acc086e..0c1d72ad3571 100644
--- a/dev-util/rosdep/Manifest
+++ b/dev-util/rosdep/Manifest
@@ -1,4 +1,5 @@
+AUX tests.patch 1578 BLAKE2B c83b381010e29052a51f9dfb9a9ac24e9076caa23194deb1c7062b56f83bd03dce6281038541cca6c9353c2eaf90b5bbd6eaa9447ae5868b3e56e4f870be3908 SHA512 da349f614bd497dbe1437eb841657183c1b623fb3d4a933c9fe0202dd1dab741cb962370efb56cb8f11f51b70da106033fa9aafbc9d8f36e3ec1729fe6b5ec74
 DIST rosdep-0.19.0.tar.gz 309029 BLAKE2B d4d9f607757c418f848a89987db6ff17a98719d0cacab49250abf45145a9f5b538d9442622ec3a8c3536061e82e624f25c9a7b777662b686167e2fdce88433ec SHA512 3e1d5829689646d583da2eaaf3b8bbddec3cb4ca3dc3941ee2697f6367510a4dcff11984fa1792a400f49132778d7869f0a8274e42bc8c04f2e326e6a663c494
-EBUILD rosdep-0.19.0.ebuild 1512 BLAKE2B cc0c8275ebbd36624498d22e21707b3e806d3036b128c9861dc1fa38f417d8bfd52334fef993c50458123c7b49c209418ed35178e9cfc18f96f1a8f7ac318a40 SHA512 f8437f1b3f89d4d3aaa41f70d24cff1b2e6c8286b4d78fb55cb968b99dc603acd23ae9323c4f54c6f68bcebed9ddd10109a9462b7dde07f602a166e963039cf5
-EBUILD rosdep-9999.ebuild 1512 BLAKE2B cc0c8275ebbd36624498d22e21707b3e806d3036b128c9861dc1fa38f417d8bfd52334fef993c50458123c7b49c209418ed35178e9cfc18f96f1a8f7ac318a40 SHA512 f8437f1b3f89d4d3aaa41f70d24cff1b2e6c8286b4d78fb55cb968b99dc603acd23ae9323c4f54c6f68bcebed9ddd10109a9462b7dde07f602a166e963039cf5
+EBUILD rosdep-0.19.0-r1.ebuild 1624 BLAKE2B b02379abc8277ca2d293141b3376fe6f18110b43336d5bf6fa624b40b9efdceb6e709197bd7c60f01f0f510cf1338b0893472d93eda16d483126df7092494dfd SHA512 84a81ca80cfc28c72b5cd37208e3569d377e09ee9908416a32230b77cb730ee70fa8a30b2f8d9173062015d8b906385360d47dcc500937f0a3188b04e17ee87a
+EBUILD rosdep-9999.ebuild 1624 BLAKE2B b02379abc8277ca2d293141b3376fe6f18110b43336d5bf6fa624b40b9efdceb6e709197bd7c60f01f0f510cf1338b0893472d93eda16d483126df7092494dfd SHA512 84a81ca80cfc28c72b5cd37208e3569d377e09ee9908416a32230b77cb730ee70fa8a30b2f8d9173062015d8b906385360d47dcc500937f0a3188b04e17ee87a
 MISC metadata.xml 339 BLAKE2B 98c570641ca07f96e5fcfaece9d49977136f720d77c9cf6dcecbb06bc4016410e082201d69d3c36af5de03cc70ea5a1b726289124324e2f11266e5db69a6ea97 SHA512 62ab4dc2638e4af95290eba19e1755d3bade56e5d1e7251d3cc9da410fcf7ead48562193b2cb6b6f8800daf7df31786e70ce153780b9e278891c31d2b9c257bf
diff --git a/dev-util/rosdep/files/tests.patch b/dev-util/rosdep/files/tests.patch
new file mode 100644
index 000000000000..cd6e199b3cd0
--- /dev/null
+++ b/dev-util/rosdep/files/tests.patch
@@ -0,0 +1,33 @@
+Index: rosdep-0.19.0/src/rosdep2/platforms/osx.py
+===================================================================
+--- rosdep-0.19.0.orig/src/rosdep2/platforms/osx.py
++++ rosdep-0.19.0/src/rosdep2/platforms/osx.py
+@@ -303,7 +303,7 @@ class HomebrewInstaller(PackageManagerIn
+ 
+             # make sure options is a list of list of strings
+             try:
+-                valid = all([isinstance(x, _basestring) for l in options for x in l])
++                valid = all([isinstance(x, _basestring) for option in options for x in option])
+             except Exception as e:
+                 raise InvalidData("Invalid list of options '%s', error: %s" % (options, e))
+             else:
+Index: rosdep-0.19.0/test/test_rosdep_gentoo.py
+===================================================================
+--- rosdep-0.19.0.orig/test/test_rosdep_gentoo.py
++++ rosdep-0.19.0/test/test_rosdep_gentoo.py
+@@ -183,13 +183,11 @@ def test_PortageInstaller():
+ 
+         mock_method.return_value = ['a', 'b']
+ 
+-        expected = [['sudo', '-H', 'emerge', 'a'],
+-                    ['sudo', '-H', 'emerge', 'b']]
++        expected = [['sudo', '-H', 'emerge', 'a', 'b']]
+         val = installer.get_install_command(['whatever'], interactive=False)
+         assert val == expected, val
+ 
+-        expected = [['sudo', '-H', 'emerge', '-a', 'a'],
+-                    ['sudo', '-H', 'emerge', '-a', 'b']]
++        expected = [['sudo', '-H', 'emerge', '-a', 'a', 'b']]
+         val = installer.get_install_command(['whatever'], interactive=True)
+         assert val == expected, val
+ 
diff --git a/dev-util/rosdep/rosdep-0.19.0.ebuild b/dev-util/rosdep/rosdep-0.19.0-r1.ebuild
index aa7a8d86538f..861de0006ff1 100644
--- a/dev-util/rosdep/rosdep-0.19.0.ebuild
+++ b/dev-util/rosdep/rosdep-0.19.0-r1.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
@@ -38,14 +39,18 @@ DEPEND="${RDEPEND}"
 BDEPEND="
 	dev-python/nose[${PYTHON_USEDEP}]
 	test? (
-		dev-python/coverage[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/flake8[${PYTHON_USEDEP}]
 	)
 "
+PATCHES=( "${FILESDIR}/tests.patch" )
 
 python_test() {
-	nosetests --with-coverage --cover-package=rosdep2 --with-xunit test || die
+	if has network-sandbox ${FEATURES}; then
+		einfo "Skipping tests due to network sandbox"
+	else
+		env -u ROS_DISTRO nosetests --with-xunit test || die
+	fi
 }
 
 pkg_postrm() {
diff --git a/dev-util/rosdep/rosdep-9999.ebuild b/dev-util/rosdep/rosdep-9999.ebuild
index aa7a8d86538f..861de0006ff1 100644
--- a/dev-util/rosdep/rosdep-9999.ebuild
+++ b/dev-util/rosdep/rosdep-9999.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
@@ -38,14 +39,18 @@ DEPEND="${RDEPEND}"
 BDEPEND="
 	dev-python/nose[${PYTHON_USEDEP}]
 	test? (
-		dev-python/coverage[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/flake8[${PYTHON_USEDEP}]
 	)
 "
+PATCHES=( "${FILESDIR}/tests.patch" )
 
 python_test() {
-	nosetests --with-coverage --cover-package=rosdep2 --with-xunit test || die
+	if has network-sandbox ${FEATURES}; then
+		einfo "Skipping tests due to network sandbox"
+	else
+		env -u ROS_DISTRO nosetests --with-xunit test || die
+	fi
 }
 
 pkg_postrm() {
diff --git a/dev-util/rosinstall_generator/Manifest b/dev-util/rosinstall_generator/Manifest
index c5c000fced36..8da16c58911d 100644
--- a/dev-util/rosinstall_generator/Manifest
+++ b/dev-util/rosinstall_generator/Manifest
@@ -1,5 +1,5 @@
 AUX yaml.patch 493 BLAKE2B ce0d917dc54edda1423b29c1f39662c56e6be8b0c33012cc8cbb8a86b4fe20c9a25139ed2b59db9aca245ebae01a7a1f06f4956a8521bc046ffd46ed795752c9 SHA512 d63da158e7a496da2de41bbfe453e492cd32b9380b11f3201491fc40bc6a9f4057adc19ce0ce7e417080bb9ded0010790caf69d7cd50373cd53033f37a42c456
 DIST rosinstall_generator-0.1.22.tar.gz 11902 BLAKE2B 6dd41c8b86146a9e50d4a20fd4991ed247de915d29f051c6dc416b6820386497ccf3a9cf6dde16e039932c354d7dfc5b6706bc206c16b068633fbddb69686452 SHA512 c1801ea441d1765090684a12e559a39ce496d08f91021b13d026a4127e5bc16974daa2cb561f0ed6c54a31216f57c1f3e257b4a96aec8255c34b37c5545123c6
-EBUILD rosinstall_generator-0.1.22.ebuild 1100 BLAKE2B 975af506b78a86e7f6e7bef81e5ceef0d66d8becf9fef3c7541a9e74fcf269a6abb1030559ddd2d22f3826813e42c2270915b1790ec4f80d06de1fb6f077c05d SHA512 1efbb4fc3109308401ad998e20ca66abb6223fc04a5796a5dd0dac755da0eedc6c66f0f93c3b9259e6ff64a75e1d79c328163b2b52b6f4f68a43339e82ddf7ed
-EBUILD rosinstall_generator-9999.ebuild 1100 BLAKE2B 975af506b78a86e7f6e7bef81e5ceef0d66d8becf9fef3c7541a9e74fcf269a6abb1030559ddd2d22f3826813e42c2270915b1790ec4f80d06de1fb6f077c05d SHA512 1efbb4fc3109308401ad998e20ca66abb6223fc04a5796a5dd0dac755da0eedc6c66f0f93c3b9259e6ff64a75e1d79c328163b2b52b6f4f68a43339e82ddf7ed
+EBUILD rosinstall_generator-0.1.22-r1.ebuild 1135 BLAKE2B 8ff2301980fcb106090e0cd6bc794a51e429f51abbaa488f99b552ff5e57dc8faf1436c48cbccf4894ef2e970bab79ba2a8a8ff7ae39f0b95e80830298f1ede5 SHA512 ed5e52418bdb425ae16e5cb769468414def2a89bf5f177c6fad419a776f01c8c6dc3f4c975590235a52d8d806b053d7423b94f8ef3e19dec0f656cb00243b862
+EBUILD rosinstall_generator-9999.ebuild 1135 BLAKE2B 8ff2301980fcb106090e0cd6bc794a51e429f51abbaa488f99b552ff5e57dc8faf1436c48cbccf4894ef2e970bab79ba2a8a8ff7ae39f0b95e80830298f1ede5 SHA512 ed5e52418bdb425ae16e5cb769468414def2a89bf5f177c6fad419a776f01c8c6dc3f4c975590235a52d8d806b053d7423b94f8ef3e19dec0f656cb00243b862
 MISC metadata.xml 353 BLAKE2B 26692ca3eb76500607275909a9c86bc88f7c80114e7840763136902a59dddc8f23dcd766f821aa5beffff9419d39a48e18682f86c8148df7d640977c9b30ebcd SHA512 a681a9f31c4cf06a775ef57f7a942c76d0e8873c4c854fddaf44df0301f3e14bd836727e6816bc74f0ced9e54dfd9335c376c47b8af2a19455c42a3f6ed38a18
diff --git a/dev-util/rosinstall_generator/rosinstall_generator-0.1.22.ebuild b/dev-util/rosinstall_generator/rosinstall_generator-0.1.22-r1.ebuild
index 58ee6bf23a0d..3b70d500c3cf 100644
--- a/dev-util/rosinstall_generator/rosinstall_generator-0.1.22.ebuild
+++ b/dev-util/rosinstall_generator/rosinstall_generator-0.1.22-r1.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
diff --git a/dev-util/rosinstall_generator/rosinstall_generator-9999.ebuild b/dev-util/rosinstall_generator/rosinstall_generator-9999.ebuild
index 58ee6bf23a0d..3b70d500c3cf 100644
--- a/dev-util/rosinstall_generator/rosinstall_generator-9999.ebuild
+++ b/dev-util/rosinstall_generator/rosinstall_generator-9999.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
diff --git a/dev-util/rpmdevtools/Manifest b/dev-util/rpmdevtools/Manifest
index 34173fe32d46..ca9348f1d584 100644
--- a/dev-util/rpmdevtools/Manifest
+++ b/dev-util/rpmdevtools/Manifest
@@ -1,3 +1,5 @@
 DIST rpmdevtools-8.10.tar.xz 94976 BLAKE2B 290044a511f77111487cef40b6b9bd706f0bf6b2b65681a931839f1fd00aa490c106492de35643c8a7218762e4e92c9bd44a42d8976472c15748d9ad94f0d5c0 SHA512 49f310d5cf1e709e8001ffcf2b17afa7f7a89ef9c8f805d694149a914c40626a08afe93b16d9ed41df1717d0bc97713c06a3b0e63f13fa53d978c6204bb05d57
+DIST rpmdevtools-9.2.tar.xz 95528 BLAKE2B 2485b4a1f27bc07b2c865804829fe2692383d54ce976d32919ee717b52b32aec93c1e50382e8e74cdbb630fda1655d68c840057e61428a45ab40ac31bc5b4ae1 SHA512 fbfe1123421775eb892776362f39144ce0e7c6519bdf23c7d9eb746c867d998d6a0ecce376ceaffec82e786040e41f2494dbec3170af1fa74a204447a4965fff
 EBUILD rpmdevtools-8.10-r2.ebuild 779 BLAKE2B b44952742569fdeb7514f68cf42ef252b7c5d5050cd240197ca644dc7b8c888f35b12e41463774ad2e4103a73946fb296d853cb4b4a1e7c39479b8a8454c05a6 SHA512 9d75dbbe5faa94447d143724235fb16e3d07f1fe95720e5ba6af9a2355bbe3c02b1ec538c2b1cb2472c593459c7eadd7f1dfb3981c2013055ddb316f5cd45bb7
+EBUILD rpmdevtools-9.2.ebuild 891 BLAKE2B 91f841ff8aa752ace9cd06f3c9928151eec8116bcac01fe8c6b6b9a16fa9ca4c312e7fa49aecef85854822449d6b5355a9e8dbac6afee8743adf990a683f6cb7 SHA512 a6b1e1fbf2c8647f38cbb68012fe2eae7a3ab3b475585554a1229047d62f0b3cc9b72fde8e211564fab96eb6f5273dcc1c14f79def884e1b13e4a5f2b4d6d557
 MISC metadata.xml 221 BLAKE2B 6d597a7a853603bd878e86c6552cb68211e81f627cdb673ae99dc6c6133f50f617101e43f4b4631b45b5969ee6ec42849b156a62594f939d00c112ce51d769e1 SHA512 e50d6cad26239ebf4260f0cf4bdf4e29ef2038e999039adf94f49b184b5993f02bb0d4cdb3de6c7b5cda99890db42dcd2b65c5342256be50dc19e6aab2406353
diff --git a/dev-util/rpmdevtools/rpmdevtools-9.2.ebuild b/dev-util/rpmdevtools/rpmdevtools-9.2.ebuild
new file mode 100644
index 000000000000..d3360b839191
--- /dev/null
+++ b/dev-util/rpmdevtools/rpmdevtools-9.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+inherit python-single-r1
+
+DESCRIPTION="Collection of rpm packaging related utilities"
+HOMEPAGE="https://pagure.io/rpmdevtools"
+SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~amd64-linux ~x86-linux"
+IUSE="emacs"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="
+	${PYTHON_DEPS}
+	app-arch/rpm[python,${PYTHON_SINGLE_USEDEP}]
+	dev-lang/perl:*
+	$(python_gen_cond_dep 'dev-python/progressbar2[${PYTHON_USEDEP}]')
+	$(python_gen_cond_dep 'dev-python/requests_download[${PYTHON_USEDEP}]')
+"
+RDEPEND="${DEPEND}
+	net-misc/curl
+	emacs? ( app-emacs/rpm-spec-mode )
+"
+BDEPEND="sys-apps/help2man"
+
+src_prepare() {
+	default
+	python_fix_shebang rpmdev-{bumpspec,checksig,rmdevelrpms.py,sort,spectool,vercmp}
+}
diff --git a/dev-util/rr/Manifest b/dev-util/rr/Manifest
index 7524a121ba03..a8557456d1ba 100644
--- a/dev-util/rr/Manifest
+++ b/dev-util/rr/Manifest
@@ -1,3 +1,3 @@
-DIST mozilla-rr-5.3.0.tar.gz 1343557 BLAKE2B 80ed2feb52fd34b424193902c02408443e5ae943a34d3fe8e75c4c813042c6dd7f39571924ce94aca558ea5f1630f9bda28bea9d5f7e2d429d772a85d3e3e7ad SHA512 6ae37a3ced0c001208fb981abc18f02b912a2851564955dd8da364cb30d9580ea6c91bedbef6495da5d082954d4f261eeaea81df1e9895b4adf948e9998f4c2b
-EBUILD rr-5.3.0-r1.ebuild 1368 BLAKE2B 1f9ef787e458c599e0d13efa9b7325dd91d2a84013832f59da1e58d907ebdbeeb0858c29ddfb42ff57213aa100f028e06170b7e6fb28ffe78683c77419382f07 SHA512 797cae8fc2432e41b24ee03db7bfa0466dbf41e19682c08a827da698ae4f784687b9f243e3fe86ce9ca76892b8f421bb5ba0a34cc1d43ce9e2cf8edaf3aeafd5
+DIST mozilla-rr-5.4.0.tar.gz 1434820 BLAKE2B 8454304fa2ddf85fcd385d3d4e72b8963dc0f6804bf572db31654cdf5bfc8a3afd050380fe34d280264114467e9b973866384d75d6f8b7078affd51064e9f597 SHA512 69b029a29cf3c147f033ff4c1c67c6190f5163b4f7329306e5f0ccfe78cae4b6ae262602253772e83d5a55408c5a4d121e5a9b3530779de74adc34b81e2592c8
+EBUILD rr-5.4.0.ebuild 1350 BLAKE2B 75bed2853ad8496021eb70883f9bad6cb8c958c75072979f4c5e2f649146e214a5187783c7595b3169a753e9ab212a335a1e069197269a5ca5bf3d68d1d0a433 SHA512 7f7ff1f8e7d3fea3acb0ffc26de15d5114057f745dfbc0c1abf962121ca846baf508b5637ce9146ec8eb50aa6204e70bf0a7b9f3cdd7f3ea0699e4da8fff5f39
 MISC metadata.xml 555 BLAKE2B 3618975613ac5286f849880de14d61b1cb74b0e64d539250c700ff0c955667acbcc11125381c31ba39b839da4b38c5d648fea27ebea4f7f28ca492e0554e3a27 SHA512 33487b0389d097115365ef82c85accedf17d798e312e9528fae27519f242c343fa280d32bff05c6f1a1620d6481df1db57fc4c1e2fa7ce36dbe56f998f03870a
diff --git a/dev-util/rr/rr-5.3.0-r1.ebuild b/dev-util/rr/rr-5.4.0.ebuild
index 792f4f9768e2..c6945c278872 100644
--- a/dev-util/rr/rr-5.3.0-r1.ebuild
+++ b/dev-util/rr/rr-5.4.0.ebuild
@@ -3,10 +3,10 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 CMAKE_BUILD_TYPE=Release
 
-inherit cmake-utils linux-info python-single-r1
+inherit cmake linux-info python-single-r1
 
 DESCRIPTION="Record and Replay Framework"
 HOMEPAGE="https://rr-project.org/"
@@ -19,8 +19,8 @@ IUSE="multilib test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="
-	sys-libs/zlib
-	dev-libs/capnproto
+	sys-libs/zlib:=
+	dev-libs/capnproto:=
 	${PYTHON_DEPS}"
 RDEPEND="${DEPEND}
 	sys-devel/gdb[xml]"
@@ -44,7 +44,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	sed -i 's:-Werror::' CMakeLists.txt || die #609192
 }
@@ -55,7 +55,7 @@ src_test() {
 		return 0
 	fi
 
-	cmake-utils_src_test
+	cmake_src_test
 }
 
 src_configure() {
@@ -64,5 +64,5 @@ src_configure() {
 		-Ddisable32bit=$(usex !multilib) #636786
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/dev-util/rt-tests/Manifest b/dev-util/rt-tests/Manifest
index 8c4a5094975d..9d07ff3cb391 100644
--- a/dev-util/rt-tests/Manifest
+++ b/dev-util/rt-tests/Manifest
@@ -1,4 +1,4 @@
-AUX rt-tests-1.8-musl.patch 10834 BLAKE2B 54bc0e20a9bc7c251985b8e21c94b0e6261345d02a23dc510ee6a303843ea88aa13750680adb3954d63561246dfb26e6427adf2bc2012f9161357d0fae207b83 SHA512 196b0d1d19aeab83710edddcaec7064d4e4770cd514f8b8a61b23980932b793d044cfb4d69c91e61c4ee912eb24cd3a87ee8da05612c1ee02e2a5885f32bb9e5
-DIST rt-tests-1.8.tar.xz 105820 BLAKE2B 478ac14732393f718e6be818b82b24b1e53d2f293140012bc17fd1c9242bd885b4d70dca3c7f3187e9ba22334e5f83d9ad1993ab9f70079e1765b918deab4411 SHA512 41c0b18e84d1f76de22a4ab239d43ac678b8c8419b508c96204bef346734122b9a42df51fcea97b1e0675bd25ed1e262730236ec0cb189732d5810122e96aa39
-EBUILD rt-tests-1.8.ebuild 923 BLAKE2B cf4dacc192b38ffac20e7dda97a4f775e71ae9c4a602b6fef39a7ecdf99be7395ece533d2f901c08de91ece2edf7e4791f8755159032aeb6b588bd599bbc6874 SHA512 18609c388c6d6d87700b5e308911f797ff85fdcf3e91983d14a9acecef66fceb2ee543b4015ae2b0b640115f890a17ed3cedcbca45a058c3cb3b5166b263af28
+AUX rt-tests-1.9-musl.patch 10822 BLAKE2B 144562d6dc921c8ae89e1ae017cc5bddb7aad7a4167194df1a8ae647678310da71b0c2df4cd18d9ba53fbbfccb5e6a92f2ec33ca055c9def592ca973a0bc0381 SHA512 56b538bc7ea327a5362d03b3207aa533ea4aa7067584335f7e92449869a37b355170520fa6b54e7aa175290bff718af6970c791884f9c2bc68ff624926ae22d0
+DIST rt-tests-1.9.tar.xz 112180 BLAKE2B fa9b7b70bd9ae5d5f5e1077ddbd916bc4556d079d4067f16289ab34fec16ed0c8074607a7a8e50ea7bad4df318a063074f1c0ec5c2e895851d3045d51a8ecd74 SHA512 66f086dbda31567e6dc5297424ec66b2c6bd7cb0e065c32e02c326f33967f3a301b1b34f9eb0dd0acd853279c64fb1c2bc271ac26648f4abc3f6090ba6484cfa
+EBUILD rt-tests-1.9.ebuild 923 BLAKE2B bd37db6fc2c3b1383cc8bd231d3ea46033b8dd5b133b227fc27b43b23b277cf74f4b9d222c05f4d0110346bb2b74213ae1e68460462c5ddfc89b46aa8042852b SHA512 1982e3f6a1970a3c1fa9cdcc14cc4ab647b278de78a07caefc5ecc3a96eb577555c4fa3d5cd88d746b20660910f2e87b10fe680a988cfb43079fde09cedd8314
 MISC metadata.xml 718 BLAKE2B e09ef2dd4bd98df6e36e684105242e579fd86dfa28fd02f6b04ea78f91dc2089485a54497edb0a9a1b3c36fe5033eb1e98b626735b82d2a765150812f724bb93 SHA512 8b7eb83545e11f2f5786f0e5fbc47ce15fbb9a364ad9fcf51a7c47e8a05e70d3d0c48c2f69b5f6abd4b839514bc2575a66a43202204340137ec3d8a9f41564e1
diff --git a/dev-util/rt-tests/files/rt-tests-1.8-musl.patch b/dev-util/rt-tests/files/rt-tests-1.9-musl.patch
index 48a7a297afc1..0114cd004473 100644
--- a/dev-util/rt-tests/files/rt-tests-1.8-musl.patch
+++ b/dev-util/rt-tests/files/rt-tests-1.9-musl.patch
@@ -1,4 +1,4 @@
-From 4daa685588ee3848fc98fd9c6328b76f136ee876 Mon Sep 17 00:00:00 2001
+From fd78f200ac8e9d1eb7579cd9e4adaaa1a4dc2d46 Mon Sep 17 00:00:00 2001
 From: Kurt Kanzenbach <kurt@kmk-computers.de>
 Date: Wed, 1 Apr 2020 20:15:24 +0200
 Subject: [PATCH] all: Fix musl build
@@ -30,7 +30,7 @@ Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
  create mode 100644 src/include/musl.h
 
 diff --git a/Makefile b/Makefile
-index 05fc5eda71fa..9340f28f2c32 100644
+index c3ebbd7b2a2e..8815c113c0df 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -7,7 +7,6 @@ OBJDIR = bld
@@ -41,7 +41,7 @@ index 05fc5eda71fa..9340f28f2c32 100644
  	  pmqtest.c \
  	  ptsematest.c \
  	  rt-migrate-test.c \
-@@ -35,7 +34,6 @@ LDFLAGS ?=
+@@ -36,7 +35,6 @@ LDFLAGS ?=
  PYLIB  ?= $(shell python3 -c 'import distutils.sysconfig;  print (distutils.sysconfig.get_python_lib())')
  
  MANPAGES = src/cyclictest/cyclictest.8 \
@@ -49,7 +49,7 @@ index 05fc5eda71fa..9340f28f2c32 100644
  	   src/ptsematest/ptsematest.8 \
  	   src/rt-migrate-test/rt-migrate-test.8 \
  	   src/sigwaittest/sigwaittest.8 \
-@@ -125,9 +123,6 @@ deadline_test: $(OBJDIR)/deadline_test.o $(OBJDIR)/librttest.a
+@@ -129,9 +127,6 @@ deadline_test: $(OBJDIR)/deadline_test.o $(OBJDIR)/librttest.a
  signaltest: $(OBJDIR)/signaltest.o $(OBJDIR)/librttest.a
  	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS) $(RTTESTLIB)
  
@@ -60,7 +60,7 @@ index 05fc5eda71fa..9340f28f2c32 100644
  	chmod +x src/hwlatdetect/hwlatdetect.py
  	ln -s src/hwlatdetect/hwlatdetect.py hwlatdetect
 diff --git a/src/backfire/sendme.c b/src/backfire/sendme.c
-index c1854d9660cb..ecec5c201bef 100644
+index d963723b1c93..b355bbbcfece 100644
 --- a/src/backfire/sendme.c
 +++ b/src/backfire/sendme.c
 @@ -31,6 +31,7 @@
@@ -72,7 +72,7 @@ index c1854d9660cb..ecec5c201bef 100644
  #include <utmpx.h>
  #include <sys/types.h>
 diff --git a/src/cyclictest/cyclictest.c b/src/cyclictest/cyclictest.c
-index c5f1fd46567a..8204e57cbbac 100644
+index b41d42f13f24..56b27a4e0547 100644
 --- a/src/cyclictest/cyclictest.c
 +++ b/src/cyclictest/cyclictest.c
 @@ -36,6 +36,7 @@
@@ -83,7 +83,7 @@ index c5f1fd46567a..8204e57cbbac 100644
  
  #include <bionic.h>
  
-@@ -628,12 +629,8 @@ static void *timerthread(void *param)
+@@ -501,12 +502,8 @@ static void *timerthread(void *param)
  {
  	struct thread_param *par = param;
  	struct sched_param schedp;
@@ -96,7 +96,7 @@ index c5f1fd46567a..8204e57cbbac 100644
  	struct thread_stat *stat = par->stats;
  	int stopped = 0;
  	cpu_set_t mask;
-@@ -664,14 +661,6 @@ static void *timerthread(void *param)
+@@ -537,14 +534,6 @@ static void *timerthread(void *param)
  	sigaddset(&sigset, par->signal);
  	sigprocmask(SIG_BLOCK, &sigset, NULL);
  
@@ -111,7 +111,7 @@ index c5f1fd46567a..8204e57cbbac 100644
  	memset(&schedp, 0, sizeof(schedp));
  	schedp.sched_priority = par->prio;
  	if (setscheduler(0, par->policy, &schedp))
-@@ -726,20 +715,6 @@ static void *timerthread(void *param)
+@@ -599,20 +588,6 @@ static void *timerthread(void *param)
  		stop = now;
  		stop.tv_sec += duration;
  	}
@@ -132,7 +132,7 @@ index c5f1fd46567a..8204e57cbbac 100644
  
  	stat->threadstarted++;
  
-@@ -747,16 +722,10 @@ static void *timerthread(void *param)
+@@ -620,16 +595,10 @@ static void *timerthread(void *param)
  
  		uint64_t diff;
  		unsigned long diff_smi = 0;
@@ -150,7 +150,7 @@ index c5f1fd46567a..8204e57cbbac 100644
  		case MODE_CLOCK_NANOSLEEP:
  			if (par->timermode == TIMER_ABSTIME) {
  				ret = clock_nanosleep(par->clock, TIMER_ABSTIME,
-@@ -878,11 +847,6 @@ static void *timerthread(void *param)
+@@ -751,11 +720,6 @@ static void *timerthread(void *param)
  
  		next.tv_sec += interval.tv_sec;
  		next.tv_nsec += interval.tv_nsec;
@@ -162,7 +162,7 @@ index c5f1fd46567a..8204e57cbbac 100644
  		tsnorm(&next);
  
  		while (tsgreater(&now, &next)) {
-@@ -907,17 +871,6 @@ out:
+@@ -780,17 +744,6 @@ out:
  		pthread_mutex_unlock(&refresh_on_max_lock);
  	}
  
@@ -180,7 +180,7 @@ index c5f1fd46567a..8204e57cbbac 100644
  	/* close msr file */
  	if (smi)
  		close(par->msr_fd);
-@@ -1417,7 +1370,8 @@ static void process_options (int argc, char *argv[], int max_cpus)
+@@ -1305,7 +1258,8 @@ static void process_options (int argc, char *argv[], int max_cpus)
  		case OPT_VERBOSE: verbose = 1; break;
  		case 'x':
  		case OPT_POSIX_TIMERS:
@@ -190,7 +190,7 @@ index c5f1fd46567a..8204e57cbbac 100644
  		case '?':
  		case OPT_HELP:
  			display_help(0); break;
-@@ -1450,13 +1404,6 @@ static void process_options (int argc, char *argv[], int max_cpus)
+@@ -1338,13 +1292,6 @@ static void process_options (int argc, char *argv[], int max_cpus)
  		}
  	}
  
@@ -204,7 +204,7 @@ index c5f1fd46567a..8204e57cbbac 100644
  	/* if smp wasn't requested, test for numa automatically */
  	if (!smp) {
  #ifdef NUMA
-@@ -2157,7 +2104,6 @@ int main(int argc, char **argv)
+@@ -2038,7 +1985,6 @@ int main(int argc, char **argv)
  
  	}
  
@@ -212,7 +212,7 @@ index c5f1fd46567a..8204e57cbbac 100644
  	mode = use_nanosleep + use_system;
  
  	sigemptyset(&sigset);
-@@ -2207,16 +2153,18 @@ int main(int argc, char **argv)
+@@ -2088,16 +2034,18 @@ int main(int argc, char **argv)
  			void *stack;
  			void *currstk;
  			size_t stksize;
@@ -234,7 +234,7 @@ index c5f1fd46567a..8204e57cbbac 100644
  
  			/*  allocate memory for a stack on appropriate node */
 diff --git a/src/hackbench/hackbench.c b/src/hackbench/hackbench.c
-index 5a883d341f2e..9f1e4db736a7 100644
+index 2cddff654df6..46f09fa9e7ba 100644
 --- a/src/hackbench/hackbench.c
 +++ b/src/hackbench/hackbench.c
 @@ -24,13 +24,15 @@
@@ -289,7 +289,7 @@ index 000000000000..ea5075e768c8
 +
 +#endif /* _MUSL_H_ */
 diff --git a/src/lib/rt-utils.c b/src/lib/rt-utils.c
-index 1998a327d036..f7adda9c5987 100644
+index f786588706cd..c1a55272dfdb 100644
 --- a/src/lib/rt-utils.c
 +++ b/src/lib/rt-utils.c
 @@ -23,6 +23,7 @@
@@ -298,7 +298,7 @@ index 1998a327d036..f7adda9c5987 100644
  #include "error.h"
 +#include "musl.h"
  
- static char debugfileprefix[MAX_PATH];
+ #define  TRACEBUFSIZ  1024
  
 diff --git a/src/pi_tests/classic_pi.c b/src/pi_tests/classic_pi.c
 index 64af8890276f..bb088d3973b2 100644
@@ -327,7 +327,7 @@ index 97a345edd26e..1028d344edff 100644
  #define TIMEOUT 2
  
 diff --git a/src/pmqtest/pmqtest.c b/src/pmqtest/pmqtest.c
-index 3ce29252b9a2..1a57841cb7e8 100644
+index 5db8d348cdf8..2de6c1417e4a 100644
 --- a/src/pmqtest/pmqtest.c
 +++ b/src/pmqtest/pmqtest.c
 @@ -24,6 +24,7 @@
@@ -339,7 +339,7 @@ index 3ce29252b9a2..1a57841cb7e8 100644
  #include <pthread.h>
  
 diff --git a/src/ptsematest/ptsematest.c b/src/ptsematest/ptsematest.c
-index 485c991ec173..c000e083615f 100644
+index de8ea2fe1b0c..1568f3b78711 100644
 --- a/src/ptsematest/ptsematest.c
 +++ b/src/ptsematest/ptsematest.c
 @@ -22,6 +22,7 @@
@@ -376,5 +376,5 @@ index a08e28e73c42..675a0ea1a162 100644
  #define STR(x) _STR(x)
  #ifndef MAXPATH
 -- 
-2.24.1
+2.26.2
 
diff --git a/dev-util/rt-tests/rt-tests-1.8.ebuild b/dev-util/rt-tests/rt-tests-1.9.ebuild
index f94e433d66c0..cb4f2d293518 100644
--- a/dev-util/rt-tests/rt-tests-1.8.ebuild
+++ b/dev-util/rt-tests/rt-tests-1.9.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6..8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit python-single-r1 toolchain-funcs
 
diff --git a/dev-util/rustup/Manifest b/dev-util/rustup/Manifest
index b94c019bf8fe..aa8ea6f78072 100644
--- a/dev-util/rustup/Manifest
+++ b/dev-util/rustup/Manifest
@@ -1,4 +1,4 @@
-AUX symlink_rustup.sh 2517 BLAKE2B 618beadda1eae620b4e2686a83042344e61c271242249e45a9485188ae50f4df8b0752f1a3093a1fab8aff183ada8bb8ea4c30a3bf72435b3f0fb52af8957e89 SHA512 9e55cc455f6672b2ef37860be1692112ab41f0d3263422f6005c68071d9ed30e66a09afe395292367cbb5a8b6c791457eb9082dadcac67b8d9264eff508f17bb
+AUX symlink_rustup.sh 2581 BLAKE2B 3bb410b287db19e3876236b811d97ffcfc959e11ed5686940aef19272fa6493c24a48b1e4c4c28559ec6f072c4c2514e193241b74b54050dac3b6e21bbe7ba85 SHA512 fe1336549dfa8978d805f6a76cb734ec88b7d06647c9e80ea6b5fba9c8906868c5aebcfaaf52df17d959d8e44451e6449b8a960f0cdcc699e4d07760b91fcadd
 DIST addr2line-0.12.2.crate 119767 BLAKE2B 5d012c7c0a0d8afd48f2148b5fb4ceb54f525ef1ae6e4f9c0ad228cff059b2e0662aabb82eead22db6ea284b5c430c8b8cc2aa0100a46d8d14009bd88b5fe24a SHA512 2c797f587498418c3c14d8ffc7eb79092532dfbb290b5371594e8dbd82a0979929ecb0b6f2cb615d0481a555cb1508b4220acb2db8076ea64fee0d47f290de6d
 DIST adler32-1.1.0.crate 5442 BLAKE2B 1a4d932402a584fa6edda414c0dedff4994afcee7bfc71f85f6e8b4568de835bb7a3eebad1b5ac0be7f59cdb0e5ce5dfa4444d2c59d5ecf819d2a6abbbd7ea37 SHA512 57e3b3812e2747470c63edf64e13827c96ef8dd2311833b7f616ec63cf57ce8967636ec4d57464b607f570df06f6f648214d12ddc567e761b2de2ab16c8a7271
 DIST aes-0.3.2.crate 84345 BLAKE2B e3e634fd6256bc52a8d0be5042dcc74651e1197eac17592378b9e78ea173eb02f8680b1408d860b3c278bc4eb22d714cc83788a321b4f88d272495811327788a SHA512 0dde257064659ae0d7b13d12e538f2cf2f35d2f3cac2f3e0cf3a2dba0a4a89bb78377e85382cf82b95e347f34ae3c27bb145441d50f20e595c069445560a9e04
@@ -234,6 +234,6 @@ DIST xattr-0.2.2.crate 11750 BLAKE2B a5fc393d16935411a89e152e7afe9622f5b78cc207c
 DIST xz2-0.1.6.crate 24512 BLAKE2B 47f260f4ce920bf8eff1446981672c9d877b4e5908fe20053ed15419e3cebd540fcedecf71ace32b25bfc5d6731092a565a2a8ac303ed21ae47460c1b3414833 SHA512 c0880b2bbf890e962b27efda6c513d1626332ff400dd08a9126a6e1d1375e0d0e3bf243b10df78e2397b611d0365b6526d96974c4ff332bb81edba71b6ebc811
 DIST zeroize-1.1.0.crate 10316 BLAKE2B d5907adacd54a8fee639faa230ce98d8f9f2e1a68d22c824f475f0ca84d621e6d5c21e0aac676c5979b8529de556d45e5cf8c434ad3d8f99e9e1b2f9872919c8 SHA512 19ebb9515b7c8bc384c180e4ec8b6f77dc84fbc49a3690af972918b2ca73695b935d4673ff17ec8ae95a1824e5b261838e656e7939f10e3b14b3b984180aecbd
 DIST zeroize_derive-1.0.0.crate 4247 BLAKE2B 2e96c44ca630eccab5e49f4426bbecfcf83318ecfefdfce2ecf877dbde94a93c4fc44ca60c4cf2950e5108ccc1b4474e40be29edeace558c74dab8b12f9f84c5 SHA512 495979256548c6dc0e39d7f08d752772f6358214a2704328ec839a1872a59a62244b8bc700cf20830091ad4f02298dc8f571f2f17253f95c1ae99b38fb0b9445
-EBUILD rustup-1.22.1-r1.ebuild 5967 BLAKE2B 987dbc8c42def9bdbe8c727ef3eed809cdb381635a1ed0ffb95b4dd5ea0f534fb535c9659c64b0b025afd139450b16d65770c9e7bd9b1178f620d95b5843baf4 SHA512 87e27711d7f743e418ef29adbb138cbaeebd23f2b9e80e90ca37518f6f40e2ce8004184d8617d1aee250a77a22b7839cc4c4210e808096d939d5e96036c11003
-EBUILD rustup-9999.ebuild 1907 BLAKE2B 37a0bbf4e8a391aa2531a0579e4a2d17aaa9ae6251cfcba7d71441afed618b2304e4f27b750085db64219ab9aa80b643fafdde5bcf9d9faa2c220e2438c00abd SHA512 5e272b49b1efe36a4bbb941c5a7faae5b957a3ac16c7db0fc539f51d3e8b6a1ace2151ed7ab8a4a11d71a7463f1c4497c11d9c009fba621864780cb7ae7278b9
+EBUILD rustup-1.22.1-r2.ebuild 6247 BLAKE2B cf381c4df7fe47ebe55f8291591d05ecd2e1720bdad88a4c6e293ab90bc0936619a476ab5d8661f0cea40fce6d255e1016b99e92281d577afa2cd0b7ce68f4fc SHA512 7614fc73f5b8045718e1bfd4625192100f1b36645153a2e2fc7de5e3b73b0d99766114e4d5c9ffce533b0d8440faebd98f782f9ae889f85afc3bfc1e57e100e3
+EBUILD rustup-9999.ebuild 2000 BLAKE2B 13c78fe9644a8646d11545f4d8ab1f613b94b2f448dbfcb65a0d0afa40119dbc562c00f561370411f5cbef6cb062636aa853546d1b4fde69bfa7aaadd54c7dee SHA512 6167c62a6bf20dea007775c994c00ceedecb60f6f199703c2c73d502ddb697790c7fc28d45f5083794f590e41f133a96d05befc1fc133ecbf7b828ea9ddefce7
 MISC metadata.xml 356 BLAKE2B e17235a7b0ea9156af7ba204f1693bffd96a42926df5241e158e67616a60101d5a554d882e3aec14eb41a53b411a762cb50ceae076e44bab6e0e361eee83c569 SHA512 dc4ec000b7f6d769dabb37210fd9515917feba7224cbd1db27013b0e0f27824cdf03c7310d0f64dd3a099bdc33fc65c29648e860011c98fc6c8e9b374a17e337
diff --git a/dev-util/rustup/files/symlink_rustup.sh b/dev-util/rustup/files/symlink_rustup.sh
index 87365028843a..743072b8f96c 100644
--- a/dev-util/rustup/files/symlink_rustup.sh
+++ b/dev-util/rustup/files/symlink_rustup.sh
@@ -3,7 +3,8 @@
 set -euo pipefail
 IFS=$'\n\t'
 
-SYMLINK_RUSTUP_VERSION="0.0.2"
+SYMLINK_RUSTUP_VERSION="0.0.3"
+
 
 : "${CARGO_HOME:=${HOME}/.cargo}"
 : "${RUSTUP_HOME:=${HOME}/.rustup}"
@@ -79,6 +80,7 @@ symlink_rustup() {
 
 
 main(){
+	[[ "$EUID" -eq 0 ]] && die "Running as root is not supported"
 	local me
 	me="$(basename "${BASH_SOURCE[${#BASH_SOURCE[@]} - 1]}")"
 	while [[ ${#} -gt 0 ]]; do
diff --git a/dev-util/rustup/rustup-1.22.1-r1.ebuild b/dev-util/rustup/rustup-1.22.1-r2.ebuild
index 9f951ef8aa7d..cb13c09bcf50 100644
--- a/dev-util/rustup/rustup-1.22.1-r1.ebuild
+++ b/dev-util/rustup/rustup-1.22.1-r2.ebuild
@@ -239,19 +239,25 @@ zeroize-1.1.0
 zeroize_derive-1.0.0
 "
 
-inherit bash-completion-r1 cargo prefix
-
 HOME_CRATE_COMMIT="a243ee2fbee6022c57d56f5aa79aefe194eabe53"
 
+inherit bash-completion-r1 cargo prefix
+
 DESCRIPTION="Rust toolchain installer"
 HOMEPAGE="https://rust-lang.github.io/rustup/"
-SRC_URI="https://github.com/rust-lang/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/rbtcollins/home/archive/${HOME_CRATE_COMMIT}.tar.gz -> ${P}_home_crate.tar.gz
-	$(cargo_crate_uris ${CRATES})"
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/rust-lang/${PN}.git"
+else
+	SRC_URI="https://github.com/rust-lang/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+		https://github.com/rbtcollins/home/archive/${HOME_CRATE_COMMIT}.tar.gz -> ${P}_home_crate.tar.gz
+		$(cargo_crate_uris ${CRATES})"
+	KEYWORDS="~amd64 ~arm64 ~ppc64"
+fi
 
 LICENSE="Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD Boost-1.0 CC0-1.0 MIT Unlicense ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
 IUSE=""
 
 # requires old libressl-2.5, so openssl only for now.
@@ -274,6 +280,15 @@ src_prepare() {
 	sed -i "/^home =/s:.*:home = { path = \"../home-${HOME_CRATE_COMMIT}\" }:" Cargo.toml || die
 }
 
+src_unpack() {
+	if [[ "${PV}" == *9999* ]]; then
+		git-r3_src_unpack
+		cargo_live_src_unpack
+	else
+		cargo_src_unpack
+	fi
+}
+
 src_configure() {
 	local myfeatures=( no-self-update )
 	cargo_src_configure
@@ -287,8 +302,7 @@ src_compile() {
 src_install() {
 	cargo_src_install
 	einstalldocs
-	exeinto /usr/share/rustup
-	newexe "$(prefixify_ro "${FILESDIR}"/symlink_rustup.sh)" symlink_rustup
+	newbin "$(prefixify_ro "${FILESDIR}"/symlink_rustup.sh)" rustup-init-gentoo
 
 	ln -s "${ED}/usr/bin/rustup-init" rustup || die
 	./rustup completions bash rustup > "${T}/rustup" || die
@@ -302,9 +316,10 @@ src_install() {
 
 pkg_postinst() {
 		einfo "No rustup toolchains installed by default"
-		einfo "system rust toolchain can be added to rustup by running"
-		einfo "helper script installed to ${EPREFIX}/usr/share/rustup/symlink_rustup"
-		einfo "it will create proper symlinks in user home directory"
+		einfo "eselect activated system rust toolchain can be added to rustup by running"
+		einfo "helper script installed as ${EPREFIX}/usr/bin/rustup-init-gentoo"
+		einfo "it will create symlinks to system-installed rustup in home directory"
 		einfo "and rustup updates will be managed by portage"
-		einfo "please delete current rustup installation (if any) before running the script"
+		einfo "please delete current rustup binaries from ~/.cargo/bin/ (if any)"
+		einfo "before running rustup-init-gentoo"
 }
diff --git a/dev-util/rustup/rustup-9999.ebuild b/dev-util/rustup/rustup-9999.ebuild
index 5db8a446ae65..ccdc91c9c6bc 100644
--- a/dev-util/rustup/rustup-9999.ebuild
+++ b/dev-util/rustup/rustup-9999.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-CRATES=""
+CRATES="
+"
 
 inherit bash-completion-r1 cargo prefix
 
@@ -23,6 +24,7 @@ LICENSE="Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD Boost-1.0 CC0-1.0 MIT Un
 SLOT="0"
 IUSE=""
 
+# requires old libressl-2.5, so openssl only for now.
 DEPEND="
 	app-arch/xz-utils
 	net-misc/curl:=[http2,ssl]
@@ -58,8 +60,7 @@ src_compile() {
 src_install() {
 	cargo_src_install
 	einstalldocs
-	exeinto /usr/share/rustup
-	newexe "$(prefixify_ro "${FILESDIR}"/symlink_rustup.sh)" symlink_rustup
+	newbin "$(prefixify_ro "${FILESDIR}"/symlink_rustup.sh)" rustup-init-gentoo
 
 	ln -s "${ED}/usr/bin/rustup-init" rustup || die
 	./rustup completions bash rustup > "${T}/rustup" || die
@@ -73,9 +74,10 @@ src_install() {
 
 pkg_postinst() {
 		einfo "No rustup toolchains installed by default"
-		einfo "system rust toolchain can be added to rustup by running"
-		einfo "helper script installed to ${EPREFIX}/usr/share/rustup/symlink_rustup"
-		einfo "it will create proper symlinks in user home directory"
+		einfo "eselect activated system rust toolchain can be added to rustup by running"
+		einfo "helper script installed as ${EPREFIX}/usr/bin/rustup-init-gentoo"
+		einfo "it will create symlinks to system-installed rustup in home directory"
 		einfo "and rustup updates will be managed by portage"
-		einfo "please delete current rustup installation (if any) before running the script"
+		einfo "please delete current rustup binaries from ~/.cargo/bin/ (if any)"
+		einfo "before running rustup-init-gentoo"
 }
diff --git a/dev-util/scons/Manifest b/dev-util/scons/Manifest
index d172416ddb8f..d0beb9ec2cb8 100644
--- a/dev-util/scons/Manifest
+++ b/dev-util/scons/Manifest
@@ -12,7 +12,7 @@ DIST scons-4.0.1-user.html 1415152 BLAKE2B 1a94b2ef5e076d883f2960825f055c7cc39cf
 DIST scons-4.0.1-user.pdf 2468804 BLAKE2B f0af6bc6b41d972b98e955ee3ccec908aa366eabe31bd01022abe1f6d3a94dd6d7da26f71de23a6dfbcbc7bb4e439463f69bb7e8a5780c1300e3ba508b9eb314 SHA512 0d2733e2f1391083522a64117bfd35a2160d1366382f6f630b26eba36fc12ce797467d5e16efeb3b7f58aa9d853f96ae0d50fe78f59e78d24642b146bc7e565d
 DIST scons-4.0.1.gh.tar.gz 5578800 BLAKE2B f9ece5eaf1b133219f975e484beb5df726560a38969b8e8ad829781b960b438458bfcd7971333da87560c957675b2a4f8675e757fb0a4268cc4ecf72bb60d45f SHA512 f23c5dfd3c236e9f9f85b986ca64a36dbd85e9f3383cb3577e082a7dea4b83283020fbf064c2d919ab116195c6708fc11f906fcf3b0bc0533a4bc49a4f7371c6
 DIST scons-4.0.1.tar.gz 2874481 BLAKE2B 98377e62ae31d32758a93c4e04c578b88ea541cc292af63c6ca43e2948745e416ee6d757d98129ee30d0e0bbab90664889441a5bb86d4c9dfc649ca1dbef7536 SHA512 400b11323d48f04395b519dfafb6fce15a6dea92013f599dc4895b112629c0a06c7d2806755c74047d001d60087b94f39a118f512b7ee8de6214a4ffc7310468
-EBUILD scons-3.1.1.ebuild 1575 BLAKE2B 476c2d08b17df1d25e743579ad082c8d4c835d84e0b07baf25a354e2409a0b534518ad878cf2b1b7715ce00c824b3c49c7a4af31037c51efee04ffca20e732f6 SHA512 b33df71f92de48d1c03f704c81de2b508402f7df08c82559589366064a19e8b43d02573ffc3a536858d25a067f4351a32a0d4c2bd9e86688f1ae0fb9841f4172
-EBUILD scons-3.1.2.ebuild 1699 BLAKE2B 609ab947808f60bb42a76346877c01a46fb84702d097ec8608b48d31b5cf54d3c037d8d46ac0fbce477de3a45ed1add0ff75cef6469bf178cb3b5d46567ea6ea SHA512 1a6e8df5ea9deb5404bd9bfb9e809868f15b468e51167b50c282f85eb6a6a5bd18d7129bde14f0fc80b357a408e153fbcda0419c1b5e369d737169e7da4a865b
-EBUILD scons-4.0.1.ebuild 2876 BLAKE2B b08d0676bd26530a5e0f1dd3f0774d2148cc3d990c74080d962bbf59b5241c9bb089a37750f78220b861200a34bcce11aa168f773bb1d606b5be9e298f92af91 SHA512 d633d072a046b9423abba1e7a643497d7ee53c5a41d1827bd4cd904f2d0a9fb4b01e50c0cf7c47eba233bd53c3a16789bc974bbc8a907758bff9a37da739e9bb
+EBUILD scons-3.1.1.ebuild 1569 BLAKE2B 316c0f94ab8e17d91245401d9b2cccd35908e67c71413e6778586e97c8618fac9a157cdb573b131793b5b57eab506d1535527ce0af2617e9eef1a2c5f16661cc SHA512 1ac845dab5fef8cf70cd2df90a91b7d762447eb50f56e47eaa9f88fb8ad9137c7d5089d789e1dff0814105792436d3e1471271bd6ccf645d9cc3b00a997d98e2
+EBUILD scons-3.1.2.ebuild 1693 BLAKE2B ec64a596efa07156828d5354fef08c3d0965a5cc022d3c704ef05ba0f2186da9784a740b10cee69dc69b7e9eb75fe8752d32fcab7fd8e10bfcb602eebf74cb7a SHA512 fa6168e8bc71108cd5231a2c51eb856919d798d78ed760cccd79c180610a438ae8be3a7ce68945edd76424a8152d44a5bd5d0f3b3a0c38f4c43c4c1963e9b81c
+EBUILD scons-4.0.1.ebuild 2875 BLAKE2B c1227224fb69f8dfd2ce2ac5aa6e3aad3888146cc6ee4f2a6fa2d9ed6bbc3c42389c94ced13a4e707c94f7aec8941fc18950a218e0ae91daaa2cc95b5076130d SHA512 5491b317ce5ac313e29d1f00560e9ca1f83b610d3400adb1631a7e8959f5ba2eae70befcfd5fbde966999f37e6731d7c4cca8da7276d834a0d1977e88c085d8f
 MISC metadata.xml 704 BLAKE2B 448bfef70e4f230008c21d8e542618a52f9761295ed33f1c7385a2a678bcb29d1028792e221441f9ba61fecb34646f5ef0f04795e28b17e8d4aeacbabf8751f2 SHA512 62e5c8c23f1c67c218ff6b33c1f941ac3c258b39a5b2d799bedceb734aa5b2e29a718f90823ab5bf199e9d1eb8236aefaddcbff99c6d03f58987fb4936b10aa6
diff --git a/dev-util/scons/scons-3.1.1.ebuild b/dev-util/scons/scons-3.1.1.ebuild
index 822bd62dd620..e802cfc3d555 100644
--- a/dev-util/scons/scons-3.1.1.ebuild
+++ b/dev-util/scons/scons-3.1.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-util/scons/scons-3.1.2.ebuild b/dev-util/scons/scons-3.1.2.ebuild
index 8cd85f931c7d..c080cb8a5c1f 100644
--- a/dev-util/scons/scons-3.1.2.ebuild
+++ b/dev-util/scons/scons-3.1.2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 # False positive due to commented code in setup.py
 DISTUTILS_USE_SETUPTOOLS=manual
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-util/scons/scons-4.0.1.ebuild b/dev-util/scons/scons-4.0.1.ebuild
index 98836168923b..d589066d63c6 100644
--- a/dev-util/scons/scons-4.0.1.ebuild
+++ b/dev-util/scons/scons-4.0.1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/setconf/Manifest b/dev-util/setconf/Manifest
deleted file mode 100644
index 32757713abd4..000000000000
--- a/dev-util/setconf/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST setconf-0.6.6.tar.xz 12620 BLAKE2B 2882c50430a65e6947135808f87674c19bb8a57d0f5ecbb9d3e316b203b359bb79503b1e68931bfac04e52d3d0686fc11f0c74aa4d84797a0d44f8989c26b4cf SHA512 28f62b4dbc5883763cd11480ca059dd8ba120d6dfd964bbf1746ec5cb23fb0f0fd949249f77673d150cb6abd0039ff6f34d79ad744f8abcc765e0af37fbb85ff
-DIST setconf-0.6.7.tar.xz 12700 BLAKE2B 9dd3625f3fa2345ba6f9cb21fffae770a257928c2287e1772f92d831e9b6c09d8c5b09118a146b6704bb5003dd02fb0793ecabc7d8a2410f4f3941bd687b3a14 SHA512 8b247de9f7ac06f77e6251e95c045886cde5b6ca21b0152cb6fdc1456381aacd9051d5221c9fc8149608555e14f85ee2b51acbe65f78d129b1c8b732e093236d
-EBUILD setconf-0.6.6.ebuild 825 BLAKE2B dfc3a1db922cac2b04b22f9cfc91c950ba671ad50babc0ee5f3c6b8661aa238b962c11b3122191544cd1a4430eaa9f85ff3cee4a79c9d05cd1fa7f3477776c43 SHA512 6bb53533220f833457ffe5eac1a45f70d0d52349d3f9a9af9778fd167d057764d0f7b812e9b732fab164a167b916ca07aff87c8944437a4f23e62f4a25d28675
-EBUILD setconf-0.6.7.ebuild 825 BLAKE2B 4b7c495886dfdf86c886c7c510a1a1215851494dd3a22bd3b9c837e936ec1d5e41ab5f59a5e34c1470b2540c495fe633eefe07c317054c798d97579608af86cb SHA512 0c81b23aaa86b2f979681fb6535c20cd8ae24e2b8c9fc9836d62852ece602af76daee6619c4fa0645835c69ab9fa99d3a1a3fdc97fff47ebf9ebabd202ccd169
-MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25
diff --git a/dev-util/setconf/metadata.xml b/dev-util/setconf/metadata.xml
deleted file mode 100644
index 3cf14bf74636..000000000000
--- a/dev-util/setconf/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>shell-tools@gentoo.org</email>
-		<name>Gentoo Shell Tools Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-util/setconf/setconf-0.6.6.ebuild b/dev-util/setconf/setconf-0.6.6.ebuild
deleted file mode 100644
index 28c40e11ff30..000000000000
--- a/dev-util/setconf/setconf-0.6.6.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-inherit python-single-r1
-
-DESCRIPTION="A small python based utility used to change configuration files"
-HOMEPAGE="http://setconf.roboticoverlords.org/"
-SRC_URI="http://${PN}.roboticoverlords.org/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=${PYTHON_DEPS}
-
-# "REQUIRED_USE is needed to have a (un-)nice error when someone disabled all of python3" -mgorny
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}" || die
-	unpack "./${PN}.1.gz"
-}
-
-src_prepare() {
-	python_fix_shebang -f "${PN}.py"
-}
-
-src_install() {
-	python_doscript "${PN}.py"
-	dosym "${PN}.py" "/usr/bin/${PN}"
-	doman "${PN}.1"
-}
diff --git a/dev-util/setconf/setconf-0.6.7.ebuild b/dev-util/setconf/setconf-0.6.7.ebuild
deleted file mode 100644
index 9152802536d1..000000000000
--- a/dev-util/setconf/setconf-0.6.7.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python3_6 )
-inherit python-single-r1
-
-DESCRIPTION="A small python based utility used to change configuration files"
-HOMEPAGE="http://setconf.roboticoverlords.org/"
-SRC_URI="http://${PN}.roboticoverlords.org/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=${PYTHON_DEPS}
-
-# "REQUIRED_USE is needed to have a (un-)nice error when someone disabled all of python3" -mgorny
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}" || die
-	unpack "./${PN}.1.gz"
-}
-
-src_prepare() {
-	python_fix_shebang -f "${PN}.py"
-}
-
-src_install() {
-	python_doscript "${PN}.py"
-	dosym "${PN}.py" "/usr/bin/${PN}"
-	doman "${PN}.1"
-}
diff --git a/dev-util/spirv-headers/Manifest b/dev-util/spirv-headers/Manifest
index a748c15505d3..4e04fa23d90b 100644
--- a/dev-util/spirv-headers/Manifest
+++ b/dev-util/spirv-headers/Manifest
@@ -1,4 +1,6 @@
 DIST spirv-headers-1.5.3.tar.gz 387520 BLAKE2B 80f210792294232b9f1ebd12e96a8070b27ca29fcfcf8f61c19b0ddef493511bd1f5f85d44f6112de6154108237147feb564334cd47fb37b6f3e7dfb50620a7e SHA512 fab90cd073aed34320d2a03c441746101e757a4bd44f0b259aaa34e1fafd450b9576d8d539d85a8066cdf0eda3e78c807ccf65cd86ab9d8660195a96e9a50795
-EBUILD spirv-headers-1.5.3.ebuild 517 BLAKE2B ece572275252b124c42605a465ab4ed2215b22a6ddeccf559c3d89516956ecde0db4ed89067b02cec4bf72788d1daacae2136bccc362183f886648989b890a3a SHA512 d38257d4d62747ac69105f07c534fb3194de03f0d7aea1e2a6e27565996b78409322e4c35ea6685a035ea509fc7c79f57948811109a05b3f2a8a8c15c971f42f
+DIST spirv-headers-1.5.4.tar.gz 394957 BLAKE2B c94d0ab2e98242aeb78c6948ac915467ba2cc9568483b8e3d00d5c5e1f422a23e9645161ea6b958cb3a8f7b2d51cf8e8040b7479712dd32382c5c5cbba30e4f3 SHA512 050ae8ded345bbef3d94e91f22dd72860fdeed3072f943bafaa37f86f2d522e59d7c4ff2e6aa5bddb3c3df55f124200394a91e6d99eb95933463e7b8ce360aad
+EBUILD spirv-headers-1.5.3.ebuild 514 BLAKE2B e5d846bf7b3aaf4b39a254e17b55926ca91c016bea43f57f52a8c30ab5152013f5f4b96a9d25981b32e0c58091626704ee4bc79088d9447f72ad9af0897d3ee8 SHA512 8edf411df280b4c0d143263d7eca5f3a1866972c4df4f8b62c899f7e2c1d3975a3d6bc80ab570d36f7dcbe1131529c2fadf658349167a15494affde48a7e5679
+EBUILD spirv-headers-1.5.4.ebuild 484 BLAKE2B 15495a74ce925fca3844fe3df6945dfa31bbba115515dce2965995e036249c47853ddc70d5573154db2e90e74a8f21669b2d1d8a8bbe03eb503f7e70b88fa0c8 SHA512 f6eb2390b41f192e225b090595ea504490938acdf7eb1747aa86c0190a5cd5025792a30b96b72947bd0923f683e32b911c88eaa426ec7490f38a6c9e4843f0d8
 EBUILD spirv-headers-9999.ebuild 600 BLAKE2B e52054009b4c2a119218fe8e7d1d7606a5355fa93c8a9e14d7e6174dc212d2c87a7d2c57106bd4d217c8fd0ab88234e5a186f700664ccbd04de8b3520afef10e SHA512 420d7be91c892302e0b052c9bf1a628d663f95051a6d38580944aafd1c43c395cb87cec8df6d2d756b8fb4a177b23671911f58c05e9e5b035a41b0b9bb399dfe
 MISC metadata.xml 431 BLAKE2B 2a03bfd5ff92d23da598ab731032790658e828cfc16c1bb1bcaed0e8e8aeba5d76ca97d5b52f5433bae5391e5f50d2d1028c49689114da7d4fc9703e40f964d6 SHA512 a770e25b42892a5062dc35739c6776d1e8baa22ee4ac9c745b0283fdb3322ae4f6549693045f9125b6a604f4f103c34e52bc069c11f47394373400c522a877c5
diff --git a/dev-util/spirv-headers/spirv-headers-1.5.3.ebuild b/dev-util/spirv-headers/spirv-headers-1.5.3.ebuild
index 38d9ad01c4ba..4f2bba2c5394 100644
--- a/dev-util/spirv-headers/spirv-headers-1.5.3.ebuild
+++ b/dev-util/spirv-headers/spirv-headers-1.5.3.ebuild
@@ -12,6 +12,6 @@ SRC_URI="https://github.com/KhronosGroup/SPIRV-Headers/archive/${EGIT_COMMIT}.ta
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86"
 
 S="${WORKDIR}/SPIRV-Headers-${EGIT_COMMIT}"
diff --git a/dev-util/spirv-headers/spirv-headers-1.5.4.ebuild b/dev-util/spirv-headers/spirv-headers-1.5.4.ebuild
new file mode 100644
index 000000000000..857097a8c8bb
--- /dev/null
+++ b/dev-util/spirv-headers/spirv-headers-1.5.4.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="Machine-readable files for the SPIR-V Registry"
+HOMEPAGE="https://www.khronos.org/registry/spir-v/"
+EGIT_COMMIT="${PV}"
+SRC_URI="https://github.com/KhronosGroup/SPIRV-Headers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+S="${WORKDIR}/SPIRV-Headers-${EGIT_COMMIT}"
diff --git a/dev-util/spirv-llvm-translator/Manifest b/dev-util/spirv-llvm-translator/Manifest
index 7b9364234acd..d8d38eaab524 100644
--- a/dev-util/spirv-llvm-translator/Manifest
+++ b/dev-util/spirv-llvm-translator/Manifest
@@ -1,8 +1,6 @@
 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-9.0.1.1.tar.gz 498803 BLAKE2B dbc1a3a51671102e13ac265c5de744ec7ddbb74ff1a58971e18bfd7cbc7a0497cbb86d099681ac153d8e104577c93b66eec597b6c646d422eb701ea7c96a57c9 SHA512 a84494c49cc16148301cc468fdc20b9ef41a4532477b69468e32551d2132a9be68346369d5f4c07cbefd7f0f63b3e7ddf11e5c40088f74d8e3379a95c3cff251
-EBUILD spirv-llvm-translator-10.0.0.ebuild 1267 BLAKE2B b12f6b0095a57a290680f695296f85fa3cff3823dae03f527b3da718777c0b4f2a0cf465de5fa1671e191b83a837f949bea27f2664fa9d841efd2613f1108d6d SHA512 5b2c9122bba0244adc28d5cf1c93a93e8d810dec57702d3b71b22944f698dd13757a9b68bb4b30a2f483b94566877eacb205c150ed70139b7ba4756b98c849be
+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-9.0.1.1.ebuild 1291 BLAKE2B 22fd214fa80e3331da17994058a0861b5f0a3f3d12b558cba329e6e8d3cd34020bd2d5f489ea89e2916e73aca2a45446cb3c36aba203b5fa3425984a486b140f SHA512 9a7e64db4abbae7d694c17935707fa5a1a79ecd0c454e12f35dfab369bc0d5158118c010629dd4b2fc8ea418c2ed8d0342bcbb0903328b394e6d8354b6c4f30c
-MISC metadata.xml 442 BLAKE2B c63b20489865e563e064525b8df310eca993f15ff03cd533458729e5d6611b678e2f797d6efbe177e1bdeaed84e9bcf63921cb67318e948d579b57cc7f1cd28c SHA512 b036abe761b1aeb68ce5668eb3d501d2e5530be3456e85f51bee15c0aa8387a8be89c212308d7997a5f60bb0301bcdd22a7cb44a27324c05533aed94215b4721
+MISC metadata.xml 364 BLAKE2B 203073aa7deafccc7b4521504756fdf2f062d089e132b3175394c3bcc19b72d372260b911bf451a0b362194599b09a9d59dd018fdea8d2bb36d70c631ac1d167 SHA512 770937412a353d713452613168a44fa6697a19352c4b04f51b68fb93aa194f079120d095660b55477ce4d4bbf9eb9c587b2cc7d39d6dbf87cf0ee8181cc1442c
diff --git a/dev-util/spirv-llvm-translator/metadata.xml b/dev-util/spirv-llvm-translator/metadata.xml
index f5e348c67b5f..59d8ee72c1b1 100644
--- a/dev-util/spirv-llvm-translator/metadata.xml
+++ b/dev-util/spirv-llvm-translator/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="tools">
 			Install the command-line translator llvm-spirv
diff --git a/dev-util/spirv-llvm-translator/spirv-llvm-translator-10.0.0.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-10.0.0.ebuild
index 787306f0e0b5..e4ea0dd13f8c 100644
--- a/dev-util/spirv-llvm-translator/spirv-llvm-translator-10.0.0.ebuild
+++ b/dev-util/spirv-llvm-translator/spirv-llvm-translator-10.0.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="UoI-NCSA"
 SLOT="10"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="test tools"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-util/spirv-llvm-translator/spirv-llvm-translator-9.0.1.1.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-9.0.1.1.ebuild
deleted file mode 100644
index 4feef376c920..000000000000
--- a/dev-util/spirv-llvm-translator/spirv-llvm-translator-9.0.1.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib flag-o-matic llvm
-
-MY_PN="SPIRV-LLVM-Translator"
-MY_PV="$(ver_rs 3 -)"
-MY_P="${MY_PN}-${MY_PV}"
-
-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/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="UoI-NCSA"
-SLOT="9"
-KEYWORDS="~amd64"
-IUSE="test tools"
-
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}/${MY_P}"
-
-COMMON="sys-devel/clang:9=[${MULTILIB_USEDEP}]"
-DEPEND="${COMMON}"
-RDEPEND="${COMMON}"
-BDEPEND="test? ( dev-python/lit )"
-
-REQUIRED_USE="test? ( tools )"
-
-LLVM_MAX_SLOT=9
-
-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/spirv-tools/Manifest b/dev-util/spirv-tools/Manifest
index 7c2090faa334..7ff432dc59c5 100644
--- a/dev-util/spirv-tools/Manifest
+++ b/dev-util/spirv-tools/Manifest
@@ -1,4 +1,6 @@
 DIST spirv-tools-2020.3.tar.gz 2170858 BLAKE2B c9fdc6bbf6edbb6e3e5aba1fff9bd179b7b435ecb4ebbe29db38ce0c71166269484f8c3798a69a0fe5d936392b07fc6ccd5f058945aa70330612a6ef8fafe12f SHA512 8abb4fe227dbe9d0fc4279523eb714ce3a590a3c56e3dcd226317bc7835e2dceaef3a46c0873c2f144c61b28f41c0fcdf2985cc4f708fa496186c16738cc493f
-EBUILD spirv-tools-2020.3.ebuild 1091 BLAKE2B d9e28703c0dcabdcfdd2ab913f096d7780a58a4d5a85e1e952781d25a97da39d6e8045df522e7e6df4b9fb8f347dbeb3026f8dcdb9cf805994442f7aa6f17711 SHA512 9d092a46dc4a6daeddb3d50864e62abdc7b27d7ff041ed538989d7a58d01808f3656c57a9f8128a23506c5ec6f73768c65daab86f199da964cca429958150aa1
-EBUILD spirv-tools-9999.ebuild 1076 BLAKE2B f2b331dad1276fcdb1ae4029c75bca06be7136fe8f543053d8a7c0bd025d383132c756397cdab4f6c4cbebddd54f82d8a469802e66cd5906867768a952974256 SHA512 32b887f0b40bb37b1c6d63f93eb787c8982996ca94e293e531904870484ad811ea36f4c124101c6cbf33e95d3984f44fd6d013c3043632d75716356a3f5e0faf
+DIST spirv-tools-2020.5_pre20201107.tar.gz 2583541 BLAKE2B f234e34142af47a98268d85fa12861b9c66c78d74af7e44d4aa9150ad5cfce8e65780d89344ec947b4866de9811a8198e174480c23c30f690193feca7cc136a6 SHA512 a65174e5f1b7cad3be80e0df0d46e8fbfbb62f397fe98eb1b2c37bb85cf8f92d7b4c9103b5e9e8181240bcf97e5a7e3f09323f78159d4b25f7f02176e982f542
+EBUILD spirv-tools-2020.3.ebuild 1088 BLAKE2B 9576a7b33287e9139790225411a344c0a2eb17459140d6c165791195bc6e265be3038e269c7de85ca54405e4030f80d3d3e863ff832ca59772bbf0a9027774f9 SHA512 947a778123f62fd3901d017dfaf9743c50cb75d2014c2e85289b9709958d21462371bdfc926c3e6b5cbc5e2e6a4a86481552b45f062810c04007b09fac529b64
+EBUILD spirv-tools-2020.5_pre20201107.ebuild 1228 BLAKE2B 93c5fb104f3264f14e1ac18a0d7954dfb166e2add2ba2d79b6bab09e89e7e7605e9baa53824f919c8e825f354f719b226bfa647d814b5be45d9861dcfaeccb99 SHA512 54e65f2212524e7a11d5d73bf0368151048a4efcfdcf9636cb42a7da890a97f5e4aad6b9b53a035ec94e78608bc6d488627d50f46905a8986108e4e255f3d85d
+EBUILD spirv-tools-9999.ebuild 1228 BLAKE2B 93c5fb104f3264f14e1ac18a0d7954dfb166e2add2ba2d79b6bab09e89e7e7605e9baa53824f919c8e825f354f719b226bfa647d814b5be45d9861dcfaeccb99 SHA512 54e65f2212524e7a11d5d73bf0368151048a4efcfdcf9636cb42a7da890a97f5e4aad6b9b53a035ec94e78608bc6d488627d50f46905a8986108e4e255f3d85d
 MISC metadata.xml 429 BLAKE2B 84129eb27ea4a745c90ed7eab09723b41b45a696375c41458c45a6163dc00cd15d208d6858ea4fd92280e3ff3bb385f340ec3684c980a97ea5fd46fdc4c24001 SHA512 13b340b0e43ba726370f3b013759adab727fc37e251ec5777d10541976843e3e575be23ee015af83dd2e98a1917f4d2511467a38afd064cef025ab4700f005a6
diff --git a/dev-util/spirv-tools/spirv-tools-2020.3.ebuild b/dev-util/spirv-tools/spirv-tools-2020.3.ebuild
index 8cf8dca6539c..16c82fcd1bd9 100644
--- a/dev-util/spirv-tools/spirv-tools-2020.3.ebuild
+++ b/dev-util/spirv-tools/spirv-tools-2020.3.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+	KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86"
 	S="${WORKDIR}"/${MY_PN}-${PV}
 fi
 
diff --git a/dev-util/spirv-tools/spirv-tools-2020.5_pre20201107.ebuild b/dev-util/spirv-tools/spirv-tools-2020.5_pre20201107.ebuild
new file mode 100644
index 000000000000..d1cdb00c129a
--- /dev/null
+++ b/dev-util/spirv-tools/spirv-tools-2020.5_pre20201107.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN=SPIRV-Tools
+CMAKE_ECLASS="cmake"
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit cmake-multilib python-any-r1
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
+	inherit git-r3
+else
+	EGIT_COMMIT="a61d07a72763c1eb200de0a2c316703643a0d1d9"
+	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	S="${WORKDIR}"/${MY_PN}-${EGIT_COMMIT}
+fi
+
+DESCRIPTION="Provides an API and commands for processing SPIR-V modules"
+HOMEPAGE="https://github.com/KhronosGroup/SPIRV-Tools"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+# Tests fail upon finding symbols that do not match a regular expression
+# in the generated library. Easily hit with non-standard compiler flags
+RESTRICT="test"
+COMMON_DEPEND=">=dev-util/spirv-headers-1.5.4"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND=""
+BDEPEND="${PYTHON_DEPS}
+	${COMMON_DEPEND}"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		"-DSPIRV-Headers_SOURCE_DIR=/usr/"
+		"-DSPIRV_WERROR=OFF"
+		"-DSPIRV_TOOLS_BUILD_STATIC=OFF"
+		"-DBUILD_SHARED_LIBS=ON"
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-util/spirv-tools/spirv-tools-9999.ebuild b/dev-util/spirv-tools/spirv-tools-9999.ebuild
index 97f9e9c25627..d1cdb00c129a 100644
--- a/dev-util/spirv-tools/spirv-tools-9999.ebuild
+++ b/dev-util/spirv-tools/spirv-tools-9999.ebuild
@@ -12,9 +12,10 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
 	inherit git-r3
 else
-	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64 ~x86"
-	S="${WORKDIR}"/${MY_PN}-${PV}
+	EGIT_COMMIT="a61d07a72763c1eb200de0a2c316703643a0d1d9"
+	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	S="${WORKDIR}"/${MY_PN}-${EGIT_COMMIT}
 fi
 
 DESCRIPTION="Provides an API and commands for processing SPIR-V modules"
@@ -25,7 +26,7 @@ SLOT="0"
 # Tests fail upon finding symbols that do not match a regular expression
 # in the generated library. Easily hit with non-standard compiler flags
 RESTRICT="test"
-COMMON_DEPEND=">=dev-util/spirv-headers-1.5.3"
+COMMON_DEPEND=">=dev-util/spirv-headers-1.5.4"
 DEPEND="${COMMON_DEPEND}"
 RDEPEND=""
 BDEPEND="${PYTHON_DEPS}
@@ -35,6 +36,8 @@ multilib_src_configure() {
 	local mycmakeargs=(
 		"-DSPIRV-Headers_SOURCE_DIR=/usr/"
 		"-DSPIRV_WERROR=OFF"
+		"-DSPIRV_TOOLS_BUILD_STATIC=OFF"
+		"-DBUILD_SHARED_LIBS=ON"
 	)
 
 	cmake_src_configure
diff --git a/dev-util/splint/Manifest b/dev-util/splint/Manifest
index 2d662c92cbd7..e53eeebf3861 100644
--- a/dev-util/splint/Manifest
+++ b/dev-util/splint/Manifest
@@ -2,4 +2,4 @@ AUX splint-3.1.2-musl.patch 232 BLAKE2B 1d802cba805a993ccec83b2beeefba3f7971fe31
 DIST splint-3.1.2.src.tgz 2284033 BLAKE2B b071092ddb82be76734e00cdc8f96b697c20d0beaeba921b74464ac0b1f727c396f8f15845cf8c6c20011186e4da00199411545e0e167fcb9ce4ef2b27efa975 SHA512 9bbf3f6575763c022940efde947f845f52095a1bcf645f7f4a98feb335b62d2bd50d78420e7fe95f81eb139b110d8fe48112b025deace45f7994360b20d47e0b
 EBUILD splint-3.1.2-r1.ebuild 1001 BLAKE2B c96b4fdeeba281d26aa346a77bfa091934421215add9b6c81a93cc820f3ae16c5a20e023774e38b88e81a888a7dc5ee1c0e33626f4ae93537505866f93b937ae SHA512 8e4f2feb30a17f713410328823e9c44af8bf7ca2df44fc1504314cebffad44e1395c1e2ad185f24ea846456b79278ded4cfd8f799f2defebaa2061edfb53533b
 EBUILD splint-3.1.2-r2.ebuild 1104 BLAKE2B 34018ff5595437b51568457c6432c556a34cf4b3b18ccc2e10e487d594e7f743bd7971ccbb60172772570d77b16f42fb53e6a69e42384117dd354d336fa48f2b SHA512 a1c3235f37727e8edc66b23ea6527996b5074adc9492b54b095583a37ae094d988064e8583ba38665c386a6029f956c0f737b8d782cef80a94d18097a024f77d
-MISC metadata.xml 240 BLAKE2B 64fe413f69832b5396b621f50bc6f618ddea15ddd4044ac76da4557d7dc0d963ce6ba36c0d1c0a8911af48fd71a6e84c4981f15ac7bad40bbd801e52b568a23b SHA512 25affa2d6d2fe48707ae81553343451aff9797885b4232e73973a29d4cc1d28a937d024cefca49f92383f01eb8cb811546cd2334cbb78f8e66f1db1f63ff4572
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/splint/metadata.xml b/dev-util/splint/metadata.xml
index f9f8bbfd9405..6f49eba8f496 100644
--- a/dev-util/splint/metadata.xml
+++ b/dev-util/splint/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>jer@gentoo.org</email>
-	<name>Jeroen Roovers</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/dev-util/statifier/Manifest b/dev-util/statifier/Manifest
index fa1088e23c3d..96912efafe57 100644
--- a/dev-util/statifier/Manifest
+++ b/dev-util/statifier/Manifest
@@ -2,5 +2,5 @@ AUX statifier-1.7.4-clang.patch 344 BLAKE2B 6e5d2f48fa20c34c999cf898f943e9e61133
 AUX statifier-1.7.4-fix-build-system.patch 2104 BLAKE2B 019248feff682a75b90d1aca7eea425aded1b0f01e8dff4bd24410a474ef1350ed8215803915cb52df53866f6dc996428742d0a9187f55bbff17ce30894dd6b3 SHA512 a9bf5adf1206bbca84084df0680785e1f31902fb7ce4d455593ee35e0195ef9546de641d2f5372843afb7c8584fb04b1b13ee7973813ee8561a2282f2162cc87
 AUX statifier-1.7.4-musl.patch 673 BLAKE2B 1b1d46c44ae7675dd757219a40d0f255455308c27a0515c32ebdc629cbb6e1777e4a7d673c51cba42b7b82b4608ed1e69ab3d2aa7bda93b4171c0e9670e608db SHA512 285ed4d06080188b45a10c3e5da83c7e28e198cbe2f20dc84befa4d4b83850278c4f8e444898f6c419b8e13e41140875eb1e7960d9633a03b396a716c53bd03e
 DIST statifier-1.7.4.tar.gz 73245 BLAKE2B 897b78b31aa4f148b6a6a986251ba9d4f40ebad3209f71896ffffb71e06ab25d337a4a79adc0217592051f917bc71428d3032f6216ec053f62c4632edef474d5 SHA512 22d4873130bafe06144c8f6ce7089aa25e3eb047bbee5709344fee1e8d85b24aac689c88d34537fe4a690e231d768e56a2fa13672b9eccf27d945b3f8bcda756
-EBUILD statifier-1.7.4-r1.ebuild 1228 BLAKE2B bed2a64bbe3d79191a6073cbe2d8ecb8ae5163807ecdaf4426186608b593a4a227905cbdce76bef5f1419cd81d58b129ba3e3a3beb2cbc37cc58feee95e11ed5 SHA512 054f3b3821e844c271e083d5cf33cc21979684f66987ea049da7e1591c49da8cf002a55fb887baa77e56e715ab031f7c305c4c9d9cc76482d38b90fcd2c06a85
+EBUILD statifier-1.7.4-r1.ebuild 1232 BLAKE2B 48e6dfbda2e8ecc8ae459f3281b91b4474ed54ee2236acfdb50df5b3f2a062fd1faedaaaa46811e5422b0cd781906bee62495c48d19eafbb46b5b2708e7946bb SHA512 a33b5ef90f935d8a9933a901fc43201f96ee9bb5652387fb1eb60c46302efbab069cb78411e76d805210f5179ad37faf237a379d9fc4659f49831c8dd60bd1b6
 MISC metadata.xml 250 BLAKE2B d57634b040c498296655940e3ee580c8580075a4190e2600113cee5548ff44a2025568380f3d5d9f3ca0fcd1ea5d41c9871395ffbcf4bd32d8df6a494852a885 SHA512 c225bdf339347a1768b255d905f3831904cdc375f3d4e90e41c68645b8bcfe2dfdf8e6aa4c67063103f459808a387c8edd9b35b073b8be175f7a3bd490fe3dca
diff --git a/dev-util/statifier/statifier-1.7.4-r1.ebuild b/dev-util/statifier/statifier-1.7.4-r1.ebuild
index 553d4ee5f440..1899394b0d7b 100644
--- a/dev-util/statifier/statifier-1.7.4-r1.ebuild
+++ b/dev-util/statifier/statifier-1.7.4-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-MULTILIB_COMPAT=( abi_x86_{32,64} )
+MULTILIB_COMPAT=( abi_x86_{32,x32,64} )
 
 inherit flag-o-matic multilib-build toolchain-funcs
 
diff --git a/dev-util/sysdig-kmod/Manifest b/dev-util/sysdig-kmod/Manifest
index 733c86f49324..9d7af144c137 100644
--- a/dev-util/sysdig-kmod/Manifest
+++ b/dev-util/sysdig-kmod/Manifest
@@ -1,3 +1,5 @@
 DIST sysdig-0.27.0.tar.gz 933094 BLAKE2B e412bd2a35a62b580344a49e2deee85764710f91327cd63b42913dc361ee96943ffe51b90ee745c420454f0a4be455606d486a91ab3e103d7e396f04dc3f1ff4 SHA512 102150cc641165a6c18ce71e3c6148dc10700f614fec7e1909c29172e3cce02dfa16af56aabdcd420499d0aa89f90fee8f26d92a250b0a521d1b9d416c6a678f
+DIST sysdig-0.27.1.tar.gz 936415 BLAKE2B f4c15e3a2d4b974c5eafc8374f927dd82f123c05cc1976d04b08e77e1a7c0ff53f37c4e2c0022b7073fcc936310daf76ca3c3611141799ae4f51991bc6f3a0a3 SHA512 690f012c7db0a75ec2eb78fae17aae0f422aa1db0d4c2b15c4a09153fd2f60bd3c00d62238976fdcff2a906d87b2e34b81d02c0c78ad2684a1d6016a9988eb08
 EBUILD sysdig-kmod-0.27.0.ebuild 945 BLAKE2B be025ff85bfdf7de187e06439e44e1336604d282163b889c9af3846d64b278c1454f4a9f33ff5be19f2089688227b4d980b5b9e802fda4e5e08b18f5d68f62b7 SHA512 2373a4b32538b65d293832b93167f5ffbc1b6f4eed9fdcac10104c15d5eed955cd8239368fe5be929b6bf28c59cd678ef6ead0f9701ee9fb8b90f3e82b145acd
+EBUILD sysdig-kmod-0.27.1.ebuild 945 BLAKE2B be025ff85bfdf7de187e06439e44e1336604d282163b889c9af3846d64b278c1454f4a9f33ff5be19f2089688227b4d980b5b9e802fda4e5e08b18f5d68f62b7 SHA512 2373a4b32538b65d293832b93167f5ffbc1b6f4eed9fdcac10104c15d5eed955cd8239368fe5be929b6bf28c59cd678ef6ead0f9701ee9fb8b90f3e82b145acd
 MISC metadata.xml 325 BLAKE2B a4fb1518abfc94ae4f45d30f85ab3cfec6139025f302fc46725275e1a0ef9d789de1f55b07330dd7aed44cfee60c688d4ba95e3f67832f5581066ad833cf2e2a SHA512 51815b800827d94d1c554de9fde3d97b67a4f2f83847826a8aaede5c84dfab95401526ea670bd84e79ba435a1439c109ef3b27e313cb2bafc0c49639bf02ff68
diff --git a/dev-util/sysdig-kmod/sysdig-kmod-0.27.1.ebuild b/dev-util/sysdig-kmod/sysdig-kmod-0.27.1.ebuild
new file mode 100644
index 000000000000..ba7201399d5c
--- /dev/null
+++ b/dev-util/sysdig-kmod/sysdig-kmod-0.27.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake linux-mod
+
+MY_P=${P/-kmod}
+DESCRIPTION="Kernel module for dev-util/sysdig"
+HOMEPAGE="https://sysdig.com/"
+SRC_URI="https://github.com/draios/sysdig/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="|| ( MIT GPL-2 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="!<=dev-util/sysdig-0.26.4[modules]"
+
+CONFIG_CHECK="HAVE_SYSCALL_TRACEPOINTS ~TRACEPOINTS"
+
+pkg_pretend() {
+	linux-mod_pkg_setup
+}
+
+pkg_setup() {
+	linux-mod_pkg_setup
+}
+
+src_prepare() {
+	sed -i -e '/USE_BUNDLED_DEPS/,$d' CMakeLists.txt || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		# we will use linux-mod for that
+		-DBUILD_DRIVER=OFF
+	)
+
+	cmake_src_configure
+
+	# setup linux-mod ugliness
+	MODULE_NAMES="sysdig-probe(extra:${BUILD_DIR}/driver/src:)"
+	BUILD_PARAMS='KERNELDIR="${KERNEL_DIR}"'
+	BUILD_TARGETS="all"
+}
diff --git a/dev-util/sysdig/Manifest b/dev-util/sysdig/Manifest
index 32ed4f7e8f96..1c9cd51862fa 100644
--- a/dev-util/sysdig/Manifest
+++ b/dev-util/sysdig/Manifest
@@ -1,3 +1,5 @@
 DIST sysdig-0.27.0.tar.gz 933094 BLAKE2B e412bd2a35a62b580344a49e2deee85764710f91327cd63b42913dc361ee96943ffe51b90ee745c420454f0a4be455606d486a91ab3e103d7e396f04dc3f1ff4 SHA512 102150cc641165a6c18ce71e3c6148dc10700f614fec7e1909c29172e3cce02dfa16af56aabdcd420499d0aa89f90fee8f26d92a250b0a521d1b9d416c6a678f
+DIST sysdig-0.27.1.tar.gz 936415 BLAKE2B f4c15e3a2d4b974c5eafc8374f927dd82f123c05cc1976d04b08e77e1a7c0ff53f37c4e2c0022b7073fcc936310daf76ca3c3611141799ae4f51991bc6f3a0a3 SHA512 690f012c7db0a75ec2eb78fae17aae0f422aa1db0d4c2b15c4a09153fd2f60bd3c00d62238976fdcff2a906d87b2e34b81d02c0c78ad2684a1d6016a9988eb08
 EBUILD sysdig-0.27.0.ebuild 1446 BLAKE2B 8cacc86c38675a24c5b8d7e6402259ee6cf88035e08967bdfa43c24025be755cc326674d10189a3dbbd4331380b3b9f911375aa98507db8da708c4f93e6668f9 SHA512 2b2bec125737f8c5741b76c83844af1694c5753a2c9e10724d0e6483e2bc985162cbe85b0f724d2f49478e3b279df6e1de67235beabb7d6fb0051d077e9c775d
+EBUILD sysdig-0.27.1.ebuild 1446 BLAKE2B 8cacc86c38675a24c5b8d7e6402259ee6cf88035e08967bdfa43c24025be755cc326674d10189a3dbbd4331380b3b9f911375aa98507db8da708c4f93e6668f9 SHA512 2b2bec125737f8c5741b76c83844af1694c5753a2c9e10724d0e6483e2bc985162cbe85b0f724d2f49478e3b279df6e1de67235beabb7d6fb0051d077e9c775d
 MISC metadata.xml 507 BLAKE2B 4e19c0d3370019c80eda625ae812a4485139ab8a83285946ebc6ef62abad280beaefaaac29d7a57e14b5ca5448bd9d1c23a8cf6a4f783149633dd09e7ae1465c SHA512 d218731de7acfbbfa3c3043b2d942c00b7f5aff1a020b6dca2019f202be3a5390f44337e04691a0d4641e661f7581f703db5fda3d2a116c0d63fb7d9da25ed06
diff --git a/dev-util/sysdig/sysdig-0.27.1.ebuild b/dev-util/sysdig/sysdig-0.27.1.ebuild
new file mode 100644
index 000000000000..55a20f694f42
--- /dev/null
+++ b/dev-util/sysdig/sysdig-0.27.1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 cmake
+
+DESCRIPTION="A system exploration and troubleshooting tool"
+HOMEPAGE="https://sysdig.com/"
+SRC_URI="https://github.com/draios/sysdig/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl +modules test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	app-misc/jq:0=
+	dev-cpp/tbb:0=
+	dev-lang/luajit:2=
+	>=dev-libs/jsoncpp-0.6_pre:0=
+	dev-libs/libb64:0=
+	dev-libs/protobuf:0=
+	net-dns/c-ares:0=
+	net-libs/grpc:0=
+	sys-libs/ncurses:0=
+	sys-libs/zlib:0=
+	libressl? ( dev-libs/libressl:0= )
+	!libressl? ( dev-libs/openssl:0= )
+	net-misc/curl:0="
+DEPEND="${RDEPEND}
+	virtual/os-headers
+	test? ( dev-cpp/gtest )"
+PDEPEND="
+	modules? ( >=dev-util/sysdig-kmod-${PV} )"
+
+src_prepare() {
+	sed -i -e 's:-ggdb::' CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCREATE_TEST_TARGETS=$(usex test)
+
+		# done in dev-util/sysdig-kmod
+		-DBUILD_DRIVER=OFF
+		# libscap examples are not installed or really useful
+		-DBUILD_LIBSCAP_EXAMPLES=OFF
+
+		# unbundle the deps
+		-DUSE_BUNDLED_DEPS=OFF
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	# remove sources
+	rm -r "${ED}"/usr/src || die
+
+	# move bashcomp to the proper location
+	dobashcomp "${ED}"/usr/etc/bash_completion.d/sysdig || die
+	rm -r "${ED}"/usr/etc || die
+}
diff --git a/dev-util/sysprof-capture/Manifest b/dev-util/sysprof-capture/Manifest
index 31a9e5c50ba9..e7bd00eb5bca 100644
--- a/dev-util/sysprof-capture/Manifest
+++ b/dev-util/sysprof-capture/Manifest
@@ -1,5 +1,5 @@
-DIST sysprof-3.34.1.tar.xz 372612 BLAKE2B 3a50a00f29866ae8bf03cc7a57b598e40a6a37ad88ac2159087e4f2a8a6a5cef09b345dc5332fb1df9036c4e159e98f19adda45588150b059af313878b9b554c SHA512 5f2d820935291a3b578222d5daa87b0a2f74cd16d14daca19065495be61cf7359f00f12f452a5c0b4e05dfeb94e2376017c2288cad92dc0c4bb9bca51b903d19
 DIST sysprof-3.36.0.tar.xz 435956 BLAKE2B 990a6c6c28339594df915ed1fb98f504bf6b080a5e3c31af0cc4bcfd208027361f02a9068291692d082787a6fd42ab414079122a63e4706aee2511040379f0c8 SHA512 41f99cc3446a6624ea74fcdecd7a29a2e5e2d4086383d59a9064c4a3df5d9b8d08f4903ff4dcc85ffa9c6d42bd84dec5c03f6010fffd4415cc8fecf4dc0b23f4
-EBUILD sysprof-capture-3.34.1-r1.ebuild 1158 BLAKE2B 28a75972c7e9aea4a7115985a0f82bceb3b487c04380b9779c5fc5450000aa47c847d3b03096c760b16a6f08fbc55e8672228537ecd70f0ed5c6cf06dfebf93f SHA512 e55ebb10bfbfb5805ba545441abf5c55f4c2ebbf820680edb27d275e92f388e7f183521faecdb048f6b34dbaaf1811e59be63c45ec80957a601c53de4db65a07
+DIST sysprof-3.38.1.tar.xz 458572 BLAKE2B 68c219a6c80ed070314fc7718a2995c49821cc7c761b277fdd29c233da9d81b561b6c68cd0d0a42cc3e4c150e3de438322f7d418140ce19f3381f4ffac78aa1a SHA512 7ba3dd51bd4055dcdf4d46ff87e46537afe42ba009809fdee5ba0ebcdf70776d9e1ff812714096d33b09ac57d459707b92b1ca07682e2f3888b612ca74820442
 EBUILD sysprof-capture-3.36.0.ebuild 929 BLAKE2B d3eb2dd1588bd42872120abb7145df27e9cd1a16baf1aa07387abb22fe588e3902430877c9b84e71310aaa5af2cddd9e2008e68c56fdd056bcaa950a5d424896 SHA512 ffc8dfcb4aaa36a2af7fadee096ffe103ddd49aa6356e5909e2b1fbf1c4398a357a6c303ff71a45524a4391398a5dcd8937018831a57d22b3b50e21448dd83e6
+EBUILD sysprof-capture-3.38.1.ebuild 899 BLAKE2B 6a436fee3348ce2894612aa6e85f7da9763cd548de778261e5b81e3eacacb3a9456da54a7a456fdd580aeabf94d75bf27b73ee79cefe06086f1ab8032697e8eb SHA512 48ab1c769f38aaef628a3daa3aac695469741f261cba3cdf57491ecd946575ca6eafcfe53c249e089536dde7db43ee44d27ab98aa0f5799509806320dc9271b4
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/sysprof-capture/sysprof-capture-3.34.1-r1.ebuild b/dev-util/sysprof-capture/sysprof-capture-3.38.1.ebuild
index cdc63554ec99..c2eafbf121c1 100644
--- a/dev-util/sysprof-capture/sysprof-capture-3.34.1-r1.ebuild
+++ b/dev-util/sysprof-capture/sysprof-capture-3.38.1.ebuild
@@ -4,14 +4,14 @@
 EAPI=7
 GNOME_ORG_MODULE="sysprof"
 
-inherit gnome.org meson systemd
+inherit gnome.org meson multilib-minimal systemd
 
 DESCRIPTION="Static library for sysprof capture data generation"
 HOMEPAGE="http://sysprof.com/"
 
 LICENSE="GPL-3+ GPL-2+"
-SLOT="3"
-KEYWORDS="amd64 x86"
+SLOT="4"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.61.3:2
@@ -23,14 +23,7 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-src_prepare() {
-	default
-	# In 3.34.1 -Dlibsysprof=false still installs various data files related with it;
-	# some of these seem fixed by 3.36
-	sed -i -e '/subdir.*data/d' meson.build || die
-}
-
-src_configure() {
+multilib_src_configure() {
 	local emesonargs=(
 		-Denable_gtk=false
 		-Dlibsysprof=false
@@ -38,13 +31,19 @@ src_configure() {
 		-Dsystemdunitdir=$(systemd_get_systemunitdir)
 		# -Ddebugdir
 		-Dhelp=false
+		-Dlibunwind=false
 	)
 	meson_src_configure
 }
 
-src_install() {
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_test() {
+	meson_src_test
+}
+
+multilib_src_install() {
 	meson_src_install
-	# In 3.36 these shouldn't be needed with with_sysprofd=none
-	rm "${ED}"/usr/share/dbus-1/interfaces/org.gnome.Sysprof2.xml || die
-	rm "${ED}"/usr/share/dbus-1/interfaces/org.gnome.Sysprof3.Service.xml || die
 }
diff --git a/dev-util/sysprof/Manifest b/dev-util/sysprof/Manifest
index 7d357b3738e6..276ae7cb532e 100644
--- a/dev-util/sysprof/Manifest
+++ b/dev-util/sysprof/Manifest
@@ -1,6 +1,4 @@
 AUX 3.36.0-fix-32bit-tests-build.patch 916 BLAKE2B 17301f082a57bd513da3f82e4adbabe3b577bbbaa8623ac3882e2b69555d384b4ecb3cc74676f10d06d58907f831536164c40bb3dc82443a25f6e7664c0af48e SHA512 901a5781cb6acdf7febad8fd264d16b1aeacbfc6c44126593d75b4f271aa0925da65a846b8b27afe42633e491994ab68913bd36484b6b77473fe8adb972e28cc
-DIST sysprof-3.34.1.tar.xz 372612 BLAKE2B 3a50a00f29866ae8bf03cc7a57b598e40a6a37ad88ac2159087e4f2a8a6a5cef09b345dc5332fb1df9036c4e159e98f19adda45588150b059af313878b9b554c SHA512 5f2d820935291a3b578222d5daa87b0a2f74cd16d14daca19065495be61cf7359f00f12f452a5c0b4e05dfeb94e2376017c2288cad92dc0c4bb9bca51b903d19
 DIST sysprof-3.36.0.tar.xz 435956 BLAKE2B 990a6c6c28339594df915ed1fb98f504bf6b080a5e3c31af0cc4bcfd208027361f02a9068291692d082787a6fd42ab414079122a63e4706aee2511040379f0c8 SHA512 41f99cc3446a6624ea74fcdecd7a29a2e5e2d4086383d59a9064c4a3df5d9b8d08f4903ff4dcc85ffa9c6d42bd84dec5c03f6010fffd4415cc8fecf4dc0b23f4
-EBUILD sysprof-3.34.1-r1.ebuild 2178 BLAKE2B c7af4fa12f96de0aff7639364be3fd34574646a1345c27210b3ec6275a3fec64e002c43479dc290906983a673b319b68481469ccf954a270a74c0269290c43ca SHA512 3ef91c9ebe8d26f96bc0ecde85ca9c171c573c6c29a7050554301e4933ab5bb214a9069bb459129bbdc2b99c16b45197c69b4603ebf7270f648ff3d96dcd7681
 EBUILD sysprof-3.36.0.ebuild 2307 BLAKE2B 1568508955c5be1b360553aa1e1aaba72ebd4f4c2e62884ebcfc8b0f0cff7ba2032159b3a9ef414c1cb56944f33662c65016a43d59b115a1763fea3be55fe112 SHA512 c350410c8775e4f8ec6817d73add43a86afd36fcd4d3a303f9e87aef642edbbfaaa799a685f8cd70aa579b86fff71f224e0ee120b47b21722330f396b62fffe2
 MISC metadata.xml 704 BLAKE2B 0f16b3a4886ed687e5e889f9cacee3148f0ed4c80f5bc88c66217dcd7d411a0e900710d36e7e9a12995872f75b247f231fd1a085fe699a3b3d14d48e67e13dbd SHA512 247b92c056fe9b224ca5a096825223b883534af67bdd514dfa424460ee3b50cf7187bdd81fc70c64b1073477e7292f19d92d8d5112c1f27472f59e59bcae450d
diff --git a/dev-util/sysprof/sysprof-3.34.1-r1.ebuild b/dev-util/sysprof/sysprof-3.34.1-r1.ebuild
deleted file mode 100644
index 834dacd878d4..000000000000
--- a/dev-util/sysprof/sysprof-3.34.1-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org gnome2-utils meson systemd xdg
-
-DESCRIPTION="System-wide Linux Profiler"
-HOMEPAGE="http://sysprof.com/"
-
-LICENSE="GPL-3+ GPL-2+"
-API_VERSION="3"
-SLOT="0/${API_VERSION}"
-KEYWORDS="amd64 x86"
-IUSE="gtk"
-
-RDEPEND="
-	>=dev-libs/glib-2.61.3:2
-	gtk? (
-		>=x11-libs/gtk+-3.22.0:3
-		>=dev-libs/libdazzle-3.30.0
-	)
-	>=sys-auth/polkit-0.114
-	>=dev-util/sysprof-capture-3.34.1-r1:${API_VERSION}
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-libs/appstream-glib
-	dev-util/gdbus-codegen
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	>=sys-kernel/linux-headers-2.6.32
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	xdg_src_prepare
-	# These are installed by dev-util/sysprof-capture
-	sed -i -e '/install/d' src/libsysprof-capture/meson.build || die
-	sed -i -e 's/pkgconfig\.generate/subdir_done()\npkgconfig\.generate/' src/libsysprof-capture/meson.build || die
-}
-
-src_configure() {
-	# -Dwith_sysprofd=host currently unavailable from ebuild
-	local emesonargs=(
-		$(meson_use gtk enable_gtk)
-		-Dlibsysprof=true
-		-Dwith_sysprofd=bundled
-		-Dsystemdunitdir=$(systemd_get_systemunitdir)
-		# -Ddebugdir
-		-Dhelp=true
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	# installed by sysprof-capture, as mutter needs it at build time
-	rm "${ED}"/usr/share/dbus-1/interfaces/org.gnome.Sysprof3.Profiler.xml || die
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-
-	elog "On many systems, especially amd64, it is typical that with a modern"
-	elog "toolchain -fomit-frame-pointer for gcc is the default, because"
-	elog "debugging is still possible thanks to gcc4/gdb location list feature."
-	elog "However sysprof is not able to construct call trees if frame pointers"
-	elog "are not present. Therefore -fno-omit-frame-pointer CFLAGS is suggested"
-	elog "for the libraries and applications involved in the profiling. That"
-	elog "means a CPU register is used for the frame pointer instead of other"
-	elog "purposes, which means a very minimal performance loss when there is"
-	elog "register pressure."
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/dev-util/umockdev/Manifest b/dev-util/umockdev/Manifest
index f8c18ed8260c..7d0c9e23a535 100644
--- a/dev-util/umockdev/Manifest
+++ b/dev-util/umockdev/Manifest
@@ -1,3 +1,3 @@
 DIST umockdev-0.12.1.tar.xz 756920 BLAKE2B a8c1d9734f4c0a8e7f19405e011ce964efce6621b4886efead88e040bfe07d2f5a85f063977dfed1c8fb5a5bf4668024b6e687b688a9609cdba1db419518a8ac SHA512 a8995d09179c7d2d37d319f8e675fb15c3caa605c57b56cbb2e785088909d886e790864475feb82ab2b6eb2449038c636a06250d4f9eb8b28b38f0d80574824c
-EBUILD umockdev-0.12.1.ebuild 1200 BLAKE2B c9f99392023e772edc55c016224778cc76204d232a7e29e7756f68a62cbe3e468e8a09f27db8022781c239fdd1e6ce8ec39930494c334624b4f706b535d69b36 SHA512 1604fe4fc9e3af3e5907bc2f0865da6a8af6c9612c6067b3b329b3ceb91b9484d0dd8c0776c6dbd0a9ca7d3aefe150fe172cfbff46647ca41bc193cdd1b11be7
+EBUILD umockdev-0.12.1.ebuild 1207 BLAKE2B ca4f162dae088382eb619e58dac0a0e6e7c481ba7784267de9e0ab00ec08f5755a6aa3554f52ea62ebb3eb02b4f36de006b2d632746797694d7d87607320188c SHA512 a206ee1fb26cfc0a3cee18351a7dffc533b890bb8b603eaab349e253d701a582e96868d39b88aa0d01a238c3435982afe9c13fcb3cc91413279abf6f75f8cb0a
 MISC metadata.xml 388 BLAKE2B 5140e5be03021c8b50516cddf6a51b8715a1e110e13519313cd3e30b2317874cec5c56eea5168d47496a2055635b87effcc66dac54a66a482818da15b540186d SHA512 ca1c14fa200681d916d6d4539fa9ee8c64d6894d7b78870abfc4ad03446a30703f0fe862a11c5838e26719ae66e0bc944fe0ca75f0f89195128d4e8856b6cd78
diff --git a/dev-util/umockdev/umockdev-0.12.1.ebuild b/dev-util/umockdev/umockdev-0.12.1.ebuild
index a3ebfc339420..91b6c9f98ed0 100644
--- a/dev-util/umockdev/umockdev-0.12.1.ebuild
+++ b/dev-util/umockdev/umockdev-0.12.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/martinpitt/umockdev/releases/download/${PV}/${P}.tar
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~ppc64 x86"
 IUSE="+introspection static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/valgrind/Manifest b/dev-util/valgrind/Manifest
index 3c3b3a23197d..630aed801dd7 100644
--- a/dev-util/valgrind/Manifest
+++ b/dev-util/valgrind/Manifest
@@ -1,12 +1,6 @@
 AUX valgrind-3.15.0-Build-ldst_multiple-test-with-fno-pie.patch 650 BLAKE2B ffb545d6af214a5bd43ff800d52e0d7cfc03feac8d2466da8d4935db659172cd50cf3e2d63b3aff46d81b21846b304671506cd235b710037218fc16e0ef66438 SHA512 7cb5a46c2d8ed4360053289994014b334e32d48b0608ed58662486bd432c31835ef16e2cdfd734f3e4d720e272d2507ec76f0b77e1364237e9f6dbbd97a8abb6
 AUX valgrind-3.7.0-respect-flags.patch 360 BLAKE2B 020b9e3af2c6393193edd8be99ff2309f4b138915bd0315090cebd902747678a5b655a8178a8ec8e88782286470922aed505d2a69d6da4d295fd2053d640b035 SHA512 efdb017283b6a5829d1a5acc31b42ddd177a3ab468eb062b8c4fd90b2dbd06679e8d8bc2d6f813e3001efdda831d4410cc8da3a3e42ee2e49efea0423e4b3ca3
-DIST valgrind-3.14.0.tar.bz2 16602858 BLAKE2B 00d601593388180cc874cf2f0c78e79f705f145e45ea82996117cb91ba881e7888ef241fb7e45927f82f99666d76ed35cb5d451e9a3ef123c04a0dff233b2269 SHA512 68e548c42df31dc2b883a403e0faff7480c49b3054841870f5d2f742141ba199eca5d83c96bbf283115f0633f2bdb0860161d422f98e3ec720ec65760d250f97
-DIST valgrind-3.15.0.tar.bz2 20241437 BLAKE2B a1bd46d46b3cd9f963773d011e7c74bf5e09e59be13afe38229a3c66a89eeb416498faed67d6ec21489b630b55ac73cc212e17ba515884f8b6374849a60e3720 SHA512 5695d1355226fb63b0c80809ed43bb077b6eed4d427792d9d7ed944c38b557a84fe3c783517b921e32f161228e10e4625bea0550faa4685872bb4454450cfa7f
-DIST valgrind-3.16.0.tar.bz2 16267317 BLAKE2B 4ab7a248bc46a772a03fecdab4658b059e65dc328f422f51d23d116d658b8fcfe1dc4b3b26b43ca7bd824169b169506f67cd14a1db2b767b5b5a34c949687d25 SHA512 6c82a0121e0ffde79f84943ea0f5791159ad3e37a490c1a18ff23f41cd4de62b62110e9c4d48b95b06d542f2a6d638492ecaeba9fed48f7e909e959aa4b4856d
 DIST valgrind-3.16.1.tar.bz2 16262776 BLAKE2B 1c333c26827f7a8356869e8758da9dd6a7444642ac4f6377c84fdab8349b9cee1e9bf2cf2eb86043c4feffab342dd97da20e76d7566d0296189e6ea8483a8c65 SHA512 2a4173efe1b6facdd2f5c5ee8ed006704168eba1813736fccc8191d60363afd96197512cf42037e65f18d4ddd49adc74a54c47210df216fba3c46bf68ef0f950
-EBUILD valgrind-3.14.0.ebuild 3682 BLAKE2B b5c775610622d2aa48db013dfe9cfc6d8db508b825df2cc3f7759de9d0467161cb7d5eb8c18aee8532ebf04a9aebfa3663b88661bc4d3d747916997a71d1904f SHA512 8fddf0b86912858fcd60ba23e301934dbd256efbbd8f08ba9972167cd04ab512f5f759acd3dd2a7c12e45428bb25ebb3674bd60b84cc6ab1dac38f492f9a8952
-EBUILD valgrind-3.15.0.ebuild 3760 BLAKE2B 1f405ff5df90f34b165b7d35ce319d742c6b5877255426516efa3f042ac9e0defaa5f1e12f150e25c46063c0de507fea017823153f35fc82a13f13d520c6802a SHA512 6b00bfd3d64ffa99d9a4757c1f7a3e534754e454424f95ed2f9390d248a1221d4391c9405807c8801621ca1c8cb7d5c83a765875a553c59e96ab638695fe1974
-EBUILD valgrind-3.16.0.ebuild 3766 BLAKE2B 820536cd71c55c9fa35f77b014d7a5c5936fc845773b1523ef79c9c6e47d632e1633e2f60cd378b33610c396d57ca71241517de1817aad86402836376b954320 SHA512 454562b3e6725accb06c4d06450eb2e30cc5e4819932ad227d5b6f8b58b0b9b9d8f9966ac1c2294e8f7dc05a0f75bc29eb31c7084c27c3259d47306246481e26
-EBUILD valgrind-3.16.1.ebuild 3761 BLAKE2B 5f4a709fb8bdb360aab17ca7047f62e66322072f72102028d0244df1b6350d97bd1c4332d801e18f95e0cded1a2f23625a4db0b27485dee7b302472d9137b433 SHA512 b3972805f1ca91e477601179b33c01ebe21e0ace88ed88678ed1af37d015e64ccb0ce77b8278a9bd893453c126a5000a08b66c1cf5aca677e06ad6946a9d3283
-EBUILD valgrind-9999.ebuild 3753 BLAKE2B 546a516d9a909f44e1c8dc20ace9025826335e2910e3652e1c7592804765fd4d679f6422276399c7629e2b711236181958dfe435198b8ebd8327b6f637cd67fd SHA512 64831f5594eee66cb5ed5a1afbc44708cf0f334e05b22e46c4675f35528628f5bb6f89981de420bcae568b18dee4767150a6465f75f1451cdd128bf297dd04bd
+EBUILD valgrind-3.16.1.ebuild 3760 BLAKE2B a36c9fd765bfa21e5d4f8c475b3bb418a6729b577b42165f048d46d27e7879e2b8be98d6aa109abf821e681233c55323321d8ce0b6c5709469e8f76246543368 SHA512 3668fbd8f29746d4aaf94a50046b8bd7ba2dde9c9d6bee457dac48c8b7d2a4a1979f201a2028a2c27c8e0567453bba0bb0910a6490216053c9a4d841331441e9
+EBUILD valgrind-9999.ebuild 3766 BLAKE2B 820536cd71c55c9fa35f77b014d7a5c5936fc845773b1523ef79c9c6e47d632e1633e2f60cd378b33610c396d57ca71241517de1817aad86402836376b954320 SHA512 454562b3e6725accb06c4d06450eb2e30cc5e4819932ad227d5b6f8b58b0b9b9d8f9966ac1c2294e8f7dc05a0f75bc29eb31c7084c27c3259d47306246481e26
 MISC metadata.xml 1027 BLAKE2B df13361ec401ce5e0bfa11e51378c432405bd296a874d8c71c26c9cbdf0171689e4b3134b5e05672dfc22bbcd6e2b6c74b96c47367725c209990d3e1fcc65e7b SHA512 da5bcaf596f2adaa552cc3b7296891b40be0bafec8a12695076ce8fbe660b8aabe70508eb02ab3fb66b0d9dd0c0c8615f430c1ee0ce3f3579732ea2406c8a778
diff --git a/dev-util/valgrind/valgrind-3.14.0.ebuild b/dev-util/valgrind/valgrind-3.14.0.ebuild
deleted file mode 100644
index cd973a989871..000000000000
--- a/dev-util/valgrind/valgrind-3.14.0.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools flag-o-matic toolchain-funcs multilib pax-utils
-
-DESCRIPTION="An open-source memory debugger for GNU/Linux"
-HOMEPAGE="http://www.valgrind.org"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="mpi"
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://sourceware.org/git/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="ftp://sourceware.org/pub/valgrind/${P}.tar.bz2"
-	KEYWORDS="-* amd64 arm ~arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
-fi
-
-DEPEND="mpi? ( virtual/mpi )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# Correct hard coded doc location
-	sed -i -e "s:doc/valgrind:doc/${PF}:" docs/Makefile.am || die
-
-	# Don't force multiarch stuff on OSX, bug #306467
-	sed -i -e 's:-arch \(i386\|x86_64\)::g' Makefile.all.am || die
-
-	# Respect CFLAGS, LDFLAGS
-	eapply "${FILESDIR}"/${PN}-3.7.0-respect-flags.patch
-
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		# upstream doesn't support this, but we don't build with
-		# Sun/Oracle ld, we have a GNU toolchain, so get some things
-		# working the Linux/GNU way
-		find "${S}" -name "Makefile.am" -o -name "Makefile.tool.am" | xargs \
-			sed -i -e 's:-M,/usr/lib/ld/map.noexstk:-z,noexecstack:' || die
-		cp "${S}"/coregrind/link_tool_exe_{linux,solaris}.in
-	fi
-
-	# Allow users to test their own patches
-	eapply_user
-
-	# Regenerate autotools files
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=()
-
-	# Respect ar, bug #468114
-	tc-export AR
-
-	# -fomit-frame-pointer	"Assembler messages: Error: junk `8' after expression"
-	#                       while compiling insn_sse.c in none/tests/x86
-	# -fstack-protector     more undefined references to __guard and __stack_smash_handler
-	#                       because valgrind doesn't link to glibc (bug #114347)
-	# -fstack-protector-all    Fails same way as -fstack-protector/-fstack-protector-strong.
-	#                          Note: -fstack-protector-explicit is a no-op for Valgrind, no need to strip it
-	# -fstack-protector-strong See -fstack-protector (bug #620402)
-	# -m64 -mx32			for multilib-portage, bug #398825
-	# -ggdb3                segmentation fault on startup
-	filter-flags -fomit-frame-pointer
-	filter-flags -fstack-protector
-	filter-flags -fstack-protector-all
-	filter-flags -fstack-protector-strong
-	filter-flags -m64 -mx32
-	replace-flags -ggdb3 -ggdb2
-
-	if use amd64 || use ppc64; then
-		! has_multilib_profile && myconf+=("--enable-only64bit")
-	fi
-
-	# Force bitness on darwin, bug #306467
-	use x86-macos && myconf+=("--enable-only32bit")
-	use x64-macos && myconf+=("--enable-only64bit")
-
-	# Don't use mpicc unless the user asked for it (bug #258832)
-	if ! use mpi; then
-		myconf+=("--without-mpicc")
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-
-	if [[ ${PV} == "9999" ]]; then
-		# Otherwise FAQ.txt won't exist:
-		emake -C docs FAQ.txt
-		mv docs/FAQ.txt . || die "Couldn't move FAQ.txt"
-	fi
-
-	dodoc FAQ.txt
-
-	pax-mark m "${ED}"/usr/$(get_libdir)/valgrind/*-*-linux
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# fix install_names on shared libraries, can't turn them into bundles,
-		# as dyld won't load them any more then, bug #306467
-		local l
-		for l in "${ED}"/usr/lib/valgrind/*.so ; do
-			install_name_tool -id "${EPREFIX}"/usr/lib/valgrind/${l##*/} "${l}"
-		done
-	fi
-}
-
-pkg_postinst() {
-	elog "Valgrind will not work if glibc does not have debug symbols."
-	elog "To fix this you can add splitdebug to FEATURES in make.conf"
-	elog "and remerge glibc.  See:"
-	elog "https://bugs.gentoo.org/show_bug.cgi?id=214065"
-	elog "https://bugs.gentoo.org/show_bug.cgi?id=274771"
-	elog "https://bugs.gentoo.org/show_bug.cgi?id=388703"
-}
diff --git a/dev-util/valgrind/valgrind-3.15.0.ebuild b/dev-util/valgrind/valgrind-3.15.0.ebuild
deleted file mode 100644
index 41693c4f120d..000000000000
--- a/dev-util/valgrind/valgrind-3.15.0.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools flag-o-matic toolchain-funcs multilib pax-utils
-
-DESCRIPTION="An open-source memory debugger for GNU/Linux"
-HOMEPAGE="http://www.valgrind.org"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="mpi"
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://sourceware.org/git/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="ftp://sourceware.org/pub/valgrind/${P}.tar.bz2"
-	KEYWORDS="-* amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
-fi
-
-DEPEND="mpi? ( virtual/mpi )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# Correct hard coded doc location
-	sed -i -e "s:doc/valgrind:doc/${PF}:" docs/Makefile.am || die
-
-	# Don't force multiarch stuff on OSX, bug #306467
-	sed -i -e 's:-arch \(i386\|x86_64\)::g' Makefile.all.am || die
-
-	# Respect CFLAGS, LDFLAGS
-	eapply "${FILESDIR}"/${PN}-3.7.0-respect-flags.patch
-
-	eapply "${FILESDIR}"/${PN}-3.15.0-Build-ldst_multiple-test-with-fno-pie.patch
-
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		# upstream doesn't support this, but we don't build with
-		# Sun/Oracle ld, we have a GNU toolchain, so get some things
-		# working the Linux/GNU way
-		find "${S}" -name "Makefile.am" -o -name "Makefile.tool.am" | xargs \
-			sed -i -e 's:-M,/usr/lib/ld/map.noexstk:-z,noexecstack:' || die
-		cp "${S}"/coregrind/link_tool_exe_{linux,solaris}.in
-	fi
-
-	# Allow users to test their own patches
-	eapply_user
-
-	# Regenerate autotools files
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=()
-
-	# Respect ar, bug #468114
-	tc-export AR
-
-	# -fomit-frame-pointer	"Assembler messages: Error: junk `8' after expression"
-	#                       while compiling insn_sse.c in none/tests/x86
-	# -fstack-protector     more undefined references to __guard and __stack_smash_handler
-	#                       because valgrind doesn't link to glibc (bug #114347)
-	# -fstack-protector-all    Fails same way as -fstack-protector/-fstack-protector-strong.
-	#                          Note: -fstack-protector-explicit is a no-op for Valgrind, no need to strip it
-	# -fstack-protector-strong See -fstack-protector (bug #620402)
-	# -m64 -mx32			for multilib-portage, bug #398825
-	# -ggdb3                segmentation fault on startup
-	filter-flags -fomit-frame-pointer
-	filter-flags -fstack-protector
-	filter-flags -fstack-protector-all
-	filter-flags -fstack-protector-strong
-	filter-flags -m64 -mx32
-	replace-flags -ggdb3 -ggdb2
-
-	if use amd64 || use ppc64; then
-		! has_multilib_profile && myconf+=("--enable-only64bit")
-	fi
-
-	# Force bitness on darwin, bug #306467
-	use x86-macos && myconf+=("--enable-only32bit")
-	use x64-macos && myconf+=("--enable-only64bit")
-
-	# Don't use mpicc unless the user asked for it (bug #258832)
-	if ! use mpi; then
-		myconf+=("--without-mpicc")
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-
-	if [[ ${PV} == "9999" ]]; then
-		# Otherwise FAQ.txt won't exist:
-		emake -C docs FAQ.txt
-		mv docs/FAQ.txt . || die "Couldn't move FAQ.txt"
-	fi
-
-	dodoc FAQ.txt
-
-	pax-mark m "${ED}"/usr/$(get_libdir)/valgrind/*-*-linux
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# fix install_names on shared libraries, can't turn them into bundles,
-		# as dyld won't load them any more then, bug #306467
-		local l
-		for l in "${ED}"/usr/lib/valgrind/*.so ; do
-			install_name_tool -id "${EPREFIX}"/usr/lib/valgrind/${l##*/} "${l}"
-		done
-	fi
-}
-
-pkg_postinst() {
-	elog "Valgrind will not work if glibc does not have debug symbols."
-	elog "To fix this you can add splitdebug to FEATURES in make.conf"
-	elog "and remerge glibc.  See:"
-	elog "https://bugs.gentoo.org/show_bug.cgi?id=214065"
-	elog "https://bugs.gentoo.org/show_bug.cgi?id=274771"
-	elog "https://bugs.gentoo.org/show_bug.cgi?id=388703"
-}
diff --git a/dev-util/valgrind/valgrind-3.16.0.ebuild b/dev-util/valgrind/valgrind-3.16.0.ebuild
deleted file mode 100644
index 33873a0e69c3..000000000000
--- a/dev-util/valgrind/valgrind-3.16.0.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools flag-o-matic toolchain-funcs multilib pax-utils
-
-DESCRIPTION="An open-source memory debugger for GNU/Linux"
-HOMEPAGE="http://www.valgrind.org"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="mpi"
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://sourceware.org/git/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="ftp://sourceware.org/pub/valgrind/${P}.tar.bz2"
-	KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
-fi
-
-DEPEND="mpi? ( virtual/mpi )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# Correct hard coded doc location
-	sed -i -e "s:doc/valgrind:doc/${PF}:" docs/Makefile.am || die
-
-	# Don't force multiarch stuff on OSX, bug #306467
-	sed -i -e 's:-arch \(i386\|x86_64\)::g' Makefile.all.am || die
-
-	# Respect CFLAGS, LDFLAGS
-	eapply "${FILESDIR}"/${PN}-3.7.0-respect-flags.patch
-
-	eapply "${FILESDIR}"/${PN}-3.15.0-Build-ldst_multiple-test-with-fno-pie.patch
-
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		# upstream doesn't support this, but we don't build with
-		# Sun/Oracle ld, we have a GNU toolchain, so get some things
-		# working the Linux/GNU way
-		find "${S}" -name "Makefile.am" -o -name "Makefile.tool.am" | xargs \
-			sed -i -e 's:-M,/usr/lib/ld/map.noexstk:-z,noexecstack:' || die
-		cp "${S}"/coregrind/link_tool_exe_{linux,solaris}.in
-	fi
-
-	# Allow users to test their own patches
-	eapply_user
-
-	# Regenerate autotools files
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=()
-
-	# Respect ar, bug #468114
-	tc-export AR
-
-	# -fomit-frame-pointer	"Assembler messages: Error: junk `8' after expression"
-	#                       while compiling insn_sse.c in none/tests/x86
-	# -fstack-protector     more undefined references to __guard and __stack_smash_handler
-	#                       because valgrind doesn't link to glibc (bug #114347)
-	# -fstack-protector-all    Fails same way as -fstack-protector/-fstack-protector-strong.
-	#                          Note: -fstack-protector-explicit is a no-op for Valgrind, no need to strip it
-	# -fstack-protector-strong See -fstack-protector (bug #620402)
-	# -m64 -mx32			for multilib-portage, bug #398825
-	# -ggdb3                segmentation fault on startup
-	filter-flags -fomit-frame-pointer
-	filter-flags -fstack-protector
-	filter-flags -fstack-protector-all
-	filter-flags -fstack-protector-strong
-	filter-flags -m64 -mx32
-	replace-flags -ggdb3 -ggdb2
-
-	if use amd64 || use ppc64; then
-		! has_multilib_profile && myconf+=("--enable-only64bit")
-	fi
-
-	# Force bitness on darwin, bug #306467
-	use x86-macos && myconf+=("--enable-only32bit")
-	use x64-macos && myconf+=("--enable-only64bit")
-
-	# Don't use mpicc unless the user asked for it (bug #258832)
-	if ! use mpi; then
-		myconf+=("--without-mpicc")
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-
-	if [[ ${PV} == "9999" ]]; then
-		# Otherwise FAQ.txt won't exist:
-		emake -C docs FAQ.txt
-		mv docs/FAQ.txt . || die "Couldn't move FAQ.txt"
-	fi
-
-	dodoc FAQ.txt
-
-	pax-mark m "${ED}"/usr/$(get_libdir)/valgrind/*-*-linux
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# fix install_names on shared libraries, can't turn them into bundles,
-		# as dyld won't load them any more then, bug #306467
-		local l
-		for l in "${ED}"/usr/lib/valgrind/*.so ; do
-			install_name_tool -id "${EPREFIX}"/usr/lib/valgrind/${l##*/} "${l}"
-		done
-	fi
-}
-
-pkg_postinst() {
-	elog "Valgrind will not work if glibc does not have debug symbols."
-	elog "To fix this you can add splitdebug to FEATURES in make.conf"
-	elog "and remerge glibc.  See:"
-	elog "https://bugs.gentoo.org/show_bug.cgi?id=214065"
-	elog "https://bugs.gentoo.org/show_bug.cgi?id=274771"
-	elog "https://bugs.gentoo.org/show_bug.cgi?id=388703"
-}
diff --git a/dev-util/valgrind/valgrind-3.16.1.ebuild b/dev-util/valgrind/valgrind-3.16.1.ebuild
index cfa35de040f3..4bf740a9b006 100644
--- a/dev-util/valgrind/valgrind-3.16.1.ebuild
+++ b/dev-util/valgrind/valgrind-3.16.1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="ftp://sourceware.org/pub/valgrind/${P}.tar.bz2"
-	KEYWORDS="-* amd64 ~arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+	KEYWORDS="-* amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
 fi
 
 DEPEND="mpi? ( virtual/mpi )"
diff --git a/dev-util/valgrind/valgrind-9999.ebuild b/dev-util/valgrind/valgrind-9999.ebuild
index aa72dd092528..33873a0e69c3 100644
--- a/dev-util/valgrind/valgrind-9999.ebuild
+++ b/dev-util/valgrind/valgrind-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit autotools flag-o-matic toolchain-funcs multilib pax-utils
 
 DESCRIPTION="An open-source memory debugger for GNU/Linux"
@@ -15,7 +15,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="ftp://sourceware.org/pub/valgrind/${P}.tar.bz2"
-	KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+	KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
 fi
 
 DEPEND="mpi? ( virtual/mpi )"
diff --git a/dev-util/vulkan-headers/Manifest b/dev-util/vulkan-headers/Manifest
index e1480092b1a7..92ef744a300f 100644
--- a/dev-util/vulkan-headers/Manifest
+++ b/dev-util/vulkan-headers/Manifest
@@ -1,4 +1,6 @@
 DIST vulkan-headers-1.2.143.tar.gz 758635 BLAKE2B e1fa8e1290d2fd1e4cef932e4dcd2bc10ef14449cdb41d57f0e4ef58f9a758add7e05d06d7884b08e080250cbb93bf0b211ac3570f0be6b256f6c70bd9eb1704 SHA512 fafd28822da050211525b289a324d333d5651e74e455a7b1010db55eac624edbbf50f5e7f899e2003c821fd06a9a61fec32ea7d07dc4d90a3b3697e03d3ddcc3
-EBUILD vulkan-headers-1.2.143.ebuild 608 BLAKE2B c9f1b1a10bfea7684fb3917134a8d2f4e1b54afe8db661ff9d07f00c3b1c735f693c57949aa544d1ae8a9e1acbcd004bd4c6524f15209723c648f7a4a53d628c SHA512 2e573ef97eee75ff590e5b38a510c2d0b8db5d4e4bca2a1ba66e401fea4281224b7b67e7b465f5f4ec251018b1902da3020533f602e022e8899b7f096cba5049
+DIST vulkan-headers-1.2.154.tar.gz 817069 BLAKE2B 66b073daf01741d74a8c2524e6f2692a4c2143340bba8349f3c85408ce12cd7405f960fac0b6ffe3cbd6dcddfcbb04a6481b2743428c66a527d51c16cbd326c6 SHA512 97f9b56b57a762a3616ff3e9795de01c9b9327b80903adf2b141f33be45b30980acd50007ac6af9562ee1897491929d23f7f5dc6a8bafced59e14df27dfca6a9
+EBUILD vulkan-headers-1.2.143.ebuild 605 BLAKE2B caf8d1eff6c89b36ca7e4a544a97699aa257bd306b69bb40e3522a743469f079c3fdbcb26e79bcee137267eccf2de8f7886a3282e6d0582e3a33bd3cfade49ee SHA512 211cf1ac07e4dd0bcdf133cc9cf288bf4613ee91cf1358c406a7534584aa117a72e0d2a51a45afed59e5884c05ce87d2acfe49995ad91b3e20fa15b54cd5d6ed
+EBUILD vulkan-headers-1.2.154.ebuild 610 BLAKE2B df50cddc20133ece723f3bdfd28c02b435de3582685ef4235829dc3df964b9a9afd26ee26e11775ba53824d0bd0e32a1674ff56b8820fc2af2c36ed00489bc02 SHA512 164378f4ee98383c16f40e89a8fde5225ef80c8e2a447ca635ef27eb6885be0e7c42aa51fb703ae229df5ec248619cb95f6db2c3907d6cc59dfc4cc0d81fee09
 EBUILD vulkan-headers-9999.ebuild 593 BLAKE2B 101dc4954cc61f0375202d2398a3bab6e99e379f9dbc3aaab01129670e0413cba3fc9d15f031a44f634ec7576f0cd6bbd52ccfdbec0de9d703f6db5a9a2eff52 SHA512 a95238b09e9d71d72588e9e90af0d99590a8d4fffb6b134cc75c5b9bfc542c40f7a438447ce06aaf4a5ea5922d9ce49763af91b49934c8f66fc5dbb1d7ea8246
 MISC metadata.xml 432 BLAKE2B e6c1f4f34e41862d3739bad772b910b21348dce97dbde38cc7fbc9cb42993a493881dd100a0c21be3615805f27d3987259233ae5830ef56e2d1dd928c285c09f SHA512 f4f93b16ad29f813a2c0397ec46c6decf7c9bdb3f4a376e1f24a29724c136feabd230d0558d37a502f2795f71c959833a662e6d2544a78704408b3be9be314fc
diff --git a/dev-util/vulkan-headers/vulkan-headers-1.2.143.ebuild b/dev-util/vulkan-headers/vulkan-headers-1.2.143.ebuild
index 7bea2760fcf0..3c7d217ae9fa 100644
--- a/dev-util/vulkan-headers/vulkan-headers-1.2.143.ebuild
+++ b/dev-util/vulkan-headers/vulkan-headers-1.2.143.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+	KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86"
 	S="${WORKDIR}"/${MY_PN}-${PV}
 fi
 
diff --git a/dev-util/vulkan-headers/vulkan-headers-1.2.154.ebuild b/dev-util/vulkan-headers/vulkan-headers-1.2.154.ebuild
new file mode 100644
index 000000000000..a5f2a13e8786
--- /dev/null
+++ b/dev-util/vulkan-headers/vulkan-headers-1.2.154.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN=Vulkan-Headers
+inherit cmake
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	S="${WORKDIR}"/${MY_PN}-${PV}
+fi
+
+DESCRIPTION="Vulkan Header files and API registry"
+HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Headers"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+BDEPEND=">=dev-util/cmake-3.10.2"
diff --git a/dev-util/vulkan-tools/Manifest b/dev-util/vulkan-tools/Manifest
index 098e10dc7ecd..ee08b36bf45b 100644
--- a/dev-util/vulkan-tools/Manifest
+++ b/dev-util/vulkan-tools/Manifest
@@ -1,4 +1,6 @@
 DIST vulkan-tools-1.2.141.tar.gz 711666 BLAKE2B 0ad31cba26106ea76ddeb26e05b59302a6f35c9172eb75fe31b6a05370be0131a92db33a4c54a006b6ba5145447079239d7ff174f7be10feb172fe03d7a1a619 SHA512 5dce372f60f55570bfc7dc4e4da7b4a07f632cfac6a2862bdf773cab61a8c6260bb38cbd48d944e08479248bfe29248214618a78952fac0aeef285e5b888d337
+DIST vulkan-tools-1.2.154.tar.gz 719166 BLAKE2B 351fd168be69615691bf956f65c0a6f2050c1061897745ecc227cc11336d2d3b39b0475a0c941c0ccdb011b9d37ef0417b22e0935ec956c5d37bbb8c6cd2e6d2 SHA512 51d6521af4f65c5b93bc5a10ef921f3770f04d6a363a9c4f0941421bf762e17cb8948bbdd3ed1d5449d015e1ac86e42e63583aee4a442cc275a1d410f61813a7
 EBUILD vulkan-tools-1.2.141.ebuild 1885 BLAKE2B 145b76e22548ae638ec3eedf9b3692d03b026484a2cc611221c25a9dc4ac4d57a077531ff34533579f983d997fdf5eae9ded0c2c25e5573daa99a698e6eb9b49 SHA512 2d76c2ff116686ed5d6bfd3cca4de4c8e2bd227bd7a4373e0b1f7ef12f9c26d871be9048c92d0f9569ea11b04369215f6fe6bd7b31054db4dca675f3cd2d57e1
-EBUILD vulkan-tools-9999.ebuild 1869 BLAKE2B f47caf24e21149f31c79b2ed3d71b729d6b41ed899212c07bb40f1385e75b7db6a09d54c75a9989a10bf3da21bff2a53a57a9f42b5b28399cece42e25c1e2621 SHA512 3f8b8bf5e6490643cb051cbe7d6827f48d357e374d59a5164159be34d09397ced64a14525488d0c187fe050980c56b8eb98ceefb8a7340c2061a3835392e85bd
+EBUILD vulkan-tools-1.2.154.ebuild 1886 BLAKE2B 370a628f1edc87ffbfa541531dc4ddaf7e956963365050debcc3d66dafefb0ebdce6b93c1b7c7e2e80400607007d3130860241cf636029288c3106955f9044dd SHA512 6a457f33f1d21ca91f72876c892da529305b43afcce57c9266fb8660825cb0971782e8496f34d9f4cf1d4b2f0c2dfa9e8a3ce9fc25de268b119ff57481138ddb
+EBUILD vulkan-tools-9999.ebuild 1886 BLAKE2B 370a628f1edc87ffbfa541531dc4ddaf7e956963365050debcc3d66dafefb0ebdce6b93c1b7c7e2e80400607007d3130860241cf636029288c3106955f9044dd SHA512 6a457f33f1d21ca91f72876c892da529305b43afcce57c9266fb8660825cb0971782e8496f34d9f4cf1d4b2f0c2dfa9e8a3ce9fc25de268b119ff57481138ddb
 MISC metadata.xml 500 BLAKE2B 2b03cd2296502530b43020bacbbef0edaabacc6b8d2458ef6d5f653fbbdf6b02ff5fba9988fd19ee9c9e14e41df359c150cbc2fd141769960f2f1b95e213d8ed SHA512 327529a5a8a57115e116c31c5b86a00f978c8612a4905eed90ad3b33671acaabbaa5e7e82bb140ad5d9b1574b0f37a53882d117c50ec320c1ea0c8d5fc25994e
diff --git a/dev-util/vulkan-tools/vulkan-tools-1.2.154.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.2.154.ebuild
new file mode 100644
index 000000000000..1dad1fe14b60
--- /dev/null
+++ b/dev-util/vulkan-tools/vulkan-tools-1.2.154.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN=Vulkan-Tools
+CMAKE_ECLASS="cmake"
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit cmake-multilib python-any-r1
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
+	EGIT_SUBMODULES=()
+	inherit git-r3
+else
+	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64"
+	S="${WORKDIR}"/${MY_PN}-${PV}
+fi
+
+DESCRIPTION="Official Vulkan Tools and Utilities for Windows, Linux, Android, and MacOS"
+HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Tools"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="cube wayland +X"
+
+# Cube demo only supports one window system at a time
+REQUIRED_USE="!cube? ( || ( X wayland ) ) cube? ( ^^ ( X wayland ) )"
+
+BDEPEND="${PYTHON_DEPS}
+	>=dev-util/cmake-3.10.2
+	cube? ( dev-util/glslang:=[${MULTILIB_USEDEP}] )
+"
+RDEPEND="
+	>=media-libs/vulkan-loader-${PV}:=[${MULTILIB_USEDEP},wayland?,X?]
+	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
+	X? (
+		x11-libs/libX11:=[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}
+	>=dev-util/vulkan-headers-${PV}
+"
+
+pkg_setup() {
+	MULTILIB_CHOST_TOOLS=(
+		/usr/bin/vulkaninfo
+	)
+
+	use cube && MULTILIB_CHOST_TOOLS+=(
+		/usr/bin/vkcube
+		/usr/bin/vkcubepp
+	)
+
+	python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=ON
+		-DBUILD_VULKANINFO=ON
+		-DBUILD_CUBE=$(usex cube)
+		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
+		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
+		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
+		-DVULKAN_HEADERS_INSTALL_DIR="${EPREFIX}/usr"
+	)
+
+	use cube && mycmakeargs+=(
+		-DGLSLANG_INSTALL_DIR="${EPREFIX}/usr"
+		-DCUBE_WSI_SELECTION=$(usex X XCB WAYLAND)
+	)
+
+	cmake_src_configure
+}
+
+multilib_src_install() {
+	cmake_src_install
+}
diff --git a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
index 1d6d8e74d61e..1dad1fe14b60 100644
--- a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
+++ b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64"
 	S="${WORKDIR}"/${MY_PN}-${PV}
 fi
 
diff --git a/dev-util/watchman/Manifest b/dev-util/watchman/Manifest
new file mode 100644
index 000000000000..51aee9552c77
--- /dev/null
+++ b/dev-util/watchman/Manifest
@@ -0,0 +1,5 @@
+AUX 4.9.0-changes.patch 2974 BLAKE2B 71163fce5ec3f62e174810f485a43fe0a329757004cd32050a949d6c809c156774b3b95ddd43b45bcb95e02eebc94f551de498d0bf856c90483205e907980d64 SHA512 6700d62de75063db08f23799b05ef867ae3f9b608f9b9774846cb98c2ad651ce22786496ccaa15ef2c4b923cc51adb13a4c2af0ead0f1672ce990ca7e8560329
+AUX 4.9.0-python3.patch 2402 BLAKE2B 9378a4613048891e6d4b461a9442ff7585dc9f137c03de417c62fad5edb78f138e417e35abe9283f33bcc7da884a2b2e885ebfcfa638c183c1521660af97c300 SHA512 68490ac9eaed522f81e51bc1a2bd98f93282f929587c8e865baa519faecc921192f9e751a5ef8099a5ab6e1e5523855ba4bf8aadb2656506e632cb97eff16839
+DIST watchman-4.9.0.tar.gz 3508045 BLAKE2B 413b779f02736442c371af1d9e18e5c84f05f9e9465c114dc4bdf79cbc1d823f1ad3167abef22818652a924ca2cb563c54d18f7599b987f579655d8a2b82162a SHA512 3c1222ba41383b26c2c427415e75abdb4bef5a95001438c3debe7cf3ca654944ecf08e432c5ad0aefa2a6554ae73ff0f6995e7f4ee61cdb2cde80f8378d3a704
+EBUILD watchman-4.9.0.ebuild 1162 BLAKE2B 1678ab89ab182df69bb0614612265cf8db30db118890524199ca0bb1b375c5dcc85172a43a55730e4255c017e77c3d1ba8689af2efaf5d47389e7d6ac7a969be SHA512 e87429fd22a2e932df408ec7e3582deb4ac14b948c330b3944a318b9fccf80aa84fd1994e41f3d5d8b596ff63de863d6d3fe2568ae40bac0d794c7ded6a2a1dc
+MISC metadata.xml 672 BLAKE2B 96db77114305163124079f89946b3824baad223e6a3e64c820904d0c9f05addec99e746e22a76f22eff7d4e533788bdb0a39d7ddd566f012be4f8fd37b8a68c7 SHA512 3b0a92388bc934b430a7367760373d033975d47a3a96efec80eae5570acd10648f93e8ce85dff74d51f33a08faa53161bb7c90365575e01284211e3261382a78
diff --git a/dev-util/watchman/files/4.9.0-changes.patch b/dev-util/watchman/files/4.9.0-changes.patch
new file mode 100644
index 000000000000..4625bc815539
--- /dev/null
+++ b/dev-util/watchman/files/4.9.0-changes.patch
@@ -0,0 +1,80 @@
+diff -ru old/python/bin/watchman-make new/python/bin/watchman-make
+--- old/python/bin/watchman-make	2020-09-06 11:36:12.202435809 +0200
++++ new/python/bin/watchman-make	2020-09-06 11:36:14.105482419 +0200
+@@ -55,7 +55,14 @@
+         data = client.getSubscription(self.name)
+         if data is None:
+             return
+-        self.triggered = True
++        for item in data:
++            # We only want to trigger if files matched;
++            # updates without a files list are metadata
++            # such as state-enter/leave notices so we skip them
++            if 'files' in item:
++                self.triggered = True
++            if 'canceled' in item:
++                raise RuntimeError('Watch was cancelled')
+
+     def execute(self):
+         if not self.triggered:
+@@ -165,6 +172,11 @@
+ parser.add_argument('-r', '--run', type=str, help="""
+ The script that should be run when changes are detected
+ """)
++parser.add_argument('--connect-timeout', type=float, default=600, help="""
++Initial watchman client connection timeout. It should be sufficiently large to
++prevent timeouts when watchman is busy (eg. performing a crawl). The default
++value is 600 seconds.
++""")
+ args = parser.parse_args()
+
+ if args.target is None and args.run is None:
+@@ -187,7 +199,7 @@
+         sys.exit(1)
+
+ targets = {}
+-client = pywatchman.client(timeout=600)
++client = pywatchman.client(timeout=args.connect_timeout)
+ try:
+     client.capabilityCheck(
+         required=['cmd-watch-project', 'wildmatch'])
+diff -ru old/python/bin/watchman-wait new/python/bin/watchman-wait
+--- old/python/bin/watchman-wait	2020-09-06 11:36:12.202435809 +0200
++++ new/python/bin/watchman-wait	2020-09-06 11:36:14.106482444 +0200
+@@ -76,6 +76,11 @@
+ Exit if no events trigger within the specified timeout.  If timeout is
+ zero (the default) then keep running indefinitely.
+ """)
++parser.add_argument('--connect-timeout', type=float, default=100, help="""
++Initial watchman client connection timeout. It should be sufficiently large to
++prevent timeouts when watchman is busy (eg. performing a crawl). The default
++value is 100 seconds.
++""")
+ args = parser.parse_args()
+
+
+@@ -141,7 +146,7 @@
+     def formatField(self, fname, val):
+         if fname == 'name':
+             # Respect the --relative path printing option
+-            return os.path.relpath(val, args.relative)
++            return os.path.relpath(os.path.join(self.name, val), args.relative)
+         # otherwise just make sure it's a string so that we can join it
+         return str(val)
+
+@@ -173,12 +178,13 @@
+ for path in args.path:
+     sub = Subscription(path)
+
++# and start up the client + subscriptions
++client = pywatchman.client(timeout=args.connect_timeout)
++
+ deadline = None
+ if args.timeout > 0:
+     deadline = time.time() + args.timeout
+
+-# and start up the client + subscriptions
+-client = pywatchman.client()
+ try:
+     client.capabilityCheck(
+         required=['term-dirname', 'cmd-watch-project', 'wildmatch'])
diff --git a/dev-util/watchman/files/4.9.0-python3.patch b/dev-util/watchman/files/4.9.0-python3.patch
new file mode 100644
index 000000000000..5b416f24ae46
--- /dev/null
+++ b/dev-util/watchman/files/4.9.0-python3.patch
@@ -0,0 +1,65 @@
+diff -ru backup/old/python/bin/watchman-make old/python/bin/watchman-make
+--- backup/old/python/bin/watchman-make	2020-09-06 11:33:34.449582111 +0200
++++ old/python/bin/watchman-make	2020-09-06 11:33:43.473801969 +0200
+@@ -100,7 +100,7 @@
+             targets = []
+             setattr(namespace, self.dest, targets)
+ 
+-        if isinstance(values, basestring):
++        if isinstance(values, (str, bytes)):
+             values = [values]
+ 
+         if namespace.pattern is None or len(namespace.pattern) == 0:
+@@ -209,7 +209,7 @@
+         client.setTimeout(600)
+ 
+         result = client.receive()
+-        for _, t in targets.iteritems():
++        for _, t in targets.items():
+             t.consumeEvents(client)
+ 
+         # Now we wait for events to settle
+@@ -218,7 +218,7 @@
+         while not settled:
+             try:
+                 result = client.receive()
+-                for _, t in targets.iteritems():
++                for _, t in targets.items():
+                     t.consumeEvents(client)
+             except pywatchman.SocketTimeout as ex:
+                 # Our short settle timeout hit, so we're now settled
+@@ -226,7 +226,7 @@
+                 break
+ 
+         # Now we can work on executing the targets
+-        for _, t in targets.iteritems():
++        for _, t in targets.items():
+             t.execute()
+ 
+         # Print this at the bottom of the loop rather than the top
+@@ -249,4 +249,3 @@
+     except KeyboardInterrupt:
+         # suppress ugly stack trace when they Ctrl-C
+         break
+-
+diff -ru backup/old/python/bin/watchman-wait old/python/bin/watchman-wait
+--- backup/old/python/bin/watchman-wait	2020-09-06 11:33:34.449582111 +0200
++++ old/python/bin/watchman-wait	2020-09-06 11:33:43.473801969 +0200
+@@ -182,7 +182,7 @@
+ try:
+     client.capabilityCheck(
+         required=['term-dirname', 'cmd-watch-project', 'wildmatch'])
+-    for _, sub in subscriptions.iteritems():
++    for _, sub in subscriptions.items():
+         sub.start(client)
+ 
+ except pywatchman.CommandError as ex:
+@@ -200,7 +200,7 @@
+         # the client object will accumulate all subscription results
+         # over time, so we ask it to remove and return those values
+         # for each of the subscriptions
+-        for _, sub in subscriptions.iteritems():
++        for _, sub in subscriptions.items():
+             sub.emit(client)
+ 
+     except pywatchman.SocketTimeout as ex:
diff --git a/dev-util/watchman/metadata.xml b/dev-util/watchman/metadata.xml
new file mode 100644
index 000000000000..0dc2b75aa0cb
--- /dev/null
+++ b/dev-util/watchman/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>monsieurp@gentoo.org</email>
+		<name>Patrice Clement</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>adrian@planetcoding.net</email>
+		<name>Adrian Moennich</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">facebook/watchman</remote-id>
+	</upstream>
+	<use>
+		<flag name="python">Install pywatchman bindings and the watchman-{wait,make} utils</flag>
+	</use>
+</pkgmetadata>
diff --git a/dev-util/watchman/watchman-4.9.0.ebuild b/dev-util/watchman/watchman-4.9.0.ebuild
new file mode 100644
index 000000000000..ca3006fbc0c6
--- /dev/null
+++ b/dev-util/watchman/watchman-4.9.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit autotools distutils-r1
+
+COMMIT="8e0ba724d85de2c89f48161807e878667b9ed089"  # v4.9.0 tag
+DESCRIPTION="A file watching service"
+HOMEPAGE="https://facebook.github.io/watchman/"
+SRC_URI="https://github.com/facebook/watchman/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="pcre python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="pcre? ( dev-libs/libpcre )
+	python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PV}-python3.patch"
+	"${FILESDIR}/${PV}-changes.patch"
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-lenient \
+		--disable-statedir \
+		--without-python \
+		$(use_with pcre)
+}
+
+src_compile() {
+	default
+
+	if use python; then
+		pushd python >/dev/null || die
+		distutils-r1_src_compile
+		popd >/dev/null || die
+	fi
+}
+
+src_install() {
+	default
+
+	if use python; then
+		pushd python >/dev/null || die
+		distutils-r1_src_install
+		popd >/dev/null || die
+	fi
+}
diff --git a/dev-util/xfce4-dev-tools/Manifest b/dev-util/xfce4-dev-tools/Manifest
index c2a69363b789..bab739d403fc 100644
--- a/dev-util/xfce4-dev-tools/Manifest
+++ b/dev-util/xfce4-dev-tools/Manifest
@@ -1,5 +1,7 @@
 DIST xfce4-dev-tools-4.14.0.tar.bz2 292275 BLAKE2B 18f28394ded038a7bcf0e754ebb359464358df245903a0c4441df2845e57c9059de6e6775a90c0e6c3cde4936a847ddf26ae88ff61fe7612fc2626b00f1d56a7 SHA512 e22b139ff7516ec0e510f882cc6a9e8e8b2b7bd41093c8e67e5ef11eb6c2c2848637513369d652f7238f10b5005c5483a938d3348020b48a4c1fadadd6d635f8
 DIST xfce4-dev-tools-4.15.0.tar.bz2 336453 BLAKE2B 9072d86b4b1645e72c04f26b5609162f50aac9d90ad007d2f629bb1ec67d242f3addea4bdd6f129f3336658b04f0eaecbd039154dfd98ccb87a85840b502d11f SHA512 125c8a7d594b17ce822dc5f57f5c700e69ee6208b06931cb0fefcbd1aa70281f388a9eebe8b451ffb55f16682070f9119a43b148f97adcdfd2278b4901910425
+DIST xfce4-dev-tools-4.15.1.tar.bz2 340738 BLAKE2B 73c08f27011ce0d2144eaa1672209669a382695bc9fc9c0a7b9966398df09cf4813afdde9f809354b48d8ddc06644b6e8d4f45ed758dfca24c92e557f5536c8e SHA512 e24fb63774b36f5b3cd901394b75b36e891a68fe7a46a1503a1fc3cfe901bd267e2d8d4aa35a2c760226524079617059e5344b93ef98b3f97dce85e765e5c5dc
 EBUILD xfce4-dev-tools-4.14.0.ebuild 579 BLAKE2B 366d376277ef62122256194b0d4dfdd747e30e82097009b8c41d83473497f5b285b2b75b4584d2293236a17c9efc1ef152a331a398a7f1e67b68dc904c55eb58 SHA512 68fadca9308eb50c5c2be9f50847df966457518cebe86263c21d2f4b8aa64bc5b0f7146f25c16df281924c643ce4de2f38e2fe8db8efb155dde8b3dd9771363e
 EBUILD xfce4-dev-tools-4.15.0.ebuild 584 BLAKE2B 6b2f6fcd2f8ed91d4a09138a3ea90c1ecb1e5cf8236dc7e16bbf4889d0aabb9a08d822b7cca7b0888ee586837e41a5c055d71836cb2255ac82c99af875a58cf7 SHA512 35e950fba2c4de9b286afa8d9af5560c8c1ec72c8df70ab2fafc67015005bee23f5e7b59e79e8d631e668cb1ceb423106c4a1fddfdbd39e8e7741e6fb9fe1c9e
+EBUILD xfce4-dev-tools-4.15.1.ebuild 584 BLAKE2B 6b2f6fcd2f8ed91d4a09138a3ea90c1ecb1e5cf8236dc7e16bbf4889d0aabb9a08d822b7cca7b0888ee586837e41a5c055d71836cb2255ac82c99af875a58cf7 SHA512 35e950fba2c4de9b286afa8d9af5560c8c1ec72c8df70ab2fafc67015005bee23f5e7b59e79e8d631e668cb1ceb423106c4a1fddfdbd39e8e7741e6fb9fe1c9e
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.15.1.ebuild b/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.15.1.ebuild
new file mode 100644
index 000000000000..665633a8f721
--- /dev/null
+++ b/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.15.1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A set of scripts and m4/autoconf macros that ease build system maintenance"
+HOMEPAGE="https://www.xfce.org/ http://users.xfce.org/~benny/projects/xfce4-dev-tools/"
+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"
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2.42"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
author	V3n3RiX <venerix@redcorelinux.org>	2020-11-25 22:39:15 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-11-25 22:39:15 +0000
commit	d934827bf44b7cfcf6711964418148fa60877668 (patch)
tree	0625f358789b5e015e49db139cc1dbc9be00428f /dev-util
parent	2e34d110f164bf74d55fced27fe0000201b3eec5 (diff)