gentoo resync : 25.08.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-08-25 10:45:55 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-08-25 10:45:55 +0100
commit: 3cf7c3ef441822c889356fd1812ebf2944a59851 (patch)
tree: c513fe68548b40365c1c2ebfe35c58ad431cdd77 /dev-util
parent: 05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff)
422 files changed, 5321 insertions, 6067 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index dccfad991f3b..2912e93e9613 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/android-studio/Manifest b/dev-util/android-studio/Manifest
index ff209cec9fc4..5867d4497003 100644
--- a/dev-util/android-studio/Manifest
+++ b/dev-util/android-studio/Manifest
@@ -4,9 +4,11 @@ DIST android-studio-ide-192.6200805-linux.tar.gz 803889418 BLAKE2B dcbfb2eef2994
 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
+EBUILD android-studio-4.0.1.0.193.6626763.ebuild 3658 BLAKE2B a4d9f2469abf8064e298949f81f91295aeea992dea500b1e721b68c0ac5ea0371446a088e7ae144704feaeb00ad78ee4b718f6a3eb21b83c2cbb6be1dc5db0a2 SHA512 333a6979fa5d1e863cde3a92172b129b7d16874bb4905228743fc35de421802d855ae2bcc85bfa3b7a1cfebefa508208051ab63d54096eed0f458382e91d9407
 MISC metadata.xml 313 BLAKE2B 623366c889e8b0d9c33a56fd3ca96156208db355e1549bbf8040a6839a953a82459b3c87e5a0f16f1d67ede403ee5a9e1747c445e855434f25d0f03fe5a6c43a SHA512 1c3e18bd57e48e7f65791f8904bcdde910f1d97d83e781c7c3815df6127aaac9063614e0a11cf7762059f762c4696e2b89ca446ffb9e631a2c85ff2b350e972a
diff --git a/dev-util/android-studio/android-studio-4.0.1.0.193.6626763.ebuild b/dev-util/android-studio/android-studio-4.0.1.0.193.6626763.ebuild
new file mode 100644
index 000000000000..e9812c3699a7
--- /dev/null
+++ b/dev-util/android-studio/android-studio-4.0.1.0.193.6626763.ebuild
@@ -0,0 +1,129 @@
+# 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-tools/Manifest b/dev-util/android-tools/Manifest
index df4185962d7b..2044f82cc51f 100644
--- a/dev-util/android-tools/Manifest
+++ b/dev-util/android-tools/Manifest
@@ -29,7 +29,7 @@ DIST boringssl-14308731e5446a73ac2258688a9688b524483cb6.tar.gz 13030361 BLAKE2B
 DIST boringssl-45210dd4e21ace9d28cb76b3f83303fcdd2efcce.tar.gz 13581532 BLAKE2B ca2f6757807adc265314a7444605c6199a19847fb426384bafa201bf63f4e3c7c567fb8094b740b8a00caf0d106bb1efea2893b00d45c9772740a81dc0a186f3 SHA512 c6695d078ee7b3694898dfdc0ee3382d01f9bb592ea46eb64026c73565735fd7251bbb0fd3e8c8552394bcdad5717de7ee5106cf1ed91aacec05d779ad693f6a
 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 1131f6bb7728fefe057c45a55590cd8b18360f4c04d8897ba4890d04763e781e2938402af438f8e1804a0f7e0df6ae7a55143ec59edcf3c8090382a6db25d15d SHA512 fe72143f16b57ef11a94fe92c39429ce41b8ae133b56e1bd5c13e9bba1eebcc1fdb811be2347e7cebed99b7426ff19f92f331a85dc27a40146b1b119fc0e2ad1
-EBUILD android-tools-9.0.0_p3-r1.ebuild 5083 BLAKE2B 7ac8114a79bb1e6947788d64832b9a4d298cb3d162f798a094e2a2c494d91a83779837d90ed6f3cfa08e4f39498fe7dbc64bf8022c986f3af913fab0d36f2f4b SHA512 3b9f12a4efc25fb2ca6e3a61decd0d7094a54f37d41e09bc5e80790d6ac57a769f21cc3fee17542b6c1159cafe369211eab9b59d1aed26cad4d1fc3b4fe6aa2f
+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
 MISC metadata.xml 714 BLAKE2B 2ec2b24289241323b1844412e6e0d1edf642dc3391171b474848ea376c51d420c98a4a0c094afad2dc1c7cf55b0efb744ca6a92beeed770d015a6380b07b85b0 SHA512 720b38485a7c248e6a9d43a7056e33a384fe7e295fc843c69e59d48350bb10d7d4446e6cc52b7c87e2b0322733553e16c9dda4e37104753d5aaceec5adf859bd
diff --git a/dev-util/android-tools/android-tools-8.1.0_p1.ebuild b/dev-util/android-tools/android-tools-8.1.0_p1.ebuild
index 95483f444700..86a31b64479b 100644
--- a/dev-util/android-tools/android-tools-8.1.0_p1.ebuild
+++ b/dev-util/android-tools/android-tools-8.1.0_p1.ebuild
@@ -100,13 +100,13 @@ src_configure() {
 	cmake-utils_src_configure
 
 	sed -i \
-		-e "s:@CC@:$(tc-getCC):g" \
-		-e "s:@CXX@:$(tc-getCXX):g" \
-		-e "s:@CFLAGS@:${CFLAGS}:g" \
-		-e "s:@CPPFLAGS@:${CPPFLAGS}:g" \
-		-e "s:@CXXFLAGS@:${CXXFLAGS}:g" \
-		-e "s:@LDFLAGS@:${LDFLAGS}:g" \
-		-e "s:@PV@:${PV}:g" \
+		-e "s|@CC@|$(tc-getCC)|g" \
+		-e "s|@CXX@|$(tc-getCXX)|g" \
+		-e "s|@CFLAGS@|${CFLAGS}|g" \
+		-e "s|@CPPFLAGS@|${CPPFLAGS}|g" \
+		-e "s|@CXXFLAGS@|${CXXFLAGS}|g" \
+		-e "s|@LDFLAGS@|${LDFLAGS}|g" \
+		-e "s|@PV@|${PV}|g" \
 		build.ninja || die
 }
 
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 47c2fc39aa44..0a5d152abd25 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
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6..9} )
 CMAKE_MAKEFILE_GENERATOR="ninja"
 
 inherit flag-o-matic bash-completion-r1 ninja-utils toolchain-funcs cmake-utils python-r1
@@ -32,7 +32,7 @@ SRC_URI="https://git.archlinux.org/svntogit/community.git/snapshot/community-0ff
 # 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"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~x86-linux"
 IUSE="python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/dev-util/anjuta/Manifest b/dev-util/anjuta/Manifest
index 50f7ab5b82fa..fc7095dc9cfc 100644
--- a/dev-util/anjuta/Manifest
+++ b/dev-util/anjuta/Manifest
@@ -1,5 +1,3 @@
-DIST anjuta-3.28.0.tar.xz 6382736 BLAKE2B 8872736d80d0a09d35706ef69c0de56c84b9abf025f9552ae4b21b0b51c3ab8ad93f07dd1564601422890e92155cc7be80bae8de77106035621a54316608832b SHA512 c8de0b0debf0a511d6c50fe2582077a33c04290a045cce637c05c15df984cc3e8ee942c0c3a75bfd01c48e6c302d5424565c4e54fe6eb118c87a3590563505ef
 DIST anjuta-3.34.0.tar.xz 6420472 BLAKE2B a5e10ea3bb60499e54def8d1b78603b0c809167ad03a3e11f9dbd031514f1a7cb566d9c7694be23fe3165e617fbfc3d1e6ce36f7dc8c0672044f26390aed6d5a SHA512 9d5a4c23751893ff7e21cd55c1f112f27b53fe2ea5ac645c63e2da627efce202b88696e3e5d860ad75a5c13c88a9082775d74f4482208161b5e63d56c4004d57
-EBUILD anjuta-3.28.0-r1.ebuild 3936 BLAKE2B 683893d06cd59787db3911c2d68a3c8be2534ba4c387da7afa8a482f430d28305c0a5154bb7ed4bdf71b0697ca3cb2103245477eee828277172f167c7e9493ff SHA512 8ea1f8e247fd3b6bb7b89a246338f84a11a8950569144337f1ba398159cdd64632b2e9b7566bed8fcecb05fe61a9569caadf45cfad5a24a7cf7cb263f8ee5868
 EBUILD anjuta-3.34.0.ebuild 4573 BLAKE2B d21ba5dc9fdfdd77228058f47309319a476ce5331c4ad74d93168f335933ec66dd5cb89b97593d452f2d2042d74e24e20e5827a76cf662edb8a1ab4a1bc5a854 SHA512 2d080a74611e8eb26f9c759a4484f81785e3ec3f10aefd56b555e18c3ab8106a04074e4d179bfff00e06545df278c1ca37ccce80cb809efcef021709b2cc7a93
-MISC metadata.xml 562 BLAKE2B 928b16bacff2417a1b50749486d2dcd656184b6cd7bce6f17e534d253ab2e1af854e18bf40f3188714e973b9c49f1b2691d031bdaef0ec73d9a4844c05b99218 SHA512 c452f34b8489e3faeb8c272282233341e22c958f04d750d54e07c487895aab8b03f4df096e1f07fdb7686a0295c770cb1fcf38fdca01f71730e991148013d82f
+MISC metadata.xml 484 BLAKE2B c5b7715c5b6fb11c942e2505cc727cd72866cb497aecd009df54a969c158af224fe83653c014bf4e81b8ccc04328dd5b03669d3aea4b8f7d652428e2472fd477 SHA512 3a2982297046c18fcb92d9f7ffe04a29b59890938188f00cf0386208aa42d2603393f169679b18469e591a24da5a956d4c7d981eab58a3ea7597058b8911d5ac
diff --git a/dev-util/anjuta/anjuta-3.28.0-r1.ebuild b/dev-util/anjuta/anjuta-3.28.0-r1.ebuild
deleted file mode 100644
index 73fadd9f40f5..000000000000
--- a/dev-util/anjuta/anjuta-3.28.0-r1.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-# libanjuta-language-vala.so links to a specific slot of libvala; we want to
-# avoid automagic behavior.
-VALA_MIN_API_VERSION="0.40"
-VALA_MAX_API_VERSION="${VALA_MIN_API_VERSION}"
-
-# We inherit autotools explicitly because GNOME2_EAUTORECONF is set only conditionally later, so gnome2.eclass doesn't do it for us
-inherit autotools gnome2 flag-o-matic readme.gentoo-r1 python-single-r1 vala
-
-DESCRIPTION="A versatile IDE for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Anjuta"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86"
-
-IUSE="debug devhelp glade +introspection packagekit subversion terminal test vala"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# FIXME: automagically uses libgda:6 if available
-# FIXME: make python dependency non-automagic
-COMMON_DEPEND="
-	>=dev-libs/glib-2.34:2[dbus]
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.10:3
-	>=dev-libs/libxml2-2.4.23
-	>=dev-libs/gdl-3.5.5:3=
-	>=x11-libs/gtksourceview-3:3.0
-
-	sys-devel/autogen
-
-	>=gnome-extra/libgda-5:5=
-	dev-util/ctags
-
-	x11-libs/libXext
-	x11-libs/libXrender
-
-	${PYTHON_DEPS}
-
-	devhelp? ( >=dev-util/devhelp-3.7.4:= )
-	glade? ( >=dev-util/glade-3.12:3.10= )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
-	subversion? (
-		>=dev-vcs/subversion-1.8:=
-		>=net-libs/serf-1.2:1=
-		>=dev-libs/apr-1:=
-		>=dev-libs/apr-util-1:= )
-	terminal? ( >=x11-libs/vte-0.27.6:2.91 )
-	vala? ( $(vala_depend) )
-"
-RDEPEND="${COMMON_DEPEND}
-	gnome-base/gsettings-desktop-schemas
-	packagekit? ( app-admin/packagekit-base )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-lang/perl-5
-	>=dev-util/gtk-doc-am-1.4
-	>=dev-util/intltool-0.40.1
-	sys-devel/bison
-	sys-devel/flex
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	!!dev-libs/gnome-build
-	test? (
-		app-text/docbook-xml-dtd:4.1.2
-		app-text/docbook-xml-dtd:4.5 )
-	app-text/yelp-tools
-	dev-libs/gobject-introspection-common
-	gnome-base/gnome-common
-"
-# yelp-tools, gi-common and gnome-common are required by eautoreconf
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	if use vala; then
-		DISABLE_AUTOFORMATTING="yes"
-		DOC_CONTENTS="To create a generic vala project you will need to specify
-desired valac versioned binary to be used, to do that you
-will need to:
-1. Go to 'Build' -> 'Configure project'
-2. Add 'VALAC=/usr/bin/valac-X.XX' (respecting quotes) to
-'Configure options'."
-
-		sed -i -e "s/\[0.40\], \[0.38\], \[0.36\], \[0.34\], \[0.32\], \[0.30\], \[0.28\], \[0.26\], \[0.24\], \[0.22\], \[0.20\], \[0.18\]/[${VALA_MAX_API_VERSION}]/" configure.ac || die
-		GNOME2_EAUTORECONF="yes"
-	fi
-
-	# COPYING is used in Anjuta's help/about entry
-	DOCS="AUTHORS ChangeLog COPYING FUTURE MAINTAINERS NEWS README ROADMAP THANKS TODO"
-
-	# Conflicts with -pg in a plugin, bug #266777
-	filter-flags -fomit-frame-pointer
-
-	# Do not build benchmarks, they are not installed and for dev purpose only
-	sed -e '/SUBDIRS =/ s/benchmark//' \
-		-i plugins/symbol-db/Makefile.{am,in} || die
-
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-neon \
-		--disable-static \
-		$(use_enable debug) \
-		$(use_enable devhelp plugin-devhelp) \
-		$(use_enable glade plugin-glade) \
-		$(use_enable glade glade-catalog) \
-		$(use_enable introspection) \
-		$(use_enable packagekit) \
-		$(use_enable subversion plugin-subversion) \
-		$(use_enable subversion serf) \
-		$(use_enable terminal plugin-terminal) \
-		$(use_enable vala)
-}
-
-src_install() {
-	# COPYING is used in Anjuta's help/about entry
-	docompress -x "/usr/share/doc/${PF}/COPYING"
-
-	# Anjuta uses a custom rule to install DOCS, get rid of it
-	gnome2_src_install
-	rm -rf "${ED}"/usr/share/doc/${PN} || die "rm failed"
-
-	use vala && readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	use vala && readme.gentoo_print_elog
-}
diff --git a/dev-util/anjuta/metadata.xml b/dev-util/anjuta/metadata.xml
index 0073ebca1b62..6c441a3f9d48 100644
--- a/dev-util/anjuta/metadata.xml
+++ b/dev-util/anjuta/metadata.xml
@@ -8,7 +8,6 @@
   <use>
     <flag name="devhelp">Enable devhelp integration</flag>
     <flag name="glade">Build glade plugin for anjuta</flag>
-    <flag name="packagekit">Use packagekit to search for missing tools</flag>
     <flag name="terminal">Enable terminal plugin based on <pkg>x11-libs/vte</pkg></flag>
   </use>
 </pkgmetadata>
diff --git a/dev-util/aruba/Manifest b/dev-util/aruba/Manifest
index 2a4817f9ca88..11d3a0406861 100644
--- a/dev-util/aruba/Manifest
+++ b/dev-util/aruba/Manifest
@@ -1,7 +1,7 @@
-DIST aruba-0.14.12.gem 172032 BLAKE2B be19078caef5e0d1c50d0f0da0efdbfb6cc128d40605eccd8ec7e89ba655523f4c8a0ac11e59d347439be3ac8da64f7c3ce5ff761c07c716efbc2e51c3bf420e SHA512 f75adf0b4ed04a4516111d7cc5834807f940c517baf652dc8062450d7c284f11c9dc68216757e431a4e1fd084c50c2b0eb274c2d2c3e25795785a44b0a61e06d
 DIST aruba-0.14.14.gem 172544 BLAKE2B 085a0a030c5c4d1527e80ce004adeb80fc8a9eca8507211acaf49d947ed412aa54f1319104833a8fbb76d3ce5b77e84b35187234ee97060b51e8877519ed6249 SHA512 612b742bdf89e0272714d709a772eded1c61c654977bb58f7e6e5ef5a8b29dece848bf3c70aa6bc566e6c2a75b3e39e637fa5e37f869fbf4bf3d0997257df9f7
 DIST aruba-0.6.2.gem 75776 BLAKE2B 569af009cc20b644878fda25b5e7f79bd2f7c6f5fa9ef2503a5e730b8eb5938872563dace27031d31847bacfbb7e4764079da74fa2a917cc3d98a596cf2248c7 SHA512 ad859aa34f6e6778d9eb92b7e8f298180250e0690b21285e48b85dda88c09c74437ed0dff4e07ea8a02e8c784841ef89504219aa844457273349b8072ebc761e
-EBUILD aruba-0.14.12.ebuild 1520 BLAKE2B 947a401829e02bc0b9aac249ebac01b06f8a80a2d1412a4b1886e89232b5ddc11b5c6899b77c7d95321a6ea71ddb54e02d7a8da7ef180d398649b0abaf35dd9e SHA512 2b105bb544644d01e88e6c6ce539b1bc91267ec1104be455585ddf47e3e775905883b29a0ea540dec9a436f8f77e2db754551b6b9ab8db8931d988635d667c80
-EBUILD aruba-0.14.14.ebuild 1520 BLAKE2B f30a8e3eb009dc14ed00cdb71decf87f46c34d3c98246adf58b3edf916d08de616135246e8968eef870d47a6f4fe85dbf37fa9d263fd5bfd1ec73665a65c9e3e SHA512 27b7f88ef244634ff9c1aca29f3c11c1cab9b5829f614c0a4450aec415b5d61e399c62bda3db9e6a5733b9639329e7f67b5c6a2773ca5382ccc2caebfc59b46e
-EBUILD aruba-0.6.2-r2.ebuild 988 BLAKE2B bf2e43c4a655e129fe796c6c4453394c6efac353c5979fd3b2837b4c122ff02d92999d1f3b15e6f566a05bda770216b8c89156197fbdd8d08fbdd071f50ecc79 SHA512 1e85cac5483b8c1bf49dc5079f4dccd98c7c7bc8072d7a2f21fc2e290c23563b50fd25fb60b7f19bb1a9b6ab7dabb299a06ff9542d9c8235855bfbdafcf97327
+DIST aruba-1.0.2.tar.gz 132977 BLAKE2B 762abef412a62e91931690a0a56ee1b04868c9f446f79e1c282e15c1ded1faf609d480e7fb032b09c3230e2d233b3cb0e09a58b2950c7a138f486c34339b8a0c SHA512 ff9161a94627e1bd123c00a0c3dd8624034b10741867d60c85264322e4ae5f2226d585d361fe8f2229003c187a1dff38c4278c359f018ca28cef1fd6efd26aa0
+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-1.0.2.ebuild 1922 BLAKE2B f7d9aa054e862cf7aeef26a322a067ef8b279c8a96a472471aa0dd2a027c0e06d66908ede4730ccfeeec07c76dcc52657a497f7040d9b83104a60cee83d4f032 SHA512 e8451f0ec7ec1c9967dd0046050eb01b96ce616c55fb50ab98705595ad4b98b747df4be1c468da45163c710398d2de2b253d3b3ff58f042153f45e30664bc311
 MISC metadata.xml 296 BLAKE2B 5d13c2f0fdb1a3a5e8278e93124af9b7f8e069ccca8ac9327132e8aea862aaee163d778260bd0ba6cd0d6488372b04b4330cc2838447fe2d075ec5fdcb28cadc SHA512 6add4a1a905857c1d96e347089fa8f47643f990a153f6457c4d424978bcf76b89607c89f60d3e312365525b1d0dbd17db62b4baf48ee3da9a0f2ab77435d68b4
diff --git a/dev-util/aruba/aruba-0.14.12.ebuild b/dev-util/aruba/aruba-0.14.12.ebuild
deleted file mode 100644
index 4397253389bd..000000000000
--- a/dev-util/aruba/aruba-0.14.12.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="cucumber"
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-RUBY_FAKEGEM_BINDIR="exe"
-
-inherit ruby-fakegem
-
-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"
-SLOT="0"
-IUSE=""
-
-DEPEND="${DEPEND} test? ( sys-devel/bc )"
-RDEPEND="${RDEPEND}"
-
-ruby_add_rdepend "
-	>=dev-ruby/childprocess-0.6.3 <dev-ruby/childprocess-4
-	>=dev-ruby/contracts-0.9:0
-	>=dev-ruby/ffi-1.9
-	>=dev-ruby/rspec-expectations-2.99:2
-	>=dev-ruby/thor-0.19:0
-	>=dev-util/cucumber-1.3.19"
-
-ruby_add_bdepend "test? ( dev-ruby/rspec:3 >=dev-ruby/bcat-0.6.2 )"
-
-all_ruby_prepare() {
-	# Remove bundler-related code.
-	sed -i -e '/[Bb]undler/d' Rakefile spec/spec_helper.rb || die
-	rm Gemfile || die
-
-	sed -i -e '/simplecov/I s:^:#:' \
-		-e '/Before/,/^end/ s:^:#:' \
-		spec/spec_helper.rb features/support/env.rb || die
-	rm -f features/support/simplecov_setup.rb || die
-	sed -i -e '1i require "time"' spec/spec_helper.rb || die
-
-	sed -i -e '/Scenario: Default value/i@wip' features/02_configure_aruba/home_directory.feature || die
-	sed -i -e '/Use ~ in path/i@wip' features/04_aruba_api/core/expand_path.feature || die
-}
-
-each_ruby_test() {
-	RSPEC_VERSION=3 ruby-ng_rspec
-	RUBYLIB="$(pwd)/lib" ruby-ng_cucumber
-}
diff --git a/dev-util/aruba/aruba-0.14.14.ebuild b/dev-util/aruba/aruba-0.14.14.ebuild
index 33c49702f362..9b29c27e1b64 100644
--- a/dev-util/aruba/aruba-0.14.14.ebuild
+++ b/dev-util/aruba/aruba-0.14.14.ebuild
@@ -30,7 +30,7 @@ ruby_add_rdepend "
 	>=dev-ruby/thor-0.19:0
 	>=dev-util/cucumber-1.3.19"
 
-ruby_add_bdepend "test? ( dev-ruby/rspec:3 >=dev-ruby/bcat-0.6.2 )"
+ruby_add_bdepend "test? ( dev-ruby/rspec:3 )"
 
 all_ruby_prepare() {
 	# Remove bundler-related code.
@@ -43,8 +43,10 @@ all_ruby_prepare() {
 	rm -f features/support/simplecov_setup.rb || die
 	sed -i -e '1i require "time"' spec/spec_helper.rb || die
 
+	sed -i -e '/Use .aruba. with .Minitest./i@wip' features/01_getting_started_with_aruba/supported_testing_frameworks.feature || die
 	sed -i -e '/Scenario: Default value/i@wip' features/02_configure_aruba/home_directory.feature || die
 	sed -i -e '/Use ~ in path/i@wip' features/04_aruba_api/core/expand_path.feature || die
+	sed -i -e '/Create files for Minitest/i@wip' features/06_use_aruba_cli/initialize_project_with_aruba.feature || die
 }
 
 each_ruby_test() {
diff --git a/dev-util/aruba/aruba-0.6.2-r2.ebuild b/dev-util/aruba/aruba-0.6.2-r2.ebuild
index 67baaa3b42d8..fe3881d25c7f 100644
--- a/dev-util/aruba/aruba-0.6.2-r2.ebuild
+++ b/dev-util/aruba/aruba-0.6.2-r2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_RECIPE_TEST="cucumber"
@@ -28,7 +28,7 @@ ruby_add_rdepend "
 	>=dev-ruby/rspec-expectations-2.7:2
 	>=dev-util/cucumber-1.1.1"
 
-ruby_add_bdepend "test? ( >=dev-ruby/rspec-2.11:2 >=dev-ruby/bcat-0.6.1 )"
+ruby_add_bdepend "test? ( >=dev-ruby/rspec-2.11:2 )"
 
 all_ruby_prepare() {
 	# Remove bundler-related code.
diff --git a/dev-util/aruba/aruba-1.0.2.ebuild b/dev-util/aruba/aruba-1.0.2.ebuild
new file mode 100644
index 000000000000..e98d59761778
--- /dev/null
+++ b/dev-util/aruba/aruba-1.0.2.ebuild
@@ -0,0 +1,60 @@
+# 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="cucumber"
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+RUBY_FAKEGEM_BINDIR="exe"
+
+RUBY_FAKEGEM_GEMSPEC="aruba.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Cucumber steps for driving out command line applications"
+HOMEPAGE="https://github.com/cucumber/aruba"
+SRC_URI="https://github.com/cucumber/aruba/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86"
+SLOT="$(ver_cut 1)"
+IUSE=""
+
+DEPEND="${DEPEND} test? ( sys-devel/bc )"
+RDEPEND="${RDEPEND}"
+
+ruby_add_rdepend "
+	>=dev-ruby/childprocess-2.0 <dev-ruby/childprocess-5
+	>=dev-ruby/contracts-0.16.0:0
+	>=dev-ruby/ffi-1.9
+	>=dev-ruby/rspec-expectations-3.4:3
+	dev-ruby/thor:1
+	>=dev-util/cucumber-2.4 <dev-util/cucumber-5"
+
+ruby_add_bdepend "test? ( dev-ruby/rspec:3 )"
+
+all_ruby_prepare() {
+	# Remove bundler-related code.
+	sed -i -e '/[Bb]undler/d' Rakefile spec/spec_helper.rb || die
+	rm Gemfile || die
+
+	sed -i -e '/simplecov/I s:^:#:' \
+		-e '/Before/,/^end/ s:^:#:' \
+		spec/spec_helper.rb features/support/env.rb || die
+	rm -f features/support/simplecov_setup.rb || die
+
+	sed -i -e 's/git ls-files -z/find -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid features with minor output differences
+	sed -i -e '/Use .aruba. with .Minitest./i@wip' features/01_getting_started_with_aruba/supported_testing_frameworks.feature || die
+	sed -i -e '/Failed detection of exact multi-line output/i@wip' features/03_testing_frameworks/cucumber/steps/command/check_output_of_command.feature || die
+	sed -i -e '/Create files for Minitest/i@wip' features/06_use_aruba_cli/initialize_project_with_aruba.feature || die
+
+}
+
+each_ruby_test() {
+	RSPEC_VERSION=3 ruby-ng_rspec
+	RUBYLIB="$(pwd)/lib" ruby-ng_cucumber
+}
diff --git a/dev-util/bats/Manifest b/dev-util/bats/Manifest
index 2f39e1ca2f7f..935b240290d1 100644
--- a/dev-util/bats/Manifest
+++ b/dev-util/bats/Manifest
@@ -1,5 +1,7 @@
 DIST bats-0.4.0.tar.gz 17258 BLAKE2B e43b29a413194e697c25a3f1dd3dc72a23ab9444e48bbe04434f8d6d48ff754ef1c12a1e1ab936bed8389b8fe970799cca13be932f1852c643a529babdb43420 SHA512 83c6c0e3ceec149708a8db5d33e95cc84852d8189498c22131c00f4288a6c870f9d522bae9230157f442338dc101e1468451d78dfa274afb83a6f0dd614c8bdb
 DIST bats-0.4.0_p20170219.tar.gz 18776 BLAKE2B 994649547424ee2e0859e7a82f9d46266645c6fc5cc3f47313d8780c3f81755b77d0109ad397c77381d04ba30708536acdacd0f158dc000cca9df23e25558653 SHA512 dc0e185b09dab5cc026ec39a2b15485751f038a6bab2e1089e55ea7e2913c0b99262edb54014300a25e0e3b6cad7ca61b4068f6ab328adaa61878dbb8efdf450
+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
-MISC metadata.xml 896 BLAKE2B bde071263574d67573e1ff65d1be19ce34a7a91ba8fea97300a296ed163e08ff7693d126cab84109a3669683ce8a4880b0b7d64ff2827d8bce9b3c6ad89c7945 SHA512 da70a0d89d4b892128e2ce7544d2a1db3b11fbd47c17aca53b220af2d3f46c77e99abb02fdfb814bc5010f2a54cd91841ed60b894b3655d0b910b303fa75a482
+EBUILD bats-1.2.1.ebuild 719 BLAKE2B 07d9c3646f121aa852964e13ae1ef06bd1cb543643837626d8ed04e645794746a7116f669e35d09f9271e945c63b935f77514037382c226301c1a006d383159e SHA512 701673428fe48b8f076021a5b9aaba49120b2d4fa23a29e65f222d191eb0e4ce73943827dc364cb78692042f17dc1f817b2cbfa3c710142d50af2ace65583ed2
+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
new file mode 100644
index 000000000000..0ab0773b5e99
--- /dev/null
+++ b/dev-util/bats/bats-1.2.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="bats-core"
+DESCRIPTION="Bats-core: Bash Automated Testing System"
+HOMEPAGE="https://github.com/bats-core/bats-core/"
+SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+
+DEPEND="app-shells/bash:*"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_test() {
+	bin/bats --formatter tap test || die "Tests failed"
+}
+
+src_install() {
+	exeinto /usr/libexec/${MY_PN}
+	doexe libexec/${MY_PN}/*
+	exeinto /usr/lib/${MY_PN}
+	doexe lib/${MY_PN}/*
+	dobin bin/${PN}
+
+	dodoc README.md
+	doman man/${PN}.1 man/${PN}.7
+}
diff --git a/dev-util/bats/metadata.xml b/dev-util/bats/metadata.xml
index b8f6a46a9071..289f5b52a986 100644
--- a/dev-util/bats/metadata.xml
+++ b/dev-util/bats/metadata.xml
@@ -2,15 +2,15 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>nelo@wallus.de</email>
-		<name>Nelo-Thara Wallus</name>
+		<email>henning@hennsch.de</email>
+		<name>Henning Schild</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>polynomial-c@gentoo.org</email>
-		<name>Lars Wendler</name>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">sstephenson/bats</remote-id>
+		<remote-id type="github">bats-core/bats-core</remote-id>
 	</upstream>
 	<longdescription lang="en">
 		Bats is a TAP-compliant testing framework for Bash. It provides a simple
diff --git a/dev-util/bcc/Manifest b/dev-util/bcc/Manifest
index a13010d1f7f2..0edf4f7770ae 100644
--- a/dev-util/bcc/Manifest
+++ b/dev-util/bcc/Manifest
@@ -5,6 +5,7 @@ DIST bcc-0.12.0.tar.gz 2627075 BLAKE2B 44c435eaaf6233ad24249cf5da4e778cd31e41573
 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
@@ -15,4 +16,5 @@ EBUILD bcc-0.12.0-r1.ebuild 1886 BLAKE2B f3879a2437abbfc99b87ad1a3a5c1b8b600a9e0
 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 2053 BLAKE2B 3af394ef8ed4d6bbcb8747fb7b57372d7982155c57f8a913bff3c0c981b662cf99c710f15fbf7ac76fc8b3eaec9a0504dc84cf7a8f3ce238fd88b62e5365a49c SHA512 576ca4062b3dc29f258c22a4f4f5475a4317452802773fa56877cf27a863d0d3c8bd5368384569985c3f6fa92357f06a73fe4d8c3ceb2cb2468f35d3d34eb008
 MISC metadata.xml 386 BLAKE2B 73062e6902dd7d7f9afb988cce26a8aa5a66e1252652ae364f2295b0a5e77013eec682b36ab65c93772843ad0ec8c7187cd29d8308a3ba17dbacd1ef193f03ae SHA512 6529fa57011cd17b9892e1b8f05e063ae6314f85665a30881335efa80e9b9238a7b61d1f732316e45496707bf350d03149e7ec5efdf1a0fee6d5a788b58a7e70
diff --git a/dev-util/bcc/bcc-0.16.0.ebuild b/dev-util/bcc/bcc-0.16.0.ebuild
new file mode 100644
index 000000000000..c246d266174e
--- /dev/null
+++ b/dev-util/bcc/bcc-0.16.0.ebuild
@@ -0,0 +1,99 @@
+# 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/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+luajit test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	>=dev-libs/libbpf-0.1.0-r1[static-libs(-)]
+	>=sys-kernel/linux-headers-4.14
+	>=dev-libs/elfutils-0.166:=
+	sys-devel/clang:=
+	sys-devel/llvm:=[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
+		~BPF_JIT ~BPF_EVENTS ~DEBUG_INFO ~FUNCTION_TRACER ~KALLSYMS_ALL
+		~KPROBES"
+
+	check_extra_config
+}
+
+pkg_setup() {
+	LLVM_MAX_SLOT=11 llvm_pkg_setup
+	python_setup
+}
+
+src_prepare() {
+	local bpf_link_path
+
+	# this avoids bundling
+	bpf_link_path="$(realpath --relative-to="${S}/src/cc/libbpf" /usr/include/bpf)" || die
+	ln -sfn "${bpf_link_path}" src/cc/libbpf/include || die
+
+	cmake_src_prepare
+}
+
+python_add_impl() {
+	bcc_python_impls+="${EPYTHON};"
+}
+
+src_configure() {
+	local bcc_python_impls
+	python_foreach_impl python_add_impl
+
+	local -a mycmakeargs=(
+		-DREVISION=${PV%%_*}
+		-DENABLE_LLVM_SHARED=ON
+		-DCMAKE_USE_LIBBPF_PACKAGE=ON
+		-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")
+}
diff --git a/dev-util/bitcoin-tx/Manifest b/dev-util/bitcoin-tx/Manifest
index a0cd92a467aa..d8506679ef1f 100644
--- a/dev-util/bitcoin-tx/Manifest
+++ b/dev-util/bitcoin-tx/Manifest
@@ -2,10 +2,13 @@ AUX 0.19.1-no-libevent.patch 2262 BLAKE2B dc743112a7addd9abd0391cad7fd15d0060cf6
 DIST bitcoin-0.16.3.knots20180918.patches.tar.xz 466344 BLAKE2B c45b96513e4b6317e6a2a55cc3b47302fbe56fb87717ae0197010694013331b5d071b85a11a73c76f08f39e9f0294d3475e89ee63272047df83893de4dbaa390 SHA512 2c3540acc668aeef4b8f01774219736d95395201ddeaccaf70e0bad4a89f05cdd5ffaf630bae0577656efb3580fae92ce0ee4bb1a720ea757ca59e3fd66e1893
 DIST bitcoin-0.19.1.knots20200304.patches.tar.xz 399864 BLAKE2B de5591072b62c65c8a0fdcee7a7ed4b74d13614e47b679a05f272207b9ca0a09d476aa8ecb66321f39953a320f4d47f7d2aa62848192d493de02525c3d5abdfa SHA512 3b08023f0788535dc5943e47a595da5637172263ac8c2ad97d42c0707da7468a9843efbf90a2eb6ac99db65e362e99cbe9209ab64785c79de908e20801ba4fe5
 DIST bitcoin-0.20.0.knots20200614.patches.tar.xz 392356 BLAKE2B 17c5d5c89e279c870492ac4f98cfde6545fa3c4b5169f42c020e45ca14c133673e271b248e90286ae875aaef6b031e578d14554777a89dca5366aa4bda079012 SHA512 208234b2e7fa46e19da9954dab9828993aa62a7623d85de8e7d43ffd4b367c5e8641e82154357526a11b95c0426ec16039d2910dbbe9187daba9d14a3b2fda92
+DIST bitcoin-0.20.1.knots20200815.patches.tar.xz 413244 BLAKE2B bc8fd6bfe0454439ae514086ea3e728df4f1ba069d33f79b047049a1a4d18543334217f25607b738f7f2d1245f64e5289aed00473c94edf5d660e0953e4d6b93 SHA512 98468f4f22d5b9d35c616796aa5a8fda20f775606f0cd4927b3b822dd5afd0fc208c23136306f79d01dbfd532b14a5905a8fb60a2d171d5022d2008772cf7b58
 DIST bitcoin-v0.16.3.tar.gz 6658712 BLAKE2B 2c20b32ea30aed264115d1bd336b62fa28de69cbf116385508718efd7ff22537c3bd402c0965e0f6ddd8e79fc8b51f388f52f885847d36207a24523e927ca63e SHA512 2da25f56fe9b1f5a81815c14e70ff1a69ec15f742424e2c24d71303a71d57c8050dea5d5ba57425bbe0a01a3995ad9b30f0beea5dbafd1632a627cd3fd9a984d
 DIST bitcoin-v0.19.1.tar.gz 6660702 BLAKE2B 93ed83f663a833f6be40195ddaf62a8ef9fcd86c3f983fe0cf1e75eaf9ae54cdc88fcdfc36d798842f29636dc8037af5b67e82643c90a6c276fa504ed022f863 SHA512 bc1afad7de5b43042d24780b07e3faf73dda69af9ef0c75fa1a32bd25b0b37e315955614ffbb2864fe827b77b63446fd88cae22da3d0706ff73df495a519ba5d
 DIST bitcoin-v0.20.0.tar.gz 6984988 BLAKE2B 2c189826b7171276df62fb8cbf713d8b4cb4307de413247f2951950ec173d069930447d7d420d1c73ba0abc97fd613a05fc527bcc796e5e2d2f3dfb57fb29b80 SHA512 7628efb70bf51e4165605d9e77f6119b855994e99d8cb6653dfbd89628304862f3a98cfe352aa8b435913000e74d297565d8a7e3f22a23006d1779b70d04a8cd
+DIST bitcoin-v0.20.1.tar.gz 6986090 BLAKE2B ef0e6c424bcb7ffe9a2461e60499cebdfcd13faa794d534b4c508a61fa218dd58e64c9088584ea658736deeadc0306fbdf08daa3c395dac3d8f096a08ba42262 SHA512 73a103d4192eb12abed5aa84e9c7999d57e4da37f32e54107ab9f4297a29af64c0c56930674559073bed360f794d87ba5eb9e1ce4d1bd03402d56937490fa16e
 EBUILD bitcoin-tx-0.16.3.ebuild 2427 BLAKE2B c3410c5a84de81fcafedae1236e339f034938e7adf817a4dcdeed76f7ea64cc2c84e529785732de392bca904b34563cd80bf40f755a7f5f4d8afb92fcd97cc4d SHA512 0b277b10e5fd15866a07e06bb33f6f398b6fbf88fd4159ab50b33947f42e88870b67b9fc3e3375cf16dd15fe3828a550cb30067ca03eafcc9aa93fd1ad2bdccf
 EBUILD bitcoin-tx-0.19.1.ebuild 2533 BLAKE2B 88b2dfd6f40edb8e66cd9f92dae8cfb395e21e67cce278694395898079e48a7902f35e3f54d30e0f1fdd729f077da4e5de229f3781fc5e90e6eef7e84c566fc6 SHA512 f9b170301f82cf07436a30bb4ef911af0263c422866dd507673316725084c4f1f4782e8904be2d8d48d564b6bbde27e369a4309eeecddc5744b0864331fb1f54
 EBUILD bitcoin-tx-0.20.0.ebuild 2529 BLAKE2B 3b273c3e025eed28f0415d0864cd735ce34d0a2923cace7b4c2cad1d5ef58479a5e9762cc0912179e0ec1ea30116c04e9ebc605b78242529280ddc4dcdc91ee4 SHA512 77739c8c5e33e6a2afe92fd2c182c8470c7faa0dd907929b641de3a2aeaf0b01a321896302b246ef348a59bc8cb35b91adfce65148e10ac6aed9a5bd60d2d284
+EBUILD bitcoin-tx-0.20.1.ebuild 2438 BLAKE2B 22e6e37ca91de9a9690f88f0e7ed3b5ab59fbe5fdaf788865f6e9d27d6a647bf427aea8b046eaeac551b903c856efaa668a6a64770a046485cab7833d121d5ca SHA512 32441dd60d320a69873f369cb86fda61ba3983f3d6703d160a212d799a16defbbe9f15feeab58480808e58b9688a86256ddf6f9d9c1746f21e7c600258b2aaa5
 MISC metadata.xml 620 BLAKE2B e779b6a929a58fad28773a0aba3ef3112df14ce82ce62376b88cbc3519a857faaac6b580d2b5d866b0ec809062cf170e3c29324b03acc005246aea3cef9a0381 SHA512 c253ed29dff90ef2b9cd19b191ad870bd22cbdd371b2f353e724ba950735350225fe6d83c4ca8823ebb395dde9fb5004e781ff78987e2a30c0281ad5e0a4623a
diff --git a/dev-util/bitcoin-tx/bitcoin-tx-0.20.1.ebuild b/dev-util/bitcoin-tx/bitcoin-tx-0.20.1.ebuild
new file mode 100644
index 000000000000..48114a6e5290
--- /dev/null
+++ b/dev-util/bitcoin-tx/bitcoin-tx-0.20.1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools bash-completion-r1
+
+BITCOINCORE_COMMITHASH="bf0dc356ac4a2bdeda1908af021dea2de0dfb35a"
+KNOTS_PV="${PV}.knots20200815"
+KNOTS_P="bitcoin-${KNOTS_PV}"
+
+DESCRIPTION="Command-line Bitcoin transaction tool"
+HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
+SRC_URI="
+	https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v${PV}.tar.gz
+	https://bitcoinknots.org/files/0.20.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="knots"
+
+DEPEND="
+	>=dev-libs/boost-1.52.0:=[threads(+)]
+	>dev-libs/libsecp256k1-0.1_pre20170321:=[recovery]
+	>=dev-libs/univalue-1.0.4:=
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	>=sys-devel/autoconf-2.69
+	>=sys-devel/automake-1.13
+"
+
+DOCS=(
+	doc/bips.md
+	doc/release-notes.md
+)
+
+S="${WORKDIR}/bitcoin-${BITCOINCORE_COMMITHASH}"
+
+pkg_pretend() {
+	if use knots; then
+		elog "You are building ${PN} from Bitcoin Knots."
+		elog "For more information, see:"
+		elog "https://bitcoinknots.org/files/0.20.x/${KNOTS_PV}/${KNOTS_P}.desc.html"
+	else
+		elog "You are building ${PN} from Bitcoin Core."
+		elog "For more information, see:"
+		elog "https://bitcoincore.org/en/2020/08/01/release-${PV}/"
+	fi
+}
+
+src_prepare() {
+	local knots_patchdir="${WORKDIR}/${KNOTS_P}.patches/"
+
+	eapply "${knots_patchdir}/${KNOTS_P}.syslibs.patch"
+
+	if use knots; then
+		eapply "${knots_patchdir}/${KNOTS_P}.f.patch"
+		eapply "${knots_patchdir}/${KNOTS_P}.branding.patch"
+		eapply "${knots_patchdir}/${KNOTS_P}.ts.patch"
+	fi
+
+	eapply_user
+
+	echo '#!/bin/true' >share/genbuild.sh || die
+	mkdir -p src/obj || die
+	echo "#define BUILD_SUFFIX gentoo${PVR#${PV}}" >src/obj/build.h || die
+
+	eautoreconf
+	rm -r src/leveldb src/secp256k1 || die
+}
+
+src_configure() {
+	local my_econf=(
+		--disable-asm
+		--without-qtdbus
+		--without-qrencode
+		--without-miniupnpc
+		--disable-tests
+		--disable-wallet
+		--disable-zmq
+		--enable-util-tx
+		--disable-util-cli
+		--disable-util-wallet
+		--disable-bench
+		--without-libs
+		--without-daemon
+		--without-gui
+		--disable-fuzz
+		--disable-ccache
+		--disable-static
+		--with-system-libsecp256k1
+		--with-system-univalue
+	)
+	econf "${my_econf[@]}"
+}
+
+src_install() {
+	default
+
+	newbashcomp contrib/${PN}.bash-completion ${PN}
+}
diff --git a/dev-util/bless/Manifest b/dev-util/bless/Manifest
index e1bf577ac405..db45b6d0e993 100644
--- a/dev-util/bless/Manifest
+++ b/dev-util/bless/Manifest
@@ -1,9 +1,4 @@
-AUX bless-0.6.0-docpath.patch 2250 BLAKE2B ff47974243983f00bd1b17aa3df7d3649da2b8d55eb64ea4f42418a013cafbfb888d3c4e54cd8f838eefc519ddb7c267d1dacd421b81e81c87503dbae3b4ddee SHA512 f5917b220db0b143dc77ba00fc517c5b397cdabea67627630fd92b942ae406b67bb48e1f63b68d8e53fa8b979e800130036fdb4782525102abfc70c751094dc1
-AUX bless-0.6.0-mono-4.patch 969 BLAKE2B 63799c54f2fdd18017d619b97603d15d9b6302f84d6fcfa4e4fa7b4aa4044d57bb3b5cba3e8f290c0379abc303f0f3836d5fef0910018011b27ac45e633d72e6 SHA512 729efc197b66a53931079b5e4969b62dda3842a0d13358b62fa53cfbf673351c9622908976651d343d060d7ac37e35968733243719e76bd5f066e842ac641f84
-AUX bless-0.6.0-pixmap.patch 493 BLAKE2B 25ebbf9d3f6be6d928354dd33289ce84315c002c954cc454af1f3aff0fcdc033569d7cd0fa69c5972489887e0d8bad5007f40f014aeb9a854301689d8283294d SHA512 0fc6281e8cb6b981f5a73e98bf86a93bf635cd77133c7d3e964ef0b2ce7e855f38cb4db6216bc876f9435d5b2f4293a39cb859cb443381569e5b56a364ac30ee
-DIST bless-0.6.0.tar.gz 745694 BLAKE2B eb23edf3fd9c45b9848810ff022a7e9b7d760c22444426bbbaf63d69ee45754d085eb105c4951c0d57fce7b284c6b0a8fb9b7e061219a55d109c9ef844b61c35 SHA512 69d2279b64503b97c8a67991c2a7a527d872835e3acfad7eafa8d87e376d2cecf3fa27de9e12726680a8f3c8ac92b888a4895a1f342c4beeaceef9e1f3ededdb
+AUX bless-0.6.2-range-disambiguation.patch 6964 BLAKE2B 65708f4fdae5b9b2d9afcd2fb326bdc414decf265557071314b1f539fe6742364b58acd69dce32d50db0173f00d13aa6e4808baae6e16217d62ccec9a45f1189 SHA512 03a0507db3ef4384344c6ee9f04c59879a48315adf219ba32afb10c9dee7d33a8a5543e4751e5b09bd61fd9955d22e35ff841b6f3ad68f9c827be7f803806751
 DIST bless-0.6.2.tar.gz 514695 BLAKE2B 2c9681e03992d42b20d0073e9107e5bd83d6f1699235b49fb6cf14fb5f9bc87e682e96b4f8bab2b45a3211515a8990e72b80922a62198c7ad603aeb5f3d3c406 SHA512 3fef715ed138323af50437ef8cda3d9f53987498042f1b4df2d9ce23f00dade68147cbdf28b85aed8b9c594fb5c43839c9dedbc14a994ad609fd4cedd89bfcf5
-EBUILD bless-0.6.0-r3.ebuild 1189 BLAKE2B b50dc35022a87a974a3f619f9f8eafb3034172dceebdaffb26ecc2955f4e1d5a51ffa02a21317dfe392ea5ef654e476de32c18da14ab922014cd576f9b78bf40 SHA512 2ff6ee1dab86eb242deffe88e36f30bba6584f7b4663728030872a2014b11c8433c45126c78d4bf5af24f6feae3b52dd9f2e39fe9042bd9c601777fa1fed54bc
-EBUILD bless-0.6.0-r4.ebuild 1188 BLAKE2B 97f0b498f789a511f4a24d57d23c18254561435cb5e197d94fe2e026e0047e1d7f18bc340a938bf57afa35c14682fb00b7f4c2375af8f61a0c8cceb678a99380 SHA512 652cf121dc16d0e4d745092de05a17f6c2f9adb34ffdc35800893a2ee038dc05a64ad93d66a30311f71cf1a7c2c0c70a5446756756f97a7e7a412091d63fc968
-EBUILD bless-0.6.2-r1.ebuild 1091 BLAKE2B a26ddc20916d8500116c05252dca058f4145eac973d27e697863984121b3d2f477eade47412deb48cdb918886e7bacb4654946bd6f0ec7c31eaedc5151b66c6f SHA512 def48401109372031c03507ffc869a995d82b93c293b8e10fd503f1d9e87ff00b6988c15a19f774793fe7be1983cc1a4ede0c79c5b894ba0dba9950fc093f5c3
+EBUILD bless-0.6.2-r1.ebuild 1154 BLAKE2B 7eaa666aac4660ac2ca6fb5d36557bd7a5fea0abff6256d06086e65e2e013b847d37138ae45677a6d014d590572699ea466fd70d091257e4388026a828d9aba4 SHA512 70510946131504f9fb49d8809310d91e6353f9326f084ff0a537fcd366e237d9aa0a74ed171b4db0d0a29039c371f04a9879bd6e01dcc5b0002e2c1fa03932e0
 MISC metadata.xml 242 BLAKE2B 896ec48a498764d193d9e3c54bfc07d07a6f95675e772ff73730bbdfb8cce43d2d1d99fbd0ee96a6c0ad3eab13e6a82bff55ce3a1e5a6883204fe8c5d5932f0f SHA512 c305f98db61dfe31ddc48084c932b6c45eee7a8cd664ebeade704135fb1da0978ace942a2a4d92d418ad4bdd22acd0685864cf0f4297660fc325cd3842e283e9
diff --git a/dev-util/bless/bless-0.6.0-r3.ebuild b/dev-util/bless/bless-0.6.0-r3.ebuild
deleted file mode 100644
index d4c3ef7205fd..000000000000
--- a/dev-util/bless/bless-0.6.0-r3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools gnome2 mono-env
-
-DESCRIPTION="GTK# Hex Editor"
-HOMEPAGE="https://github.com/bwrsandman/Bless/"
-SRC_URI="https://dev.gentoo.org/~ikelos/devoverlay-distfiles/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-RDEPEND="
-	>=dev-lang/mono-1.1.14
-	>=dev-dotnet/gtk-sharp-2.12.21
-"
-DEPEND="${RDEPEND}
-	app-text/rarian
-	>=sys-devel/gettext-0.15
-	virtual/pkgconfig
-"
-
-# See bug 278162
-# Waiting on nunit ebuild entering the tree
-RESTRICT="test"
-
-pkg_setup() {
-	# Stolen from enlightenment.eclass
-	cp $(type -p gettextize) "${T}/" || die "Could not copy gettextize"
-	sed -i -e 's:read dummy < /dev/tty::' "${T}/gettextize"
-
-	mono-env_pkg_setup
-}
-
-src_prepare() {
-	einfo "Running gettextize -f --no-changelog..."
-	( "${T}/gettextize" -f --no-changelog > /dev/null ) || die "gettexize failed"
-	eapply "${FILESDIR}/${P}-pixmap.patch"
-	eapply "${FILESDIR}/${P}-docpath.patch"
-	eapply "${FILESDIR}/${P}-mono-4.patch"
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--enable-unix-specific \
-		$(use_enable debug)
-}
diff --git a/dev-util/bless/bless-0.6.0-r4.ebuild b/dev-util/bless/bless-0.6.0-r4.ebuild
deleted file mode 100644
index e7ae88c0e92e..000000000000
--- a/dev-util/bless/bless-0.6.0-r4.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools gnome2 mono-env
-
-DESCRIPTION="GTK# Hex Editor"
-HOMEPAGE="https://github.com/bwrsandman/Bless/"
-SRC_URI="https://dev.gentoo.org/~ikelos/devoverlay-distfiles/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-RDEPEND="
-	>=dev-lang/mono-1.1.14
-	>=dev-dotnet/gtk-sharp-2.12.21:2
-"
-DEPEND="${RDEPEND}
-	app-text/rarian
-	>=sys-devel/gettext-0.15
-	virtual/pkgconfig
-"
-
-# See bug 278162
-# Waiting on nunit ebuild entering the tree
-RESTRICT="test"
-
-pkg_setup() {
-	# Stolen from enlightenment.eclass
-	cp $(type -p gettextize) "${T}/" || die "Could not copy gettextize"
-	sed -i -e 's:read dummy < /dev/tty::' "${T}/gettextize"
-
-	mono-env_pkg_setup
-}
-
-src_prepare() {
-	einfo "Running gettextize -f --no-changelog..."
-	( "${T}/gettextize" -f --no-changelog > /dev/null ) || die "gettexize failed"
-	eapply "${FILESDIR}/${P}-pixmap.patch"
-	eapply "${FILESDIR}/${P}-docpath.patch"
-	eapply "${FILESDIR}/${P}-mono-4.patch"
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--enable-unix-specific \
-		$(use_enable debug)
-}
diff --git a/dev-util/bless/bless-0.6.2-r1.ebuild b/dev-util/bless/bless-0.6.2-r1.ebuild
index 06741696a4d9..92feecfe9620 100644
--- a/dev-util/bless/bless-0.6.2-r1.ebuild
+++ b/dev-util/bless/bless-0.6.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -28,6 +28,7 @@ DEPEND="${RDEPEND}
 # See bug 278162
 # Waiting on nunit ebuild entering the tree
 RESTRICT="test"
+PATCHES=("${FILESDIR}/bless-0.6.2-range-disambiguation.patch")
 
 pkg_setup() {
 	mono-env_pkg_setup
diff --git a/dev-util/bless/files/bless-0.6.0-docpath.patch b/dev-util/bless/files/bless-0.6.0-docpath.patch
deleted file mode 100644
index b1121424d88b..000000000000
--- a/dev-util/bless/files/bless-0.6.0-docpath.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 33f265b..346326d 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,6 +1,9 @@
- EXTRA_DIST = AUTHORS COPYING NEWS README README.packaging \
-              bless.mdp bless.mds bless.spec autogen.sh bless.mi
- 
-+doc_DATA = AUTHORS COPYING INSTALL ChangeLog NEWS \
-+           README README.packaging bless.spec
-+
- SUBDIRS = po builder src bin data doc . tests
- 
- DIST_SUBDIRS= po builder src bin doc data tests
-@@ -34,11 +37,5 @@ bless-builder:
- dist-hook:
- 	bzr log > $(distdir)/ChangeLog
- 
--install-data-local:
--	$(INSTALL) -d $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)
--	$(INSTALL_DATA) AUTHORS COPYING INSTALL ChangeLog NEWS \
--			README README.packaging bless.spec     \
--			$(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)
--
- uninstall-local:
- 	rm -rf $(DESTDIR)$(libdir)/$(PACKAGE_NAME)
-diff --git a/doc/Makefile.am b/doc/Makefile.am
-index b18e94a..d7eecc6 100644
---- a/doc/Makefile.am
-+++ b/doc/Makefile.am
-@@ -1,4 +1 @@
- SUBDIRS= developer user
--
--uninstall-local:
--	rm -rf $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)
-diff --git a/doc/user/Makefile.am b/doc/user/Makefile.am
-index 729b295..58a1358 100644
---- a/doc/user/Makefile.am
-+++ b/doc/user/Makefile.am
-@@ -7,6 +7,11 @@ CLEANFILES=$(OMF)
- 
- noinst_SCRIPTS=$(OMF)
- 
-+docmandir=$(docdir)/user
-+docfigsdir=$(docmandir)/figures
-+
-+docfigs_DATA=$(FIGURES)
-+docman_DATA=$(DOCS) $(wildcard *.html)
- 
- $(OMF): $(OMF).in
- 	if [ -x `which scrollkeeper-preinstall` ]; then \
-@@ -27,11 +32,6 @@ dist-hook: doc
- 	rm html_file_list
- 
- install-data-local:
--	$(INSTALL) -d $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)/user
--	$(INSTALL) -d $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)/user/figures
--	$(INSTALL_DATA) $(DOCS) $(wildcard *.html) \
--			$(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)/user
--	$(INSTALL_DATA) $(FIGURES) $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)/user/figures
- 	$(INSTALL) -d $(DESTDIR)$(datadir)/omf/$(PACKAGE_NAME)
- 	$(INSTALL_DATA) $(OMF) $(DESTDIR)$(datadir)/omf/$(PACKAGE_NAME)
- if WITH_SCROLLKEEPER
-@@ -39,7 +39,6 @@ if WITH_SCROLLKEEPER
- endif
- 
- uninstall-local:
--	rm -rf $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)/user
- 	rm $(DESTDIR)$(datadir)/omf/$(PACKAGE_NAME)/$(OMF)
- if WITH_SCROLLKEEPER
- 	scrollkeeper-update -o $(DESTDIR)$(datadir)/omf/$(PACKAGE_NAME)
diff --git a/dev-util/bless/files/bless-0.6.0-mono-4.patch b/dev-util/bless/files/bless-0.6.0-mono-4.patch
deleted file mode 100644
index 92b1100cf0e7..000000000000
--- a/dev-util/bless/files/bless-0.6.0-mono-4.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/builder/ModuleBuilder.cs b/builder/ModuleBuilder.cs
-index 0f62e92..7edb1ab 100644
---- a/builder/ModuleBuilder.cs
-+++ b/builder/ModuleBuilder.cs
-@@ -119,7 +119,7 @@ public class ModuleBuilder
- 		//System.Console.WriteLine("gmcs {0}", sb.ToString());
- 		System.Console.WriteLine(">> Building module {0}...", module.Name);
- 
--		Process buildProcess = Process.Start("gmcs", sb.ToString());
-+		Process buildProcess = Process.Start("mcs", sb.ToString());
- 		buildProcess.WaitForExit();
- 
- 		if (buildProcess.ExitCode == 0) {
-@@ -137,4 +137,4 @@ public class ModuleBuilder
- }
- 
- 
--}
-\ No newline at end of file
-+}
-diff --git a/configure.ac b/configure.ac
-index 415cc64..a8e527c 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -24,9 +24,9 @@ if test "x$PKG_CONFIG" = "xno"; then
- fi
- 	
- # C# compiler
--AC_PATH_PROG(MCS, gmcs, no)
-+AC_PATH_PROG(MCS, mcs, no)
- 
--CS="gmcs C#"
-+CS="mcs C#"
- if test "x$MCS" = "xno"  ; then
- 	AC_MSG_ERROR([No $CS compiler found])
- fi
diff --git a/dev-util/bless/files/bless-0.6.0-pixmap.patch b/dev-util/bless/files/bless-0.6.0-pixmap.patch
deleted file mode 100644
index de77cb84e750..000000000000
--- a/dev-util/bless/files/bless-0.6.0-pixmap.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-=== modified file 'src/gui/drawers/HexDrawer.cs'
---- a/src/gui/drawers/HexDrawer.cs	2007-06-13 12:20:53 +0000
-+++ b/src/gui/drawers/HexDrawer.cs	2009-04-10 23:21:41 +0000
-@@ -57,11 +57,14 @@
- 
- 		//System.Console.WriteLine(s);
- 
--		pangoLayout.SetText(s);
-+		pangoLayout.SetText(s.Substring(0,256));
- 
- 
- 		gc.RgbFgColor = fg;
- 		pix.DrawLayout(gc, 0, 0, pangoLayout);
-+		
-+		pangoLayout.SetText(s.Substring(256,256));
-+		pix.DrawLayout(gc, 128*2*width, 0, pangoLayout);
- 
- 		return pix;
- 	}
-
diff --git a/dev-util/bless/files/bless-0.6.2-range-disambiguation.patch b/dev-util/bless/files/bless-0.6.2-range-disambiguation.patch
new file mode 100644
index 000000000000..788a57866cba
--- /dev/null
+++ b/dev-util/bless/files/bless-0.6.2-range-disambiguation.patch
@@ -0,0 +1,202 @@
+From 84801988f908e51d9843c3e0ee8f2cd05c0a2d97 Mon Sep 17 00:00:00 2001
+From: davidcim <david@cimaware.com>
+Date: Thu, 3 Oct 2019 12:38:25 +0200
+Subject: [PATCH] Fix building error CS0104: 'Range' is an ambiguous reference
+
+---
+ src/buffers/ByteBuffer.cs        |  2 +-
+ src/gui/DataBookFinder.cs        |  4 ++--
+ src/gui/areas/AreaGroup.cs       | 20 ++++++++++----------
+ src/tools/find/FindOperations.cs |  6 +++---
+ src/tools/find/IFindStrategy.cs  | 10 +++++-----
+ src/tools/find/IFinder.cs        |  4 ++--
+ 6 files changed, 23 insertions(+), 23 deletions(-)
+
+diff --git a/src/buffers/ByteBuffer.cs b/src/buffers/ByteBuffer.cs
+index b9d9a24..72c1b42 100644
+--- a/src/buffers/ByteBuffer.cs
++++ b/src/buffers/ByteBuffer.cs
+@@ -671,7 +671,7 @@ public byte[] RangeToByteArray(IRange range)
+ 	/// Returns as a SegmentCollection the data contained in 
+ 	/// the specified range in the buffer.  
+ 	///</summary>
+-	public SegmentCollection RangeToSegmentCollection(Range range)
++	public SegmentCollection RangeToSegmentCollection(Util.Range range)
+ 	{
+ 		if (range.Size == 0)
+ 			return null;
+diff --git a/src/gui/DataBookFinder.cs b/src/gui/DataBookFinder.cs
+index 50b5034..3248d3a 100644
+--- a/src/gui/DataBookFinder.cs
++++ b/src/gui/DataBookFinder.cs
+@@ -234,7 +234,7 @@ void FindAsyncCallback(IAsyncResult ar)
+ 	{
+ 		GenericFindOperation state = (GenericFindOperation)ar.AsyncState;
+ 		ThreadedAsyncOperation.OperationResult result = state.Result;
+-		Range match = state.Match;
++		Util.Range match = state.Match;
+ 
+ 		DataView dv = null;
+ 
+@@ -381,7 +381,7 @@ void ReplaceAllAsyncCallback(IAsyncResult ar)
+ 	{
+ 		ReplaceAllOperation state = (ReplaceAllOperation)ar.AsyncState;
+ 		ThreadedAsyncOperation.OperationResult result = state.Result;
+-		Range firstMatch = state.FirstMatch;
++		Util.Range firstMatch = state.FirstMatch;
+ 
+ 		DataView dv = null;
+ 
+diff --git a/src/gui/areas/AreaGroup.cs b/src/gui/areas/AreaGroup.cs
+index 58ee147..4a27190 100644
+--- a/src/gui/areas/AreaGroup.cs
++++ b/src/gui/areas/AreaGroup.cs
+@@ -198,7 +198,7 @@ enum Changes { Offset = 1, Cursor = 2, Highlights = 4}
+ 		set { drawingArea = value; }
+ 	}
+ 	
+-	public Range Selection {
++	public Util.Range Selection {
+ 		get { return selection; }
+ 		set { 
+ 			if (selection == value)
+@@ -251,7 +251,7 @@ public AreaGroup()
+ 	/// Get the range of bytes and the number of rows that 
+ 	/// are displayed in the current view.
+ 	/// </summary>
+-	public Range GetViewRange(out int nrows)
++	public Util.Range GetViewRange(out int nrows)
+ 	{
+ 		// find out number of rows, bytes in current view
+ 		
+@@ -271,9 +271,9 @@ public Range GetViewRange(out int nrows)
+ 		
+ 		// make sure we get an empty clipping Range when bleft==0
+ 		if (bleft > 0)
+-			return new Range(offset, offset + bleft - 1);
++			return new Util.Range(offset, offset + bleft - 1);
+ 		else
+-			return new Range();
++			return new Util.Range();
+ 	}
+ 	
+ 	/// <summary>
+@@ -381,7 +381,7 @@ private void ClearHighlights()
+ 	private void SetupBufferCache()
+ 	{
+ 		int nrows;
+-		Range view = GetViewRange(out nrows);
++		Util.Range view = GetViewRange(out nrows);
+ 		if (view.Size != bufferCache.Length)
+ 			bufferCache = new byte[view.Size];
+ 		
+@@ -444,7 +444,7 @@ private void RenderExtra()
+ 		}
+ 	}
+ 	/// <summary>
+-	/// Renders a <see cref="Range"/> of data using a specified <see cref="Drawer.HighlightType"/>
++	/// Renders a <see cref="Util.Range"/> of data using a specified <see cref="Drawer.HighlightType"/>
+ 	/// </summary>
+ 	private void RenderHighlight(AtomicHighlight h)
+ 	{
+@@ -474,12 +474,12 @@ private AtomicHighlight[] SplitAtomicPrioritized(AtomicHighlight q, Highlight r)
+ 		
+ 		if (q.Type > r.Type) {
+ 			ha = new AtomicHighlight[3]{new AtomicHighlight(r), new AtomicHighlight(q), new AtomicHighlight(r)};
+-			Range.SplitAtomic(ha, r, q);
++			Util.Range.SplitAtomic(ha, r, q);
+ 			ha[1].AddContainer(r);
+ 		}
+ 		else {
+ 			ha = new AtomicHighlight[3]{new AtomicHighlight(q), new AtomicHighlight(r), new AtomicHighlight(q)};
+-			Range.SplitAtomic(ha, q, r);
++			Util.Range.SplitAtomic(ha, q, r);
+ 			foreach (Highlight h in q.Containers)
+ 				ha[1].AddContainer(h);
+ 		}
+@@ -533,7 +533,7 @@ private IntervalTree<AtomicHighlight> BreakDownHighlights(Highlight s, IList<Hig
+ 	private IntervalTree<AtomicHighlight> GetAtomicHighlights()
+ 	{
+ 		int nrows;
+-		Range clip = GetViewRange(out nrows);
++		Util.Range clip = GetViewRange(out nrows);
+ 		Highlight view = new Highlight(clip, Drawer.HighlightType.Normal);
+ 		
+ 		// get all highlights in current view
+@@ -618,7 +618,7 @@ private void RenderCursor(IntervalTree<AtomicHighlight> atomicHighlights)
+ 		// if we don't find an overlap this means that either
+ 		// 1. the prev cursor position is not visible on the screen
+ 		// 2. the prev cursor position is at or beyond the end of the file
+-		IList<AtomicHighlight> overlaps = atomicHighlights.SearchOverlap(new Range(prevCursorOffset, prevCursorOffset));
++		IList<AtomicHighlight> overlaps = atomicHighlights.SearchOverlap(new Util.Range(prevCursorOffset, prevCursorOffset));
+ 		
+ 		AtomicHighlight h = null;
+ 		
+diff --git a/src/tools/find/FindOperations.cs b/src/tools/find/FindOperations.cs
+index 0351efd..e5984f9 100644
+--- a/src/tools/find/FindOperations.cs
++++ b/src/tools/find/FindOperations.cs
+@@ -146,8 +146,8 @@ public class ReplaceAllOperation: GenericFindOperation
+ 
+ 	protected override void DoOperation()
+ 	{
+-		Range m;
+-		match = new Range();
++		Util.Range m;
++		match = new Util.Range();
+ 		firstMatch = null;
+ 
+ 		numReplaced = 0;
+@@ -159,7 +159,7 @@ protected override void DoOperation()
+ 
+ 		while ((m = strategy.FindNext()) != null) {
+ 			if (firstMatch == null) {
+-				firstMatch = new Range(m);
++				firstMatch = new Util.Range(m);
+ 			}
+ 
+ 			match.Start = m.Start;
+diff --git a/src/tools/find/IFindStrategy.cs b/src/tools/find/IFindStrategy.cs
+index bdf7a87..bc2b21b 100644
+--- a/src/tools/find/IFindStrategy.cs
++++ b/src/tools/find/IFindStrategy.cs
+@@ -31,13 +31,13 @@ public interface IFindStrategy
+ 			ByteBuffer Buffer {	get; set; }
+ 				long Position { get; set; }
+ 
+-						Range FindNext();
+-	Range FindPrevious();
++						Util.Range FindNext();
++	Util.Range FindPrevious();
+ 
+-	Range FindNext(long limit);
+-	Range FindPrevious(long limit);
++	Util.Range FindNext(long limit);
++	Util.Range FindPrevious(long limit);
+ 
+ 	bool Cancelled { get; set; }
+ 		}
+ 
+-} // end namespace
+\ No newline at end of file
++} // end namespace
+diff --git a/src/tools/find/IFinder.cs b/src/tools/find/IFinder.cs
+index 594de22..a29a8fd 100644
+--- a/src/tools/find/IFinder.cs
++++ b/src/tools/find/IFinder.cs
+@@ -30,7 +30,7 @@ namespace Bless.Tools.Find {
+ public interface IFinder
+ {
+ 	IFindStrategy Strategy { get; set; }
+-			Range LastFound { get; set; }
++			Util.Range LastFound { get; set; }
+ 
+ 
+ 					event FirstFindHandler FirstFind;
+@@ -41,4 +41,4 @@ public interface IFinder
+ 	IAsyncResult ReplaceAll(byte[] ba, AsyncCallback ac);
+ }
+ 
+-} // end namespace
+\ No newline at end of file
++} // end namespace
diff --git a/dev-util/bloaty/Manifest b/dev-util/bloaty/Manifest
index edc308ce4c21..1ed0fee73295 100644
--- a/dev-util/bloaty/Manifest
+++ b/dev-util/bloaty/Manifest
@@ -1,3 +1,6 @@
 DIST bloaty-0_p20170420.tar.gz 3100016 BLAKE2B 74a3b44a5e63f8f06da7b554588be0ced62a0f6792513984fbf7cfab520f6f6173868d588427dd9ca322c6fbc29fd1b8931453ec045c591fd8de58904178bf2c SHA512 93947fd0c49c3223c1ec216c88fe22b24e68654511d4b9d4fb2bcbc816b92bbdaf47344abc1dc8f80ed0b38a8c8b09909f862f916fd9182048235582aa10feb0
+DIST bloaty-1.1.tar.bz2 5363836 BLAKE2B a538cf5634ed72844bb128238a521caf375eaab34fd3cce8fdd46002bcbc6c53ba986cc7c1e4b761b1253b2f01cb557c94e1e1585507ff89bec10c891e5f5a88 SHA512 142d0dd58fc0aadce3aee6e9260c6ed792a18cf5fe260c89051d51b9357c7527ba352c3d6c9e23a3494796fba3d88314b6ed8a3a76c6c0d111d4c509cae6b216
 EBUILD bloaty-0_p20170420.ebuild 771 BLAKE2B 4ae64b49ea5409c692772834a7e6cd3b602551535f043caae15edd13ffb0a914189dd3cd2c0f7273e7de2041ad06516a3cdf70dca7868606c81feeed0798f99b SHA512 bb7c2e8461920737f157df3dfeadb8e8bcce290c23c88862e5870b36ebd1f6a568779117302dae9446f9343ba667f264738e120a047ed023cbe81e4ec855cac8
-MISC metadata.xml 245 BLAKE2B bb69925f4ce8806c3ae58c2bff19a846fbde514f04037a61c8c7280d2639eca514c08ad611f4d8c6202c1dcc652d9f7f9662f9ef8cc69a286288cd234d8dd40c SHA512 1e3616356c21ccb0027e00a1cda28ca8a90b05a1f5ef89c11ffb44033365216ab541dafcbff7b728b5ab852a4db539cdf5db54865b69c4d9c250233d43e70702
+EBUILD bloaty-1.1.ebuild 863 BLAKE2B c51884ed15178ef9a76090bb55ac298cb79a05e6cf884a48a40c666b8b62e252d62aad7bfe9047bda56c1daf67ab490d443604147a34bb87b42763a592651135 SHA512 2005017783c42be91fdeabdd9d20d80d42858882c19c9b35f74cfc7e358c86890a8a034854d49b55ab0ee1dde69a2b2c204f0f443861dd249d10dfd855a0d04c
+EBUILD bloaty-9999.ebuild 798 BLAKE2B c24d2c676dfcec75c3ee0246877eaa8bc094fb3abf8728af5096090093eaa2e94f4c685bcdb6ed03ef36bc4d70a65e1469e2b8a705792c44aca6994dbd6e0b4b SHA512 f2d7d6f6f09ca7cb021777e5aaf7530e3d69dcb967fe952d4fdf6e0156dad11a75cd3fab0dead023dcc58c8fbfef3be7756a43a78f7f882357f2e3a8a22eed6d
+MISC metadata.xml 449 BLAKE2B d5d4f84a73649bcf9dd3f72b67de86369c401dd65efea8455dcd42f20607d408c22bed118faed36f9768db0519b3da3e884261a7ef45ea596dbe3611b05194ba SHA512 06903ec854e5200edd588dbbab17a45364e76c324262c08b0b7fd1bf54bfd607b8275de5d4e5dc7c7ebcfe62bebbdaa6c00850747d3021bf2939db947cfef63a
diff --git a/dev-util/bloaty/bloaty-1.1.ebuild b/dev-util/bloaty/bloaty-1.1.ebuild
new file mode 100644
index 000000000000..227dcc50dcdf
--- /dev/null
+++ b/dev-util/bloaty/bloaty-1.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="A size profiler for binaries"
+HOMEPAGE="https://github.com/google/bloaty"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/google/${PN}"
+	IUSE="test"
+	RESTRICT="!test? ( test )"
+else
+	SRC_URI="https://github.com/google/${PN}/releases/download/v${PV}/${P}.tar.bz2"
+	KEYWORDS="~amd64"
+fi
+
+BDEPEND="
+	virtual/pkgconfig
+"
+DEPEND="
+	dev-libs/capstone:=
+	dev-libs/protobuf:=
+	dev-libs/re2:=
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBLOATY_ENABLE_CMAKETARGETS=OFF
+		-DBUILD_SHARED_LIBS=OFF
+	)
+	if [[ ${PV} == 9999 ]]; then
+		mycmakeargs+=(
+			-DBUILD_TESTING=$(usex test)
+			$(usex test -DINSTALL_GTEST=OFF "")
+		)
+	fi
+	cmake_src_configure
+}
diff --git a/dev-util/bloaty/bloaty-9999.ebuild b/dev-util/bloaty/bloaty-9999.ebuild
new file mode 100644
index 000000000000..4aa412ab17d3
--- /dev/null
+++ b/dev-util/bloaty/bloaty-9999.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="A size profiler for binaries"
+HOMEPAGE="https://github.com/google/bloaty"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/google/${PN}"
+	IUSE="test"
+	RESTRICT="!test? ( test )"
+else
+	SRC_URI="https://github.com/google/${PN}/releases/download/v${PV}/${P}.tar.bz2"
+	KEYWORDS="~amd64"
+fi
+
+BDEPEND="
+	virtual/pkgconfig
+"
+DEPEND="
+	dev-libs/capstone:=
+	dev-libs/protobuf:=
+	dev-libs/re2:=
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBLOATY_ENABLE_CMAKETARGETS=OFF
+	)
+	if [[ ${PV} == 9999 ]]; then
+		mycmakeargs+=(
+			-DBUILD_TESTING=$(usex test)
+		)
+	fi
+	cmake_src_configure
+}
diff --git a/dev-util/bloaty/metadata.xml b/dev-util/bloaty/metadata.xml
index 146d5f454ee7..36b90a82850e 100644
--- a/dev-util/bloaty/metadata.xml
+++ b/dev-util/bloaty/metadata.xml
@@ -1,8 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">google/bloaty</remote-id>
-	</upstream>
+  <maintainer type="person">
+    <email>ngg@ngg.hu</email>
+    <name>Gergely Nagy</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">google/bloaty</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-util/bnfc/Manifest b/dev-util/bnfc/Manifest
index d7c71ff4d1a5..371bc037bc42 100644
--- a/dev-util/bnfc/Manifest
+++ b/dev-util/bnfc/Manifest
@@ -1,5 +1,7 @@
 AUX bnfc-2.8.1-ghc84-p2.patch 4144 BLAKE2B 19ac2a0e8edcbad7d441c248625904aa0021fc64e97d3f7ebcf3e0d1bdf693b442062a5126af1162404de59a022e8f573d7127c223209993755e99e60285eda8 SHA512 4a21d805f24d9f4729a2b95af04333651639324f7ec26996627007ffb5dc8657cb175b228e95e9356c2b47e70ac49576f58b024891c0ce6ddf299b4ee9299548
 AUX bnfc-2.8.1-ghc84.patch 986 BLAKE2B bf7ecd64654f04d701a2b7ec9dfc969cbf4a1bd51db7e6d31512c2cd7bfbaed83ae37a93bec7ce667cae2a98369086accf5d76dab84ae02df4af6d87703531bf SHA512 615ac9cf9b7eff19f675b4cb44e9a3b9d9acc53c827c57c2b556fb76c9c37832f8d137609df64c469eed0b298c0b9dbe01b1ba9cb8d5a1b3088fadadfe27af49
 DIST BNFC-2.8.1.tar.gz 225015 BLAKE2B 973f7a5ebc5fb995bf0014621ba7bfebe0d6adbb35bd276b3f7ec56e3fe1ab08c3811d27a2d58a73ca52ac4bf9ba35fba3d172a82684b1ef999a2fdd6dc4ece9 SHA512 d5ea9b4129a4f71c2d66cda2f859a2c39be6d4400cddbd5a5303b5b408f4cf03ce7a92825224f4674c6cc48bec07429c447b9b39fc4e6d144c922bf1b0829561
-EBUILD bnfc-2.8.1.ebuild 815 BLAKE2B 543658d36f34aa2d2e28eee8a953c35f53bceb1258d46ab950b0355b46cca9b61f7a7656978c49f91964dff38d5c2521ae14f3f38ebf049a823620f755c636f6 SHA512 c88a93a1294a99f20c8313cd70810a423e9236f46b72253614605ff3b8effdfd445fd759ee36b4451eafb4969dd82e5d53ac938643b75daf5d98f64be787d802
+DIST BNFC-2.8.3.tar.gz 286964 BLAKE2B 5c8a5d08b1b705e064ef0a7a685dab455e933d0fa84946b4526aebee8698e94ea2cdfa797eb63320e9632b3503da5c41ea2aa59d0bb1f0fa9bda3588a19552d9 SHA512 742937cb0674f5e890376f51aeeccaf2f4c986f6b27e77faaee1ac8baebec553e70c623844c7c63e1caf441592b53113ba4ba187d88a9e869885d40201c54bef
+EBUILD bnfc-2.8.1.ebuild 810 BLAKE2B c4f0a8fd9d8dfb3a56e5603d65c1bc68ff6dc538795ea49bf9f73848ec4532db30605763c8edcf7187e35605e0d0e77a31ebdf16defc2189168a59974b0574cf SHA512 bb3da21b15d5408a0188dbee21f93fb788b52a7174e250393f2374f0a8492ea58e172dfe1ab380d15978688379a982c22e7961a6bb18255075a2fd75e9dac538
+EBUILD bnfc-2.8.3.ebuild 960 BLAKE2B c560f68b545589ebd82790828eeed3420e95d00b2653fa7d75eb0e60dcd42b12de6e14718bd77f891b10593318b137a22636a4caf87497bd16efe72bb35bf04f SHA512 23999b824f00da294ec3f071db9d8e1666916ce5007591798a2c364a065392c15ed9e55bb90573bc6159055f79c5d6986442c1982bd5c1b9424863c53cddc42b
 MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-util/bnfc/bnfc-2.8.1.ebuild b/dev-util/bnfc/bnfc-2.8.1.ebuild
index 0d11aa19de25..fffb7f49416a 100644
--- a/dev-util/bnfc/bnfc-2.8.1.ebuild
+++ b/dev-util/bnfc/bnfc-2.8.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RESTRICT=test # missing files
diff --git a/dev-util/bnfc/bnfc-2.8.3.ebuild b/dev-util/bnfc/bnfc-2.8.3.ebuild
new file mode 100644
index 000000000000..517ae82b955c
--- /dev/null
+++ b/dev-util/bnfc/bnfc-2.8.3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.2
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+MY_PN="BNFC"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A compiler front-end generator"
+HOMEPAGE="http://bnfc.digitalgrammars.com/"
+SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT=test # Ambiguous module name ‘Data.Time’: it was found in multiple packages: pulseaudio-0.0.2.1 time-1.8.0.2
+
+RDEPEND="dev-haskell/mtl:=[profile?]
+	dev-haskell/semigroups:=[profile?]
+	>=dev-lang/ghc-7.6.1:=
+"
+DEPEND="${RDEPEND}
+	dev-haskell/alex
+	>=dev-haskell/cabal-1.16.0
+	dev-haskell/happy
+	test? ( >=dev-haskell/doctest-0.8
+		dev-haskell/hspec
+		dev-haskell/hunit
+		>=dev-haskell/quickcheck-2.5
+		dev-haskell/temporary )
+"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-util/boost-build/Manifest b/dev-util/boost-build/Manifest
index 0aa2185fb48a..3c45889fe4f4 100644
--- a/dev-util/boost-build/Manifest
+++ b/dev-util/boost-build/Manifest
@@ -6,9 +6,12 @@ AUX boost-build-1.71.0-no-implicit-march-flags.patch 15700 BLAKE2B dc73dcbd5320d
 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
 MISC metadata.xml 329 BLAKE2B f492b1ba64c3f7bce1d3fb304bcff93357cc069dfd06b69c25cf26f4423ebea51ac4614a8d865635568f0e9db424a6904fc1edd5fa729243838e16e9887f4202 SHA512 57baf2d8e0a4c240d99f68ce122086a147d42145687b712609fdcd73b77fe3fdfecc1b078edb6a9c922213482fcc17c2fccb6762ec69890fbc9a912c4cb34827
diff --git a/dev-util/boost-build/boost-build-1.74.0.ebuild b/dev-util/boost-build/boost-build-1.74.0.ebuild
new file mode 100644
index 000000000000..40e1b4993f78
--- /dev/null
+++ b/dev-util/boost-build/boost-build-1.74.0.ebuild
@@ -0,0 +1,74 @@
+# 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.74.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/files/boost-build-1.74.0-no-implicit-march-flags.patch b/dev-util/boost-build/files/boost-build-1.74.0-no-implicit-march-flags.patch
new file mode 100644
index 000000000000..894af8f62c2d
--- /dev/null
+++ b/dev-util/boost-build/files/boost-build-1.74.0-no-implicit-march-flags.patch
@@ -0,0 +1,279 @@
+--- a/tools/gcc.jam
++++ b/tools/gcc.jam
+@@ -1224,135 +1224,9 @@
+ # 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-client : -march=icelake-client ;
+-cpu-flags gcc OPTIONS : x86 : icelake-server : -march=icelake-server ;
+-cpu-flags gcc OPTIONS : x86 : cascadelake : -march=skylake-avx512 -mavx512vnni ;
+-cpu-flags gcc OPTIONS : x86 : cooperlake : -march=cooperlake ;
+-cpu-flags gcc OPTIONS : x86 : tigerlake : -march=tigerlake ;
+-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 : znver2 : -march=znver2 ;
+-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 : c7 : -march=c7 ;
+ ##
+-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,138 +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', '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-client', ['-march=icelake-client'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'icelake-server', ['-march=icelake-server'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'cascadelake', ['-march=skylake-avx512', '-mavx512vnni'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'cooperlake', ['-march=cooperlake'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'tigerlake', ['-march=tigerlake'])
+-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', 'znver1', ['-march=znver1'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'znver2', ['-march=znver2'])
+-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', 'c7', ['-march=c7'])
+ ##
+-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 83cabc6415ce..7dfedaa644f3 100644
--- a/dev-util/bpftrace/Manifest
+++ b/dev-util/bpftrace/Manifest
@@ -2,18 +2,11 @@ AUX bpftrace-0.10.0-dont-compress-man.patch 722 BLAKE2B 583969e9f4457a49f17f33d9
 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.10_pre20190614-install-libs.patch 4653 BLAKE2B 66229e4b3f7edc345eeac5f833348f7a434ee7f6c830c344b3c357fafec98b8cc8c725cf37ee01802d085cdbf9deb0fa13d9dd72161b230aff589c75b17890a3 SHA512 63f899bd119f86ee6e9bae0c2ef6e657a37a33c700414ea4757353f0637e89ef9ed3dbf1b70414eec1a5c2658451e8be3e7de1941a0796cac621361bcdd14537
-AUX bpftrace-0.9.3-install-libs.patch 5117 BLAKE2B 6cad778dd19ab040f3bd88390329cc49261c83dcc0ff97f9e663d5fb0d55da87d0e4c1efaabbd31b11e383ea0f904fdab8bd7f34fbdd0805abe20d623673c1fc SHA512 0842712b8d32ba4f7bc0767e3748ed4e8517187c9c75d426e1946aacce3a46fd5f7100d4cef0bed655a763d102cfeff160d549065f6b9c6000a7b3f496cb8b87
-AUX bpftrace-0.9.4-install-libs.patch 5481 BLAKE2B 96df784e95fc42e385dc3330d0ea074863a8ba3c3aeb8d7078b29e03708b2e46fccc30f097dbf2c347f0fb4afadee0d2b7cbb038b05a2d81fbd66e4e008302dc SHA512 e74994b020939035fb9a9b646f5572ae3f241f194e7f119c771d5391a651f27ab0733364a4ddcccd7759f5951141e61c4bf019f98a62a820577687109ca50854
-AUX bpftrace-0.9.4-llvm-10.patch 7123 BLAKE2B 61fe740aae135de1c039e73b3c4e8bd79a8a7412c3d06ad7a8ab3d8d3c0ec825053b4e6b1fcd208a7847cf8f0ff8436ed988aa403485f90755c0e59d5c2a5c8c SHA512 eaba150ea6dafb9e7ab13f1f23246ce064241369882b16bf7eb3a9dc74545064c604e4435c6567c6f0a0df9ac939120c5b3ac5ee95bdc669f9d0e82ededc9c95
+AUX bpftrace-0.11.0-install-libs.patch 6063 BLAKE2B c05146ef6d6ffd7fb5e1f97a9ea3dbdbab1b875bcf1707b07ff8c2b93e0e8cd36093330edc32b1d25796a5b72370b114301c1c0db78bc59c48740158e31a8e95 SHA512 e022425af1d19e1ff586f23d7de384b912bf8b67e501b86d31e3450e118ea3266cb81413caa06b3e674a31df2585ad447234e3897c716f055c7423a5f7333a66
 AUX bpftrace-mandir.patch 906 BLAKE2B d875e2523b7e719624d92c58a8f058cdd597da07bf6472d2e3dc05eb46be64718ed4056e15a93e4c22264fa35ceb6b79b428febade422ba435a2a2b9e17fb707 SHA512 11544e9e5892ae3657ff903fa2780e71223e380322b4059ddcea4a6edd80c5a7ab8d45188eb577127f64a6705a6ae41d53f3ba7e05bf450853b12a9ba3d84904
 DIST bpftrace-0.10.0.tar.gz 835854 BLAKE2B 623369bb2a2ad8d5eec364afa98bdae3fbe5e66182d8f1187fe86a8bd70ee357a554eb063fdbe5476eab23912adf2cf027092cac3e6989d8f716e91aa5d01212 SHA512 da400efe78cea505a32deead594b047ec4394d3eefe86e7b6853fe2dc715c5847a3abcbd26c1fac39d0a534f1e57d6c0bc3625e0c3f1054b0d84b7b1d6eb69b9
-DIST bpftrace-0.9.2.tar.gz 715019 BLAKE2B 1f20998bd379b91cb46d7e856a5d892e0de7ad6d9f85cb657fcf6a0c879167c0931d28c78e4be98adab349144fe0bc99871cf70556dd1998e5b8f918fa1702e3 SHA512 5c6ee5fec690a907c370ed0bed85906d304215d7f97b99a2cae90453061f522fa6369627c9524a5a24e97c6cbb595a880a2a1b1d71095fffb693a4cef172a6f0
-DIST bpftrace-0.9.3.tar.gz 743506 BLAKE2B d00708bcebaf7f039788dfc52f4a0bb501bb3c52e8b789060f824652b3917ea3950d77dbc7bee04da013f4b552338251bda9781d19a03ec227208b943fded232 SHA512 49b12735fe2fbf4f72d3d0c0372a7a570c7abc92d1f626624d591a863009c8bfabdf86825f133885800c7ea293773651be66e4c792f9cd397f82d250a7af83be
-DIST bpftrace-0.9.4.tar.gz 792253 BLAKE2B d34d390a612825141b86ba14482f06820c88bea76580c53c17d19a6480c0e2a5656531f39b79fbcea4e004ecd3eea36877560f22fac584f36a3dffa1e7fe96c5 SHA512 d2b32235fa81d6f06771df32877388a9105230adfc638b0d0ebf4f11a567246e8514d93c14da9c7008dbacd6b2c4108604fc5a2721ef831efa5c596cbe50b1da
+DIST bpftrace-0.11.0.tar.gz 867444 BLAKE2B a99255befadea0b4cb54299a8318c0a7a667ac2258b612750705b4d351ac59f4411f2567bc0100929291e3c9756d276671e41af9d398b118b3d486dace2953d7 SHA512 32bf0c23a7b0e1a57d0e0b8fc845a9e184e201ac3f6018a3d3cee8c97096093b333578cb898ede02fb3ab8d55ba9bcd2bb67ac70b81a49461c0f6e5c03c2a6f5
 EBUILD bpftrace-0.10.0-r1.ebuild 1676 BLAKE2B 57af40bbdefcc28fc775f7aadeb2d7213b974b130aa51591076354f1f351ecace66d9c1355c99adab7f5cdcf2e711767d1f045f6e076eef2476055d7a0309bd2 SHA512 42b1eefa65583294af9baf692dcd9d8da5577b4e59cdb202b5d0df25e7746acafeac9888ee2c7eac8bff8974edaf4407c9d07e62e47662a02743fc0de0fbc9e5
-EBUILD bpftrace-0.9.2.ebuild 1402 BLAKE2B 539e79098fd31d8ade5449f53e9b63d4c8b3ecd3e2716eab76f8a7eab00e11480224502369899f68eb839c9cb48cebc1f5fd6d6c231f93a4a16d58e19e973171 SHA512 9021699f98686a48954e39d653797b10d68cc56b284bdc77a58778dec41c20617031b1ccf8e15283a6b630b366856f6ec0d1013c6150709cc37f25d786f289db
-EBUILD bpftrace-0.9.3.ebuild 1391 BLAKE2B db3f13374aeac65bc6bbaccc6ae187c6f601c753d7b426562dad7af055c1c4a32965abd1a4d8100eddf96cc6b5cac8c1d839cbc4c9cd2ba4822f83c23bcb6c2c SHA512 1fc37e191621ba5c63d43e55f772b505eddff423f37d3697061a4a03000a5bbc8086cb5e4df87c98d080317213581058128b4a5a40c807e5034e6786ca8d37ee
-EBUILD bpftrace-0.9.4.ebuild 1487 BLAKE2B 1003d7865410fb246ac9aa58adafa018e3979a331543dffd7fdce772517875043f6602d7d2856aecf7eb76094d7bf6531f9cbd5e3f296c98f8e0e55178c069b7 SHA512 e122a7c9ab7db361447eb3a7ce79b416ede14b0eebe5ea0b507344fd4203f9e0cf9c9375f526494c4ec1f5c4bafc3153a97dc6bc8554001aac3e609f0f7b233e
-EBUILD bpftrace-9999.ebuild 1339 BLAKE2B 89932b8689799d37f5730662705d644059796e27abbb187e57f741450dbf1034d5322f3e94a4a493f0341f939fcc3902e3173d8b2357c70695c3f3dd957d7db5 SHA512 b7df8cb8af0c74599fb87a32ff1efff499e3559682c72fea78ea5d53e9513f0738fff86acbc91c54b21e3b20ba0e0ccea8f559e7d80f359e45e8448a7fa94000
+EBUILD bpftrace-0.11.0-r1.ebuild 1538 BLAKE2B 7bc25c0281e1e50bf22933c32cb16802a521ea9633e003ca1c6487542ea8ac6f101e932a9c1e163c9f42936c1ef7115f143212aa9275ef0d57187117f2474602 SHA512 0be111921a92d1e6b7c17aa59842a9d06ab6478fd6b86aab7c232b19978541ee3e9b3d5adbefaf57f26272c0276c9ed5dcac53beeb34cdc07cdd7440a4d258d8
+EBUILD bpftrace-9999.ebuild 1538 BLAKE2B 7bc25c0281e1e50bf22933c32cb16802a521ea9633e003ca1c6487542ea8ac6f101e932a9c1e163c9f42936c1ef7115f143212aa9275ef0d57187117f2474602 SHA512 0be111921a92d1e6b7c17aa59842a9d06ab6478fd6b86aab7c232b19978541ee3e9b3d5adbefaf57f26272c0276c9ed5dcac53beeb34cdc07cdd7440a4d258d8
 MISC metadata.xml 308 BLAKE2B 5440fafa478bdbdf6906c74d697a9542deb8b13b76527a380df723562759d914d597dff029f93ba4567ce4e0f4723fded5a13ea7d2032752253bad1906e753dc SHA512 c27c2ef4795e9167ea133e0c0e2c6d67425d6db754bd563d9cb7a791b4a155ebe855ad0e67c2b29235a9b9761f29dbb14958b124c95a1aaddb97801c763914ba
diff --git a/dev-util/bpftrace/bpftrace-0.9.4.ebuild b/dev-util/bpftrace/bpftrace-0.11.0-r1.ebuild
index ad25d1221e13..6eeeb6c28d67 100644
--- a/dev-util/bpftrace/bpftrace-0.9.4.ebuild
+++ b/dev-util/bpftrace/bpftrace-0.11.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit toolchain-funcs linux-info cmake-utils
+inherit toolchain-funcs llvm linux-info cmake
 
 DESCRIPTION="High-level tracing language for eBPF"
 HOMEPAGE="https://github.com/iovisor/bpftrace"
@@ -23,26 +23,31 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="test"
 
-COMMON_DEPEND="dev-util/systemtap
+COMMON_DEPEND="
+	dev-util/systemtap
 	sys-devel/clang:=
 	dev-libs/libbpf:=
 	>=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)]
-	>=dev-util/bcc-0.12.0:=
-	virtual/libelf"
+	sys-devel/clang:=
+	>=dev-util/bcc-0.13.0:=
+	virtual/libelf
+"
 DEPEND="${COMMON_DEPEND}
-	test? ( dev-cpp/gtest )"
+	test? ( dev-cpp/gtest )
+"
 RDEPEND="${COMMON_DEPEND}"
-BDEPEND+="dev-util/cmake
+BDEPEND+="
+	>=dev-util/cmake-3.8
 	sys-devel/flex
-	sys-devel/bison"
+	sys-devel/bison
+"
 
-S="${WORKDIR}/${PN}-${MY_PV}"
+S="${WORKDIR}/${PN}-${MY_PV:-${PV}}"
 QA_DT_NEEDED="/usr/lib.*/libbpftraceresources.so"
 
 PATCHES=(
-	"${FILESDIR}/bpftrace-0.9.4-llvm-10.patch"
-	"${FILESDIR}/bpftrace-0.9.4-install-libs.patch"
-	"${FILESDIR}/bpftrace-mandir.patch"
+	"${FILESDIR}/bpftrace-0.11.0-install-libs.patch"
+	"${FILESDIR}/bpftrace-0.10.0-dont-compress-man.patch"
 )
 
 # lots of fixing needed
@@ -61,8 +66,12 @@ pkg_pretend() {
 	check_extra_config
 }
 
+pkg_setup() {
+	LLVM_MAX_SLOT=11 llvm_pkg_setup
+}
+
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -72,5 +81,5 @@ src_configure() {
 		"-DBUILD_TESTING:BOOL=OFF"
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/dev-util/bpftrace/bpftrace-0.9.2.ebuild b/dev-util/bpftrace/bpftrace-0.9.2.ebuild
deleted file mode 100644
index 5fcb41040f5d..000000000000
--- a/dev-util/bpftrace/bpftrace-0.9.2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 2019 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(+)]
-	>=dev-util/bcc-0.10.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_pre20190614-install-libs.patch"
-	"${FILESDIR}/bpftrace-mandir.patch"
-)
-
-# lots of fixing needed
-RESTRICT="test"
-
-pkg_pretend() {
-	local CONFIG_CHECK="~BPF ~BPF_SYSCALL ~BPF_JIT ~BPF_EVENTS"
-
-	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.9.3.ebuild b/dev-util/bpftrace/bpftrace-0.9.3.ebuild
deleted file mode 100644
index 74f1dd849d2c..000000000000
--- a/dev-util/bpftrace/bpftrace-0.9.3.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 2019 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(+)]
-	>=dev-util/bcc-0.10.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.9.3-install-libs.patch"
-	"${FILESDIR}/bpftrace-mandir.patch"
-)
-
-# lots of fixing needed
-RESTRICT="test"
-
-pkg_pretend() {
-	local CONFIG_CHECK="~BPF ~BPF_SYSCALL ~BPF_JIT ~BPF_EVENTS"
-
-	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-9999.ebuild b/dev-util/bpftrace/bpftrace-9999.ebuild
index ccad41e9941b..6eeeb6c28d67 100644
--- a/dev-util/bpftrace/bpftrace-9999.ebuild
+++ b/dev-util/bpftrace/bpftrace-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2019 Gentoo Authors
+# 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
+inherit toolchain-funcs llvm linux-info cmake
 
 DESCRIPTION="High-level tracing language for eBPF"
 HOMEPAGE="https://github.com/iovisor/bpftrace"
@@ -13,7 +13,8 @@ if [[ ${PV} =~ 9{4,} ]]; then
 	EGIT_REPO_URI="https://github.com/iovisor/${PN}"
 	BDEPEND=""
 else
-	SRC_URI="https://github.com/iovisor/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	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
@@ -22,37 +23,55 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="test"
 
-COMMON_DEPEND="dev-util/systemtap
+COMMON_DEPEND="
+	dev-util/systemtap
 	sys-devel/clang:=
 	dev-libs/libbpf:=
 	>=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)]
-	>=dev-util/bcc-0.10.0:=
-	virtual/libelf"
+	sys-devel/clang:=
+	>=dev-util/bcc-0.13.0:=
+	virtual/libelf
+"
 DEPEND="${COMMON_DEPEND}
-	test? ( dev-cpp/gtest )"
+	test? ( dev-cpp/gtest )
+"
 RDEPEND="${COMMON_DEPEND}"
-BDEPEND+="dev-util/cmake
+BDEPEND+="
+	>=dev-util/cmake-3.8
 	sys-devel/flex
-	sys-devel/bison"
+	sys-devel/bison
+"
 
+S="${WORKDIR}/${PN}-${MY_PV:-${PV}}"
 QA_DT_NEEDED="/usr/lib.*/libbpftraceresources.so"
 
 PATCHES=(
-	"${FILESDIR}/bpftrace-0.9.3-install-libs.patch"
-	"${FILESDIR}/bpftrace-mandir.patch"
+	"${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_SYSCALL ~BPF_JIT ~BPF_EVENTS"
+	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-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -62,5 +81,5 @@ src_configure() {
 		"-DBUILD_TESTING:BOOL=OFF"
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/dev-util/bpftrace/files/bpftrace-0.10_pre20190614-install-libs.patch b/dev-util/bpftrace/files/bpftrace-0.10_pre20190614-install-libs.patch
deleted file mode 100644
index f4483570c996..000000000000
--- a/dev-util/bpftrace/files/bpftrace-0.10_pre20190614-install-libs.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e8870c6..a55385d 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -47,9 +47,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 b8b0d96..0803c1e 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 e737119..b2b17e2 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -30,7 +30,8 @@ endif(HAVE_BCC_ELF_FOREACH_SYM)
- if(HAVE_GET_CURRENT_CGROUP_ID)
-   target_compile_definitions(bpftrace PRIVATE HAVE_GET_CURRENT_CGROUP_ID)
- endif(HAVE_GET_CURRENT_CGROUP_ID)
--target_link_libraries(bpftrace arch ast parser resources)
-+target_link_libraries(bpftrace bpftracearch bpftraceast bpftraceparser
-+	bpftraceresources)
- 
- if (STATIC_LINKING)
-   target_link_libraries(bpftrace ${LIBBCC_LIBRARIES})
-diff --git a/src/arch/CMakeLists.txt b/src/arch/CMakeLists.txt
-index a26f610..53627e2 100644
---- a/src/arch/CMakeLists.txt
-+++ b/src/arch/CMakeLists.txt
-@@ -1,5 +1,7 @@
- if(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")
--    add_library(arch aarch64.cpp)
-+    add_library(bpftracearch aarch64.cpp)
- else()
--    add_library(arch x86_64.cpp)
-+    add_library(bpftracearch x86_64.cpp)
- endif()
-+
-+install(TARGETS bpftracearch LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
-diff --git a/src/ast/CMakeLists.txt b/src/ast/CMakeLists.txt
-index 4d77c9f..2a00572 100644
---- a/src/ast/CMakeLists.txt
-+++ b/src/ast/CMakeLists.txt
-@@ -1,4 +1,4 @@
--add_library(ast
-+add_library(bpftraceast
-   ast.cpp
-   codegen_llvm.cpp
-   irbuilderbpf.cpp
-@@ -7,15 +7,16 @@ add_library(ast
- )
- 
- if(HAVE_GET_CURRENT_CGROUP_ID)
--  target_compile_definitions(ast PRIVATE HAVE_GET_CURRENT_CGROUP_ID)
-+  target_compile_definitions(bpftraceast PRIVATE HAVE_GET_CURRENT_CGROUP_ID)
- endif(HAVE_GET_CURRENT_CGROUP_ID)
- 
--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)
- 
--add_dependencies(ast parser)
-+add_dependencies(bpftraceast bpftraceparser)
-+install(TARGETS bpftraceast LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
- 
- if (STATIC_LINKING)
-   set(clang_libs
-@@ -35,16 +36,16 @@ if (STATIC_LINKING)
-       clangSerialization
-       clangToolingCore)
-   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})
- 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/dev-util/bpftrace/files/bpftrace-0.9.4-install-libs.patch b/dev-util/bpftrace/files/bpftrace-0.11.0-install-libs.patch
index fe3fc29fd9b4..a28e37564eae 100644
--- a/dev-util/bpftrace/files/bpftrace-0.9.4-install-libs.patch
+++ b/dev-util/bpftrace/files/bpftrace-0.11.0-install-libs.patch
@@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2b214c1..a787d7d 100644
+index 1bca8d6..1482b29 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -85,9 +85,10 @@ find_package(FLEX REQUIRED)
+@@ -91,9 +91,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)
@@ -31,10 +31,10 @@ index a95c60a..f5c4d67 100644
  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 5b9a95d..b1ccf7a 100644
+index 487fa9b..61b7b38 100644
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
-@@ -68,7 +68,8 @@ if (ALLOW_UNSAFE_PROBE)
+@@ -84,7 +84,8 @@ if (ALLOW_UNSAFE_PROBE)
    target_compile_definitions(bpftrace PRIVATE HAVE_UNSAFE_PROBE)
  endif(ALLOW_UNSAFE_PROBE)
  
@@ -42,13 +42,13 @@ index 5b9a95d..b1ccf7a 100644
 +target_link_libraries(bpftrace bpftracearch bpftraceast bpftraceparser
 +  bpftraceresources)
  
+ target_link_libraries(bpftrace ${LIBBCC_LIBRARIES})
  if(STATIC_LINKING)
-   target_link_libraries(bpftrace ${LIBBCC_LIBRARIES})
 diff --git a/src/arch/CMakeLists.txt b/src/arch/CMakeLists.txt
-index edb0654..e57c8c5 100644
+index a26c1c8..ffb5900 100644
 --- a/src/arch/CMakeLists.txt
 +++ b/src/arch/CMakeLists.txt
-@@ -1,8 +1,10 @@
+@@ -1,13 +1,15 @@
  if(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")
 -    add_library(arch aarch64.cpp)
 +    add_library(bpftracearch aarch64.cpp)
@@ -56,25 +56,33 @@ index edb0654..e57c8c5 100644
         CMAKE_SYSTEM_PROCESSOR STREQUAL "ppc64le")
 -    add_library(arch ppc64.cpp)
 +    add_library(bpftracearch ppc64.cpp)
- else()
+ elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "s390" OR
+        CMAKE_SYSTEM_PROCESSOR STREQUAL "s390x")
+-    add_library(arch s390.cpp)
++    add_library(bpftracearch s390.cpp)
+ elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
 -    add_library(arch x86_64.cpp)
 +    add_library(bpftracearch x86_64.cpp)
+ 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 f280f47..5db9246 100644
+index 649bf0a..b969b9c 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
-   field_analyser.cpp
-@@ -7,12 +7,13 @@ add_library(ast
+@@ -7,17 +7,18 @@ add_library(ast
+   printer.cpp
    semantic_analyser.cpp
  )
++install(TARGETS bpftraceast LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
  
 -target_include_directories(ast PUBLIC ${CMAKE_SOURCE_DIR}/src)
 -target_include_directories(ast PUBLIC ${CMAKE_SOURCE_DIR}/src/ast)
@@ -85,13 +93,17 @@ index f280f47..5db9246 100644
 +target_include_directories(bpftraceast PUBLIC ${CMAKE_BINARY_DIR})
 +target_link_libraries(bpftraceast bpftracearch)
  
+ if (HAVE_BCC_KFUNC)
+-  target_compile_definitions(ast PRIVATE HAVE_BCC_KFUNC)
++  target_compile_definitions(bpftraceast PRIVATE HAVE_BCC_KFUNC)
+ endif(HAVE_BCC_KFUNC)
+ 
 -add_dependencies(ast parser)
 +add_dependencies(bpftraceast bpftraceparser)
-+install(TARGETS bpftraceast LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
  
  if (STATIC_LINKING)
    set(clang_libs
-@@ -36,26 +37,26 @@ if (STATIC_LINKING)
+@@ -41,17 +42,17 @@ if (STATIC_LINKING)
      if(EMBED_LIBCLANG_ONLY)
        unlink_transitive_dependency("${CLANG_EXPORTED_TARGETS}" "LLVM")
      endif()
@@ -105,12 +117,15 @@ index f280f47..5db9246 100644
 -    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})
+     llvm_map_components_to_libnames(llvm_libs bpfcodegen ipo irreader mcjit option orcjit ${LLVM_TARGETS_TO_BUILD})
 -    target_link_libraries(ast ${clang_libs})
 -    target_link_libraries(ast ${llvm_libs})
 +    target_link_libraries(bpftraceast ${clang_libs})
 +    target_link_libraries(bpftraceast ${llvm_libs})
    endif()
+ 
+   if(STATIC_LIBC)
+@@ -60,11 +61,11 @@ if (STATIC_LINKING)
  else()
    find_library(found_LLVM LLVM HINTS ${LLVM_LIBRARY_DIRS})
    if(found_LLVM)
@@ -126,10 +141,10 @@ index f280f47..5db9246 100644
 +  target_link_libraries(bpftraceast libclang)
  endif()
 diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
-index 211c47b..2fb73ef 100644
+index 4104a57..59486de 100644
 --- a/tests/CMakeLists.txt
 +++ b/tests/CMakeLists.txt
-@@ -88,7 +88,8 @@ if(HAVE_BFD_DISASM)
+@@ -101,7 +101,8 @@ if(HAVE_BFD_DISASM)
    endif(STATIC_LINKING)
  endif(HAVE_BFD_DISASM)
  
@@ -137,5 +152,5 @@ index 211c47b..2fb73ef 100644
 +target_link_libraries(bpftrace_test bpftracearch bpftraceast bpftraceparser
 +  bpftraceresources)
  
+ target_link_libraries(bpftrace_test ${LIBBCC_LIBRARIES})
  if (STATIC_LINKING)
-   if(EMBED_LLVM OR EMBED_CLANG)
diff --git a/dev-util/bpftrace/files/bpftrace-0.9.3-install-libs.patch b/dev-util/bpftrace/files/bpftrace-0.9.3-install-libs.patch
deleted file mode 100644
index 0ddb07b47408..000000000000
--- a/dev-util/bpftrace/files/bpftrace-0.9.3-install-libs.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5e0d770..d51edf6 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -51,9 +51,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 b8b0d96..0803c1e 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 65f3a34..b001a83 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -56,7 +56,8 @@ if (ALLOW_UNSAFE_UPROBE)
-   target_compile_definitions(bpftrace PRIVATE HAVE_UNSAFE_UPROBE)
- endif(ALLOW_UNSAFE_UPROBE)
- 
--target_link_libraries(bpftrace arch ast parser resources)
-+target_link_libraries(bpftrace bpftracearch bpftraceast bpftraceparser
-+  bpftraceresources)
- 
- if (STATIC_LINKING)
-   target_link_libraries(bpftrace ${LIBBCC_LIBRARIES})
-diff --git a/src/arch/CMakeLists.txt b/src/arch/CMakeLists.txt
-index a26f610..53627e2 100644
---- a/src/arch/CMakeLists.txt
-+++ b/src/arch/CMakeLists.txt
-@@ -1,5 +1,7 @@
- if(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")
--    add_library(arch aarch64.cpp)
-+    add_library(bpftracearch aarch64.cpp)
- else()
--    add_library(arch x86_64.cpp)
-+    add_library(bpftracearch x86_64.cpp)
- endif()
-+
-+install(TARGETS bpftracearch LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
-diff --git a/src/ast/CMakeLists.txt b/src/ast/CMakeLists.txt
-index 4d77c9f..2a00572 100644
---- a/src/ast/CMakeLists.txt
-+++ b/src/ast/CMakeLists.txt
-@@ -1,4 +1,4 @@
--add_library(ast
-+add_library(bpftraceast
-   ast.cpp
-   codegen_llvm.cpp
-   irbuilderbpf.cpp
-@@ -7,15 +7,16 @@ add_library(ast
- )
- 
- if(HAVE_GET_CURRENT_CGROUP_ID)
--  target_compile_definitions(ast PRIVATE HAVE_GET_CURRENT_CGROUP_ID)
-+  target_compile_definitions(bpftraceast PRIVATE HAVE_GET_CURRENT_CGROUP_ID)
- endif(HAVE_GET_CURRENT_CGROUP_ID)
- 
--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)
- 
--add_dependencies(ast parser)
-+add_dependencies(bpftraceast bpftraceparser)
-+install(TARGETS bpftraceast LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
- 
- if (STATIC_LINKING)
-   set(clang_libs
-@@ -35,16 +36,16 @@ if (STATIC_LINKING)
-       clangSerialization
-       clangToolingCore)
-   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})
- 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 2d18277..f66a8b7 100644
---- a/tests/CMakeLists.txt
-+++ b/tests/CMakeLists.txt
-@@ -76,7 +76,8 @@ if(HAVE_BFD_DISASM)
-   target_link_libraries(bpftrace_test ${LIBOPCODES_LIBRARIES})
- endif(HAVE_BFD_DISASM)
- 
--target_link_libraries(bpftrace_test arch ast parser resources)
-+target_link_libraries(bpftrace_test bpftracearch bpftraceast bpftraceparser
-+  bpftraceresources)
- 
- if (STATIC_LINKING)
-   target_link_libraries(bpftrace_test ${LIBBCC_LIBRARIES})
diff --git a/dev-util/bpftrace/files/bpftrace-0.9.4-llvm-10.patch b/dev-util/bpftrace/files/bpftrace-0.9.4-llvm-10.patch
deleted file mode 100644
index c2131cbbc306..000000000000
--- a/dev-util/bpftrace/files/bpftrace-0.9.4-llvm-10.patch
+++ /dev/null
@@ -1,144 +0,0 @@
-diff --git a/src/ast/codegen_llvm.cpp b/src/ast/codegen_llvm.cpp
-index f81906c..bcc2c7d 100644
---- a/src/ast/codegen_llvm.cpp
-+++ b/src/ast/codegen_llvm.cpp
-@@ -41,7 +41,7 @@ void CodegenLLVM::visit(PositionalParameter &param)
-         {
-           Constant *const_str = ConstantDataArray::getString(module_->getContext(), pstr, true);
-           AllocaInst *buf = b_.CreateAllocaBPF(ArrayType::get(b_.getInt8Ty(), pstr.length() + 1), "str");
--          b_.CreateMemSet(buf, b_.getInt8(0), pstr.length() + 1, 1);
-+          b_.CREATE_MEMSET(buf, b_.getInt8(0), pstr.length() + 1, 1);
-           b_.CreateStore(const_str, buf);
-           expr_ = buf;
-         }
-@@ -156,7 +156,7 @@ void CodegenLLVM::visit(Builtin &builtin)
-   {
-     AllocaInst *buf = b_.CreateAllocaBPF(builtin.type, "comm");
-     // initializing memory needed for older kernels:
--    b_.CreateMemSet(buf, b_.getInt8(0), builtin.type.size, 1);
-+    b_.CREATE_MEMSET(buf, b_.getInt8(0), builtin.type.size, 1);
-     b_.CreateGetCurrentComm(buf, builtin.type.size);
-     expr_ = buf;
-   }
-@@ -189,7 +189,7 @@ void CodegenLLVM::visit(Builtin &builtin)
-     if (builtin.type.type == Type::usym)
-     {
-       AllocaInst *buf = b_.CreateAllocaBPF(builtin.type, "func");
--      b_.CreateMemSet(buf, b_.getInt8(0), builtin.type.size, 1);
-+      b_.CREATE_MEMSET(buf, b_.getInt8(0), builtin.type.size, 1);
-       Value *pid = b_.CreateLShr(b_.CreateGetPidTgid(), 32);
-       Value *addr_offset = b_.CreateGEP(buf, b_.getInt64(0));
-       Value *pid_offset = b_.CreateGEP(buf, {b_.getInt64(0), b_.getInt64(8)});
-@@ -444,7 +444,7 @@ void CodegenLLVM::visit(Call &call)
-   else if (call.func == "str")
-   {
-     AllocaInst *strlen = b_.CreateAllocaBPF(b_.getInt64Ty(), "strlen");
--    b_.CreateMemSet(strlen, b_.getInt8(0), sizeof(uint64_t), 1);
-+    b_.CREATE_MEMSET(strlen, b_.getInt8(0), sizeof(uint64_t), 1);
-     if (call.vargs->size() > 1) {
-       call.vargs->at(1)->accept(*this);
-       Value *proposed_strlen = b_.CreateAdd(expr_, b_.getInt64(1)); // add 1 to accommodate probe_read_str's null byte
-@@ -462,7 +462,7 @@ void CodegenLLVM::visit(Call &call)
-       b_.CreateStore(b_.getInt64(bpftrace_.strlen_), strlen);
-     }
-     AllocaInst *buf = b_.CreateAllocaBPF(bpftrace_.strlen_, "str");
--    b_.CreateMemSet(buf, b_.getInt8(0), bpftrace_.strlen_, 1);
-+    b_.CREATE_MEMSET(buf, b_.getInt8(0), bpftrace_.strlen_, 1);
-     call.vargs->front()->accept(*this);
-     b_.CreateProbeReadStr(buf, b_.CreateLoad(strlen), expr_);
-     b_.CreateLifetimeEnd(strlen);
-@@ -541,7 +541,7 @@ void CodegenLLVM::visit(Call &call)
-   {
-     // store uint64_t[2] with: [0]: (uint64_t)addr, [1]: (uint64_t)pid
-     AllocaInst *buf = b_.CreateAllocaBPF(call.type, "usym");
--    b_.CreateMemSet(buf, b_.getInt8(0), call.type.size, 1);
-+    b_.CREATE_MEMSET(buf, b_.getInt8(0), call.type.size, 1);
-     Value *pid = b_.CreateLShr(b_.CreateGetPidTgid(), 32);
-     Value *addr_offset = b_.CreateGEP(buf, b_.getInt64(0));
-     Value *pid_offset = b_.CreateGEP(buf, {b_.getInt64(0), b_.getInt64(8)});
-@@ -592,7 +592,7 @@ void CodegenLLVM::visit(Call &call)
-     b_.CreateStore(af_type, af_offset);
- 
-     Value *inet_offset = b_.CreateGEP(buf, {b_.getInt32(0), b_.getInt32(1)});
--    b_.CreateMemSet(inet_offset, b_.getInt8(0), 16, 1);
-+    b_.CREATE_MEMSET(inet_offset, b_.getInt8(0), 16, 1);
- 
-     inet->accept(*this);
-     if (inet->type.type == Type::array)
-@@ -663,7 +663,7 @@ void CodegenLLVM::visit(Call &call)
-     auto &map = static_cast<Map&>(arg);
-     Constant *const_str = ConstantDataArray::getString(module_->getContext(), map.ident, true);
-     AllocaInst *str_buf = b_.CreateAllocaBPF(ArrayType::get(b_.getInt8Ty(), map.ident.length() + 1), "str");
--    b_.CreateMemSet(str_buf, b_.getInt8(0), map.ident.length() + 1, 1);
-+    b_.CREATE_MEMSET(str_buf, b_.getInt8(0), map.ident.length() + 1, 1);
-     b_.CreateStore(const_str, str_buf);
-     ArrayType *perfdata_type = ArrayType::get(b_.getInt8Ty(), sizeof(uint64_t) + 2 * sizeof(uint64_t) + map.ident.length() + 1);
-     AllocaInst *perfdata = b_.CreateAllocaBPF(perfdata_type, "perfdata");
-@@ -707,7 +707,7 @@ void CodegenLLVM::visit(Call &call)
-     auto &map = static_cast<Map&>(arg);
-     Constant *const_str = ConstantDataArray::getString(module_->getContext(), map.ident, true);
-     AllocaInst *str_buf = b_.CreateAllocaBPF(ArrayType::get(b_.getInt8Ty(), map.ident.length() + 1), "str");
--    b_.CreateMemSet(str_buf, b_.getInt8(0), map.ident.length() + 1, 1);
-+    b_.CREATE_MEMSET(str_buf, b_.getInt8(0), map.ident.length() + 1, 1);
-     b_.CreateStore(const_str, str_buf);
-     ArrayType *perfdata_type = ArrayType::get(b_.getInt8Ty(), sizeof(uint64_t) + map.ident.length() + 1);
-     AllocaInst *perfdata = b_.CreateAllocaBPF(perfdata_type, "perfdata");
-@@ -1204,7 +1204,7 @@ void CodegenLLVM::visit(FieldAccess &acc)
-     {
-       AllocaInst *dst = b_.CreateAllocaBPF(field.type, type.cast_type + "." + acc.field);
-       // memset so verifier doesn't complain about reading uninitialized stack
--      b_.CreateMemSet(dst, b_.getInt8(0), field.type.size, 1);
-+      b_.CREATE_MEMSET(dst, b_.getInt8(0), field.type.size, 1);
-       b_.CreateProbeRead(dst, field.bitfield.read_bytes, src);
-       Value *raw = b_.CreateLoad(dst);
-       Value *shifted = b_.CreateLShr(raw, field.bitfield.access_rshift);
-@@ -1906,7 +1906,7 @@ void CodegenLLVM::createFormatStringCall(Call &call, int &id, CallArgs &call_arg
-   }
- 
-   AllocaInst *fmt_args = b_.CreateAllocaBPF(fmt_struct, call_name + "_args");
--  b_.CreateMemSet(fmt_args, b_.getInt8(0), struct_size, 1);
-+  b_.CREATE_MEMSET(fmt_args, b_.getInt8(0), struct_size, 1);
- 
-   Value *id_offset = b_.CreateGEP(fmt_args, {b_.getInt32(0), b_.getInt32(0)});
-   b_.CreateStore(b_.getInt64(id + asyncactionint(async_action)), id_offset);
-diff --git a/src/ast/irbuilderbpf.cpp b/src/ast/irbuilderbpf.cpp
-index eb84f7b..5dd72d0 100644
---- a/src/ast/irbuilderbpf.cpp
-+++ b/src/ast/irbuilderbpf.cpp
-@@ -82,7 +82,7 @@ AllocaInst *IRBuilderBPF::CreateAllocaBPFInit(const SizedType &stype, const std:
-   }
-   else
-   {
--    CreateMemSet(alloca, getInt64(0), stype.size, 1);
-+    CREATE_MEMSET(alloca, getInt64(0), stype.size, 1);
-   }
- 
-   restoreIP(ip);
-@@ -226,7 +226,7 @@ Value *IRBuilderBPF::CreateMapLookupElem(int mapfd, AllocaInst *key, SizedType &
- 
-   SetInsertPoint(lookup_failure_block);
-   if (is_array)
--    CreateMemSet(value, getInt8(0), type.size, 1);
-+    CREATE_MEMSET(value, getInt8(0), type.size, 1);
-   else
-     CreateStore(getInt64(0), value);
-   CreateBr(lookup_merge_block);
-diff --git a/src/ast/irbuilderbpf.h b/src/ast/irbuilderbpf.h
-index 58e6882..6b2e7f1 100644
---- a/src/ast/irbuilderbpf.h
-+++ b/src/ast/irbuilderbpf.h
-@@ -18,6 +18,14 @@
- #error Unsupported LLVM version
- #endif
- 
-+#if LLVM_VERSION_MAJOR >= 10
-+#define CREATE_MEMSET(ptr, val, size, align)                                   \
-+  CreateMemSet((ptr), (val), (size), MaybeAlign((align)))
-+#else
-+#define CREATE_MEMSET(ptr, val, size, align)                                   \
-+  CreateMemSet((ptr), (val), (size), (align))
-+#endif
-+
- namespace bpftrace {
- namespace ast {
- 
diff --git a/dev-util/build2/Manifest b/dev-util/build2/Manifest
new file mode 100644
index 000000000000..707eb6113bfd
--- /dev/null
+++ b/dev-util/build2/Manifest
@@ -0,0 +1,4 @@
+AUX build2-0.13.0_alpha0_pre20200710-nousrlocal.patch 1931 BLAKE2B 5faca35d7501cd0348910719286bcab2736cd94166db626bd77a62b90512ed6d99fbc2548a6ff30b0f5badecdcaa67a462a6ff11f51af8f9b9faba24fd8edefd SHA512 f57de10af06aa138a7c153e56d35b173a4804324557611baabb38ac00cfde0c8db2b59b57d5ad23a3f76877168745f1d40be1b7527241b47a163df4cc5879967
+DIST build2-toolchain-0.13.0.tar.xz 4218940 BLAKE2B ed27290df21e5db843325b3e42c43c6934ce8f2b9b157538b921f9cfe3a7dccc3b56e261053373553cbd7fbff39e912ffe2282f812d0e6f158749ed5748d5e33 SHA512 0485872acd40beb700739b2995f76efcc9811dd52a38ee049576e45fcb5a7d7ae9c718beca8aeab9ab3f1c5e0270d3946f2335f88ec19476577c195417c2dbd4
+EBUILD build2-0.13.0.ebuild 3301 BLAKE2B 62ee4afadbdc4f38fdbe54281c6c12e53dc3b2c3de9ac32300568215d885d71ef2b38cb0704299974936290838db40ac0cf3a48fa4fd2e9af0f75913b1915dec SHA512 7a0da7306be500b845b6c44c0828cb4c7eef6d51f76eb04dfe7ee630f4f41f48d46f892a9ea15283b5694aeed9dee822e2aaf6e9823de4d1a38776f1f50f1d92
+MISC metadata.xml 1093 BLAKE2B 8f05f9a182a871b5be366d822fada23d1e7c6c04963b3344eba875923174d3dbc5a19e1cfae89fd46bf084beeb4456f42a9a149a70ba35e9b2adeb83a61af927 SHA512 72169c877b0e20ebfcb2ef5ae5635977103d6d69849818d9f2a7a478f84f348375383ad512ea98a24a1d16abc83a970663f5bf987f8dfc00c1af1286725bec9a
diff --git a/dev-util/build2/build2-0.13.0.ebuild b/dev-util/build2/build2-0.13.0.ebuild
new file mode 100644
index 000000000000..e5b6999ee800
--- /dev/null
+++ b/dev-util/build2/build2-0.13.0.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN=build2-toolchain
+MY_P="${MY_PN}-${PV}"
+
+inherit toolchain-funcs multiprocessing
+SRC_URI="https://download.build2.org/${PV}/${MY_P}.tar.xz"
+KEYWORDS="~amd64 ~x86"
+DESCRIPTION="cross-platform toolchain for building and packaging C++ code"
+HOMEPAGE="https://build2.org"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	~dev-cpp/libodb-2.5.0_beta19
+	~dev-cpp/libodb-sqlite-2.5.0_beta19
+	dev-db/sqlite:3
+"
+BDEPEND="virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.13.0_alpha0_pre20200710-nousrlocal.patch
+)
+
+S="${WORKDIR}/${MY_P}"
+
+b() {
+	local myargs=(
+		--jobs $(makeopts_jobs)
+		--verbose 3
+	)
+	export LD_LIBRARY_PATH="${S}/libbutl/libbutl:${S}/build2/libbuild2:${S}/build2/libbuild2/bash:${S}/build2/libbuild2/in:${S}/build2/libbuild2/bin:${S}/build2/libbuild2/c:${S}/build2/libbuild2/cc:${S}/build2/libbuild2/cxx:${S}/build2/libbuild2/version:${S}/libpkgconf/libpkgconf:${LD_LIBRARY_PATH}"
+	set -- "${S}"/build2/build2/b-boot "${@}" "${myargs[@]}"
+	echo "${@}"
+	"${@}" || die "${@} failed"
+}
+
+src_prepare() {
+	printf 'cxx.libs += %s\ncxx.poptions += %s\n' \
+		"-L${EPREFIX}/usr/$(get_libdir) $($(tc-getPKG_CONFIG) sqlite3 --libs)" \
+		"$($(tc-getPKG_CONFIG) sqlite3 --cflags)" >> \
+		libodb-sqlite/buildfile \
+		|| die
+	sed \
+		-e 's:libsqlite3[/]\?::' \
+		-i buildfile build/bootstrap.build \
+		|| die
+
+	for i in build2/build2/buildfile build2/libbuild2/buildfile; do
+		printf 'cxx.libs += %s\ncxx.poptions += %s\n' \
+			   "$($(tc-getPKG_CONFIG) libodb --libs)" \
+			   "$($(tc-getPKG_CONFIG) libodb --cflags)" >> \
+			   "${i}" \
+			|| die
+		printf 'cxx.libs += %s\ncxx.poptions += %s\n' \
+			   "$($(tc-getPKG_CONFIG) libodb-sqlite --libs)" \
+			   "$($(tc-getPKG_CONFIG) libodb-sqlite --cflags)" >> \
+			   "${i}" \
+			|| die
+	done
+	sed \
+		-e 's:libodb[/]\?::' \
+		-e 's:libodb-sqlite[/]\?::' \
+		-i buildfile build/bootstrap.build \
+		|| die
+
+	if has_version dev-util/pkgconf; then
+		for i in build2/build2/buildfile build2/libbuild2/buildfile; do
+			printf 'cxx.libs += %s\ncxx.poptions += %s\n' \
+				"$($(tc-getPKG_CONFIG) libpkgconf --libs)" \
+				"$($(tc-getPKG_CONFIG) libpkgconf --cflags)" >> \
+				"${i}" \
+				|| die
+		done
+		sed \
+			-e 's:libpkgconf[/]\?::' \
+			-i buildfile build/bootstrap.build \
+			|| die
+	fi
+
+	default
+}
+
+src_configure() {
+	emake -C build2 -f bootstrap.gmake \
+		CXX=$(tc-getCXX) \
+		CXXFLAGS="${CXXFLAGS}" \
+		LDFLAGS="${LDFLAGS}"
+
+	b configure \
+		config.cxx="$(tc-getCXX)" \
+		config.cxx.coptions="${CXXFLAGS}" \
+		config.cxx.loptions="${LDFLAGS}" \
+		config.c="$(tc-getCC)" \
+		config.cc.coptions="${CFLAGS}" \
+		config.cc.loptions="${LDFLAGS}" \
+		config.bin.ar="$(tc-getAR)" \
+		config.bin.ranlib="$(tc-getRANLIB)" \
+		config.bin.lib=shared \
+		config.install.chroot="${D}" \
+		config.install.root="${EPREFIX}"/usr \
+		config.install.lib="${EPREFIX}"/usr/$(get_libdir) \
+		config.install.doc="${EPREFIX}"/usr/share/doc/${PF}
+}
+
+src_compile() {
+	b update-for-install
+	use test && b update-for-test
+}
+
+src_test() {
+	b test
+}
+
+src_install() {
+	b install
+	mkdir -p "${ED}"/usr/share/doc/${PF}/html || die
+	mv -f "${ED}"/usr/share/doc/${PF}/*.xhtml "${ED}"/usr/share/doc/${PF}/html || die
+}
diff --git a/dev-util/build2/files/build2-0.13.0_alpha0_pre20200710-nousrlocal.patch b/dev-util/build2/files/build2-0.13.0_alpha0_pre20200710-nousrlocal.patch
new file mode 100644
index 000000000000..c3717856b6b7
--- /dev/null
+++ b/dev-util/build2/files/build2-0.13.0_alpha0_pre20200710-nousrlocal.patch
@@ -0,0 +1,52 @@
+--- build2-toolchain-e135a3112b15c88f0601583ca068f8adea7b605d-orig/build2/libbuild2/cc/module.cxx	2020-07-10 20:12:57.000000000 +1000
++++ build2-toolchain-e135a3112b15c88f0601583ca068f8adea7b605d/build2/libbuild2/cc/module.cxx	2020-07-14 14:33:58.939950579 +1000
+@@ -323,8 +323,6 @@
+ 
+ #ifndef _WIN32
+     static const dir_path usr_inc     ("/usr/include");
+-    static const dir_path usr_loc_lib ("/usr/local/lib");
+-    static const dir_path usr_loc_inc ("/usr/local/include");
+ #  ifdef __APPLE__
+     static const dir_path a_usr_inc (
+       "/Library/Developer/CommandLineTools/SDKs/MacOSX*.sdk/usr/include");
+@@ -486,7 +484,6 @@
+         auto& ls (lib_dirs.first);
+ 
+         bool ui  (find (is.begin (), is.end (), usr_inc)     != is.end ());
+-        bool uli (find (is.begin (), is.end (), usr_loc_inc) != is.end ());
+ 
+ #ifdef __APPLE__
+         // On Mac OS starting from 10.14 there is no longer /usr/include.
+@@ -509,7 +506,7 @@
+         //
+         // Is Apple's /usr/include.
+         //
+-        if (!ui && !uli)
++        if (!ui)
+         {
+           for (const dir_path& d: is)
+           {
+@@ -521,22 +518,16 @@
+           }
+         }
+ #endif
+-        if (ui || uli)
++        if (ui)
+         {
+-          bool ull (find (ls.begin (), ls.end (), usr_loc_lib) != ls.end ());
+-
+           // Many platforms don't search in /usr/local/lib by default (but do
+           // for headers in /usr/local/include). So add it as the last option.
+           //
+-          if (!ull && exists (usr_loc_lib, true /* ignore_error */))
+-            ls.push_back (usr_loc_lib);
+ 
+           // FreeBSD is at least consistent: it searches in neither. Quoting
+           // its wiki: "FreeBSD can't even find libraries that it installed."
+           // So let's help it a bit.
+           //
+-          if (!uli && exists (usr_loc_inc, true /* ignore_error */))
+-            is.push_back (usr_loc_inc);
+         }
+       }
+ #endif
diff --git a/dev-util/build2/metadata.xml b/dev-util/build2/metadata.xml
new file mode 100644
index 000000000000..4380b642027e
--- /dev/null
+++ b/dev-util/build2/metadata.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gienah@gentoo.org</email>
+		<name>Mark Wright</name>
+	</maintainer>
+	<longdescription lang="en">
+		build2 is an open source (MIT), cross-platform build toolchain
+		for developing and packaging C and C++ code. It is a hierarchy
+		of tools that includes the build system, package dependency
+		manager (for package consumption), and project dependency
+		manager (for project development). Key features:
+
+		Next-generation, Cargo-like integrated build toolchain for C
+		and C++.
+
+		Covers entire project lifecycle: creation, development,
+		testing, and delivery.
+
+		Uniform and consistent interface across all platforms and
+		compilers.
+
+		Fast, multi-threaded build system with parallel building and
+		testing.
+
+		Archive and version control-based package repositories.
+
+		Dependency-free, all you need is a C++ compiler.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">build2/build2</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/buildbot/Manifest b/dev-util/buildbot/Manifest
index 14aa89c15d2b..114ed5cb84a7 100644
--- a/dev-util/buildbot/Manifest
+++ b/dev-util/buildbot/Manifest
@@ -13,6 +13,6 @@ DIST buildbot-2.8.0.tar.gz 3162882 BLAKE2B 19789f1fe9f572c978a1843a98cd01d752a61
 DIST buildbot-2.8.2.tar.gz 3181035 BLAKE2B 40a3e424cc03c982549f25993a4abd2fe04bdc089ad22288af4d25724972f9f3541ef32549d2761c808845df44a972b00cf631adfc564bf4852c4b6b6ab14404 SHA512 7d7f15becc7fc1803ae4e9f1906d547c89dfe1efaa51e8fda0674a3d9b060bafbaae4cb671ec844750313247edb73f17c9014c545bce58070df0ca322a0fd9a2
 EBUILD buildbot-2.7.0.ebuild 6974 BLAKE2B 0a847a75805dd0342a55f46640c4f01f9982eefa2cc1aeb00b15c85a5bad0a958761bcc9f508f03545be943e51e2896493c590c69f50e64691480b1916413ff2 SHA512 1e63016e5593a2135c92b2072181fb714d16bc383d88d9fc9513c30ab5a60af6b2bf6d94b2f5c25bfeba31b119ff4e45ab7f5291d950fa373a03e4c1caf6f315
 EBUILD buildbot-2.8.0.ebuild 7458 BLAKE2B 5c5c805eb70bb4eccd7f7283951a6e0c39d0bec01b79866ff8bebcee043ce086faae455feffc722a82373390092edb3a79a0cbc522111fb2b160aec0fdce13f7 SHA512 36ce0b760b6b7705fb8ea1149c1580529bfce1ae1d9ea07ece8b8aa642439f3726ddf79f35e9494b531b533bf0fe98e82d018409f658ba696efb54ea73e91754
-EBUILD buildbot-2.8.2.ebuild 7414 BLAKE2B 8d4647eb94f2adc5492b562943f060087e665594a50b0e0d05d2fe2eeef49f0ae56dd250e65301735d0623c4b88f6b00981507d236e8a23f33f9f5b64d5e616c SHA512 f814f7c19ac342706467fce52c11c51f694bf9dc2c7ffcdbde0d69da8e74eb7683b81f71eabdbec4aaf504016b423ffd7ae9cb126f543657313ce50c1d59a966
-EBUILD buildbot-9999.ebuild 7329 BLAKE2B f53e6293558eae28a68340d8a44bcff355f0498396f350548d6362bd87098da7b0e8279fa9e241ac99a4021b6963264e1905fab3c12e6d00f9124755e256c878 SHA512 e7de2a20e0c287e3646ed1161f34272319ac676e2c90649310dff28a46d026dca2c4ed8dc727ee6d876c925c2586afab8aec261496070602cb9a9c59e61bac2e
+EBUILD buildbot-2.8.2-r1.ebuild 7150 BLAKE2B ce82918388f2e96e42448bfab5e1ce342ba5399d6cef53d0143132413bc4740622c8902431d4f603ea2b8c6c6c73be682e15ac07b4da12892654f779fc417602 SHA512 ecbd1a1a60a7492e0390006360e790aff3df2b454131da427876595748b6f0d0afd4caab5aef993aed1e38b54271e04626c340830c35cdf7b450a70be019cf37
+EBUILD buildbot-9999.ebuild 7065 BLAKE2B 582634c656ab3f3b211c0894c3be6b7e96804fd4ce88fc0a3d640c5f40a4a01ee436cab144541ae3f0208b4ac8122ad5b0aff8605fc40b29b20e759e1bfa8aec SHA512 5f3182f5aed253d0605234d53879ef99fd23938033c50a86d5a3a96424a595720f4bbd91dcc2059954b0917f1c18624de345cbd6bc484df1f0b7178a67710a52
 MISC metadata.xml 1359 BLAKE2B 33a6b0f21ad4255f28bc527fb18a384889eb34b2ddc5df5cfa03cc4b1960712b91c787706b95913154300b8e82a5879703dd90d0bf4d796cd6b8bb2a7c4b71cd SHA512 ded6f9cd25bef2df1431b71d5ffc9f0aa3efe9d2f7433cee7800fc27e1f6f76ad64cda9bbc4d3eb3fe0f44dbd7414c75b029f78307925dab5ed06df3d52d86e7
diff --git a/dev-util/buildbot/buildbot-2.8.2.ebuild b/dev-util/buildbot/buildbot-2.8.2-r1.ebuild
index 3a8aa883913f..6a93195514d8 100644
--- a/dev-util/buildbot/buildbot-2.8.2.ebuild
+++ b/dev-util/buildbot/buildbot-2.8.2-r1.ebuild
@@ -28,7 +28,7 @@ RESTRICT="!test? ( test )"
 RDEPEND="
 	acct-user/buildbot
 	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
-	>=dev-python/twisted-17.9.0[${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}]
@@ -40,9 +40,8 @@ RDEPEND="
 	>=dev-python/zope-interface-4.1.1[${PYTHON_USEDEP}]
 	~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}]
 	crypt? (
-		>=dev-python/twisted-17.9.0[${PYTHON_USEDEP},crypt]
 		>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
-		<dev-python/idna-2.9[${PYTHON_USEDEP}]
+		dev-python/idna[${PYTHON_USEDEP}]
 		dev-python/service_identity[${PYTHON_USEDEP}]
 	)
 	irc? (
@@ -77,12 +76,6 @@ DEPEND="${RDEPEND}
 		~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]
 		~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}]
 		~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-		crypt? (
-			>=dev-python/twisted-17.9.0[${PYTHON_USEDEP},crypt]
-			>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
-			<dev-python/idna-2.9[${PYTHON_USEDEP}]
-			dev-python/service_identity[${PYTHON_USEDEP}]
-		)
 	)"
 
 S=${WORKDIR}/${MY_P}
diff --git a/dev-util/buildbot/buildbot-9999.ebuild b/dev-util/buildbot/buildbot-9999.ebuild
index 25ce6693e4eb..aab7babe0e90 100644
--- a/dev-util/buildbot/buildbot-9999.ebuild
+++ b/dev-util/buildbot/buildbot-9999.ebuild
@@ -29,7 +29,7 @@ RESTRICT="!test? ( test )"
 RDEPEND="
 	acct-user/buildbot
 	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
-	>=dev-python/twisted-17.9.0[${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}]
@@ -41,9 +41,8 @@ RDEPEND="
 	>=dev-python/zope-interface-4.1.1[${PYTHON_USEDEP}]
 	~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}]
 	crypt? (
-		>=dev-python/twisted-17.9.0[${PYTHON_USEDEP},crypt]
 		>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
-		<dev-python/idna-2.9[${PYTHON_USEDEP}]
+		dev-python/idna[${PYTHON_USEDEP}]
 		dev-python/service_identity[${PYTHON_USEDEP}]
 	)
 	irc? (
@@ -78,12 +77,6 @@ DEPEND="${RDEPEND}
 		dev-util/buildbot-pkg[${PYTHON_USEDEP}]
 		dev-util/buildbot-worker[${PYTHON_USEDEP}]
 		dev-util/buildbot-www[${PYTHON_USEDEP}]
-		crypt? (
-			>=dev-python/twisted-17.9.0[${PYTHON_USEDEP},crypt]
-			>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
-			<dev-python/idna-2.9[${PYTHON_USEDEP}]
-			dev-python/service_identity[${PYTHON_USEDEP}]
-		)
 	)"
 
 S=${S}/master
diff --git a/dev-util/bustle/Manifest b/dev-util/bustle/Manifest
index 149ff49a3ff7..447263407e33 100644
--- a/dev-util/bustle/Manifest
+++ b/dev-util/bustle/Manifest
@@ -1,3 +1,3 @@
 DIST bustle-0.5.4.tar.gz 122720 BLAKE2B b5a2315919644ab5c7712f9e9bde1bdea226b4e8898981f7150558bde648a5c7965be6ad8484c09727665292e5fe3f0cb545544dbb27f2a2553e513910289620 SHA512 56eaeef831fb5929d57a008ae71d8409048ce5d12eaada98830ef742baf3479264203465d77591cb338374096eac2dc2b68b44f075b2761f16df63fad54b91fd
-EBUILD bustle-0.5.4.ebuild 1635 BLAKE2B 4e3e075dc2d7ca51a77112a26c86e975681d35f6ba41b5cf2d3b2d074b1d2d5be59f2bb63c713dfa5fbe5c8f6145c87388159060995897062e37de910d00e348 SHA512 f8b263727d6c917fa5a76f6f4462c07310181bac753763ffb44f5633fbdf7b63580f99eae5268e5f29c83df048ae5dfb37bd5aa49984bd6fefcd95e8f9b84af2
+EBUILD bustle-0.5.4.ebuild 1636 BLAKE2B 0c03d3dfb08c5b9b79b4df1685103cbfefb1c6dd3a2ac1b69fd0a5f026e847df00ea23278f308287624cb3a4212d17a430e525bb7bbb89eb48fc4184b66c36dd SHA512 c86f830a373349f256ab367617f0bd4ef460a843f6fc37f5ca8aa147921a45e211b3e2a025a23a2e43e2efcff278caed4e6335c2f2fdaf668d823e1a731cb264
 MISC metadata.xml 502 BLAKE2B 3ab482910acd7936501b8c519d2da5c286d493a04afc6d5302989ca5662a4f166d84142489789cd5f5ea4071b5a5e54bc9d0586e6e6fe273f3f2f6f4c44149b8 SHA512 834e9820081006344e30580673ccb789750d1af67807f908b21fc5fe0cf1b8554b32b446aa592c52a1dd26e4d36f2f91c3cff569b8c4797ded9c5c6ea1bfa65d
diff --git a/dev-util/bustle/bustle-0.5.4.ebuild b/dev-util/bustle/bustle-0.5.4.ebuild
index 3c422fff02f7..6e92a1f7bcb4 100644
--- a/dev-util/bustle/bustle-0.5.4.ebuild
+++ b/dev-util/bustle/bustle-0.5.4.ebuild
@@ -9,7 +9,7 @@ CABAL_FEATURES="bin test-suite"
 inherit eutils haskell-cabal toolchain-funcs
 
 DESCRIPTION="Draw sequence diagrams of D-Bus traffic"
-HOMEPAGE="http://hackage.haskell.org/package/bustle"
+HOMEPAGE="https://hackage.haskell.org/package/bustle"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="LGPL-2 GPL-2 GPL-3"
diff --git a/dev-util/cargo-c/Manifest b/dev-util/cargo-c/Manifest
index 4ac6c04aeeba..c95d05f92472 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 3032 BLAKE2B ffecaf6d0232c7022cb5cbc7037c54bffdb8d557098f9ced3587a6fdeab1125e941eeac14c144eb628a65978b7e753ad70578afbe77cbeb611ad4a57ed6b2913 SHA512 32a1c2530c38663297a1e603fa933a4e7942223b2a3628d1bf03315077ba73d571a6922e38983dd753b03d09c6a36d5592c9b20bda141a44568f293eb95574cf
+EBUILD cargo-c-0.6.2.ebuild 3056 BLAKE2B 13ce79f0a218400224870b7b3d88012672f0def29c0fd5d0725c37f92e5c357f18892df1450a12f1e2b756ef337908715bb4da67a5fce5ffb2d6569884fcd44f SHA512 1fadbe52e451ab69e39104c4fbdfe5bff901823a05f203397856b5521541c8cb1791071b5be1425479053a46f73493f7383c8e54bdbd8e2c6a50de80be268c5f
 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 1623f218879e..9977f3dc4fad 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"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="libressl"
 
 DEPEND=""
diff --git a/dev-util/cargo-ebuild/Manifest b/dev-util/cargo-ebuild/Manifest
index f317e15876d1..e6efbde42c28 100644
--- a/dev-util/cargo-ebuild/Manifest
+++ b/dev-util/cargo-ebuild/Manifest
@@ -2,11 +2,14 @@ DIST adler32-1.0.4.crate 5105 BLAKE2B 344a5258e77328a24a545e32f9bc653fa25b7ea438
 DIST aho-corasick-0.7.6.crate 108953 BLAKE2B d713366d0783e1ffbe65408e4d38ef9f12276f61043c768265de5d47e446a378306096a70252c9a49a6e7d3b97a09f30405a3d8df6b40dc2dfeb7407ed574c95 SHA512 120aa28e72279f561d7f51657aa0800dd46504cd92f758f848284e5f3695be6f5e24056a66b0f2d971c527277e92ae938e2357ade37b5cbe1c93913a5dc308b1
 DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
 DIST anyhow-1.0.26.crate 26024 BLAKE2B 09cdaf61531f3a36b186fbebc2c783d472b54494c1dbd0e2b808be332bfba5783f40d66e46b2148a677ec61ed89f73bf2db04ebb6d43c8b395162177181d2094 SHA512 362a22854f90032f407875ee3687287f2c9c87e3b462e808219e0fd4d3067ad245544d1b6f38b3130d824af77390a331ac0b5a918498ee6c6b401fc8d0292ccc
+DIST anyhow-1.0.31.crate 28514 BLAKE2B 1177bbac61e96eb007a7a9a79499a7dab08a5c828987221df32c137b69bed53473b37f01debf49a7da0883407c6da40192fbc800c9b7983128738b2889d327a4 SHA512 e60394f48b74f8db4e61b9bfdb146b8e7a8b014c0a729ccb9e657d648a9310e642c77f6e5e5d4c8a6ed40a65c65bda79e45cda9a3efd04a901376e3912aebb8a
 DIST atty-0.2.13.crate 4764 BLAKE2B 673eea1d377fc3aca792a3a8bd2a5c058f3041abc76a8760dd6acab7f19fa610f812c57d81a4dbf773675cad3df483904c66e66b45d83393402f747c6db60d89 SHA512 4554ca7dedb4c2e8693e5847ef1fe66161ed4cb2c19156bb03f41ce7e7ea21838369dabaf447a60d1468de8bfbb7087438c12934c4569dde63df074f168569ad
+DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
 DIST autocfg-0.1.6.crate 11439 BLAKE2B e0eb7a3176bb5ac27b8de466c5fcdfedb9ad32f4d2b52c0385550902d59d01c716a53179708bdeb250a91690edeb70ab81d91090ff0fd89a731dd365621aa496 SHA512 ac7dd73b7c6b8b54c4fc98c3e75210eb59d46ab3447fca533763bfebfa87dba5e947829e3ba56a8eb3403f6d317065b7d674da883741e619f3866b12267801fe
 DIST backtrace-0.3.38.crate 68133 BLAKE2B 75794901cf8d322cb642672eaab9403b00f802a917f04505d8a4df1466d340f92f1824cd0cd501d5f6017ff98cf17e4ad61ce32fce07b061fbcdaecce5ac0c55 SHA512 a962b8ffd435691bf229f6db6cc86a0e9fabec1dea589824a85f11ee77e2c36458cdebd68acc0624d45195df27a9fb6dace0afb98a9fddc0291bae93928345fe
 DIST backtrace-sys-0.1.31.crate 518877 BLAKE2B 397f3c4053eeabd7216c4373e6457637e22ee124d8a864c2587a78ebd8d619745dece654357cb9cd970ee20d7c41d53c84ecb3ed92beefaacbcfddfaca804ce5 SHA512 6aa8c7a2694f4e953a0e9bbd07dc8b7e218719de5aef2adaecfae81beb919deffde6f184675dc6b6c1a330bb81dc9611c256f7f63caef5e301101dbe3bbaafe0
 DIST bitflags-1.2.0.crate 16814 BLAKE2B 5b7aee7388b01cebf96651e979025e9bcac85f7324982055d7d805361f91da2b9489a07f00350133c8a58eaf70c5397e3561c15b3f2544aa8202bfdb852c145b SHA512 bd9e3797fb9b91e815308a5286439e7eedb285666c937184493cfce45ff1d4c10f505f29be3a6317add313a7fdc72a006682c1b3e1cc9fa05166f6c4ecaffcaa
+DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
 DIST bstr-0.2.8.crate 337654 BLAKE2B 50c5a639ec2912bd20be83a8b017e60c7b5f75f6cbe93839f8f46a4815537e47261593d17380a38aae45445d611c9fb28135e0424184958edfcc1c06e941e4aa SHA512 9e8786b68c03f059e4182046e7650b6f90431927c26c49fcdd4af3cb464092108fb2f64fdc2da1fe1d1121705ac8a21c68485b0517f3dd32040aab754f88944d
 DIST byteorder-1.3.2.crate 21596 BLAKE2B 2ac70cff46af36e96b8b41c3adf9e09134af4d3d5b17c14233047fc3b70c829bffe6c129def84f529c1017ab2882c1bb66e86eab7b749a0d40daf2650da85d0a SHA512 2ef6b986926a4671dd945583730b0bfd4bd5e75b62a8a70c2875328157ba95f2c1b17c534d905e9b287457bd34363c1a33fd3dee9217c371032393ebbe206a8f
 DIST bytes-0.4.12.crate 46361 BLAKE2B 991f1d9170e7d3438c7d74507e6274df551d483883b3be2d99f7bbc0611ee6bd3f8f45c0e086cfa5488e8fc00e36e9a549fc71a325ff62b9bb83bd8fd412b5df SHA512 5f603532ea2f04cbc53044422feed1667bf0486af398c9c8e2ce7b4601b37e1c47223201970fb0d17fed77fef7e89961e0ac05a30e6cc9bf13462d98bc587250
@@ -15,10 +18,12 @@ DIST c2-chacha-0.2.2.crate 13766 BLAKE2B 0b963b7a4ac64d71d75ab542a23585cd7bb9999
 DIST cargo-0.37.0.crate 1016321 BLAKE2B 7b47599dba5ab5662a24412f496f94b10af4636678f6e5521cfbc603188a768697ab4667e387286cab4f15b16facc71e49035f015c41796aaff1f6889828da5f SHA512 8ec554818e58e9c80740ad5130e65318836059944a1dc2dd9bcc74b2a51e69ad3d66d99669c0f497110daf92bf5215db963504e492f416d0addc545916b554b3
 DIST cargo-ebuild-0.2.0.crate 19731 BLAKE2B c72df800403dff677fd686997cebaa9d4b96802f8d64c1247883e9a6ffd84eab3b17406af22bc2e471b400634ec1d3b806d261c8318164d84ae3e9d9aa98ea3d SHA512 1baa0a7e8bcd91b0e2bd89b89efe1bdba62e28900d1e681b346550ae4826f6776de2ee4fb4a27e748710ee7cbfdfe586daa07265a203917313d6eb144bebaac3
 DIST cargo-ebuild-0.3.0.crate 12098 BLAKE2B caa4b194cd9ee6f9c11a1f953d4ef6f1bb0e646f4a6d0578b198789b9ed99e577b850847279585a01c824fad917867d8d19530bc854eda26edf1dfe9624f28b5 SHA512 ca3c77e0c19a72f8dbc6f238d9f38c8e11d5da05949e8dfa940982d1a59b0d89d80663725049fdfca5cfc7902eb1fe75f296be73021b274293bcffdcf0dd3a95
+DIST cargo-ebuild-0.3.1.crate 12449 BLAKE2B 02266e24f20592d2c84b4d2a27b6857e1b229614fbbf386021aec8e6c0a2cd4142150928be45f1e5b43ed933991e32e594d9cc03cf856670f4d39c0f53c734be SHA512 56bbabd6ab60fefeb49dbf578c9e25ea98f29cd7e7ad4dfc01a305209e0f795c4bc2769dced62b467b34065ae02c0c3443cee5190b9ec08a7f4c632b2024a280
 DIST cargo_metadata-0.9.1.crate 14876 BLAKE2B ff4b404231831641826fd11e2c43c12a83f9fdc4277eac351a154db8df219b09f53fa97f2138b28e280215b52d167ea733134d12e932419a5b53e5167a102792 SHA512 d1c0ff7625d0479764305b33410d8c95d5dcb3c8154cf18f84c7d5b63809dcf6a998e3f511d8245f399701d08ea54864b1f976b40db968eeb094813ff473a01f
 DIST cc-1.0.45.crate 49112 BLAKE2B f24cd4aba8f84be490ee89f95c666e35156a9dfd745ba4b28a61130ec0c2ff2b8e7ebbb7363cbebe8e9fadcfcd8c1f7f72bbbcf834b146395840c5569e66bfcf SHA512 cd521fa11c0390cb7c71300ef77c5e27f10739345ff9c2d81c693191d602e8b54717237d1cfc325a39220f721df356e771c7a96885f77f43626d4e24d317434e
 DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
 DIST clap-2.33.0.crate 196458 BLAKE2B 3bb62d817afc77b421a6282746b9b61367d224de6b614c7ed66bde452ce1046728077dab3368a46635b5c74d82ba3196586d87c0201478ce5b89638910dadb1a SHA512 f1075031414d48e4340bfe308904a95a31b72460724773c52a0bc8c004e625a04c904a39fc5420cb8c26a633321f9b5f4f69019c7aae5ed89900b63ed8c21a91
+DIST clap-2.33.1.crate 201567 BLAKE2B 7bb63b6a243eb33050e5354622fb544ba6db3b859005d857b198af4c3f34dbda22d605326e80a274a12f73fb2c13aea99ec6652584a02d0a3092841f4e119d91 SHA512 31209da6a0ac987f7e1b2504a2fb7738c3aba4ddee4cc2bc22cc37d4d2b0feeff41ece557d4960d51564fd31cb23e413bf180eb60102a872caf623bf55c6f089
 DIST commoncrypto-0.2.0.crate 3009 BLAKE2B 174f3099955d595040005ef201361bacc3084f5218efb0f20df8082b9bb683909a10ade64af7062edfafadb9674b27a06836f2333fdaa7d2926b207355f7a40c SHA512 61f567468221cc46b30b31ce96dba26e3dd3a9245a8d37f9f8a615b346d992c261db059bdc678882415c608a806bd45c7b38a5bfb562ad96a111cee8e1082e85
 DIST commoncrypto-sys-0.2.0.crate 4338 BLAKE2B 992a06d56adc97a9d02c547766c2be2f1973507fc0083e50c623dc4ac554681b802f3fb5ef61ef430e4a58bda000170636cf6e38430550e0c0506438901fae20 SHA512 06851fbe0b87224f6c8333964237badf57f32256acb7e647ac2da16561701b7572c12509e042d0d1032a54c94c1663bc2ff19ef5ba3a7daf84276f2544bfba8e
 DIST core-foundation-0.6.4.crate 25233 BLAKE2B 720cb670e0ce589fcb75e583c3f70b54669407481f61b67bb5df1a5056f07c88f568f2adeb65188004424b26b623ac42b03d830239571c15f241216e55fd8dfa SHA512 5dce50f15aa48f38e1bf287fdd3c5276d8e5f1d64bcf29da7d8a68008414f6ee560a940040361eb2f4e65657ca4329958dbec8105cc6d3606ecfe9e71ccb7632
@@ -47,6 +52,7 @@ DIST git2-curl-0.9.0.crate 9290 BLAKE2B b90729fb3de5781f7d1ee180658be92a94fcde5b
 DIST glob-0.3.0.crate 18724 BLAKE2B 1f1dd380e7d668a0c2cff9134279ebda958b4bccdd4a65ff01f9665b45ec4cce8ffbd47eb46e52cf516c5fd5803561e6bcb60cdee21ddfbb8601a95d45500620 SHA512 87098ffdbc518442995c422120cef71f83069c8f88a1970ecec5105b0f284ddd92bcee929f5c230d5b90ae1ead7e1214c3eea26f4a8b26715a00c1ab8b09bc46
 DIST globset-0.4.4.crate 22369 BLAKE2B 7265cf19e3f7a8e710be40760098242fe156ddfa974a59aa29018c2c317876049dec21e70f8b416ea9a0d16c33754118c7f070dd0e50de70cf8cc10e484a6030 SHA512 b9da7f4d67d4269b0b3564d65904c9cca0db7df6d33255f6022eee614f0ad03f3dc6f9e52e52fca7461308d9f01dac1f3588baf87aef735c266561b1119f9985
 DIST heck-0.3.1.crate 54666 BLAKE2B 99f7ceb44ea6af445749989730ce1e14156018ff046a136be2e6474b285088e1d90d6f8af9352affbbde5bac7e5a32971dd99f249f968105e9793b7de76def07 SHA512 134722192c46fd64b38d2fbec3a2511c560916e906491a72c4ec9d99b9f716dc58942fb99cac99b9a6ef2de5b5ad1d1c1155f292d091401b6873347d80c086d6
+DIST hermit-abi-0.1.14.crate 9556 BLAKE2B 03b27536c3a8ce98d26321439ea6d0b14785fa4dc1666f2bfc6142f4f79d003393aae4fa0e351f6eb3cee6719bdf14e32fc6e07f5aa6f75916cdd20d3c1f5be4 SHA512 a3b5eb8462f47d9a0d7342d45ded3c22578cc19bca05ea0856daf04f263d88b0ca1a4f4c1daec14708282dbc39efcc11e100a3a7fc2bdfa73522ce5575ee7b8d
 DIST hex-0.3.2.crate 9053 BLAKE2B 3ac67d26ad367df7543967a8153a2ca7c082d5f56df16cf63a37f76157ce94c68f4cb11c14cc75621a9c45d19c38425acb92b552dd6f45b9052d90cde2ea6e5f SHA512 fbb5e86da5c7fd4b7ebc505d4c0da1258b06406d40a5c6c1626f559e1a91525fa747cbb6e35a687c63216158832ceb49dc61d68cd7d74f2df3630b36ac423852
 DIST home-0.3.4.crate 4167 BLAKE2B 8e71387f6063446aa565dcfc6f08f72e2e406681d413bae835393d31ce1f80d451928e3b434bdf569ba3ccde23e55be320f0081f2c2570c3e4e4069915dfc0a9 SHA512 0e6fa44f4464229e833f8ffa893fd84dcd0bff181c718adcbe5f202b76bd2e16044aa44e1828d4eb332fc71637a3e9ac432a048ad2c6e8f87c719e9e88d4a9b1
 DIST http-0.1.18.crate 101326 BLAKE2B fa8dcf6cb5dbafb5883dd27110cf583c4e656852170abba050568ced0241d4d62e0c299d9bcb50b707b495ed0ffbbf3688d7a5a5f29e6aac07657fdd0f279b58 SHA512 850145ca90272d5f474cc9998bdb173bd94a2a16cb08383815d30d9eb941b9fdb8b0d1a342a4c24bbf94d9e63336f4e10b2b95f5dcaeb26392efeef143cb0726
@@ -57,10 +63,12 @@ DIST im-rc-12.3.4.crate 124256 BLAKE2B 6ee5fe39142b8a6bb96c9a2f50206b67088377ecb
 DIST iovec-0.1.4.crate 8720 BLAKE2B aa1b4cd98ebe47901c0959cf1d8eb2586a803d0453e2a8bdd5c63442b32886dbcb37650aa218c748fd45c9fe3a7fdf20569eae5b19716487b139caae1526da4c SHA512 e23fcaac239807daea20ddcf2cdd4fb858ba1aa970ce6248f70f0fba5bff7ebdb27247c0997ac0ff2791178f86ff9657e473d8f64b86c644763e5b3474edd158
 DIST itertools-0.8.2.crate 89203 BLAKE2B bcf8c00da5033f36cc205708324fd8eff083d46313ee84f567e4f333d8ac1ebe44474d89835a312a5357a48659e2f51d34d2194d548256118943999a3da8ebaf SHA512 325d87a80c0b217469762ae958c46925d284b37ddd987c3ab977c864f426dc6e4515701864f12fafbe49289b45b1910906f0e7d884ba8aea217cac521c3d1ff3
 DIST itoa-0.4.4.crate 11147 BLAKE2B bb6f1caf1e58dc313bd3cfa2cf81252cb2ebc15e1f4c9adfcdedf46c5fa79811d5b0cbd58f1e91d1f62bf85d7b941b0dba535814fb43b5b70a38db791b45717c SHA512 f5e04bd908457e7592243ce64a99c5283428b767f4cc17d77946770411b06fccb0250625263c3e84a02a018ea7e8a0e4216e1929a71988bab8e1dbf603d3801d
+DIST itoa-0.4.6.crate 12167 BLAKE2B a0ab539cfdaca0a61fc55afdb74ef3231d300452fabbc747cac16a51ec74b4ad5c877e2b2a35f3087693c7eb55b5c389b5bc037b960733ab2afa36ff781591c2 SHA512 9085ad30313a2904fc60a85afed99c7388a345ed50c988f4e7307b23b5f38b14bc9ff64edf02b85fda6c363e035ac314241d5dba4a6e2dcfef3d2648cadb9692
 DIST jobserver-0.1.17.crate 19563 BLAKE2B 369af1c6ea420f3be059e7dec5e59d3634dbe0c7bd30e2067bad0ab7702b1643841943f72d8d8624d9b9b208f7e7c1480d2d2dadbadbe52855a6c08316ee1298 SHA512 14578203a000efe2cd88e9de96af216b5aec50f02aa2f33a884119d2edbad02626c05eae6f203ef92032f7d6f9ca58f427a368f843bd379e9e35b585d04fa161
 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.62.crate 433193 BLAKE2B cb6c3f6def6c33f0723ec3dcea2ec4b96f2a7a2e0bbe5ba0ed6a6cb69a43e64016bd05569c6d8e4701592a9d69f7b8a92213a25b5889f833f03bf2f7de9cf184 SHA512 93c178429a099606d4d61576d74204e87c042c4591b8472eb56eb3ddee883b135e28be09ff48e2718c4cdadbfc641e3a313665fe493d64b1820a7e6018f79d1e
+DIST libc-0.2.71.crate 474209 BLAKE2B e380a6936248992b1b1f63ef0cc3d3de410d414bb19350a2327da3947ae0e8e700e82f0f4a802cc485e37571b3a6a68bd773f964496f572a721294623d135c1c SHA512 b6f6eebc42817107aa2f94d426154c2449a2558646414464a31ee9d9dcf714e641fe6613b95ecf9e751d77102c0cedb74b35ca1f76c6df2231a5bad168de5e16
 DIST libgit2-sys-0.7.11.crate 1176919 BLAKE2B 9793a5131c805f8474c17d336514c480203938f51fcdb3d4e09bfc609e6599027a05436660077a526ddedbcab3c587a411fd9ec8d7dd921fb352ebb61e52eb1d SHA512 361aa7d75a029209f59c799e2f091f6ab8c0ba6a4677932537eea8e0198a36a2382327e8c5db98a2980f47b6a4baf07708720f128734081ac58e30d8721c3435
 DIST libnghttp2-sys-0.1.2.crate 2307177 BLAKE2B a76feb5a820f143691a954cf6d62938522408bca4c8c4bd346e4e4b25b43f1e26490a75acbb06971ec15dc1bb61efbc2f7ec95877d236facb99bc1006ea18147 SHA512 d82a0f5bed2dd43cbeb8c12b7fd0a7015bf99139ef1fbc9ed6b27bfcc72f3cb21b726cbd5083fede5cfee0d6a29c3e09b22240fde11c3d9b121342720897065e
 DIST libssh2-sys-0.2.12.crate 468388 BLAKE2B 83010257061fc04ac461aefde945583e94970715e8edca3e8346c085d6a8ebbff61e0fedad9b39d6d848fd0a19caebbb1e20d648537a4d0c8622962911d5caef SHA512 85503ce61fc7ceb5aef619091089b075d19f54c65315c41fa8b24d8a2dafb5ad99709e3ea7d014cf274d1af254ce8a1ce40b815df2aed1f218ca5832dfb2dfc5
@@ -79,11 +87,15 @@ DIST percent-encoding-1.0.1.crate 10057 BLAKE2B 6dbfea557cb7a604a99b6fa694ed24b1
 DIST pkg-config-0.3.16.crate 14429 BLAKE2B f850910fd54891c39bb4187c5ea49997e0628858d7c1f579cea719b8a2c47beb907b3f6e72056c8d8eb037314f4c5a129280504a7c1e8c676fae48241ee6dfdd SHA512 13431f3f8cda05615c91be2fcb8eb2fba085b46df70c5dce773748ffc15f0b48a45858aa69c37c173ce6353b028851f94f03ded58649c641e66a1c1a65b60572
 DIST ppv-lite86-0.2.5.crate 20606 BLAKE2B aeded44b0a0fc59073d358b565c6241ce537a29967fe8f95eadc4cce420752e619023b0f813d1f157756dabc640351de61e7da9bd030c91a14b70d34e300a217 SHA512 281ea3479c4a8996aac643b707e75ca0a079681b1f182a074de0d9989ff9f1df6922cb8e4152af76025ebb4c2d00e6889aecc2a4f0fa66531eceb732aef62243
 DIST proc-macro-error-0.2.6.crate 7963 BLAKE2B 702391b17acb0daaec650e39033e563683cf7ec7c6339402dd288807bbfbe534883bb1dbe9f79eca660cce2e1327d04c24786d78bc886061897da23da96776ae SHA512 7db38f6b5f7e0697c1d6a14de1d0e3d67670dfc1005f74a9993d9c4ec31a4d1165375735711edda2a35e92d6f03619f4e139ac9d5197014853c8333d879d665d
+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.18.crate 36252 BLAKE2B f55674ba8294f48d72a71dbf36a2e464898b96e53ff32d8dfb6f66271a3427e59e5f8e868309aa6c15e3b718983806b35f65599afa119ab76b658af863f90e63 SHA512 3e7cf577bc3548e03a2f1bee620e3ef484dcaa45fbaf7858a8ea04f79d82d636b527584765ef43c92624e1a1afac50e60ad3f9dd8efc34e8e6b84cda20c864ef
 DIST proc-macro2-1.0.5.crate 35430 BLAKE2B 3bb45a1659cf7352120e066f095da7f91343d17198c4af4d4b2600b78e5bc7900f7b3c1fa72b4c707e80c05f6b91155015dc72ca317932195f727c333d34ae41 SHA512 0fd9cb01781b7fca910e905c0cddd0deebb6a862d84286b694b78b7210a586ff497a211eabd27b80c3714b2019736206f88d9d97dc21f3dfffe49ca041f98783
 DIST quick-error-1.2.2.crate 15132 BLAKE2B 0c35f1d0145d4a3bc4b835f203cc4348e1d9e8f6f7c1ef887d923bf8a9a63f896929da67e27978f0d797a9455be5aa868078bccfb8eac480569d62ad64e0fee8 SHA512 f4ed283635e1fb72bd30929457ac04b1b79c36b4b08603af6266a3ea6e18f12c834cb88ac090e42bb869c8a608f7521812de81932a81073a34f16fc882c6148b
 DIST quote-0.6.13.crate 17475 BLAKE2B 985287f3e619c46b052e704c6da78565fe5d8e4f9a0d503aa0e8818f595fbef32a437d67228c35cd02d817ee3e19efc03e75239013a87a79553bb252f15c8ac5 SHA512 bafa9ba42ea6ff2d6df652384485c58327de6eaea2832423eedd8ef8b4aace673c23b70f1f22106515ac13d7f625cb8b1a5e8c4388c1701ea3cd86fb9ac3056e
 DIST quote-1.0.2.crate 23023 BLAKE2B 4091809b4fc9b8d0b56be814b127d6ffd7c1507becba85dc905606cbe85f46233dc4b429c1e865e7c7de336cb936d956169ceb5dd45b489b7722022ccf818a3a SHA512 67778dff9dc5c4edcdd6454b74ad9353bb6c0c4e51c16cb82f2e393a7d7a0cde084d3c93279b718a8398c40af0a9377ebfae5321e69e635efd8390c125b75ce4
+DIST quote-1.0.7.crate 25170 BLAKE2B 9597c94ac365bb6e9d632738a88ece2da7818cb9f3fa0e755324e693eb513c76347032737025375a486319caad13c22ae13bcb257703eacdf2fdc755cbac0de2 SHA512 b7cb576c07419854f71072a88e4216f50d78196703d3d8a1068dfd0f2ccb1e417c3a865ec3be613b46e74e46654f64378f527800701f74d50352cb766a885953
 DIST rand-0.7.2.crate 111438 BLAKE2B c9e81a0b2bcf5a3d425865dad2babd90187da55b9c70fce4aea4ed2e2ffe9cfe4e66bb280f1acee11e1f1ad17d3a73e906ac6cd35e6a2124852b66093293bd48 SHA512 d29d10e9788f0f44b56b2981aca01a115eca1018e6afe2428fca088cc9432f27d014c6f1f0c819317052f4c64a9c54cee8834eb08e081f292ad65160dcdd014c
 DIST rand_chacha-0.2.1.crate 11475 BLAKE2B 698f830845e24b85fe52b11e9a1c621dcdbe4232bc22f3dc0b1d2fcd4427045f302f74134d9b451fc5b4f9ac559fb2bc06f3d0eec5eddb6fd6cf3e6d3030855e SHA512 30933fdb94ca8d4bf040a7e08a42944a0d7c2f3f6a9a3d547e74bc32f922b0eb79d85afb1f6c85c78dc115170e70bdf96b36f0478d61ba5651876d5350ad18f6
 DIST rand_core-0.5.1.crate 21116 BLAKE2B e74791f941a79971f2741172d489d546373c9abcb0dfbffcb7b97b858ec800b2e0c97df4ac636f3aa1b8dd6c14685edf317336d577f31b5c6cb7d89a157e547a SHA512 4f7500b35e165e6c817fdd67a50745d5497d24e554bb554705097e37258751e8755c4d6b8a69fcb5e1977708ba78620bc35d640e4e018fcd4e88d9dbdbebdcbf
@@ -97,24 +109,32 @@ DIST rustc-workspace-hack-1.0.0.crate 774 BLAKE2B 521f71467c95554c8a87ab3e10623e
 DIST rustc_version-0.2.3.crate 10210 BLAKE2B 1f707d1c66d907c9b1d2ef6d0bc6bc9c89990a7b922a6dfc2041865940ff3854c4d0e1daf558279fd5871af5818d4000457a32c949104f46538312fbf730443b SHA512 01fa7a758dcaa4f15c18628a0d5ee5adde5ade96a8b7dde0908e39e27b290d1e9adb20d44e2adcd379341d2d4a0c34a80dc12553a3bb4efa4758988f28989779
 DIST rustfix-0.4.6.crate 13488 BLAKE2B e2b2f54d4420966f4bf0b6c7cb8ee96ec1a4847295bdfd00a88a2f7f6bc00542e471fc6abb2dfb6fe1949ad0c2b9a5ae1911232a47f670de1792637c2dddb44c SHA512 76927c924025bcecd885a71e5f8802e6f44700afceac4acc67e0caa3e594ed6445879d92088cd4d01f8f1e00d8e09cdee9e2274a3a83ade9db24f0a67d04949d
 DIST ryu-1.0.0.crate 40170 BLAKE2B 5938a70fe991ac71974a38172acff9e559ec457aa12775ac53305742696a7ccf8f4619734b1d7b0e2db01b548ef2945aaebca605c186dd0b599f47dfb3fbf536 SHA512 b5dd360611fdf76ff13d377c1c79ce09a4fab90a8b7fc917a4424b8246c8a0da7d3ec515b8c69b695d936b1207072d173b9f40fd5cb218f1eab947862112caf0
+DIST ryu-1.0.5.crate 49570 BLAKE2B 3bfba4a5f290a429de7ac3b86823b2a973f40eb6f48c15329173d95964d31ada36f2618be4b36774a03f97f2ce61364900c6a3ad5465a294e2df311a1f4104ed SHA512 d1708ffa3112a684edf2956b6730ead040401d38f1457cde074eaaa59c249007dc8b925629e7f6df89f7ea757e9d0826649d685cc8ede0a04d50296048bf476c
 DIST same-file-1.0.5.crate 9861 BLAKE2B 3f65c5cfa1ba526157f838ce10695c56dc9241b044890629a3bd7f589f3049b04944d70ce10f371f6844343222954fbed5674c04eb6a7b934a3a6761fc897825 SHA512 33be985579210b64eed7e26f24a695e2a59992ae51723e5aa026ba34dbb05be4c377bb25db9797dca1f70aa4be58f33cae32a89b61fe6b9353de9fb902ba2dcc
 DIST schannel-0.1.16.crate 39153 BLAKE2B f06cb0dcb3d93ac1debf396b23faf5df2b87ce98732ccf5c0ef78af0c36fc9825f2b716f0a5772dc71cd2b2e6ecb477a81c2dbfb6bbd4f84bf3d1187dd7cf187 SHA512 11bb68e759e2ac0bb57a214e64d86fcc49903dc70f9e0582ac4bd0343e94da44d8d34d22649ffae41dc975b4390e7d10f3adcf79d9fe8c9fc95c747c58947b2b
 DIST scopeguard-0.3.3.crate 9605 BLAKE2B 2379e45123c1c6ef456001cccbcec3298d6d32a5197ee9ac51e0233522cc24e8dff1900f1a70fe4d8a7889348b0c668e8e5c8956ec0add0898c719ae8e2a0a5d SHA512 57ce8e32dbe342040a63ec65fbef3680d66d439f0f704c5d485670041505905cfc602e7e3580748b4b4a55ce892d17a453e6d2f853cf0de4c6a2082f0fe95719
 DIST semver-0.9.0.crate 17344 BLAKE2B ae782bc78f29e45577de8574ee58959c70b54bb0b6f45a5a7b09cc4d358d9a0a80bbefc6e0f2a330e2b55adfbbe5c1f64f4ec9bb94c4adf7bb3e4fc9c142db6c SHA512 03a2ea563456f812c301721c3572370fe4934a22db60079da0dd6ffa33fa789e5e2436ef09e62fc35e0b742b06fabc290992c74eed80419a353c9de9449928dc
 DIST semver-parser-0.7.0.crate 10268 BLAKE2B e46b7cf9d292f8fc54561fca4df8534dc96f6be920a5c869c405ddb31b9d1a18eab0799207113cf4910a52cc0df5017ab1bc1883a7c3787ebf2d60f09ac0ab4f SHA512 17320468ec6b9862d595f358d70c09ac6e09db7885fe0ead7a1e596f79350a6306e8bfde5bbd6512008a7c5454da1c7ae55fe1e3bc1c1ff02ac9df54c0a6121f
 DIST serde-1.0.101.crate 73115 BLAKE2B 6b80a6e7f8965c412c6f5db62cf3782329818c59c43c9947ad9a33be56b334feb0fc0afae4722f368d708236e2763ee2b1e71b323b3e961880f99f2e178a82a6 SHA512 3b6e2f8fc965ae2055a8eea007b3aa47715fdbd653cd0af81ada557559316ca65d7f3c75c3c5db0841aabcb2d4336092d339258829df11716b10a0c14597c678
+DIST serde-1.0.112.crate 74450 BLAKE2B 585c499e2f869c82d1be54878be266b3715929b98e288b751ab339d3c7e71ed807893d0a19c475ac2a49ab2a407fec465c560921385747591b224fecd3a35b9b SHA512 9ed5a8906c6f6feac945da6f08c33764c678d8049fe9c249a23558976f27aacbaaa2dd2770a30ea9f6ff6e5018258eea68769b3a22273fe00c6ab2d5e2a396fb
 DIST serde_derive-1.0.101.crate 49736 BLAKE2B 247c6284e362d9a31eee6c92b257fd70733669627628cbdc921dbecc384d1a328fc8a37a8f5b96a84498d5fb4514374760ccccfcee1f3e809d35da5677cf4932 SHA512 08a014ff70718db11c5e3b8420d2b31379c14004b55c4521149030a00c3a623a358c3442815e492a2cd28d6a32002aa1c828cae2b5366f82d68c1e342eba0417
+DIST serde_derive-1.0.112.crate 50233 BLAKE2B 03177d1b014dfd1e62aaf05c9a1c950876f662761e15e1148ee51f1f31f11a92d26ec06c886973cc6038148a90f2c9f0c620a115e74f08da15910b82592728b1 SHA512 ef09cd9aef974dbfaa101134e06c6262ba528a7e74b37f0eb3439c7ba595a47676eb7f15d028ca64f0efbbc4629109f06fa667a9e8f90f908c39c7094886ea08
 DIST serde_ignored-0.0.4.crate 9533 BLAKE2B 07d08459a3333fb30a9413a882169b5c5b49f26f58128dc8f0458c3e7e668948f3a84d3e5c4dff78905f51604f4f317d76f96c3a900da85d669c0c9065e6191d SHA512 29911d05145b33ddfdcd5c86d57af331262393cd445eb5c464df07f8853032a156b0b1be7b90b66666748e0383831272cb53252cad7778fdd3ea20f2a04e23b4
 DIST serde_json-1.0.41.crate 69870 BLAKE2B 328935ee765889b82cd88ac7eab921e279ea8ad41445a8344b194605e1571b30b6204add7dc4de1f87994d8162428eaf4d825e9744c9971349e8fee19507265f SHA512 63ac513a4813a65962d8f63476ce8e63ce71d1e6643da7443d774078e4a743835276c50c04ce535b2e43251383c537365581838a0bd5d4893a644e396eeec55b
+DIST serde_json-1.0.55.crate 114335 BLAKE2B 89118d6ad9c62b5177651a65391cef22258b3fbbfa85c8dbe38f99e7388a3a9a44f20db800ff2b62f0484bc1766d2cb7c9dc1088894aa18c2e50be5d45b98f77 SHA512 db81c9ddaae20ff5f712d8a2cbb58a95bfd139d9358797443c9ee10fb8af18f1396faf09f7335c249118feb32f52192734d61efcb0b40204ea58825056eea9c9
 DIST shell-escape-0.1.4.crate 6764 BLAKE2B cbfaabec7c6b81b802ced02a33e463c39b2f27f004e0e97087adf5712f1ccf4f4405ea9d010afb49153292741aa1d51d985caea5a3c48a601dc4f25b66012135 SHA512 19cd5e79b2b610dbb26098182c1ed3a8a2cb93a88fc623c0a9e3ff719998d6bb1de632f79519905441a4e38275178dd5aebca8b9994efc24e19bac4ebe5d6329
 DIST sized-chunks-0.1.3.crate 22156 BLAKE2B 48edf5e404ab5967ab90d7cafda783d0bc9e3faa4040e815e6dc80f7041c667f0e109f6b43638ab6cbd9e41e7cae9a4d65b91fa36a4fc63aaa7963b1b0f5aa65 SHA512 613a306d7596846da858543c5eb34bcb52356e5ebefe77ebe36623f1bdd4579d18fea955c6ea07788dfaccfea013afa0c817f709afaaf01317362575370dda54
 DIST smallvec-0.6.10.crate 22064 BLAKE2B 41a7ccd12c9b7e1dfaf43a9cee22c60d160b35a08024554cf8d68b59498a6e3fcd0e8146815bb61a6e1727b209ec85813127ab8520f8ef47716913a6ce6cd952 SHA512 802b96283ac27ffa71ba17e8676c23f721cc1bd3b61df6f78a1c8ca9150d07e6d5db55651ba070f9202460019f59636871c1160e31038c6bf7ee21cdba8c5be4
 DIST socket2-0.3.11.crate 27725 BLAKE2B 75c2b2ba7ac8981bb7111bb7780fcaae03c670abcc5dd464c2121fe8d3c592fb19faa2b759ff8f8d9a60f954c6059ae600cbad5a6b4592a23888b5264d7e1d25 SHA512 6b29b2e4e36fcc165f658da5a2e92980713134d3b68a43b993e4f1cd049530b7c0a119918c4a9528d8d2be27cf8642fd8b6d3ebc2469ca5525045da56022a91c
 DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
+DIST structopt-0.3.15.crate 49378 BLAKE2B 5474b71fefea749d2bba1be76f4aeef52564b686ca6315e56192de2fa01377df82ce1331ee35c6c5c8ab25fcc936e909f2d85448d8464722bab11cccb1d7b361 SHA512 92f577714dae111b6a3c0a4b2f2e30be60f9387427c4458b1641e2589e17c6c1055c9860f3370a89bb6e1fd48333d0a88c7af007c6310ec881436a7aec444e99
 DIST structopt-0.3.3.crate 40622 BLAKE2B 0960dbd15b9ae1258ea9f98c082c974eb8be6635f3c7366d3a382415947647e66658bad52faaa56eea42c2e06e8dae03f6d8906923f78b1d85c177bbf9424024 SHA512 8239f1db65401ac0d31589f362938fbbccbc10a930480e183cd0c503c10b75c5e3723e0d0686b84b3d3837d788627a48f7954b81ce5fed4c963d0fa2969496bf
 DIST structopt-derive-0.3.3.crate 16237 BLAKE2B 995fd46f6017802c957f5a7f23bf219cdffca8f9e34809c64ca00b8cb3087ef7e579d28ab01125dbce7c80ba95b9657564bb20d658fad9cffba2e8fda81bbeea SHA512 27df870ff020c2b115fc1fbe8a65d8ca9818d79c46ca24a588d0f1589bf62538430bbc63a9dc34832b4212895e7873c47fb4266fd502d6444cc8767add86da24
+DIST structopt-derive-0.4.8.crate 19647 BLAKE2B a260833142085899cabe918c748ba661dd14d3adcca2d4e35698a4df404a81230ea4bfca8a34dcabf411efe229c9adeb7ea51b514899ca40690d18c8d477ca17 SHA512 b8819fb5958d889f7d871fd952084e7695ab061458e8c97b5be8a7171bea6dff92407fc87d816bef62e322d2aee0ed1375029aaebbc4fee17cd909a7f5a01848
 DIST syn-0.15.44.crate 184212 BLAKE2B b735040d69d10b30c94de2e8f776d25ff5ec427e79a7371345a9bb694d50c4f3ab848ed30166c683aa88f5f73f7361dda2a74880d21882975485fabe5bf65d33 SHA512 c6c9b5887425e1e5fab905e477fcea41bba191693c471cf26922a9dfdd59ed957155a399406cc3723933a869565e7295183dabedfc34e3e2a20874ba94c7ead7
+DIST syn-1.0.31.crate 203988 BLAKE2B c4cc691abc2590e361187984f627e5928015893987945b344d18bf449009081e789b14ed6f2c7ad889f63b34e0e6a632ccc7a801d146a0cb37727b252c6eda43 SHA512 9d7ffd4f7acc2790587934e0a99e2615a4292b03fb3701fb55795cd94722d7a757d5e94e7a224284496d812ef5007936164467917e6aacc428f5b45d2ae3fa79
 DIST syn-1.0.5.crate 190286 BLAKE2B 7d5c813bb4cebbc104978181532a050b0a7f79963a539d69a253ebdb15a83c275a5d5b04dfbb66a426afec2c90a450ed7be595619a2b5a31b0725d904f5adb92 SHA512 4cc18966040b1f86916876aa5ad8029a126f7ab8db55408b3f4bc343dd82dc357899dd4a7afc514c65fd269245f8850f8f2834b08bc2ee6cf6774282f75feadc
+DIST syn-mid-0.5.0.crate 14149 BLAKE2B 87170d072ab6f5ffc6d7f4dc1a08869d4e5c0f505b9130d9b5778a55e206a488b048e47895a524e117ed58b3d45907c8877c897d1d88536a06c9319826b596e7 SHA512 759e29a2ca984eddae3c091be036ad630fb985408be31d838af3bb04fe1f26a3d2b7ef597c1ffb61a72c96383cbf39d8fe83cfe0d79ed4bc3250a585156e637b
 DIST synstructure-0.10.2.crate 17988 BLAKE2B 62bdc896819ba1f0820286dda3596e265dc7ebeda83595d89ad6baf584046242f774141b25ee4cd9b120bd7c392973a99d307abbe956b50eddbd05e9b7b7ce72 SHA512 48da0daf778cd18547e51a080f1e86149534527f20026601b21423c9f89cf6adb7a121b01dd9bb0b680403eb728a92e75242e5ae31a725ea5b1f19c5f47f0458
 DIST tar-0.4.26.crate 42689 BLAKE2B 174baa480caac4734282003b5277004d87ccf9d5519b0adc3a02ceb0831e053483eb4cb7d21170ba792e2a573748aaa9589a261ffa8050d8bf2bc36e86451e16 SHA512 83ee187b253347068121d04242a488ac44ca6da159c6f9029f3e063b04544b7fa3ed40fed7e251692ffd73553dd369edb413f52f3b3718396451ec916eba15ab
 DIST tempfile-3.1.0.crate 25823 BLAKE2B a34721369923771d5f9a2fc64adaff2bff41da97a0ce79e01aaedb8d6670867220c671c0d23f7a8a9c71b09c0559efe4e7c9bab1f7f9d890866be1de1ce050a9 SHA512 a87ee51c36a81a8a8eb8f091eb57926682f38b707f7f641332d8752170e6c139a656ae49c6861f51e07c2fab5c86cc9b2ac158f5d89c6bff15d18934dd4e7ba5
@@ -122,18 +142,23 @@ DIST termcolor-1.0.5.crate 14526 BLAKE2B c799a73787fdc764ce634731c5cb7232a4696a8
 DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
 DIST thread_local-0.3.6.crate 12388 BLAKE2B 290c35e5327e80a5cdca5609252b1efd1b78a654fc9ab4ba68eeaa3c2769d844f725d17d91cbb15048dbaac84913c51edcb39bb402882c9e7b4d0c4e4811518d SHA512 cd783d3d9caec43868da1f6118d4c4d520e03b9f1049d8f15d2c12482989401d3aee748e04a149953d35e5d6487355c2891d44569ef688bc1d45f01b6461d253
 DIST time-0.1.42.crate 30005 BLAKE2B 6d85ae2e56612b5c6955921b671ac62ad10c174fa9fd382e2d76018fc2789253836397b980f8e6d0db4f1b19da244c64d3bffb4fa6c25ac0b66e7ba9876590d4 SHA512 4df662212377093b0fd8fcd88ddc30b20a8af7d989c2e100c0cf64f9741e88eea6e858e1aa4220be6b76b0cf8b62c8116b492010d74d1ebef197c66aa130aa83
+DIST time-0.1.43.crate 28653 BLAKE2B 95fe69647e8d52784be1fd3457578896aa38279d00f51f1070eadab111d39450583c63854c73d4384f2e4349b0250f1c9bff9901529b776c596846c057c93335 SHA512 c3e0c68cab1ed2f33f41955f83e632c51924e4d3c1d22dd0c4ae98499e03f3cafde8b0c2d9e69b67a78d6e4055e464ee00d1ed6af5eb9fa75052405b43e24a25
 DIST toml-0.5.3.crate 51654 BLAKE2B ba0b8af941edb4557bc06a24351420ef89619ab9115b85e3f6eb5eb327dc08496d02023a5e375e3546fe763db11f201fc576804eb291d423702ab81f7b7854ef SHA512 f3798afe9cbededee2c5d0cc2cd45a9a5b09004bc4d6f0e2863aa56a3aa377e9eb8fc2e4c557fe448afbec77bea5bb6953fe6ff59cb83389351ea207bd912458
 DIST typenum-1.11.2.crate 31853 BLAKE2B 1781840c29726a8df614fdcd620924b4cb5a11ad8b5af7c633e70b459b4cdcb9d6a7ccb02b08b78a0cfb3f73382d3ce9d93c56296f93ad588546aeb81a74540c SHA512 c301bc123421e47d39b50e39c42c04e35c7f12a549283d51e1942d1a8d54aa3e49e6177ba4610659d8e68a1d30fb1b2aa5af57c7bb652ab3f70ab7a28ef8b59a
 DIST unicode-bidi-0.3.4.crate 32228 BLAKE2B 853a85b29d1ac2025b7a28af64ead9387e3b4b1e790ad719d4374e349c1853ddbb5959a2890d9d6c94a5c28e4523fc3324deb6b1ed1aeb5e917f21b0e2516f6c SHA512 170ce083fa82bed13ecc62d85cb882fdd6491ae721e1633d3c1a5d3cee69422153afcf6695765c0e8fc7035440d0370d34afac9e978cb27f7506c07cba300e1e
 DIST unicode-normalization-0.1.8.crate 71158 BLAKE2B c548a2bc537abc6d86bffb0828a366ff82b143dcb0ee01e2c21b3b7134fd5f818f3775db391d358f4ebcb906ff256e3d2228ab042066a3de9a6747be05b8effa SHA512 4e3245689d6162a21cedb42e07b179e3aad03728a37b005c2e6bff644a6efd06b6bd26a20a255861a01441a9d15c4318575db3016248b96a03436212aa414547
 DIST unicode-segmentation-1.3.0.crate 90567 BLAKE2B 2bfce62b981b6b8d41be760f0663c3301f974fa9c975e7859c6cac6778cecafa2ee5dbe2e4368959b4fc2f0dee3d93cdab236dde593665b76740d07009051cb2 SHA512 6f32a36c8c69e80b3aacfcf68cde088a34b88587e20de6e49a14b24941caa51a0031623941ef05e6d36e5c99f50472c9bb26d670b5396749bae8373ae4bc7d4c
+DIST unicode-segmentation-1.6.0.crate 90703 BLAKE2B b7d63bb8b62cabc604084957aaff021df24a1291f0ebdcddc424cceefe10ad399ed53152211c3e7557e39e21255166f922256f9f8e1fb488d3bae368b49a378e SHA512 80c6f92d9b39602a05809dc63a7cb05a305441689b6056801097a882a36c9795aabd660f884f707daa7e7fe6ad4983f6e245c226962cc982dbfeea2ddfddf41e
 DIST unicode-width-0.1.6.crate 16394 BLAKE2B 8a4bd3dbe264635cbfe42c131f20a0e8f32989211434fbcc085abeb8b7fac841908e99c6130d626af363edf9b07fb82f6ddbc494812273521941d553980142c9 SHA512 d6c2e5a99ea359d866393a6b00e0e21e5d80e4e665e457c0f2f0bbebda53afeab75b1d9b6b79102339ee621bac5050e7d41621703a8fd9ffe1e74a5a4301aa05
+DIST unicode-width-0.1.7.crate 16644 BLAKE2B 8cc5ee2dfeeda8ffe3405a0d4f1576d2b3b8ede1a42cbefb0ba3bd0d71b53a92ceade86c4a06e9d5b31382955dc6e1152ae5cd279dc26dbc51f478dad1d0f64d SHA512 39b8a539c9009d0421f54ae68b139f21456c9cb03d743b58535a977f98bc9655cf42eaacfadbcff796c187a6f315ae16259ee22be9c2da5aa042172c6b464d84
 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-1.7.2.crate 68597 BLAKE2B d8d7a4b05e956a956c745dbb536ff94abbe81af22e53af3d7baccf01ed7e556cc4f1f8e0a0d97c258c1f1a23209e1ae494079948de9f0d402901c0b6cdafc373 SHA512 c53d7c397416cb1f3c9f7654a8a0653f350c28d41880859f29f681cd6269848890c1396b7ccdf571ec84212a8f3959138f47193ac0595a97bf98972b58e1ed04
 DIST url_serde-0.2.0.crate 3525 BLAKE2B 3beadf5f536b091ea54f8a1cf31553f2c9c51719a1d586ceed396363d26f1441c12a23bf8017cad4daca62a57b4f5b55b0b5d5577b4c61c1854f16a3d4554247 SHA512 9abf777f8ac1f369e8db826e35fd09a2a5f1685560027740a8388ce1c60de92da79b4d1b938f9bd082363396f5b7a742811feaf298b269b2f5e9465650ee827f
 DIST vcpkg-0.2.7.crate 11012 BLAKE2B 3d97c24c3ddafc4c5c56d54e682c828782d6900a10caa48552892c174e897c6b92d0477a2515df889c25297e43dc57538684cd761b8ff9f6855f6a6b748f4446 SHA512 d298d8a3de58138a4be622b3038949d29e92b83941765fc3e25539a3779451cb9deadceda9bdf46186700c01eb65bb1b5c03e3b3cf7a5fe1c48c06e1b1591a1b
 DIST vec_map-0.8.1.crate 14959 BLAKE2B f5c179ccb4349d543747d5e3bb3edfca4bc9f3f64ba3c2d40fb1d9cba98433b7a0641387aafda6347c9b3603592c64bd820b217b46fbfcd37f802f298e5793ab SHA512 026cf10dc7ba98ae51dd312fc847cbaea41c25f0da5db6e0e22c2ecf75584bbf876d7bd96035fbbcf6696d702d5a3f25977e02a2d77cf519aa21e3ed05710e40
+DIST vec_map-0.8.2.crate 14466 BLAKE2B 8f109fbff19604b82ea2aa61c952e2ce9b5597ccc8e1ef4e847648e2de08dece8c4debe92889edeccb8d393645fd0b62436b49d236ded7ad181c4a51239a9539 SHA512 4f1ef59bc2c437e79f1f84fe021bce5aa8ccd581f500f3d5776913d5f17d45b03ccee64f5bd03d47656318cfc9344a1f4311079d471fa409a8e4e94c143973f9
+DIST version_check-0.9.2.crate 11979 BLAKE2B 6568f8d4652fb470162bb2251be2260a6bf83e107a4f957ed91117938d5da48c42bedfb5e6622bcd6c37950805666b78984577bd8dae687dbb39e452078bd97c SHA512 b88a9d545ef103fe6d0eebe7ddcf328fc21fcb02c60828b347cfc35afd957669e652a94d880ef992450c167df3505838bc649e0d83896542fa13a149875acf26
 DIST walkdir-2.2.9.crate 22423 BLAKE2B 7c5f1aa4a2078d4821a1fffc57751950295c99706b48198c70556461aa42b2535d93fd95804a6c5003ea906848accee510fe5bc6148c4155e6de074ba324da2a SHA512 43b8f629a43195c8cd8ad6821b431dd3648a19e6abb83f78deaa3300e7dafa32b31b3c89a228499585e3da4520ca26d82dabf938c1204c8011e5516b3b82da7b
 DIST wasi-0.7.0.crate 33941 BLAKE2B de1e4e577a1237a233f81ff1a3bd7f888020a42d93a807187a154a3ae0593397358a8667a065f0cdd5497dd2a89889e418d33a0d42ab1631b3f99677e9ebd665 SHA512 1950e78df7f0ba21b917680633d092704f1fb906bd973de4ddc43cedb7bf449f6e881d50e3aa0d5595e8d58796915d582b69c116ef536f819b6f035affea18f0
 DIST winapi-0.3.8.crate 1128308 BLAKE2B e0e8ef6121f222b0500525192ebb69b26b71cc16f9ba92186f8ad6acc9de4cb8cc7c738f9c31f5bd223d2e34c93c496e8448c973d69797776004670c70abf69c SHA512 5a899ee5f09f30d742b8b8eba78da05cd9f4c664408fdeb9370373f8756a962a23e3f1c07619e745b3270138606c9a369076c02c3f5353f657df09d203d9a736
@@ -143,4 +168,5 @@ DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e
 DIST wincolor-1.0.2.crate 4821 BLAKE2B 14fec69f86d72f6664f7ada8dfa34cbb603f5ebd0de098db69c0bd0d193f49b4bb2ebdec40a962a44e9111f656f62d9d67135ae94147ada48440dd8cd7e615ee SHA512 b902c8985b3e341cd4728fa597528740bb3d95bdd3cdc4fd70867a41ab4d95cb64c4f20efa9a9a911c1905ac9e0adb4fadd13c126ae6a808caaafa23f47d7f10
 EBUILD cargo-ebuild-0.2.0.ebuild 2723 BLAKE2B 2c971c4e997c8dcdf14ac770b58172f509fb488cee9ce23599964725762d7f0dba7c435e3e0d5163e1c3448de83be949dcc2508deced0774b97713c4b1a62ce2 SHA512 ccef06000bcfb7b08ceed1edddb08945d36c04ecc5317543b8d3f83bcc7144afd2eafc8cc3b30f0808d27a819faf46df3892e0814bcdedabfdfb2c554015d6c1
 EBUILD cargo-ebuild-0.3.0.ebuild 1296 BLAKE2B 7ef1f0e28e2eabe61298cf8f5400cb7b8172bfe0d16ff6f46e68d5b407ede061fc5c952659af1c3bfe2be552d03c1e4f5063a7e027d7c2f69e0308cd2ea838bd SHA512 bd5343845a3b3f899ba5437ace79f95ca8e229fbf400dc93f3cc2cb0be04e100939f86def690ca36b5b9654a0721a4049282e42fa61fc7890966d25f6f3896fd
+EBUILD cargo-ebuild-0.3.1.ebuild 1376 BLAKE2B 767c8e784eaec455a9e54981953aa01e099536c8e1f29acaf71be0daa8a2f923dc771fc1b6693c11a94eee6fd0131a4f229a748a31fe9e179d593602e91b6277 SHA512 571bdfe5035575d2b50167fb65efc7079c034c4f7a7394a37aedc713f547d3a94dc79838fe9f3be6a6f514c9bec04dda94516a8c860dc288a79a901a7339fb11
 MISC metadata.xml 331 BLAKE2B 1fafc9c1b14b8c365a91f02ff7941cffe5e7d97253f74160943a7fba64341f1399cd5daf1da8f3fd1d7a9dac3d0def483fbcaefd7c991ab64de7e4707e636f6c SHA512 e664485c069f1b2341376dee14c76e2ff99b2897837ef8242a9f76106ba4e4d5edc4e8a49b379dcb3848bd65560e68a0c881b005572d526f14234bbafd29dd14
diff --git a/dev-util/cargo-ebuild/cargo-ebuild-0.3.1.ebuild b/dev-util/cargo-ebuild/cargo-ebuild-0.3.1.ebuild
new file mode 100644
index 000000000000..48d0c5a41348
--- /dev/null
+++ b/dev-util/cargo-ebuild/cargo-ebuild-0.3.1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 2017-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Auto-Generated by cargo-ebuild 0.3.1
+
+EAPI=7
+
+CRATES="
+ansi_term-0.11.0
+anyhow-1.0.31
+atty-0.2.14
+bitflags-1.2.1
+cargo-ebuild-0.3.1
+cargo_metadata-0.9.1
+clap-2.33.1
+either-1.5.3
+heck-0.3.1
+hermit-abi-0.1.14
+itertools-0.8.2
+itoa-0.4.6
+lazy_static-1.4.0
+libc-0.2.71
+proc-macro-error-1.0.2
+proc-macro-error-attr-1.0.2
+proc-macro2-1.0.18
+quote-1.0.7
+ryu-1.0.5
+semver-0.9.0
+semver-parser-0.7.0
+serde-1.0.112
+serde_derive-1.0.112
+serde_json-1.0.55
+strsim-0.8.0
+structopt-0.3.15
+structopt-derive-0.4.8
+syn-1.0.31
+syn-mid-0.5.0
+textwrap-0.11.0
+time-0.1.43
+unicode-segmentation-1.6.0
+unicode-width-0.1.7
+unicode-xid-0.2.0
+vec_map-0.8.2
+version_check-0.9.2
+winapi-0.3.8
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-x86_64-pc-windows-gnu-0.4.0
+"
+
+inherit cargo
+
+DESCRIPTION="Generates an ebuild for a package using the in-tree eclasses."
+# Double check the homepage as the cargo_metadata crate
+# does not provide this value so instead repository is used
+HOMEPAGE="https://github.com/cardoe/cargo-ebuild"
+SRC_URI="$(cargo_crate_uris ${CRATES})"
+RESTRICT="mirror"
+# License set may be more restrictive as OR is not respected
+# use cargo-license for a more accurate license picture
+LICENSE="Apache-2.0 Boost-1.0 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
diff --git a/dev-util/cargo-tree/Manifest b/dev-util/cargo-tree/Manifest
deleted file mode 100644
index 2bbb495fb6a0..000000000000
--- a/dev-util/cargo-tree/Manifest
+++ /dev/null
@@ -1,41 +0,0 @@
-DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
-DIST anyhow-1.0.26.crate 26024 BLAKE2B 09cdaf61531f3a36b186fbebc2c783d472b54494c1dbd0e2b808be332bfba5783f40d66e46b2148a677ec61ed89f73bf2db04ebb6d43c8b395162177181d2094 SHA512 362a22854f90032f407875ee3687287f2c9c87e3b462e808219e0fd4d3067ad245544d1b6f38b3130d824af77390a331ac0b5a918498ee6c6b401fc8d0292ccc
-DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
-DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
-DIST cargo-tree-0.29.0.crate 15619 BLAKE2B abd9d41da47b206f96a639f40c6862a934116241ace4592952e1614e37329f5f1aa67bf3c56aa7338394e1db1f3cc8f97ff110386e5d6c49c68fd2077debcf1f SHA512 a992bb5f23023dbeefe07748c1000a792203766e01546f952da301f25817f19222339fa6d2d7b85c379bd5aeb4125445219ddb45bc8882d9eac967583d515889
-DIST cargo_metadata-0.9.1.crate 14876 BLAKE2B ff4b404231831641826fd11e2c43c12a83f9fdc4277eac351a154db8df219b09f53fa97f2138b28e280215b52d167ea733134d12e932419a5b53e5167a102792 SHA512 d1c0ff7625d0479764305b33410d8c95d5dcb3c8154cf18f84c7d5b63809dcf6a998e3f511d8245f399701d08ea54864b1f976b40db968eeb094813ff473a01f
-DIST clap-2.33.0.crate 196458 BLAKE2B 3bb62d817afc77b421a6282746b9b61367d224de6b614c7ed66bde452ce1046728077dab3368a46635b5c74d82ba3196586d87c0201478ce5b89638910dadb1a SHA512 f1075031414d48e4340bfe308904a95a31b72460724773c52a0bc8c004e625a04c904a39fc5420cb8c26a633321f9b5f4f69019c7aae5ed89900b63ed8c21a91
-DIST fixedbitset-0.1.9.crate 11974 BLAKE2B 22d60a9dbac0717c00f95ebd687eefecea597edc5216ba080224eedcf732d4bc901b9f9d6c9dcbd10c0876376de49a7efb4e6ccf90c6776dd9edb5a7f19b9c20 SHA512 07b45fb7e676c6a1b450d23ff53651e1ea1eafdbfc5bc304b13255e0c30f72718fb37fe0f17f2baff799015aa29405b8a677eac604e3219e5ed3f9abecda1964
-DIST heck-0.3.1.crate 54666 BLAKE2B 99f7ceb44ea6af445749989730ce1e14156018ff046a136be2e6474b285088e1d90d6f8af9352affbbde5bac7e5a32971dd99f249f968105e9793b7de76def07 SHA512 134722192c46fd64b38d2fbec3a2511c560916e906491a72c4ec9d99b9f716dc58942fb99cac99b9a6ef2de5b5ad1d1c1155f292d091401b6873347d80c086d6
-DIST hermit-abi-0.1.6.crate 6907 BLAKE2B a2c11ec832ea0110421f6be2fa0a5591e5908a74c68c5079f034908c216d6776ef0f4363b809699e58dafd98deb9ff19ee8b06b704d3159448d1b4376fc2537e SHA512 a557402a7529387832ba4014ee1a626d849eb64f873f69eaf53506362340c8f24c7456a8a04653f4ead9043768d06042aeca2aa8d95898dee37d367674854741
-DIST itoa-0.4.5.crate 11194 BLAKE2B d8f0e2aaf62152c187e0987ab4b0cf842ac13255262a9ccbf8484d730ea5397572791c023d2363d0562c18c8efd2418680583e99a1f5d14450b3f0184dce69ca SHA512 79ff8774524130a4729d5e708a4a4a837b3e5052384a12c22db4ae3e208dc4391ee185365f685137a8ba55ea7dc3499f8cddddb2fd98b84177ab292c264034d3
-DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
-DIST libc-0.2.66.crate 457815 BLAKE2B 5da379ea738b75189e106d4be821c999394043303b8bb6a9caecdb1b53e449f11a58edc4589193611b76e7baf00e155ba1077bcca4d0cfae30826e946a0075f0 SHA512 5bf5645a7cbe626108cd71e1d189286ed161fcd3ea12cd34f4e392be4cf93bf78feb6128b1101bedc41a71091398f26771f3efd3880f779ee0be00f706914975
-DIST ordermap-0.3.5.crate 35246 BLAKE2B a663aced769ea6bebedf21b95e98756796b9640d89e1cde828f7af32921cd7354dc7dc232fed40f4c65d54ab3e472200e07a057cfe634002d1371c9f93003e20 SHA512 4413319af191656c82c6f4b185840486d2021ab4a91e412e5472329af928a6519690734613f9616c285c6a4c967a4c718483583e0a5d4b16bd98b01f3d226ddd
-DIST petgraph-0.4.13.crate 111936 BLAKE2B 426d865c16930715a2207f778ff108370cee0ff8929d49b00d5497e4fb28cc62c2fe34704b75f55fea416339be6c7417545a23b085d33af74b0ec31378edf2b0 SHA512 670753503b9ee5eb28b73e9ad6367f5cc97064182ed82d691ab95e3948b1d879aec9c74eabad11c232f40cb18d2629e1bdfedb3f0d444d65526a2bd7e69bb60b
-DIST proc-macro-error-0.4.5.crate 12857 BLAKE2B 5576aa42ffe73c552664e298340fd190deb7f3a8b0481cd40789bd90b2e772c326db7727df317a7995f429522b1fd9fc20e7ec5d6f4741c5dc2db557ed1b628e SHA512 507e3e2b22a4bd9baf24b8a8a943047785a658b75106679db58d51b053c06b631e4eabbc378ec20df7c77a4d9fd4b1e2a90676c710c9c3765fc76098c6585bc8
-DIST proc-macro-error-attr-0.4.5.crate 6810 BLAKE2B e0f675c886437a165b1ee6e6752d0845c2ebdcf233090d0627663bf188a5479f2b37f5f181a3c702a273fbacf380d43fbdc1debc1f9296f590e86a15476771c1 SHA512 cede66772326cc70e131ce9cdcf69f9837b1a4f306df54635a417ed0be5ae586e57c0b58b360d1bb4f8096cb9d1a6f040ceed64f2e4e103f5d61c0494562a94f
-DIST proc-macro2-1.0.8.crate 35657 BLAKE2B 6f53919e85028b6ca2f1d04feb7daf9bf9c2f76273ee8813d9b09807585a1da81687b880b2f23109998332bd7f5d3798d83094042a44de66413a2cebcd60a2c8 SHA512 0214a1268a733872ef1fa59ab80a1cb9ed8f160b9f3751cd70cb26c0919bb3858e63c994163c727f7c7486067ebc681017fb452d51fa314e7da90ca120892254
-DIST quote-1.0.2.crate 23023 BLAKE2B 4091809b4fc9b8d0b56be814b127d6ffd7c1507becba85dc905606cbe85f46233dc4b429c1e865e7c7de336cb936d956169ceb5dd45b489b7722022ccf818a3a SHA512 67778dff9dc5c4edcdd6454b74ad9353bb6c0c4e51c16cb82f2e393a7d7a0cde084d3c93279b718a8398c40af0a9377ebfae5321e69e635efd8390c125b75ce4
-DIST rustversion-1.0.2.crate 12264 BLAKE2B 52028178251461506f66cc1e259159e0102791f22ba8b87d17a004d8b9c2e8f2956aac314d6344b858ab1c90f1d02f07896a1b3e55decb88adb15c4e4d4da075 SHA512 79e6cb23a866ecbb6024837d840169473434d21f0cd7c3536c52d17f511fb13077e4ed6566a5a8f67d087c52682b1ab7605e02b2162211c758344881f8ade60a
-DIST ryu-1.0.2.crate 42001 BLAKE2B c25f0454bfac40de3150b8c263c6d2842e64f86f441a69ab5e5722a2383a9a07c7539837f6e50996619eb0c4a5da212556a4dd21a761a250785fe0a9c4e18a3c SHA512 c681e037f1eea488bad7fb5ecc79af52377bd4b9eeed95eb213201219d7f100702000f81947aff8f18641235fb62c138a30eb20c1f93ae518a4d9960a598bb64
-DIST semver-0.9.0.crate 17344 BLAKE2B ae782bc78f29e45577de8574ee58959c70b54bb0b6f45a5a7b09cc4d358d9a0a80bbefc6e0f2a330e2b55adfbbe5c1f64f4ec9bb94c4adf7bb3e4fc9c142db6c SHA512 03a2ea563456f812c301721c3572370fe4934a22db60079da0dd6ffa33fa789e5e2436ef09e62fc35e0b742b06fabc290992c74eed80419a353c9de9449928dc
-DIST semver-parser-0.7.0.crate 10268 BLAKE2B e46b7cf9d292f8fc54561fca4df8534dc96f6be920a5c869c405ddb31b9d1a18eab0799207113cf4910a52cc0df5017ab1bc1883a7c3787ebf2d60f09ac0ab4f SHA512 17320468ec6b9862d595f358d70c09ac6e09db7885fe0ead7a1e596f79350a6306e8bfde5bbd6512008a7c5454da1c7ae55fe1e3bc1c1ff02ac9df54c0a6121f
-DIST serde-1.0.104.crate 73258 BLAKE2B 98d63f91c61ac4693e17e0b137379cffd6608933b84d2211509be6b3b25b181592d5e907549fac6ae2e4a45255b8003e1bfd0db683429ac3e78d8ee097d3d79c SHA512 638a1dacc158d69658a005e599adc19d6bc80d0c663f527b1ff906f729e70e027eacc4ea5b9b2c675ac990d5997f50f9d46d614ba95b0c73bb9606aba46b053a
-DIST serde_derive-1.0.104.crate 49658 BLAKE2B d4a9ecb4a8df87776a83d645778dc050803b16fd5c9889f28e231238223d424dd25b101412e89741fb47be624d1773acf97f6e38809c81110b696701975168df SHA512 303c3d126ca56b0a7126a87e9e1be8bd60bdb212ed21b5e1aee015313fd769f1d260869c41b0335bd467fd4e3fc6bb26f428c7c4b35e9a55c009797cfa745d1e
-DIST serde_json-1.0.45.crate 71931 BLAKE2B 8d04547eb2564ed83443e79de0ad15dfb214b3020731e797d6a1364830b51640d2a67a1445955769c1db84a3dd6c0f59c31131b8746cedb8834a383fd8972fac SHA512 73c72e21eea82fb4103fcd7da43135aab7821d9d42ac9f0bf217c2dce0607e0283d29d10429edf7a4150b3fd473b2260a1be883ff8dadeca729cb7d73184ad1e
-DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
-DIST structopt-0.3.8.crate 50127 BLAKE2B b6121e30ca074300328f4b779814c02a67c19aa59df508971f26da15b5e52ac05e2d3ff8f5ebb61bf41cf48dcd60ac40130a45ec98306e3f825096a4aab17ca9 SHA512 194758e3eb924adcdd5ac89f74ec114aefd8008e507efe6406584452e0d80f7a5603619c9fbf920e072bbdcf8dcc602b58eb2a7230f28691021d6d7d9b21163d
-DIST structopt-derive-0.4.1.crate 19598 BLAKE2B 5d0fd2e2d1c2501b65fec0b6a8f54969d0665acc2a26625bfb584b026451055adf58bc3afbc72a2aa54195a9f50292f3076dbe715ac42731484998ad396841e0 SHA512 366bee6d9dd40243d3641f428dfcf60d0207b3ce5d2d201ed990d40deece6f618c041104df4d7bb80cb5155bfb0f6022c357801bf32bc2f6848fc09269a1a6a2
-DIST syn-1.0.14.crate 195286 BLAKE2B 8311cdc0eb8ff69d65c250eb95706cd1e74a6ba899fac02ffc0a288e978c40a03fe5a7c18e3116a767eb6e5e08299d27f5ae04021b224d71d7b492a6b87d67a8 SHA512 7b2b7562ac89d719060b35bf89f21330c02a3c1f34270e864053feba9b0f7a16b5cfd11c57d57eab7c60df8663d8ae76709ca1c48ebab960db168d2836f57340
-DIST syn-mid-0.4.0.crate 13226 BLAKE2B d300be7f32c6f7db6fcc4967264de79272a69e370fc4286483128fc3473d635d4d690031f8b682f29abca0ce154aca3fa981a1950419423085d4a33dece9e962 SHA512 65351a6493c2906251eccc27ce9e262caf0dac16fce95454898190958961015f65c6f08443c46aae76d378d61d72d17c267dfc013ca5306cb229d751a2b0bcce
-DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
-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 winapi-0.3.8.crate 1128308 BLAKE2B e0e8ef6121f222b0500525192ebb69b26b71cc16f9ba92186f8ad6acc9de4cb8cc7c738f9c31f5bd223d2e34c93c496e8448c973d69797776004670c70abf69c SHA512 5a899ee5f09f30d742b8b8eba78da05cd9f4c664408fdeb9370373f8756a962a23e3f1c07619e745b3270138606c9a369076c02c3f5353f657df09d203d9a736
-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 cargo-tree-0.29.0-r1.ebuild 1226 BLAKE2B 92088ae4b32cc7e56b0e72421ad5bee004569de43446364653cba906ec8e253df8a417fa5085dd98cd186256b9f39acc8978635b7321027e5e2f0fd8f36faa4c SHA512 97a6b83ee1cb0b8d7e9e1093c0885f4ab5d0e2344938bc6d7ea0bd47d2367ab5f596800f00d2394d7dd5fc94c2d866c10dbd2eb5f0ecd7256e588fc770460da0
-MISC metadata.xml 335 BLAKE2B 458848de5f95f88465b613bc3d2b692c4a8638ae42dda2b98ab6801ec695f92db223d1c115b6021f07822c62bcf98987ffe976f48bb8c3d9c74f35673d810962 SHA512 d7fee3ca27c5b91888e5dcf5d02e453cfa3dd7d8ca72fc2060d052e74990c2311a71bcf60b7ee3ee02cf21229611769e388925d7ef5acf8597dededd6b35f918
diff --git a/dev-util/cargo-tree/cargo-tree-0.29.0-r1.ebuild b/dev-util/cargo-tree/cargo-tree-0.29.0-r1.ebuild
deleted file mode 100644
index 306f92a38838..000000000000
--- a/dev-util/cargo-tree/cargo-tree-0.29.0-r1.ebuild
+++ /dev/null
@@ -1,68 +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
-anyhow-1.0.26
-atty-0.2.14
-bitflags-1.2.1
-cargo-tree-0.29.0
-cargo_metadata-0.9.1
-clap-2.33.0
-fixedbitset-0.1.9
-heck-0.3.1
-hermit-abi-0.1.6
-itoa-0.4.5
-lazy_static-1.4.0
-libc-0.2.66
-ordermap-0.3.5
-petgraph-0.4.13
-proc-macro-error-0.4.5
-proc-macro-error-attr-0.4.5
-proc-macro2-1.0.8
-quote-1.0.2
-rustversion-1.0.2
-ryu-1.0.2
-semver-0.9.0
-semver-parser-0.7.0
-serde-1.0.104
-serde_derive-1.0.104
-serde_json-1.0.45
-strsim-0.8.0
-structopt-0.3.8
-structopt-derive-0.4.1
-syn-1.0.14
-syn-mid-0.4.0
-textwrap-0.11.0
-unicode-segmentation-1.6.0
-unicode-width-0.1.7
-unicode-xid-0.2.0
-vec_map-0.8.1
-winapi-0.3.8
-winapi-i686-pc-windows-gnu-0.4.0
-winapi-x86_64-pc-windows-gnu-0.4.0
-"
-
-inherit cargo
-
-DESCRIPTION="Cargo subcommand that visualizes crate dependency graph in a tree-like format"
-HOMEPAGE="https://github.com/sfackler/cargo-tree"
-SRC_URI="$(cargo_crate_uris ${CRATES})"
-
-LICENSE="Apache-2.0 Boost-1.0 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
-IUSE=""
-
-BDEPEND=""
-RDEPEND="<virtual/rust-1.44.0"
-DEPEND=""
-
-QA_FLAGS_IGNORED="usr/bin/cargo-tree"
-
-src_install() {
-	cargo_src_install
-	einstalldocs
-}
diff --git a/dev-util/cargo-tree/metadata.xml b/dev-util/cargo-tree/metadata.xml
deleted file mode 100644
index 841547e2c570..000000000000
--- a/dev-util/cargo-tree/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>gyakovlev@gentoo.org</email>
-		<name>Georgy Yakovlev</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">sfackler/cargo-tree</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/catkin/Manifest b/dev-util/catkin/Manifest
index 3c90b01aba85..a04b449af3d2 100644
--- a/dev-util/catkin/Manifest
+++ b/dev-util/catkin/Manifest
@@ -1,22 +1,16 @@
 AUX 40catkin 89 BLAKE2B d8a24606f095c6afdbc9141a47fa250bd931b53f9e32ce885a7e1dee33013968e8e401404c187d8afb6660bbb3528888c43b46e473f5dd96b53cf9af04d24d42 SHA512 bc0fc727177f071c48b2177adceaa0f5578a55bb05a65035871d83c7b217d86ef7f6c8585264971d0c8957652a8a60dbdb674600087800433823190e577744db
 AUX catkin_prefix_path.patch 3297 BLAKE2B 60027c9564b6013f885bdd1f695e7279459cbf499536f381806116ef3d9d66a8507faa39008ee95d1d5662ec667dbe8ca3c1b284f0dd0fe561217a4876bfe960 SHA512 22c6e2440e1d7e48c46c0ad7f2006d621942b9c75d1d126ef1e110b36da321b79152aae8bf4d82c18250ce6da3337c697733ba130c1b2f116282ccb954d8d13f
-AUX catkin_prefix_path_util_py.patch 2134 BLAKE2B 2c358c1e7e9b2cdb2b889b70ca5644f3823b7d1ef0af597d7f7f0a6de9ef7697d41ce74964f5e0d95deb9d2bc9e1afaf4665fb48cb76258c552483cbdc68374a SHA512 68b375ed46f7d25ece3e723fb6d41ba3f89bd27ef44f11d74427f63d615e043ab02de4ac806d77059db8a0d12671f0602df16a2b318b9d6e36671cd1491ce2b0
-AUX catkin_prefix_path_util_py_v2.patch 2146 BLAKE2B 3d5fa2ec75d71938f3290617f60eb45e46ee6e24da722d05977dd5c58eb078ca1d5fd7b943bd46bbe765e63a7114d5df9fe36ac286f161c99731736a51635279 SHA512 b55d1a67433afec78238795c5d807607c59b97514beffa5e2cf30c9340ec0d62045bdff9af875fc4c2ae7b4d90859010b08b737120e9434d9c7589569f8696d9
+AUX catkin_prefix_path_util_py_v2.patch 2153 BLAKE2B 0ae7e9bf9c43652a148102d43eccf7026bb4ad2b00f61530d946d3831da783ab39cb67b844ce093cad97b8dbfdc2c74aaddb8df6771742726a8ef860099933b0 SHA512 4a801c57da530fde06dfed3482931a52c1dfeccf90951b40cde827dfb63e32d811f0963352cdcefe89eb84e6b15729cb2baa03a59ca7c11a44541e8c9c8880c8
 AUX distutils-v2.patch 795 BLAKE2B 830270d966c3006967424b94cd99d6a43803a85e8e68de4d609d60c68cbb610451b42a11d6906d944fb1f47ff669216f9f02e31f227b1379a6efb7b2e5e2f38d SHA512 c315382e77cbf3461e2a57ed6e3f270fe333396ebaff018a4177eb83ea9fd1565368ed51228686ba0ff6c2df6bed4eadece653664ff6bb7e32882eba6d3c3f7f
-AUX distutils.patch 798 BLAKE2B aeb6d364c8fa565e662686f723fe782bb6d3b2a17c0a1b243090515290258586e0df79699a32ec0eeb5834628dc885566c296055c4062826c03014a809b8cb01 SHA512 de281d0039515c4621d161c778520c4306897426c5692f46b4440326b6246502e64f90f121eaff8741775bafcb4213b2817468354db8c5b3c1250a2fce42d36d
 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 sitedir.patch 884 BLAKE2B ba051cbd046971d3b6327755b0de83c03b3a441a3e47e7d791e653bcd0b7ed3373752367a4ecfb8570a6b5d7c6fb3ae006f0c516909646d7ba7142f20b352217 SHA512 c619b6bcfa007f90464146767ea5b1aed4dad79d16bcc7daa573df14dcaa6eeb2ff96eb9d838d3bbfd0480b87d5538ffaf31dc059e25224d425f3786523b475d
 AUX tests.patch 1640 BLAKE2B cc0d89a779ad056806b1c721709c1318278cb836e539042071e83acaa0aaffed9c316ed482a821219c9c074c71ea15bad343a7f63b887b9b266982fe4afe7f71 SHA512 a53ff72bf5302107241d43a0daa8ff18c50b6e69c0e1ecf2a841ace8d37fe7f3e8cb4202b666ad3bdda1bcb7d79f39244308542e1992b9af94d97bcec7086913
-DIST catkin-0.7.14.tar.gz 203422 BLAKE2B 22f27066054db9d35aaee216603c778a70a1941ab067ba6bfb42d25c6c90dc3fe3efb19167328dcbb008d21b9f7987cce4d3af44fe8368a1fda369432b383401 SHA512 4d17d2fd9c69d04d90a2aff4d48ac6cbdec052856af18cd4b3fb72cb7b3159651b606cd36ef653b9097ee7c23e036709afc019a95bb0ab34c29f51aad4d17d21
-DIST catkin-0.7.17.tar.gz 212023 BLAKE2B 901bc5a3e226eaab59917b4d548fe3aacfad602a75e46cbd720f252ffd490c4ff2b170cd158a0c09c047b837d6f097555ba55291dfeedb51951d98f2f0273c34 SHA512 0c6adfda27924a5c9c5360e5e84e082e5cc9a7638a1129fe86f604515d3731f4257f725f80e8e8781200a8a367472224aea537871e56e1859e9f66950a746d45
-DIST catkin-0.7.20.tar.gz 215244 BLAKE2B 06755e87f43d1e97138a6696af05dfd9b9434adcca9d4269c7b93b363b25ac9e8b198a980d7607b6b317f546b7637103dc251213087201ff56c1f12c86892edb SHA512 7258f0d548a92d846c9ad195d5e28a567d3c1b4cd1caabffd58c3fabee66cec8ce3612d3095e6437ac201b4d37fddf8f850775e809ebb7eaaeb99328afaedfc6
 DIST catkin-0.8.3.tar.gz 215988 BLAKE2B 92d7bced93e2d33dafcfd902724f993aa15756139265b5594c15041c333568591193b86e1a4bee8c278f2739dd063f73b6ce675b8ab4fefd312b5daeea414c7a SHA512 14fd03627f3fb339a850ca73e7a49dfeb7312a85416473dff60995ea1d0f1050982929c297751502589a7320dd7eec5d922c86061166f9d475fc1108540db4ae
-EBUILD catkin-0.7.14.ebuild 3123 BLAKE2B 55670c978713ca720322e1fc8b2f83b4177f9ec4b92ff3d8ce160211c1dd8bccdb393ac720aa0d18ddb51bb31bc2a7bacdd51b2b447bbfe15c5f593e11147235 SHA512 bd0d8dc4b32f5e563efdae702305b4bced7c6581d2bce59861e90e6326247b95a60e2a1840f68a5126ba79e6e7e26b3cc2848b88ed587c0d843597716b5000e0
-EBUILD catkin-0.7.17.ebuild 3126 BLAKE2B 572239dad696efab0d44e214c85d6a223e095f2f9fbd61a7fbf467cdda3a8f3b64ee9d971a5f36165f604efd1a1f6801649a7399ff2009aa2d04fa59e8b9b467 SHA512 47cb440805dfb949f2ea55edb77a12e8986ddd4c7898d9abfd2fe306d0f522f59d2a3a5be658eb58c1e406feea1e83bae427e60ceee73e9c445fa7be1237fe5f
-EBUILD catkin-0.7.20.ebuild 3133 BLAKE2B 6f37db38a28e5b9256e52b0f5ea7b7a5ac60286a800c5cddf624519c1ee4a0524a47ff8f245604d1f51aea2d3b9384240fde336af8c06e2baf5577e7d8362143 SHA512 0a6099a1ca8517167c3e4a05a4140e14f85788de885fcf8c7cccaf501e5b5cd9fd0042341dc8831384c1f2abdfd0b9f64c197b26aabb41ab1fbd598bd3273974
-EBUILD catkin-0.8.3-r1.ebuild 3206 BLAKE2B ff3891f92e7eeb384ad4535c7b4626e2e2bf516aa5f745f93afef93dd3afbf14f87cd9d6fc56f01e3dffb8ad617fc337424456723e317890c67266cc196dcc38 SHA512 6a8fea7c9b318e10933a827af1db94f8fbd3e0df55acb693747441a14fca2c0b0f5cd0ad9a8c131da6a100f077eb3e9825aa7e04bd0c9e7b4ca10efb0650fea3
-EBUILD catkin-9999.ebuild 3206 BLAKE2B ff3891f92e7eeb384ad4535c7b4626e2e2bf516aa5f745f93afef93dd3afbf14f87cd9d6fc56f01e3dffb8ad617fc337424456723e317890c67266cc196dcc38 SHA512 6a8fea7c9b318e10933a827af1db94f8fbd3e0df55acb693747441a14fca2c0b0f5cd0ad9a8c131da6a100f077eb3e9825aa7e04bd0c9e7b4ca10efb0650fea3
+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
 MISC metadata.xml 324 BLAKE2B 393e10af3d1bef82391a91bbf6382d9d1cafcdfe8a681b3a24844427cee1e3aa36f27ffd0a37a65b8a476ce0b3f2a860f546adc32c480164c69f66673bb0b5f4 SHA512 598dc8dd4427079a7eeca415c192ec39e99e53bc41c06796d2355b8858363b71ee8f038646c61ddd82d27451eb48c6f93b47489cdb04ae7c8663a6b46c4f9b94
diff --git a/dev-util/catkin/catkin-0.7.14.ebuild b/dev-util/catkin/catkin-0.7.14.ebuild
deleted file mode 100644
index 4a444f773cf6..000000000000
--- a/dev-util/catkin/catkin-0.7.14.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/ros/catkin"
-fi
-
-PYTHON_COMPAT=( python3_6 pypy3 )
-
-inherit ${SCM} cmake-utils python-r1
-
-DESCRIPTION="Cmake macros and associated python code used to build some parts of ROS"
-HOMEPAGE="http://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}] )"
-
-PATCHES=(
-	"${FILESDIR}/tests.patch"
-	"${FILESDIR}/distutils.patch"
-	"${FILESDIR}/catkin_prefix_path.patch"
-	"${FILESDIR}/gnuinstalldirs.patch"
-	"${FILESDIR}/catkin_prefix_path_util_py.patch"
-	"${FILESDIR}/package_xml.patch"
-	"${FILESDIR}/etc.patch"
-	"${FILESDIR}/sitedir.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=(
-		"$(cmake-utils_use test CATKIN_ENABLE_TESTING)"
-		"-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"
-}
-
-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.7.20.ebuild b/dev-util/catkin/catkin-0.7.20.ebuild
deleted file mode 100644
index c4909886d81d..000000000000
--- a/dev-util/catkin/catkin-0.7.20.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/ros/catkin"
-fi
-
-PYTHON_COMPAT=( python3_6 pypy3 )
-
-inherit ${SCM} cmake-utils python-r1
-
-DESCRIPTION="Cmake macros and associated python code used to build some parts of ROS"
-HOMEPAGE="http://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}] )"
-
-PATCHES=(
-	"${FILESDIR}/tests.patch"
-	"${FILESDIR}/distutils.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}/sitedir.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=(
-		"$(cmake-utils_use test CATKIN_ENABLE_TESTING)"
-		"-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##*/}" || die
-		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"
-}
-
-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.3-r1.ebuild b/dev-util/catkin/catkin-0.8.3-r1.ebuild
index adf1b136a8c7..c11d65241502 100644
--- a/dev-util/catkin/catkin-0.8.3-r1.ebuild
+++ b/dev-util/catkin/catkin-0.8.3-r1.ebuild
@@ -14,7 +14,7 @@ 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="http://wiki.ros.org/catkin"
+HOMEPAGE="https://wiki.ros.org/catkin"
 if [ "${PV#9999}" != "${PV}" ] ; then
 	SRC_URI=""
 	KEYWORDS=""
diff --git a/dev-util/catkin/catkin-0.7.17.ebuild b/dev-util/catkin/catkin-0.8.8-r1.ebuild
index bd0fec4e9fa1..46bed14e7929 100644
--- a/dev-util/catkin/catkin-0.7.17.ebuild
+++ b/dev-util/catkin/catkin-0.8.8-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
@@ -9,12 +9,12 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 	EGIT_REPO_URI="https://github.com/ros/catkin"
 fi
 
-PYTHON_COMPAT=( python3_6 pypy3 )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 
-inherit ${SCM} cmake-utils python-r1
+inherit ${SCM} cmake python-r1 python-utils-r1
 
 DESCRIPTION="Cmake macros and associated python code used to build some parts of ROS"
-HOMEPAGE="http://wiki.ros.org/catkin"
+HOMEPAGE="https://wiki.ros.org/catkin"
 if [ "${PV#9999}" != "${PV}" ] ; then
 	SRC_URI=""
 	KEYWORDS=""
@@ -37,16 +37,17 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	test? ( dev-python/nose[${PYTHON_USEDEP}] dev-python/mock[${PYTHON_USEDEP}] )"
+BDEPEND=""
 
 PATCHES=(
 	"${FILESDIR}/tests.patch"
-	"${FILESDIR}/distutils.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}/sitedir.patch"
+	"${FILESDIR}/gtest.patch"
 )
 
 src_prepare() {
@@ -58,7 +59,7 @@ src_prepare() {
 		-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
+	cmake_src_prepare
 }
 
 catkin_src_configure_internal() {
@@ -68,30 +69,30 @@ catkin_src_configure_internal() {
 		-DPYTHON_INSTALL_DIR="${sitedir#${EPREFIX}/usr/}"
 	)
 	python_export PYTHON_SCRIPTDIR
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_configure() {
 	export PYTHONPATH="${S}/python"
 	local mycmakeargs=(
-		"$(cmake-utils_use test CATKIN_ENABLE_TESTING)"
+		"-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
+	python_foreach_impl cmake_src_compile
 }
 
 src_test() {
 	unset PYTHON_SCRIPTDIR
-	python_foreach_impl cmake-utils_src_test
+	python_foreach_impl cmake_src_test
 }
 
 catkin_src_install_internal() {
 	python_export PYTHON_SCRIPTDIR
-	cmake-utils_src_install
+	cmake_src_install
 	if [ ! -f "${T}/.catkin_python_symlinks_generated" ]; then
 		dodir /usr/bin
 		for i in "${D}/${PYTHON_SCRIPTDIR}"/* ; do
@@ -108,6 +109,8 @@ src_install() {
 
 	# needed to be considered as a workspace
 	touch "${ED}/usr/.catkin"
+
+	python_foreach_impl python_optimize
 }
 
 pkg_postinst() {
diff --git a/dev-util/catkin/catkin-9999.ebuild b/dev-util/catkin/catkin-9999.ebuild
index adf1b136a8c7..46bed14e7929 100644
--- a/dev-util/catkin/catkin-9999.ebuild
+++ b/dev-util/catkin/catkin-9999.ebuild
@@ -11,10 +11,10 @@ fi
 
 PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 
-inherit ${SCM} cmake-utils python-r1 python-utils-r1
+inherit ${SCM} cmake python-r1 python-utils-r1
 
 DESCRIPTION="Cmake macros and associated python code used to build some parts of ROS"
-HOMEPAGE="http://wiki.ros.org/catkin"
+HOMEPAGE="https://wiki.ros.org/catkin"
 if [ "${PV#9999}" != "${PV}" ] ; then
 	SRC_URI=""
 	KEYWORDS=""
@@ -37,9 +37,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	test? ( dev-python/nose[${PYTHON_USEDEP}] dev-python/mock[${PYTHON_USEDEP}] )"
-BDEPEND="
-	dev-util/cmake
-"
+BDEPEND=""
 
 PATCHES=(
 	"${FILESDIR}/tests.patch"
@@ -49,7 +47,7 @@ PATCHES=(
 	"${FILESDIR}/catkin_prefix_path_util_py_v2.patch"
 	"${FILESDIR}/package_xml.patch"
 	"${FILESDIR}/etc.patch"
-	"${FILESDIR}/egginfo.patch"
+	"${FILESDIR}/gtest.patch"
 )
 
 src_prepare() {
@@ -61,7 +59,7 @@ src_prepare() {
 		-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
+	cmake_src_prepare
 }
 
 catkin_src_configure_internal() {
@@ -71,7 +69,7 @@ catkin_src_configure_internal() {
 		-DPYTHON_INSTALL_DIR="${sitedir#${EPREFIX}/usr/}"
 	)
 	python_export PYTHON_SCRIPTDIR
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_configure() {
@@ -84,17 +82,17 @@ src_configure() {
 }
 
 src_compile() {
-	python_foreach_impl cmake-utils_src_compile
+	python_foreach_impl cmake_src_compile
 }
 
 src_test() {
 	unset PYTHON_SCRIPTDIR
-	python_foreach_impl cmake-utils_src_test
+	python_foreach_impl cmake_src_test
 }
 
 catkin_src_install_internal() {
 	python_export PYTHON_SCRIPTDIR
-	cmake-utils_src_install
+	cmake_src_install
 	if [ ! -f "${T}/.catkin_python_symlinks_generated" ]; then
 		dodir /usr/bin
 		for i in "${D}/${PYTHON_SCRIPTDIR}"/* ; do
diff --git a/dev-util/catkin/files/catkin_prefix_path_util_py.patch b/dev-util/catkin/files/catkin_prefix_path_util_py.patch
deleted file mode 100644
index e667ea9cf59e..000000000000
--- a/dev-util/catkin/files/catkin_prefix_path_util_py.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Author:  Eric Timmons 
-https://bugs.gentoo.org/show_bug.cgi?id=586104
-
-Index: catkin-0.6.16/cmake/templates/_setup_util.py.in
-===================================================================
---- catkin-0.6.16.orig/cmake/templates/_setup_util.py.in
-+++ catkin-0.6.16/cmake/templates/_setup_util.py.in
-@@ -262,7 +262,7 @@
-             sys.exit(1)
- 
-         # environment at generation time
--        CMAKE_PREFIX_PATH = '@CMAKE_PREFIX_PATH_AS_IS@'.split(';')
-+        CMAKE_PREFIX_PATH = '@CATKIN_PREFIX_PATH@;@CMAKE_PREFIX_PATH_AS_IS@'.split(';')
-         # prepend current workspace if not already part of CPP
-         base_path = os.path.dirname(__file__)
-         if base_path not in CMAKE_PREFIX_PATH:
-Index: catkin-0.7.1/python/catkin/builder.py
-===================================================================
---- catkin-0.7.1.orig/python/catkin/builder.py
-+++ catkin-0.7.1/python/catkin/builder.py
-@@ -1026,6 +1026,7 @@ def build_workspace_isolated(
-                     'CATKIN_LIB_ENVIRONMENT_PATHS': "'lib'",
-                     'CATKIN_PKGCONFIG_ENVIRONMENT_PATHS': "os.path.join('lib', 'pkgconfig')",
-                     'CMAKE_PREFIX_PATH_AS_IS': ';'.join(os.environ['CMAKE_PREFIX_PATH'].split(os.pathsep)),
-+                    'CATKIN_PREFIX_PATH': ';'.join(os.environ['CATKIN_PREFIX_PATH'].split(os.pathsep)),
-                     'PYTHON_EXECUTABLE': sys.executable,
-                     'PYTHON_INSTALL_DIR': get_python_install_dir(),
-                 }
-Index: catkin-0.7.1/test/unit_tests/test_setup_util.py
-===================================================================
---- catkin-0.7.1.orig/test/unit_tests/test_setup_util.py
-+++ catkin-0.7.1/test/unit_tests/test_setup_util.py
-@@ -14,6 +14,7 @@ data = configure_file(os.path.join(os.pa
-                           'PYTHON_EXECUTABLE': sys.executable,
-                           'PYTHON_INSTALL_DIR': 'pythonX.Y/packages',
-                           'CMAKE_PREFIX_PATH_AS_IS': '',
-+                          'CATKIN_PREFIX_PATH':'',
-                       })
- with tempfile.NamedTemporaryFile('w+') as setup_util_file:
-     setup_util_file.write(data)
diff --git a/dev-util/catkin/files/catkin_prefix_path_util_py_v2.patch b/dev-util/catkin/files/catkin_prefix_path_util_py_v2.patch
index ae468b21c01c..6ad761f8421a 100644
--- a/dev-util/catkin/files/catkin_prefix_path_util_py_v2.patch
+++ b/dev-util/catkin/files/catkin_prefix_path_util_py_v2.patch
@@ -22,7 +22,7 @@ Index: catkin-0.7.17/python/catkin/builder.py
                      'CATKIN_LIB_ENVIRONMENT_PATHS': "'lib'",
                      'CATKIN_PKGCONFIG_ENVIRONMENT_PATHS': "os.path.join('lib', 'pkgconfig')",
                      'CMAKE_PREFIX_PATH_AS_IS': ';'.join(os.environ['CMAKE_PREFIX_PATH'].split(os.pathsep)),
-+                    'CATKIN_PREFIX_PATH': ';'.join(os.environ['CATKIN_PREFIX_PATH'].split(os.pathsep)),
++                    'CATKIN_PREFIX_PATH': ';'.join(os.environ.get('CATKIN_PREFIX_PATH','').split(os.pathsep)),
                      'PYTHON_EXECUTABLE': sys.executable,
                      'PYTHON_INSTALL_DIR': get_python_install_dir(),
                  }
diff --git a/dev-util/catkin/files/distutils.patch b/dev-util/catkin/files/distutils.patch
deleted file mode 100644
index 292551181b6d..000000000000
--- a/dev-util/catkin/files/distutils.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Allow to install scripts in PYTHON_SCRIPTDIR.
-Needed for Gentoo multi-python support.
-
-Index: catkin-0.6.11/cmake/templates/python_distutils_install.sh.in
-===================================================================
---- catkin-0.6.11.orig/cmake/templates/python_distutils_install.sh.in
-+++ catkin-0.6.11/cmake/templates/python_distutils_install.sh.in
-@@ -25,4 +25,4 @@ cd "@INSTALL_CMD_WORKING_DIRECTORY@"
-     build --build-base "@CMAKE_CURRENT_BINARY_DIR@" \
-     install \
-     $DESTDIR_ARG \
--    @SETUPTOOLS_ARG_EXTRA@ --prefix="@CMAKE_INSTALL_PREFIX@" --install-scripts="@CMAKE_INSTALL_PREFIX@/@CATKIN_GLOBAL_BIN_DESTINATION@"
-+    @SETUPTOOLS_ARG_EXTRA@ --prefix="@CMAKE_INSTALL_PREFIX@" --install-scripts="${PYTHON_SCRIPTDIR:-@CMAKE_INSTALL_PREFIX@/@CATKIN_GLOBAL_BIN_DESTINATION@}"
diff --git a/dev-util/catkin/files/gtest.patch b/dev-util/catkin/files/gtest.patch
new file mode 100644
index 000000000000..106b7e2886e8
--- /dev/null
+++ b/dev-util/catkin/files/gtest.patch
@@ -0,0 +1,45 @@
+From d9302318dece61acd0caa27d56f3817838f8f333 Mon Sep 17 00:00:00 2001
+From: seanyen <seanyen@microsoft.com>
+Date: Thu, 6 Aug 2020 18:59:07 -0700
+Subject: [PATCH] Adding the new GTest search logic for Vcpkg.
+
+---
+ cmake/test/gtest.cmake | 25 +++++++++++++++++++++++++
+ 1 file changed, 25 insertions(+)
+
+Index: catkin-0.8.8/cmake/test/gtest.cmake
+===================================================================
+--- catkin-0.8.8.orig/cmake/test/gtest.cmake
++++ catkin-0.8.8/cmake/test/gtest.cmake
+@@ -337,6 +337,31 @@ if(TARGET gtest AND TARGET gtest_main AN
+     set(GTEST_BOTH_LIBRARIES ${GTEST_LIBRARIES} ${GTEST_MAIN_LIBRARIES})
+   endif()
+ else()
++  # attempt to find the modern GTest config.
++  find_package(GTest 1.8.1 QUIET CONFIG)
++  if(GTest_FOUND AND TARGET GTest::gtest AND TARGET GTest::gtest_main)
++    set(GTEST_FOUND TRUE)
++    add_library(gtest ALIAS GTest::gtest)
++    add_library(gtest_main ALIAS GTest::gtest_main)
++    set(GTEST_INCLUDE_DIRS)
++    set(GTEST_LIBRARY_DIRS)
++    set(GTEST_LIBRARIES gtest)
++    set(GTEST_MAIN_LIBRARIES gtest_main)
++    set(GTEST_BOTH_LIBRARIES ${GTEST_LIBRARIES} ${GTEST_MAIN_LIBRARIES})
++  endif()
++  if(GTest_FOUND AND TARGET GTest::gmock AND TARGET GTest::gmock_main)
++    set(GMOCK_FOUND TRUE)
++    add_library(gmock ALIAS GTest::gmock)
++    add_library(gmock_main ALIAS GTest::gmock_main)
++    set(GMOCK_INCLUDE_DIRS)
++    set(GMOCK_LIBRARY_DIRS)
++    set(GMOCK_LIBRARIES gmock)
++    set(GMOCK_MAIN_LIBRARIES gmock_main)
++    set(GMOCK_BOTH_LIBRARIES ${GMOCK_LIBRARIES} ${GMOCK_MAIN_LIBRARIES})
++  endif()
++endif()
++
++if(NOT GTEST_FOUND)
+   find_package(GTest QUIET)
+ endif()
+ if(NOT GMOCK_FOUND OR NOT GTEST_FOUND)
diff --git a/dev-util/catkin/files/sitedir.patch b/dev-util/catkin/files/sitedir.patch
deleted file mode 100644
index 61fcad29d04a..000000000000
--- a/dev-util/catkin/files/sitedir.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Pass --install-lib to setup.py install.
-pypy installs in /usr/site-packages otherwise...
-
-Index: catkin-0.7.6/cmake/templates/python_distutils_install.sh.in
-===================================================================
---- catkin-0.7.6.orig/cmake/templates/python_distutils_install.sh.in
-+++ catkin-0.7.6/cmake/templates/python_distutils_install.sh.in
-@@ -30,4 +30,6 @@ echo_and_run /usr/bin/env \
-     build --build-base "@CMAKE_CURRENT_BINARY_DIR@" \
-     install \
-     $DESTDIR_ARG \
--    @SETUPTOOLS_ARG_EXTRA@ --prefix="@CMAKE_INSTALL_PREFIX@" --install-scripts="${PYTHON_SCRIPTDIR:-@CMAKE_INSTALL_PREFIX@/@CATKIN_GLOBAL_BIN_DESTINATION@}"
-+    @SETUPTOOLS_ARG_EXTRA@ --prefix="@CMAKE_INSTALL_PREFIX@" \
-+    --install-scripts="${PYTHON_SCRIPTDIR:-@CMAKE_INSTALL_PREFIX@/@CATKIN_GLOBAL_BIN_DESTINATION@}" \
-+    --install-lib="@CMAKE_INSTALL_PREFIX@/@PYTHON_INSTALL_DIR@"
diff --git a/dev-util/cbindgen/Manifest b/dev-util/cbindgen/Manifest
index 2f521b809957..79f6d21119bb 100644
--- a/dev-util/cbindgen/Manifest
+++ b/dev-util/cbindgen/Manifest
@@ -2,8 +2,8 @@ DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97
 DIST atty-0.2.13.crate 4764 BLAKE2B 673eea1d377fc3aca792a3a8bd2a5c058f3041abc76a8760dd6acab7f19fa610f812c57d81a4dbf773675cad3df483904c66e66b45d83393402f747c6db60d89 SHA512 4554ca7dedb4c2e8693e5847ef1fe66161ed4cb2c19156bb03f41ce7e7ea21838369dabaf447a60d1468de8bfbb7087438c12934c4569dde63df074f168569ad
 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.2.crate 165699 BLAKE2B c0964a66b3ef57a6eccaef83c7cd8a500605be0cb5bb0f571b5d35a2f924613fec3b4ee77190b74203057488c2402c6a11680ddbf395dca00baa5e69bf18210b SHA512 d3ab0a4c217c9047bc3ada7911d4ae1bdfc09092835f78d232bb56ef0d9a499df43e358532dfb828a04df61a0cacccd7e57214cd15f466791eb1b8edd9f92ed0
 DIST cbindgen-0.14.3.crate 165874 BLAKE2B 0155bccbacc70a2f8173117dde46c3bb48e07d0a0616b53ea56cade436cb6da1aa7106a82bf4ac55954cafbea1790f9200bdd3132032d3306ec755be0bb2f05c SHA512 abce798aff93260c28b0717df5fd25cf24b3eb89c9d05df4832d06169ec30db8e1c17a300f88087c6fbd4414a6aae6788e162dde838aac01c499afcb145c8461
+DIST cbindgen-0.14.4.crate 172123 BLAKE2B e86fe619d824b25884570c7a34bdb6ceb3d4906b2309a3c16b29b46284f7bd855991910000a54605eaf2786ce4f570b647a469a2d02831919d9c0a17feda694f SHA512 1d1dfbb159aad25ecbe77368ced803a0cf219a00238364d95b1866f371912e10932e9a6ccda7acd8541b270b1880bda4a29af095a8d83b79a792e31d1ce2bd78
 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
@@ -37,6 +37,6 @@ DIST wasi-0.7.0.crate 33941 BLAKE2B de1e4e577a1237a233f81ff1a3bd7f888020a42d93a8
 DIST winapi-0.3.8.crate 1128308 BLAKE2B e0e8ef6121f222b0500525192ebb69b26b71cc16f9ba92186f8ad6acc9de4cb8cc7c738f9c31f5bd223d2e34c93c496e8448c973d69797776004670c70abf69c SHA512 5a899ee5f09f30d742b8b8eba78da05cd9f4c664408fdeb9370373f8756a962a23e3f1c07619e745b3270138606c9a369076c02c3f5353f657df09d203d9a736
 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.2.ebuild 965 BLAKE2B 311220957f3598f4396f909942f788ee38e319825cef2fec927a83863f4c3b3b8aa83b78842e57d61e429e722baf4ae03ffa9f40ab65f543e1f31737c97bffe0 SHA512 64e24aa2e6714fd5d44011131f6b775e1daa7a1ca5a23a28f680a7edcfef3b28d99980ff39f072951ca49d1c71452f2066dc5449b199f7fc20612636dbfb42e4
-EBUILD cbindgen-0.14.3.ebuild 968 BLAKE2B 63506fd9c6e73f304b8e0179b7f6057a8673d58f9aba66b15fa6f23369abecb72cceb37d019661f9e2ebd23db2af909e195c5d6bb9392ed6f4d14f3c872a16b6 SHA512 9e07009c498cbc1731d437a54da5a50f278eb915b65381685911dce66de9debe4aa2f04676cb9fa4ef7ae35ac08d0724fac2cd3cdd1d82b325be5a02efe51d31
+EBUILD cbindgen-0.14.3.ebuild 970 BLAKE2B ebc12682113ef7cd06974b72bb5d45ad3005475e3bac615d061efe7a3b3493a2964633f3a77d2691ce0587835f552b924572fdc7803fdd33e67ae44ac9647ab8 SHA512 aaf99043f26afaac6bb138bc0cf5dd66c6f4eaf2568c17988f77e9ed93a5ff3ee4e36fcdb3ce71897b00b7d94a1f012b53faf86ef342a10fc2b6fc5a7befab15
+EBUILD cbindgen-0.14.4.ebuild 973 BLAKE2B d4b703a2fa4022ee6e8c683c73a6c29ef9b4de3aca7bebbe36f97deb8d7165b79dcce230ad0cdc9a1cddf14c0d933464e33c4d1b3a07378d0434765c4f96254d SHA512 f73de464787bba6289cf8eb24c0a77714b20de3fc3d5d4af36a00f39d5bc9f4a76f1d763811fd63afd9ff3a9b07abdc3a5b0b9f1cef6bca2a1a6584d8aec9023
 MISC metadata.xml 334 BLAKE2B 5d7ffa9456ed3cca80fc3089f9bd508e652c600b8b013d03946b674409e45cd2ff52030e8c6a1dbc8fed2aef4caa9ab697c5a0a1b2fb4f0d8b44cf3c40d92f05 SHA512 a5e105a59463430347e5a44e36b8249faa1e84c73ae4e7fced96be371a7a59539d57accbf51065e9e5cf7e8108f69ab28d23f250182ba755e49a67991f4ff029
diff --git a/dev-util/cbindgen/cbindgen-0.14.3.ebuild b/dev-util/cbindgen/cbindgen-0.14.3.ebuild
index 1a72d3a19dcf..21e250b26fce 100644
--- a/dev-util/cbindgen/cbindgen-0.14.3.ebuild
+++ b/dev-util/cbindgen/cbindgen-0.14.3.ebuild
@@ -51,4 +51,4 @@ HOMEPAGE="https://github.com/eqrion/cbindgen/"
 SRC_URI="$(cargo_crate_uris ${CRATES})"
 LICENSE="MIT MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
diff --git a/dev-util/cbindgen/cbindgen-0.14.2.ebuild b/dev-util/cbindgen/cbindgen-0.14.4.ebuild
index 402a6ff20ba2..0c1282478263 100644
--- a/dev-util/cbindgen/cbindgen-0.14.2.ebuild
+++ b/dev-util/cbindgen/cbindgen-0.14.4.ebuild
@@ -8,7 +8,7 @@ ansi_term-0.11.0
 atty-0.2.13
 bitflags-1.2.1
 c2-chacha-0.2.3
-cbindgen-0.14.2
+cbindgen-0.14.4
 cfg-if-0.1.10
 clap-2.33.0
 getrandom-0.1.13
@@ -51,4 +51,4 @@ HOMEPAGE="https://github.com/eqrion/cbindgen/"
 SRC_URI="$(cargo_crate_uris ${CRATES})"
 LICENSE="MIT MPL-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index e76e739a93ee..0bf7e0c6ad22 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -2,9 +2,7 @@ AUX ccache-3.5-nvcc-test.patch 262 BLAKE2B b33b6372e8e6c597d7ed6c781f0a3ac22c435
 AUX ccache-3.7.10-objdump.patch 392 BLAKE2B 6c15a165aff5b2633b0c3571f8f89a3480d5608b006f9f3c0a80117d5c94039fc3e631d0f54c870df1904ac5c855d11007fb73178be8df7001be4f414d103ede SHA512 94f291d44a64ed9aff04da39467751aaf84262fd987c63e53213cbdedbaf30c36ff0aa0902e73418846153e8cdf5a912b021adf7c122bea9698cb296faa9ebf6
 AUX ccache-config-3 2147 BLAKE2B 6e703e12b6a2f83b838f8b1d1e534de3366b6e2994990b30c381b0df28be9c0ae7c0f1d7325282e97ca54881171846c13945b264bd4a793785ff1a19d0941669 SHA512 05d512b001b6a2fdc947d10d810c89683144080a060c24a37422e9b587594e1ee42fa1d7607461571f196819dae92146d861e8ae116e9226e1ff97ea035b3003
 DIST ccache-3.7.10.tar.xz 353792 BLAKE2B d7c06ee55a79afb4b72cdc20ec3d6413a5417301c63a0c822a4f82e6b9542c7a9cdf9f1bbd60a4698c335fdddfadcb9d674bff02c6dad1c2df9932212fdf6477 SHA512 64b0d42af7fd2dfdda65668b04dbd16807a22324e336e61f6c6a91c00110fb535c7ac9062a9c14c924a7ddaf42247f69a43d83dd0fd187ce3b0737158b5bb8fc
-DIST ccache-3.7.7.tar.xz 351592 BLAKE2B 0b211cb77ceb42b7ee5dfcde98d9f53bf222cf18b8d38a7cf6fc9631c5e1c79ca82e6d0a0dbacfe2d5f61b2acefebe202e06fc3b8035f0f25a5f9954554a18cd SHA512 f93380aeb45e815964abc3b62f1963abafe22e0c6a7b61d039e710c7f935221e02678e21af65add4fd59fd5a141824ab95f4a7afc8dd557de36737c365cab816
-DIST ccache-3.7.9.tar.xz 352948 BLAKE2B 791491c3f9da58f06bb0a58e411d9a7b3e39e460102793ef736820913d43d488ce7daffba572c21f507ea78d8da04edc3aaa47eb1a0fbec8cb35461a60b770e9 SHA512 5d39baeb66265451b0e9cef250f6d9c5f6869cd87e27c108c9a50bef80050122ed4280ff662a81bba8d1d1311f2004bcaf9ada6b783a42eedc67ca01ebc48bb4
-EBUILD ccache-3.7.10.ebuild 1531 BLAKE2B d1583ac3d2283f44e9feacef08092cf7852ebbbccf35ac82df08f48be3046aa0c89bbb7084d0b77b31c135e350c7f5528bab63c9663db5fc1918ff7d71199a18 SHA512 c1f7d9466122f2c77925cf885c7ef08c596589e7cf005416f169bd9b65eb387448d32fafebc7908d4c15bb3fd5a10b24e48fc45db0b48dcfcf1a70d52f5042d8
-EBUILD ccache-3.7.7-r1.ebuild 2204 BLAKE2B 168006b6402a929a5c4367d98fafcfac1f6bb0a4ae11c2aa495cc6c326a7ff21cedc81204451ffa592b1b6f04150aa7923f0eff851ad502496bc101641f7ae0c SHA512 f60bdfe797f15da5ce90a784029dce92971bd15b90e91d1503ff2da78d8ef6d57a9b98ffa75c1f9565f4e5a71bc09e0be58946a0613d3fe2fdbb20d1797c8ccf
-EBUILD ccache-3.7.9.ebuild 1419 BLAKE2B 6f248e8069578a8fd82ff7c425978c3656d45943e77c611d663cb3d63ca3ac526cba14d410dc3a3a5f46a140733d8fefc0b7580504b9008fc97c963c47669ce9 SHA512 c218ae20057eebf4242b51c5b3fa4dd6e3e9bc43428d4ecdff197773c80a6967c81e3df246c298c89cb028dff9caeba6c190e897bc60cc772445d43519444c0e
+DIST ccache-3.7.11.tar.xz 354160 BLAKE2B 46fc5d65d6224bb796db7632b35ccca1089e5fed36eeb2ba231cf4c1aaa94be10bf0504f6ef565ce11673e527e09dee64583a764062ca7fea38364d790dd8cc1 SHA512 47b71b3ab4b89bf9b6f6d15941c22d2207b369922f51f9a8fbf4e86554325053dccce669e1c1ed3c0019a7e0a3d610f399e52d3fee68b56111aa7c1b24132c11
+EBUILD ccache-3.7.10.ebuild 1522 BLAKE2B 6c21b6c5782c39eafb043fd6fbde0dec69ffa7e58db5c3efcf51e066a3ab28ab02f16edef5b74db3997e6bf7a43c6790ce81c581fc76ebacb903ea1b9d0c5534 SHA512 1e8a2bbdd0fdbae5923329ef42b2af631c586b883ef9dc610a856744d18d762dda8eb693b8e2d043138bb1b1ad63b3fe7b7250a601f8e82ee1ddeb01b31f5c1c
+EBUILD ccache-3.7.11.ebuild 1536 BLAKE2B e18af4839b030ab57f3b4c6ea1c1e6a44c37a5bb7dc90f4e04403279ab063cc124e3304f4aa68c70ff32907486cfd4f51265b680a2e454a04330e51e074e5149 SHA512 887a05e698fdd15c0211ca65a53c82aeee914f0c432729243238ea704741f417243d5c425e13e4c51254936760c2bdedf878cef7de6a777dccd1c324af3304d0
 MISC metadata.xml 445 BLAKE2B 8ef8f120989420428ea85108180c659c72a7553f3f20ab96597d26aa04b059f491aeae8c887697a214c437f2dba30fbb934cb47c1db93821eda7dd489e6cb693 SHA512 41ffcad23c9f0274c48a058090d6404cd782dea6674b81615a6b3b7fa272ff5df4c68404fb4dcdb9d2275c13fb137f21f0f65232d5fb1ef6152cc25213893249
diff --git a/dev-util/ccache/ccache-3.7.10.ebuild b/dev-util/ccache/ccache-3.7.10.ebuild
index 900d8f39d692..ef3ee0cf4101 100644
--- a/dev-util/ccache/ccache-3.7.10.ebuild
+++ b/dev-util/ccache/ccache-3.7.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/ccache-${PV}.
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 IUSE="test"
 
 DEPEND="app-arch/xz-utils
diff --git a/dev-util/ccache/ccache-3.7.9.ebuild b/dev-util/ccache/ccache-3.7.11.ebuild
index 6a749a059596..ba117d9a324a 100644
--- a/dev-util/ccache/ccache-3.7.9.ebuild
+++ b/dev-util/ccache/ccache-3.7.11.ebuild
@@ -3,13 +3,15 @@
 
 EAPI=7
 
+inherit 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"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
 IUSE="test"
 
 DEPEND="app-arch/xz-utils
@@ -26,6 +28,7 @@ RESTRICT="!test? ( test )"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.5-nvcc-test.patch
+	"${FILESDIR}"/${PN}-3.7.10-objdump.patch
 )
 
 src_prepare() {
@@ -34,6 +37,9 @@ src_prepare() {
 	sed \
 		-e "/^EPREFIX=/s:'':'${EPREFIX}':" \
 		"${FILESDIR}"/ccache-config-3 > ccache-config || die
+
+	# mainly used in tests
+	tc-export OBJDUMP
 }
 
 src_configure() {
diff --git a/dev-util/ccache/ccache-3.7.7-r1.ebuild b/dev-util/ccache/ccache-3.7.7-r1.ebuild
deleted file mode 100644
index 915fe80c14aa..000000000000
--- a/dev-util/ccache/ccache-3.7.7-r1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit readme.gentoo-r1
-
-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"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
-IUSE="test"
-
-DEPEND="app-arch/xz-utils
-	sys-libs/zlib"
-RDEPEND="${DEPEND}
-	dev-util/shadowman
-	sys-apps/gentoo-functions"
-# clang-specific tests use it to compare objects for equality.
-# Let's pull in the dependency unconditionally.
-DEPEND+="
-	test? ( dev-libs/elfutils )"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.5-nvcc-test.patch
-)
-
-src_prepare() {
-	default
-
-	# make sure we always use system zlib
-	rm -rf src/zlib || die
-	sed \
-		-e "/^EPREFIX=/s:'':'${EPREFIX}':" \
-		"${FILESDIR}"/ccache-config-3 > ccache-config || die
-}
-
-src_compile() {
-	emake V=1
-}
-
-src_test() {
-	emake check V=1
-}
-
-src_install() {
-	DOCS=( doc/{AUTHORS,MANUAL,NEWS}.adoc CONTRIBUTING.md README.md )
-	default
-
-	dobin ccache-config
-	insinto /usr/share/shadowman/tools
-	newins - ccache <<<"${EPREFIX}/usr/lib/ccache/bin"
-
-	DOC_CONTENTS="
-To use ccache with **non-Portage** C compiling, add
-'${EPREFIX}/usr/lib/ccache/bin' to the beginning of your path, before
-'${EPREFIX}/usr/bin'. Portage will automatically take advantage of ccache with
-no additional steps.  If this is your first install of ccache, type
-something like this to set a maximum cache size of 2GB:\\n
-# ccache -M 2G\\n
-If you are upgrading from an older version than 3.x you should clear all of your caches like so:\\n
-# CCACHE_DIR='${CCACHE_DIR:-${PORTAGE_TMPDIR}/ccache}' ccache -C\\n
-ccache now supports sys-devel/clang and dev-lang/icc, too!"
-
-	readme.gentoo_create_doc
-}
-
-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
-
-	# nuke broken symlinks from previous versions that shouldn't exist
-	rm -rf "${EROOT}"/usr/lib/ccache.backup || die
-
-	readme.gentoo_print_elog
-}
diff --git a/dev-util/cdiff/Manifest b/dev-util/cdiff/Manifest
deleted file mode 100644
index fa78841bcb08..000000000000
--- a/dev-util/cdiff/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX cdiff-0.9.2-disable-unimportant-failing-test.patch 383 BLAKE2B 4dfd4cdff8c71ba3cc160317d27a5bf26b2c5ed0d1278403dd7c5ad2a07e0b55759ec8c67c50b5d36aa1a8912f2b4f653fdb0b7ad1b36865367e28a433ebc4d7 SHA512 598cf3d4ccbffb6ac71c3e60c4402001d18172d1f7fb309290c94b0f5d2541c4fc1c6557cb1d5780e993e3fefb84314acb2515ab6e585affb7172327794fb4f9
-DIST cdiff-1.0.tar.gz 33599 BLAKE2B 98e6e8689329bfbdc718e7f6bf3cfb6c6ff92de0b27a44f62f24e35710cf0391c6127833b7f8302aa31d9420147791fdc2861aa95acf5719ce250f7af4d8893f SHA512 74a41bdf9c0ffef5baff775dd32027d401547bdc8f40eb633e11107c74d0e9b31746cedbeffc4a3732ff9abe03a101aa3a7a509d3a0e0e080589c6f18bcb8cfe
-EBUILD cdiff-1.0.ebuild 658 BLAKE2B 529f8e0c22075038485cf14f7008fad6cd3360af8cc606bd1b393f098957410493e6aa926ff1d0862fd7f2325f4f189a657d27eb9d731db64addd945f980980f SHA512 0fe5d0d3c83f62a1a3ac5cbec3a28a893ec20c537472a562ea8139570a465860264ba303563a51a202de217927299c9199c38d84b35b89b2ee4d52fad5898a03
-EBUILD cdiff-1.1.ebuild 394 BLAKE2B 58e4a2ce454e5fad6fa36be9ed5680eb2f33347545625530012d5730b9653358aa3bcc93c1e0f0fdbda5466b92838b16f3b77fa9b41f7dad2eb00cb460bf92b8 SHA512 6dd0abbf9eda12ea96b01b601da3b5aeb43d6446b34d5d7d9d801ad66a5827c9cd169aaa591f3201122db29fc7734f3aa4a5d31a49909ba099f721c07b1b2ff4
-EBUILD cdiff-9999.ebuild 703 BLAKE2B 8dcbd0ecba4b75868373d4ee3bfcb6a6bb64f8f499362e1c3f84dede20b931f932f15a95a463ddbc66f06873c7ac3988d55a48087b63c311ff369805d6969f5f SHA512 4ad7c798e7cdb16f6ecd32ca360e9da57ebf395fda852b5f3ef4d10d03a0777ecc20c571cfeda84117c351c543e2e882ca874f86cd7a01ababcfed4bca8fa1ac
-MISC metadata.xml 287 BLAKE2B c4ed1b40666b9a9477093f34cc040421ab141056f8a504c01362180172cf8d843be7c8513e01b7a8d21a4246d02409f2c9877c1961b78799f0166396b85c4333 SHA512 c64ae3d531e511e02a81762196f51a7c44e417e76c9aacd8ecf55e66854dde9e971af79ad983d8b2b9d4eb90793fd175bc8b348aa546170e99c045431f4744ce
diff --git a/dev-util/cdiff/cdiff-1.1.ebuild b/dev-util/cdiff/cdiff-1.1.ebuild
deleted file mode 100644
index 173ec06646e1..000000000000
--- a/dev-util/cdiff/cdiff-1.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Colored, side-by-side diff terminal viewer"
-HOMEPAGE="https://github.com/ymattw/cdiff"
-SRC_URI=""
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND=""
-RDEPEND="dev-util/ydiff"
-
-S="${WORKDIR}"
-
-src_install() {
-	dosym ydiff /usr/bin/cdiff
-}
diff --git a/dev-util/cdiff/cdiff-9999.ebuild b/dev-util/cdiff/cdiff-9999.ebuild
deleted file mode 100644
index 3b5ae5181b25..000000000000
--- a/dev-util/cdiff/cdiff-9999.ebuild
+++ /dev/null
@@ -1,32 +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 distutils-r1 git-r3
-
-DESCRIPTION="Colored, side-by-side diff terminal viewer"
-HOMEPAGE="https://github.com/ymattw/cdiff"
-EGIT_REPO_URI="https://github.com/ymattw/cdiff.git"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	sys-apps/less"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.9.2-disable-unimportant-failing-test.patch )
-
-DOCS=( CHANGES.rst README.rst )
-
-python_test() {
-	${PYTHON} tests/test_cdiff.py || die "Unit tests failed."
-
-	./tests/regression.sh || die "Regression tests failed."
-}
diff --git a/dev-util/cdiff/files/cdiff-0.9.2-disable-unimportant-failing-test.patch b/dev-util/cdiff/files/cdiff-0.9.2-disable-unimportant-failing-test.patch
deleted file mode 100644
index 50b00cc5a46e..000000000000
--- a/dev-util/cdiff/files/cdiff-0.9.2-disable-unimportant-failing-test.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/tests/test_cdiff.py	2013-03-24 15:08:00.000000000 +0100
-+++ b/tests/test_cdiff.py	2013-06-23 01:17:20.560520188 +0200
-@@ -737,7 +737,7 @@
-         os.chdir(self._non_ws)
-         ret = cdiff.main()
-         os.chdir(self._cwd)
--        self.assertNotEqual(ret, 0)
-+#        self.assertNotEqual(ret, 0)
- 
-     def test_read_log(self):
-         sys.argv = [sys.argv[0], '--log']
diff --git a/dev-util/cdiff/metadata.xml b/dev-util/cdiff/metadata.xml
deleted file mode 100644
index 4ec31f8291a1..000000000000
--- a/dev-util/cdiff/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="pypi">cdiff</remote-id>
-		<remote-id type="github">ymattw/cdiff</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/cgdb/Manifest b/dev-util/cgdb/Manifest
index bf30c2b4ed0d..12dae384c9db 100644
--- a/dev-util/cgdb/Manifest
+++ b/dev-util/cgdb/Manifest
@@ -3,4 +3,4 @@ DIST cgdb-0.7.0.tar.gz 319980 BLAKE2B bfc62f9214f6726e5df081119e85ccdeaea9a2310a
 EBUILD cgdb-0.6.8.ebuild 892 BLAKE2B ef7e3c4ec0ff5128fd4dec999ffcd69e664ef16c568cc1855480db95ba082f59520da9761243cb6fef5945d30e28e7788b05b1bc92774242fca4034a054d2df5 SHA512 7e1b93b4b28beba45f71231a7065e9c8280dd93093477095c2a353cebf98323cc4dcd5ab4a59aeefddc4fde2f34ab9abe0c9d2c2a63473afd8ac71401fd4eb39
 EBUILD cgdb-0.7.0-r1.ebuild 1348 BLAKE2B 370d58da127c77a5f3055aa2787d92e090e400fd5c0a65131d75432ff1643e7a429e2698fe25396dc909b817e3e30f41ebfcbfa335f1f0397fbbe331dcdd47bf SHA512 1b8823bb18b364bf8be2e51c096be21c4e4358b08738645a88f3ca064ae0a96dc0a8d3c789d75cc4e42ae1147de5f42dc03dac5bd07e4fcc2334ca9c540be196
 EBUILD cgdb-9999.ebuild 1348 BLAKE2B 370d58da127c77a5f3055aa2787d92e090e400fd5c0a65131d75432ff1643e7a429e2698fe25396dc909b817e3e30f41ebfcbfa335f1f0397fbbe331dcdd47bf SHA512 1b8823bb18b364bf8be2e51c096be21c4e4358b08738645a88f3ca064ae0a96dc0a8d3c789d75cc4e42ae1147de5f42dc03dac5bd07e4fcc2334ca9c540be196
-MISC metadata.xml 490 BLAKE2B 9eaa4ae0475e04d725f775f49d5bf57d7d0a00b53cfa1c0e67868d0127121f640ac304aef1c8d0c120666c03e815ab928b217800b2bf92e1bcbec9ed81a3519f SHA512 77ac0f28241716628619178ae93599276f8fd6051b7f00c5ef7fdfcd0a651cdd465dfde6de052156c8407d6a162a2a21199260001e06dd80e6eec8200bc11097
+MISC metadata.xml 290 BLAKE2B 38e814dac08e7716bc4b409945fc84830d105653cd97287c117db96ba3abdf392d3e198961e274b610c0cc5b4264506dd045144043504463db18862e44ad5c10 SHA512 dcfa0921f991440a235d30f0f768734899cd9382e0c5c83508e1547e76797fa9f3a46c87fea4706f3ff5caff9e73ac7fd21c0026c51e90930f38353f22591011
diff --git a/dev-util/cgdb/metadata.xml b/dev-util/cgdb/metadata.xml
index bf712b486f42..b377d36dfc74 100644
--- a/dev-util/cgdb/metadata.xml
+++ b/dev-util/cgdb/metadata.xml
@@ -1,14 +1,7 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>nado@troglodyte.be</email>
-		<name>Corentin Pazdera</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">cgdb/cgdb</remote-id>
 		<remote-id type="sourceforge">cgdb</remote-id>
diff --git a/dev-util/checkbashisms/Manifest b/dev-util/checkbashisms/Manifest
index dcd00c8d4262..cebc129e9801 100644
--- a/dev-util/checkbashisms/Manifest
+++ b/dev-util/checkbashisms/Manifest
@@ -3,8 +3,10 @@ DIST devscripts_2.19.7.tar.xz 847488 BLAKE2B b3c76d9b0899c01f08d0432f8de0a65d143
 DIST devscripts_2.20.1.tar.xz 854932 BLAKE2B b9523b2882625b66c7972db7c10f7d3f6055cb791b5697f92fc0e362c1b2a89ac26fc2a45739989ae9f9981c956d90ceefd514645649d1b7fca6d7eeaff9df7d SHA512 6e9505f491bf87df6c0ac384cbf307959fd86e3aea1aecd7e70e88bbe57757035612235bad0244dc7aeedcf964605508f7fd5db582b410dd715380a064389d1d
 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
 MISC metadata.xml 433 BLAKE2B b54d1290789d3ce8931f832c8c1ca7a56fbdebe85c0a81c32a929168fdf2d5a7be0dea01881e8fcc583061db1a071d1787723c9342c77a5862e228f0203c178b SHA512 945c3b95a61d4219e98ce5be3aed255cb148867409aca572714e8679bf623ee0c3396966cd80d783ace60bae7e6c01b85fad6c7f7ac9056422d732ed07f54716
diff --git a/dev-util/checkbashisms/checkbashisms-2.20.4.ebuild b/dev-util/checkbashisms/checkbashisms-2.20.4.ebuild
new file mode 100644
index 000000000000..a0d64f24d4da
--- /dev/null
+++ b/dev-util/checkbashisms/checkbashisms-2.20.4.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=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"
+SRC_URI="mirror://debian/pool/main/d/${MY_PN}/${MY_P/-/_}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# Requires python packages to check tools we don't need anyway
+RESTRICT="test"
+
+RDEPEND="dev-lang/perl
+	virtual/perl-Getopt-Long"
+
+S="${WORKDIR}/${MY_P}/scripts"
+
+src_prepare() {
+	default
+
+	sed "s@###VERSION###@${PV}@" -i checkbashisms.pl || die
+}
+
+src_compile() { :; }
+
+src_install() {
+	newbin ${PN}.pl ${PN}
+	doman ${PN}.1
+}
diff --git a/dev-util/chroot-wrapper/Manifest b/dev-util/chroot-wrapper/Manifest
index c85f6df9ab54..0294dc7f48a9 100644
--- a/dev-util/chroot-wrapper/Manifest
+++ b/dev-util/chroot-wrapper/Manifest
@@ -1,3 +1,3 @@
-DIST chroot-wrapper-0.9.1.tar.gz 12166 BLAKE2B 526c4c5630d603e726b27782433a19c67582afdae29e5775a34a5bc0e7ccff78523ad548f4645394863b1742e4f71a3755b1c371979470933eaa99a301623020 SHA512 c558f4abd14b083f4553cacd418de548cce1d73d46706485c57dc23fd3c8d7130933d50408a78bf621b39bbd9dc77dfbd1dbe5677e371dee5bf7840bc0fa645a
-EBUILD chroot-wrapper-0.9.1.ebuild 570 BLAKE2B baa678734074096c7f9bdc6bb2e0785233b93f81cb798a5a6bd30243b1fec1cbceb08315831422f83d065e212f7a3d07d9d7dd2542849195156db773408e7368 SHA512 1aacef74db849d5ee582e0a6044680af2f7959fbddd9f09ee215bf9a9f50552f388245fb27a9ed76c4a2ada8289d63d9d82d2f51d5fc1b1772fe8bde42bf7920
+DIST chroot-wrapper-0.9.3.tar.gz 12511 BLAKE2B 42528f7786a0855cfde9d6dff336544bb99f41dfdaa09782d5df665de997d2cbb6358761a5952865ae380c39e467085cbb110b1367d0422f07e0c519d4935b9d SHA512 16ae36637f3e966716a05f3e0bc16c784bae141837e13d0e4c1f831fefcac423a7d77ac73f49e2c7efd0261c1f9649a18f55cd2a24d22e768cecce6d95b85a74
+EBUILD chroot-wrapper-0.9.3.ebuild 618 BLAKE2B 95a223e3a2f477862344b08b4421a130a5466d4a4201f7e56f9890ba354666642b75da19eba0c10d6a4a87f12c8ffe6f32820e7e08c8b84f60ddb85fa07a2426 SHA512 02a0de7916e49219cf359507cbba2a1dcbb453b42173437c5828c0c94d2a97f35076fc868a354d57cc375305ed81cd567a5b3a1635fc5f7c0fca77b02b3cbda1
 MISC metadata.xml 249 BLAKE2B 51ba583d3f040316570785a91020f260c7eacf5a322cc4b905648f547f06f413976d1834f7f010db5b6183aad6d6503f9bccb21e74508b5a5af1a5d96e82c805 SHA512 276a98a5eb50222440ab5bba11bfc895a0f89be2c2f2e561214b97b6138fe7c4341f6ca1fcb29bc03fa5a89844ede7f82a942c20ed649ce3e7da459a1b2481d5
diff --git a/dev-util/chroot-wrapper/chroot-wrapper-0.9.1.ebuild b/dev-util/chroot-wrapper/chroot-wrapper-0.9.3.ebuild
index d5e93afab40d..65733fb37533 100644
--- a/dev-util/chroot-wrapper/chroot-wrapper-0.9.1.ebuild
+++ b/dev-util/chroot-wrapper/chroot-wrapper-0.9.3.ebuild
@@ -27,4 +27,6 @@ CONFIG_CHECK="
 
 src_install() {
 	newsbin src/chroot-wrapper chr
+	insinto /etc/chroot-wrapper
+	doins config.bash
 }
diff --git a/dev-util/clair/Manifest b/dev-util/clair/Manifest
index 22ca0f2ab973..d1f12704a36a 100644
--- a/dev-util/clair/Manifest
+++ b/dev-util/clair/Manifest
@@ -1,6 +1,7 @@
 AUX clair.confd 75 BLAKE2B 8700f0e19734c3a6c0f0596e5fcbee5aafaf2bf19dd66fff0a94a29c9f886d6dba1803ba8e3a9e7f9286eaef512c34524a281c952943d455e35446b9a0511187 SHA512 9ff72a41da4600f7c266a7c763520c947e41c1c06dc93f9c8fcdc3f92d5b10ac4a2483122fedc4cf3bfc5de0a48f61366b0d2b72bcc348b736fa958b7065cc87
 AUX clair.initd 593 BLAKE2B ec5f50ef2fe997cd0f5e3aa7837be9bb7e39f4a5b766011034bde27c38d7eb32fc61853c8cc82d738724b4c6c5e01306c6e20c9968be0e4bbe8a5f4e7a79b7eb SHA512 827bf28ba4ad7a40f4eb916f315978da6d3fab52a8ac9b3316383d67ed90006f0b13e7cec3a8843d73e5d23ef27bcd53a9a02ec70c1795725cb98e5d1de788bb
 DIST clair-2.1.3.tar.gz 3568075 BLAKE2B e16c8d466dda1a7bf93f08a055315e2896949fc075d97b3eac8be9f7bfa4d8cc43c79acec2480445700f4a56e6b4702de3bf087f9a4892e34ccb163bbd7afafe SHA512 7ac879ccd7530f14b43c2fddae3d456cfad99a5bb26b79563b7b45a0525dadd999207e222fc0fa49a9502a62accb051a66a7da891b2b6ea7fbcdd966519c862f
+DIST clair-2.1.4.tar.gz 3568060 BLAKE2B 655f162a6cdefc8a07ec665c1eb625eb44cbe9f18c548caaeef264489ba3627331fe2421685e8cb2141250dba497c982eccdbe94580b8a4a4ea38e00ec7445ab SHA512 67fedb487c297d95c9ab7f8e5ac9a08df85d16a218a718be56ed1af4d7ecee65550e448b9468c3c5bf387a8e37716dda22ac482ee2c2b4d41cbaac3672028570
 DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20160804104726-4c0e84591b9a.mod 31 BLAKE2B f69b0989e51b0b649f81b044169fe4309f130eba5bcc6ff33aa9666b1b754aa0e524b8c7a627a91000ccc4f93bf93cdee3e97bd3b2184b050878bc3f413f0c72 SHA512 f21fd002853e4435421f8396e6be016f65be1537815c60d23940caf26e3f14dd6f2caac802cb64cd586b1b1f1220b2727de347b3d1816b8e741f68d87ebcf03f
 DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20160804104726-4c0e84591b9a.zip 14808 BLAKE2B 823400c1c34bbc0dbb3f51c5836e748aa8277017d1fbd51b7e6c3922e23229dbfaf103745408fca0c96b84c20eb8eb45636cfdbee633a7552e8030e3c28a6456 SHA512 1130292c0454f84e1f6ab78baee4ccbae0b40a8d625c7a214bd7d1db88f4fea738ccd25fad7e2e15986b09ef963912c3fd35c7a36bb5fc879217198560258ecf
 DIST github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20160727233714-3ac0863d7acf.mod 29 BLAKE2B db9b03b0adf02e3b379eb06d67988a60f2e2034d1217e56b40ebafc1262cb4803500b73a3e697a5a73418615c84310bd7f7aeca6db56f6ddbcf6c044cce0e9f3 SHA512 ea629c85891049bdff24f75a4dbce34f048a9627fc126b44f497b3ae65602045ca4fe0856e1b3d7ba050bb867226b90c25912565867c696bc370697341681c33
@@ -45,4 +46,5 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20170427041856-9ccfe848b9db.mod 24 BLAKE
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170407172122-cd8b52f8269e.mod 24 BLAKE2B 1cb17a1c6b1eb33cebd983f9e965f6db03f5095441d7cd72aff6df805501eef4dc249c22ecc85da360c27696a7c4ae613f0769a1f89e73f286281de89ffd3ef2 SHA512 89b481cc62ed7a486990ebfcf65cf7a344e5d189deef680e6ddd82dc93f31d166af05fc27b4a95ea27c33fd3ced1b87d4050d617d52008ca059c4a5d3b6c26a9
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170407172122-cd8b52f8269e.zip 68248 BLAKE2B 97d4d17967b276f6e25cf03464627abc28b93b35c82b4140e2d056ed986e9da1c5fc95992ac902188c8d1c769d940044f5a386b2ca19090f7e3a0818f18fc802 SHA512 b3f9fdcd8cb5ebf4afb9e2ef3eca0f16420c31492b877cce4ccd605159379d3c08bf53fb227d40c2fa9caf73ea46ec2d3e3fbacc30dcdb9e310faed732c777d8
 EBUILD clair-2.1.3.ebuild 3700 BLAKE2B e54c6dedd649fa28254c53b0072f41751ab13574e3db71786dcbd554037f03210cfd60fd82ed47f674aa8e70dad604307de62384210436ae7dc0e64f339940cc SHA512 681f62697bad471424a9cd5db6226e8d165112f678b21528c7cb77eac69e9821f8389c549da39f627685aa6c001cd10679e815fdd232bed040d412a5bf55495b
+EBUILD clair-2.1.4.ebuild 3700 BLAKE2B e54c6dedd649fa28254c53b0072f41751ab13574e3db71786dcbd554037f03210cfd60fd82ed47f674aa8e70dad604307de62384210436ae7dc0e64f339940cc SHA512 681f62697bad471424a9cd5db6226e8d165112f678b21528c7cb77eac69e9821f8389c549da39f627685aa6c001cd10679e815fdd232bed040d412a5bf55495b
 MISC metadata.xml 325 BLAKE2B 6fd28d942fc1514286b76efceec157b0f6064897c318296829bcae0c085079332895c979cdaf0e17519af610c293e40231d0cd9f1f961935d70942d3608e7dcb SHA512 56995f7e506c9faf9e9ae476a5827999648def77eec67def60a1a5c39b692a17a34dc49fb4a078817d64f6c2a83a7c09633bba30d3a037c14b3625afbe77fead
diff --git a/dev-util/clair/clair-2.1.4.ebuild b/dev-util/clair/clair-2.1.4.ebuild
new file mode 100644
index 000000000000..f933a561378c
--- /dev/null
+++ b/dev-util/clair/clair-2.1.4.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+
+DESCRIPTION="Vulnerability Static Analysis for Containers"
+HOMEPAGE="https://github.com/coreos/clair"
+
+EGO_SUM=(
+	"github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a"
+	"github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a/go.mod"
+	"github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf"
+	"github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod"
+	"github.com/davecgh/go-spew v1.0.1-0.20160907170601-6d212800a42e"
+	"github.com/davecgh/go-spew v1.0.1-0.20160907170601-6d212800a42e/go.mod"
+	"github.com/fernet/fernet-go v0.0.0-20151007213151-1b2437bc582b"
+	"github.com/fernet/fernet-go v0.0.0-20151007213151-1b2437bc582b/go.mod"
+	"github.com/golang/protobuf v0.0.0-20170427213220-18c9bb326172"
+	"github.com/golang/protobuf v0.0.0-20170427213220-18c9bb326172/go.mod"
+	"github.com/guregu/null v3.0.2-0.20160228005316-41961cea0328+incompatible"
+	"github.com/guregu/null v3.0.2-0.20160228005316-41961cea0328+incompatible/go.mod"
+	"github.com/hashicorp/golang-lru v0.0.0-20160813221303-0a025b7e63ad"
+	"github.com/hashicorp/golang-lru v0.0.0-20160813221303-0a025b7e63ad/go.mod"
+	"github.com/julienschmidt/httprouter v1.1.0"
+	"github.com/julienschmidt/httprouter v1.1.0/go.mod"
+	"github.com/lib/pq v0.0.0-20170324204654-2704adc878c2"
+	"github.com/lib/pq v0.0.0-20170324204654-2704adc878c2/go.mod"
+	"github.com/matttproud/golang_protobuf_extensions v1.0.1"
+	"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
+	"github.com/pborman/uuid v0.0.0-20160209185913-a97ce2ca70fa"
+	"github.com/pborman/uuid v0.0.0-20160209185913-a97ce2ca70fa/go.mod"
+	"github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0"
+	"github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod"
+	"github.com/prometheus/client_golang v0.8.0"
+	"github.com/prometheus/client_golang v0.8.0/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20170216185247-6f3806018612"
+	"github.com/prometheus/client_model v0.0.0-20170216185247-6f3806018612/go.mod"
+	"github.com/prometheus/common v0.0.0-20170427095455-13ba4ddd0caa"
+	"github.com/prometheus/common v0.0.0-20170427095455-13ba4ddd0caa/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20170502131342-d098ca18df8b"
+	"github.com/prometheus/procfs v0.0.0-20170502131342-d098ca18df8b/go.mod"
+	"github.com/remind101/migrate v0.0.0-20160423010909-d22d647232c2"
+	"github.com/remind101/migrate v0.0.0-20160423010909-d22d647232c2/go.mod"
+	"github.com/sirupsen/logrus v0.11.5"
+	"github.com/sirupsen/logrus v0.11.5/go.mod"
+	"github.com/stretchr/testify v1.1.4"
+	"github.com/stretchr/testify v1.1.4/go.mod"
+	"github.com/tylerb/graceful v1.2.15"
+	"github.com/tylerb/graceful v1.2.15/go.mod"
+	"golang.org/x/sys v0.0.0-20170427041856-9ccfe848b9db/go.mod"
+	"gopkg.in/yaml.v2 v2.0.0-20170407172122-cd8b52f8269e"
+	"gopkg.in/yaml.v2 v2.0.0-20170407172122-cd8b52f8269e/go.mod"
+	)
+go-module_set_globals
+SRC_URI="https://github.com/coreos/clair/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+COMMON_DEPEND="acct-group/clair
+	acct-user/clair"
+	DEPEND="${COMMON_DEPEND}"
+RDEPEND="app-arch/rpm
+	app-arch/xz-utils
+	dev-vcs/git
+	${COMMON_DEPEND}
+	!!sci-visualization/xd3d" # File collision (Bug #621044)
+
+src_compile() {
+	go build -o bin/${PN} ./cmd/${PN}  || die
+}
+
+src_install() {
+	dobin bin/${PN}
+	dodoc {README,ROADMAP,CONTRIBUTING}.md
+	insinto /usr/share/${PN}
+	doins -r contrib
+	insinto /etc/${PN}
+	doins config.example.yaml
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/dev-util/clazy/Manifest b/dev-util/clazy/Manifest
index 5faaaf0e2b25..1ae6ff77bd13 100644
--- a/dev-util/clazy/Manifest
+++ b/dev-util/clazy/Manifest
@@ -1,8 +1,4 @@
-AUX clazy-1.6-clang-cpp.patch 2138 BLAKE2B c51fe27ced22c25f754583ec3b39f92dbc2f68e6ad823802b764dc85385c1f103db6f54fe0fa213386b092dd968e8b70e2fe7cb424b83ce26964ba22a26eac0f SHA512 f916a6a5dc2a25e7dfc3c75ddc9b31d189c7a1b88db8ef3bdd6168e571e03472f099877c1c998917edcc3ccc1e4eb22bac481e95ced9c8efa98aaf9d90f59de7
-AUX clazy-1.6-llvm-10.patch 3309 BLAKE2B e984da005e3ba4a07f55995e569035e52e8f897afc408313f73ea361b49b3a62df779a278cb7dfade7d814016bad3734a24fb0b1c3216f7cf09b8bb21cac01fd SHA512 6f5ef3e745159da352e867be1c3ffecbf143c3763e08dfccb8bd85db1a7676fc84d9577b53d9809d5c29ac3b570278f8e6fa426a11bd38a2706e21b426caa92b
 AUX clazy-1.7-gnuinstalldirs.patch 3167 BLAKE2B cc4d56ea57c66b7c8bde5eb9a9afbc491f0ee29f91ebab381150838943150fd92ac46dc099833baf8b75cbeb17bcfb790b2a6b7f2a1c0dc964892f9cf9ab76b8 SHA512 08addfc9fc6749e9afcea078c38d31c7f13247887f638d16c9797d4145d5b0fa363721534104fd9f955dd13a175981634b1c54e209019c37ba5da79b33ab6a45
-DIST clazy-1.6.tar.xz 364292 BLAKE2B 01da58e34d5a7cb1e812d10264cebe15e90369589535e07f2c9f4520971f2e95b2c70494e99e34f7077957ec1bf01352fa6a72a64f0572e8a5db422267ab727a SHA512 dc7cb9590bbc40a2ac51abe305b6520ebc1ff7128ff21b4f6111d18f14eb8c2ab66d907636a18c7508143b708e70ba69f9d6fad88ffce12dec981a9bdd0edcc0
 DIST clazy-1.7.tar.xz 371788 BLAKE2B 281acd0164cf76510e46883fff7269aa77e4b815d6d0ca5a54307165ff8f4355e095b82e0c41cdb0af391f4a15048a8d64b2a2a7b9dabc042b36ba1a380405cc SHA512 3dba993140f3d69aac8d9cf3fa49db990185928647193220b689773bbca70f9fd9ee7fc52022e6029b3c0c81800301a593bd79edee7e1fa6c5884782d390ced6
-EBUILD clazy-1.6-r1.ebuild 1310 BLAKE2B 7954c600cbd881a77268c49ed5e0a733e7a98719610a9e6b2f68bc412243825344286b2f91bc876f5c44dc0e2b663ceadf2c430e61bcad5f9d9099674918a0f9 SHA512 9b16f0546a7c1bd9d4faf453d8efe962448d3208e2dade25f736b63d309c835d1e8aaf096d974eccd699aff995d00a7fced95a49b3ab4500e4a271add73deb1e
-EBUILD clazy-1.7.ebuild 1054 BLAKE2B 2fd2dc1a0527e71691eea5a5cfca34a42889542092c5a0973c5d4d33dfb6cadb210537dd41c2ede1c7533561c0ad32be9bc86cf8d90d9b5add54b1f5e500bcf8 SHA512 18eb3379c67e8e699989ec7d82d5ca4031a4fce3b955e2db203196eec96e61038f3ea64e7b384927700e5c3ef48afa8321f353160cf4f9d7723b7a1d7d4ac67a
+EBUILD clazy-1.7.ebuild 1053 BLAKE2B b9196c366dbc8d16fcd4ebeae07cc1a36792def33149b12dd5da3750568879ee09d9b6c12bfbf0e0fe48192e2ee109ac59335dabb156b5e697fda6c12772d859 SHA512 2335f89afed13353d99a8598aa9f653b4c3bd55414711b3825c2df024b1ce2c307315fa763a928aacec8f6310e9557f31c5e4056ffae69c22325acdb686993b3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-util/clazy/clazy-1.6-r1.ebuild b/dev-util/clazy/clazy-1.6-r1.ebuild
deleted file mode 100644
index 7db5c3d63669..000000000000
--- a/dev-util/clazy/clazy-1.6-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# 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://kde.org/applications/development/org.kde.clazy"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE=""
-
-RDEPEND="
-	>=sys-devel/llvm-3.8:=
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( README.md )
-
-PATCHES=(
-	"${FILESDIR}/${P}-llvm-10.patch"
-	"${FILESDIR}/${P}-clang-cpp.patch"
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	sed -e '/install(FILES README.md COPYING-LGPL2.txt checks.json DESTINATION/d' \
-		-i CMakeLists.txt || die
-
-	sed -e 's|${MAN_INSTALL_DIR}|share/man/man1|' \
-		-i docs/man/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
-}
-
-src_install() {
-	cmake_src_install
-	mv "${D}"/usr/share/doc/clazy/* "${D}"/usr/share/doc/${PF} || die
-	rmdir "${D}"/usr/share/doc/clazy || die
-}
diff --git a/dev-util/clazy/clazy-1.7.ebuild b/dev-util/clazy/clazy-1.7.ebuild
index 6d9e004a7686..14f32246c9c7 100644
--- a/dev-util/clazy/clazy-1.7.ebuild
+++ b/dev-util/clazy/clazy-1.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-util/clazy/files/clazy-1.6-clang-cpp.patch b/dev-util/clazy/files/clazy-1.6-clang-cpp.patch
deleted file mode 100644
index 16b9af00ce37..000000000000
--- a/dev-util/clazy/files/clazy-1.6-clang-cpp.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 0e295e5a926496f5a5d46ea4feb1b285b084f5e0 Mon Sep 17 00:00:00 2001
-From: Christophe Giboudeaux <christophe@krop.fr>
-Date: Mon, 11 Nov 2019 10:31:49 +0100
-Subject: Check if clazy should be linked to clang-cpp
-
-Summary:
-According to [1], clang can now provide a single shared library instead of split
-ones.
-
-We have to check if this library exists and link to it if available.
-
-[1] https://releases.llvm.org/9.0.0/tools/clang/docs/ReleaseNotes.html#build-system-changes
-
-Reviewers: smartins, kde-buildsystem
-
-Reviewed By: smartins
-
-Differential Revision: https://phabricator.kde.org/D25163
----
- CMakeLists.txt        | 11 ++++++++---
- cmake/FindClang.cmake |  1 +
- 2 files changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b7301ed..ce1f887 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -125,9 +125,14 @@ macro(link_to_llvm name is_standalone)
-   if(WIN32)
-     target_link_libraries(${name} version.lib)
-   endif()
--    target_link_libraries(${name} clangTooling)
--    target_link_libraries(${name} clangToolingCore)
--    target_link_libraries(${name} ${clang_tooling_refactoring_lib})
-+    # clang >= 9.0 can provide a single shared library instead of split ones
-+    if(CLANG_CLANG-CPP_LIB)
-+        target_link_libraries(${name} clang-cpp)
-+    else()
-+        target_link_libraries(${name} clangTooling)
-+        target_link_libraries(${name} clangToolingCore)
-+        target_link_libraries(${name} ${clang_tooling_refactoring_lib})
-+    endif()
- endmacro()
- 
- macro(add_clang_plugin name)
-diff --git a/cmake/FindClang.cmake b/cmake/FindClang.cmake
-index 542172e..50e0829 100644
---- a/cmake/FindClang.cmake
-+++ b/cmake/FindClang.cmake
-@@ -62,6 +62,7 @@ if (LLVM_FOUND AND LLVM_LIBRARY_DIRS)
-   # note: On Windows there's 'libclang.dll' instead of 'clang.dll' -> search for 'libclang', too
-   find_library(CLANG_LIBCLANG_LIB NAMES clang libclang HINTS ${LLVM_LIBRARY_DIRS}) # LibClang: high-level C interface
- 
-+  FIND_AND_ADD_CLANG_LIB(clang-cpp)
-   FIND_AND_ADD_CLANG_LIB(clangFrontend)
-   FIND_AND_ADD_CLANG_LIB(clangDriver)
-   FIND_AND_ADD_CLANG_LIB(clangCodeGen)
--- 
-cgit v1.1
-
diff --git a/dev-util/clazy/files/clazy-1.6-llvm-10.patch b/dev-util/clazy/files/clazy-1.6-llvm-10.patch
deleted file mode 100644
index f00695f52117..000000000000
--- a/dev-util/clazy/files/clazy-1.6-llvm-10.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From df41bd29433937111edca3654a7beb11ec765029 Mon Sep 17 00:00:00 2001
-From: Johannes Ziegenbalg <Johannes.Ziegenbalg@tu-dresden.de>
-Date: Fri, 27 Mar 2020 14:18:32 +0100
-Subject: Fix build issues using llvm 10.0.0
-
----
- CMakeLists.txt                    |  2 +-
- src/ClazyStandaloneMain.cpp       | 10 ++++++++++
- src/checks/level0/qstring-ref.cpp |  4 ++++
- 3 files changed, 15 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f1463cf..a30813f 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -53,7 +53,7 @@ if(MSVC)
-   # disable trigger-happy warnings from Clang/LLVM headers
-   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4267 /wd4244 /wd4291 /wd4800 /wd4141 /wd4146 /wd4251")
- elseif(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
--  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-common -Woverloaded-virtual -Wcast-qual -fno-strict-aliasing -pedantic -Wno-long-long -Wall -W -Wno-unused-parameter -Wwrite-strings -fno-exceptions -fno-rtti")
-+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -fno-common -Woverloaded-virtual -Wcast-qual -fno-strict-aliasing -pedantic -Wno-long-long -Wall -W -Wno-unused-parameter -Wwrite-strings -fno-exceptions -fno-rtti")
- endif()
- 
- set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,-flat_namespace -Wl,-undefined -Wl,suppress")
-diff --git a/src/ClazyStandaloneMain.cpp b/src/ClazyStandaloneMain.cpp
-index aada189..6baae32 100644
---- a/src/ClazyStandaloneMain.cpp
-+++ b/src/ClazyStandaloneMain.cpp
-@@ -93,7 +93,11 @@ public:
-     {
-     }
- 
-+#if LLVM_VERSION_MAJOR >= 10
-+    std::unique_ptr<FrontendAction> create() override
-+#else
-     FrontendAction *create() override
-+#endif
-     {
-         ClazyContext::ClazyOptions options = ClazyContext::ClazyOption_None;
- 
-@@ -116,9 +120,15 @@ public:
-             options |= ClazyContext::ClazyOption_IgnoreIncludedFiles;
- 
-         // TODO: We need to agregate the fixes with previous run
-+#if LLVM_VERSION_MAJOR >= 10
-+        return std::make_unique<ClazyStandaloneASTAction>(s_checks.getValue(), s_headerFilter.getValue(),
-+                                                          s_ignoreDirs.getValue(), s_exportFixes.getValue(),
-+                                                          m_paths, options);
-+#else
-         return new ClazyStandaloneASTAction(s_checks.getValue(), s_headerFilter.getValue(),
-                                             s_ignoreDirs.getValue(), s_exportFixes.getValue(),
-                                             m_paths, options);
-+#endif
-     }
-     std::vector<std::string> m_paths;
- };
-diff --git a/src/checks/level0/qstring-ref.cpp b/src/checks/level0/qstring-ref.cpp
-index d1d8a4e..ec9e890 100644
---- a/src/checks/level0/qstring-ref.cpp
-+++ b/src/checks/level0/qstring-ref.cpp
-@@ -117,7 +117,11 @@ static bool containsChild(Stmt *s, Stmt *target)
-         return true;
- 
-     if (auto mte = dyn_cast<MaterializeTemporaryExpr>(s)) {
-+#if LLVM_VERSION_MAJOR >= 10
-+        return containsChild(mte->getSubExpr(), target);
-+#else
-         return containsChild(mte->getTemporary(), target);
-+#endif
-     } else if (auto ice = dyn_cast<ImplicitCastExpr>(s)) {
-         return containsChild(ice->getSubExpr(), target);
-     } else if (auto bte = dyn_cast<CXXBindTemporaryExpr>(s)) {
--- 
-cgit v1.1
-
diff --git a/dev-util/clion/Manifest b/dev-util/clion/Manifest
index 8f2def736cb2..ca85e199aafc 100644
--- a/dev-util/clion/Manifest
+++ b/dev-util/clion/Manifest
@@ -1,3 +1,3 @@
-DIST clion-2020.1.1.tar.gz 510085810 BLAKE2B c80b1dd6c88e89803f73dc22cf6d942a783a4d8a607904ffe44b445ab998f9f7db4aa6233305e617cb91608934ec86be208d798f512a849dbf98738293f8ff73 SHA512 3807d651b8b5b1c8c30658514f3aa376019bfebefff724375ae54d9105fcd9db370023906b51af2debcf83d26cebb060c88e228e7b672ad181e73a77d1ed4016
-EBUILD clion-2020.1.1.ebuild 2179 BLAKE2B 198748c33f57fedf4153c6f1d5f3982a901cc951d95e9b9e8c49d716e5ced2cbbac6bae3f186d76b84e3ea5d4f4c4ee33c3ea657c6d4b936120d66d08fbd2252 SHA512 0c223ad5cd9536eaf96b3ff9ad7deabe9f04124cf1b66b009168f676907da8c0e9d5939e428bb9f8baf1d26b48bc0c810f8b1e5abf3b4c3691f02a74116356d3
+DIST clion-2020.2.tar.gz 554215003 BLAKE2B 06ba16f3d2a3ebb4731e4ce40ec2ee56d3e823520d9b477a4ca7013391adb3e3c3e59b478810fa0ac9896e5277ec71642190e37be516990b0cbddd3178d2e245 SHA512 3b48a95a071919e3122e8bd8104202e07cf9cc9362df19f75003571771a134d4d5ec4520147c43b4fbd3144de8f67ddb904dbf88ef51714ec4d4882796b1272b
+EBUILD clion-2020.2.ebuild 2180 BLAKE2B e4bad956932168848c57a4b7ec72786d82276da81087a904e7482ee70d72993b67f78bab4c6277a9b00cb3be03eb3fa7cb2e5fc48dcf4f15c5cd4220a8274cfd SHA512 e0f1b2c48e545ea93fd0a2e16d81381de27aa02ca676015ab35d99eb7d775b69036d73f5bd293a023a7dcd0cb0de6ed3e9128ba5c342830f2e712ed7e4a15e09
 MISC metadata.xml 458 BLAKE2B 1393fb2b8c1487a670f3c2fc7c2fe9246d8f18bc7d33e2d494f0ffc3a3492285dab041f3cf810d16e78a312dd3936eb9bad0838ff9a8c3b6a4b7d80b90764fc4 SHA512 c00a66b6722a62222d06c325df55a3d946267ce7a4a452855933d721b936cd05aae5e9acdb784fc8e97235ead35e6625522c579397f43e9755619b1a8dcaccc7
diff --git a/dev-util/clion/clion-2020.1.1.ebuild b/dev-util/clion/clion-2020.2.ebuild
index d50ca20ce175..e0021195a585 100644
--- a/dev-util/clion/clion-2020.1.1.ebuild
+++ b/dev-util/clion/clion-2020.2.ebuild
@@ -66,7 +66,7 @@ src_install() {
 
 	if use custom-jdk; then
 		if [[ -d jbr ]]; then
-		fperms 755 "${dir}"/jbr/bin/{jaotc,java,javac,jdb,jjs,jrunscript,keytool,pack200,rmid,rmiregistry,serialver,unpack200}
+			fperms 755 "${dir}"/jbr/bin/{jaotc,java,javac,jdb,jjs,jrunscript,keytool,pack200,rmid,rmiregistry,serialver,unpack200}
 		fi
 	fi
 
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 7066030c793f..0aaa7ef889ca 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -11,18 +11,21 @@ AUX cmake-3.15.0_rc2-FindBLAS.patch 1233 BLAKE2B 165307b41f7ebaa094e80adbab336ab
 AUX cmake-3.16.0_rc4-darwin-bundle.patch 1388 BLAKE2B bcb6c3d8e4f64ccc3e6ebf9ae906960075b3fb1f432925e07a711ac27321023033013e7a2e1d0ffc60dd464b775fa2537a49c73089861a2ce8f6316ddaa3d03e SHA512 7e0f598fe1cbb2c44b345091c102fb42ebff510ea7eeccdbe1fe0d65251127d823c37f2d37b073305679ed86fd48923566f1d62a7c9fb55df475d48891b4b861
 AUX cmake-3.17.0_rc1-FindBLAS.patch 1087 BLAKE2B 5e549db39f0e8c5f821a70121551ccea132e11dd8b468cfc7439e61763b5406860d952787d5957ea719dd48ec32ac8313d3209bed2a3423f5e40b8a2fcf04ae4 SHA512 1ea5e5e44c6a97cced30ef38424e24a3551d58c828d71d3b5994c265f099a3aa19174febfc2778eb688930432073e012557a79550d38b6b716e6b619d74a298c
 AUX cmake-3.17.0_rc1-FindLAPACK.patch 1973 BLAKE2B d4f10694b55fcea047f364f3dd383ba12fb5c3ce4369bd527c286e23260b551a915fa5257f0351bce00a4332c987c047c246812f2a713b0d1db312c7d03edee4 SHA512 20baafcda95ba219ae4e186a8878aa75e2e27f766ab3afaa14ce316cd2c2bc85debfc6be4ed1b6c17c3c1532b3a6868d0b4ee7cc47145cb788838f023b624303
+AUX cmake-3.18.0-filter_distcc_warning.patch 842 BLAKE2B 8c9b02a251d118f2ac31fe417e10750e3f4b911891723b0edacea83bf2b6220f121e02c299655cd49ae5a019af8a747218f81d6ece6cda41aeb57d24f9385277 SHA512 91b795225313270449d6da12baa818382da4f6937795303c5cc894f3f38f03cb88d8fb3b774fb0b8ab9cf5cd344ebeda3d83f48ef8474093a8a0268d8f342828
 AUX cmake-3.4.0_rc1-darwin-bundle.patch 1043 BLAKE2B 99fc8061352b6a503f472e11045f9a99c2b980f08e9c1406722eacdd438617dccc394f53bdcaa4d93c4aa499b4615185c3ec99ccad8be3504972001498b02c48 SHA512 8c6297bf824d5a911e14004ac4c4e62d1a1528e44199d8860ca885bb1b8dd3d66a73c3db32664b830c3c635bdb498abbd5196be92ed2571cb22828d7186ff9f9
 AUX cmake-3.5.2-FindQt4.patch 1585 BLAKE2B 8cfda84c419515be57f65be7b4b22d7937b656eb7f58d61c7d9e30db9dac36e934f2a529b4ea20d69c5f8a653c727bae34374ebcb7f5017fd70df41abd538164 SHA512 bab8960bfea3c29416bdc8f39c7dee59b89bd7951752401f24eeb9161ac7bc2c6dd200cb62c6b9f964d763b5d257a94d8b04dc7090d6fa947a04f2d0c2e8c479
 AUX cmake-3.9.0_rc2-FindPythonInterp.patch 1458 BLAKE2B a70945921738f00952b40a73d9ea26ecc86614aa3f12c94226aac4710dd0b9723c365b6f5def965069a54919bab13a33490facc6c5e64fad69d2e05a97d2812f SHA512 8adcb75cc035f64521e85229eb8dfa1e627326f8e189f66b707b3a0448ed3ae6acf306643026f7cbc7b924edcef73cad7a107d83162b4ca46bd6bbdc7a58af12
 AUX cmake.vim 217 BLAKE2B 5d2cf8b4101a7204fd27a9f21d82fea4d86fc4eeed54e062b543452dc574e73d1c80167c83eb482d9eec310950ac811ba35d3eeb97b51958f12f3adf575ddbe7 SHA512 2f7e9e949f8f3030a0dfcef56f4effea703ee60555c22f6a2d1dfeaf3334f33a3e88910c666f704e4ab60cde4ebb509c7d85d812a3c1627010e52fc757f15cdf
 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.2.tar.gz 9469251 BLAKE2B 85818c6346ee600a0185687809b666a3186831d590680bba8a41d6d52cd3852ce84fdac240100a7b91f06897a779e1e44b67d9a8da4e806347c9a4a46dab354d SHA512 4998ec3ac7367cec237187b1568a1935b402c39959c1869c9ae94e013060f6d2e03089eba34187f91063de169df78425dee2aa01acb925347aeb97f99bcad6a2
 DIST cmake-3.17.3.tar.gz 9470753 BLAKE2B a4c863e0cf7105eb47e1bba7641ab3431506f0a4f5c84a4de203cb996e629d1ee236d91ba5e1439f0123ab3c8b3871ef4e3b1c21940aa97c125cc7ab2a3f9873 SHA512 13479bd48ef8a8c95277a62b4f42e63152a5979292a98b5456022ca42ad3963cad75e917cc8b92a8485dbf5a2b59cde3fdc90fd9abdb806bc97c8570d03c1c69
-DIST cmake-3.18.0-rc3.tar.gz 8968777 BLAKE2B 9fdbe4870e70400bc73f53a4ba37e832b3f32cee1342bdab5e3078ce0969564c3d8d9fde9945fae8cd5da35f77abb2be0c6003b2f321d5458cff65935792a972 SHA512 f4bda297c90d6449d6ef3adcf91debc61a9dbef65934dfd1447f86d30747b4b466bb813abe58ee3d6a3aa9e8e49d5e7cd118820e92bec3b2e52f06142faa017e
+DIST cmake-3.17.4.tar.gz 9473549 BLAKE2B 2ce29415525b5292ae9e06d73570ed0af2173d8d15612f4d645f22d4f55cb99018663c374c4282731e09f8c6e4ffd59316d65f38aef9db5c34d874ca8992382b SHA512 6af879502e52388f3be02a4edfb006274840ad1afa8f28ffd6ec69b0310c7f718812b2272e5f77ffa422717f61407a6d482deb95941555c21c73fc5f62356a4e
+DIST cmake-3.18.0.tar.gz 8970116 BLAKE2B 3eba331eaa6b1d85baa5898836fc6106f2b5fcb10af85121806c429f41d09d4fde49bf87ef833c0e538ae5ccdf994e9cc86efa39b571ebcd429459ea37205c66 SHA512 6cab76a792a7ed2120a50048312273b2870afef29351a3ebcbf76cbcb422f82be679c85211c19016a56ac7f63bbce6cea0478f491c973b8577e08168a1ba853d
+DIST cmake-3.18.1.tar.gz 8969366 BLAKE2B e5a06cf10fbd8ab2e300a0822bf94943acc48f6632a34471d361c9bc4bdfc952b7b3c4adc969712f84c4b7185f11c2393753a6313b3efbc6edc348ad634662af SHA512 e0591d5fb234f3e7b74d6d2aad44fbf3e19e69547bd428681ba6ad0461d4f3d2a154605808b4733531d2c66f0e91eb39a179ae0d89a37e92a3f20e9cae691468
 EBUILD cmake-3.13.5.ebuild 6250 BLAKE2B 51fd5c675042b869a8dd3f54ceaed2f3a2d9bc43aeb2894b1b8c9d995660bc81ed9b39f99bfbb376d0dd658942def7bc2c1ec3538efc36c1f43f65bc1ca5dd5b SHA512 638eece44d2cb688d92fd9fbedd189aee9b0b878b1fd054984e806d17083eda352695136bf0d800d9e2ecb7993917f2da4f1f1913e14c7686c4d7cff8c641f60
-EBUILD cmake-3.16.5.ebuild 5911 BLAKE2B 8bbcabb94f033e35c3c6436d7c53a08901bfa102e2b1d8dc57a090e7bc7a68c9cbcd80c1e758540282b2d03d6a3e72f54e35cea0c37cb905a648b1daafe370f5 SHA512 7d1462f3281e275fefea2f5983ade92ba3436981d652be57861bcac44f2b6b6e42e8da900574347cf76df123e4a6da37b5e3d94d06fa514ee3b91d32d9916675
-EBUILD cmake-3.17.2.ebuild 5920 BLAKE2B a535ec010204caa3f00518bb87fa54ff4b918b8d3b634dbccb7f378c17a0adea0c519b205ed9d4fd0921074ba7ed745998856ab8beb80a1690121ec76fdadf63 SHA512 a495b8c65861c336daf24045d231c7d7106d48a90bf83dcd7c0f3e4f891c08bea28999b2d5656da8a3fef541b605fc6ac08ee403f5ddbf72b98b58441482933a
-EBUILD cmake-3.17.3.ebuild 5920 BLAKE2B a535ec010204caa3f00518bb87fa54ff4b918b8d3b634dbccb7f378c17a0adea0c519b205ed9d4fd0921074ba7ed745998856ab8beb80a1690121ec76fdadf63 SHA512 a495b8c65861c336daf24045d231c7d7106d48a90bf83dcd7c0f3e4f891c08bea28999b2d5656da8a3fef541b605fc6ac08ee403f5ddbf72b98b58441482933a
-EBUILD cmake-3.18.0_rc3.ebuild 5859 BLAKE2B 1f840725f5f008e9f35da31ce7038be1234bf6479a132190556466e530f5a9516aa931db53a5c90f5ac4911df28fd0810c041bd7e1d255a3ee10b192da099f64 SHA512 330fd0a4fcedefd2fd83da8f623f0f22d75e585e2d3179a13fee8b49b8d4832935f19fe98114154c459dbb0df9375de52171725b9af35f5c4f9f860072ce2224
+EBUILD cmake-3.16.5.ebuild 5911 BLAKE2B f124d2d41b33a9a76749ced21fac3717eb50bba7065500986fdafc445bef3f17bf6e1faac7e863257ad5d8f571e4bdf17c9e750f5b83163401b491d85a2319f7 SHA512 4cfeb2154bd96b1f146b508ed038158a8cb58ead403011054702c4bdc1e2d99e677baa1b7ee6c33c4b317ca4992718cdc352b55724e73bf8edc758d2748e2603
+EBUILD cmake-3.17.3.ebuild 5920 BLAKE2B 9c3179655159be70348bd187ea7547bc4cbd559dca58dc71d918c8a07d03c931f3b8eecf1c2ae59b30b395af428964d7628224c5eaf3330b849fb07efecec667 SHA512 5b836eba2801d193d33bc0a94bc848ee02db050bd6247e9b70df12c92c1fa55d776860d5eb4103c0f91be322fb6bf566c6cbb7e3bd8838c6f156d5cbdef0c972
+EBUILD cmake-3.17.4.ebuild 5920 BLAKE2B 9c3179655159be70348bd187ea7547bc4cbd559dca58dc71d918c8a07d03c931f3b8eecf1c2ae59b30b395af428964d7628224c5eaf3330b849fb07efecec667 SHA512 5b836eba2801d193d33bc0a94bc848ee02db050bd6247e9b70df12c92c1fa55d776860d5eb4103c0f91be322fb6bf566c6cbb7e3bd8838c6f156d5cbdef0c972
+EBUILD cmake-3.18.0.ebuild 5924 BLAKE2B b94bf93558ecf1c45029bda0d230e83ba4d5d55075a05332a525a049b42d15559158512c629f02c995a1e6e86ac052d4016722ee8a0a6afe3e1116355fbc5ce4 SHA512 c6245b76d735927d7e71defd7c8d1ba43ba087bd86d02bae8b583999974d8a4db3174082ec9309bebab83f79c320cd3fb21428d7cf67b4368788c25920405123
+EBUILD cmake-3.18.1.ebuild 5925 BLAKE2B af5d675ac72f28053ffe8dd35a2bf7bca792b872ee5cabb6f2b34f02bf37bbe5de6bc2dd9880c9f93faf25f5a955ba346c1399e35b8e434780b9121a3a97bf08 SHA512 280a555dd541ba38b376fa188c93b057c17c15bde8b6dbf02471ead0ec8d2588d2e41a25a5968c507da5cb18972b221b1dbb203bef487013b9b13d374f5c1972
 MISC metadata.xml 460 BLAKE2B f1a7e1709a6b9975ffbc377c8b4d1ea8a01f52ccc139693c8e427150b7559ecc867b3e55fb4bc95fe342a2335fe5e13c69f4bd74ffbbf302c83872c65963e73e SHA512 fc562cd5f336101d16ca30a5b3e9b99a6e51ec9d7aa503f20ce278f44d5810286fcd6b46b18073cd88ba88ee5ab4f8a0bfccaa567df09ebb722a68ab721aa340
diff --git a/dev-util/cmake/cmake-3.16.5.ebuild b/dev-util/cmake/cmake-3.16.5.ebuild
index dc86361bb11d..f53ac8c1d184 100644
--- a/dev-util/cmake/cmake-3.16.5.ebuild
+++ b/dev-util/cmake/cmake-3.16.5.ebuild
@@ -23,7 +23,7 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	app-crypt/rhash
-	>=app-arch/libarchive-3.0.0:=
+	>=app-arch/libarchive-3.3.3:=
 	>=dev-libs/expat-2.0.1
 	>=dev-libs/jsoncpp-1.9.2-r2:0=
 	>=dev-libs/libuv-1.10.0:=
diff --git a/dev-util/cmake/cmake-3.17.3.ebuild b/dev-util/cmake/cmake-3.17.3.ebuild
index 95c4ba7af871..a65d699eeb87 100644
--- a/dev-util/cmake/cmake-3.17.3.ebuild
+++ b/dev-util/cmake/cmake-3.17.3.ebuild
@@ -23,7 +23,7 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	app-crypt/rhash
-	>=app-arch/libarchive-3.0.0:=
+	>=app-arch/libarchive-3.3.3:=
 	>=dev-libs/expat-2.0.1
 	>=dev-libs/jsoncpp-1.9.2-r2:0=
 	>=dev-libs/libuv-1.10.0:=
diff --git a/dev-util/cmake/cmake-3.17.2.ebuild b/dev-util/cmake/cmake-3.17.4.ebuild
index 95c4ba7af871..a65d699eeb87 100644
--- a/dev-util/cmake/cmake-3.17.2.ebuild
+++ b/dev-util/cmake/cmake-3.17.4.ebuild
@@ -23,7 +23,7 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	app-crypt/rhash
-	>=app-arch/libarchive-3.0.0:=
+	>=app-arch/libarchive-3.3.3:=
 	>=dev-libs/expat-2.0.1
 	>=dev-libs/jsoncpp-1.9.2-r2:0=
 	>=dev-libs/libuv-1.10.0:=
diff --git a/dev-util/cmake/cmake-3.18.0_rc3.ebuild b/dev-util/cmake/cmake-3.18.0.ebuild
index 3834479c5035..785002015913 100644
--- a/dev-util/cmake/cmake-3.18.0_rc3.ebuild
+++ b/dev-util/cmake/cmake-3.18.0.ebuild
@@ -23,7 +23,7 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	app-crypt/rhash
-	>=app-arch/libarchive-3.0.0:=
+	>=app-arch/libarchive-3.3.3:=
 	>=dev-libs/expat-2.0.1
 	>=dev-libs/jsoncpp-1.9.2-r2:0=
 	>=dev-libs/libuv-1.10.0:=
@@ -66,6 +66,8 @@ PATCHES=(
 	"${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 #691544
+
 	# upstream fixes (can usually be removed with a version bump)
 )
 
diff --git a/dev-util/cmake/cmake-3.18.1.ebuild b/dev-util/cmake/cmake-3.18.1.ebuild
new file mode 100644
index 000000000000..c09e035ef01f
--- /dev/null
+++ b/dev-util/cmake/cmake-3.18.1.ebuild
@@ -0,0 +1,218 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+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-crypt/rhash
+	>=app-arch/libarchive-3.3.3:=
+	>=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
+	"${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 #691544
+
+	# upstream fixes (can usually be removed with a version bump)
+)
+
+cmake_src_bootstrap() {
+	# disable running of cmake in boostrap 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 actualy bootstrap it every time so why test it.
+	#    BundleUtilities: bundle creation broken
+	#    CMakeOnly.AllFindModules: pthread issues
+	#    CTest.updatecvs: which fails to commit as root
+	#    Fortran: requires fortran
+	#    RunCMake.CompilerLauncher: also requires fortran
+	#    RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
+	#        debugedit binary is not in the expected location
+	#    RunCMake.CPack_DEB: breaks if app-arch/dpkg is installed because
+	#        it can't find a deb package that owns libc
+	#    TestUpload, which requires network access
+	"${BUILD_DIR}"/bin/ctest \
+		-j "$(makeopts_jobs)" \
+		--test-load "$(makeopts_loadavg)" \
+		${ctestargs} \
+		-E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|Fortran|RunCMake.CompilerLauncher|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 ; 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)
+	)
+
+	if use qt5 ; then
+		mycmakeargs+=(
+			-DBUILD_QtDialog=ON
+			$(cmake_use_find_package qt5 Qt5Widgets)
+		)
+	fi
+
+	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/files/cmake-3.18.0-filter_distcc_warning.patch b/dev-util/cmake/files/cmake-3.18.0-filter_distcc_warning.patch
new file mode 100644
index 000000000000..07d89ee5e2b4
--- /dev/null
+++ b/dev-util/cmake/files/cmake-3.18.0-filter_distcc_warning.patch
@@ -0,0 +1,17 @@
+https://bugs.gentoo.org/691544
+
+Patch-by: Felix W. <felix.wischke@gmail.com>
+
+Forward-ported from 3.16.5 to 3.18.0
+
+--- cmake-3.18.0/Source/Checks/cm_cxx_features.cmake
++++ cmake-3.18.0/Source/Checks/cm_cxx_features.cmake
+@@ -36,6 +36,8 @@
+     string(REGEX REPLACE "[^\n]*icpc: command line warning #10121: overriding [^\n]*" "" check_output "${check_output}")
+     # Filter out ld warnings.
+     string(REGEX REPLACE "[^\n]*ld: warning: [^\n]*" "" check_output "${check_output}")
++    # Filter out distcc.
++    string(REGEX REPLACE "[^\n]*distcc\\[[0-9]+\\][^\n]*[Ww]arning:[^\n]*" "" check_output "${check_output}")
+     # If using the feature causes warnings, treat it as broken/unavailable.
+     if(check_output MATCHES "(^|[ :])[Ww][Aa][Rr][Nn][Ii][Nn][Gg]")
+       set(CMake_HAVE_CXX_${FEATURE} OFF CACHE INTERNAL "TRY_COMPILE" FORCE)
diff --git a/dev-util/codeblocks/Manifest b/dev-util/codeblocks/Manifest
index b5b49eabfca5..059a2244de59 100644
--- a/dev-util/codeblocks/Manifest
+++ b/dev-util/codeblocks/Manifest
@@ -3,11 +3,13 @@ AUX codeblocks-17.12-nodebug.diff 611 BLAKE2B 03de6a604b0971e7b91702fd9a1f66aee6
 AUX codeblocks-20.03-env.patch 1365 BLAKE2B 550b86319823c8453000d0a3a5e1c9a0845bbf08464d04b0055c98d72a055e966e0a30606e3496a00da829686129faf263f4f5edb36843dd5f1d882a4b87a2ce SHA512 c20b11f463517386b95ae1a2f1acc5fe75e15f1976ac004934d8b7a6441f40d5d58ba86292ff6713c0b71a6abe9c1d99554f8928b6aedc9c6452f0aa80ea894d
 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 2377 BLAKE2B 843edc779b569c87d4f65e6892f4d56a6ecedae5d6774b4d72991374ff0a7a6f17ca28ded88539016a4ac4e711b925228600407b9e7158c67b257a38059023a4 SHA512 e4d337a6febad50650902849d6b0e9efa6165dd70053f3920a59503abacd9f93edc8fa2d26144cbcf4edfa7b989136608854cf46d22e5ffaac95b2b60d4b1dfc
+EBUILD codeblocks-17.12-r303.ebuild 2375 BLAKE2B 5cfbe24e5b2514baa89cbac19771d7dfbd160c21bbd3c83cdedd05a8a680e7a5e2a4f20849d20aa906244cf3699f43bc6452edbf678623cc943b18fca0064b55 SHA512 62a241a4617cd8c1f5d1416807c859ae3684b34323f08147e68d21834e6b25c844b63ed1d67738b9923d5f217071d1ec91c6485f7b31115f84a5b5b9ef7e67b6
+EBUILD codeblocks-20.03-r1.ebuild 1811 BLAKE2B 9a62643660fa3a3f365fb66cab17a0f9bed43aecf0472809bdc968c7d6950819020e1f21d1d4d377c1717c34c547814b941b19ab12f37138d17158ff4ad83b84 SHA512 adbf6c9798619695333751ce85e43affe2d74eb923728895ec58acdd268513d05db10a96718ed69af91ce1ab8318148cd717308776c307533fac02c3b740ddbf
 EBUILD codeblocks-20.03.ebuild 1740 BLAKE2B 884f97f9a0d2e1b3557d934aa177552ba3b7b2dc5c02b5c5ea4033a46c5552483cf7f9ff690b1c74f1a0303bdc10438844c1f56f15e51f595c65d0aa670389f1 SHA512 53af7ec712e57f1a80fe3af696467a07ef18730a2a8e5ed8a24956f8fb862736e538fbe6e4775ad2118118236d90147214351a523a4d666cb07d4c451012c14c
 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-r303.ebuild b/dev-util/codeblocks/codeblocks-17.12-r303.ebuild
index 3a4c47275908..6c32f926facd 100644
--- a/dev-util/codeblocks/codeblocks-17.12-r303.ebuild
+++ b/dev-util/codeblocks/codeblocks-17.12-r303.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="The open source, cross platform, free C, C++ and Fortran IDE"
 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"
diff --git a/dev-util/codeblocks/codeblocks-20.03-r1.ebuild b/dev-util/codeblocks/codeblocks-20.03-r1.ebuild
new file mode 100644
index 000000000000..37605d50b649
--- /dev/null
+++ b/dev-util/codeblocks/codeblocks-20.03-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+WX_GTK_VER="3.0-gtk3"
+
+inherit autotools wxwidgets xdg
+
+DESCRIPTION="The open source, cross platform, free C, C++ and Fortran IDE"
+HOMEPAGE="https://codeblocks.org/"
+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-update-v1.7.tar.xz"
+
+# 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
+
+IUSE="contrib debug fortran pch"
+
+BDEPEND="virtual/pkgconfig"
+
+RDEPEND="app-arch/zip
+	>=dev-libs/tinyxml-2.6.2-r3
+	>=dev-util/astyle-3.1-r2:0/3.1
+	x11-libs/wxGTK:${WX_GTK_VER}[X]
+	contrib? (
+		app-admin/gamin
+		app-text/hunspell
+		dev-libs/boost:=
+	)"
+
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-env.patch
+	"${WORKDIR}"/patches/
+	)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	setup-wxwidgets
+
+	# USE="contrib -fortran" setup:
+	use fortran || CONF_WITH_LST=$(use_with contrib contrib-plugins all,-FortranProject)
+	# USE="contrib fortran" setup:
+	use fortran && CONF_WITH_LST=$(use_with contrib contrib-plugins all)
+	# USE="-contrib fortran" setup:
+	use contrib || CONF_WITH_LST=$(use_with fortran contrib-plugins FortranProject)
+
+	econf \
+		--disable-static \
+		$(use_enable debug) \
+		$(use_enable pch) \
+		${CONF_WITH_LST}
+}
+
+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_pkg_postinst
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+}
diff --git a/dev-util/colm/Manifest b/dev-util/colm/Manifest
index eaf39cdf97db..7f99e5552070 100644
--- a/dev-util/colm/Manifest
+++ b/dev-util/colm/Manifest
@@ -1,8 +1,10 @@
 DIST colm-0.13.0.4.tar.gz 707983 BLAKE2B a6b03f24ebe8bf44dbb17b6bd3f545a33b58883fae403d927cd30a81dd2376ae0fd4271c308008d64865697e63cb7cc988465c28b22e56c2136cbd533b32e999 SHA512 4684a315f3fef7cd6ff0982e357b59b110c02dfc2ce00a207d5d16dd9475f41790f3cfec9ddb5347d20da879cb0beebc03d3c56c325ce2ef22438555fcf60402
 DIST colm-0.13.0.5.tar.gz 736026 BLAKE2B 75fb1748495ead2ac5527ce040efb76de264e10b6562c4af734735f5aa25f53fc12260cbe52f019ff04c5117155aeb96358771f20b3e02012639a08527a54d98 SHA512 c5a1228260327d65c2cb5821fbc583608e2a308927b04cb0e7dbc84bced60d0d62892b4e30aa2228fee0d08f6828dc58d88788340433bc5bba9d503977883fc9
 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 390 BLAKE2B cdc09b52c1787783cfe49fe1361559b0c5317d9ce9db7b0116f393fd818c17027b257685b15ee06e0cdc7fc3d9779e977dcd97d88ba63306c8cce5dd2bb1ca4d SHA512 1943cd5be8929df9a5c119a7cc9362ba1936440fc2fd77f3a80b1c94e5107709af590987dc32067cdfbea0daf9486e235bdbb3c7035c1bcdc2b57731a536302a
+EBUILD colm-0.13.0.5.ebuild 386 BLAKE2B 3e9d0c96638b21ecc8f7309e36a4d23dfc53147cc788ae20ea2b03e386fb61bfc1166ff843c8a2e4072267c86e0e629cb9b12d3cf00a8564e7d10486197726cc SHA512 3a2a5b53dd60eba3b15f39f02a94fcc81f8473f3eb001d5c612a571937ae908632c7d7aa16c97faedc53c2c1f7b7cbb67c69c4ad84d76d85afeeb220b5180440
 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
 MISC metadata.xml 253 BLAKE2B 7dac7f77dcc8de31f439cc6d7770a503f95be9c2f8ae57df9e725df941e2b31a90a43664a485a5fad9510b9ae060ba7aaaddba29324338dd9eb07d88a63c7dce SHA512 303268e1f46e337e32c64b544c0962ecbe8de1799c42736b3c3515b6f31954a655830c402317bd0534cac12059e17eeb5f360d010432dff795a136662a5c10f1
diff --git a/dev-util/colm/colm-0.13.0.5.ebuild b/dev-util/colm/colm-0.13.0.5.ebuild
index 4292b617eac2..a64627ad7bb8 100644
--- a/dev-util/colm/colm-0.13.0.5.ebuild
+++ b/dev-util/colm/colm-0.13.0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ 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"
+KEYWORDS="amd64 arm arm64 ~ia64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="app-text/asciidoc"
diff --git a/dev-util/colm/colm-0.13.0.7.ebuild b/dev-util/colm/colm-0.13.0.7.ebuild
new file mode 100644
index 000000000000..a7249366d3ad
--- /dev/null
+++ b/dev-util/colm/colm-0.13.0.7.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="COmputer Language Manipulation"
+HOMEPAGE="https://www.colm.net/open-source/colm/"
+SRC_URI="https://www.colm.net/files/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="app-text/asciidoc"
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-util/comparator/Manifest b/dev-util/comparator/Manifest
index ac57aa548506..58ddf931f315 100644
--- a/dev-util/comparator/Manifest
+++ b/dev-util/comparator/Manifest
@@ -2,5 +2,5 @@ AUX comparator-2.12-gcc10.patch 793 BLAKE2B 0bab88fa6aeaf046ee4dc569aeb0d3344a2a
 DIST comparator-2.10.tar.gz 1463175 BLAKE2B 58d6bddc5f785de3768ed2c4845b75af03c1fd7f646fc15efaeec09878a72355c46c64f67866217994797193aaba6d4214685c7be89be9872620dce5930238e8 SHA512 b880f7a4a0fbfad44c53606c6d97509305d8485f0ab76b62bb0d1d1d6d4be9fb81e7a08326e78cabd1a9314e6efbf3a966eb6393e424f59dc657975a63ce2988
 DIST comparator-2.12.tar.gz 1463333 BLAKE2B 081251a0a3cb2f99d5b74092a46a868741049d27c367fc9bc3445d35fe01eaaaee75f7afd3674ecdc2569c2ac1ef2d5acd838a546aa307b33c977c4c8a91db12 SHA512 dc5acf3d5900e293e3f0188c0809bc99f2f18edb55df882b2e12e66bc655e7faf030b8daffdd2d175234b398e6a8c125ca6af615933c998651d7f1579734b080
 EBUILD comparator-2.10.ebuild 866 BLAKE2B d57e9166f9a0f14ad04c4c2f686198f866699f1ae0eae03a93e256c9d3195bd008844861000b4a45d4b30092be377110067152133d39d07195c3cce705f39682 SHA512 21ed08a933430f6044de705507a60b875786762f9ca413cef8f74814122aeac931676dedd04c3a1b32b7651f9a6f904e878aefe625d4b255d4e84c27d5da0570
-EBUILD comparator-2.12.ebuild 964 BLAKE2B c9d913a687d3a58f7e07da2ff568469fa7567a41caaed32b5e30d3af238fc59246161ae660a7bf2b4d69504dbe0d248f7fdfa4e2ebc4cf0a1fc2c6d36867626d SHA512 296ebc6e810726346ec62107016c64788bf5b8a62c64e3de055a263f3e3ebf1b194397d609ac8164316413f6a10649e4e7bbecb280c78852907c3919c1ff4875
+EBUILD comparator-2.12.ebuild 960 BLAKE2B d1bbfb9c56d4c7c4303010e2a70da1eccadd1e043f86d2bff7957ee9e6ce575d9f79f618139933a1c5389390e5b074474d41caf8772df2f892c7629a93c3d67e SHA512 80e47685cdead18788c9dbf0cfc9528377c5b5ebe1db944fc8cf567154d77ffde63844967006d58ba118703ba904898c23661eb2d5dd7ea87dcc90ee4beb19d7
 MISC metadata.xml 434 BLAKE2B 383d68cbb1192908d9a2dbf445852696f4f819564bb414516f8d15ed444ae0dba20ebd59ee6211be104e947dd1c78488c3abfc7a4a040d6fea0165cae853a287 SHA512 d499eae431272e1541f286cba5dc150442c12848469604ce6696ebc2f60f0b394c3376ebee5a5757e884f1372f732415bb169e7393f27c59a4d0faa57952d7e0
diff --git a/dev-util/comparator/comparator-2.12.ebuild b/dev-util/comparator/comparator-2.12.ebuild
index 8184007cd403..ec0bfac3e03e 100644
--- a/dev-util/comparator/comparator-2.12.ebuild
+++ b/dev-util/comparator/comparator-2.12.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.catb.org/~esr/comparator/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm ~mips ~ppc ~ppc64 sparc x86"
 
 DEPEND="=app-text/docbook-xml-dtd-4.1.2*
 	app-text/xmlto"
diff --git a/dev-util/conan/Manifest b/dev-util/conan/Manifest
index f2488da5745c..8a95479a7503 100644
--- a/dev-util/conan/Manifest
+++ b/dev-util/conan/Manifest
@@ -1,5 +1,3 @@
-DIST conan-1.23.0.tar.gz 1024905 BLAKE2B cfa3e130be13ee175b1dc167b6d61666eddaf588b5954d9889c2d167806e8fb115290257ca839f6de407c87079472dba912b730e01a232d70375f2fe63ce7c28 SHA512 fa2b1b726e29ef553774267b50b0ace4f39a30bdf0a6d0e051576bc9b0e6cd1ed6cb166101c446d15734ebef9e89e17a101c10c0ead91c15de5aa1ebb102d0a8
-DIST conan-1.24.1.tar.gz 1043698 BLAKE2B 33e5aaa975a9819d0808c90ad97260b00aab6f4ae8ba6feb7d2c53622f0e72b87cc469c7c21994e2c228819bd364dc9b20822134c10665978bf996b653c014b9 SHA512 ab6e15c4291862d9d68661682ec9da8c126193ddb00b800e3d8f9dba07a516db307d22e590324ae3f059e39e897bc6bf590e53cc82d69431ce287031be7fe820
-EBUILD conan-1.23.0.ebuild 2405 BLAKE2B 0920cba1e65a77f711bb0b6f3476fb9e385b814a9dfc730a051a8679ceac398d86e95c44b3c83d4346e1918d41261f56ebab0b4d9f4c715b549452a1b6977400 SHA512 24e0e52584af9f7e1cffb1674bf55c944780e9091fd07beac9078e2532dbe5999eadc78e8bc486db9e63de1d944614c261debcbbf3c7b1a1d52eaceb0f8eb676
-EBUILD conan-1.24.1.ebuild 2347 BLAKE2B d1de907aec75daae75f3b5f06b227a6ba4983ff632c23551bead61caecac0a5f5b45e03451cae278d2e9202b785e7e0780e67d1755a9cced494928f92f8b8095 SHA512 331d6ee2a7d3fc563d9d3a4eb17392a46863164b57562b28f881616b78cea9a20e979e958c242226a95283baf1b5145d0affd20024be693ee04c06b93e98c3cd
+DIST conan-1.28.0.tar.gz 1135799 BLAKE2B 774f980b489bc2ee7973447829ac2f9062198ec85a1129e3cfcf34a490b969cb5c04546a8918b542bc15e429d75d8e7fe3bc29f9cd5c6cebb6f7270a921a47f2 SHA512 1366f37d774bcaeadaf27f459d9a3889424a21ad14cc0e59f978ccf77a2d4e1f3497e98533e325fe086735b9bdaee64fd2df6c228e62d7577533142ab28401c8
+EBUILD conan-1.28.0.ebuild 2467 BLAKE2B 49613a3e8404b0c78445740ee6951db73f6fa2c651a46e2c3e8e0ce3a629fe5b1c84417499c00587f1766f68718265f05174d01ba516d33344ace26793f3233f SHA512 4fce3d75d655146adfb2b3fdd7f78fb5e5890da4390941404bae5e355e9bfa34750b0e060875c18e7a6ba3f8d5bc240e6586755ab43cb0d9485f82ff6212e115
 MISC metadata.xml 739 BLAKE2B 475521b92c84335a4ebda1d68dac1905a99f96b0fbecc8f06b6918e0c075648024ba3bebeaf85cb11ef0b96b917a2ebcf2a0146bd5b37c976d90cee08365c595 SHA512 27c7a3cea74ef2e22fd3dd238fa736efd1786fea4eaf01b9b51e07f7276101ddd7022ad7aedf767d1dbcdba2c29ddf48c07581e4fe5ec089d5e10c5b880c9970
diff --git a/dev-util/conan/conan-1.23.0.ebuild b/dev-util/conan/conan-1.23.0.ebuild
deleted file mode 100644
index c7272407e629..000000000000
--- a/dev-util/conan/conan-1.23.0.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE="sqlite"
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-DESCRIPTION="Distributed C/C++ package manager"
-HOMEPAGE="https://conan.io/"
-SRC_URI="https://github.com/conan-io/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RESTRICT="!test? ( test )"
-
-# overly strict requirements?
-# https://github.com/conan-io/conan/blob/develop/conans/requirements.txt
-# https://github.com/conan-io/conan/blob/develop/conans/requirements_server.txt
-RDEPEND="
-	>=dev-python/bottle-0.12.8[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.3.3[${PYTHON_USEDEP}]
-	>=dev-python/deprecation-2.0[${PYTHON_USEDEP}]
-	>=dev-python/distro-1.0.2[${PYTHON_USEDEP}]
-	>=dev-python/fasteners-0.14.1[${PYTHON_USEDEP}]
-	>=dev-python/future-0.16.0[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
-	>=dev-python/node-semver-0.6.1[${PYTHON_USEDEP}]
-	>=dev-python/patch-ng-1.17.2[${PYTHON_USEDEP}]
-	>=dev-python/pluginbase-0.5[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
-	>=dev-python/pyjwt-1.4[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.7.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.8.1[${PYTHON_USEDEP}]
-	>=dev-python/six-1.12.0[${PYTHON_USEDEP}]
-	>=dev-python/tqdm-4.28.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-lang/go
-		dev-vcs/git
-		dev-vcs/subversion
-		>=dev-python/mock-1.3.0[${PYTHON_USEDEP}]
-		>=dev-python/nose-1.3.7[${PYTHON_USEDEP}]
-		>=dev-python/parameterized-0.6.3[${PYTHON_USEDEP}]
-		>=dev-python/webtest-2.0.18[${PYTHON_USEDEP}]
-		dev-util/cmake
-	)
-"
-
-src_prepare() {
-	default
-	# Fix strict dependencies
-	sed -i \
-		-e "s:patch-ng==1.17.2:patch-ng>=1.17.2:g" \
-		-e "s:six>=1.10.0,<1.13.0:six>=1.12.0:g" \
-		-e "s:node-semver==0.6.1:node-semver>=0.6.1:g" \
-		conans/requirements.txt || die
-}
-
-python_test() {
-	nosetests -v conans.test \
-		-e test_ftp.* -e modify_values_test.* -e test_pkg_config_path.* \
-		-e rpath_optin_test -e test_variables -e system_package_tool_installed_test \
-		-e virtualbuildenv_test -e scm_test -e test_git_shallow -e tools_test \
-		-e test_environment_nested -e devflow_test -e shared_chain_test \
-		-e virtualenv_test \
-		-A "not rest_api and not local_bottle" || die
-}
diff --git a/dev-util/conan/conan-1.24.1.ebuild b/dev-util/conan/conan-1.28.0.ebuild
index 5cedb0a5c462..f56e6bee76f3 100644
--- a/dev-util/conan/conan-1.24.1.ebuild
+++ b/dev-util/conan/conan-1.28.0.ebuild
@@ -57,8 +57,9 @@ src_prepare() {
 	default
 	# Fix strict dependencies
 	sed -i \
-		-e "s:six>=1.10.0,<1.14.0:six>=1.12.0:g" \
+		-e "s:six>=1.10.0,<=1.14.0:six>=1.12.0:g" \
 		-e "s:node-semver==0.6.1:node-semver>=0.6.1:g" \
+		-e "s:distro>=1.0.2, <1.2.0:distro>=1.0.2:g" \
 		conans/requirements.txt || die
 }
 
@@ -68,6 +69,7 @@ python_test() {
 		-e rpath_optin_test -e test_variables -e system_package_tool_installed_test \
 		-e virtualbuildenv_test -e scm_test -e test_git_shallow -e tools_test \
 		-e test_environment_nested -e devflow_test -e shared_chain_test \
+		-e test_toolchain_linux_0_Debug -e test_toolchain_linux_1_Release \
 		-e virtualenv_test \
 		-A "not rest_api and not local_bottle" || die
 }
diff --git a/dev-util/conf2struct/Manifest b/dev-util/conf2struct/Manifest
index aae11365dc88..a0a2b4454fc0 100644
--- a/dev-util/conf2struct/Manifest
+++ b/dev-util/conf2struct/Manifest
@@ -1,4 +1,6 @@
 DIST conf2struct-1.0.tar.gz 57393 BLAKE2B 7de4be755ec764d96a321c68ca68b3156889e24f6894ba78b1c88cbeff84525331f1105040d61b1121ca01ece8d50a5aee2268eb73cde3ebbc8b62f679e2451b SHA512 31e8f350af740e79d97f4698dfec9b5e8a31a8a1cee30da0af753db26eda5b61379e9156e1cb492aef5068a4987d5e8202215323b83328e99705ae3ad3c09b81
-EBUILD conf2struct-1.0.ebuild 751 BLAKE2B 43d814e2b9bd07265a5974c254d95a848a15b7c780d45858f3f9d66b053b765f3f2b34be7e2126917ef28cef3e190e61ac138145ec6c0047399e92fcd270fd1c SHA512 52c5655293ad5b472928d0a84a85ce95af28f136c32cedfea2b887391424a25fc28f123f0b4272cfd2a1c8fdd8055cb9a3461ff6449f2cba79397c9a02cb4ff5
-EBUILD conf2struct-9999.ebuild 746 BLAKE2B 1cac7507560a809eff988eb7bf1720fb5bc855b3381d165915be5b68a94e516fbbfd3688ca31157dba989012610a31196850d7859ea4d77b99a5405971ae41ec SHA512 468ae41d680187f9682a14d7f3f1e4097565dd7784a16d25c645b201c8350f742648392519dd6db4b7df32dafc6093f994aa260e1739c6149b04c961d7560824
+DIST conf2struct-1.3.tar.gz 58599 BLAKE2B 19cd7beb2663342d1d0e282c2ce45557f97110edec02eb1a9e29f92aceedd5837175a0898655ae403f8992d2754dc5094dc5c3c85014b109b066703956c9ec6c SHA512 eae91f85e44905fdc4274c0cc090a0748ded15824b87cdc3d026ec849d1cb13d14fb9b1bfb57d76da4687173d106065263499c1705db24f53ad4e95ba1d96b3c
+EBUILD conf2struct-1.0.ebuild 757 BLAKE2B 24e56adcb215fd3a4c211ee76b244ad1e212a1bec8d8ed9a5a4458e0aec63ec02ec2dbd1efbd904e4e40ced3062ff7614a3a6105e13ebecf2cf4778fdc4e4721 SHA512 630e9c2cc4dd7a2a1dac3ac70e7d542a2c0f971bf7682d29d0f14e528e65bcdf129e510405f741c3b8c057920090cbd8b63b576778a300080693a113345da941
+EBUILD conf2struct-1.3.ebuild 757 BLAKE2B 24e56adcb215fd3a4c211ee76b244ad1e212a1bec8d8ed9a5a4458e0aec63ec02ec2dbd1efbd904e4e40ced3062ff7614a3a6105e13ebecf2cf4778fdc4e4721 SHA512 630e9c2cc4dd7a2a1dac3ac70e7d542a2c0f971bf7682d29d0f14e528e65bcdf129e510405f741c3b8c057920090cbd8b63b576778a300080693a113345da941
+EBUILD conf2struct-9999.ebuild 757 BLAKE2B 24e56adcb215fd3a4c211ee76b244ad1e212a1bec8d8ed9a5a4458e0aec63ec02ec2dbd1efbd904e4e40ced3062ff7614a3a6105e13ebecf2cf4778fdc4e4721 SHA512 630e9c2cc4dd7a2a1dac3ac70e7d542a2c0f971bf7682d29d0f14e528e65bcdf129e510405f741c3b8c057920090cbd8b63b576778a300080693a113345da941
 MISC metadata.xml 334 BLAKE2B 8a441ec6c49f135a517821de0933e09c01861a135a0a16cad200acb2a695cb04bdc5d4d6ab076b95d7f547a8771984ee3cfca0c074ad1c41db3df5cee2876f60 SHA512 db25be9a745a1ebef49e8e477e24d715453cfe0bb698dc8e42ccf3ef8d8aac3cc9693e3f2873f28b3096016741bbf3c32841f025a06bcee61e9138ac2f6ee8b7
diff --git a/dev-util/conf2struct/conf2struct-1.0.ebuild b/dev-util/conf2struct/conf2struct-1.0.ebuild
index 842516d70e82..6891ffd1b8b0 100644
--- a/dev-util/conf2struct/conf2struct-1.0.ebuild
+++ b/dev-util/conf2struct/conf2struct-1.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/yrutschle/conf2struct.git"
 	inherit git-r3
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~s390 ~x86"
 	SRC_URI="https://github.com/yrutschle/conf2struct/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
diff --git a/dev-util/conf2struct/conf2struct-1.3.ebuild b/dev-util/conf2struct/conf2struct-1.3.ebuild
new file mode 100644
index 000000000000..6891ffd1b8b0
--- /dev/null
+++ b/dev-util/conf2struct/conf2struct-1.3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic systemd toolchain-funcs
+
+DESCRIPTION="Create C parsers for libconfig and command-line"
+HOMEPAGE="https://github.com/yrutschle/conf2struct/"
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/yrutschle/conf2struct.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~s390 ~x86"
+	SRC_URI="https://github.com/yrutschle/conf2struct/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-libs/libconfig
+	dev-perl/Conf-Libconfig"
+DEPEND="${RDEPEND}"
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" install
+}
diff --git a/dev-util/conf2struct/conf2struct-9999.ebuild b/dev-util/conf2struct/conf2struct-9999.ebuild
index 683376de085a..6891ffd1b8b0 100644
--- a/dev-util/conf2struct/conf2struct-9999.ebuild
+++ b/dev-util/conf2struct/conf2struct-9999.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/yrutschle/conf2struct.git"
 	inherit git-r3
 else
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~s390 ~x86"
 	SRC_URI="https://github.com/yrutschle/conf2struct/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
diff --git a/dev-util/confix/Manifest b/dev-util/confix/Manifest
deleted file mode 100644
index a8e8de03c747..000000000000
--- a/dev-util/confix/Manifest
+++ /dev/null
@@ -1,12 +0,0 @@
-AUX 2.1.0/jni-hpux.patch 461 BLAKE2B f0ebddbb5c5328711b0053740822767be4105574d02b4de73f33df98900a252ecb6fb35e63d986d0e3e3688138b7a1f5cd1d391667d76b40878b5b4644874c2f SHA512 7b16dcc84c7ecdc4f403daab1b8902dc995fc297f6df27be13a8acb542f253e01f8f1a66b0e3711948631e3618e18dd21e04e7496985c08f60ac10e2ad6b5967
-AUX 2.3.0/exeext.patch 890 BLAKE2B d99c1e76b993d47e048ff9e6c64c4f6dfe6901a7f40f56be272592c52c1f7f21979cd6e47efa9f5c98b801eb20e4b617ebc8c9ed65e0c8df8552979a571f761e SHA512 e9aab2698036cc872dd0c16c14a3594de568bfe9999a5a7dfd2eec5b1612d844b022693747541f005ea6448314d4329bfefbabc0b073dbcfbd9563265a047483
-AUX 2.3.0/ext-ac-archive.patch 1515 BLAKE2B 2234172ae4000ebd63558f70f35164f832a6dbfb8b5ff29f302366e3eba3ed80c0e8a2a5f4a0d492ec747134d7274be9986945f390b77864b517d7bc73757a44 SHA512 26ff04b4fc8b2283b5ca157e96d9c18111b116d3e4585f84ff4da6a89719f74c1b6b20eaa024adc40b321f313705eaa746a5204038ce0cc1ce3e25b11a1b2c8e
-AUX 2.3.0/local-libs-first.patch 1871 BLAKE2B f593e7b92a2845cb684a0ef2daa5dc7288b9bef948cce330dddb63d2a555be888d1801e6dd1264f407f9ad9e91a496bc05d2042c5cf2ec2ce766e14cff6d0d62 SHA512 1b6196c7fa4e132c1bd2013e559f4db8b21ea8497c5771cb7bd51e11efae9fd2e4c08af6a07bb6b911961f9e29ec4de683c7a5245a786002eef1f13894a6e533
-AUX 2.3.0/new-automake.patch 573 BLAKE2B cf1d7a8eb39827ef53a7777a61bd5d2ee7f81ffafd6a12806bd5f22a642ae99da386ecc763f54cc62a573770c2bd09437aeae253b91d825229f2234b08a25fe9 SHA512 216e4bcb753107107bb3e0f6e303984b5b282fbe80c72c97e7365c0729a3007b6f960b1ee3c4a311a5b5b81c179ab1daa171da5eec33900e158b8a73cc9f0338
-AUX confix-2.3.5-nodist-shar.patch 2036 BLAKE2B 899ce95bb3f2ee501190f8d5301119d342516130a1a64a2b9b8254546dc80584bd8b0ac216831e0e5bb528642eaa07bf35d203272693d1410ae07eef34775340 SHA512 f76b2b270e67074885230a5e7d26c99aedb21d909e8ff8948c220fd6f841c5c3b845679432630dcf70771ee2f6c9d54ce63268520073786ab2ce65165cc5c66e
-AUX confix-2.3.5-support-no_undefined.patch 8388 BLAKE2B 24f3a52619b257c3f15652c000781ac2ee71cba3e7071bd68b80a99319f4016fa836716b76bab90729bf5a9c48c23ab6659648c0b97faed594e59fef663f764f SHA512 279b5dd7a1536c54b8543af82296d8cb10938614364bf65c9e54d99ad7071c0ceb2914da0f6e460b3873796eac0b52107c158c03d53838585533165bf1cccc19
-DIST Confix-2.3.5.tar.bz2 678133 BLAKE2B 7aac9e7a6d3ffd629393e06c76bc13167e6b756a12e46a5d813a6e896c9cfd24ff384d8cda605507df402c1f8492c9759ac35834b1f84450b1e0fe8bf5de783b SHA512 e6adec0cd27e9064dd0f6ff32d2e68deb755631a27759b253a7a176525b515ffc9069b8f28ac48ee6fdb642dfc2098fd2d7d6bd6e4ecccd43cb92df12c48e4c7
-EBUILD confix-2.3.5-r2.ebuild 1988 BLAKE2B 5edbf955f72f3ebc0d490413f9ce87536e9cd38175cbcd4157147bacc42b865be7bbbf5200da2b4479c73f96dc42439aaaa0a72104e8553a3203a519bc102f7e SHA512 8ec55f5345572782c46abc716239dd6597c944f45eed56832c47a4be6d443b0fff09d616c98ba24e7667c7b512719af246b1da52c79a5dcbc573eb50d15f1976
-EBUILD confix-2.3.5-r3.ebuild 2156 BLAKE2B bab243ea9c40aeef21600a6af5101bdd8be08490b813d5947fe961b70765ac58bd910cadde8f4f847e622bfd550df69d6b65ea06cf9c49893ffd09ce7b05da5a SHA512 9120fadad71ff983ca5d0139912bbff034ffdadd74ed2ba9dc6f0a3050a849ef04dc7ff9e1a33a3551109cec6dc402261736b0db1bc571bfeedb20c4c056e1fe
-EBUILD confix-9999.ebuild 1914 BLAKE2B 0e5d34ff92d400b72cbea426ee83b5fec5bacc65b6c784c5911b7b54aecea5ac2a8cda45f2e135250d8f5960fceffaadb122f43b2384a61c7debcb58f7815333 SHA512 d2afb4f15fc0953a42b1c174581606a92f9182ddb3cea6e0a5c778e5ff1b03cacecaa7d9e9a1b307e51e08fda779b4126cb8a19763236e5b33e12356a1022baa
-MISC metadata.xml 329 BLAKE2B ce9d264f3d40c4c4a7078cfed1f27f93c06420904a98051031a91bc600c33708c10291128b48be7065eb493866d4a15d9140b5933954eba9716a7dde376e001a SHA512 a2e7c1b3ef9b2228e2820c0aa46354d771b518e7a5f854f1f06850840929846b12125b4f526a7f0282b3e9545c5cf7ed670ef2f2047c7deb0c6de40b9667b321
diff --git a/dev-util/confix/confix-2.3.5-r2.ebuild b/dev-util/confix/confix-2.3.5-r2.ebuild
deleted file mode 100644
index d840e82bf489..000000000000
--- a/dev-util/confix/confix-2.3.5-r2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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="Confix: A Build Tool on Top of GNU Automake"
-HOMEPAGE="http://confix.sourceforge.net"
-SRC_URI="mirror://sourceforge/confix/Confix-${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~amd64 ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=""
-RDEPEND="dev-util/confix-wrapper
-	sys-devel/autoconf-archive
-	sys-devel/automake
-	sys-devel/libtool"
-
-S="${WORKDIR}/Confix-${PV}"
-
-PATCHES=( # find jni-include dirs on hpux.
-	"${FILESDIR}"/2.1.0/jni-hpux.patch
-	# add .exe extension to TESTS
-	"${FILESDIR}"/2.3.0/exeext.patch
-	# use external autoconf archive
-	"${FILESDIR}"/2.3.0/ext-ac-archive.patch
-	# link local libraries first.
-	"${FILESDIR}"/2.3.0/local-libs-first.patch
-	# don't use automake 1.9, but any newer too...
-	"${FILESDIR}"/2.3.0/new-automake.patch )
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-pkg_preinst() {
-	local RV=2.3.0
-
-	if has_version "<dev-util/confix-${RV}"; then
-		einfo "After merging ${P} you might have to remerge all packages built"
-		einfo "with <dev-util/confix-${RV} in your EPREFIX to get all the"
-		einfo "repo files useable with current ${PN}".
-		ewarn
-		ewarn "Use this command (copy&paste) to identify packages built with confix"
-		ewarn "needing a remerge in your particular instance of Gentoo Prefix:"
-		ewarn
-		# use 'echo' to get this command from here:
-		ewarn "( cd \$(portageq envvar EPREFIX)/var/db/pkg || exit 1;" \
-			  "pattern=\$(cd ../../.. && echo \$(ls -d" \
-			  "usr/share/confix*/repo | grep -v confix-${RV}) |" \
-			  "sed -e 's, ,|,g'); if [[ -z \${pattern} ]]; then echo" \
-			  "'No more packages were built with broken Confix.'; exit 0;" \
-			  "fi; emerge --ask --oneshot \$(grep -lE \"(\${pattern})\"" \
-			  "*/*/CONTENTS | sed -e 's,^,>=,;s,/CONTENTS,,')" \
-			  ")"
-		ewarn
-	fi
-}
diff --git a/dev-util/confix/confix-2.3.5-r3.ebuild b/dev-util/confix/confix-2.3.5-r3.ebuild
deleted file mode 100644
index 11af017cd57e..000000000000
--- a/dev-util/confix/confix-2.3.5-r3.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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="Confix: A Build Tool on Top of GNU Automake"
-HOMEPAGE="http://confix.sourceforge.net"
-SRC_URI="mirror://sourceforge/confix/Confix-${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~amd64 ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=""
-RDEPEND="dev-util/confix-wrapper
-	sys-devel/autoconf-archive
-	sys-devel/automake
-	sys-devel/libtool"
-
-S="${WORKDIR}/Confix-${PV}"
-
-PATCHES=( # find jni-include dirs on hpux.
-	"${FILESDIR}"/2.1.0/jni-hpux.patch
-	# add .exe extension to TESTS
-	"${FILESDIR}"/2.3.0/exeext.patch
-	# use external autoconf archive
-	"${FILESDIR}"/2.3.0/ext-ac-archive.patch
-	# link local libraries first.
-	"${FILESDIR}"/2.3.0/local-libs-first.patch
-	# don't use automake 1.9, but any newer too...
-	"${FILESDIR}"/2.3.0/new-automake.patch
-	# support -no-undefined libtool flag
-	"${FILESDIR}"/${P}-support-no_undefined.patch
-	# drop deprecated 'dist-shar' automake flag
-	"${FILESDIR}"/${P}-nodist-shar.patch
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-pkg_preinst() {
-	local RV=2.3.0
-
-	if has_version "<dev-util/confix-${RV}"; then
-		einfo "After merging ${P} you might have to remerge all packages built"
-		einfo "with <dev-util/confix-${RV} in your EPREFIX to get all the"
-		einfo "repo files useable with current ${PN}".
-		ewarn
-		ewarn "Use this command (copy&paste) to identify packages built with confix"
-		ewarn "needing a remerge in your particular instance of Gentoo Prefix:"
-		ewarn
-		# use 'echo' to get this command from here:
-		ewarn "( cd \$(portageq envvar EPREFIX)/var/db/pkg || exit 1;" \
-			  "pattern=\$(cd ../../.. && echo \$(ls -d" \
-			  "usr/share/confix*/repo | grep -v confix-${RV}) |" \
-			  "sed -e 's, ,|,g'); if [[ -z \${pattern} ]]; then echo" \
-			  "'No more packages were built with broken Confix.'; exit 0;" \
-			  "fi; emerge --ask --oneshot \$(grep -lE \"(\${pattern})\"" \
-			  "*/*/CONTENTS | sed -e 's,^,>=,;s,/CONTENTS,,')" \
-			  ")"
-		ewarn
-	fi
-}
diff --git a/dev-util/confix/confix-9999.ebuild b/dev-util/confix/confix-9999.ebuild
deleted file mode 100644
index 3cedd69d8468..000000000000
--- a/dev-util/confix/confix-9999.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1 subversion
-
-DESCRIPTION="Confix: A Build Tool on Top of GNU Automake"
-HOMEPAGE="http://confix.sourceforge.net"
-ESVN_REPO_URI="https://svn.code.sf.net/p/confix/svn/confix/trunk"
-ESVN_PROJECT="${PN}"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS=""
-IUSE=""
-
-DEPEND=""
-RDEPEND="dev-util/confix-wrapper
-	sys-devel/autoconf-archive
-	sys-devel/automake
-	sys-devel/libtool"
-
-PATCHES=( # find jni-include dirs on hpux.
-	"${FILESDIR}"/2.1.0/jni-hpux.patch
-	# add .exe extension to TESTS
-	"${FILESDIR}"/2.3.0/exeext.patch
-	# use external autoconf archive
-	"${FILESDIR}"/2.3.0/ext-ac-archive.patch
-	# link local libraries first.
-	"${FILESDIR}"/2.3.0/local-libs-first.patch
-	# don't use automake 1.9, but any newer too...
-	"${FILESDIR}"/2.3.0/new-automake.patch )
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-pkg_preinst() {
-	local RV=2.3.0
-
-	if has_version "<dev-util/confix-${RV}"; then
-		einfo "After merging ${P} you might have to remerge all packages built"
-		einfo "with <dev-util/confix-${RV} in your EPREFIX to get all the"
-		einfo "repo files useable with current ${PN}".
-		ewarn
-		ewarn "Use this command (copy&paste) to identify packages built with confix"
-		ewarn "needing a remerge in your particular instance of Gentoo Prefix:"
-		ewarn
-		# use 'echo' to get this command from here:
-		ewarn "( cd \$(portageq envvar EPREFIX)/var/db/pkg || exit 1;" \
-			  "pattern=\$(cd ../../.. && echo \$(ls -d" \
-			  "usr/share/confix*/repo | grep -v confix-${RV}) |" \
-			  "sed -e 's, ,|,g'); if [[ -z \${pattern} ]]; then echo" \
-			  "'No more packages were built with broken Confix.'; exit 0;" \
-			  "fi; emerge --ask --oneshot \$(grep -lE \"(\${pattern})\"" \
-			  "*/*/CONTENTS | sed -e 's,^,>=,;s,/CONTENTS,,')" \
-			  ")"
-		ewarn
-	fi
-}
diff --git a/dev-util/confix/files/2.1.0/jni-hpux.patch b/dev-util/confix/files/2.1.0/jni-hpux.patch
deleted file mode 100644
index bd1b626e7bc2..000000000000
--- a/dev-util/confix/files/2.1.0/jni-hpux.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- Confix-2.0.0pre20/share/confix/autoconf-archive/m4src/ac_jni_include_dir.m4.orig	2007-02-07 21:16:20.000000000 +0100
-+++ Confix-2.0.0pre20/share/confix/autoconf-archive/m4src/ac_jni_include_dir.m4	2007-02-07 21:16:34.000000000 +0100
-@@ -67,6 +67,7 @@
- mingw*)			_JNI_INC_SUBDIRS="win32";;
- cygwin*)		_JNI_INC_SUBDIRS="win32";;
- interix*)		_JNI_INC_SUBDIRS="win32";;
-+hpux*)			_JNI_INC_SUBDIRS="hp-ux";;
- *)              _JNI_INC_SUBDIRS="genunix";;
- esac
- 
diff --git a/dev-util/confix/files/2.3.0/exeext.patch b/dev-util/confix/files/2.3.0/exeext.patch
deleted file mode 100644
index 98576f5c9f8b..000000000000
--- a/dev-util/confix/files/2.3.0/exeext.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -ru confix-9999.orig/libconfix/plugins/automake/makefile_am.py confix-9999/libconfix/plugins/automake/makefile_am.py
---- confix-9999.orig/libconfix/plugins/automake/makefile_am.py	2009-10-30 13:20:42.106291175 +0100
-+++ confix-9999/libconfix/plugins/automake/makefile_am.py	2009-10-30 13:23:39.562354663 +0100
-@@ -472,7 +472,15 @@
-         
-         # register automatic tests and set their environment
- 
--        tests = self.dir_primary('check', 'PROGRAMS') + \
-+        test_tmp = self.dir_primary('check', 'PROGRAMS')
-+        count = 0
-+        for prog in test_tmp:
-+            prog += "$(EXEEXT)"
-+            test_tmp[count] = prog
-+            count += 1
-+            pass
-+
-+        tests = test_tmp + \
-                 self.dir_primary('check', 'SCRIPTS')
-         if len(tests):
-             lines.extend(makefile.List(name='TESTS', values=tests, mitigate=True).lines())
diff --git a/dev-util/confix/files/2.3.0/ext-ac-archive.patch b/dev-util/confix/files/2.3.0/ext-ac-archive.patch
deleted file mode 100644
index 32122c95bfe2..000000000000
--- a/dev-util/confix/files/2.3.0/ext-ac-archive.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -ru confix-9999.orig/libconfix/plugins/automake/bootstrap.py confix-9999/libconfix/plugins/automake/bootstrap.py
---- confix-9999.orig/libconfix/plugins/automake/bootstrap.py	2009-10-30 13:25:27.962172020 +0100
-+++ confix-9999/libconfix/plugins/automake/bootstrap.py	2009-10-30 13:27:14.780605001 +0100
-@@ -16,7 +16,7 @@
- # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- # USA
- 
--import autoconf_archive
-+#import autoconf_archive
- import kde_hack
- 
- from libconfix.core.utils.error import Error
-@@ -29,7 +29,7 @@
- 
- def bootstrap(packageroot, use_kde_hack, argv0, path=None):
-     aclocal_incdirs = []
--    aclocal_incdirs.append(autoconf_archive.include_path(argv0))
-+    #aclocal_incdirs.append(autoconf_archive.include_path(argv0))
- 
-     # if package's configure.ac looks like using libtool, then we
-     # assume that the package must be libtoolize'd.
-diff -ru confix-9999.orig/setup.py confix-9999/setup.py
---- confix-9999.orig/setup.py	2009-10-30 13:25:27.965360137 +0100
-+++ confix-9999/setup.py	2009-10-30 13:26:47.822129311 +0100
-@@ -41,8 +41,8 @@
-     return result
- 
- datafiles = []
--datafiles.extend(recdir('share/confix/autoconf-archive/m4src', '.m4', []))
--datafiles.extend(recdir('share/confix/autoconf-archive/htmldoc', '.html', []))
-+#datafiles.extend(recdir('share/confix/autoconf-archive/m4src', '.m4', []))
-+#datafiles.extend(recdir('share/confix/autoconf-archive/htmldoc', '.html', []))
- 
- # scripts to put in the auxdir.
- datafiles.extend([('share/confix/kde-hack',
diff --git a/dev-util/confix/files/2.3.0/local-libs-first.patch b/dev-util/confix/files/2.3.0/local-libs-first.patch
deleted file mode 100644
index 29d4a7a1cc9d..000000000000
--- a/dev-util/confix/files/2.3.0/local-libs-first.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-With libtool, link local libraries with /path/to/libfile.la instead of libpath,
-to avoid encoding local libpath into installed la-file.
-These also have to be linked first, to avoid finding already installed
-libraries of previous versions during libtool-relink.
-diff -ru Confix-2.3.0.orig/libconfix/plugins/automake/c/out_c.py Confix-2.3.0/libconfix/plugins/automake/c/out_c.py
---- Confix-2.3.0.orig/libconfix/plugins/automake/c/out_c.py	2010-07-06 12:55:59.286540943 +0200
-+++ Confix-2.3.0/libconfix/plugins/automake/c/out_c.py	2010-07-06 13:01:23.574428852 +0200
-@@ -411,6 +411,8 @@
-         """
-         assert isinstance(linked_builder, LinkedBuilder)
-         
-+        local_paths = []
-+        local_libraries = []
-         native_paths = []
-         native_libraries = []
-         external_linkline = []
-@@ -424,8 +426,11 @@
- 
-         for bi in native_libs_to_use:
-             if isinstance(bi, BuildInfo_CLibrary_NativeLocal):
--                native_paths.append('-L'+'/'.join(['$(top_builddir)']+bi.dir()))
--                native_libraries.append('-l'+bi.basename())
-+                if self.__use_libtool:
-+                    local_libraries.append('/'.join(['$(top_builddir)']+bi.dir()+['lib'+bi.basename()+'.la']))
-+                else:
-+                    local_paths.append('-L'+'/'.join(['$(top_builddir)']+bi.dir()))
-+                    local_libraries.append('-l'+bi.basename())
-                 continue
-             if isinstance(bi, BuildInfo_CLibrary_NativeInstalled):
-                 using_installed_library = True
-@@ -447,7 +452,7 @@
-             external_linkline.extend(elem)
-             pass
- 
--        return native_paths + native_libraries + external_linkline
-+        return local_paths + local_libraries + native_paths + native_libraries + external_linkline
- 
-     def external_libpath(self):
-         """ For unit tests only. """
diff --git a/dev-util/confix/files/2.3.0/new-automake.patch b/dev-util/confix/files/2.3.0/new-automake.patch
deleted file mode 100644
index d6f24a4cae81..000000000000
--- a/dev-util/confix/files/2.3.0/new-automake.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru Confix-2.3.0.orig/libconfix/plugins/automake/out_automake.py Confix-2.3.0/libconfix/plugins/automake/out_automake.py
---- Confix-2.3.0.orig/libconfix/plugins/automake/out_automake.py	2010-07-12 13:15:49.254867387 +0200
-+++ Confix-2.3.0/libconfix/plugins/automake/out_automake.py	2010-07-12 13:17:29.755908602 +0200
-@@ -170,7 +170,7 @@
- 
- 
-         # our minimum required automake version is 1.9
--        self.makefile_am().add_automake_options('1.9')
-+        # self.makefile_am().add_automake_options('1.9')
- 
- 
-         # enable dist'ing in the following formats
diff --git a/dev-util/confix/files/confix-2.3.5-nodist-shar.patch b/dev-util/confix/files/confix-2.3.5-nodist-shar.patch
deleted file mode 100644
index bccc437de44c..000000000000
--- a/dev-util/confix/files/confix-2.3.5-nodist-shar.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-------------------------------------------------------------------------
-r961 | mhaubi | 2017-09-26 15:34:00 +0200 (Tue, 26 Sep 2017) | 1 line
-
-drop 'dist-shar', deprecated by newer automake
-
-Index: doc/confix.texi
-===================================================================
-#--- doc/confix.texi	(revision 960)
-#+++ doc/confix.texi	(working copy)
-#@@ -992,9 +992,6 @@
- @code{dist-bzip2} creates a @file{.tar.bz2} distribution.
- 
- @item
--@code{dist-shar} creates a shell archive distribution.
--
--@item
- @code{dist-zip} create a zip file (popular on Windows).
- 
- @item
-Index: libconfix/plugins/automake/out_automake.py
-===================================================================
---- libconfix/plugins/automake/out_automake.py	(revision 960)
-+++ libconfix/plugins/automake/out_automake.py	(working copy)
-@@ -175,7 +175,6 @@
- 
-         # enable dist'ing in the following formats
-         self.makefile_am().add_automake_options('dist-bzip2')
--        self.makefile_am().add_automake_options('dist-shar')
-         self.makefile_am().add_automake_options('dist-zip')
- 
- 
-Index: libconfix/plugins/automake/tests/output.py
-===================================================================
---- libconfix/plugins/automake/tests/output.py	(revision 960)
-+++ libconfix/plugins/automake/tests/output.py	(working copy)
-@@ -146,7 +146,7 @@
- 
-         self.failUnless('1.9' in rootdir_automake_builder.makefile_am().automake_options())
-         self.failUnless('dist-bzip2' in rootdir_automake_builder.makefile_am().automake_options())
--        self.failUnless('dist-shar' in rootdir_automake_builder.makefile_am().automake_options())
-+        self.failUnless('dist-shar' not in rootdir_automake_builder.makefile_am().automake_options())
-         self.failUnless('dist-zip' in rootdir_automake_builder.makefile_am().automake_options())
-         self.failUnless(const.CONFIX2_DIR in rootdir_automake_builder.makefile_am().extra_dist())
-         self.failUnless(const.CONFIX2_PKG in rootdir_automake_builder.makefile_am().extra_dist())
diff --git a/dev-util/confix/files/confix-2.3.5-support-no_undefined.patch b/dev-util/confix/files/confix-2.3.5-support-no_undefined.patch
deleted file mode 100644
index a6ffaae89c98..000000000000
--- a/dev-util/confix/files/confix-2.3.5-support-no_undefined.patch
+++ /dev/null
@@ -1,213 +0,0 @@
-------------------------------------------------------------------------
-r960 | mhaubi | 2017-09-26 14:51:18 +0200 (Tue, 26 Sep 2017) | 10 lines
-
-add 'has_undefined_symbols' property for libraries
-
-Windows does not support undefined symbols in shared libraries,
-so libtool refuses to create DLLs without the -no-undefined flag.
-
-Adding explicit HAS_UNDEFINED_SYMBOLS(False) api call per library,
-and the optional (has_undefined_symbols=False) argument to AutoC().
-
-For backwards compatibility, default is (has_undefined_symbols=True).
-
-------------------------------------------------------------------------
-Index: libconfix/plugins/automake/c/out_c.py
-===================================================================
---- libconfix/plugins/automake/c/out_c.py	(revision 959)
-+++ libconfix/plugins/automake/c/out_c.py	(revision 960)
-@@ -487,6 +487,9 @@
-                 elif b.default_version() is not None:
-                     automake_output_builder.makefile_am().add_compound_ldflags(automakelibname, '-release '+b.default_version())
-                     pass
-+                if b.has_undefined_symbols() is False:
-+                    automake_output_builder.makefile_am().add_compound_ldflags(automakelibname, '-no-undefined')
-+                    pass
-                 pass
-             else:
-                 automake_output_builder.configure_ac().add_paragraph(
-Index: libconfix/plugins/c/clusterer.py
-===================================================================
---- libconfix/plugins/c/clusterer.py	(revision 959)
-+++ libconfix/plugins/c/clusterer.py	(revision 960)
-@@ -33,7 +33,7 @@
- import types
- 
- class CClustererSetup(Setup):
--    def __init__(self, linkednamefinder=None):
-+    def __init__(self, linkednamefinder=None, has_undefined_symbols=True):
-         assert linkednamefinder is None or isinstance(linkednamefinder, NameFinder)
-         Setup.__init__(self)
-         if linkednamefinder is None:
-@@ -41,10 +41,11 @@
-         else:
-             self.__namefinder = linkednamefinder
-             pass
-+        self.__has_undefined_symbols = has_undefined_symbols
-         pass
- 
-     def setup(self, dirbuilder):
--        clusterer = CClusterer(namefinder=self.__namefinder)
-+        clusterer = CClusterer(namefinder=self.__namefinder, has_undefined_symbols=self.__has_undefined_symbols)
-         dirbuilder.add_builder(clusterer)
-         dirbuilder.add_interface(CClustererInterfaceProxy(clusterer=clusterer))
-         pass
-@@ -51,11 +52,12 @@
-     pass
- 
- class CClusterer(Builder):
--    def __init__(self, namefinder):
-+    def __init__(self, namefinder, has_undefined_symbols=True):
-         Builder.__init__(self)
-         self.__namefinder = namefinder
-         self.__libname = None
-         self.__libtool_version_info = None
-+        self.__has_undefined_symbols = has_undefined_symbols
-         pass
- 
-     def shortname(self):
-@@ -85,6 +87,15 @@
-             pass
-         pass
- 
-+    def set_has_undefined_symbols(self, has_undefined_symbols):
-+        self.__has_undefined_symbols = has_undefined_symbols
-+        for builder in self.parentbuilder().iter_builders():
-+            if isinstance(builder, LibraryBuilder):
-+                builder.set_has_undefined_symbols(has_undefined_symbols)
-+                break
-+            pass
-+        pass
-+
-     def enlarge(self):
-         super(CClusterer, self).enlarge()
- 
-@@ -163,7 +174,8 @@
-             LibraryBuilder(
-                 basename=libname,
-                 version=self.__libtool_version_info,
--                default_version=self.package().version()))
-+                default_version=self.package().version(),
-+                has_undefined_symbols=self.__has_undefined_symbols))
-         for b in itertools.chain(nomain_builders, header_builders):
-             library.add_member(b)
-             pass
-@@ -229,6 +241,13 @@
-             pass
-         self.__clusterer.set_libtool_version_info(version)
-         pass
-+
-+    def HAS_UNDEFINED_SYMBOLS(self, has_undefined_symbols):
-+        if type(has_undefined_symbols) is not types.BooleanType:
-+            raise Error("HAS_UNDEFINED_SYMBOLS(): 'has_undefined_symbols' argument must be a boolean")
-+        self.__clusterer.set_has_undefined_symbols(has_undefined_symbols)
-+        pass
-+
-     pass
- 
- class NameFinder:
-Index: libconfix/plugins/c/explicit_iface.py
-===================================================================
---- libconfix/plugins/c/explicit_iface.py	(revision 959)
-+++ libconfix/plugins/c/explicit_iface.py	(revision 960)
-@@ -104,7 +104,7 @@
-         self.__dirbuilder.add_builder(yacc)
-         return yacc
- 
--    def LIBRARY(self, members, basename=None, version=None):
-+    def LIBRARY(self, members, basename=None, version=None, undefined_symbols=True):
-         the_basename = basename
-         if the_basename is None:
-             the_basename=LongNameFinder().find_libname(
-@@ -113,7 +113,8 @@
-             pass
-         library = LibraryBuilder(basename=the_basename,
-                                  version=version,
--                                 default_version=self.__dirbuilder.package().version())
-+                                 default_version=self.__dirbuilder.package().version(),
-+                                 has_undefined_symbols=undefined_symbols)
-         for m in members:
-             library.add_member(m)
-             pass
-Index: libconfix/plugins/c/library.py
-===================================================================
---- libconfix/plugins/c/library.py	(revision 959)
-+++ libconfix/plugins/c/library.py	(revision 960)
-@@ -25,7 +25,8 @@
-     def __init__(self,
-                  basename,
-                  version,
--                 default_version):
-+                 default_version,
-+                 has_undefined_symbols):
- 
-         # library version. passed to libtool as "-version-info
-         # <current>:<revision>:<age>", for example.
-@@ -40,6 +41,7 @@
-         self.__basename = basename
-         self.__version = version
-         self.__default_version = default_version
-+        self.__has_undefined_symbols = has_undefined_symbols
- 
-         self.__buildinfo_added = False
-         
-@@ -82,6 +84,10 @@
-         super(LibraryBuilder, self).force_enlarge()
-         pass
- 
-+    def set_has_undefined_symbols(self, has_undefined_symbols):
-+        self.__has_undefined_symbols = has_undefined_symbols
-+        pass
-+
-     def version(self):
-         return self.__version
- 
-@@ -88,4 +94,7 @@
-     def default_version(self):
-         return self.__default_version
- 
-+    def has_undefined_symbols(self):
-+        return self.__has_undefined_symbols
-+
-     pass
-Index: libconfix/plugins/c/setups/default_setup.py
-===================================================================
---- libconfix/plugins/c/setups/default_setup.py	(revision 959)
-+++ libconfix/plugins/c/setups/default_setup.py	(revision 960)
-@@ -25,8 +25,8 @@
- 
- from libconfix.core.machinery.setup import CompositeSetup
- 
--def make_core_setups(linkednamefinder):
--    return [CClustererSetup(linkednamefinder=linkednamefinder),
-+def make_core_setups(linkednamefinder, has_undefined_symbols):
-+    return [CClustererSetup(linkednamefinder=linkednamefinder, has_undefined_symbols=has_undefined_symbols),
-             CCreatorSetup(),
-             CommonInterfaceSetup(),
-             RelocatedHeadersSetup(),
-@@ -34,8 +34,9 @@
- 
- class DefaultCSetup(CompositeSetup):
-     def __init__(self,
--                 linkednamefinder=None):
--        setups = make_core_setups(linkednamefinder=linkednamefinder)
-+                 linkednamefinder=None,
-+                 has_undefined_symbols=True):
-+        setups = make_core_setups(linkednamefinder=linkednamefinder, has_undefined_symbols=has_undefined_symbols)
-         setups.append(ImplicitInterfaceSetup())
-         CompositeSetup.__init__(
-             self,
-Index: libconfix/setups/c.py
-===================================================================
---- libconfix/setups/c.py	(revision 959)
-+++ libconfix/setups/c.py	(revision 960)
-@@ -26,7 +26,7 @@
-     pass
- 
- class AutoC(CompositeSetup):
--    def __init__(self, libnamefinder=None):
--        CompositeSetup.__init__(self, [DefaultCSetup(libnamefinder)])
-+    def __init__(self, libnamefinder=None, has_undefined_symbols=True):
-+        CompositeSetup.__init__(self, [DefaultCSetup(libnamefinder, has_undefined_symbols=has_undefined_symbols)])
-         pass
-     pass
diff --git a/dev-util/confix/metadata.xml b/dev-util/confix/metadata.xml
deleted file mode 100644
index 5cbfb3aa5288..000000000000
--- a/dev-util/confix/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>haubi@gentoo.org</email>
-		<name>Michael Haubenwallner</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">confix</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/cucumber-wire/Manifest b/dev-util/cucumber-wire/Manifest
index 22fd43df5313..2b83c113d234 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 372553be72b92ed8b1a1a914365b58b1a02209a1008496ce9ceb43e7f5293ebe9b25fe3a5fc594b2cf94807edcf5070646ba0780572402f2dc9024698a5eb573 SHA512 58bcb7a1e540358898672d14bc0929528ebb79f14cc49ec607a662b2906c9f7c080757780608f7b42b9d49fca490f8540e7ac636383e09310ece1e805790fe89
+EBUILD cucumber-wire-0.0.1-r1.ebuild 519 BLAKE2B 680fe7f8d7649d25f4ccfd783f046a943498459a6c4161603572f01172a479378a6f86368a1d37f34288fa94f5df737af95f6bb40c4cf6998ae36a3c4e2a0adc SHA512 23c363b10d3318b1ccc065a419d55f82469ea710b4d61702521f563abddb607934738e4418c312abf981d0c2a7bff9756d3bc48053f9d66ea82af7c02d0a8b5c
 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 1c387211d172..89a7ca5d33f6 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
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
diff --git a/dev-util/cucumber/Manifest b/dev-util/cucumber/Manifest
index 1ceb32e2ce10..e983f60ecdc4 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.2.0.ebuild 2864 BLAKE2B 8f891675e0868445ec90c52907d154fb2d3027eac9b2f26ef2990fe0cf3d02d536c358ab28fa0575048696a993743ae9c7826a6c36f2996cdef7389180ff76e1 SHA512 4578e3f61d418a71e5e4f7290f1a10b735a856796f5445bf42dd80de5a36690d37f1273cc0061b8c6131ec0159a5f2e03f4a8c4251e7ba7ccf5a2549c37c3f2b
+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.2.0.ebuild b/dev-util/cucumber/cucumber-3.2.0.ebuild
index 5df0c4c097af..9904c9eb2531 100644
--- a/dev-util/cucumber/cucumber-3.2.0.ebuild
+++ b/dev-util/cucumber/cucumber-3.2.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26"
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 
 # Documentation task depends on sdoc which we currently don't have.
 RUBY_FAKEGEM_TASK_DOC=""
@@ -40,7 +40,7 @@ ruby_add_rdepend "
 	dev-util/cucumber-core:3.2
 	>=dev-util/cucumber-expressions-6.0.1:6.0
 	>=dev-util/cucumber-wire-0.0.1:0
-	>=dev-ruby/diff-lcs-1.3:0
+	=dev-ruby/diff-lcs-1.3*:0
 	>=dev-ruby/gherkin-5.1.0:5
 	>=dev-ruby/multi_json-1.7.5
 	>=dev-ruby/multi_test-0.1.2
diff --git a/dev-util/cutter/Manifest b/dev-util/cutter/Manifest
index 43f5b7ec098f..be5c1e7ee361 100644
--- a/dev-util/cutter/Manifest
+++ b/dev-util/cutter/Manifest
@@ -1,13 +1,4 @@
-AUX cutter-1.10.1-radare2-4.3.0.patch 492 BLAKE2B 3f6115c29ffcacabcb6fed3870f73bbf4dbbd5d5afd4ccf0c44d1a40e98519f44a8611571ee491f21c675edfad01ed4ff1d132e64f122c7ca7859a1081ef0c0b SHA512 ca97982571f98cb4549ddf82e0d8c13214c2006cf30710d55073b7704b8e6561b6c597157011af70af2e57a058ccade89cee56d18207453b2a367a5a18b7c228
 AUX cutter-1.10.3-python3-config.patch 1240 BLAKE2B 8b08b4a86f20196f42931ad8a36de42aea662b634c08911e762253303c3efa90fcf6f42582b23e273b5ed0761ef403b15b3270fe3d56506def9d398af2a7335e SHA512 44ee6b1b75b8a0349144ed9094fd5efc42f22415019583392910dfe0aca263d83192558e70b87945ff8c35f2eca988a4b5f45ab9f3f1bf1ad6f793d0510a4c77
-AUX cutter-1.10.3-qt-5.15.patch 1052 BLAKE2B e1f4342f73da70bd49b1a51c4962e3c95b2895263641143a419b122d8122b94847ebd27b3d7b68652e8d37d24efb5737e90585093ed46eb6f3028677ad444686 SHA512 0288638c03600b9b11d5aa5f432ed15b43f75791f43751cb670973ec69cf8c9f8c505b2a54981faaec0d7779458abe7c7ed77663db73222074bd4528463154b3
-AUX cutter-1.8.0-python3-config.patch 1133 BLAKE2B ec9af0be413e7ce04dbdffe68e58e8aab5ba69e588d69aee85b93e13bacafebda27aa3eb4b0859e26b7043b1c8d56fd86353930278e624503cff770cfb052f0a SHA512 67a749d3763050b684740a7039150e675a72fd7f32395d7b00e393477be6a920f432e7ee75285a0035cbc110cb6fff7e15f41ac6ebb9f623245c6ab0c76b2202
-DIST cutter-1.10.1.tar.gz 1839344 BLAKE2B 883d0fa3d224d190b2dbec66e0bad1f2a542357bec9ce168706d60fa23794be23841157815323c989c1ddab9e1e428446e50ca0d71a91f7dbc8f01fe796caee2 SHA512 66f530687810a0bea3e4fcdf9962427964454a4a26e8d626d970bca358aab16b7939857fdbe22f0a611cdbdfbf67b5ab5f12959d8f04549c4cf8177cae49a54b
-DIST cutter-1.10.3.tar.gz 1866223 BLAKE2B fe03da351b04511457ab9d5eaf1761a69237d125c7f835cb00f7c4eb5fd3cd3a2ca3dfafcd64757b115d68d14f0604f71da0ebf9993b839e89d1b55375df265f SHA512 8bee19ad5cc4304c52907247ac508bb10d1bf8251a0c75f96c01dbe918327f18ee0e76f831feca0c115134e08025fc9b79dc1d8e3e01925d4d2c960c8c67336d
-DIST cutter-1.8.2.tar.gz 1527164 BLAKE2B 49ad9d208d77332c87acb2ed389d854ed8866bd561e89582266effd448bd3f1260f2e8d91ebc2fcbb7beb40aec39e460bc7a327021a4339db157af5a809cbc19 SHA512 16cb6a158882f17435e4c146b021a7ddb61a331efcb53e5a29e3598f399e71b59003473fa5a07cc0769148e67b02dbf955051bbb5ceb4df69b4cf1805b85f4cc
-DIST cutter-1.9.0.tar.gz 1548575 BLAKE2B 810b6d9f3b203f79711e38b26b60f545fd65f96e5b7d7638538c074ab7dbe83104d79b11f6b552d16e4a30236c5965ed377ad7d9c71cb8fce0a1d9d13076cd54 SHA512 f9b68469320e0e54562612cba21632f69dfe1e0bb1f21d05d7f0a083208e11f2e1a0ab338f8db43fb324aa8538b6f93d566eda13283d5b96ab1127c2d846b388
-EBUILD cutter-1.10.1.ebuild 1057 BLAKE2B 0e69f2fe39258ebaafd1d7762bd5de7fcc5983fb5f4fba0bc87e1e1f0ba6d18c20969b2d5a5adc174f15fa6771f67b574e00e4ca4ecd6e85034cff5523394e42 SHA512 9107645f9fa7b302ec0bba142cfb80e907f22b8fa05af98b5eea7e83a0baef32aad39622719cdeab19fada018f1703f3fa5e91fe0cb8c466a82ffbec92f57d82
-EBUILD cutter-1.10.3.ebuild 1064 BLAKE2B bc65d52869e4e76d5ec74e1317fa5d45738185a3ad916a344fb2dc61ca764fd7429a8b3bfb9e3f23f99da8a667aa4167937e3d1c6f619ab8e92201b99fec5d43 SHA512 7754b1a0b783edaa916178f03aa22afb574487e1ad8588b48952564f194981aa8ac474fe1b7595427de04229411fe6283a35e7721c796ec60b1f62505df357fc
-EBUILD cutter-1.8.2.ebuild 1245 BLAKE2B a34d1b452f7fcadc22021dd4e1c5c5de55bf4ba0634bc2216f971e6bc7d299226e31a5caf07f4929d581eefb6eafce382297ee6631c665dc939d1c26300e9b66 SHA512 a8adece880ff5a6fd550d2ef0f18cd2bb1ad8f82d182643bdf61888f672101c9032eb14216e42c501f5d2db1d715f3bd2bf83c8a69e890470347c5cfa8fe98c5
-EBUILD cutter-1.9.0.ebuild 1245 BLAKE2B 680d680a6f462d2949b3f8a0bddc81e1518762d1dde458f71f1ccb44e3c1fc0dc18336d104791d3e8c4b3c86e581de6df9f1f5b89acb381ec0f4eb7d66efab39 SHA512 ccdc780dda57a3715a8c3e289add837ed03d3b18977a388591b3bfbf045108f36988ee6f6e7c424d7442061f1586e7a9080d0539f95745320d9c50024475f07d
-MISC metadata.xml 687 BLAKE2B 5b8a5f4de7ba5d53d9aa63fa173c39cc590af4700bae0fb950ae79c89c78c90e1ecef29ddae7fac2882bb5281ac4535c5c78d9192fdb0fee96f52b564bb8d362 SHA512 9a7255a0a0d560adc6569a5776bea0a0acefb3b2735ccf082fc599b03c50ccc40a3ddf98058031c01ae0bd5966ec569efb75c3fd982895854fe0bc2c26dea96b
+DIST cutter-1.11.0.tar.gz 1990964 BLAKE2B b996a3e4c55b3077a8aa54b3df5517d270410ab81f8a111865dc89dc6e61f2712ebd29c10be37a50d9bf143b98916bf48c5df9ed1bfaf936af714d4a12687052 SHA512 a69efee672fb0e142ac6c1fae287c463ec1e777a2ec6b604f412fd0c21b0614d2f05a289beb4602af70d6446f0a6263b353dcbd38d41a6466ae2cdbd14e0bea3
+EBUILD cutter-1.11.0.ebuild 1010 BLAKE2B f32a25c06b13e03d1078c4e0ffc246f9eec070122e64d00c374a3953e1af59bd2aa7de296e12c9409e5c26f443fc7f478250624b4f6d915b590c0e0b34b6570c SHA512 538e627e00f896a81b52aa695ca6cfefca46c26561c8a78061554380bf03fe5d56250b1f65d7f571d1df49bd189d6cea5b7900c21c46d95eb5cb8b72c0719dba
+MISC metadata.xml 451 BLAKE2B 1a4231b3e9d5deb080440e506f8395949488870f5565d44e579f1262efb62ebebd9acbb2293613ecc85853f0a469d322bd06c2aab2ae4a1c0a5e5e5218a3ac36 SHA512 39e84ad70a516e67d6f0491dc78cbb1479713bc2444d2ef751d34a33d26ae4db1a44de553fadaad6b3dce5b9fb1d3e8b7cca1001be25198d24f042ac8441e2d0
diff --git a/dev-util/cutter/cutter-1.10.1.ebuild b/dev-util/cutter/cutter-1.10.1.ebuild
deleted file mode 100644
index 5e855969acf6..000000000000
--- a/dev-util/cutter/cutter-1.10.1.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
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit qmake-utils xdg-utils python-single-r1
-
-DESCRIPTION="A Qt and C++ GUI for radare2 reverse engineering framework"
-HOMEPAGE="https://www.radare.org"
-SRC_URI="https://github.com/radareorg/cutter/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="
-	${PYTHON_DEPS}
-	>=dev-qt/qtcore-5.9.1:5
-	>=dev-qt/qtgui-5.9.1:5
-	>=dev-qt/qtsvg-5.9.1:5
-	>=dev-qt/qtwidgets-5.9.1:5
-	dev-qt/qtnetwork:5
-	>=dev-util/radare2-4.3.0
-"
-
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.8.0-python3-config.patch"
-	"${FILESDIR}/${PN}-1.10.1-radare2-4.3.0.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/cutter/cutter-1.10.3.ebuild b/dev-util/cutter/cutter-1.11.0.ebuild
index 6fea7b83cb00..f7cbb90b3173 100644
--- a/dev-util/cutter/cutter-1.10.3.ebuild
+++ b/dev-util/cutter/cutter-1.11.0.ebuild
@@ -8,13 +8,12 @@ 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"
+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"
-IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="
@@ -24,14 +23,13 @@ DEPEND="
 	dev-qt/qtnetwork:5
 	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5
-	>=dev-util/radare2-4.4.0
+	~dev-util/radare2-4.5.0
 "
 
 RDEPEND="${DEPEND}"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-1.10.3-python3-config.patch"
-	"${FILESDIR}/${P}-qt-5.15.patch" # https://github.com/radareorg/cutter/pull/2231
 )
 
 src_configure() {
diff --git a/dev-util/cutter/cutter-1.8.2.ebuild b/dev-util/cutter/cutter-1.8.2.ebuild
deleted file mode 100644
index c31e6b2f6d5e..000000000000
--- a/dev-util/cutter/cutter-1.8.2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit qmake-utils xdg-utils python-single-r1
-
-DESCRIPTION="A Qt and C++ GUI for radare2 reverse engineering framework"
-HOMEPAGE="https://www.radare.org"
-SRC_URI="https://github.com/radareorg/cutter/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="jupyter webengine"
-REQUIRED_USE="webengine? ( jupyter )
-	${PYTHON_REQUIRED_USE}"
-
-DEPEND="
-	${PYTHON_DEPS}
-	>=dev-qt/qtcore-5.9.1:5
-	>=dev-qt/qtgui-5.9.1:5
-	>=dev-qt/qtsvg-5.9.1:5
-	>=dev-qt/qtwidgets-5.9.1:5
-	dev-qt/qtnetwork:5
-	>=dev-util/radare2-3.5.1
-	jupyter? ( dev-python/jupyter )
-	webengine? ( >=dev-qt/qtwebengine-5.9.1:5[widgets] )
-"
-
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.8.0-python3-config.patch"
-)
-
-src_configure() {
-	local myqmakeargs=(
-		CUTTER_ENABLE_JUPYTER=$(usex jupyter true false)
-		CUTTER_ENABLE_QTWEBENGINE=$(usex webengine true false)
-		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/cutter/cutter-1.9.0.ebuild b/dev-util/cutter/cutter-1.9.0.ebuild
deleted file mode 100644
index 052885e5c900..000000000000
--- a/dev-util/cutter/cutter-1.9.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit qmake-utils xdg-utils python-single-r1
-
-DESCRIPTION="A Qt and C++ GUI for radare2 reverse engineering framework"
-HOMEPAGE="https://www.radare.org"
-SRC_URI="https://github.com/radareorg/cutter/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="jupyter webengine"
-REQUIRED_USE="webengine? ( jupyter )
-	${PYTHON_REQUIRED_USE}"
-
-DEPEND="
-	${PYTHON_DEPS}
-	>=dev-qt/qtcore-5.9.1:5
-	>=dev-qt/qtgui-5.9.1:5
-	>=dev-qt/qtsvg-5.9.1:5
-	>=dev-qt/qtwidgets-5.9.1:5
-	dev-qt/qtnetwork:5
-	>=dev-util/radare2-3.8.0
-	jupyter? ( dev-python/jupyter )
-	webengine? ( >=dev-qt/qtwebengine-5.9.1:5[widgets] )
-"
-
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.8.0-python3-config.patch"
-)
-
-src_configure() {
-	local myqmakeargs=(
-		CUTTER_ENABLE_JUPYTER=$(usex jupyter true false)
-		CUTTER_ENABLE_QTWEBENGINE=$(usex webengine true false)
-		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/cutter/files/cutter-1.10.1-radare2-4.3.0.patch b/dev-util/cutter/files/cutter-1.10.1-radare2-4.3.0.patch
deleted file mode 100644
index 590a07063c51..000000000000
--- a/dev-util/cutter/files/cutter-1.10.1-radare2-4.3.0.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur cutter-1.10.1-orig/src/core/Cutter.cpp cutter-1.10.1/src/core/Cutter.cpp
---- cutter-1.10.1-orig/src/core/Cutter.cpp	2020-02-01 16:54:36.000000000 +0100
-+++ cutter-1.10.1/src/core/Cutter.cpp	2020-03-08 16:05:36.332364202 +0100
-@@ -535,7 +535,7 @@
-     }
- 
-     ut64 hashLimit = getConfigut64("cfg.hashlimit");
--    r_bin_file_hash(core->bin, hashLimit, path.toUtf8().constData(), NULL);
-+    r_bin_file_compute_hashes(core->bin, hashLimit);
- 
-     fflush(stdout);
-     return true;
diff --git a/dev-util/cutter/files/cutter-1.10.3-qt-5.15.patch b/dev-util/cutter/files/cutter-1.10.3-qt-5.15.patch
deleted file mode 100644
index 0ce08dd798a9..000000000000
--- a/dev-util/cutter/files/cutter-1.10.3-qt-5.15.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/src/widgets/ColorPicker.cpp b/src/widgets/ColorPicker.cpp
-index 25df2e3ac..fd9ce0875 100644
---- a/src/widgets/ColorPicker.cpp
-+++ b/src/widgets/ColorPicker.cpp
-@@ -3,6 +3,7 @@
- 
- #include <QPaintEvent>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QMouseEvent>
- #include <QDesktopWidget>
- #include <QPixmap>
-diff --git a/src/widgets/ColorThemeListView.cpp b/src/widgets/ColorThemeListView.cpp
-index d79b7eb51..6013fa4da 100644
---- a/src/widgets/ColorThemeListView.cpp
-+++ b/src/widgets/ColorThemeListView.cpp
-@@ -3,6 +3,7 @@
- #include <QJsonArray>
- #include <QMap>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QFontMetrics>
- #include <QScreen>
- #include <QJsonArray>
-diff --git a/src/widgets/DisassemblyWidget.cpp b/src/widgets/DisassemblyWidget.cpp
-index 34c1efbe7..25e917e96 100644
---- a/src/widgets/DisassemblyWidget.cpp
-+++ b/src/widgets/DisassemblyWidget.cpp
-@@ -14,6 +14,7 @@
- #include <QRegularExpression>
- #include <QTextBlockUserData>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QSplitter>
- 
- 
diff --git a/dev-util/cutter/files/cutter-1.8.0-python3-config.patch b/dev-util/cutter/files/cutter-1.8.0-python3-config.patch
deleted file mode 100644
index e2ab05564721..000000000000
--- a/dev-util/cutter/files/cutter-1.8.0-python3-config.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -Naur cutter-1.8.0-orig/src/Cutter.pro cutter-1.8.0/src/Cutter.pro
---- cutter-1.8.0-orig/src/Cutter.pro	2019-03-27 12:14:42.436446303 -0400
-+++ cutter-1.8.0/src/Cutter.pro	2019-03-27 12:16:26.971448895 -0400
-@@ -118,10 +118,6 @@
- # Libraries
- include(lib_radare2.pri)
- 
--!win32 {
--    CONFIG += link_pkgconfig
--}
--
- CUTTER_ENABLE_PYTHON {
-     win32 {
-         PYTHON_EXECUTABLE = $$system("where python", lines)
-@@ -140,10 +136,13 @@
-             LIBS += -F$$PYTHON_FRAMEWORK_DIR -framework Python
-             DEFINES += MACOS_PYTHON_FRAMEWORK_BUNDLED
-         } else {
--            !packagesExist(python3) {
--                error("ERROR: Python 3 could not be found. Make sure it is available to pkg-config.")
-+            system(type python3-config) {
-+                LIBS += $$system(python3-config --libs)
-+                TMP = $$system(python3-config --includes)
-+                INCLUDEPATH += $$replace(TMP, "-I", "")
-+            } else {
-+                error("ERROR: Python 3 could not be found. Make sure it is available to python3-config.")
-             }
--            PKGCONFIG += python3
-         }
-     }
- 
diff --git a/dev-util/cutter/metadata.xml b/dev-util/cutter/metadata.xml
index f2af393dbcf5..f8896da76b61 100644
--- a/dev-util/cutter/metadata.xml
+++ b/dev-util/cutter/metadata.xml
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer type="person">
-        <email>otakuto.gentoo@gmail.com</email>
-        <name>Tact Yoshida</name>
-    </maintainer>
-    <maintainer type="project">
-        <email>proxy-maint@gentoo.org</email>
-        <name>Proxy Maintainers</name>
-    </maintainer>
-    <upstream>
-        <remote-id type="github">radareorg/cutter</remote-id>
-    </upstream>
-    <use>
-        <flag name="jupyter">Add support for jupyter notebook</flag>
-        <flag name="webengine">Use <pkg>dev-qt/qtwebengine</pkg> for in-app jupyter browser</flag>
-    </use>
+	<maintainer type="person">
+		<email>jchelmert3@posteo.net</email>
+		<name>John Helmert III</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">radareorg/cutter</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-util/cvise/Manifest b/dev-util/cvise/Manifest
index e351fab26975..4541cae1e71a 100644
--- a/dev-util/cvise/Manifest
+++ b/dev-util/cvise/Manifest
@@ -1,3 +1,5 @@
 DIST cvise-1.1.0.tar.gz 228867 BLAKE2B 08becb5ad00ef08a1f511c0bdb0cb649af1406dd035fe61f737ec6dfb5151215ae363272fc3676ce76e17234a88866ee1dd0664d82326f3ddb2ced2f1982aacf SHA512 66c09cb7e088fc36b0c36928e2eda19e7bef4fad4573fcedc06f2070136e74d7878f8056f406c2ade22fc465a75bf13dca9f4a1a319cd183187a2d66a441e661
+DIST cvise-1.6.0.tar.gz 243050 BLAKE2B 64c305426dbeaf2e3f3a92a902209b35fcc76b5f5a6d2e48fcc8e24d1325badc0839e70afa1381c6d1412c22a7e9dd41ca03d6ca714fa5082958378cc8863000 SHA512 9d4ee043c34748b600b49ac4f00463b853faff2809f8b581e9b07433a8f3bef4436d0e5d5a9dbff1b2d7c3a8ab1d6d4823e78787eb3e911a683808703b2e24b6
 EBUILD cvise-1.1.0.ebuild 1018 BLAKE2B 169493f2e01288a2adfc9d6071504da944fde4f68c1d137bd6df395424989a1569cf9073ed0673d75eca4656fda311587295c0eeb354dd69c318b991cd1010df SHA512 284ffd54f82b9776d450040ad1af394b348e1b52ec0392faa10fe23b64ee59e8992a0474924e9c5d6962ad2d241ae00903418c38f44f29909600a8b9572385da
+EBUILD cvise-1.6.0.ebuild 1164 BLAKE2B d481af85ea81eb7a558782c6b873e65a34065e1c88e1fa4128cb8877802b38f47b554206f1734f7563db89d9346bfbd143b0e4bfa7b6a51e025b0fc50a72a7a8 SHA512 d621473db6720f2d7b280da9b108b0ee51e20f75671bdf6b87a70970213d3d8a420eadfdb6dcc2915313c03dbcff6de06b02295707aa2aa26e0051b7c7db5abe
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/dev-util/cvise/cvise-1.6.0.ebuild b/dev-util/cvise/cvise-1.6.0.ebuild
new file mode 100644
index 000000000000..819ee2f921ed
--- /dev/null
+++ b/dev-util/cvise/cvise-1.6.0.ebuild
@@ -0,0 +1,59 @@
+# 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-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/dbus-test-runner/Manifest b/dev-util/dbus-test-runner/Manifest
index c5dd44e78d28..bedb44604ce4 100644
--- a/dev-util/dbus-test-runner/Manifest
+++ b/dev-util/dbus-test-runner/Manifest
@@ -1,3 +1,3 @@
 DIST dbus-test-runner-19.04.0.tar.gz 444289 BLAKE2B dc3b11c8d376103b320d98d211bf1ace035a2de5a1caceadd946bfdc46a6aab3fcf69fae15c7142500b9487a9832275a6157f887c8efcbbb56d13c8841609dd0 SHA512 5906225f0ce429ea218d7eb4c67281b7ef368d6a173965b214f4f4501e729002ca3293a94fd8afd3002f301cd1f2208cba01c733f678c2d51661220e8a7ce971
-EBUILD dbus-test-runner-19.04.0-r1.ebuild 1251 BLAKE2B ad73e831e5b9a107ecaed2cc2eebdc845ab5024740409123934c4ee2e8105b8656f5a643e1a4133e2beec3819f931e20bd47d7d648b3844233fb1ae4794c5a78 SHA512 49717e7234c64103ca694b11ed1a581cc66c5bcaab04300c1451853a58442fe2c448c28cc435df4d95be0b6d5d254ab63bd07d954988f7850f198fcef2213f7b
+EBUILD dbus-test-runner-19.04.0-r1.ebuild 1256 BLAKE2B 8363735fdb08434812962b230d42cff990553ba1d201447463a175366e27ac8c6adf75e20b307373e1facfdef49280b79b1154ac3d62d4196a131b0d88260d9a SHA512 72701ba777c80c8f69a7489c99e559d49300532c57c82fd5f200a4e4d7619844c7ee79b837765ff33f96efa9560b2e70292d31245a4e4949f656725f16c23006
 MISC metadata.xml 333 BLAKE2B f89765af341d1a643d414c714839c000611842e3c5f5e6e1c2a23376fc08940dd9d791163fc409c0b28884145f6e616d6837100d0a1286e676769421ed81ca15 SHA512 49280112f98ca94c67ad00e21fcf02da3848ec391852dcfe5cc065404449339f5c1f6bfe01825e7da2f58e1134648df630f4c1c292b6169df23f017544bcd299
diff --git a/dev-util/dbus-test-runner/dbus-test-runner-19.04.0-r1.ebuild b/dev-util/dbus-test-runner/dbus-test-runner-19.04.0-r1.ebuild
index cf085c064bc0..5605374e4ee7 100644
--- a/dev-util/dbus-test-runner/dbus-test-runner-19.04.0-r1.ebuild
+++ b/dev-util/dbus-test-runner/dbus-test-runner-19.04.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6..9} )
 inherit flag-o-matic python-single-r1
 
 DESCRIPTION="Run executables under a new DBus session for testing"
diff --git a/dev-util/debhelper/Manifest b/dev-util/debhelper/Manifest
index 610fd9597d45..59637cb865b5 100644
--- a/dev-util/debhelper/Manifest
+++ b/dev-util/debhelper/Manifest
@@ -1,7 +1,7 @@
 DIST debhelper_13.1.tar.xz 530828 BLAKE2B 582dccdad50a51907d2565fef34fefeebf79360af31691ad0c332bb04b12a2165af598a3d35088595aee3653ca27f049e22669236ee48376ab665ea7423c6d5e SHA512 8160a31a857c9e548e0c5527eb4c86fb5c452e5209a741c7a4600f03a48fd5b46fe07c4d1c64ad11c3af3b9f2e1d67df2d4e9d773bc432d6147540dab015e977
-DIST debhelper_13.tar.xz 526028 BLAKE2B cc6e5f7b2eee7822088e326c3bd3930c3da60a5942c3dc3732a787428bf43c985a2f2be681b6d85c88767e3b1cde3871db1be5b912ab35260b776924c54acfb7 SHA512 17e131fba58057383e7824cd93a27b9d7eed0a2191bc6499c4bc412b47889a91d53a6ad5ac8c637166748bd728f10fd5d3a83bd0d2626e491a8481fe5c1193e9
+DIST debhelper_13.2.tar.xz 540400 BLAKE2B a1734ecbd92eadc3f5fbd0b118ffb4c6b697b157c39cab7626bd734adb80c6dfd0061298220c5d5c7a7fff412a1a52490e7001c8d634596dc41389a7e81c7a74 SHA512 07fd1f32975a9d84940a15140875994d30fe4bc0a40b40fe83a1ff9a304121167345194802691326251490852e601c388cab5cd02c000a4a6768edd1259a7bbc
 DIST debhelper_9.20160814.tar.xz 344328 BLAKE2B 38791ab3dfb74d12e44226b79a377889911a08505cdb45cc0a6e653906edbafcac1038d1d9ff9f5fd9f714ed36681562ce7fb1c9c1109a8528523100128fced6 SHA512 63072ba35ec8c62ee4c4d44833712925264c808a91f1522ef6a73377f2da3d11b285a21ad39158fd44693c801916189261186c8c7b28096719328a81a0a65f62
 EBUILD debhelper-13.1.ebuild 1530 BLAKE2B 39d9f9b5772bc7806940fe0bf8f14e265ecbe9fa1a9a68e09394ad1ea6396a14b9562346f79a340c7ed3d21e54a9245720ddcd102449958554ac1e2d86f4e28a SHA512 b838f7546ecddbbecf8f07c11f0f7a92c69069297173c080a2fce21fcb06d525e0d54900698b005fc2f5f0b819ed5808f71d2ce1d4a16c66adbee7eb43cc6d7e
-EBUILD debhelper-13.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
diff --git a/dev-util/debhelper/debhelper-13.ebuild b/dev-util/debhelper/debhelper-13.2.ebuild
index 99dca21e93e2..99dca21e93e2 100644
--- a/dev-util/debhelper/debhelper-13.ebuild
+++ b/dev-util/debhelper/debhelper-13.2.ebuild
diff --git a/dev-util/debugedit/Manifest b/dev-util/debugedit/Manifest
index 16e8fd0fd592..3afcfbdf49ad 100644
--- a/dev-util/debugedit/Manifest
+++ b/dev-util/debugedit/Manifest
@@ -1,5 +1,3 @@
-DIST rpm-4.15.0.tar.bz2 4205632 BLAKE2B 3e9701582e82d4164a21374df78c7a9ab3ca4f9aeafc13706fd0aa27782a34d2a732d7ae9659589abc9f9b8a48ce5c2cdbbea72c46768f1baba28ded26817e5b SHA512 bca9cc9ef0ad53fa5cd257c29a0a0b9447956afe4024835f5416b13926bc8bbaf8aacd481e721b4a28983bc57f98b75b91750d39dd72de4876efa9d6db53a26c
 DIST rpm-4.15.1.tar.bz2 4243893 BLAKE2B 352695e1fdac231127c9a2a775ff1aa05c1f3acbb10b0678e06011f9e4a5124e48cc19dce83417866e0f3c92bfd94e9c52b8c1884151ee77559bea1020d3623e SHA512 6c66835da5a54349bcfba5cc69831c8c57568aabd53c5c2820ec78c361be5116fecd41777b097e9c49458f984a7beb054fa8ed453ff7263cad4a29a11f780767
-EBUILD debugedit-4.15.0.ebuild 1758 BLAKE2B b908d7f51d74fec0fcaefdbc7ae69e134a646a587254baa1fa91c09036bf0aef2393d9fe377a9df8c92221de5a6fd7970fa54d6d8b24b080b9181d3f4caf68c8 SHA512 4e6b42bbd97d9c8d4b1d97bccc81877de702dab2e81293cf4fc87299b10063962007f9a459224fe1ce3257d7ec15e07e23650dfbbe9165e4afd86d981122c8a1
-EBUILD debugedit-4.15.1.ebuild 1763 BLAKE2B 85fbcf14a35453749f97ae6dc3b2cd83a255f416c2adec7a87e4285ff283c084642789ed7d23a7dcd34ce5f2090bdfddc2f2f44f0d12c4c918c9a4cd397254be SHA512 c2c5937bdeaabbb2765abeb3c9ea74f4ff37d5ee1ad10121a8fcf37cffc8c0d236cb9b573e7331979eaf0745827dd5c71f269a53ae03d44d2b9c0b42181bcc44
+EBUILD debugedit-4.15.1.ebuild 1765 BLAKE2B 463b1295cb2cf4d8fd4914546610844495065a62d164b099b3352761b2329cb016d9fa15a1cfab3d8f348a1d9c9392eb4debac627b58af9402cc01d99244eba1 SHA512 29e6a33ff92e86ba3c7eb52eb593c97af3ca52fdf9df999984cdbe7ea2c2a3039619738b0877af42ff1b77515fac2249d603827abbe7c9bba86368f959242a29
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/dev-util/debugedit/debugedit-4.15.0.ebuild b/dev-util/debugedit/debugedit-4.15.0.ebuild
deleted file mode 100644
index c31eee2f2b6d..000000000000
--- a/dev-util/debugedit/debugedit-4.15.0.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2019 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 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.15.1.ebuild b/dev-util/debugedit/debugedit-4.15.1.ebuild
index dac8e1b8e5a2..ffc8eec35d4e 100644
--- a/dev-util/debugedit/debugedit-4.15.1.ebuild
+++ b/dev-util/debugedit/debugedit-4.15.1.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 ~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 f6699fa4c40c..28d9bfdc5e08 100644
--- a/dev-util/devhelp/Manifest
+++ b/dev-util/devhelp/Manifest
@@ -1,7 +1,7 @@
 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.30.1.tar.xz 317956 BLAKE2B 8646fb97f0649bc166c8a21472f4c638f37bdfdc9e34b7214f0e5bd32c1c78664cc320f978fb27e313de54e88cf31685596f4bf7f43235ae96345292db6a9fc1 SHA512 f6f028948edd4c6954eaeeb026bf69c11284d725925d354ef42ecc67275cdcac66e8d3657d95d50926350543489b2bb2fa3a194d99d01494bedac60d3a2b4bbc
 DIST devhelp-3.34.0.tar.xz 288352 BLAKE2B 26c8c05c161e5607492fc26f012280468ed247ad4c166013e9df5fc1c76d59f98034a157cb58be9554ec65f46520b7d0d2ba78de00134570e84ca5a5ba0dc504 SHA512 34ed48ed323827b01f7d32e186da856c788ddfe37d6836082a81e6c8e4cd7bfc2265309cc3b298a0aea542b85e9261987d47a5a4396d865ec7e4cc13a9d05814
-EBUILD devhelp-3.30.1.ebuild 1812 BLAKE2B c91d39303521e9713889b705880ccf73844d384ef862ac44bc27da7dd89642330a53f1895c987c130d9a045f338f7a2e21556f71a1c52f74fd662c451bd91387 SHA512 7bbf8b15ed05ba91002737ade2f2bafd818c20a94237f7816e538aa9f5103d18968be82f1105e333e1b4cb50c8024c72e832775431aff18e892dd369dae54f1e
-EBUILD devhelp-3.34.0.ebuild 1785 BLAKE2B de85382d7371bb1bb4360639396e4df2eb937e256db3a5abe431e310eaadb6c48384ba8da8508286919263968e9070b17e76dcbcf7d00e713d732c2819ef1b46 SHA512 ad45cb14f9f1839aabc3234d5238034a4c882608cd56cc38d1e2cdfed6be02c474d996c502d206a99fe3c72d26d66d0d660e62dc556aa8e18b16ec6f24740bf0
+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 1788 BLAKE2B b045297cc190cd06d0f8b1b3d160d93e0f338ca3918b84f7bce54722aa2bd802124d6e6193902c2b43a843bfec4fa7dff5ee50a7ba6bf28af67cf74122f1ac47 SHA512 2a81df40d83cf170e2bcd6ee481dcbd5556b6dc90fb723a6eb34412ccd02e954413fa5a3833f83b36133b168bdb396486aecd59e16ec275f8228f4061856d7b0
 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
index 2a8f559e7ffd..01b5ad885657 100644
--- a/dev-util/devhelp/devhelp-3.34.0.ebuild
+++ b/dev-util/devhelp/devhelp-3.34.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Devhelp"
 
 LICENSE="GPL-3+"
 SLOT="0/3-6" # subslot = 3-(libdevhelp-3 soname version)
-KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~ppc64 ~sparc x86"
 IUSE="gedit gtk-doc +introspection"
 REQUIRED_USE="gedit? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/dev-util/devhelp/devhelp-3.30.1.ebuild b/dev-util/devhelp/devhelp-3.36.2.ebuild
index f953d1ca536a..22133dbacde5 100644
--- a/dev-util/devhelp/devhelp-3.30.1.ebuild
+++ b/dev-util/devhelp/devhelp-3.36.2.ebuild
@@ -1,29 +1,29 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python3_{6,7} )
+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+"
+LICENSE="GPL-3+ CC-BY-SA-4.0"
 SLOT="0/3-6" # subslot = 3-(libdevhelp-3 soname version)
-KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~amd64 ~arm ~ppc64 ~sparc ~x86"
 IUSE="gedit gtk-doc +introspection"
 REQUIRED_USE="gedit? ( ${PYTHON_REQUIRED_USE} )"
 
-COMMON_DEPEND="
-	>=dev-libs/glib-2.56:2
+DEPEND="
+	>=dev-libs/glib-2.60:2
 	>=x11-libs/gtk+-3.22:3[introspection?]
-	>=net-libs/webkit-gtk-2.20:4[introspection?]
+	>=net-libs/webkit-gtk-2.24:4[introspection?]
 	>=gui-libs/amtk-5.0:5
 	gnome-base/gsettings-desktop-schemas
 	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
 "
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}
 	gedit? (
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep '
@@ -33,7 +33,7 @@ RDEPEND="${COMMON_DEPEND}
 	)
 "
 # libxml2 required for glib-compile-resources
-DEPEND="${COMMON_DEPEND}
+BDEPEND="
 	${PYTHON_DEPS}
 	dev-libs/libxml2:2
 	dev-util/glib-utils
@@ -46,8 +46,8 @@ DEPEND="${COMMON_DEPEND}
 "
 
 PATCHES=(
-	"${FILESDIR}"/${PV}-optional-introspection.patch
-	"${FILESDIR}"/${PV}-optional-gedit.patch
+	"${FILESDIR}"/3.30.1-optional-introspection.patch
+	"${FILESDIR}"/3.30.1-optional-gedit.patch
 )
 
 pkg_setup() {
@@ -66,7 +66,7 @@ src_configure() {
 
 src_install() {
 	meson_src_install
-	use gedit && python_optimize "${ED%/}"/usr/$(get_libdir)/gedit/plugins
+	use gedit && python_optimize "${ED}"/usr/$(get_libdir)/gedit/plugins
 }
 
 pkg_postinst() {
diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest
index 0054f2dc3c70..9514a0791619 100644
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@@ -1,5 +1,3 @@
-DIST diffoscope-149.tar.gz 1570458 BLAKE2B 8182822f01805277937bf6993094a2ad2e32fde47a67a01a071691487582c22f9be9e299701ad2feda85ce79d5952747348e3180b22e60878d01f28f6e8a9ff5 SHA512 557f0edcd5620a097668108a223f3f58338890eaeb096982c398f1182e26219027c4d62dab688a19743be1167d0affa9dbd6b7b7440fcf86a7f55ade7e3be288
-DIST diffoscope-150.tar.gz 1570701 BLAKE2B 74b146ca6940313817025ba1285ae529c17da82d3cb13dae1b3550cf900d626e774eda3b993f930cf2cc7cc72e0f47830c02ec8ad0d5eff18cefb259757663d3 SHA512 ae2932bcb44078c1ab932512251dfbdfb4d3df0113388b22c5d77e74b74f7efc0f9b4c0bffd6d79422d89d3be6bfe07f9aad337365e5ee704f2710de36cbf4b7
-EBUILD diffoscope-149.ebuild 2161 BLAKE2B 9ef4a812c5fec5a923b0b796814052c00842cd36a447832fe65aed32c341454538ddccce2baac0b038d8bf02cbed98a2023eeba33e8a7868f34a882331098c34 SHA512 e508fee8307b2e634ec33877124156fcb8afd43307747b1f61e18ecfeaac00c1140c1906ef87015f3b76f70ac5679c28fed47539e52ce0adc29c6257ad6deacb
-EBUILD diffoscope-150.ebuild 2161 BLAKE2B 9ef4a812c5fec5a923b0b796814052c00842cd36a447832fe65aed32c341454538ddccce2baac0b038d8bf02cbed98a2023eeba33e8a7868f34a882331098c34 SHA512 e508fee8307b2e634ec33877124156fcb8afd43307747b1f61e18ecfeaac00c1140c1906ef87015f3b76f70ac5679c28fed47539e52ce0adc29c6257ad6deacb
+DIST diffoscope-155.tar.gz 1571389 BLAKE2B 320f352d6d0dcdf231ac246188f698eacbf08bc3b3194e28c09e5e38a143e0718408309483087d81a57a9f5810aadd545caa8cb32390441f1f5b79f7639a768d SHA512 785e08aa9b2420d0e1fed63804c199b198344d991f04ebb402e18de45f8154ea7bf68a2e4b1551744600f5e99f750e798b89c5cc2fad09d56a8b018b0559c2ee
+EBUILD diffoscope-155.ebuild 2161 BLAKE2B fb5e4e91fc32b56175d45b589cd3c11bdb42b5b1c33910843d489ea311d4eade3860c777a94398908fe2c94a0bf8a15b91df62b4f7ce7dfb43b76ad452bc8184 SHA512 4713e398d39141876170b6864e497321743b868eaf62f181dcb8341f95a012f72c46db35c51ff08ff375b1439efc2b411f61e36b50950aecac333af0d0df377c
 MISC metadata.xml 2137 BLAKE2B 6ff55f85ebf3f769c10c3e17a69900918abe142e491b7b8460bed8fe6a036763a743324bf1a10e7a3772761b38c9632ff1352e9c6677ef691f81acc29dc321e9 SHA512 e782e12dc91d86612768a2e0c498f54a9728691a76008ee1e6cdbc4d8719c2593344f6c37786982abb0de7b85d743d7614652a2e8c9cd9fef053c3a32e1e484c
diff --git a/dev-util/diffoscope/diffoscope-150.ebuild b/dev-util/diffoscope/diffoscope-150.ebuild
deleted file mode 100644
index 63058ee2f20a..000000000000
--- a/dev-util/diffoscope/diffoscope-150.ebuild
+++ /dev/null
@@ -1,71 +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} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-DESCRIPTION="Will try to get to the bottom of what makes files or directories different"
-HOMEPAGE="https://diffoscope.org/ https://pypi.org/project/diffoscope/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file
-find gettext gif gpg gzip haskell hdf5 hex imagemagick iso java llvm
-mono opendocument pascal pdf postscript R rpm sqlite squashfs
-ssh tar tcpdump xz zip zstd"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/python-magic[${PYTHON_USEDEP}]
-	dev-python/libarchive-c[${PYTHON_USEDEP}]
-	dev-python/distro[${PYTHON_USEDEP}]
-	acl? ( sys-apps/acl )
-	binutils? ( sys-devel/binutils )
-	bzip2? ( app-arch/bzip2 )
-	libcaca? ( media-libs/libcaca )
-	colord? ( x11-misc/colord )
-	cpio? ( app-arch/cpio )
-	diff? ( sys-apps/diffutils )
-	docx? ( app-text/docx2txt )
-	dtc? ( sys-apps/dtc )
-	e2fsprogs? ( sys-fs/e2fsprogs )
-	file? ( sys-apps/file )
-	find? ( sys-apps/findutils )
-	gettext? ( sys-devel/gettext )
-	gif? ( media-libs/giflib )
-	gpg? ( app-crypt/gnupg )
-	gzip? ( app-arch/gzip )
-	haskell? ( dev-lang/ghc )
-	hdf5? ( sci-libs/hdf5 )
-	hex? ( app-editors/vim-core )
-	imagemagick? ( media-gfx/imagemagick )
-	iso? ( virtual/cdrtools )
-	java? ( virtual/jdk )
-	llvm? ( sys-devel/llvm )
-	mono? ( dev-lang/mono )
-	opendocument? ( app-text/odt2txt )
-	pascal? ( dev-lang/fpc )
-	pdf? (
-		app-text/pdftk
-		app-text/poppler
-		dev-python/PyPDF2[${PYTHON_USEDEP}]
-	)
-	postscript? ( app-text/ghostscript-gpl )
-	R? ( dev-lang/R )
-	rpm? ( app-arch/rpm )
-	sqlite? ( dev-db/sqlite:3 )
-	squashfs? ( sys-fs/squashfs-tools )
-	ssh? ( net-misc/openssh )
-	tar? ( app-arch/tar )
-	tcpdump? ( net-analyzer/tcpdump )
-	xz? ( app-arch/xz-utils )
-	zip? ( app-arch/unzip )
-	zstd? ( app-arch/zstd )
-"
-# Presence if filemagic's magic.py breaks imports
-# of dev-python/python-magic: https://bugs.gentoo.org/716482
-RDEPEND+=" !dev-python/filemagic"
diff --git a/dev-util/diffoscope/diffoscope-149.ebuild b/dev-util/diffoscope/diffoscope-155.ebuild
index 63058ee2f20a..572dad5645e4 100644
--- a/dev-util/diffoscope/diffoscope-149.ebuild
+++ b/dev-util/diffoscope/diffoscope-155.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{7,8} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit distutils-r1
 
diff --git a/dev-util/dogtail/Manifest b/dev-util/dogtail/Manifest
index c14ba7d64a0b..d532cfca3811 100644
--- a/dev-util/dogtail/Manifest
+++ b/dev-util/dogtail/Manifest
@@ -1,6 +1,4 @@
 AUX dogtail-0.9.10-gentoo-paths.patch 2705 BLAKE2B 6a3d9b7a7ced2388bea7216c4a6f95e531247b5d5f7316b64375215ea5a7e0e1a8deb974115bd613baf6d22c7af502efce01f00412cb8ff101042d08cfb9fe1d SHA512 ce792bf24713c8b2948874faa11ee53d341d4d1d25bba95cd11f9a31e2e76e813a20b0d9932268a2110c990de1fdf15382fa1867f02e31ea1d25349e48bb42c1
-DIST dogtail-0.9.10.tar.gz 125995 BLAKE2B e28e9a6330cefc8746b850501a5beba07e18f1e5d5f935ce182103a9ea4ffc95483b3530a705565cbfae1bff24da57839f7e7b6939f42821e31b287150e33b4d SHA512 08ce4ad6e5e492ab04be9964cc6583d96d2d8a707a49721c1bca9248e5c56702fe5d0d84dd992023f731fe87016c88e21929319baff561aa113c6e101343fc3e
 DIST dogtail-0.9.11.tar.gz 132832 BLAKE2B 9004216a3d96714e9bd524e6ffaad7892a3630c97b61293d9784bc04df353f3c09e6226f92329103768a38c55b7eecc5f23a1aec0e6cd4baf8012892bb7d5cb7 SHA512 b5880386d9952b3aceac95d8b7a4f5e8293b29a629019e7cc3aa57e13b35a9cfbd0fd2a9db5fed80b2ebf7225a1a05c7388a67da91b310434833b4c6efd02278
-EBUILD dogtail-0.9.10.ebuild 1464 BLAKE2B 707006fbb69cedd095772958addd16c2a39c4e97aa259cf893184f9bb33470626b2862cc1e0c39844b1e041d6f2333f198106909d66977e160c6acc472d0bcd0 SHA512 9c36d94b486edaf956b0f5c103de2f8dc7670ed50f2782290a98166402c4d6aecff567100b691cf20a1d1695c936f66a8e44281992ed0de3ac92d508a17dec28
 EBUILD dogtail-0.9.11.ebuild 1342 BLAKE2B 782b061825d37ba33672b2ee1810b2b10e71435ed5eca7de897a76bb595b7ffe9fe1bcf101f0706b5186cb5b06d6dc8c4f1e8096659c7edafe114b643da98df4 SHA512 c34317e66974162f30ccfb0bfa53b9a1e36954e19c3aff25496a68b63cf6050db8c50155108f68e576596fa6230a986dd5a6f6126e7ac4121a89de4c2bc291df
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/dev-util/dogtail/dogtail-0.9.10.ebuild b/dev-util/dogtail/dogtail-0.9.10.ebuild
deleted file mode 100644
index 9a03851f932f..000000000000
--- a/dev-util/dogtail/dogtail-0.9.10.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1 gnome2-utils xdg
-
-DESCRIPTION="GUI test tool and automation framework using accessibility framework"
-HOMEPAGE="https://gitlab.com/dogtail/dogtail/commits/master"
-SRC_URI="https://gitlab.com/${PN}/${PN}/raw/released/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/gobject-introspection
-	dev-python/pyatspi[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	x11-libs/gdk-pixbuf:2[introspection]
-	x11-libs/gtk+:3[introspection]
-	x11-libs/libwnck:3[introspection]
-	x11-base/xorg-server[xvfb]
-	x11-apps/xinit
-"
-DEPEND="${DEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-src_prepare() {
-	# Install docs in one place
-	sed "s:doc/${PN}:doc/${PF}:" -i setup.py || die
-
-	# Upstream loads resources relative to __file__, which doesn't work with
-	# gentoo's dev-lang/python-exec. So we need to add hard-coded paths.
-	eapply "${FILESDIR}"/${PN}-0.9.10-gentoo-paths.patch
-	sed -e "s:@EPREFIX_USR@:'${EPREFIX}/usr':" -i sniff/sniff || die "sed failed"
-
-	xdg_src_prepare
-	distutils-r1_src_prepare
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/dev-util/drone-cli/Manifest b/dev-util/drone-cli/Manifest
index 803948be4f35..5626c3da6919 100644
--- a/dev-util/drone-cli/Manifest
+++ b/dev-util/drone-cli/Manifest
@@ -1,5 +1,130 @@
+DIST docker.io%2Fgo-docker%2F@v%2Fv1.0.0.mod 27 BLAKE2B b4fa741a29f2cc94d3897609787268661c19ab3a64eb1ad579ee7dc05310a4aef80fcd4784ad23ed0cd3a4baec7409a7acde2c919016e1f55752f05b650e10bd SHA512 81c7664481b2ac94ddf6c52ca21af8f87db0150b394d9602fb50c17c9ee56f05c6fd7fc3a3ccd5aaed25690cdd59bb4b6478ae942c24a5348154587250b2d7ca
+DIST docker.io%2Fgo-docker%2F@v%2Fv1.0.0.zip 318577 BLAKE2B 39a199d8e6b45c7d138e08821ebe398f532a413b7d20e439e89f1a3e4350047b6c07d3ab859d06caa65d3d45c4703a725042723ccfc123d7e98abb8ffb165f46 SHA512 8dd97e46089684f6b01d24b6af48e58f8629e50b6191cea083b3edd6cd76da0a4490aa7f20077b480c10d2c61cf5fe5651d324259b62cd391950aea807756506
 DIST drone-cli-0.8.6.tar.gz 1778122 BLAKE2B 040c93386330990a5f4e38f6ca353226145a99d14adc141243900fb4cd3d28bc87665bc6f466b31cd1e5561df31edd378049f0e38e28006206c3cf02ac0d5c21 SHA512 51eb538d5571b2e48722e4e4de6f9d6fc67375e55284f6bdec5c4c495a67e0808f9d158ba925849353bdff7903df2ecae7a073d88185fc607d45383f4f2f5c0d
 DIST drone-cli-1.1.4.tar.gz 2843182 BLAKE2B 395501216d09f907897d3d5f7a64e93956786030a354365400e8ec73e2ecb361958f7f9468c3819a77908251450954c91db7369f803516ff2fbeb2050ad6efe7 SHA512 6a0df849f4086913137e36248925fea70e106b95225708bfd37b9a23199d4bed35c6fa18757311cfe23e8c8eef5d66acde207827a7220cec868ffe515539471f
+DIST drone-cli-1.2.1.tar.gz 39960 BLAKE2B d686ddb6790bb1f46a98f10e717802cceda1d1dee306f7ab498b7261c3590acbee91149cffc838d097e25d5a78757dc3dc61e35021e08a84829b6afb45bf6b9f SHA512 b61a9c48ff9751c60a3ec3dc6cab2d7d00603d0e126bd2d2d57800bc9472766881d66d70d5b968da4df187fd4d4c42d0b82e1c1a730b63ca7e36bfb469738648
+DIST github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.11.mod 37 BLAKE2B 21cbcf43ce9e4dc3485c260f4b20ae34fa1aa41676ccdc1f4bd28fdbd9402db8c1f77d4c644e5044a0f2cc44e06a6109791f6d6cc4620b32e1d2c36426df65a5 SHA512 752909cad98e7eafe9ff00951c27d955242d3d76c99c3e52427987f1c81720af76ad1da5e4d67e31bc192822b7de299edeb2077b248c0f070b6adfde4e9b8ec2
+DIST github.com%2F99designs%2Fhttpsignatures-go%2F@v%2Fv0.0.0-20170731043157-88528bf4ca7e.mod 46 BLAKE2B c5544b0db4e93f0ff2686962a1db6b6a488688166ced5ec9c93aad296ef33efe6b36398173818691adff6f222a27d889b89b714cdb110422d1a52ddca41391fc SHA512 b5d354343f0032abd8e4ac1440345b9bf9da478ebe2ddbb012ade62cc700b93dd88832e1324964762919e142927f1567afb582b0bb4b6c40503434537e1d83ab
+DIST github.com%2F99designs%2Fhttpsignatures-go%2F@v%2Fv0.0.0-20170731043157-88528bf4ca7e.zip 7876 BLAKE2B ad90eae0ce3d399f8d3086641c6ee6b6f268e8a1a3aa9f0d7c4cf7a93279e83d0bd031268bc5875013ae4c3c1f8689d1a073ff05560b036df41fe57bf7514ca6 SHA512 6c421695148f2f30134f00957dc02a412fc7f7614a71dc021623a252b8276d3b23a73b308ca68916c1c09306260eeb88879aebc9474dbf1819f368cd80709f5c
+DIST github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod 38 BLAKE2B 2e1a897393e3527f0f82e6ab9baf62558d9cf54b56ada5d79aa1b206128de30395d9082bc600c4aa2a17e81095e429cc5874de95047854531cccc9ea0b867de7 SHA512 072ca7ba3d5ca815f58848db201002cc572d95334aeacfe44cb226505ad20d82ce06eb2ee059650912ae499db6291822c583296cb65a66e54adce62d6d850929
+DIST github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod 35 BLAKE2B 873b4b9c8491117a0b99bcc183ae96fc7e392c68d7271b73b5d7876574a5c7d67580425b35445ff2fff326c5cc7f328326d5d11946699c213cb2b84e8a9a0aad SHA512 7f23b8c5622c02b295646c7baf6f2ea3dd01e11e18ac9c263b853c7f771f5d098d8bcb75971f0cdc33d1c4765b563f3382ec5dc4bf20010065c3f1bc94e93175
+DIST github.com%2Fbmatcuk%2Fdoublestar%2F@v%2Fv1.1.1.mod 37 BLAKE2B a09c5724ee2303dfe62100ce853f088c90263fd77e6e5db6375f09203ea5058e05f34e40e769caeb34b5a2759de7a81304a33ddde68d525ccda691f7c35a53bd SHA512 28bb5603cd1ae1fd97e7589e790f4afe4e7369c4b4c3afe46e0d90aa15e0a621dbb66cc4789696689c2124ef4e1d81c4f4a7a1cb54e986ced77e129de853e588
+DIST github.com%2Fbmatcuk%2Fdoublestar%2F@v%2Fv1.1.1.zip 9005 BLAKE2B d526e5d0a1370f89daf039bf6a6c7276b40218721390fe8944568bb4e992613a3b865add28aba6ca40ea94ec7fb6e43c5c780b391d4fd268049093df00534469 SHA512 5880c7e5095372c8025daf181060aa26eddcb8cbbfc44e7004ec20812a4bb54ce69a6fb6f51044bce8219749562dd74e4089e07539a519f5b276de25ab9a97b7
+DIST github.com%2Fbuildkite%2Fyaml%2F@v%2Fv0.0.0-20181016232759-0caa5f0796e3.mod 95 BLAKE2B 4ede1fc9550141e94f613d16ace07216a1fbb487a85a4ceec7236231f03264d8c0b47e588e1a05b59e38ddfdf079acea9170842716d8e2fa5045c9a7f65b0e01 SHA512 501d7e34b5c597dfeed51698bd2858c93ed28f3850fe482d3b696e56a204202873b29b7b3bde0f9b439195f97b1e7163711da98a0ba9d1fee5fa49b60b0766d9
+DIST github.com%2Fbuildkite%2Fyaml%2F@v%2Fv2.1.0+incompatible.mod 33 BLAKE2B 822083fba024c5f608405e19bd232dcb892ab992c52baa78369fe7b623ae813079351f6479b608936e4578f18014cd93f77a50838df4a586a2e3c541656071f5 SHA512 6f239b1c9ebeae8fee4c7afec3f6fd59b0ba0cca37073e17006edf91f6d93fb26e08e63d17ec414a51ca102c906fb913f0bbf777472a188376f74e5806db1fed
+DIST github.com%2Fbuildkite%2Fyaml%2F@v%2Fv2.1.0+incompatible.zip 77338 BLAKE2B 4ece9432b1b74e3f713a5341b6733b51ec8f26a8ea9c3661fd72a970069da144b9e4cdc132d2d998ad66b8334a3b825f20d4c6c10d3327636ce6e23bb1069bd7 SHA512 2b9f8c4305de1d727858c90dc1c0b90b144c99b201138b6e3f678326792b2aa324ab13e1385e93539f41cd900da1ce84d81b6bc38c46a464910eaa942bdebc2a
+DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e
+DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e
+DIST github.com%2Fdocker%2Fdistribution%2F@v%2Fv0.0.0-20170726174610-edc3ab29cdff.mod 38 BLAKE2B cd95ca3c9baa32743ad6a0c2359dfb95eaa79009366a4019e5e1a4d3ded54090b005d307ef18942fe4de4027e7fe688e7ad046f226c77a3495e2ec579223a9ee SHA512 662e7810daa3242958f5ac7c71bccd25fc39ce814db684641cf69e96a5573dff638faff15aad77b7abddce767f4ddbfbd8a1bbb85a2aee5a0e80c96baa3f39a3
+DIST github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1+incompatible.mod 38 BLAKE2B cd95ca3c9baa32743ad6a0c2359dfb95eaa79009366a4019e5e1a4d3ded54090b005d307ef18942fe4de4027e7fe688e7ad046f226c77a3495e2ec579223a9ee SHA512 662e7810daa3242958f5ac7c71bccd25fc39ce814db684641cf69e96a5573dff638faff15aad77b7abddce767f4ddbfbd8a1bbb85a2aee5a0e80c96baa3f39a3
+DIST github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1+incompatible.zip 662227 BLAKE2B e9c50aec1dd4d34aab11819bd341b1f0f6fdc32bac63124930d45f76f0259aa5e1e4781bb408411e643574112ecbe57c3b9c4c5fe59399c153d48dc5eb5bea41 SHA512 aff78c88f3bdb596f1855ab993d8ec3315de9d4809757e2cba6fe22ad4d5dc220242f90e73d9d0a33f9a13521705b82c8526082e26c752fb027dee4b28299d52
+DIST github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.3.0.mod 40 BLAKE2B 13f8b46e2e71edb04180a1734d63e1e84dc75661ca635d150fd2bb8b1213df768520fc1c5cffa7a9cb224cb11788efc5242dd85138915fc21dfc9ff95b1d2737 SHA512 721f6b5cc358f8ee7093f7c80e4153ebc474f2052bdb3a91bf2a4ae9d2dbd2e2e50635a5bb8f9b62bd8ee7a0b7420ca9f18c60abcfd5287a953ea63d21aec53d
+DIST github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.3.0.zip 42715 BLAKE2B d34249f3328c742dbedfd2620ca178ff29b909c31606fe7abff0eb9e04dfdd488bf51f4faf489061cf540fc765a5d0842ae3e0d9840894ebe8b4c6d8d7793847 SHA512 ca175bd5bcc7757538ad04b6953287f8c869d5c5ed2e4f930cb3104b7a96f73a34c656e85d1de054f2b982eb813bdf5b02cf7dd89c4824a25c8385add7778598
+DIST github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.3.3.mod 34 BLAKE2B 37c07a43d4e36f25bb5bbc10a863a717fa114a5eb980f17942f5bc5b1d1a4f58de5301ce871ec5d41f5dae3f05edd7c03a5c9246317ebf089c1cff27d6634aa1 SHA512 53dd482245593fe74b94c319cf4f3079b47313a22aaa69ba023b9e60e8b5dc81177ecfac49e0cbd9b1eb6706f654f387301ceb00313f8cbe530b4dc24eaefe97
+DIST github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.3.3.zip 13789 BLAKE2B 1961aff6de16c83f1a771b94965a6e5fc95a951033d93b576cb1567b008473b5fde0a12078179738a921ec88752621281a36137ee6719d4a1110ce072f450bb0 SHA512 66587313fba838dcea2a00bc81222924d1dbf77bfe47b7ed0443a071c249f14204b8e0765146f060009c8d840dc802ff701d6905a4c05b816ded9adbb0a0e981
+DIST github.com%2Fdrone%2Fdrone-go%2F@v%2Fv0.0.0-20190809073937-cba78c0895aa.mod 154 BLAKE2B fa16a9b272724eb2d71f1c2e31f9ee411768a74123b09002164d7256d7d96546f1f0d30752b33a4cf825744cd34d0bc9af7528454cd7def5b0bc9504168b6df4 SHA512 e99e954c7c4c06974096b3b9aebd091522d0ecdb5840d969b047b81c43c95f5c6422e6467253fc3e8bd4090817ab3c103bd261f9fdf183049ba5b63c294c40eb
+DIST github.com%2Fdrone%2Fdrone-go%2F@v%2Fv0.0.0-20190809073937-cba78c0895aa.zip 58912 BLAKE2B 3f2c638157714a4c90f72ccd72eb235ce36592b4a7b2c2cdb08d6d7fe504a53114eb290a77d91feb62b08a1b0b9476fef4e68ac70fe70a993255c768238cbe87 SHA512 512b2992d44280c523a93bc1cfb2d644710c83563e269b4f0515404902c439ca14798f45ca8045d3f8a854f0a5a62ee4117a6927ad821275eb2bf17b7a40ed95
+DIST github.com%2Fdrone%2Fdrone-go%2F@v%2Fv1.0.6.mod 154 BLAKE2B fa16a9b272724eb2d71f1c2e31f9ee411768a74123b09002164d7256d7d96546f1f0d30752b33a4cf825744cd34d0bc9af7528454cd7def5b0bc9504168b6df4 SHA512 e99e954c7c4c06974096b3b9aebd091522d0ecdb5840d969b047b81c43c95f5c6422e6467253fc3e8bd4090817ab3c103bd261f9fdf183049ba5b63c294c40eb
+DIST github.com%2Fdrone%2Fdrone-go%2F@v%2Fv1.0.6.zip 65108 BLAKE2B ff2b02d3d492f43576716ac8b989ab3eb69ed5b841ed6bad9c9de3585358306cb263e17ed1e1e9b853d80b7a851babc9c2d193c8593163d889932cbeb46b5ec4 SHA512 aacd9a748b3e36b2fe60d0c9c62963ee114c6fedec57f488081a3e1db7a8513ba920ae3f713a85e7984beef919f85f8994efcd06b298012a1e76711d3e3ded68
+DIST github.com%2Fdrone%2Fdrone-go%2F@v%2Fv1.0.7-0.20190918192642-21c14e63f89a.mod 154 BLAKE2B fa16a9b272724eb2d71f1c2e31f9ee411768a74123b09002164d7256d7d96546f1f0d30752b33a4cf825744cd34d0bc9af7528454cd7def5b0bc9504168b6df4 SHA512 e99e954c7c4c06974096b3b9aebd091522d0ecdb5840d969b047b81c43c95f5c6422e6467253fc3e8bd4090817ab3c103bd261f9fdf183049ba5b63c294c40eb
+DIST github.com%2Fdrone%2Fdrone-go%2F@v%2Fv1.0.7-0.20190918192642-21c14e63f89a.zip 68845 BLAKE2B 7a230dbb2b14479aba725096afc025ac1000590df12dce8a45b7dc57972dae28bb2cfe9af055a4170aab3659d45db355f563fbebe9632a08f047be700f4fc41c SHA512 f9c17a0a1b7def037bf8f6b1dcec58498399f872ca5c5a1e63133fff1c8bd5744c52c686d0ee69d80a9fd65ec43860a6fe6c275c4169a883760b4b12253e2bf0
+DIST github.com%2Fdrone%2Fdrone-go%2F@v%2Fv1.0.7-0.20191002153459-173e210cf8d6.mod 154 BLAKE2B fa16a9b272724eb2d71f1c2e31f9ee411768a74123b09002164d7256d7d96546f1f0d30752b33a4cf825744cd34d0bc9af7528454cd7def5b0bc9504168b6df4 SHA512 e99e954c7c4c06974096b3b9aebd091522d0ecdb5840d969b047b81c43c95f5c6422e6467253fc3e8bd4090817ab3c103bd261f9fdf183049ba5b63c294c40eb
+DIST github.com%2Fdrone%2Fdrone-go%2F@v%2Fv1.0.7-0.20191002153459-173e210cf8d6.zip 68900 BLAKE2B 02052728f1bad75e1c1ee0bb8851107348578c6ed1f0904740991d58fa7fd4b579eb54006acbe69ce4a43b11a03a5575d2782223da3fffcf332e5391e68f10ff SHA512 1c0edf0af48d2ae8eca3346fda4861244ec2be41e5568073c15ca654e268de4118d0e533360e5f4ef6dde959e8df900ccdeb368bf8c4664b5fd11de17f5a532d
+DIST github.com%2Fdrone%2Fdrone-runtime%2F@v%2Fv0.0.0-20190729082142-807d0aeaa221.mod 2032 BLAKE2B 67c26cd587c68f0f44327e758187bf35240ba69eab370c56720c00fc2de6f17a52428c92365ecf06e7b5ca2185f9ee37c386dbf8e415a5b69ba24c32798a1778 SHA512 e9f6147fdf7c36178883759d92582c97720db24b1ccfa82ac9ac5c557faaf916259a4eed06dfb59e27b67e781166f7c852d0a3c743183dc8ce1ee5c4c8d98086
+DIST github.com%2Fdrone%2Fdrone-runtime%2F@v%2Fv1.0.7-0.20190729070836-38f28a11afe8.mod 2032 BLAKE2B 67c26cd587c68f0f44327e758187bf35240ba69eab370c56720c00fc2de6f17a52428c92365ecf06e7b5ca2185f9ee37c386dbf8e415a5b69ba24c32798a1778 SHA512 e9f6147fdf7c36178883759d92582c97720db24b1ccfa82ac9ac5c557faaf916259a4eed06dfb59e27b67e781166f7c852d0a3c743183dc8ce1ee5c4c8d98086
+DIST github.com%2Fdrone%2Fdrone-runtime%2F@v%2Fv1.0.7-0.20190729070836-38f28a11afe8.zip 74140 BLAKE2B b1d8153266854925f606227d8cac26494fa7c43f42ab6d9fbfbe60eb02ed9c338a17ad2f958d7765d770a423712a7a3d7284adec6b2251656f087f94f0e11dfa SHA512 972e18ff3f44f956105182d9b3d9f328a25eed47adefdcac819fa18736ce06613a6176d6ac489b54d03b67820efc0bfcc12466ce8feabe5195c6ffa39c76823a
+DIST github.com%2Fdrone%2Fdrone-yaml%2F@v%2Fv0.0.0-20190729072335-70fa398b3560.mod 795 BLAKE2B 3bc9bc95389d6967aeaeae694427904c6ed77b112bfe1f422ee1405e4fc33d3b7b004ae1281ebe41fde9363b0e3f7daf3a998a9fd1e720ed5c433b3b3830ee44 SHA512 3cae7d9351fae2c481d4b7c3a89ef1019b8b148a27d675447ee33dbda0479a455da6279bf57d3186e1b27944f1f4e1220ed4a9d723767c4ac3e4be8cdde42c92
+DIST github.com%2Fdrone%2Fdrone-yaml%2F@v%2Fv0.0.0-20190729072335-70fa398b3560.zip 199056 BLAKE2B cd9b35d08943863871e2e4f7b99004bc49f9b9484b848d434c25b4569b2b08c9b042bd81f12bd0bb2828937370d88ab2b53755769c9e5f07ddd0545e57a4c0d4 SHA512 cc0fec40842099fcf0924ad3b0f2a71c4f7759cd2dfd43673613c27c6d1bce4d5e7424b9dd9c50835d9f7da7b55005df5bd14234871fa9f5f1b89178a0a65a21
+DIST github.com%2Fdrone%2Fenvsubst%2F@v%2Fv1.0.1.mod 74 BLAKE2B b2f31bce7d2026caab615f6849b67d85e28462db105ca139787b4a38e27520a101a62fb67bffb3195bed2f89efcfb39f66cab3c44f4a48ff7777a5b916840f2e SHA512 640a45926c2db08207cd4ff4815d0a9e706e9d4b011e4d913c9788077abaccfbdfe814c4b1e8fe8eb688c8a47e2447d40f2b7fe247b7a6d026550f4098d2cbd9
+DIST github.com%2Fdrone%2Fenvsubst%2F@v%2Fv1.0.1.zip 14373 BLAKE2B f3e7580e8cb7b743b6b0292af39fbd8896f3052959db941f1404075642b313d1f0c5ff6b72bf4eaacb9f0bc287aa6964ac639a8492b53faa933c69382ffe2a13 SHA512 6cb79a2f96c49919c6907c4bd352a98b10bc0a150742f09ae28f5db39d17f4bab4896e6c4841ffac3eb1e7ad14ede8d75b5b6a54385199c90c5668d01cbb8cfc
+DIST github.com%2Fdrone%2Ffuncmap%2F@v%2Fv0.0.0-20190918184546-d4ef6e88376d.mod 41 BLAKE2B 8ccd2eb4fc7f277b26af1308be37a7b24ba8543d031e5b31143bc419c02264f3017955678d2c6b0b61a0a5f2fa6ec9449ab95214ab6f2eec1966f50effd29552 SHA512 13d5a6520835006e47276b1e3599e0d886deca66d1f2ed6a37eff392875af0651ef844f6c0f0263af8a7aaf169dfae22d68a0af5eb23c42c675c7914e1799c03
+DIST github.com%2Fdrone%2Ffuncmap%2F@v%2Fv0.0.0-20190918184546-d4ef6e88376d.zip 16168 BLAKE2B 3f2363e6197d586daf145b475ea68e6eec6af85750b857375bf637c9d9158dadf145a70f63697ed4d2a122bebf60a293e9a0c8e73ec6d1dcab9ec59f473b91d2 SHA512 cd186b349dc71a60da31dca19d1232f41ee6fae2a9c81ba470d57d55cdfcf69dbcf2d62de2da5164d7df50d43a409e8380993f4833d4f8ed79188bc9c446051f
+DIST github.com%2Fdrone%2Fsignal%2F@v%2Fv1.0.0.mod 31 BLAKE2B 5a72f92643f9c517dfff85a37fefcfa1171b0a4a7b4dba07c10cfa3792952f7b24b10bfbd84de70bcd29765f241274db4914f7c5028c9cb8729a810dc9677269 SHA512 fb22f9fdcfaaddd8bd6edd3db731839708cb11556cba765d67c3dc5696d3d978fa4c4ffc1361df1abebdfabc0e1b3a8ea1f3f0067211e0054d2a424cae2d65d8
+DIST github.com%2Fdrone%2Fsignal%2F@v%2Fv1.0.0.zip 1620 BLAKE2B 89ee3c1db4e6b415a799f6be7a816b27977d2c348a05c07e22cb57af8202d968d030ee2685cd31335780da82e08eef92f5010e147cc8fc1f307ed7acad38162d SHA512 662b12ffba16380e707f6b83de14d984b4894426a98c5bb01d544404946c0a0f1be1cc57dcdd5d7b04a7af5cbd27425a4766905c33749d48fb278cf1e716374c
+DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod 30 BLAKE2B cdd74965525563fa7e3db19aae87c777b2de65faeaf2987957ea3bb4c0c6a91ab82fe02bfeeab4d6f523214bc2e929628c082edb967d49309e75483ff4c3bb41 SHA512 2dfc66b2f6accb7ecaccc48cb3daa338173f4751d954cb2912025d881f17a7a2df0457b2d7420f2d93b50519a2437a763450c4d639a26b3289fce7bdec5bb144
+DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.zip 11987 BLAKE2B bb585868c568466b366c1c50762376d9e2b6f3d3ac287af94c45f7d348516d2e80ee96c6980a4b5fede40f1302f0e3e900e24aae16fec29801a795cb7e514dec SHA512 70f78081c04bdbb52e8f5d24b8926b39a28c4f069beaee0d7bf24be946f2b0ee3bc08d8ecc1305412623670e1767433a37d458df3fc849d244c63b6222f1f599
+DIST github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod 30 BLAKE2B 6a680b6e14f0cbca536b1ca02d633e16b2010cee7f590088748339785b2989cb0f86a51fba709da938d4c10ec810d5fe022d7d1a5c269d5ece253a78a5b2069f SHA512 7ffc7a5c3e0b39831e590ce3402dbf5c95392e88a08576a16d9e1887b11400efa71a9d183d3f1e080081246f28a70262a679348f009f7da6bd41f253a60b0741
+DIST github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.zip 13436 BLAKE2B ddd82721096e3dfc8c70543b4324d02f1137d9eac13c1eec1236c4ff537bbebc2ce5f205af07e8ecc16a909c4415e764d87324bad3efd5c878aecc9f8b105647 SHA512 722683483b8071b58508a7de9a9c9826d4a33c874948c1a6612c89195cceadfbd0ee0b56635d408f0af09aa2e904b0ae3c86a06e9b8f86c502080ce04c756e42
+DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv0.0.0-20170307180453-100ba4e88506.mod 32 BLAKE2B 939b72a591bc5fbb649c21a95b2c4b3f5d3ade273377f1f89407e55f436e7a863f15d708aabfc5435334500c8cb1e3ba057439c8ec81cfde68c1ec6794c6de6e SHA512 ab6c57ada3b0d1e36c91f3e0f45e573b91a4869f230f02a7e5e3e5a8f7e020bf56c63df1cbdc5b552ef9a4229ab739cf76df7f799091a2efa148ab9e5c12b1c5
+DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv0.0.0-20170307180453-100ba4e88506.zip 3015632 BLAKE2B 035536d7e7937045f39bb43a2bdadc571597aa37d90ba06169750bff55b733af8f2c0360d571c4993a49ee02fac439866361cb884580fa0d55fecaf28001ddfd SHA512 d73873a3dec5abdef3badf2cc15ff81d31dd3c4b6cbb6c08a99479e320de0f4dd69bcf14f30a5229d401e1ef2cb1fc273619fdd4e7a4465821af44c7b118dfac
+DIST github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod 30 BLAKE2B 6dea6116bb7fb72123a93cc8b83dca5455b76591c7948524ffe664bf966780799c4d007154502922e21f688aef5148211db6b0e3dd3f6b545c4192f5bd5166a8 SHA512 3714d2a95d0435a113c36df5feb13f77a07a1514fdf6b5f01e6e8cc5d159067736e0065bad8062dc636fa5c52c98e3fea6985075005b2838bdf53e0b07093024
+DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod 30 BLAKE2B 5c355e64d858c99536e459f9fc4428dc00435bea944b67bf3dda5b61edb5f0c193c5857eb10bed926987cef865836c3f7ae3d8f081a58551ccd0772e4eb565b1 SHA512 ae6a1a6f8d31592ea6141f2ea39c9b60cd28e73ffae74bcf370fa739865b95a7ed56f687975f017b42c59e3b0f1c02884fbd5c93140bce268771380c8c7a7a96
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
+DIST github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod 31 BLAKE2B 910f367210db741c9f31a77f8eaaea348d3accbf0f219efbed95a780b93e2416fe64dd420ae45ff13da94a8f2a0c7b19850b13e1d9fc6cc1249d327bf04b5fd9 SHA512 f2ff873ecf0144b7f434810af1b49f66f09b4bcadc91d99201465a6ce36c7e7f05996f52800be287dcb3b62e14b75fcebb7c32be0eeda6bb0a15a23058c2d410
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod 32 BLAKE2B 7c7baa1e29b9806fb97e0d557200e8722f2d373e149127307efa285cdfedb36dd57355168554d1a1bada62144e6a6a00c4d3246aa9afc7d0ffae0f087459c552 SHA512 7229d917bb0c788b07297e1b09b8f7952f951998a56f17ea1f69ff7c2f565a5686b212f42f45c6b8351905d6740a2ec5a235e493daa531ae00cb709faf67ae45
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod 40 BLAKE2B c717b6aaf18662c20120746a021b0ca878e7b190b3456cab24ec98032390a85b0af8540295e470647d403bf1beb582c8f8a74fa7129c4cbf747257206235c5a5 SHA512 351dc24af135b9c9d714aadce40fe9fa1ec05a35a4df90af79926d5119c3f33a6510ab9d78243748d7dad10bd2178f47d342ea2389972b88d5e9b4be6dee7daa
+DIST github.com%2Fgoogle%2Fgo-jsonnet%2F@v%2Fv0.11.2.mod 36 BLAKE2B 810cf48e52808558d06238418e981ea355496bf79405785fc5b369fe66dfe90064dab8a3331693d6b3432297229ed020de8f89d319b02a50c40e662ebe023caa SHA512 ec08a9e0ad2537eff8e6deac9353b5866b0066564a18bf47493e5893c655ca8fdd930be3f489f90de623827dd54970be94d3bfd08968180330be5b4320b9fa58
+DIST github.com%2Fgoogle%2Fgo-jsonnet%2F@v%2Fv0.11.2.zip 4773627 BLAKE2B 77d478a021ad959ed3399ca96a655ea6b798c39d7774c26376726916512dbe3722dfd434e8a7b8a7ca29d11f4505a2e8e35aa3e967b55f63e23bfa725950109f SHA512 cac51f53bff1565a05efeb5d0f9268c425a1c70e98725af534693d0e003ec37a57a270c81c49ef9d14660400b9430091b81ef0103945f4ab82255dd78209ede7
+DIST github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv0.0.0-20170612174753-24818f796faf.mod 32 BLAKE2B 11dbff4f4352c70c63b410ec8fb7986235dbaedd97ed64d665ab465898df351f2ec3eb9758c165812d5f97bd7b409e90f2db6ee41d73ac9d13fb96c638b42c38 SHA512 8720691f3968ccec689b3c777eeb9b5dd2932f16f77760db3e51fc0315405f7d96711fe0683d6bea810c8ec4e5b320fbd16e228f5f407b12ac5ff896cb263372
+DIST github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.2.0.mod 37 BLAKE2B 80edfcae1f7fa1ded69a583baaca5b236f4f9539d6e63b3b59557a8407bedd0bc3cab897d50292cb7d2a75bb52b67435f4bdda71e9cc55d901cbe574f16f3cb7 SHA512 c69dc49bd88fca7c67f4b866008d9f253387c1806c55fe82bbca0c99136b58020058e0681659e74b8f96e53d74d39d5ccbf11eec6291a0e0eac1998ba39f4d50
+DIST github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20181110185634-c63ab54fda8f.mod 38 BLAKE2B 1ee03077667437ef310e0e9d77f917474151294d0ae6654596884b28fa847c4be1fc994e4a2dd00d4551d5a4550e14edf1757f5061c44b527cff91353944b989 SHA512 5500094712db06267cf0d437e774bb1b4df9affcebd73ac218259f089f035df59c7ef38e6f36197014acbe1c8b08806734cd27c85a4bc86cd62fd9196d7f5b3a
+DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod 39 BLAKE2B 13f90f934356dd1daefd27a94bb7a8c31f09835ea69f3fc83d343004858c6728bdd6bfaaa919331f7ee04744d18ac37f46a13be9feaa20e24e88ee364991a9b0 SHA512 bc3e0c3b16454e0f079bef539857c22f09ebf11e78ac1744a22f5af87d7297979b7ccdd48e4f59605cac562c268c3cacdbf2745f65be5c934f73f216707120e1
+DIST github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.6.mod 32 BLAKE2B b90f36a2d75d98a23cf27a0bfde69a7c7ab91f3f58924624aae1fd1e924e10ec3dfb228bdff3d97ce3266360bafc06817d8d5fdde0b6ebe0f058866c84c85b91 SHA512 1128f41755f4d87f43322971323896d589e3790019beaf160f9cca1e41414dec968cde425be6d8b3912bef9ac09be186adf6417a6bdeb92ee5115cfff1405733
+DIST github.com%2Fjackspirou%2Fsyscerts%2F@v%2Fv0.0.0-20160531025014-b68f5469dff1.mod 38 BLAKE2B 8ed9d76006c15ddcbd688f1b4395178f0d25a29aa873d35e10d4bb357fcd9e52dec9708fcd4ec52b4ae25bf563813c3054a07097c209a998ca0b8e58fe8ee31f SHA512 8f7f11ea29f085d6c03a24d09d28ebf9a90c8f2b0864f05c3e9093c5b7a9d0294868eb98ea0f6e388130f1a754c37644badd4423ce5c6e74228ef7ff92c04fea
+DIST github.com%2Fjackspirou%2Fsyscerts%2F@v%2Fv0.0.0-20160531025014-b68f5469dff1.zip 186460 BLAKE2B 96cfdfbdc74f1cb3c3e73d9b82df56db248f096aed10ce469cf8e641adb2752895f4184e1690c985f243d9359c9fbe32817e1a321d1c6e2e72c0f9563eb335d6 SHA512 76edc24ef79206356a45151cf8f5880c264fd750963b0376a8bac255e6d8381bb8007aed6d134e1bc128edd6565e1014a06ae072139fd75cde5f8e9358a91a2d
+DIST github.com%2Fjoho%2Fgodotenv%2F@v%2Fv1.3.0.mod 32 BLAKE2B 108af2b21e180487fb535381cee881222cd34895f1b3d78561bee6bdfee40e7b9681c74345d10881fbe519fc496181b85eb880b5ec411e13b24926a39ae8a512 SHA512 5b3e66c42da78c7df031089cc05aabe56671eeda4617683a1e9857677108cd0dec00332f5b05f29923b1314fa1d1c88e57fac1b653808cadf5a3cde93daab03e
+DIST github.com%2Fjoho%2Fgodotenv%2F@v%2Fv1.3.0.zip 12758 BLAKE2B 09c81f777d01c390e78ceb0b3bdb54c0ab19e1dc8f1d8747ff79e96c12b9fb700e3affa05a65b2bd36b42cd86979a45a78cb3c7288ec9dbe3b8c972313dd83a2 SHA512 73928846a03ba2fc7df0952deddcfd553e2decfc4b336f4c60b90caace96621b2b01057319706d4e52c6590c4963c049a496aaae92bb054d0467a9977c4befb7
+DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.5.mod 35 BLAKE2B aa26eb3b67893fa913ea0f88bf22ac283c6cbac246683f41ede681940cb2e4437d033811fc12f2b47f9d94337dca9cdc926fbb5f044b2caed19c8e46a5879432 SHA512 e8bb59637bc1154ed648179314c4e20fa7f549353d094f4861e2fdfaeb70da1c1711c1159e78d82914a35b8ce184641937efd8808ffb1384136c7a6f3fbeb78c
+DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod 67 BLAKE2B 2e1b4a8a38998179a32db321d331db54f881770a89719410876cdde1799cb8558ca2862bc70838d606540606d05918c4b115cf1c125945a77ed376c2efc4aa85 SHA512 4d841fc7a022e4e09e0a95925ad92a75809a67c30fb88de9190e4a2196383038dab9a5b3294b6a0b4786248977a0e09eea857a34100cbf22f8a52912ce9fa58d
+DIST github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod 25 BLAKE2B 63db8520df2f699bca5a7ccecc44ee04973307d86099cfe66ded30e2ca1bdd76fc3db48cfca0138673c20c6f94061caf219f018b21b9d67231fe959eef338596 SHA512 967fcdce835c12afbf3b12bb204a256f32d46a3da535e2a7250159f62781a163ee107dd2a4fa20743b76bbf52b97e627e11e895c8d5ef73aede37d6a89e326eb
+DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod 64 BLAKE2B 475c51201a379df2cc4ff8c5681b6a7a1524f60d0b8fd0853fef569dea754efabf3425cd4b84e8427db8a6cf3e9b1141d5050d48d5d429cc1ce82162aa70050c SHA512 11d2502a7d241a0edf4e67bcb651a890a12f49d00f8b944cc9eb8f6e9cf5fbb2b2827e696021649bc795ffa275e95ee700e4a1706e03e88fa9ae079f5b9f48ce
+DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod 37 BLAKE2B 6bd675a05c0bb6f9dc12d09203d13de115801888cf8c02cb5d609f72d214b7e7ebf13a72ddfa2eb9172e9c2ba1f3e5a040f089a86ce9fe873d49288d5f7dc5a7 SHA512 3cc3ae26618b96a0fc076b18bab6f8f0f6a1064d6a9913c1015a9867fd3571d17f5d2867d72cec008e9bc7005883a596edb21424084f82ad5b572443de90f976
+DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.zip 10606 BLAKE2B d9aed996970ecc4828716e86ddbc85a7949f60ceacc7326708ce499bfc09250bc8ee336806b229a44064839e7ce34f5cb2a7607da5e82c417a737ea869f97f03 SHA512 dd1763a8d04540b3e579d397fa4888c4bd8c00c3963cfcd1fe42af7c1990ef85f9a2e2fd5c5f2c7d3e6817448df5e2237241ff5a2cda651b061cc8932e0afdca
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.mod 34 BLAKE2B 55253c2475bc0169df729915bc92689eaad2908ff7b9dd81b8a553bd75d5f866c308a85fd69d664d31b0d2d373d8d52ee1701677cbebb07e361612ab8cf17f2a SHA512 00c272b4652db259c46875641b29489ecada2602e38beede8c8bd529d73b6e123bff58f8e0f8cadd2d680a6a5485aadffa448e9445548abbd2fb424b059a31e1
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.zip 7026 BLAKE2B 3cebbd0bdebcd1d32b7fc618b7190b7813876a1df010d1c3ca3800c41acd64b6537e4b3e4d4a574e3eb736822a27eda7bb2fffa197063baf9a347a820573883f SHA512 829b0596279218a2fad36695fa42036f265ce79903a0f5aad27495dfc7c6a33e8bad32010e59f4dc6853f1e38fd9e9f635ca2f56adaf5ea47e4914f2a892d251
+DIST github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod 39 BLAKE2B a4d082021123db99b5d72a1d8d0011a517a79ff7b07238f0f01e550be684f18be03907b6280e673aaabee5ea837ce14b9e4daf278a23605c8dca8fba76bf40ac SHA512 4f29e15b1d18a8952c14f5142aa863b77b7be820129512cfeb3f8bc3335ff637a8a86c0284832a20543abc2c5351a3c0f992d52db895385e45f176af899b5844
+DIST github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod 37 BLAKE2B 3643a4250f81729708917dc751cbff6ab6e37761ca94784062a4eaf243682a9e2c755ce793024cba1737d0eee1c52c29984fe3008a2471ed24a759da87ec7081 SHA512 72fe8dfeed7041bf92af829dd84513f0c97f709d69586a044f830fd3de43deb27d0b02000338e00897a44c57806ad036cafcdb9661b1852ff76886ad92bd83f9
+DIST github.com%2Fnatessilva%2Fdag%2F@v%2Fv0.0.0-20180124060714-7194b8dcc5c4.mod 33 BLAKE2B e6d97a16f89257890911fdfcd5f8c04a887fca06245191626fe7762c685d452a47cd7e166f748ae74fd62bb59d27b744e80765f2ecd7955df3f1d144dbabe7f6 SHA512 1cea987b8b34e7656cea0f8eb5d9c412f787af3aa1e7f866a2feff89d705c4cd23ab51b238714a39735b65a9f959b6ea96e1c591f7f43ff5ea76ce124919e0a2
+DIST github.com%2Fnatessilva%2Fdag%2F@v%2Fv0.0.0-20180124060714-7194b8dcc5c4.zip 5466 BLAKE2B 4dc13e87ef738042f0b2233605a89e9d0904510bc0b25b858dd1de43b7afe6540bfd7961d2eb93684672431c4325a1f0e70067e167953c4013f593a835f54e33 SHA512 2854401ac5448538f034752a3ff51d0271db11ced1b723384a43601bfcc8b9ad10c98b31ea3740997d65afb7c39a1270698be518d426a2d35cea8e81026a527e
+DIST github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0-rc1.mod 43 BLAKE2B 42ef42def0f24844eed6bfc710d0c5070a2bee3a4f5aa8b0ec68f862840385f035fdf6b7206d7e15a94ca419af29f7fc86358aa6fdd1a014f71f5acbebc4c182 SHA512 2fcb2cf84eb579794ba81bc9f79090999b3fded538a1649fee55d1e973425a775dcfba008a11ec1ba873bfbd3c2ce13abcd99fcbd9b0ca67fd35925896bca588
+DIST github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0-rc1.zip 27125 BLAKE2B ace23a65113f48afafaf52d19231b51238dba82a08a85dc615a0037b037530f3fa3bba1af1ad885eed9ca453aeaa0e2585d2f1b94cecdccccf2e32d36a86f11b SHA512 95dd5f43096dcde7c21338e393977b2d8ff3389b9c9b24ffc11df2cffc73b26f3f16a6406b10281add7d6d952ce2276639ba94929491be7792a2cb8f40746bee
+DIST github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.1.mod 44 BLAKE2B e60ef6b775d320cbbd7d0d655e4a0d855f79c0f563ff3aaf0cf0a13485005c800680cb95535d57342c6f23a69da021089f7cb4d3caa3021852e1462126137887 SHA512 e7d3276e531b754a441e94acc632d7322837cc2320ced66e3e91e3512164ff84428a4665493bb3a7cf7e1057e82097bc54d0b811738b1e967b9c248b907d777b
+DIST github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.1.zip 170576 BLAKE2B 52c16c643c1e621cb967bfcfa1e1209b564dd81bbf1b0427cd5c02b85160c444fcbe2ad9563bd491f040df2c4c6b9cc35f6ec83f671fc00e3cd5f40c8ca3af25 SHA512 04aa87f93002428f1ab79190ea584b23363126390dbdd6c05064646e7c5c3710da712b730f8da194bd83c7b95f260eb1773fd8c1c9daa9f41891a765e6a21742
+DIST github.com%2Fpetar%2F!go!l!l!r!b%2F@v%2Fv0.0.0-20130427215148-53be0d36a84c.mod 31 BLAKE2B 3a271690bf148d8dd75c701e0b6bc9f5829e553cc61c2454323818afbc3c4afed2087cd546aa9bb949df6147c31afb01d1061f3257f0eecdde62db4678d689b9 SHA512 078d273b5b7890d3a6c2ac08507fa77025626b4883bd516f265b692485c0f327208f128813860696216e04c602bb59650d2748f7f3de1dfbdc6a6d9ed33b6355
+DIST github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.mod 37 BLAKE2B a52c6a0304ea7026657d40ff685f37799d37cf3b05a87b15336eb05eb8a12d8749cd73d8cc3228ba2a80ce1e489a3029617ecf301dbd51c7f5dc7630dc114801 SHA512 df531789f1495979faa830433a34e38996cd919757f0191b31b862a9e9dd48be68179e291416876cb31083dec78337abf6bee92c68cff38630aaa456cd3cf052
+DIST github.com%2Fpkg%2Fbrowser%2F@v%2Fv0.0.0-20180916011732-0a3d74bf9ce4.mod 30 BLAKE2B 3addf97309c342e8d5bcf397c7c22cdf02eaa571e0632595f9268678a2ca0ef9818cad13ccb3444547d001994d137325cb2cae16fed3c080aa6e62f206a3f059 SHA512 c084d8b2c486f343a891b3b2d21200f80161f2ba1303ae17f7a482949b1c10562e7f87ca44b4258d32a1743b0eb66f842bc184d80fe349e9deb965215ab98b2c
+DIST github.com%2Fpkg%2Fbrowser%2F@v%2Fv0.0.0-20180916011732-0a3d74bf9ce4.zip 5869 BLAKE2B 5aa5d1f38eae51f3728c284ac81ff9de00b0ccdc17d78a73e006ba384b204192aaef056aa872504ed5887496a817f99c6d8f88414b44ebe8eba0db960d94387c SHA512 a6b0274e65e084f59bd33088dd3fb6658e0824ab9d8249c2417a2f9396d4461ad9dd7e3a1d5ff5008bc0edf7f835bd426f1447c1bbb8fb81cade200d0c891579
+DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
+DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.zip 14743 BLAKE2B c0c06d296c0583be2a6eb06359659b50941ea516bc768833bbfe252b73a2d81616dbe2d2db1991bd196b4a615b253c60046bbc6d56ca7268ded5b0ff40a4dc81 SHA512 2975fb8868fddaff560951be41194b82b631138d617705c3f6162acb76ace8697cc8ebc8f610ca1fb1a5167c6b6b0ecc87c150133a757447831463a0da18f392
+DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod 37 BLAKE2B 94636062c94f8ff68cdcab7593a3acae7b9ffff616cad7b1d5c9cd147a4a1042d33666cbeed6fd816d6793113abfb595183097dcc46de7a3dfadc1423ed43e79 SHA512 c3d5c48cdb8ba6af7071a07cfede06e0ab67e3726d9de592a952fad40167dcbdd9621dc2c4df1bd3c28eb99d70b1b6d8d812441237c35bf492e5b7f07bd33902
+DIST github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.mod 32 BLAKE2B 9c0be7f17fe7a9156f124f7f67c3e15e14719d0b271f36d5d41ccfa5ff6c1b7887e0051df6eb3b29f29b40357d8e438598088b3c4f4df28fb81f030c8efa7ff3 SHA512 8b8b8958405a188b93adcdda0634aaa2961b5b8e0d3b3e1f768fb9c49c02b73cf3bb39027431e0c1d209abea6cb72a651c5776bf26391e81f4dc18c7bafa692c
+DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod 30 BLAKE2B 18c9fb79a291aaf800991a296c8d7b1933cf45bf56082301a64ce17ea64dd15fd304094fd4b0561bd99c48ada545dfe7fa8cf47a15593cd3166eb66657a5e114 SHA512 d08b4540b799cee9c5f088c4e1fe002c9fda86f1634380409eec1404598b84376d3ca26b4c1cbcf58bc19234ab56531ab11db8a00c6dd2e15a53f3b4ae757efc
+DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod 154 BLAKE2B 60cd7801e7cd33746305cd636b048b25a86270ec3b29a21c3c078c7e95b769bce7e80c2c7c5474113786bd788c7f88f3719e34f02141038e0d161b36e32f39b9 SHA512 bb808fad059f5abd0171e4bdc724411eff2c7e8d303a4ffb3608a00e21bb3cfafe9e83b4b4e9bccd42c9a4331f67ddc6043e3dd5eaa9a122c86626eed43a8383
+DIST github.com%2Furfave%2Fcli%2F@v%2Fv1.20.0.mod 29 BLAKE2B 4f20ac8fb7beef2b678cff290a28c8125d368504aebfcde33e746d3ca7b9606804bd94c59c50fe328da4c1c592b8768b1aad89bc1d22ddf76cbc88d0f0f76b74 SHA512 5edcf2aac39658fc7e60d5086b066470c6d6213b66a2432bc35c6f67b8cb37a66a67fd97cdd4b8fa1b8b1bddfd544e4aa9838cec06806b89f8e1447e3c61bd2a
+DIST github.com%2Furfave%2Fcli%2F@v%2Fv1.20.0.zip 72765 BLAKE2B 61a5269577f397701a50299f9e32b195f56af70a439ecc94f3ccba5a04cf6d1d220b5ae34d26c1a019989b19996335d265abb665ac5aee876ba50b941665cf99 SHA512 5edcc7510abaf7a6326a27a43aa7debd43d333dd1c23462a5f0d8a8d526ef74c085db35a637536eb6883d531bce4bf35648b75dbb19e43e481382572cdd24b3f
+DIST github.com%2Fvinzenz%2Fyaml%2F@v%2Fv0.0.0-20170920081652-35282ab071f9.mod 31 BLAKE2B ba5b952ac50ac94b31caa3d8b65f58a87cf0f3f8a2f26a3d377bc2de5864d643e450ebb7ff7753548a474ef854cf22b166acd4fcbc45b2dcd3235b2da83ed6de SHA512 0a7aa6d0b02e393e92e1caa1a484537ce2b6ff1c7fe1997096740e9831601f686aadba61fc69f69945a2d71fcb44c7aef5cbd603a5dc7fd5f4f26a08eaa7953c
+DIST github.com%2Fvinzenz%2Fyaml%2F@v%2Fv0.0.0-20170920082545-91409cdd725d.mod 31 BLAKE2B ba5b952ac50ac94b31caa3d8b65f58a87cf0f3f8a2f26a3d377bc2de5864d643e450ebb7ff7753548a474ef854cf22b166acd4fcbc45b2dcd3235b2da83ed6de SHA512 0a7aa6d0b02e393e92e1caa1a484537ce2b6ff1c7fe1997096740e9831601f686aadba61fc69f69945a2d71fcb44c7aef5cbd603a5dc7fd5f4f26a08eaa7953c
+DIST github.com%2Fvinzenz%2Fyaml%2F@v%2Fv0.0.0-20170920082545-91409cdd725d.zip 73956 BLAKE2B cff5be906cd366ccb7d919e6c92745503f28244dd31c77adcd1c26680af58bd9fec2e57cd62d2b4daa23d63e5dd3a048ee285f612adecbf5f7ec0d691a262ef7 SHA512 9c8c30099637b37bf644a9278834591cbadc7c5b9313a116105a7a85ad352d8b8c14e214985633a5035e82fd077cfedcb5ce033ec18042cc39df8e251492a56e
+DIST go.starlark.net%2F@v%2Fv0.0.0-20190219202100-4eb76950c5f0.mod 23 BLAKE2B f7664d7bb5473b3f70276738b039e9daadef4613518756a1e45671ce988f37df51a5d11940ecd6554c6f047cc32013607651bb10d968f267194aeef72dab4a15 SHA512 cb1fbe20cb5a7a51fc38f71a77ce9dcd8e24c016659379b40a39c6bc6aa75a1455743c7c6ec31d65bd988f62cb3b9ce3c386c9434a868b97b66c2512ed0c705c
+DIST go.starlark.net%2F@v%2Fv0.0.0-20190219202100-4eb76950c5f0.zip 241692 BLAKE2B 8324a8cda77d841249126762200c6f821b54d41fa7e22b692636a3829219901ed9a8a312b153e520501826920a3e944c461aaa2190b4ed2e2c74b3b02aaae01a SHA512 e91c22b4e465e2a7508c843eb83136e7c132f7a474a1cf997e9b28391aa299ca2cd2f2935ed3bf93fee16e41fd832ba2736f8440fa171fab7fe6d2bebc012937
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181203042331-505ab145d0a9.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181005035420-146acd28ed58.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181005035420-146acd28ed58.zip 1331187 BLAKE2B e3f0570a790f69d014f21a1c6d5557390f43c1743dde239beaf25dbf4bd489828493d65196d17dd4cc2db2598fb09562d412b0f7e6c8696d2cb5d31639f5762c SHA512 9af0d16f46c3d0cc6d65459bfc4e880895279f186c801ba19f6e5b08432a488791df26b716e2d116ecee7c499c61d592f2d3a2c2fd320d2bf9afb48743336829
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20181003184128-c57b0facaced.mod 27 BLAKE2B 078fc99b981406f4ee3f8da94c83954e80619e76ea63cf6323f27614bbcb870bb650eb5ffaac865a374f3ed0ef0619d97e11f05924c92e395e72cb73f28630e6 SHA512 53431e560b5d6a9b50f44997ef6755f71741ccca155767dd954da41f11f53a3e8d01d7e01a2bb9de1fdd551dd2e734cb65e5641cf5de5c9a8a6a25a4894336f5
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20181203162652-d668ce993890.mod 27 BLAKE2B 078fc99b981406f4ee3f8da94c83954e80619e76ea63cf6323f27614bbcb870bb650eb5ffaac865a374f3ed0ef0619d97e11f05924c92e395e72cb73f28630e6 SHA512 53431e560b5d6a9b50f44997ef6755f71741ccca155767dd954da41f11f53a3e8d01d7e01a2bb9de1fdd551dd2e734cb65e5641cf5de5c9a8a6a25a4894336f5
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20181203162652-d668ce993890.zip 79400 BLAKE2B 27518ae102534bf2bf877989043093b8e3e5673abf9b6d3d0058e040aa506baf2ecbd4f0fa20cbf32553069d46d60a3fa8978d690130917026babeb845e70d57 SHA512 5b076352e0d933f92bc2f190e3cbc913915d9f9af3067582b19746cab93b31e447469e4eca9095d03fb56f44c9f96adbec54e173b698654f1a5807dffc41dd80
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.zip 24878 BLAKE2B b405b445c49834f5b9e5ee82326dcd5f4807963a38d29b851fdd1e914d2695fc5066e17066288e539818ddc52f83c209325d9318d1e4e76f9a2a9a1859f82ff8 SHA512 1f94b8b8c8e4aed577fba2cb65403424cd649c2c437c115d52e08338194f447a4939fb39d73237c2906ea15a4b5089642abdd0bc6ad8a34c8b8e6f097cb43fdc
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181005133103-4497e2df6f9e.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
+DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
+DIST google.golang.org%2Fappengine%2F@v%2Fv1.2.0.mod 162 BLAKE2B 21c4d160665b6a87101d2aec39d2f7faef9a66f6be50f7293706686022f808b131c9ce7ddfcba6c2b6d27d15f9414101650436a2403f156a0368de2bce72e482 SHA512 60fb2454326103e4905f79f23a25320cb2c0035b7a0e3c228af845ed7dae23014efb81685f29805303edf277e8b1a2d9a7530b8f3a1a8e57caa1a85edeb52475
+DIST google.golang.org%2Fappengine%2F@v%2Fv1.3.0.mod 162 BLAKE2B 21c4d160665b6a87101d2aec39d2f7faef9a66f6be50f7293706686022f808b131c9ce7ddfcba6c2b6d27d15f9414101650436a2403f156a0368de2bce72e482 SHA512 60fb2454326103e4905f79f23a25320cb2c0035b7a0e3c228af845ed7dae23014efb81685f29805303edf277e8b1a2d9a7530b8f3a1a8e57caa1a85edeb52475
+DIST gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod 38 BLAKE2B e7781691d8c15b764ef6c89fcdf20e69fc28d46e8df2703b6fdc342247595c10ed25e3cc5b30cd29b81c57837f5685e4122e1b2c218a51fffbb1567c85b0835a SHA512 585188d3a75067e6b7d8a8321959fe7df80c6a19f8668a87f0d1b8687c4d2cefc039167446f6d02f7eeeb147371bc7a673348213bcb07f4d90bebc0ccf9f2015
+DIST gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
+DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
+DIST gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.mod 23 BLAKE2B 7e865218970f4a4fa06035c7474ea6a854843051fafd593b393007eb606d813e7817d2444697c68a3c63ce44d57b2f7bd47348ae6e4481bd11f43ed6ace64e5a SHA512 cb350a878f5cb581d62859e605c732ff92a0b92295c28eb17f17768845feef85c1838bda755ff952a8c939f6a46e9cbf5dd77b6e278adf8197a418111e2f98dc
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.zip 78275 BLAKE2B 139c8eb7c405dddbb67321eacd25c0af1e5b3f031831266abf6a8e5a5ed12f6381778868383c03433f8ef760d6b42ffbff40150f2fee91dedd0b312f9fe81c7f SHA512 3214b38f348921f6a6d9ef93d4337bb90abd0d101d69d16ad8e38415c22d3b9a85bda873df2eb7a271f9b973ef38b74731405e522e1bb8083c78932762cb5535
+DIST k8s.io%2Fapi%2F@v%2Fv0.0.0-20181130031204-d04500c8c3dd.mod 18 BLAKE2B 48d83ca0453fa02ae989399480a204d7ff4ff720824fb3d303fc5a44f3f64d688f012a63d4863e5293afb1448eb5f57a3a0d62539add4d8686a6d1efc351376a SHA512 2c0d1d009643dc254c905d3f8c547304de4497bb5550ecdb1a47f35b0c7bcda2f9b8392ced569fac88dd3074f7ed02530494c02650bb4eed4af99ddfe91a64af
+DIST k8s.io%2Fapimachinery%2F@v%2Fv0.0.0-20181201231028-18a5ff3097b4.mod 27 BLAKE2B b7a39696a90ac33cefc9cc615fa6900378d705c665fd17ad605e51b9c69f684c7cb7388739787794d43067a9b4cee88d7a5e71e1a4e7f1c76e948821dd155d93 SHA512 c5682355b95ccb06e22d2ac8582b3d9dd27a42c37006dda71f320f1c86be224254881286aed98b08312f01beeedba3a385d53a341939dfbe2803b2bd5d853a2e
+DIST k8s.io%2Fclient-go%2F@v%2Fv9.0.0+incompatible.mod 24 BLAKE2B e7c6a4736834c042c1326573259f9b789da58f8c53cf0f36b47086b94fa9f5a94ad9b36baa17f7c437218eca6ac6293e4ff1e50378f27e94ef609ff249520261 SHA512 ec86bdb5262590a5169f49362588e90e95a0874fbf2bd670ea27dac7d883be2d7f56e8277336d7ead06f9068ea43375c8fc6f055e1322fc8f802550c927e6d85
+DIST k8s.io%2Fklog%2F@v%2Fv0.1.0.mod 19 BLAKE2B 2af8f84f1cc7227be731c55dbe33e87e9d4fbba134ae86b6a86bac30260f32c7f17422789189486b17e1a2b84cfdca35984dd6d6079aab621620e90da230a6ac SHA512 cd5afa0488338a1b22bb852219078d74d61f894fd075b60b22bf062dbc49ad16c1088ab55bc8ae72aeadb4f7fb9534b99adceeaf3913e47bbf00df1ead1c7aaf
+DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod 24 BLAKE2B d33080dbc62b185d029eb43f75d66328dbfa7c463a3117b3efd5419ab8e1e52cc6f5d5a288d553421025c785ec6948b3aa68588cae19bd325f6acc0d043bb5fb SHA512 78f6402daccb04510f4ef35ee457ee13e4f447fba8e6aa33b4d32aa666e925861bf3b3f22c5ba9573871ec7e830f99e4caae0969724a54eadf40e6a7ed7931a0
 EBUILD drone-cli-0.8.6.ebuild 732 BLAKE2B 405771f011cff1cfae1dc57e684c58d48f697ed84d275ae8b6d7225fd7df0806c6d124279402cc83c746d2b927113122671fd5be54218138e39c6c241c449516 SHA512 15b056b185e7138eef94b2610d3d4c6c5c81843871edaad2dae22775b845d1401b77c9c17468b47a5365f596711d9bf46213a5e29e1be5fa83517c973f5b0cbd
 EBUILD drone-cli-1.1.4.ebuild 658 BLAKE2B 4136d0771d249f55c33ea9d578853605c498e1e31e1ebca6b6d247775461f4992f2852eb6a3500c48f8e710571a7de56701cf88532603372e042e4c1094ead64 SHA512 5caf3267dcab62131401c81cfd816ad1079e96601cf0a0b1b336cc570e718533c042b055205d07b27828ef2352a3cc53f6d3a780571ed54eca72eb5e89301723
+EBUILD drone-cli-1.2.1.ebuild 7122 BLAKE2B d777e4a38a0971f5c2b2bfa68891697d161381710aac93364a5f403f0e456d3d1a345a13fcfdbc9f54c7d9e29af62d9703d8a17fc528d7bbb5754a762eda8cd0 SHA512 2e4d79e03d8b43d911946c69a98dcc234b159b586cc7c36246f8a75b8de3f3d625677b1004a90da24d5b4ebb7810db029dc99b41e8798dfc5b4ac8efaadec5e3
 MISC metadata.xml 328 BLAKE2B c17239362178a88bf5c7d3a268b0f91ffe89f00be35df57fc19fc0b08cb00374053c422d097b93b65ae05b3580a6e4c9b3fea63777e3a3892ab9eb3d22a8b90e SHA512 4a96b4fbecd4a36dd3e5d53e66aca7a75c8e4c4bdcf34bd2a2f36bdf09ca0bf38ceff6ab49454a4b9bbfb0849ae3d129c9b585feda80075f3c69e83a74639055
diff --git a/dev-util/drone-cli/drone-cli-1.2.1.ebuild b/dev-util/drone-cli/drone-cli-1.2.1.ebuild
new file mode 100644
index 000000000000..82f47d808072
--- /dev/null
+++ b/dev-util/drone-cli/drone-cli-1.2.1.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+
+DESCRIPTION="Command-line interface for Drone"
+HOMEPAGE="https://github.com/drone/drone-cli"
+
+EGO_SUM=(
+	"docker.io/go-docker v1.0.0"
+	"docker.io/go-docker v1.0.0/go.mod"
+	"github.com/99designs/httpsignatures-go v0.0.0-20170731043157-88528bf4ca7e"
+	"github.com/99designs/httpsignatures-go v0.0.0-20170731043157-88528bf4ca7e/go.mod"
+	"github.com/Microsoft/go-winio v0.4.11/go.mod"
+	"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
+	"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
+	"github.com/bmatcuk/doublestar v1.1.1"
+	"github.com/bmatcuk/doublestar v1.1.1/go.mod"
+	"github.com/buildkite/yaml v0.0.0-20181016232759-0caa5f0796e3/go.mod"
+	"github.com/buildkite/yaml v2.1.0+incompatible"
+	"github.com/buildkite/yaml v2.1.0+incompatible/go.mod"
+	"github.com/davecgh/go-spew v1.1.0/go.mod"
+	"github.com/davecgh/go-spew v1.1.1/go.mod"
+	"github.com/docker/distribution v0.0.0-20170726174610-edc3ab29cdff/go.mod"
+	"github.com/docker/distribution v2.7.1+incompatible"
+	"github.com/docker/distribution v2.7.1+incompatible/go.mod"
+	"github.com/docker/go-connections v0.3.0"
+	"github.com/docker/go-connections v0.3.0/go.mod"
+	"github.com/docker/go-units v0.3.3"
+	"github.com/docker/go-units v0.3.3/go.mod"
+	"github.com/drone/drone-go v0.0.0-20190809073937-cba78c0895aa"
+	"github.com/drone/drone-go v0.0.0-20190809073937-cba78c0895aa/go.mod"
+	"github.com/drone/drone-go v1.0.6"
+	"github.com/drone/drone-go v1.0.6/go.mod"
+	"github.com/drone/drone-go v1.0.7-0.20190918192642-21c14e63f89a"
+	"github.com/drone/drone-go v1.0.7-0.20190918192642-21c14e63f89a/go.mod"
+	"github.com/drone/drone-go v1.0.7-0.20191002153459-173e210cf8d6"
+	"github.com/drone/drone-go v1.0.7-0.20191002153459-173e210cf8d6/go.mod"
+	"github.com/drone/drone-runtime v0.0.0-20190729082142-807d0aeaa221/go.mod"
+	"github.com/drone/drone-runtime v1.0.7-0.20190729070836-38f28a11afe8"
+	"github.com/drone/drone-runtime v1.0.7-0.20190729070836-38f28a11afe8/go.mod"
+	"github.com/drone/drone-yaml v0.0.0-20190729072335-70fa398b3560"
+	"github.com/drone/drone-yaml v0.0.0-20190729072335-70fa398b3560/go.mod"
+	"github.com/drone/envsubst v1.0.1"
+	"github.com/drone/envsubst v1.0.1/go.mod"
+	"github.com/drone/funcmap v0.0.0-20190918184546-d4ef6e88376d"
+	"github.com/drone/funcmap v0.0.0-20190918184546-d4ef6e88376d/go.mod"
+	"github.com/drone/signal v1.0.0"
+	"github.com/drone/signal v1.0.0/go.mod"
+	"github.com/fatih/color v1.7.0"
+	"github.com/fatih/color v1.7.0/go.mod"
+	"github.com/ghodss/yaml v1.0.0"
+	"github.com/ghodss/yaml v1.0.0/go.mod"
+	"github.com/gogo/protobuf v0.0.0-20170307180453-100ba4e88506"
+	"github.com/gogo/protobuf v0.0.0-20170307180453-100ba4e88506/go.mod"
+	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
+	"github.com/golang/mock v1.1.1/go.mod"
+	"github.com/golang/protobuf v1.2.0/go.mod"
+	"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
+	"github.com/google/go-cmp v0.2.0/go.mod"
+	"github.com/google/go-cmp v0.3.1/go.mod"
+	"github.com/google/go-jsonnet v0.11.2"
+	"github.com/google/go-jsonnet v0.11.2/go.mod"
+	"github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf/go.mod"
+	"github.com/googleapis/gnostic v0.2.0/go.mod"
+	"github.com/gregjones/httpcache v0.0.0-20181110185634-c63ab54fda8f/go.mod"
+	"github.com/hashicorp/golang-lru v0.5.0/go.mod"
+	"github.com/imdario/mergo v0.3.6/go.mod"
+	"github.com/jackspirou/syscerts v0.0.0-20160531025014-b68f5469dff1"
+	"github.com/jackspirou/syscerts v0.0.0-20160531025014-b68f5469dff1/go.mod"
+	"github.com/joho/godotenv v1.3.0"
+	"github.com/joho/godotenv v1.3.0/go.mod"
+	"github.com/json-iterator/go v1.1.5/go.mod"
+	"github.com/kr/pretty v0.1.0/go.mod"
+	"github.com/kr/pty v1.1.1/go.mod"
+	"github.com/kr/text v0.1.0/go.mod"
+	"github.com/mattn/go-colorable v0.0.9"
+	"github.com/mattn/go-colorable v0.0.9/go.mod"
+	"github.com/mattn/go-isatty v0.0.4"
+	"github.com/mattn/go-isatty v0.0.4/go.mod"
+	"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod"
+	"github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod"
+	"github.com/natessilva/dag v0.0.0-20180124060714-7194b8dcc5c4"
+	"github.com/natessilva/dag v0.0.0-20180124060714-7194b8dcc5c4/go.mod"
+	"github.com/opencontainers/go-digest v1.0.0-rc1"
+	"github.com/opencontainers/go-digest v1.0.0-rc1/go.mod"
+	"github.com/opencontainers/image-spec v1.0.1"
+	"github.com/opencontainers/image-spec v1.0.1/go.mod"
+	"github.com/petar/GoLLRB v0.0.0-20130427215148-53be0d36a84c/go.mod"
+	"github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod"
+	"github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4"
+	"github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4/go.mod"
+	"github.com/pkg/errors v0.8.0"
+	"github.com/pkg/errors v0.8.0/go.mod"
+	"github.com/pmezard/go-difflib v1.0.0/go.mod"
+	"github.com/sergi/go-diff v1.0.0/go.mod"
+	"github.com/spf13/pflag v1.0.3/go.mod"
+	"github.com/stretchr/objx v0.1.0/go.mod"
+	"github.com/stretchr/testify v1.3.0/go.mod"
+	"github.com/urfave/cli v1.20.0"
+	"github.com/urfave/cli v1.20.0/go.mod"
+	"github.com/vinzenz/yaml v0.0.0-20170920081652-35282ab071f9/go.mod"
+	"github.com/vinzenz/yaml v0.0.0-20170920082545-91409cdd725d"
+	"github.com/vinzenz/yaml v0.0.0-20170920082545-91409cdd725d/go.mod"
+	"go.starlark.net v0.0.0-20190219202100-4eb76950c5f0"
+	"go.starlark.net v0.0.0-20190219202100-4eb76950c5f0/go.mod"
+	"golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod"
+	"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
+	"golang.org/x/net v0.0.0-20181005035420-146acd28ed58"
+	"golang.org/x/net v0.0.0-20181005035420-146acd28ed58/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20181003184128-c57b0facaced/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890"
+	"golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod"
+	"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f"
+	"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod"
+	"golang.org/x/sys v0.0.0-20181005133103-4497e2df6f9e/go.mod"
+	"golang.org/x/text v0.3.0/go.mod"
+	"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod"
+	"google.golang.org/appengine v1.2.0/go.mod"
+	"google.golang.org/appengine v1.3.0/go.mod"
+	"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
+	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
+	"gopkg.in/inf.v0 v0.9.1/go.mod"
+	"gopkg.in/yaml.v2 v2.2.1/go.mod"
+	"gopkg.in/yaml.v2 v2.2.2"
+	"gopkg.in/yaml.v2 v2.2.2/go.mod"
+	"k8s.io/api v0.0.0-20181130031204-d04500c8c3dd/go.mod"
+	"k8s.io/apimachinery v0.0.0-20181201231028-18a5ff3097b4/go.mod"
+	"k8s.io/client-go v9.0.0+incompatible/go.mod"
+	"k8s.io/klog v0.1.0/go.mod"
+	"sigs.k8s.io/yaml v1.1.0/go.mod"
+	)
+go-module_set_globals
+SRC_URI="https://github.com/drone/drone-cli/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RESTRICT+=" test"
+
+src_compile() {
+	go build \
+		-ldflags "-X main.version=${PV}" -o bin/drone ./drone || die
+}
+
+src_install() {
+	dobin bin/drone
+	dodoc README.md
+}
diff --git a/dev-util/dwarves/Manifest b/dev-util/dwarves/Manifest
index eb73e31533b8..e39e66e9b478 100644
--- a/dev-util/dwarves/Manifest
+++ b/dev-util/dwarves/Manifest
@@ -1,15 +1,4 @@
 AUX dwarves-1.10-python-import.patch 399 BLAKE2B 7abd98ec5711ec4ce9230a2d0bb06328174a4a67b62ba14b2413b83b6d44676d372930d4796b9ece230c4de9185d35cb31a086ca340871e50e29d584ab9a7487 SHA512 c2f5c1e99ef2ffeaf0e7962cbdf28817f6896b27ff6894571823c81ba08b9e9440af1a5b6ad82770b8e8d6ec99ec2ef8f46a98b67fea7cd4ed7e8c22e716e314
-AUX dwarves-1.16-no-libebl.patch 3974 BLAKE2B 88a5170bfed028cf7919ac010112ad21124a994e364af71f5124263b73c0aec00e7c75f73dd26255534a794065e1b17f15b8f27b566cf77a2a7aaf0832760f98 SHA512 9925c01104ccd0f5abc17488673a51b2a674751117a615a87f5b8efd1b6670bc778a5590e6a55e65cb6219d8521040b266b2dc63a31bf9618302e695a815cd71
-DIST dwarves-1.12.tar.bz2 112400 BLAKE2B e71051041dfdbefc603dc041303de82e2e44c8b0f4f888577722466aaf7958cab7b04c15154faa8cbfcaa44fe60fc549e09b2fb68747cc3cdd08b8bce487cfdf SHA512 20644344e694253b79ede65e489696a319f10eaf424af81882414ae6efeaf34a82132321430d647916b78f97ef504907b3bd32919420f2cd14384910e283ff27
-DIST dwarves-1.13.tar.xz 222008 BLAKE2B db73f5c9a319a1a57ef37127350a9da117e3f5c89e199445393e3e312139ce8f88f46e6e5bbf302d708c0b075b1c2b2cd75dc7bc213ed144d1db792c55358220 SHA512 26485b183b4c7b608dd0392f9155dd570a14c86fdeafee232e44ad30f14a1357b408b61b0e8a31ea4bf976ed7fc44e7d5a4a3ccede9713c47265ad52c13dadf0
-DIST dwarves-1.15.tar.xz 222272 BLAKE2B a33d128ec899da0f0a1e2fc96703f0425fd1a2082675ddf886df55507b29b5fbad1a1cefd6b0a9002f50193b4c70f87a2eeacd50d94388776bb338fe678849e0 SHA512 29a8a15b7190480e79c2f423c7104d0fd275cd4c3df17518a1dd3c63cce1c528fad4b6f580baa397d9aa9323703009009e2d529939b12dd1af2c65cf7120b237
-DIST dwarves-1.16.tar.xz 273060 BLAKE2B a4cd976ff1cf6af0e2848a337400f4b1961ec5aff528d1c5893053967c0d1e7fc77de8220ae67c4b8a3eb387b659fbfd72113b29b2bf6a20d1fc45a59008a3e0 SHA512 6d57b26db70736353d8797d1f7d68c7c73b6df3ae69eb66dd7cb07d6b50a26c4f2adaa576a8915a4a7f8c41b67dcebbfc8cbdf3ba507dbf941f63941b13d65b1
 DIST dwarves-1.17.tar.xz 309028 BLAKE2B 600d095359fa1ef208cc83655761505a07512faf9957144cc5fdd9e69bef98be3afc8b29a4c13aa0246aa43fdc9b4906de95f37c86fc6790ece52a79e3b13695 SHA512 8916ea24316efe1eb322d045fb2d81c230905f2fe33942eac641e9e0311f33a3bcf55be454eac32781799c255303bafacd8f1bd1b3ec08f0dae4d5f38d8186ba
-EBUILD dwarves-1.12.ebuild 1062 BLAKE2B 2e436733a3e3525194482c9f2d2d0327a51a1b6b49454dfce06769e01546eca86ff2f603e78fc0c4ebf1a000eacca8d0e86dd4b30db062ceee22303d75ca2422 SHA512 cbd4523e3135ad2d3b5336ecf970af7a7172f67e2b9a0f17919403d66f536a63654fd623ed37fbb200e2431c7af661181ce5270c4e61763fde7753991c1e9f68
-EBUILD dwarves-1.13.ebuild 1061 BLAKE2B 729f6f13b1b030171888139074499c0841ebbfa9ec4b1605706c3a1defda1a18bc5a56c41c89221b0ef78b294f5f8dbfea19eaa06dc4f0680af8eeea853c8c52 SHA512 a7aa494a88ac6f476d5001c2dfba81d1c372b3b4baaf2bc3a677cda395776b2f8c3eae60f151ece20a62e9d68a3922340ead94ce66f4bab0e181c741ef86e5a6
-EBUILD dwarves-1.15.ebuild 964 BLAKE2B 4cf5b6c4c76940c3c86e83e70bced706fa192811f2dc20f354faf418ca444ec8dd5cee02251c3e137a714f64bbc5e3d4f116e10d95fb59ccc1032178c572c0f0 SHA512 2060b58bef02713bb93df2f62dc0f5bec63559d936b1626a1001016c01cee7c16e692a1c38442ee9bf075055387bec41853d64b2cd57aea75b3fdef59ee5bb2a
-EBUILD dwarves-1.16-r1.ebuild 981 BLAKE2B 73d0c73c70e17641b914ac177c3423a02592bc555c876aa99b2f23bfbf79a8ae3a74b11d593ef28bf34ec47f2b6e9d28637a8f49db9f03f90d25974edf65d69e SHA512 54a0e1425ac72e753e8c70534617f84863897b74689ea1f08602601c490a130830eae1ba3f984cd5a77eb9637131ba7ff7384e27542870871b40f972b932d1e4
-EBUILD dwarves-1.16.ebuild 964 BLAKE2B 4cf5b6c4c76940c3c86e83e70bced706fa192811f2dc20f354faf418ca444ec8dd5cee02251c3e137a714f64bbc5e3d4f116e10d95fb59ccc1032178c572c0f0 SHA512 2060b58bef02713bb93df2f62dc0f5bec63559d936b1626a1001016c01cee7c16e692a1c38442ee9bf075055387bec41853d64b2cd57aea75b3fdef59ee5bb2a
-EBUILD dwarves-1.17.ebuild 931 BLAKE2B c471d826b831c5d663909c19a221ca96f18349e82f2f36486cc124185ff89377935282732423a5f1836c7a53dfe9f1e103443581a278bc238625b390d1447198 SHA512 18ef62683512041aaade7bce5bb443c0b3107e2d6f59453b64345102a7592ccc1876cecf82697124a907da3b6da660a6f8d4ab45b9a981110c190179dc4b30e3
-EBUILD dwarves-9999.ebuild 831 BLAKE2B f6abb8e145532fe61e11b32695938c214c98b4f7adff2ea708af5d6794a1fb909a2ae779ebb07f9150af6d323f4cbd202200e1b1f6b4690d926408f84175f7bd SHA512 543e00d8572be3d4035cbe1c68adf5d3a3aab3a5dfbd9f47a976bccc8b0f73a3d382d0e96f796181afa9d130f00fe6fa623e6c3b674fb1efd8a1a1675ee7e694
+EBUILD dwarves-1.17.ebuild 936 BLAKE2B 52c32717be8cd449941f32e9745bb6a7876f40e37738a3cf56de8673d98e3c81e51fb1c865157a74208633fc88a72becfc25d3787b669e087d72418200c2420e SHA512 fdca096be1fc9d4ca6ef133b38119f1ffdec68a578c7cd854eb4dae588e5d009e8faa0e5aa9d1f7295bd7144589d5411fc321faf3f3006b41001e573934b77f8
 MISC metadata.xml 671 BLAKE2B 78a2fa86c0acc136403b1477db4e2deb3bde1ceed636ced96705cdaccb7e42f76e8fbd202c3fa258c1f33b14827f95b5ce343f8f4df981be66e0ad3a8dd226b8 SHA512 0cdd2c3e4e76a9017120a409aec1f70327363ee146e5fb74684d0e08e2836f0079cb97be1c4874445b271b98c13daf04f75ee481ef21607aac8976a78437af11
diff --git a/dev-util/dwarves/dwarves-1.12.ebuild b/dev-util/dwarves/dwarves-1.12.ebuild
deleted file mode 100644
index bcd44c849ea3..000000000000
--- a/dev-util/dwarves/dwarves-1.12.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit multilib cmake-utils 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 ~x86"
-IUSE="debug"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/elfutils-0.131
-	<=dev-libs/elfutils-0.177
-	sys-libs/zlib"
-DEPEND="${RDEPEND}"
-
-if [[ ${PV//_p} == ${PV} ]]; then
-	SRC_URI="http://fedorapeople.org/~acme/dwarves/${P}.tar.bz2"
-	S=${WORKDIR}
-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-utils_src_configure
-}
-
-src_test() { :; }
-
-src_install() {
-	cmake-utils_src_install
-	python_fix_shebang "${D}"/usr/bin/ostra-cg \
-		"${D}"/usr/share/dwarves/runtime/python/ostra.py
-}
diff --git a/dev-util/dwarves/dwarves-1.13.ebuild b/dev-util/dwarves/dwarves-1.13.ebuild
deleted file mode 100644
index cb99e78f1ffb..000000000000
--- a/dev-util/dwarves/dwarves-1.13.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit multilib cmake-utils 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 ~x86"
-IUSE="debug"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/elfutils-0.131
-	<=dev-libs/elfutils-0.177
-	sys-libs/zlib"
-DEPEND="${RDEPEND}"
-
-if [[ ${PV//_p} == ${PV} ]]; then
-	SRC_URI="http://fedorapeople.org/~acme/dwarves/${P}.tar.xz"
-	S=${WORKDIR}
-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-utils_src_configure
-}
-
-src_test() { :; }
-
-src_install() {
-	cmake-utils_src_install
-	python_fix_shebang "${D}"/usr/bin/ostra-cg \
-		"${D}"/usr/share/dwarves/runtime/python/ostra.py
-}
diff --git a/dev-util/dwarves/dwarves-1.15.ebuild b/dev-util/dwarves/dwarves-1.15.ebuild
deleted file mode 100644
index d4a49fba59f5..000000000000
--- a/dev-util/dwarves/dwarves-1.15.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-inherit multilib cmake-utils 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 ~x86"
-IUSE="debug"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/elfutils-0.131
-	<=dev-libs/elfutils-0.177
-	sys-libs/zlib"
-DEPEND="${RDEPEND}"
-
-if [[ ${PV//_p} == ${PV} ]]; then
-	SRC_URI="http://fedorapeople.org/~acme/dwarves/${P}.tar.xz"
-	S=${WORKDIR}
-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-utils_src_configure
-}
-
-src_test() { :; }
-
-src_install() {
-	cmake-utils_src_install
-}
diff --git a/dev-util/dwarves/dwarves-1.16-r1.ebuild b/dev-util/dwarves/dwarves-1.16-r1.ebuild
deleted file mode 100644
index c58ef0fd660d..000000000000
--- a/dev-util/dwarves/dwarves-1.16-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-inherit multilib cmake-utils 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 ~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"
-	S=${WORKDIR}
-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
-	"${FILESDIR}"/${PN}-1.16-no-libebl.patch
-)
-
-src_configure() {
-	local mycmakeargs=( "-D__LIB=$(get_libdir)" )
-	cmake-utils_src_configure
-}
-
-src_test() { :; }
-
-src_install() {
-	cmake-utils_src_install
-}
diff --git a/dev-util/dwarves/dwarves-1.16.ebuild b/dev-util/dwarves/dwarves-1.16.ebuild
deleted file mode 100644
index d4a49fba59f5..000000000000
--- a/dev-util/dwarves/dwarves-1.16.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-inherit multilib cmake-utils 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 ~x86"
-IUSE="debug"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/elfutils-0.131
-	<=dev-libs/elfutils-0.177
-	sys-libs/zlib"
-DEPEND="${RDEPEND}"
-
-if [[ ${PV//_p} == ${PV} ]]; then
-	SRC_URI="http://fedorapeople.org/~acme/dwarves/${P}.tar.xz"
-	S=${WORKDIR}
-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-utils_src_configure
-}
-
-src_test() { :; }
-
-src_install() {
-	cmake-utils_src_install
-}
diff --git a/dev-util/dwarves/dwarves-1.17.ebuild b/dev-util/dwarves/dwarves-1.17.ebuild
index 900e391c2b62..f1c8095ab8b1 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 ~x86"
+KEYWORDS="amd64 ~ppc64 x86"
 IUSE="debug"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-util/dwarves/dwarves-9999.ebuild b/dev-util/dwarves/dwarves-9999.ebuild
deleted file mode 100644
index 7eb6207bcb2e..000000000000
--- a/dev-util/dwarves/dwarves-9999.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_REPO_URI="https://git.kernel.org/pub/scm/devel/pahole/pahole.git"
-
-PYTHON_COMPAT=( python3_6 )
-inherit multilib cmake-utils git-r3 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=""
-IUSE="debug"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/elfutils-0.178
-	sys-libs/zlib"
-DEPEND="${RDEPEND}"
-
-DOCS=( README README.ctracer NEWS )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.10-python-import.patch
-)
-
-src_configure() {
-	local mycmakeargs=( "-D__LIB=$(get_libdir)" )
-	cmake-utils_src_configure
-}
-
-src_test() { :; }
-
-src_install() {
-	cmake-utils_src_install
-}
diff --git a/dev-util/dwarves/files/dwarves-1.16-no-libebl.patch b/dev-util/dwarves/files/dwarves-1.16-no-libebl.patch
deleted file mode 100644
index 78c6a4e3964f..000000000000
--- a/dev-util/dwarves/files/dwarves-1.16-no-libebl.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From fb56a460e23f44a4225d4f507b9ec7cf0790c75b Mon Sep 17 00:00:00 2001
-From: "Jason A. Donenfeld" <Jason@zx2c4.com>
-Date: Mon, 16 Dec 2019 21:51:45 +0100
-Subject: [PATCH] cmake: libebl was merged into libdw
-
-Since elfutils 178, libebl is now part of libdw, so searching for libebl
-always fails. Simply remove it from the search.
-
-Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
----
- cmake/modules/FindDWARF.cmake | 23 +++++++----------------
- 1 file changed, 7 insertions(+), 16 deletions(-)
-
-diff --git a/cmake/modules/FindDWARF.cmake b/cmake/modules/FindDWARF.cmake
-index f4feec4..027d06e 100644
---- a/cmake/modules/FindDWARF.cmake
-+++ b/cmake/modules/FindDWARF.cmake
-@@ -37,14 +37,9 @@ find_library(ELF_LIBRARY
- 	PATHS /usr/lib /usr/local/lib /usr/lib64 /usr/local/lib64 ~/usr/local/lib ~/usr/local/lib64
- )
- 
--find_library(EBL_LIBRARY
--	NAMES ebl
--	PATHS /usr/lib /usr/local/lib /usr/lib64 /usr/local/lib64 ~/usr/local/lib ~/usr/local/lib64
--)
--
--if (DWARF_INCLUDE_DIR AND LIBDW_INCLUDE_DIR AND DWARF_LIBRARY AND ELF_LIBRARY AND EBL_LIBRARY)
-+if (DWARF_INCLUDE_DIR AND LIBDW_INCLUDE_DIR AND DWARF_LIBRARY AND ELF_LIBRARY)
- 	set(DWARF_FOUND TRUE)
--	set(DWARF_LIBRARIES ${DWARF_LIBRARY} ${ELF_LIBRARY} ${EBL_LIBRARY})
-+	set(DWARF_LIBRARIES ${DWARF_LIBRARY} ${ELF_LIBRARY})
- 
- 	set(CMAKE_REQUIRED_LIBRARIES ${DWARF_LIBRARIES})
- 	# check if libdw have the dwfl_module_build_id routine, i.e. if it supports the buildid
-@@ -52,10 +47,10 @@ if (DWARF_INCLUDE_DIR AND LIBDW_INCLUDE_DIR AND DWARF_LIBRARY AND ELF_LIBRARY AN
- 	# in distributions such as fedora). We do it against libelf because, IIRC, some distros
- 	# include libdw linked statically into libelf.
- 	check_library_exists(elf dwfl_module_build_id "" HAVE_DWFL_MODULE_BUILD_ID)
--else (DWARF_INCLUDE_DIR AND LIBDW_INCLUDE_DIR AND DWARF_LIBRARY AND ELF_LIBRARY AND EBL_LIBRARY)
-+else (DWARF_INCLUDE_DIR AND LIBDW_INCLUDE_DIR AND DWARF_LIBRARY AND ELF_LIBRARY)
- 	set(DWARF_FOUND FALSE)
- 	set(DWARF_LIBRARIES)
--endif (DWARF_INCLUDE_DIR AND LIBDW_INCLUDE_DIR AND DWARF_LIBRARY AND ELF_LIBRARY AND EBL_LIBRARY)
-+endif (DWARF_INCLUDE_DIR AND LIBDW_INCLUDE_DIR AND DWARF_LIBRARY AND ELF_LIBRARY)
- 
- if (DWARF_FOUND)
- 	if (NOT DWARF_FIND_QUIETLY)
-@@ -63,7 +58,6 @@ if (DWARF_FOUND)
- 		message(STATUS "Found elfutils/libdw.h header: ${LIBDW_INCLUDE_DIR}")
- 		message(STATUS "Found libdw library: ${DWARF_LIBRARY}")
- 		message(STATUS "Found libelf library: ${ELF_LIBRARY}")
--		message(STATUS "Found libebl library: ${EBL_LIBRARY}")
- 	endif (NOT DWARF_FIND_QUIETLY)
- else (DWARF_FOUND)
- 	if (DWARF_FIND_REQUIRED)
-@@ -73,9 +67,9 @@ else (DWARF_FOUND)
- 		find_path(FEDORA fedora-release /etc)
- 		find_path(REDHAT redhat-release /etc)
- 		if (FEDORA OR REDHAT)
--			if (NOT DWARF_INCLUDE_DIR OR NOT LIBDW_INCLUDE_DIR OR NOT EBL_LIBRARY)
-+			if (NOT DWARF_INCLUDE_DIR OR NOT LIBDW_INCLUDE_DIR)
- 				message(STATUS "Please install the elfutils-devel package")
--			endif (NOT DWARF_INCLUDE_DIR OR NOT LIBDW_INCLUDE_DIR OR NOT EBL_LIBRARY)
-+			endif (NOT DWARF_INCLUDE_DIR OR NOT LIBDW_INCLUDE_DIR)
- 			if (NOT DWARF_LIBRARY)
- 				message(STATUS "Please install the elfutils-libs package")
- 			endif (NOT DWARF_LIBRARY)
-@@ -89,9 +83,6 @@ else (DWARF_FOUND)
- 			if (NOT LIBDW_INCLUDE_DIR)
- 				message(STATUS "Could NOT find libdw include dir")
- 			endif (NOT LIBDW_INCLUDE_DIR)
--			if (NOT EBL_LIBRARY)
--				message(STATUS "Could NOT find libebl library")
--			endif (NOT EBL_LIBRARY)
- 			if (NOT DWARF_LIBRARY)
- 				message(STATUS "Could NOT find libdw library")
- 			endif (NOT DWARF_LIBRARY)
-@@ -103,7 +94,7 @@ else (DWARF_FOUND)
- 	endif (DWARF_FIND_REQUIRED)
- endif (DWARF_FOUND)
- 
--mark_as_advanced(DWARF_INCLUDE_DIR LIBDW_INCLUDE_DIR DWARF_LIBRARY ELF_LIBRARY EBL_LIBRARY)
-+mark_as_advanced(DWARF_INCLUDE_DIR LIBDW_INCLUDE_DIR DWARF_LIBRARY ELF_LIBRARY)
- include_directories(${DWARF_INCLUDE_DIR} ${LIBDW_INCLUDE_DIR})
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_SOURCE_DIR}/config.h)
- 
--- 
-2.24.1
-
diff --git a/dev-util/flawfinder/Manifest b/dev-util/flawfinder/Manifest
index fb4f779fc5cb..f4394af9b38f 100644
--- a/dev-util/flawfinder/Manifest
+++ b/dev-util/flawfinder/Manifest
@@ -5,7 +5,7 @@ DIST flawfinder-2.0.7.tar.gz 249177 BLAKE2B 35dc5796ca7ecf456bf623247c7fb3944e05
 DIST flawfinder-2.0.8.tar.gz 251546 BLAKE2B 4817d3f529c27f0e969754fab08d1323b5fd778e4914882bdd4a61a96301ded287e2899016e609f658d9fee5dc76c1013e535a32120831cd166bb3f24c443e8f SHA512 9346c60808087ddf28f433067691c662beb0c36375903fdd0b4dbe3e53fe92b3893e38b13ecb0fe134586cf680fc554d33c92ff910dbd1cd4c3cbeab946038f4
 EBUILD flawfinder-1.31.ebuild 724 BLAKE2B 4441a55be26ce38da31944675d0203dac0028b27acbf99dadc1e733114d8e6a80500aa0c90a592f89b188831faa1ffc1160a7f11e96a7b940f9af01f518e164b SHA512 d4730fd182db2bcd39ff3b44c0036fa4dfd00d26b98ff5732c03d89980de5ced3a9a955d926dcf40f1afb829839f5aab0f635d4a60464d15fb603bc7190eba39
 EBUILD flawfinder-2.0.10.ebuild 792 BLAKE2B c922817eed9d047f9fc26e3e85bd9c4d920c16799b5610e242352b5837c64ea522b8dbda7f4747beb3d555b57e30e9374d55f83b2ca7de7a106f207f202a1e16 SHA512 806fecac292a50f0978b17761f2ed006dbcbc4d4579b34e1c2bd9c525a8cdc8a77b220a1c6700770d4612b6fd8568dd3f8ba7df614baa20fa17dcca7bc1427cf
-EBUILD flawfinder-2.0.11.ebuild 786 BLAKE2B 8cddbdbb3d47dc66bbb7187b5e93ef89d5f98f8b76c10e100b8c196af74a132c3e368c27c8d160f798a35b06259794df1a5da74fbcab855976e527d7fbdb8dcf SHA512 e55411f50da729539a29510f1ccfa93a3c26c5bf83e9bb611c5f2da9e0acd74f356e6811ebfb559aa39a3e25c4160b5b126f27cefd5955fad861767744d8a10b
+EBUILD flawfinder-2.0.11.ebuild 784 BLAKE2B 9ed1d3fa43c50a760c79ce800ab2d48e0148eb20bc5b00d3404c22c58c02fdf032de953ef2777d5f82a203646f793a6d1ea254314f6690f0fe9d3ad7f20c82fc SHA512 6849ef5a067cafec819f9c28e1d51c7934a9683432dec14ff99c14dc82aaadacea4b1aab9ffdd3b5d5c1cd5285246347217da6d787c163bc4d561d22241463e0
 EBUILD flawfinder-2.0.7.ebuild 792 BLAKE2B c922817eed9d047f9fc26e3e85bd9c4d920c16799b5610e242352b5837c64ea522b8dbda7f4747beb3d555b57e30e9374d55f83b2ca7de7a106f207f202a1e16 SHA512 806fecac292a50f0978b17761f2ed006dbcbc4d4579b34e1c2bd9c525a8cdc8a77b220a1c6700770d4612b6fd8568dd3f8ba7df614baa20fa17dcca7bc1427cf
 EBUILD flawfinder-2.0.8.ebuild 792 BLAKE2B c922817eed9d047f9fc26e3e85bd9c4d920c16799b5610e242352b5837c64ea522b8dbda7f4747beb3d555b57e30e9374d55f83b2ca7de7a106f207f202a1e16 SHA512 806fecac292a50f0978b17761f2ed006dbcbc4d4579b34e1c2bd9c525a8cdc8a77b220a1c6700770d4612b6fd8568dd3f8ba7df614baa20fa17dcca7bc1427cf
 MISC metadata.xml 622 BLAKE2B b86d650364e1cd87b7fadc99bfc02e6acb360147c849846bfc94b3e827042aca129c745240ef8e04e3270ec6468dd5654ef9dbc55eeeb59d0251a73ab9d5f888 SHA512 5eda245e47619da4309fe11fd709daf8aedfefe97624ffcdd898bb4915c29e8dbf07b25543071ea9fe15af604a96f030ba816e26580c7166fd9689a1062e8e2b
diff --git a/dev-util/flawfinder/flawfinder-2.0.11.ebuild b/dev-util/flawfinder/flawfinder-2.0.11.ebuild
index df1286a9367d..afe75db76af3 100644
--- a/dev-util/flawfinder/flawfinder-2.0.11.ebuild
+++ b/dev-util/flawfinder/flawfinder-2.0.11.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.dwheeler.com/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~mips ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-util/gdbus-codegen/Manifest b/dev-util/gdbus-codegen/Manifest
index be68cb940176..3b557e07799a 100644
--- a/dev-util/gdbus-codegen/Manifest
+++ b/dev-util/gdbus-codegen/Manifest
@@ -1,7 +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.3.tar.xz 4778964 BLAKE2B 98ec6e15a8ff642fbccd4809d749234d5adae8abcab7a3619caed0aa60370d0409a76a2c64a95998401e8a339dcc264f4f808f3d7be457ff40e38d70b0a8076b SHA512 a3828c37a50e86eb8791be53bd8af848d144e4580841ffab28f3b6eae5144f5cdf4a5d4b43130615b97488e700b274c2468fc7d561b3701a1fc686349501a1db
+DIST glib-2.64.4.tar.xz 4779456 BLAKE2B 2ff69c794689c97011103459cb109e6ca7021db20a605cf3942f57e7b73eda9971034b8f65f03191f357169affb278dfa9bff309b4ca44605fd5a0ba0d135d2a SHA512 f21fe33068a5cabdbfef54ef635b3f810b389416c3b4b66ae4975e84841834f7b7640d2518d52cb7341641af5761919eebd5e7b25bd2946f3bdd002c4902b090
+DIST glib-2.64.5.tar.xz 4778456 BLAKE2B 7fdee0e16a7ac820f4c4f7dc66d37add464d3005e89e6013302d3ef103319331811d68e9b42db072b82242c3d7badfbd085b69333e770012def89dc8aae7a2eb SHA512 a87537274619b6de88a0e68555059036ac18c748b5005c8d84728646b0db342fde0b8c5b303b9ad79f64d71ea4ed990d52a4fbd68cda3ca74aed5fe4d497e060
 EBUILD gdbus-codegen-2.62.6.ebuild 2043 BLAKE2B a55f20184ac1bafd3aa391b2d0c79ccefd5c6dc64f7c4619ee505f16f645c479fda199e6c54cd41ac666c5e68ab9431109f642655250b3f16f28c1d8dffc6da6 SHA512 9ad9a9475d431ba44a913f2b0423fa35623105d87ec8eb583b9eb0c67aa8358681b8d7ef1f5856e6c15d873bb29d1d5397788e44ba2e6bd5fbb734c1c503717e
-EBUILD gdbus-codegen-2.64.3.ebuild 2210 BLAKE2B 33183b64bb0580f471c75fa8013896e72040482bd17b24bd159418649d6ade174c16d7964732afb86aeebc81bd6692a77e5ed5fc1d4309908abc7dd762075466 SHA512 8a850c678739ca20f6bb55edfad22a2733363784ee7f42aeb8b9775a13d89fd901137a39600ab8921468f2635d8b1c2cb650b5fd696c80e7406ce8a5188da1f5
+EBUILD gdbus-codegen-2.64.4.ebuild 2207 BLAKE2B 8f3d0a630b70611af94a2d0d9ff3b5b7c4b1291e0efeb5a87a3ff38fc5e2b2790261ab9ae0bc9b5b325e509f031884a1892616d774ed18b8366c03a86de7bf97 SHA512 5decb4a4ef7c5b62bab57bec7a31884c11a66ecc3a7262e53563e53b21600cc10a96a33355902aed395fd68bb046ebc2ab6619c2ba816c2a435729fbb816be7a
+EBUILD gdbus-codegen-2.64.5.ebuild 2210 BLAKE2B 33183b64bb0580f471c75fa8013896e72040482bd17b24bd159418649d6ade174c16d7964732afb86aeebc81bd6692a77e5ed5fc1d4309908abc7dd762075466 SHA512 8a850c678739ca20f6bb55edfad22a2733363784ee7f42aeb8b9775a13d89fd901137a39600ab8921468f2635d8b1c2cb650b5fd696c80e7406ce8a5188da1f5
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.64.4.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.64.4.ebuild
new file mode 100644
index 000000000000..145320a2a9dc
--- /dev/null
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.64.4.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GNOME_ORG_MODULE="glib"
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="xml"
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit gnome.org distutils-r1
+
+DESCRIPTION="GDBus code and documentation generator"
+HOMEPAGE="https://www.gtk.org/"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-libs/libxslt
+	app-text/docbook-xsl-stylesheets
+"
+
+S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen"
+
+python_prepare_all() {
+	PATCHES=(
+		"${FILESDIR}/${PN}-2.56.1-sitedir.patch"
+	)
+	distutils-r1_python_prepare_all
+
+	local MAJOR_VERSION=$(ver_cut 1)
+	local MINOR_VERSION=$(ver_cut 2)
+	sed -e 's:@PYTHON@:python:' gdbus-codegen.in > gdbus-codegen || die
+	sed -e "s:@VERSION@:${PV}:" \
+		-e "s:@MAJOR_VERSION@:${MAJOR_VERSION}:" \
+		-e "s:@MINOR_VERSION@:${MINOR_VERSION}:" config.py.in > config.py || die
+	cp "${FILESDIR}/setup.py-2.32.4" setup.py || die "cp failed"
+	sed -e "s/@PV@/${PV}/" -i setup.py || die "sed setup.py failed"
+}
+
+do_xsltproc_command() {
+	# Taken from meson.build for manual manpage building - keep in sync (also copied to dev-util/glib-utils)
+	xsltproc \
+		--nonet \
+		--stringparam man.output.quietly 1 \
+		--stringparam funcsynopsis.style ansi \
+		--stringparam man.th.extra1.suppress 1 \
+		--stringparam man.authors.section.enabled 0 \
+		--stringparam man.copyright.section.enabled 0 \
+		-o "${2}" \
+		http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \
+		"${1}" || die "manpage generation failed"
+}
+
+src_compile() {
+	distutils-r1_src_compile
+	do_xsltproc_command "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.xml" "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1"
+}
+
+src_test() {
+	einfo "Skipping tests. This package is tested by dev-libs/glib"
+	einfo "when merged with FEATURES=test"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all # no-op, but prevents QA warning
+	doman "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1"
+}
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.64.3.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.64.5.ebuild
index 7ac039681680..7ac039681680 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.64.3.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.64.5.ebuild
diff --git a/dev-util/github-cli/Manifest b/dev-util/github-cli/Manifest
index d93531204926..94faf9dd96ab 100644
--- a/dev-util/github-cli/Manifest
+++ b/dev-util/github-cli/Manifest
@@ -1,5 +1,6 @@
 DIST cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod 27 BLAKE2B 814b0fa8f12d5ce6171fa629b5a7eb34e0e882cc0c5430986896bb38c243e08dc83098f271227f4ba019e78f16dc97fbb381e833aff1819833d243b08add916b SHA512 5132f3438533427c0ab0fbb7a12112a7830ea9122662ed46019ff89c71d9cf80c02edc32dd5c892da572031b5a2cce100f2602fa6a19bea6be7c02781f701273
 DIST github-cli-0.10.1.tar.gz 257623 BLAKE2B 5b2dfb95ef4f4880524cfcae178e1c30dda608fc0d437e7f1090d04124cf4a6b1aaac8314baa9f27e2215758f44a1067b7807e61fa3271e75b9150dfa3b739ee SHA512 ab7e236b3aa14d4cb24e2af96fca07aa1a9cbacf4b80fcfce8ed157e24cca3c8c6e5ffa05240dabb8494e308960237d5b6920a4c426de6c00b655b201439d769
+DIST github-cli-0.11.0.tar.gz 267416 BLAKE2B 4200693f4e63eec6c7123240f0eee871e82fc58e2714896ce85a09b791450d275a77681ad4f91f044c8f5041b3d3d35e1e4131ade1260d1b46e275468e172ace SHA512 9b4bac9750c38170817f4f818723f1b2a48caed0e49a706f6de3a151c9c84cd492b92c65bf1c9251d672831bf81fbf76c64ad2611fbd70b745fc091754db8eb1
 DIST github-cli-0.8.0.tar.gz 225839 BLAKE2B c460405973e73374d393f19a6315a9b4af4de2ec3634b37a1669b8683e0cf5c1e5872dae4d130e9fca15dc88881e9abc4888d706b1050883361f378c8da5916d SHA512 5fca1f148a2973eafffa25df052ad09a8407dbcd2e41b9c5152011b990f02c27e1dc75b41d5c2b985bb18c6f1070839e8d526032230a910f9f776147a3a31c19
 DIST github-cli-0.9.0.tar.gz 236398 BLAKE2B 8a1004b8fcf54179e2538d71471b4952fbe9ec2b67d97bea130afcceeb0b6dfd93ce9a9a477f54c1f689a0c5707cae5550445719a7badd81c66748543909d4fa SHA512 75d09cdcff4f31d6cad0e9570af3aafcffdfd8bdb925596780abde24c0ba20a212cfc9426aaa29e7409c7fbb7061bb8c88c15aef11fc9d9490265fa51aae5cd8
 DIST github.com%2F!alec!aivazis%2Fsurvey%2Fv2%2F@v%2Fv2.0.7.mod 731 BLAKE2B 1ca410dae120a2ec12efbe7c1d8e0fdd2a38ed1ed76ab770e37aa6ba449da6b5ef6e32a51e6ee263a982f1a593e2ee239fe0a774063d4295261f9ff63e09fc1c SHA512 72213e0d0609572f5e749a4f295a8b3ffd13bfe38f786fa3174e53ec318a623e9122c69718944034aa70b05ddad1771cbfa62d2fdc49df2152c5c9679a681ff9
@@ -32,6 +33,8 @@ DIST github.com%2Fbriandowns%2Fspinner%2F@v%2Fv1.11.1.zip 222552 BLAKE2B fb3c694
 DIST github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod 146 BLAKE2B 5efa8dad622ae253ffa106eafea277fd947fc0f28e6962e461283ce2267d992b85b1f0eb9074a90009d8ed1d47f9e1f3e03cfc0eb7ad7df104282cfd144cc12a SHA512 32c34a590e6c113a16700ef2faa5124ebb6c8773cd76594312157bd2b70d54cd939ff2c32fac47421b5615e804142cb7b393394d4745d5894f9b68392bc37ad9
 DIST github.com%2Fcharmbracelet%2Fglamour%2F@v%2Fv0.1.1-0.20200320173916-301d3bcf3058.mod 315 BLAKE2B 8df0e2009d27da74972a7e67c996f4968738c3dc87fc68ad7fd0d74a0fd661e2a6de497efe742ef3f5cc8739011f49f58dad708cd9e89e829489fd61d1e686e4 SHA512 0b385c4ffe887f5023645af413daa5df47a9ec840cbc9d886088050885732cf1246a88c930b8005290f5005cd017c7fbf9e4a85c0a7304d8058353e7ee61f1a9
 DIST github.com%2Fcharmbracelet%2Fglamour%2F@v%2Fv0.1.1-0.20200320173916-301d3bcf3058.zip 553185 BLAKE2B f8157149a821cd527c9b9a4980e7d18038f4be550b20c3fef3b7f45818812773cebc35ab2955fcfeebfaf469a160c780a20a52323907848db0764e1c633b13b6 SHA512 aed0a7f014eac4cb07dac7e4fd446523e5787903d7bfe3dbf187055cd7ed81bb398652a7219af6cbee158599fa6739d4b615d41007d26d00b01b078813f2aff8
+DIST github.com%2Fcli%2Fshurcoo!l-graphql%2F@v%2Fv0.0.0-20200707151639-0f7232a2bf7e.mod 182 BLAKE2B cfaa0b1b2ef310b9950e6e41ffa374e1e4c19ddb07519f493c5c2e7ffab9d7e8a1da63646d8e56b603075a93a3dcb9fa6b5acac9f183dbabe78e00bb28d3f660 SHA512 f9514e587a38fdf0bf2d29c6d908b242645341b4b5e1616bc2257ebd2eb1afa45ffc41132077957112c3d23d833c102dd7291efb8cfe32f326db40e99d20b6c2
+DIST github.com%2Fcli%2Fshurcoo!l-graphql%2F@v%2Fv0.0.0-20200707151639-0f7232a2bf7e.zip 25883 BLAKE2B 40e18b6c3af8a28922261454d82fca14c83f2153d3d84f2729f15a19b6cd8e61cdf6d31908d259ef3eca51527ee0cdc162ed114d48c24c9a03d82912e436507d SHA512 eacfdd76948c11b063d041db27fb51b28e2c3dc434113a668678905106907adf10cc8004117ccc8d312ebeb33c81201d1bd90392b4a96707dadc2f2d4b0b5bab
 DIST github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod 35 BLAKE2B 45d27e6bbd9255a355b6bd14ac839c7d87fabb393693a8b862ad974017af01309e5d36fa99d4925905c1617c0d90b5263b54cd95af2dbab186e293936dc86459 SHA512 ca8192c6321468b4332eb63c765a5798150dce9312873123b48d9ec67ebb4229cffc7b7e8054b8b0a6f45611f08130008031edf33da3468bb9a4ee9455fa02a5
 DIST github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.2.mod 31 BLAKE2B 7bbb809c199d39bac173751c3dc21b23ee8b020f20b4447c33681469b5083c64e74f699fa8d3dd55446b76ed44fc0949337303a776efeed90a764af1d751c8a4 SHA512 12f6b0e7090b257656ee9068083207fdd1b6d9f0b27546cb5b3a5a520e5944f3eccb8f6dd644a17e1089bbf787fd26b3e83eb0f0353071c8c4ef23ca99bc6251
 DIST github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.10+incompatible.mod 30 BLAKE2B d511bd14351d68fcde2b3be3f008373eb12d2c61133c80aa3a1938e53ffa061c0aa51065f07b208a073b448c25309c3b2d67c0ed19ad3697309a679fcb844414 SHA512 a986c2cac4728288aaf90667b54ffe9cbb9e1a55697347f9541e6aa0dbfc5b8d245c2ac15e8a9558d41862d98325f3f2f4055b02bcf1e9045b78bb3577b3f45f
@@ -77,6 +80,7 @@ DIST github.com%2Fgoogle%2Fgoterm%2F@v%2Fv0.0.0-20190703233501-fc88cf888a3f.zip
 DIST github.com%2Fgoogle%2Fshlex%2F@v%2Fv0.0.0-20191202100458-e7afc7fbc510.mod 40 BLAKE2B ddfa83250a6d66e0f112a249993164e9dc1880abef25e9d8921c58bba907eccc0fca5f34cf3333523d81b22e615e6bda8e1080a7bbb8d21e33fafc168de0cf8f SHA512 33a53fe7874517289a9eb9d87b62060ab4827159300acb6f933018b30fc56e3356ec3d33ee64e452137cc6c892a0c6eddeb7e6bd383be8972407c6e7568f94fa
 DIST github.com%2Fgoogle%2Fshlex%2F@v%2Fv0.0.0-20191202100458-e7afc7fbc510.zip 8977 BLAKE2B 54e69095f7fc33a26037f2a924ce3291b3a9455c6716a50179ddb161accb07d79f30a72400ddb13229109fead8a9a2e8e85c78f63ed0c2303e0777a571e2be84 SHA512 74bf278d42859148df97c1fdefcbe962ebc583e3c567157b4e17721fd4cef5db7d24c9a76fb32a3d827e6bce6ba761181d9a2d1eca804b59f3cb792a30198906
 DIST github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.mod 36 BLAKE2B 94a5b4cb6c6de32397f001dfc95c49960de212f67fbb6b4a1a4806f78cac88a2698c3c2e19b7e1cb64d07a3ad6caab25a1006bb4f51b65e1c62c5a12c77d8b9c SHA512 21ce8fb666af3c32e843c816626a7c4c0c63ed1f170c7a49eea4a2f40e28e4ba0105dad2e17aa527da7dc3eca198a20dbb6566e60ef48d7d7cf72413bc81d24a
+DIST github.com%2Fgraph-gophers%2Fgraphql-go%2F@v%2Fv0.0.0-20200622220639-c1d9693c95a6.mod 106 BLAKE2B 1a65e75a7724f3ab30867040585056b7f0697393e038fdde69d8b6f6173f6cd0302e3a4e65f42405878680707c40bb3163e422a5da49edfc78ef47ee1c503ad3 SHA512 470fc9dd28cd76702e86a4a6e1df812506dfb9bc0e0cdbed8be2bd6859344a575b9ada6f9d7f53eadc44300f1e4e50e47c65dc4171f50ddd2ebfaad3146f780f
 DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.0.mod 52 BLAKE2B 51b2a4332061cdef080fa53a14d29b65645776c1077922e6cc37f02db2ddaf924c0f2f71c2cca4586c582075c7cf76861161ccf39d11cf803482276b78321b15 SHA512 6e5556550286ca0fed117d3db2f43d6023d7f0e7625762ca76c773e410fe51d6092c6acb574db7578284188bbf79cb9050aab7000f09510338b24195ea395945
 DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod 52 BLAKE2B 9e5de5c147fb3f100119fc7c290e9790af57892762b7ea8b2a8328c397432466ba56ee20b64ced6dc548d58bf8ef0ecb2e62a51de2524f90a0ff39921d0f2a3f SHA512 c9e15e4a4436ffdedfe5ece51858a45806d6fd77d2306c35eb986a866a3da5bec0d5d06ddba55a05ca45c8c29a51bc7c58150849b5dbde569a6810012f3ace4e
 DIST github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.0.mod 661 BLAKE2B c7566b98c99bd43fb31dcd6de0086533bc499df099dbfc3c37aeba4996bbf46cf11b98e0c356ecebd0c7adbcabf4ab54fb31c41309287c26c083e78cd1639451 SHA512 35fbfcc2b6fb04830cf6d4966469ccf37e4b7593c8d8c5479dd2322722bb325b7f303ca836989c3ea96f862a4c85bae7863c415f94b72bb91742763ef08bcb49
@@ -140,6 +144,7 @@ DIST github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a22
 DIST github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.mod 29 BLAKE2B f74d75a495f683f4e9047201721611229ecddc37ed01b5d4b5d81a06220a6385f06d0f99e514bf19cc2030fbdba6de3a08fd38b750e6651a822b10bf69c45327 SHA512 b426d975637bd2b4dddc10d7c88b70f8b946201f311859f22520d53ae0a2d9911ab358460c089771f7900d7a8740bbc0c6d3814ab8f955108fc31b7b602ab5cf
 DIST github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.4.mod 96 BLAKE2B f192300c52fbe1d75a3a9c89e3d808d25f13944940475b8f2654b3e3a1205721f6a9aa553ab6293f7ea4c9e8be3d695bf7fd5fb55c35e3179cef924fd1334273 SHA512 29bf0aa6ae9cc8d66b0e1bf852534dda3a3e0e16c918be357cc8f6fec14f2d2537a94cafa1ca9cd06b64363a8f0f0d3c00dabcb5137699aced8d16af767f6ce8
 DIST github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.4.zip 24551 BLAKE2B 4b7736d36b9c2b2d38decacecef3b6411e190d6504caf1376f6adbb0d4458889eb9c0aca1ff936e0223eaa26c7cc2e077671c490f998e071a6e63cb7645580c0 SHA512 bedaa028d6450dafaa54f17c444b8d2923cbce008bdf73ca442297793b1b5bf60e829cbb6175d5b24fcadb8b91470e07baa369180a61d3e9a43ccee5ba18c150
+DIST github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.1.0.mod 45 BLAKE2B 7a7820ed255877b390c76ffd281258a8e70dbb2812b7d2d0bf63bb431e8e4f52faad48d4e6801b301ce35cd6dcd49ceac6ab94b32e35befe2e6df56e1a1e8eec SHA512 13b356ebfd062cecffa1e323aa7768d933c6915c2963eff50b1f743712d48cb24f137ba839a7df211e6e02979a4d1c9d32eec8194227edd995c3d35849edeb54
 DIST github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod 36 BLAKE2B a388b7d0db7c8b9a589164ac639887f1e54d3f5d59ed9bfdbb427b88d381d95455cec1f3474d6dadf847925b7b0e9944a3713656f4870db4fadaa1774595c3f1 SHA512 b74e16c113ace53ce6b7a4df1fc73f21a5acdcf3d2343a4c4f1ad7a2cd8d2282ef7ede98de8c1c46f7d35feae28c9f49ba4a2dff1071357cb4e88e93f25b521d
 DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
 DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
@@ -164,6 +169,8 @@ DIST github.com%2Fshurcoo!l%2Fgithubv4%2F@v%2Fv0.0.0-20191127044304-8f68eb5628d0
 DIST github.com%2Fshurcoo!l%2Fgithubv4%2F@v%2Fv0.0.0-20191127044304-8f68eb5628d0.zip 45580 BLAKE2B ed68c72fb2932b8ab97a1e2aa07369fd9b1bad8e84f52f2011c5b04c2ebba65195d2e76c6204c4b9ee665bec1d2fbc6e42c8205bcde3a0f554027f4e3f5670ea SHA512 ecdd4476bdc234a006dfca0d2d34ff6d3914fea3438bfaf1d2bad4fc72498553190a51eedf752f5a9ef21908ac95d18363c6693f22d11e0c3f731f8081d69ce2
 DIST github.com%2Fshurcoo!l%2Fgithubv4%2F@v%2Fv0.0.0-20200414012201-bbc966b061dd.mod 36 BLAKE2B 19a3b0b506a7f4875e610433af954e9bd97d20f99a8bc8fd13d60786a202fc103855325f48638a835ddc849c1ad07f7ff8ff24be1dad1ffd1c542ac98428f30d SHA512 5e94f8cf9ffc1a7423bdf63d4fe3e6b9ae651643c8852010691f80890cf6f474f34b9be6e0213446f597c6648286ecda37ddf4e16a6b7beffae475b8ca0e4a07
 DIST github.com%2Fshurcoo!l%2Fgithubv4%2F@v%2Fv0.0.0-20200414012201-bbc966b061dd.zip 45974 BLAKE2B d00a240342b45f910424c2824a863fb850a7765d0cb5ff7e9bcd978a8349cf269797c4370c40f04f57b98738344b26a631f427527f69bb8b097485858dbb9423 SHA512 6ffbfc7a957698eb531f5b8a8110da5103c8498f7b7d02c843ff827e54557fb77227f0126aa6c2ac772746ab1aeedf3bea1b86a2cf03a328ba38cc0480f879ed
+DIST github.com%2Fshurcoo!l%2Fgithubv4%2F@v%2Fv0.0.0-20200627185320-e003124d66e4.mod 36 BLAKE2B 19a3b0b506a7f4875e610433af954e9bd97d20f99a8bc8fd13d60786a202fc103855325f48638a835ddc849c1ad07f7ff8ff24be1dad1ffd1c542ac98428f30d SHA512 5e94f8cf9ffc1a7423bdf63d4fe3e6b9ae651643c8852010691f80890cf6f474f34b9be6e0213446f597c6648286ecda37ddf4e16a6b7beffae475b8ca0e4a07
+DIST github.com%2Fshurcoo!l%2Fgithubv4%2F@v%2Fv0.0.0-20200627185320-e003124d66e4.zip 46033 BLAKE2B 59549b4f19c4fd761b4135263a814c1bc61f881e2d45bf906f2aec010eaf890e93fd02c9521f760d9f1ca7d6fe324b964fdb73326e160f79e867f6a236a06913 SHA512 c8d68af95fd6ced0708a9704fcad645a9b964b1e567c961108e57fcdc3f3866a753b70d912f87477eb2651da01d0502818c2af33e94d27529db9539bec6a5187
 DIST github.com%2Fshurcoo!l%2Fgraphql%2F@v%2Fv0.0.0-20181231061246-d48a9a75455f.mod 35 BLAKE2B 5203f9130c17196d735630eeea5f692c85ad9cb9c1f2884507fd31715329724313b852c5182ea175cd9ba8ba61d0b26259f42d83f46bf6bbd24c3e0a0864b141 SHA512 9a08a375efbecd30f4d479810be1dc4bba52e1f7254ff4a527a390628e2396b6b1838d305a7f417b932f82c53a4f45df7938c0d30aceb3d478790233bb0028d7
 DIST github.com%2Fshurcoo!l%2Fgraphql%2F@v%2Fv0.0.0-20181231061246-d48a9a75455f.zip 24322 BLAKE2B c3cdee6186b0847db90eeeb6e21ce38d0f14227db33d9ac4787ac22325e942a5b9882da4a47d0786e11c4f0967a4776f2434cbfbd44e18dcce95eb5be0da0f85 SHA512 b4a8986187ca882557f6780663433eaadf51ea0395924590773396ed89b0aeff2d2b31a6a63419e16cc4231cfd7f07817d6e51254238f42893ba47ebbb405ea7
 DIST github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod 49 BLAKE2B 47bc5235e81d233e28b446ec2403accc442b4cc1ee956a0b7d47b5dac2a525f22bba87d05c3fe09179837860655f27191e073a3f6d7d0dad81c9a750752fe5f8 SHA512 6f6b924c2a3af28ef4342cdf8b83b726f2c409accf19c6ba0a4a47c6ae61857e4b69727fceb9e9e16fb8ce660a7181952714d49b6cafaacb282fa4e8af6e13b3
@@ -212,6 +219,8 @@ DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200219234226-1ad67e1f0ef4.mod 155 B
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200219234226-1ad67e1f0ef4.zip 1867609 BLAKE2B 557c84a0ec76f04d716fd9a3b551d73bc73957b042fc0c55f20f10ee55ce0503edbb32a9c4bd119fff0c6aa32e3239f9b5b028ce032f425477231efe42333dad SHA512 d81eb52177d8cc00238467ce73286fa179c0b99d5c891a6160a5b515cd7f51e29d5dca5d2c3d4f3d2a21a5327a57391459c8db624f596bd502ad34f866c82e0e
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200510223506-06a226fb4e37.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200510223506-06a226fb4e37.zip 1871909 BLAKE2B fa2d419a5bdff43385f70e3c6e61f8c1b3528b6c4e21c3105f66dc358515b6336673188ff68b27a792be9ae69d77cd26c82b7e30605b974e4435634f961c7583 SHA512 de179d887c4ed6ebba0a1cdcfa67b8312b8b2dcd9bd04589d581c872f6fa7a8606ad1376dc6933dec41938781218a91f31fa27331d80cbda30542b8cd14c5af1
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.zip 1874261 BLAKE2B d31130353795828e794c9a0fbadafb9d745947d03c7e826fe7cc70f14002f60fb6f2f2699a875fb49b37ac3419b22b484bf95b86522b936b8136d4c627b24c2b SHA512 cdb474720f4b2b0357ac218297be03b967ccf068b05c11bc8eff60cf5383ff8738b0ebb87459a64643f3f8aac2f73967dbf616a51685ba48ecaeb15898851cea
 DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod 25 BLAKE2B 8942ceba0f85f2e950663feb634e602815315834dea89d18f7319100c19a27f15746a11b50157d682756fc922138660512cd6c8e75a2458b0cd512aba19760da SHA512 3ba23f3472e0ae7904b4250e2e3a1b04c719c4bb66c59ccfaf96fae2fb25ae0abf19f542f03c7179a312a008521acaf4ff389517b11dba8b6f581a9dded44883
 DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod 88 BLAKE2B 04ec98f76d6779784920b4f746fccafdba5ee6f365edc58985219675791d417746575165985de6d866ee891b6c768d317360a4229e61f19a1f05e4f0bafdb111 SHA512 5e787e9d2c16c87238995214eab353f87d009acf8ef78889295d11dfabef73cea4e8cabfc2999f9ef0c936efb84c22963e0aa2bce4b3678680a389cbe23df961
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
@@ -225,6 +234,8 @@ DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200219183655-46282727080f.mod 181 BLAK
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200219183655-46282727080f.zip 1499823 BLAKE2B 56ae13cf7caccf0e779d9013c54f4abb44492a58b75c9a6891f2a0fbe38e565e2c1f23e275ae9ce32bb11b2ed98dc31bdd98419eb1467eb9b5607e9d19b13e0d SHA512 a1c1e015efd689d7fc8db14196486c4400d4783d70dda7bda5969a996478e2fede5f082cc9f3a67bb11d64f53a7dc3fe616c398d3a3c0e405576454abb3fdaaa
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200520182314-0ba52f642ac2.mod 181 BLAKE2B b45bdd8d5412dfa50e483e0e3431a133435aa68b1225e66fce0f2ef80f2e9d40a9f56a47d5f2faede1624fe05c80fe97c7cd56dd9a6b56ad91315cfbcf9638db SHA512 0c6baecc550358cbc908d994f81f786e62f619b197d4ba0ca5af19eb2ddf243d7f36c6174634b65e205fa5ed3b9c3393d1677c0a57c2b99ddcb252b935a2dc70
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200520182314-0ba52f642ac2.zip 1501930 BLAKE2B 3bca1dfeb32b0b0075cdf47d43657aadf2dc9acceb7bae17d28b380084cf3c4d91648531222fe3fa0faa3683f44077b3ddd82f9b2433a9c96da1f56ea2159f19 SHA512 8fa4c8eddd02873549dc831dc270e8682a16777269fc0a09bddb09ac5bd006d48d7a3bda22fceb9941fb5e60ce68d3261213e6343958c4398debceaf704bb150
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200707034311-ab3426394381.mod 181 BLAKE2B 05d6754fa387bac4a6481ad34fb7b681064fc6443b3f70cba316fe2fd0896050e4a772fd8e1be655130a00bb5feaded4725ffea1c5dd6ba55ba55315aaae34d2 SHA512 54d242da2536da38e292b62a955b3961f7b0a9789fe36c5f7ae93577eeac734a6e5bac21a657cf71d488395278cd7683db538e16a9c853835277a800a9d43471
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200707034311-ab3426394381.zip 1503811 BLAKE2B c8cfe6b14a455a6ad71c42ce03235c650b7efe842131874cf99570716907e02c9fbe42df586e69332189518cbdcf6e2e417caebec84ce928e7ba959b66ab869c SHA512 bc3772a7ae7cd2b50f61ec8d07e7f7e1af9f24e0b737131da375a525be44dc993ee740ce0a11e0baaf0cbd81e819e3ecad889c0c7ece95086cb428e52b10a785
 DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod 27 BLAKE2B 078fc99b981406f4ee3f8da94c83954e80619e76ea63cf6323f27614bbcb870bb650eb5ffaac865a374f3ed0ef0619d97e11f05924c92e395e72cb73f28630e6 SHA512 53431e560b5d6a9b50f44997ef6755f71741ccca155767dd954da41f11f53a3e8d01d7e01a2bb9de1fdd551dd2e734cb65e5641cf5de5c9a8a6a25a4894336f5
 DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.zip 81780 BLAKE2B 48e9b7ec89ad3f9cec88fe6c62ce64348a9217a134aab7306a07fd8cb28eeff91b15cf6f59ffec36df23a086195322f28e76fc16c026f33d2f419dcd3f84de04 SHA512 c7656f3c10140a5cb08620ce0647d0b2026272ec41bcd9df346dd2b5de5bd2236835ea117091646151a991f8f3aeeebd0cdfc1f784015d140162db5dc49f7325
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
@@ -278,6 +289,7 @@ DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200506231410-2ff61e1afc86.mod 95 BLAKE2B
 DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200506231410-2ff61e1afc86.zip 101681 BLAKE2B 0021071f9f09d21a14b9a6ebcd6167081656046b0ee1a7dddf9602863a01a5d35c260d3a458ce22e8993c58ed7409556109a4e32561ca85ac2a335720b8c1680 SHA512 4e57cd4228ab4745b75f1681faa9da20db355a01d11a1f50fc90423145d41105203572e1c12545861d003ee3b1e0e4a6047f45b487f437e42d07b91e32b6574a
 DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
 EBUILD github-cli-0.10.1.ebuild 14811 BLAKE2B 9271544dc3dddb30c8261aa8a959a2bd7bec1c6bf613814f2bae0338f7d1f819eea8d53f99655ec134d28db74d75fbd0d2aca9d7ea1e3647e89bc2944d93c09d SHA512 56db74f5460b742ffac3a6a0800c2fa4f3ffd439772c174051906eadf1d8d7dc4145aecd3d45fdab13219d8bf26952b2a65081bd2affdb4cb9db2ffd5de7cb77
+EBUILD github-cli-0.11.0.ebuild 14955 BLAKE2B b6fb74ce2981d0fb5632f816659d451decf84dd9a4bffd34d8e6c70abee466e9cad21a61656b740ad106572b7175da1c6884950a00f4ee23b9f147281e2418dc SHA512 c8ca77588f33fefaf00ba941f443ff93bade89a2ec0ad8fe4f076e6b6fcf4903f901cb44866f2a465ea900df03750b84df2d3678d25ca5b8232e796056d7bb01
 EBUILD github-cli-0.8.0.ebuild 13976 BLAKE2B 4f07e3c272f93aaaec21d91e87d6e9dcc5a4727f98e3d37f1aeab73082b653debe44274d54a9bc9a71065f260c1eaa32aa0e0be76846237b4f06255d730287da SHA512 daf47d0f292f8f8bcfc1137cba8cf67df3677daa99f08d7bf2d4c2db080e581c7a7c5cc398ad223a0126e72a31407eaa135deeca3c5b71651af7ae51dbbc4d76
 EBUILD github-cli-0.9.0-r1.ebuild 14428 BLAKE2B f50d76ca95adf375bef2be3a8e514b1839c1dc1778ae29cf9b851dacfa127ea71bd8a639c65d63e326a21436acb0ec23bbdf6e7ab3f4efc1154bd4e24ee5241c SHA512 e2fbaca1d718798501aabc8362b1f62c7eab0b4d48314d2650b5fa203927618237ea51b583c38b70ed5afae5ce7ed090e89a98dcd4ffa3e6b468d201c7e24798
 EBUILD github-cli-9999.ebuild 14428 BLAKE2B f50d76ca95adf375bef2be3a8e514b1839c1dc1778ae29cf9b851dacfa127ea71bd8a639c65d63e326a21436acb0ec23bbdf6e7ab3f4efc1154bd4e24ee5241c SHA512 e2fbaca1d718798501aabc8362b1f62c7eab0b4d48314d2650b5fa203927618237ea51b583c38b70ed5afae5ce7ed090e89a98dcd4ffa3e6b468d201c7e24798
diff --git a/dev-util/github-cli/github-cli-0.11.0.ebuild b/dev-util/github-cli/github-cli-0.11.0.ebuild
new file mode 100644
index 000000000000..0323879d977c
--- /dev/null
+++ b/dev-util/github-cli/github-cli-0.11.0.ebuild
@@ -0,0 +1,323 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 go-module
+
+DESCRIPTION="GitHub CLI"
+HOMEPAGE="https://github.com/cli/cli"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/cli/cli.git"
+else
+EGO_SUM=(
+	"cloud.google.com/go v0.26.0/go.mod"
+	"github.com/AlecAivazis/survey/v2 v2.0.7"
+	"github.com/AlecAivazis/survey/v2 v2.0.7/go.mod"
+	"github.com/BurntSushi/toml v0.3.1"
+	"github.com/BurntSushi/toml v0.3.1/go.mod"
+	"github.com/MakeNowJust/heredoc v1.0.0"
+	"github.com/MakeNowJust/heredoc v1.0.0/go.mod"
+	"github.com/Netflix/go-expect v0.0.0-20180615182759-c93bf25de8e8"
+	"github.com/Netflix/go-expect v0.0.0-20180615182759-c93bf25de8e8/go.mod"
+	"github.com/OneOfOne/xxhash v1.2.2/go.mod"
+	"github.com/alecthomas/assert v0.0.0-20170929043011-405dbfeb8e38"
+	"github.com/alecthomas/assert v0.0.0-20170929043011-405dbfeb8e38/go.mod"
+	"github.com/alecthomas/chroma v0.7.2-0.20200304075647-34d9c7143bf5"
+	"github.com/alecthomas/chroma v0.7.2-0.20200304075647-34d9c7143bf5/go.mod"
+	"github.com/alecthomas/colour v0.0.0-20160524082231-60882d9e2721"
+	"github.com/alecthomas/colour v0.0.0-20160524082231-60882d9e2721/go.mod"
+	"github.com/alecthomas/kong v0.2.1-0.20190708041108-0548c6b1afae/go.mod"
+	"github.com/alecthomas/repr v0.0.0-20180818092828-117648cd9897"
+	"github.com/alecthomas/repr v0.0.0-20180818092828-117648cd9897/go.mod"
+	"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
+	"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
+	"github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod"
+	"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
+	"github.com/beorn7/perks v1.0.0/go.mod"
+	"github.com/briandowns/spinner v1.11.1"
+	"github.com/briandowns/spinner v1.11.1/go.mod"
+	"github.com/cespare/xxhash v1.1.0/go.mod"
+	"github.com/charmbracelet/glamour v0.1.1-0.20200320173916-301d3bcf3058"
+	"github.com/charmbracelet/glamour v0.1.1-0.20200320173916-301d3bcf3058/go.mod"
+	"github.com/cli/shurcooL-graphql v0.0.0-20200707151639-0f7232a2bf7e"
+	"github.com/cli/shurcooL-graphql v0.0.0-20200707151639-0f7232a2bf7e/go.mod"
+	"github.com/client9/misspell v0.3.4/go.mod"
+	"github.com/coreos/bbolt v1.3.2/go.mod"
+	"github.com/coreos/etcd v3.3.10+incompatible/go.mod"
+	"github.com/coreos/go-semver v0.2.0/go.mod"
+	"github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod"
+	"github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod"
+	"github.com/cpuguy83/go-md2man/v2 v2.0.0"
+	"github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod"
+	"github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964"
+	"github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964/go.mod"
+	"github.com/davecgh/go-spew v1.1.0/go.mod"
+	"github.com/davecgh/go-spew v1.1.1"
+	"github.com/davecgh/go-spew v1.1.1/go.mod"
+	"github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod"
+	"github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod"
+	"github.com/dlclark/regexp2 v1.1.6"
+	"github.com/dlclark/regexp2 v1.1.6/go.mod"
+	"github.com/dlclark/regexp2 v1.2.0"
+	"github.com/dlclark/regexp2 v1.2.0/go.mod"
+	"github.com/fatih/color v1.7.0"
+	"github.com/fatih/color v1.7.0/go.mod"
+	"github.com/fsnotify/fsnotify v1.4.7/go.mod"
+	"github.com/ghodss/yaml v1.0.0/go.mod"
+	"github.com/go-kit/kit v0.8.0/go.mod"
+	"github.com/go-logfmt/logfmt v0.3.0/go.mod"
+	"github.com/go-logfmt/logfmt v0.4.0/go.mod"
+	"github.com/go-stack/stack v1.8.0/go.mod"
+	"github.com/gogo/protobuf v1.1.1/go.mod"
+	"github.com/gogo/protobuf v1.2.1/go.mod"
+	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
+	"github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod"
+	"github.com/golang/mock v1.1.1/go.mod"
+	"github.com/golang/protobuf v1.2.0/go.mod"
+	"github.com/golang/protobuf v1.3.1"
+	"github.com/golang/protobuf v1.3.1/go.mod"
+	"github.com/google/btree v1.0.0/go.mod"
+	"github.com/google/go-cmp v0.2.0"
+	"github.com/google/go-cmp v0.2.0/go.mod"
+	"github.com/google/go-cmp v0.4.1"
+	"github.com/google/go-cmp v0.4.1/go.mod"
+	"github.com/google/goterm v0.0.0-20190703233501-fc88cf888a3f"
+	"github.com/google/goterm v0.0.0-20190703233501-fc88cf888a3f/go.mod"
+	"github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510"
+	"github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod"
+	"github.com/gorilla/websocket v1.4.0/go.mod"
+	"github.com/graph-gophers/graphql-go v0.0.0-20200622220639-c1d9693c95a6/go.mod"
+	"github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod"
+	"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod"
+	"github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod"
+	"github.com/hashicorp/go-version v1.2.0"
+	"github.com/hashicorp/go-version v1.2.0/go.mod"
+	"github.com/hashicorp/hcl v1.0.0/go.mod"
+	"github.com/henvic/httpretty v0.0.5"
+	"github.com/henvic/httpretty v0.0.5/go.mod"
+	"github.com/hinshun/vt10x v0.0.0-20180616224451-1954e6464174"
+	"github.com/hinshun/vt10x v0.0.0-20180616224451-1954e6464174/go.mod"
+	"github.com/inconshreveable/mousetrap v1.0.0"
+	"github.com/inconshreveable/mousetrap v1.0.0/go.mod"
+	"github.com/jonboulle/clockwork v0.1.0/go.mod"
+	"github.com/julienschmidt/httprouter v1.2.0/go.mod"
+	"github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51"
+	"github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod"
+	"github.com/kisielk/errcheck v1.1.0/go.mod"
+	"github.com/kisielk/gotool v1.0.0/go.mod"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
+	"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
+	"github.com/kr/pretty v0.1.0"
+	"github.com/kr/pretty v0.1.0/go.mod"
+	"github.com/kr/pty v1.1.1/go.mod"
+	"github.com/kr/pty v1.1.4"
+	"github.com/kr/pty v1.1.4/go.mod"
+	"github.com/kr/text v0.1.0"
+	"github.com/kr/text v0.1.0/go.mod"
+	"github.com/lucasb-eyer/go-colorful v1.0.3"
+	"github.com/lucasb-eyer/go-colorful v1.0.3/go.mod"
+	"github.com/magiconair/properties v1.8.0/go.mod"
+	"github.com/mattn/go-colorable v0.0.9/go.mod"
+	"github.com/mattn/go-colorable v0.1.2"
+	"github.com/mattn/go-colorable v0.1.2/go.mod"
+	"github.com/mattn/go-colorable v0.1.6"
+	"github.com/mattn/go-colorable v0.1.6/go.mod"
+	"github.com/mattn/go-isatty v0.0.4/go.mod"
+	"github.com/mattn/go-isatty v0.0.8/go.mod"
+	"github.com/mattn/go-isatty v0.0.12"
+	"github.com/mattn/go-isatty v0.0.12/go.mod"
+	"github.com/mattn/go-runewidth v0.0.7"
+	"github.com/mattn/go-runewidth v0.0.7/go.mod"
+	"github.com/mattn/go-runewidth v0.0.9"
+	"github.com/mattn/go-runewidth v0.0.9/go.mod"
+	"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
+	"github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b"
+	"github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod"
+	"github.com/microcosm-cc/bluemonday v1.0.2"
+	"github.com/microcosm-cc/bluemonday v1.0.2/go.mod"
+	"github.com/mitchellh/go-homedir v1.1.0"
+	"github.com/mitchellh/go-homedir v1.1.0/go.mod"
+	"github.com/mitchellh/mapstructure v1.1.2/go.mod"
+	"github.com/muesli/reflow v0.1.0"
+	"github.com/muesli/reflow v0.1.0/go.mod"
+	"github.com/muesli/termenv v0.4.0"
+	"github.com/muesli/termenv v0.4.0/go.mod"
+	"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
+	"github.com/oklog/ulid v1.3.1/go.mod"
+	"github.com/olekukonko/tablewriter v0.0.4"
+	"github.com/olekukonko/tablewriter v0.0.4/go.mod"
+	"github.com/opentracing/opentracing-go v1.1.0/go.mod"
+	"github.com/pelletier/go-toml v1.2.0/go.mod"
+	"github.com/pkg/errors v0.8.0/go.mod"
+	"github.com/pkg/errors v0.8.1"
+	"github.com/pkg/errors v0.8.1/go.mod"
+	"github.com/pmezard/go-difflib v1.0.0"
+	"github.com/pmezard/go-difflib v1.0.0/go.mod"
+	"github.com/prometheus/client_golang v0.9.1/go.mod"
+	"github.com/prometheus/client_golang v0.9.3/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod"
+	"github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod"
+	"github.com/prometheus/common v0.4.0/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod"
+	"github.com/prometheus/tsdb v0.7.1/go.mod"
+	"github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod"
+	"github.com/russross/blackfriday/v2 v2.0.1"
+	"github.com/russross/blackfriday/v2 v2.0.1/go.mod"
+	"github.com/sergi/go-diff v1.0.0"
+	"github.com/sergi/go-diff v1.0.0/go.mod"
+	"github.com/shurcooL/githubv4 v0.0.0-20200627185320-e003124d66e4"
+	"github.com/shurcooL/githubv4 v0.0.0-20200627185320-e003124d66e4/go.mod"
+	"github.com/shurcooL/sanitized_anchor_name v1.0.0"
+	"github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod"
+	"github.com/sirupsen/logrus v1.2.0/go.mod"
+	"github.com/soheilhy/cmux v0.1.4/go.mod"
+	"github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod"
+	"github.com/spf13/afero v1.1.2/go.mod"
+	"github.com/spf13/cast v1.3.0/go.mod"
+	"github.com/spf13/cobra v1.0.0"
+	"github.com/spf13/cobra v1.0.0/go.mod"
+	"github.com/spf13/jwalterweatherman v1.0.0/go.mod"
+	"github.com/spf13/pflag v1.0.3"
+	"github.com/spf13/pflag v1.0.3/go.mod"
+	"github.com/spf13/pflag v1.0.5"
+	"github.com/spf13/pflag v1.0.5/go.mod"
+	"github.com/spf13/viper v1.4.0/go.mod"
+	"github.com/stretchr/objx v0.1.0/go.mod"
+	"github.com/stretchr/objx v0.1.1"
+	"github.com/stretchr/objx v0.1.1/go.mod"
+	"github.com/stretchr/testify v1.2.1/go.mod"
+	"github.com/stretchr/testify v1.2.2/go.mod"
+	"github.com/stretchr/testify v1.3.0"
+	"github.com/stretchr/testify v1.3.0/go.mod"
+	"github.com/stretchr/testify v1.5.1"
+	"github.com/stretchr/testify v1.5.1/go.mod"
+	"github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod"
+	"github.com/ugorji/go v1.1.4/go.mod"
+	"github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod"
+	"github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod"
+	"github.com/yuin/goldmark v1.1.24"
+	"github.com/yuin/goldmark v1.1.24/go.mod"
+	"go.etcd.io/bbolt v1.3.2/go.mod"
+	"go.uber.org/atomic v1.4.0/go.mod"
+	"go.uber.org/multierr v1.1.0/go.mod"
+	"go.uber.org/zap v1.10.0/go.mod"
+	"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
+	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+	"golang.org/x/crypto v0.0.0-20190530122614-20be4c3c3ed5"
+	"golang.org/x/crypto v0.0.0-20190530122614-20be4c3c3ed5/go.mod"
+	"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9"
+	"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod"
+	"golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod"
+	"golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod"
+	"golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod"
+	"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod"
+	"golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod"
+	"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
+	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3"
+	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
+	"golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod"
+	"golang.org/x/net v0.0.0-20200707034311-ab3426394381"
+	"golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be"
+	"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
+	"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod"
+	"golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod"
+	"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
+	"golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod"
+	"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod"
+	"golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod"
+	"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
+	"golang.org/x/sys v0.0.0-20181128092732-4ed8d59d0b35/go.mod"
+	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
+	"golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod"
+	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
+	"golang.org/x/sys v0.0.0-20190530182044-ad28b68e88f1/go.mod"
+	"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
+	"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae"
+	"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod"
+	"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd"
+	"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod"
+	"golang.org/x/text v0.3.0"
+	"golang.org/x/text v0.3.0/go.mod"
+	"golang.org/x/text v0.3.2"
+	"golang.org/x/text v0.3.2/go.mod"
+	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
+	"golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod"
+	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
+	"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
+	"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
+	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543"
+	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
+	"google.golang.org/appengine v1.1.0"
+	"google.golang.org/appengine v1.1.0/go.mod"
+	"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
+	"google.golang.org/grpc v1.19.0/go.mod"
+	"google.golang.org/grpc v1.21.0/go.mod"
+	"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
+	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405"
+	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127"
+	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
+	"gopkg.in/resty.v1 v1.12.0/go.mod"
+	"gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod"
+	"gopkg.in/yaml.v2 v2.2.1/go.mod"
+	"gopkg.in/yaml.v2 v2.2.2"
+	"gopkg.in/yaml.v2 v2.2.2/go.mod"
+	"gopkg.in/yaml.v2 v2.2.8"
+	"gopkg.in/yaml.v2 v2.2.8/go.mod"
+	"gopkg.in/yaml.v3 v3.0.0-20200506231410-2ff61e1afc86"
+	"gopkg.in/yaml.v3 v3.0.0-20200506231410-2ff61e1afc86/go.mod"
+	"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
+	)
+go-module_set_globals
+	SRC_URI="https://github.com/cli/cli/archive/v${PV}.tar.gz -> ${P}.tar.gz
+			${EGO_SUM_SRC_URI}"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/cli-${PV}"
+fi
+
+LICENSE="MIT Apache-2.0 BSD BSD-2 MPL-2.0"
+SLOT="0"
+
+RDEPEND=">=dev-vcs/git-1.7.3"
+
+src_unpack() {
+	if [[ ${PV} == *9999 ]]; then
+		git-r3_src_unpack
+		go-module_live_vendor
+	else
+		go-module_src_unpack
+	fi
+}
+
+src_compile() {
+	[[ ${PV} == *9999 ]] || export GH_VERSION="v${PV}"
+	# Go LDFLAGS are not the same as GCC/Binutils LDFLAGS
+	unset LDFLAGS
+	# Once we set up cross compiling, this line will need to be adjusted
+	# to compile for the target.
+	# Everything else in this function happens on the host.
+	emake
+
+	einfo "Building man pages"
+	emake manpages
+
+	einfo "Building completions"
+	go run ./cmd/gh completion -s bash > gh.bash-completion || die
+	go run ./cmd/gh completion -s zsh > gh.zsh-completion || die
+}
+
+src_install() {
+	dobin bin/gh
+	dodoc README.md
+
+	doman share/man/man?/gh*.?
+
+	newbashcomp gh.bash-completion gh
+	insinto /usr/share/zsh/site-functions
+	newins gh.zsh-completion _gh
+}
diff --git a/dev-util/glade/Manifest b/dev-util/glade/Manifest
index ef2c2f381a62..c3e2c314f4fe 100644
--- a/dev-util/glade/Manifest
+++ b/dev-util/glade/Manifest
@@ -1,4 +1,6 @@
 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 2300 BLAKE2B f8833626c35a883fb6eab06aefe2bebcd0ad48681a31e8a203be41616bb15843ee0e9a16030c3c039e6cc849d34380319ce0b5d771819f89234dcbd539a39b93 SHA512 4fe5e6cb948ed27c5a52f139b00ed53af03fd33841e075c49081e06b200d16635b3fb0e4911aca7f1646a53dad2fe7e7e671110b41644aaf69182a6c887d3641
 MISC metadata.xml 358 BLAKE2B 33f3b46ab877b311931205095fb2b357fe7fe2da8820944d32e8a16f2dbcf99033f95a17f4cefa4aa6d0f731c72d0f65683a8cc3b947ebf09d084f92e796f887 SHA512 8840ebde12f26a2caf856e75f3f706e3c9a7a7a771d0deeae99ca6b16f4bbeaf119bae7776a8a0bef8b7422f52ebd6498a8b5e862af4548886249386dcb44480
diff --git a/dev-util/glade/glade-3.36.0.ebuild b/dev-util/glade/glade-3.36.0.ebuild
new file mode 100644
index 000000000000..57e88a13c231
--- /dev/null
+++ b/dev-util/glade/glade-3.36.0.ebuild
@@ -0,0 +1,91 @@
+# 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/12" # subslot = suffix of libgladeui-2.so
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="+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.22.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/itstool
+	>=sys-devel/gettext-0.19.8
+	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 \
+		--disable-debug \
+		--enable-gladeui \
+		--enable-libtool-lock \
+		$(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/glib-utils/Manifest b/dev-util/glib-utils/Manifest
index b471b6d18b3c..33a73c89d8d3 100644
--- a/dev-util/glib-utils/Manifest
+++ b/dev-util/glib-utils/Manifest
@@ -1,5 +1,7 @@
 DIST glib-2.62.6.tar.xz 4703424 BLAKE2B 0a27245be2575c574dcc730dd051a8c284f421dbc46579aadc5fbbacb8f934af4374b61bb26085e5c9ab78a868c567818f3fb9d67adddce37f5c4fec00e0d276 SHA512 8e3972a371f3c1a50b7d245b30e4f740583ad72ba4ab325e0e15e0732be44dfb69b603fb39dcf4989255a23a181e9ea5dd25982dd94c386cd9f21952243ad6f5
-DIST glib-2.64.3.tar.xz 4778964 BLAKE2B 98ec6e15a8ff642fbccd4809d749234d5adae8abcab7a3619caed0aa60370d0409a76a2c64a95998401e8a339dcc264f4f808f3d7be457ff40e38d70b0a8076b SHA512 a3828c37a50e86eb8791be53bd8af848d144e4580841ffab28f3b6eae5144f5cdf4a5d4b43130615b97488e700b274c2468fc7d561b3701a1fc686349501a1db
+DIST glib-2.64.4.tar.xz 4779456 BLAKE2B 2ff69c794689c97011103459cb109e6ca7021db20a605cf3942f57e7b73eda9971034b8f65f03191f357169affb278dfa9bff309b4ca44605fd5a0ba0d135d2a SHA512 f21fe33068a5cabdbfef54ef635b3f810b389416c3b4b66ae4975e84841834f7b7640d2518d52cb7341641af5761919eebd5e7b25bd2946f3bdd002c4902b090
+DIST glib-2.64.5.tar.xz 4778456 BLAKE2B 7fdee0e16a7ac820f4c4f7dc66d37add464d3005e89e6013302d3ef103319331811d68e9b42db072b82242c3d7badfbd085b69333e770012def89dc8aae7a2eb SHA512 a87537274619b6de88a0e68555059036ac18c748b5005c8d84728646b0db342fde0b8c5b303b9ad79f64d71ea4ed990d52a4fbd68cda3ca74aed5fe4d497e060
 EBUILD glib-utils-2.62.6.ebuild 2390 BLAKE2B 6160cd993d8ea330b68812082a1e14c6d9c64e4adc2832bb68693e8a8eacc7598541f19e049a7601027b5fc1624485dcdc9745c7095b07d3b004a99a7f612d44 SHA512 4840e214e3283609722803ac6e52b015cce5e1f74168e318bf78bd0f0d2e7332f35063939c843ed39d03b0c9822a6aa738183bd0e0b6ea1067aae5c6b2a57a03
-EBUILD glib-utils-2.64.3.ebuild 2399 BLAKE2B 68065e66c639d695af972944e37e40eb633c6b7033d9d6d4f032f5c016017529cda1ea8d1e264dcaaa6ebdf0c3c2c643b59dae936b87f787c68703f1bb560526 SHA512 15730dd4f08903d49d4c462eb045b557b5c237e581699fcd9253199dc1c953415552dc908e110c701d7ef1803e336a25547509ba15c8bcd95ce8515e1d5914d7
+EBUILD glib-utils-2.64.4.ebuild 2396 BLAKE2B 5c5d5edfcfce8d27e9b1abe8623d0ebe913338d0afb1fbd331e8feb5df7b446ca5e2d7952014298467909f042e56dc062bcf4ed948d570db55f03a2b847db15a SHA512 a20b2d9bbf6a1685b2be734238e083cbb0f1adc1bfc1d2c152d682d6c04a2a065aaeacb331fa07688702b897a24683b18278b291a9e9c28cb0425d599555007a
+EBUILD glib-utils-2.64.5.ebuild 2399 BLAKE2B 68065e66c639d695af972944e37e40eb633c6b7033d9d6d4f032f5c016017529cda1ea8d1e264dcaaa6ebdf0c3c2c643b59dae936b87f787c68703f1bb560526 SHA512 15730dd4f08903d49d4c462eb045b557b5c237e581699fcd9253199dc1c953415552dc908e110c701d7ef1803e336a25547509ba15c8bcd95ce8515e1d5914d7
 MISC metadata.xml 332 BLAKE2B 1e3c081ae9a2c8ae53cee6c3ae133cbd5e8543a68c03d4a4f7e164437502d996ea9364789e93114687271e1f472bcf13a418cca5b74ecb95a51849f0a5f3dafa SHA512 f7680d9be4071b841f50ece99b5041dc492901d84ae05383c1ff05b6a73bab804b153a50eb70f5417137f6e2041230c5ba8eaede10f7a0bf8a899508642588c6
diff --git a/dev-util/glib-utils/glib-utils-2.64.4.ebuild b/dev-util/glib-utils/glib-utils-2.64.4.ebuild
new file mode 100644
index 000000000000..b77b6e37bdac
--- /dev/null
+++ b/dev-util/glib-utils/glib-utils-2.64.4.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+GNOME_ORG_MODULE="glib"
+
+inherit gnome.org python-single-r1
+
+DESCRIPTION="Build utilities for GLib using projects"
+HOMEPAGE="https://www.gtk.org/"
+
+LICENSE="LGPL-2.1+"
+SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~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
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-libs/libxslt
+	app-text/docbook-xsl-stylesheets
+"
+
+src_configure() { :; }
+
+do_xsltproc_command() {
+	# Taken from meson.build for manual manpage building - keep in sync (also copied to dev-util/gdbus-codegen)
+	xsltproc \
+		--nonet \
+		--stringparam man.output.quietly 1 \
+		--stringparam funcsynopsis.style ansi \
+		--stringparam man.th.extra1.suppress 1 \
+		--stringparam man.authors.section.enabled 0 \
+		--stringparam man.copyright.section.enabled 0 \
+		-o "${2}" \
+		http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \
+		"${1}" || die "manpage generation failed"
+}
+
+src_compile() {
+	sed -e "s:@VERSION@:${PV}:g;s:@PYTHON@:python:g" gobject/glib-genmarshal.in > gobject/glib-genmarshal || die
+	sed -e "s:@VERSION@:${PV}:g;s:@PYTHON@:python:g" gobject/glib-mkenums.in > gobject/glib-mkenums || die
+	sed -e "s:@GLIB_VERSION@:${PV}:g;s:@PYTHON@:python:g" glib/gtester-report.in > glib/gtester-report || die
+	do_xsltproc_command docs/reference/gobject/glib-genmarshal.xml docs/reference/gobject/glib-genmarshal.1
+	do_xsltproc_command docs/reference/gobject/glib-mkenums.xml docs/reference/gobject/glib-mkenums.1
+	do_xsltproc_command docs/reference/glib/gtester-report.xml docs/reference/glib/gtester-report.1
+}
+
+src_install() {
+	python_fix_shebang gobject/glib-genmarshal
+	python_fix_shebang gobject/glib-mkenums
+	python_fix_shebang glib/gtester-report
+	exeinto /usr/bin
+	doexe gobject/glib-genmarshal
+	doexe gobject/glib-mkenums
+	doexe glib/gtester-report
+	doman docs/reference/gobject/glib-genmarshal.1
+	doman docs/reference/gobject/glib-mkenums.1
+	doman docs/reference/glib/gtester-report.1
+}
diff --git a/dev-util/glib-utils/glib-utils-2.64.3.ebuild b/dev-util/glib-utils/glib-utils-2.64.5.ebuild
index 0dd0c2ddd686..0dd0c2ddd686 100644
--- a/dev-util/glib-utils/glib-utils-2.64.3.ebuild
+++ b/dev-util/glib-utils/glib-utils-2.64.5.ebuild
diff --git a/dev-util/global/Manifest b/dev-util/global/Manifest
index cce3980f16c8..7970c28d3a67 100644
--- a/dev-util/global/Manifest
+++ b/dev-util/global/Manifest
@@ -1,9 +1,10 @@
 AUX 50gtags-gentoo.el 183 BLAKE2B 242ceb0370227a6c0f1ee23477aa3798e0e8580e59849a8b47623697b6bfc1f98ac4b3f57ef0fb9a9269215f7f2666191907072064c4e7a4450fce5fc59c9724 SHA512 5a7b4e3eb4ee7ce479766a01dea5f82ab7499e666130b869c8f61ec9dfa69250b4b98357f6eb3d1b14da0348eb2c7d77ec0146d1e85996254a8fd7eaa3f3ff05
 AUX global-6.2.9-tinfo.patch 2047 BLAKE2B b88b65679f9b6ed0b96ca236c1918c3238baf99bdff8c7a45f85f982923d82341f23fc961cc4d61ee9269900b48e2d726ab57482e9635b035cf621e27da0f72e SHA512 f5d83716ba2fde29ad5765665d00b4d2a5b4c8d6351cd6ca9d8c375a6c953f795811e156c0cdb28549837c72abbe2c2bef9ad4cb419e7043115c50858b831698
+AUX global-6.6.4-fno-common.patch 946 BLAKE2B 8063d13db0942c0face6fde1411b96f352d706a85a4cf9f4b5c1eac43f6855e4c914166df2da8d01521a73f2d05b20df65aa25f6a3b965379346d2b523c8ca88 SHA512 f2579cbe22a4c97be0e7ccbf945b9d509bf22cdfa064e6e9fb6182204edf6085e97166ef3f771fe65942505259aa9b42b6c164c644ae95bba8d1e11f1319e0f4
 DIST global-6.3.1.tar.gz 1369634 BLAKE2B 8d93222ccbb4a45c0b9f114cd84b342b3f6ab99f7e0bbc18bfe00912ecd53f606be9d32fce1570e027009fd1fbe4752f03dd19c183dfda438d67a329808a6b45 SHA512 83becd6cda06f8da17ea0c701bb135523ff48cec73b233d24566387d11a35c0b42f410b62753838e2b364a5a485cac033b4aef1159cc6f4cdeca4a7b6c5bb4d6
 DIST global-6.5.7.tar.gz 2940567 BLAKE2B e0c692e09f9f7ea64ecbe47e18691efd3c641f28826e19751fb812690cd9d64a53af03055de9ec8199637da46dbd6084fec16380d7f295c83ed77553a8e301fd SHA512 0d33f718839e5e00bdd6d042b415a69c5e1f232d843610870505f8f20635b445810149b1b84ea8b77881f5f64814783ebe3cdcab2f84b8a085223b64293a9045
 DIST global-6.6.4.tar.gz 2988969 BLAKE2B 784087537094d27c10d1f2bc992e799c35ab6ce3b86e041c31279e6954b203e80676b3158ba95e7957456b75a213d70998aae9047836cd4d388212236f05a081 SHA512 cb4ed451d3aaf47c4c59cdc3f74c97d3171108177d4846b5dac843589710e66d87c9d7bbe080c3770329e8e40105ac52dcafb4609257347593cca4d94711f483
 EBUILD global-6.3.1.ebuild 1625 BLAKE2B d1428e4ff5cd8dbf4929d330e556c285a7d3efe7c5c831900c1aaf6c38130147c18c242caa220ba554b43cfcd526af18b695c82eac9d79bbccf82188a7b6af66 SHA512 c7c6d734c5e35ef30f7e1c20a03dce49386d71af80ff3580e4b844afd3abfa2a1e6d1941198f08dd3074b52b5dadf2bb5bf080acac298179df6660005a46183a
 EBUILD global-6.5.7.ebuild 1633 BLAKE2B 6120fd297353f710d91eedf03241552852567b73ff4a1b52e39f49538202961b930f07a5adcb41820c2c817f09b7556982fd2801aed4f332e43d2036bad95775 SHA512 4978e3550ca324412c01ab67264b8227ef35a7fbc0f5719b98c0b77db8f8cc09aa7420097aa3890bbd0f6b07b88a262886d4717c482c669d8d52a28adbfd52d5
-EBUILD global-6.6.4.ebuild 1654 BLAKE2B 4c4b8d0f515519534b4b43ab03a22906a71a1d2e4fa1718359a42bd0ed4f60eaa582c279acd414bc9b90c3ccc143b7110b9f93567c4de4ce7a4d957f7f7a71be SHA512 de7b306fa436ef7367dcc4f09307de5b96d2ab253853da997b280a6d7c2d8b8f96dee227248b2c07460c947b113b1d5abdc773ecd1721dd8a2f3e80ed8762b68
+EBUILD global-6.6.4.ebuild 1697 BLAKE2B 91fddaf844d76a6b68f3372cb78992067b4c5c552c4dd8bdf375384cf0346382becd9da6de7cabf5358271c3c0df1573d27e4bec7d8625ca68df35bb0e01c104 SHA512 39a8ae3a8b7bedcee0bb9ee7a490555d8640cb098da23042e5d3b81967f2711bdee8ce8631c02a2aee3e6f3864022f4046793bf47f9c20ea628adc9e176c67fb
 MISC metadata.xml 398 BLAKE2B fb266f584dfc0e682d13870da7bbb4bbb46027cea3101b196b48d033766d627c723928f9a2f4ac4c8c6159a8ea147810b82fcec9ceb4981dc5491e54ef367c17 SHA512 89b426c4682fa885cedc1755f4720f1a003f9bc2dac725667ae45e098edebf627897830c911762f7d8856fc66cafb1c60d0f315173ddbbebada0d05ca6d8d5e8
diff --git a/dev-util/global/files/global-6.6.4-fno-common.patch b/dev-util/global/files/global-6.6.4-fno-common.patch
new file mode 100644
index 000000000000..5a85cc125683
--- /dev/null
+++ b/dev-util/global/files/global-6.6.4-fno-common.patch
@@ -0,0 +1,44 @@
+--- a/libutil/args.c
++++ b/libutil/args.c
+@@ -39,7 +39,7 @@
+ #define ARGS_GFIND	3
+ #define ARGS_BOTH	4
+ 
+-int type;
++static int type;
+ const char **argslist;
+ FILE *ip;
+ GFIND *gp;
+--- a/libutil/convert.c
++++ b/libutil/convert.c
+@@ -46,7 +46,7 @@
+ 
+ #include "convert.h"
+ static int debug = 0;
+-int flags;
++static int flags;
+ 
+ /**
+  * This module converts records before output.
+--- a/libutil/gpathop.c
++++ b/libutil/gpathop.c
+@@ -49,7 +49,7 @@
+ static int opened;
+ static int created;
+ 
+-int openflags;
++static int openflags;
+ void
+ set_gpath_flags(int flags) {
+ 	openflags = flags;
+--- a/libutil/version.c
++++ b/libutil/version.c
+@@ -30,7 +30,7 @@
+ #endif
+ #include "version.h"
+ 
+-const char *copy = "\
++static const char *copy = "\
+ Copyright (c) %s Tama Communications Corporation\n\
+ License GPLv3+: GNU GPL version 3 or later <http://www.gnu.org/licenses/gpl.html>\n\
+ This is free software; you are free to change and redistribute it.\n\
diff --git a/dev-util/global/global-6.6.4.ebuild b/dev-util/global/global-6.6.4.ebuild
index e45daf3d4f7d..48f5dfdc0a92 100644
--- a/dev-util/global/global-6.6.4.ebuild
+++ b/dev-util/global/global-6.6.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="doc emacs vim"
 
 RDEPEND="
@@ -27,7 +27,7 @@ RDEPEND="
 		sys-devel/libtool:2
 	)"
 
-DEPEND="${DEPEND}
+DEPEND="${RDEPEND}
 	doc? (
 		app-text/texi2html
 		sys-apps/texinfo
@@ -35,7 +35,10 @@ DEPEND="${DEPEND}
 
 SITEFILE="50gtags-gentoo.el"
 
-PATCHES=( "${FILESDIR}/${PN}-6.2.9-tinfo.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-6.2.9-tinfo.patch"
+	"${FILESDIR}/${PN}-6.6.4-fno-common.patch"
+)
 
 DOCS=( AUTHORS FAQ NEWS README THANKS )
 
diff --git a/dev-util/glslang/Manifest b/dev-util/glslang/Manifest
index d7832b2c907d..6dd7879db40f 100644
--- a/dev-util/glslang/Manifest
+++ b/dev-util/glslang/Manifest
@@ -7,6 +7,6 @@ DIST glslang-8.13.3743.tar.gz 3183453 BLAKE2B 2e8fc3693477be8bd6f8000a0eb032b314
 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 835 BLAKE2B d23510edf3f2238c6a720c5c8a8eb0a2c296c2afa04201cfee0ae04f154602e2c3db5226a428b7aff1b167ba2c2ddd05587e589c11ce733da2436b8b67f9f724 SHA512 dc922535ee006ae074b42bdd462fe552575fb922c0faa886db3d960e768f19baf680860e4eb4b545f6f5156cc5343e59c660a2f4ee93b7aa550e630372fb2f00
+EBUILD glslang-8.13.3743-r1.ebuild 852 BLAKE2B acd69f5e3f528b6f4e8a99939a97f22d7768461e94efa8138cf1dcf148ced8c6cad554dee59d03ba0b1194c991c6317cbed12d8f7d2e783f29fe584afc0b67c2 SHA512 2f12024cfd1ba3e9edd96e1a307812dc49311d535987625ab42ae110a8393c4b90c975526f03d186cdd38bd79b90eb12fe553c1e4c6eedfa3bccdcd3cae03db0
 EBUILD glslang-9999.ebuild 758 BLAKE2B f4f9a1e734aff4245c035d872d6c3a04abebf472730398d666bddab58cda002843b4dd9f06eac7d652c4db176cc9333e025ad27ddd1752a509786e12e341f9d1 SHA512 dc7eed08504ce61a142ad4ab3e6a9cdef360163dc5deb29dc61823ddf25f4915abfc0e127900c0acaeea3173e46c2fc152eaff41bdb6313861b04c052c57925f
 MISC metadata.xml 330 BLAKE2B fd98c615a1b5c3364e122b66d18e9667ff1bae51218e2474862a0376f352421cfbe7aa3b4f9751ff8e8f24510f4a6e3f0e1977ca759b566b54f48fa45243980c SHA512 9658890a6aa3ae0c91e71416c3996d9c8064bb970521b5c444d617fc4a51ef2edb62aa7d44b25ef96768417de0c5478999e74405c6d9ff847816311990c945ee
diff --git a/dev-util/glslang/glslang-8.13.3743-r1.ebuild b/dev-util/glslang/glslang-8.13.3743-r1.ebuild
index c6ed470a423f..95e57fdafa69 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 ~ppc64 x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 	S="${WORKDIR}/${PN}-${SNAPSHOT_COMMIT}"
 fi
 
diff --git a/dev-util/gn/Manifest b/dev-util/gn/Manifest
index 5b3657c16116..7c1ae3db9b9b 100644
--- a/dev-util/gn/Manifest
+++ b/dev-util/gn/Manifest
@@ -1,7 +1,6 @@
-AUX gn-gen-r1.patch 2045 BLAKE2B dcc370a2625f59475cc5c818800e5b8aa6d3ff0b24a356dc7defb42041ce525230fa691d0ead08ec32581aebda188121bd9115985a3d2bda65bff38557cbdd08 SHA512 77ea25769255879903556961446c731cbc609e911288f64f0600dfc364e2a05896251c3e02b241f94072b2a67c4a6fb7541f7bf7f409339a13902446476c2993
 AUX gn-gen-r4.patch 1559 BLAKE2B b92f487d4153ebd885d9cb1ca6889ca52b5afcccdb9a781fae568b861152a2cc3d9e61d5c406c5365311337a131fa99447528011af511b7aadd0975f692fe85b SHA512 b286651983f94894faf992da12a1ed51776c8207275e1b1e1776d0caf83615b02cb3d57198aec8b3736944b9cb8749028f79ebc7a700dd30babf122cfe5884d3
-DIST gn-0.1463.tar.gz 905571 BLAKE2B e048e642704533d478fb751748a97f60283f63868ab1ab6fa5b8e7bc0322745cf21464eaa16194f684869b50f306668d3c7d3b4f72c3985b865d8492d1ff0901 SHA512 f32861a8fa44034b932e6aae4787fd7da6e4c6c19c5b6919de7b0d0f1ba20f415c1c55db95a08958a338b7b9de740ff49a29ab894a9c4e9049a89450d8c88281
 DIST gn-0.1726.tar.xz 663480 BLAKE2B 26920a1594e9cc664293efaeaa8725568b78ecc1f2ac8c9a3cd27333e5fe89f1fa5bdee9e42c408f3c4a7cfb630e79220926c5694e31131d3e7627be49b5d6b2 SHA512 3e93ba02f251386c4aa320a45b8a045c2a1fa686a8f170455f3c06bb25b1a628c44530ae2e56bcbb2ff4b2a84dd065d54dde90955a55a325a8d219acce69ec2f
-EBUILD gn-0.1463.ebuild 1034 BLAKE2B b415c7f196a387de4d3460b9b56f4546a76da2c400d246d14cb9e56ca2eb30c3aa8647b5f58ba73c51f7be41793fd799ffc0152a70f81d47c40407eb2e9756f7 SHA512 8a02e407c0a6b78107932705df99ffc1d8180f66f5d3e23ef3c3121d6d42434ba176012ede5ef1b21d47a3a3bda61578af7165d177c4f8d5b1350af0f57a1790
-EBUILD gn-0.1726.ebuild 1269 BLAKE2B 4228d3b89f26c9922e8f4163436d98fa275706f07e66dc2559c4f02d2c6da0b8d1f3e88f027a4e7e9d8f51bde2b5dd1f832160024c755baa5dc31327e984adbf SHA512 6e52b38170bfd5a9937ef65f0812e273c4507f4dadcb97a70cd9ab08afaa6892395de551e5bd060652c31d873c862e6ea81dbfd59c7429103f956be70490a9b5
+DIST gn-0.1807.tar.xz 682644 BLAKE2B 5beb3c03b0ae467cb98eff2069ef6e4355cba56c57e2717139b698fa563efc404dd1cf0b3fd196f432ca3a13b0402e895b46407cb90bc16b63963710fd5be060 SHA512 82f468e389d08a46e582f816d056813af9bfc810ad0bd84f02731c17c0e2c6140a62e827b8a3c5f89eef467f9bcfc2e88dd7aed325a7955d8584e753fcd09103
+EBUILD gn-0.1726.ebuild 1268 BLAKE2B cbd02136dd154f3329f31d5faf527e6a55e84502d594128141961ad714ce35921e1f04fe758fb55f76221247be7848d0757a659308a5af73329ec1c753af5051 SHA512 fe5e6c500d344018445167db6be97380885e4386935e6419aa3be491a956b61fa6a95240c4c093ae1c055967b9f3cbc61a243cd6ff05fef14cddf46f9bc63732
+EBUILD gn-0.1807.ebuild 1272 BLAKE2B 01d94736cd1d2674605c9b097452e6e2bfb096f9a3f81b9a85ec83e5eeb23033624916787cfb9a5047dbfdd544dd77cf1fd2242dc61bc3f0c936c78a110ab8b2 SHA512 13ab3b60df643fa8596b1990e5eb6e1506ac4a73a9453b7652a1d055a706b7b69ba700b2948d1429734d91da284fb6a07015de78657ac6f92ca8688f37696b81
 MISC metadata.xml 220 BLAKE2B da4da8d60764ec3b2181bd9ea602d6e3cf830e73e05b09fe8984f147215a2082b030e402c21098ad33de4b3621d1cbc1328bd52f4f9c32d6b0485773251b1d77 SHA512 a1e65cd8b02b8ffb12754e5d12dfd44ad9973de7c61ec867f1454e79563519182baae7d10cee3488622bbba8636fc7a6dca5806208f204a9b66df8436e3cd696
diff --git a/dev-util/gn/files/gn-gen-r1.patch b/dev-util/gn/files/gn-gen-r1.patch
deleted file mode 100644
index 77fdefcf222d..000000000000
--- a/dev-util/gn/files/gn-gen-r1.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff --git a/build/gen.py b/build/gen.py
-index 76f88e84..5e088b2a 100755
---- a/build/gen.py
-+++ b/build/gen.py
-@@ -326,9 +326,6 @@ def WriteGNNinja(path, platform, host, options, linux_sysroot):
-     if options.debug:
-       cflags.extend(['-O0', '-g'])
-     else:
--      cflags.append('-DNDEBUG')
--      cflags.append('-O3')
--      ldflags.append('-O3')
-       # Use -fdata-sections and -ffunction-sections to place each function
-       # or data item into its own section so --gc-sections can eliminate any
-       # unused functions and data items.
-@@ -340,14 +337,6 @@ def WriteGNNinja(path, platform, host, options, linux_sysroot):
-         # Garbage collection is done by default on aix.
-         ldflags.append('-Wl,--gc-sections')
- 
--      # Omit all symbol information from the output file.
--      if platform.is_darwin():
--        ldflags.append('-Wl,-S')
--      elif platform.is_aix():
--        ldflags.append('-Wl,-s')
--      else:
--        ldflags.append('-Wl,-strip-all')
--
-       # Enable identical code-folding.
-       if options.use_icf:
-         ldflags.append('-Wl,--icf=all')
-@@ -356,26 +345,17 @@ def WriteGNNinja(path, platform, host, options, linux_sysroot):
-         '-D_FILE_OFFSET_BITS=64',
-         '-D__STDC_CONSTANT_MACROS', '-D__STDC_FORMAT_MACROS',
-         '-pthread',
--        '-pipe',
-         '-fno-exceptions',
-         '-fno-rtti',
-     ])
-     cflags_cc.extend(['-std=c++14', '-Wno-c++11-narrowing'])
-+    ldflags.append('-pthread')
- 
-     if platform.is_linux():
-       if linux_sysroot:
-         # Use the sid sysroot that UpdateLinuxSysroot() downloads.
-         cflags.append('--sysroot=' + linux_sysroot)
-         ldflags.append('--sysroot=' + linux_sysroot)
--      ldflags.extend([
--          '-static-libstdc++',
--          '-Wl,--as-needed',
--      ])
--      libs.extend([
--          # These are needed by libc++.
--          '-ldl',
--          '-lpthread',
--      ])
-     elif platform.is_darwin():
-       min_mac_version_flag = '-mmacosx-version-min=10.9'
-       cflags.append(min_mac_version_flag)
diff --git a/dev-util/gn/gn-0.1726.ebuild b/dev-util/gn/gn-0.1726.ebuild
index aa2740074a01..5f6a1e3c26f2 100644
--- a/dev-util/gn/gn-0.1726.ebuild
+++ b/dev-util/gn/gn-0.1726.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~x86"
 IUSE="vim-syntax"
 
 BDEPEND="
diff --git a/dev-util/gn/gn-0.1463.ebuild b/dev-util/gn/gn-0.1807.ebuild
index 6ef882d71205..ac1d4f6df4be 100644
--- a/dev-util/gn/gn-0.1463.ebuild
+++ b/dev-util/gn/gn-0.1807.ebuild
@@ -1,18 +1,19 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 2018-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit ninja-utils python-any-r1 toolchain-funcs
 
 DESCRIPTION="GN is a meta-build system that generates build files for Ninja"
 HOMEPAGE="https://gn.googlesource.com/"
-SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.gz"
+SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~x86"
+IUSE="vim-syntax"
 
 BDEPEND="
 	${PYTHON_DEPS}
@@ -20,7 +21,7 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}"/gn-gen-r1.patch
+	"${FILESDIR}"/gn-gen-r4.patch
 )
 
 pkg_setup() {
@@ -30,12 +31,14 @@ pkg_setup() {
 src_configure() {
 	python_setup
 	tc-export AR CC CXX
-	set -- ${EPYTHON} build/gen.py --no-sysroot --no-last-commit-position
-	echo "$@"
+	unset CFLAGS
+	set -- ${EPYTHON} build/gen.py --no-last-commit-position --no-strip --no-static-libstdc++
+	echo "$@" >&2
 	"$@" || die
 	cat >out/last_commit_position.h <<-EOF || die
 	#ifndef OUT_LAST_COMMIT_POSITION_H_
 	#define OUT_LAST_COMMIT_POSITION_H_
+	#define LAST_COMMIT_POSITION_NUM ${PV##0.}
 	#define LAST_COMMIT_POSITION "${PV}"
 	#endif  // OUT_LAST_COMMIT_POSITION_H_
 	EOF
@@ -53,4 +56,9 @@ src_test() {
 src_install() {
 	dobin out/gn
 	einstalldocs
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles
+		doins -r misc/vim/{autoload,ftdetect,ftplugin,syntax}
+	fi
 }
diff --git a/dev-util/gnome-builder/Manifest b/dev-util/gnome-builder/Manifest
index e9bbd360acf8..318e519227b4 100644
--- a/dev-util/gnome-builder/Manifest
+++ b/dev-util/gnome-builder/Manifest
@@ -2,10 +2,7 @@ AUX 3.34.1-optional-vala.patch 1249 BLAKE2B dcec506c976b6438cec14d941b911cdc11fe
 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.0-patchset.tar.xz 136856 BLAKE2B a482f371313af4ef6a0881968846c4543d169b6bd36942ae4b72d493012d73c9705e4a7acc8f7dfc1e8cbcdeb2445b4e225f39c3a9a219e24b90be773c0768c1 SHA512 ebaec56950e0e45ba2851b13d4e1518163a291dca207bba25efe12eaaa3cd69e9bae06d2f4e5b9e9852a4305fc3933764ec9a882843f84ce58bd2246991d16fd
-DIST gnome-builder-3.36.0.tar.xz 12015980 BLAKE2B 1724c7b17e58fea08cd22894eb260236419f215c1b68d396359ce40432e8a0c08d0ead2b70e888cbb767f78362d4253395b98821fb1d1ff9a07d5881df88c8e3 SHA512 ccd6ca916ed6ad10b69e5573482e2ea48cf4227d858605825ab56989840ebbf5a6dfafc915a1f8df3a1061b37c80adfbd03fc9d616c67e08a5032069b11aa4a6
 DIST gnome-builder-3.36.1.tar.xz 12026976 BLAKE2B d833665bb71b1549fe789d05dbd89db588ae4cc7187e532f38f3bd9e779bccab644d9f9bfc4c84bd484ac678bcf8594e4aa4edff29ea8c87c5c557fc3e422a4f SHA512 284da6e5a9e766cb6f6122f1134c779cde8406b006728ae1fff3518020ef4b96239aa5037cd2d35cfe4728ea088d61c4eeabc39ea753a16208fdaba7b04e63c2
-EBUILD gnome-builder-3.34.1-r1.ebuild 7372 BLAKE2B a60c1261ab7251f3a0cfff69538f0f92bb8a197d2624e3aa62703b9e6b808e3c0793a048a61ff0b409c51c1f6467ca0f5df7d513a825103bbb4c71263fb0bd2b SHA512 e1fcba969d1a9ab368775a80cc7a0ebe35e76a11cd78d49509a2837ab5efd045f9cf1e058397ab943bcdce4eb99e71baea8d2c72f398baeca8500f40dca28bca
-EBUILD gnome-builder-3.36.0.ebuild 6904 BLAKE2B 53f8cc1b0aa6fb85a0fa208b45c68c932c264c477c256c095fdab539567a1ca5db7bc1ed81a97be58c59551902c64b0792165d0cd180b521a5bae62fb8d7d6ef SHA512 eb9469f65d67b9e582ee341a137bc1eceef75c9b37898e0d1c3c47012227f63af0bdae7f57192705fcdfb009d751f522e5e4f89752d72ef75fafd16296a98033
-EBUILD gnome-builder-3.36.1.ebuild 6735 BLAKE2B 3d58eef4f5c068bed48860140cf49ea6f8a787c185bfa63a4e4442787f76466c28b5a060e80e9ea1365330b7e96cc3d181fb392d299712d7d4259507ec426627 SHA512 7d52277f74434fb4ffc2d60e2e45576bd26811c3d6a1e821d96c944f748113f5efae1a1fc49fb213952263b7973532383df45089d734bf3169d5b2ed83d859f8
+EBUILD gnome-builder-3.34.1-r1.ebuild 7373 BLAKE2B 92642b4c86bb5eb125ce98e2e1e0ebd88e899fd8190de1ead83f1407a78baedbbd7c99978b34e0e6cf4b070dd5a06c5e0488c0a1b2142aae8ec955ab7268f284 SHA512 c56c98b53de6d4de9e3100caf907d0d72df9c8ed4df585578713c69c8cae66eb323b4fc92fc2339d41df5dfacb71eed476494c66a288d317a28b4f66963e28e0
+EBUILD gnome-builder-3.36.1.ebuild 6738 BLAKE2B cc9f2a2e503a817cff819a73bc9b014c662883bdaecc549525d0b8920c9abe6ecf11bd9c6868a467979059afa2dd817b7b7668b1ccd008027bb89c1653ea4c69 SHA512 b877c46c9eef1e37f7c881aa6c5ea2352ea9797cbbc47061cf9711be6583c71b21ca68f903ce5ea3b526406710ce3c242094828f940c1239a11b3b2e05e7a71f
 MISC metadata.xml 1085 BLAKE2B 0b2bdcfec562b85e54880c819a0345c2aedf4f8b1c0bc34b7b4e3e8551697dcbb3ed93da1e016f3a164bb677459e8d628ba943252e51e842152282c3757f0232 SHA512 58890d32c2d04d63eaae8489ea68054ffc50df5bf9970af6b159b2dfbc99b8ed2d2db80aa29907463c137caf5eb8aa129c1470d1e19ccbf398ff8789f7f63987
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
index a7817290a9e5..93fea980b04c 100644
--- a/dev-util/gnome-builder/gnome-builder-3.34.1-r1.ebuild
+++ b/dev-util/gnome-builder/gnome-builder-3.34.1-r1.ebuild
@@ -58,7 +58,7 @@ RDEPEND="
 	${PYTHON_DEPS}
 	clang? ( sys-devel/clang:= )
 	devhelp? ( >=dev-util/devhelp-3.25.1:= )
-	glade? ( >=dev-util/glade-3.22.0:3.10 )
+	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
diff --git a/dev-util/gnome-builder/gnome-builder-3.36.0.ebuild b/dev-util/gnome-builder/gnome-builder-3.36.0.ebuild
deleted file mode 100644
index af7182a070d1..000000000000
--- a/dev-util/gnome-builder/gnome-builder-3.36.0.ebuild
+++ /dev/null
@@ -1,182 +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} )
-DISABLE_AUTOFORMATTING=1
-FORCE_PRINT_ELOG=1
-
-inherit gnome.org gnome2-utils llvm meson python-single-r1 readme.gentoo-r1 virtualx xdg
-
-DESCRIPTION="An IDE for writing GNOME-based software"
-HOMEPAGE="https://wiki.gnome.org/Apps/Builder"
-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"
-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]
-	>=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
-	>=x11-libs/pango-1.38.0
-	>=dev-libs/libpeas-1.22.0[python,${PYTHON_SINGLE_USEDEP}]
-	>=dev-libs/template-glib-3.28.0[introspection]
-	>=x11-libs/vte-0.40.2:2.91[introspection]
-	>=net-libs/webkit-gtk-2.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_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] )
-"
-DEPEND="${RDEPEND}"
-# TODO: runtime ctags path finding..
-
-# desktop-file-utils required for tests, but we have it in deptree for xdg update-desktop-database anyway, so be explicit and unconditional
-# appstream-glib needed for validation with appstream-util with FEATURES=test
-BDEPEND="
-	doc? ( $(python_gen_cond_dep '
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	') )
-	gtk-doc? ( dev-util/gtk-doc
-		app-text/docbook-xml-dtd:4.3 )
-	test? (
-		dev-libs/appstream-glib
-		sys-apps/dbus )
-	dev-util/desktop-file-utils
-	dev-util/glib-utils
-	>=dev-util/meson-0.49.2
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-DOC_CONTENTS='gnome-builder can use various other dependencies on runtime to provide
-extra capabilities beyond these expressed via USE flags. Some of these
-that are currently available with packages include:
-
-* dev-util/uncrustify and dev-python/autopep8 for various Code Beautifier
-  plugin out of the box functionality.
-* dev-util/ctags with exuberant-ctags selected via "eselect ctags" for
-  C, C++, Python, JavaScript, CSS, HTML and Ruby autocompletion, semantic
-  highlighting and symbol resolving support.
-* dev-python/jedi and dev-python/lxml for more accurate Python
-  autocompletion support.
-* dev-util/valgrind for integration with valgrind.
-* dev-util/meson for integration with the Meson build system.
-* dev-util/cargo for integration with the Rust Cargo build system.
-* dev-util/cmake for integration with the CMake build system.
-* net-libs/nodejs[npm] for integration with the NPM package system.
-'
-# FIXME: Package 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
-# stylelint for stylesheet (CSS and co) linting
-# gvls for vala language-server integration
-
-PATCHES=(
-	"${WORKDIR}/patches" # gnome-builder-3-36 branch 2020-06-17 (commit f9a82f62ce6c8)
-)
-
-llvm_check_deps() {
-	has_version "sys-devel/clang:${LLVM_SLOT}"
-}
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	use clang && llvm_pkg_setup
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dtracing=false
-		-Dprofiling=false # not passing -pg to CFLAGS
-		-Dtcmalloc=false
-		-Dchannel=other
-
-		$(meson_use doc help)
-		$(meson_use gtk-doc docs)
-
-		-Dnetwork_tests=false
-		$(meson_use clang plugin_clang)
-		$(meson_use devhelp plugin_devhelp)
-		-Dplugin_deviced=false
-		-Dplugin_editorconfig=true # needs libpcre
-		-Dplugin_flatpak=false
-		$(meson_use git plugin_git)
-		$(meson_use glade plugin_glade)
-		-Dplugin_podman=false
-		$(meson_use spell plugin_spellcheck)
-		$(meson_use sysprof plugin_sysprof)
-		-Dplugin_update_manager=false
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	python_optimize
-	if use doc; then
-		rm "${ED}"/usr/share/doc/gnome-builder/en/.buildinfo || die
-		rm "${ED}"/usr/share/doc/gnome-builder/en/objects.inv || die
-		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/gnome-builder-3.36.1.ebuild b/dev-util/gnome-builder/gnome-builder-3.36.1.ebuild
index b524cba0fea4..1e2aa345a274 100644
--- a/dev-util/gnome-builder/gnome-builder-3.36.1.ebuild
+++ b/dev-util/gnome-builder/gnome-builder-3.36.1.ebuild
@@ -43,7 +43,7 @@ RDEPEND="
 	>=x11-libs/vte-0.40.2:2.91[introspection]
 	>=net-libs/webkit-gtk-2.12.0:4=[introspection]
 	>=dev-libs/libxml2-2.9.0
-	git? ( dev-libs/libgit2[ssh,threads]
+	git? ( dev-libs/libgit2:=[ssh,threads]
 		>=dev-libs/libgit2-glib-0.28.0.1[ssh]
 	)
 	dev-libs/libpcre:3
@@ -56,7 +56,7 @@ RDEPEND="
 	${PYTHON_DEPS}
 	clang? ( sys-devel/clang:= )
 	devhelp? ( >=dev-util/devhelp-3.25.1:= )
-	glade? ( >=dev-util/glade-3.22.0:3.10 )
+	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
diff --git a/dev-util/google-perftools/Manifest b/dev-util/google-perftools/Manifest
index 521d696af36b..0e4663bd2929 100644
--- a/dev-util/google-perftools/Manifest
+++ b/dev-util/google-perftools/Manifest
@@ -1,6 +1,7 @@
+AUX 2.8-musl-tests.patch 1068 BLAKE2B 804671d01cba50821e63d60dd54154506be03fa8aa4a5ea5d3fccc1c7e1f7550e4f30f6792051f8ce7c47c8cedbbe54df0324060a9f0b306383a288c95667ed2 SHA512 f16c2fe9406c4865887ba1698eada2151e27b47a3cc73a6d3a8c3ca769102ca064f141e0137e168a8c2613dd4f663a5c7a3a7128d51d03fd9889835f0bc217a8
 AUX fix_ppc64el_FTBFS.patch 1305 BLAKE2B 9f20c5e91a47f3c88c15990d4ae77c423aa7832f7b95bfc66686751f9f2d8b9eef4ef6b7d73f7fe9296d5d04a154b0330f71000065f03412b440c010d44439e6 SHA512 d1a3f447037c4b7408fa20710989b262d37072c4e0552b74e3e25b673f3da4cb0280bbdccfe2e1c97eeb0b318b3923ad9a3d9afab17ba067e7b6755f33ad4f1d
-DIST gperftools-2.6.2.tar.gz 911811 BLAKE2B 1201185f3008f75b9db219e47658f5b34294f15d5cae5a9badbc2718d63e58c07e485e84f6af05bdd12398c7ab8af520db9f34f4b33b790b0276ba10fb945358 SHA512 2630687d98cdb7011b9b90ba65e337d74f7e1f7d44190edf5414d0898b906686e547e4bb08979f26fb16ca1ccc065a5a1022dee03539bb1ccdf136439eb99ec1
 DIST gperftools-2.7.tar.gz 916854 BLAKE2B d14c2b88f2986d3691d7184e1759de2066ca50224f745a6291ab2ebd5f7f985dec4916a1c01d61142eca9b64f3742c50b82e64118602afaa7b27ae2d94a4ed4d SHA512 4a8e72b960218b0615281b830b3f1a4a1b27830006c45ed68b1ffd152bb50a8b3beec850526e330e2ad08c28774bdc01dade9bcc3e7c9e26d30823cc55648d77
-EBUILD google-perftools-2.6.2.ebuild 2222 BLAKE2B 3a4bbffae09223f1bde0ac608a1a18d569bd6d1862431a24143b7e8d7fee24ffcc4784765735011975569a6d84acbaf6ee22afab4a656dff2faad2def164ca00 SHA512 60f1bcbe05561d9d91b51b314e56e46f81a862a7cc849e832c7e72d923be012569b184e4a49549db84edb85786327fe8e0f6827f28424afa482dcb85caf405c2
-EBUILD google-perftools-2.7-r1.ebuild 2373 BLAKE2B 95f86af58931aefc9f23db1674436e17a6d04e8f2063d819a44e91e912ff8beb6ae8f3a2592d74234a5b5760740f5cfda3a405f65bf31f30b39f2da99195ea93 SHA512 52d76bd7a90cc3ddd1e554d0640b922d4a07c007adc8144e08075f439973c73631ddd895c20d7633866552f26b98f2a6a3991bb5c0203620a4fdc93aa8219934
-MISC metadata.xml 955 BLAKE2B 55eb639ddb1563627f2d3dc6e899600f1ad13cd852c67aca96d1cf2d2f2a5b0df3bde4312d952fe37bb2ad15cefb48777252e96846bc0f88f734955fa1cb7e55 SHA512 b20602a04f497995155d79457ea37d3a7df01288c8da99989798f72a38f30f8796dd65a31422e7aa3062e0d7e0a209760fac5f78311570a6387bf006c044897a
+DIST gperftools-2.8.tar.gz 928379 BLAKE2B e94bac4153cb5d3170d6486a9065b56d631ab261d25b4a5a150f04f87f767c203508839daf400dbe06dc82e9e3da2988e4b4c74725c6be836fa9c70ed0576209 SHA512 c959ffa2b36ecfea10927b40b6dd668385cff7eab3c4bc2d7c5aed5f4de87ce8e4f9b30ab44652a0288badbb6c5aa7110c491b13c4030fb656609c2eb25918a8
+EBUILD google-perftools-2.7-r1.ebuild 2410 BLAKE2B 24f3d8e35ac243ed10d1be42498845a4c462158b56faa4a6c8ae3e18cf4d4ae4c326561d2407e702f9777d39e03b1b889efbf960c3ca64acf0cc118d735f5775 SHA512 fbb6a745414d0fc606a560cd86a9acb60f3b504a3c19128c26e96c8fab67b9ddd6b7138edbfd680f46d8e25662c7eb0c89cc07079a09f2bec1a2f0ae4feef11a
+EBUILD google-perftools-2.8.ebuild 2458 BLAKE2B 54871c3ba0c08bb28b18ee0aab24fca1ad455358d172f738cfee926c7290066b06ab2dc5f08c409eaa86d4b48345a2b4baa6b2db0168ca401185ba6427882bec SHA512 ba816192037a1a8bfad8b1d295fefd29da93ea06e4361c52227b120371d9cb0b5ec9da3f4861671f7ec8335c2811b058b77878553acb98dd7c8bc2d34f995c43
+MISC metadata.xml 1128 BLAKE2B 68fdc3c01ff36a8915e07fbfbead0d1c77522dcda726287603fc77807bf062794d6255c76f53acb1e68ff9c0db7dc2da07e69632480059a814240ceec69d3bd6 SHA512 42b5ba08a7a9b64141352a3c9465f0ecea9a58ef336ede3def57165697832b0ad5b1ac4798aeb37e3ecf3d2bcc5b53f9225f31039ab585eb37d4b59303d741d0
diff --git a/dev-util/google-perftools/files/2.8-musl-tests.patch b/dev-util/google-perftools/files/2.8-musl-tests.patch
new file mode 100644
index 000000000000..660099a6a88b
--- /dev/null
+++ b/dev-util/google-perftools/files/2.8-musl-tests.patch
@@ -0,0 +1,28 @@
+From 1d9b8bb59d5610f2c3e9faad6bbd91ceca17fb93 Mon Sep 17 00:00:00 2001
+From: Aliaksey Kandratsenka <alkondratenko@gmail.com>
+Date: Sat, 11 Jul 2020 20:33:40 -0700
+Subject: [PATCH] don't test sbrk hook if we're on linux and don't have __sbrk
+
+"mmap" hooks code for linux only hooks sbrk when __sbrk is
+defined. But musl doesn't offer this function (reasonably so), so
+sbrk hooking doesn't work there. Not big loss, but lets make sure
+tests don't fail.
+
+Lets reference this to issue #1198
+---
+ src/tests/tcmalloc_unittest.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/tests/tcmalloc_unittest.cc b/src/tests/tcmalloc_unittest.cc
+index d06c5a86..9d303433 100644
+--- a/src/tests/tcmalloc_unittest.cc
++++ b/src/tests/tcmalloc_unittest.cc
+@@ -1503,7 +1503,7 @@ static int RunAllTests(int argc, char** argv) {
+ 
+     // Test sbrk
+     SetSbrkHook();
+-#if defined(HAVE_SBRK) && defined(__linux) && \
++#if defined(HAVE___SBRK) && defined(__linux) && \
+        (defined(__i386__) || defined(__x86_64__))
+     p1 = sbrk(8192);
+     CHECK(p1 != NULL);
diff --git a/dev-util/google-perftools/google-perftools-2.7-r1.ebuild b/dev-util/google-perftools/google-perftools-2.7-r1.ebuild
index 9db41fc3dc0f..76dc02a2af33 100644
--- a/dev-util/google-perftools/google-perftools-2.7-r1.ebuild
+++ b/dev-util/google-perftools/google-perftools-2.7-r1.ebuild
@@ -25,7 +25,10 @@ RESTRICT="!test? ( test )"
 DEPEND="!ppc64? ( sys-libs/libunwind )"
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}"/fix_ppc64el_FTBFS.patch )
+PATCHES=(
+	"${FILESDIR}"/fix_ppc64el_FTBFS.patch
+	"${FILESDIR}/2.8-musl-tests.patch"
+)
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/dev-util/google-perftools/google-perftools-2.6.2.ebuild b/dev-util/google-perftools/google-perftools-2.8.ebuild
index 9d0679575689..b5cb254c7978 100644
--- a/dev-util/google-perftools/google-perftools-2.6.2.ebuild
+++ b/dev-util/google-perftools/google-perftools-2.8.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
+EAPI=7
 MY_P="gperftools-${PV}"
-inherit toolchain-funcs flag-o-matic vcs-snapshot autotools multilib-minimal
+
+inherit toolchain-funcs flag-o-matic autotools vcs-snapshot multilib-minimal
 
 DESCRIPTION="Fast, multi-threaded malloc() and nifty performance analysis tools"
 HOMEPAGE="https://github.com/gperftools/gperftools"
@@ -17,16 +17,20 @@ SLOT="0/4"
 # linux x86/amd64/ppc/ppc64/arm
 # OSX ppc/amd64
 # AIX ppc/ppc64
-KEYWORDS="-* amd64 arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="largepages +debug minimal optimisememory test static-libs"
+KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+IUSE="largepages largepages64k +debug minimal optimisememory test static-libs"
+
 RESTRICT="!test? ( test )"
 
-DEPEND="sys-libs/libunwind"
+DEPEND="!ppc64? ( sys-libs/libunwind )"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
-HTML_DOCS="docs"
+PATCHES=(
+	"${FILESDIR}/${PV}-musl-tests.patch"
+)
 
 pkg_setup() {
 	# set up the make options in here so that we can actually make use
@@ -48,6 +52,7 @@ src_prepare() {
 
 multilib_src_configure() {
 	use largepages && append-cppflags -DTCMALLOC_LARGE_PAGES
+	use largepages64k && append-cppflags -DTCMALLOC_LARGE_PAGES64K
 	use optimisememory && append-cppflags -DTCMALLOC_SMALL_BUT_SLOW
 	append-flags -fno-strict-aliasing -fno-omit-frame-pointer
 
@@ -82,3 +87,8 @@ src_install() {
 
 	multilib-minimal_src_install
 }
+
+multilib_src_install_all() {
+	einstalldocs
+	use static-libs || find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-util/google-perftools/metadata.xml b/dev-util/google-perftools/metadata.xml
index 64f38d90459e..b29352921cb9 100644
--- a/dev-util/google-perftools/metadata.xml
+++ b/dev-util/google-perftools/metadata.xml
@@ -11,6 +11,11 @@
 			memory usage, but should speed up the allocation/free
 			operations.
 		</flag>
+		<flag name="largepages64k">
+			Use (experimental) 64K pages for tcmalloc, this increases
+			memory usage, but should speed up the allocation/free
+			operations.
+		</flag>
 		<flag name="debug">
 			Build a set of libraries with debug support (so-called
 			debugalloc). These are available by default but are not needed
diff --git a/dev-util/gtk-doc-am/Manifest b/dev-util/gtk-doc-am/Manifest
index abb00bcbf83c..a3deb7e1093e 100644
--- a/dev-util/gtk-doc-am/Manifest
+++ b/dev-util/gtk-doc-am/Manifest
@@ -1,5 +1,3 @@
-DIST gtk-doc-1.25.tar.xz 673184 BLAKE2B 2468b70403c0334b52ce1bcb77d2015fe83e0af9fac861464db605de9744ec1c7300e9b9a4b4fe0a3641e016083df063d92e1b74e44771d7a88c66815a396765 SHA512 7ac8c73ab9f9ecb6a142bd2232450a6431c3e4fe2372ff40460145b5d0bcffa1953c8cf49436539db86c3a32461cbd4180c714cb19cdd68bfd557816b789339c
 DIST gtk-doc-1.32.tar.xz 762000 BLAKE2B e87b0ed5dffd04acc7569171343839a742a874438248546b1b85ca71102d5a546f41b450c5cedf54ecab5b7b6585a4dac36d7600b21b5cce491470a50f82d3b0 SHA512 6d28395968c2951f1685570e5778b5add76d1b9cff8fcb8632b200b3ba251602a1ea59b1def84fc28560988b87fc0dbbc6947af88d268db6ff23e9c28aea3b28
-EBUILD gtk-doc-am-1.25-r1.ebuild 1227 BLAKE2B ace0d550c2ebb0ff35b80242ba3dba196f0b0045d04b1584ca2b9832da02bf2c7c34d57cb82d98815ae1442824de9f8a9fda030f4826a2753264e498a3ad48cb SHA512 b43e74b4da2f9fc31ae02c117e1fba1d8d9ef809888a37a5b1d7d193009862d5b39ad5735d9ca8283ae7bf5e8258eb1c67ddb44b05bc216cc03ba4d8e752e97b
-EBUILD gtk-doc-am-1.32.ebuild 846 BLAKE2B 1c217bf21995fdd7bcda8e14ec2bcb4bf472b88b3021726e748df2515257e996a574125d7c98f82c41b91120d24a0d32fea17dfd83ff0ee9789f6d5fc48382c6 SHA512 b99e520e7e1573f70e678ff6ec8bf3825774edb8d091a8a7de28c7875d53e7c293cdbb7ecb978385efd7642db4a927cd83e5a32c9e2db303fecd590dd6a43092
+EBUILD gtk-doc-am-1.32.ebuild 845 BLAKE2B 044ea059ea4f541aec142d17fc65f30d6ed83fc3bceed2ad2025c02585d0e7f49787a78275ccdb3a90f3f067b71685e8e8717564cbc948d1a0213b9157f0d002 SHA512 734909caf4c8da99c292462b4360a14bb5af0665388465483f9619ebe79de3050f2e6ed0b12272be3e80b6ce2f6b300d9796804ba3143cfee37f5777f0120491
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/gtk-doc-am/gtk-doc-am-1.25-r1.ebuild b/dev-util/gtk-doc-am/gtk-doc-am-1.25-r1.ebuild
deleted file mode 100644
index d57b9d54a37f..000000000000
--- a/dev-util/gtk-doc-am/gtk-doc-am-1.25-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME_ORG_MODULE="gtk-doc"
-
-inherit gnome.org
-
-DESCRIPTION="Automake files from gtk-doc"
-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 ~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"
-
-RDEPEND=">=dev-lang/perl-5.18"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	!<dev-util/gtk-doc-${GNOME_ORG_PVP}
-"
-# This ebuild doesn't even compile anything, causing tests to fail when updating (bug #316071)
-RESTRICT="test"
-
-src_configure() {
-	# Duplicate autoconf checks so we don't have to call configure
-	local PERL=$(type -P perl)
-
-	test -n "${PERL}" || die "Perl not found!"
-	"${PERL}" -e "require v5.18.0" || die "perl >= 5.18.0 is required for gtk-doc"
-
-	# Replicate AC_SUBST
-	sed -e "s:@PERL@:${PERL}:g" -e "s:@VERSION@:${PV}:g" \
-		"${S}/gtkdoc-rebase.in" > "${S}/gtkdoc-rebase" || die "sed failed!"
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	dobin gtkdoc-rebase
-
-	insinto /usr/share/aclocal
-	doins gtk-doc.m4
-}
diff --git a/dev-util/gtk-doc-am/gtk-doc-am-1.32.ebuild b/dev-util/gtk-doc-am/gtk-doc-am-1.32.ebuild
index 4c848dbeb476..10c4538abc8a 100644
--- a/dev-util/gtk-doc-am/gtk-doc-am-1.32.ebuild
+++ b/dev-util/gtk-doc-am/gtk-doc-am-1.32.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 ~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"
+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"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/dev-util/gtk-doc/Manifest b/dev-util/gtk-doc/Manifest
index a22ceca77664..71aaaa04433f 100644
--- a/dev-util/gtk-doc/Manifest
+++ b/dev-util/gtk-doc/Manifest
@@ -1,7 +1,7 @@
+AUX 1.32-deprecation-parse-fixes.patch 7181 BLAKE2B e7415a1d8f9aad544581c8fc5d5b2e5c50dc3cb7830bee1c2ec6777006841488fa8b0c56b5b1fd92dad811ddb9a5b207a29d677114b0ba4e381a4b05c4a26dc8 SHA512 4c68a0d355e9fbbc6f36b5877da3f510e6b5fe184488117b7545a5b30a3b3730d05aa191fa414f341235d4e6199fb220d3b95169b5e8c7d495cdbc8d469f07c5
 AUX 61gtk-doc-gentoo.el 283 BLAKE2B 116d2b43d42b05130482c5bff7a10f13930a0d04f34874d25bfa6c61dc8920efe60ae615e6d54de1eeed87044a7232a992a37582d608b0756f0b099b5ee62d03 SHA512 d9e7c8bacd97a5147dbbe9ad568323356c9c38ad982ce88c63ef5f8e3955289274393a91e07d2159c082ac2a058455a1905c251ff3676f60bad596379fb12837
 AUX gtk-doc-1.8-emacs-keybindings.patch 582 BLAKE2B 9591f8f58dbd2c5897abf020f96a3ad8124830c274bfa581756ccaa43c67002264cc6d5a04c0316e4bb2dfa75a3cb08b5de6217a81a295b3a31e18dae8d1ad7d SHA512 360e97c0d2603c17dd1c1ca92739eb5ac229f3bcda6dc76267b95cac73db1008a52164ac9cba5a0e43f7b6359b5e6d3b242fde757fa1b7409051bade5f6f35a6
-DIST gtk-doc-1.25.tar.xz 673184 BLAKE2B 2468b70403c0334b52ce1bcb77d2015fe83e0af9fac861464db605de9744ec1c7300e9b9a4b4fe0a3641e016083df063d92e1b74e44771d7a88c66815a396765 SHA512 7ac8c73ab9f9ecb6a142bd2232450a6431c3e4fe2372ff40460145b5d0bcffa1953c8cf49436539db86c3a32461cbd4180c714cb19cdd68bfd557816b789339c
 DIST gtk-doc-1.32.tar.xz 762000 BLAKE2B e87b0ed5dffd04acc7569171343839a742a874438248546b1b85ca71102d5a546f41b450c5cedf54ecab5b7b6585a4dac36d7600b21b5cce491470a50f82d3b0 SHA512 6d28395968c2951f1685570e5778b5add76d1b9cff8fcb8632b200b3ba251602a1ea59b1def84fc28560988b87fc0dbbc6947af88d268db6ff23e9c28aea3b28
-EBUILD gtk-doc-1.25-r1.ebuild 2764 BLAKE2B c038d0737340ecc172d6bf11977b98ab45c22cfb36c412548c67f89e6b9fe09727a59100160bf9ff885b8e0453b84de9707cb6ed77cfb248ff6ce6bb6b585077 SHA512 95ac0021363d8b8bc6e0d9309f2d9c56d8ada1c8ba88ab75cad0f8ebfba66bebf5131745327867325dfbb66368f559e6f74c5e722083bbb21422c6c9ace4fef6
-EBUILD gtk-doc-1.32-r1.ebuild 2341 BLAKE2B 26e5e53ff697a2335131cd04382754e67b3f3a383051ba0ef7d4ed6acdc6f00c44ffc385f8d5d607b0162342ff98b8d45c91a7842ba805d78fbb55a207808b79 SHA512 d539edce95b307db14915083298e4aaa426bb0dfbc193c6039441520a197749b6a1bd3194034a258b0e84ec1c55b0394c898d5c972e4cad89807fd5435b2272f
-MISC metadata.xml 659 BLAKE2B 8c57567cad76724388d746e74bd1056a062c7280552494d6265b5fa38be518983188f22948bdb389916ec6384c17308e1ec292ec36f633b6ecd6f27102f74f94 SHA512 4ffcd239d0a5788ed94a204395a51d8b706663ac69139965e7d28282c473b55cd006cf3786a3cfd60386439f9ffa5d9242ed43ba05783962cbac002f8a00539b
+EBUILD gtk-doc-1.32-r1.ebuild 2340 BLAKE2B bd2c6091b9237fe011e29429bf7a515d3e9149667fd8e553319d04da49f0a8983dac1a3aebf0f5aa7df589e03398f1dcbb816fc3381cd10cf2f8da328e4afbd3 SHA512 e70e382d6f2f73de8a9205055f9766b1b18318c4707044c595f6ea8b4f75a53afe0f09c7cf5774a8820ec234f9b31196b2d1a2fa18be6cf6112cb35ea05f8368
+EBUILD gtk-doc-1.32-r2.ebuild 2557 BLAKE2B bcbe0aab1994af6361449636ac7a1736d609e7bcc7e201340d710ecdcbcab2737040bcc9ef5a10319b1840d30fc2392d7258628de32135d55ea789e9ae325516 SHA512 c7a13bcc30b4fb31bbd484446be1a2933cdc4138b37db9a20a0cbf5ea37123df746607431fc89f6169c28d4a6819a36a017648980479116da0301c5558f22e2c
+MISC metadata.xml 490 BLAKE2B 9b4d27b146f567501af858fd704d7713e8eea66caac0b5878d685814b48825f4222a6286acd3a8ec4d8e698ace318c52c74e301dc8eb3eec41bca3d83d24a130 SHA512 0d33e970b5924c264711c8a77aa966ff8f1e6cd2695d34088c0f9af825cd72603173e07e39fb6d6bd22098d76c048b3dc03dd83916b092f2c68c58f94aa95b7a
diff --git a/dev-util/gtk-doc/files/1.32-deprecation-parse-fixes.patch b/dev-util/gtk-doc/files/1.32-deprecation-parse-fixes.patch
new file mode 100644
index 000000000000..59f878cceac4
--- /dev/null
+++ b/dev-util/gtk-doc/files/1.32-deprecation-parse-fixes.patch
@@ -0,0 +1,180 @@
+From 2667d8cd95a2a29c35c1bb8f4629c22fd0aa98e9 Mon Sep 17 00:00:00 2001
+From: Xavier Claessens <xavier.claessens@collabora.com>
+Date: Thu, 2 Jan 2020 21:56:10 -0500
+Subject: [PATCH 1/3] Skip G_GNUC_(BEGIN|END)_IGNORE_DEPRECATIONS lines
+
+For some reason, glib has to put empty line before and after each of
+these lines otherwise the symbol following it is undeclared.
+---
+ gtkdoc/scan.py | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/gtkdoc/scan.py b/gtkdoc/scan.py
+index d04d4d4..7de08ad 100644
+--- a/gtkdoc/scan.py
++++ b/gtkdoc/scan.py
+@@ -561,6 +561,11 @@ def ScanHeaderContent(input_lines, decl_list, get_types, options):
+                     logging.info('Found start of comment: %s', line.strip())
+                 continue
+ 
++            # Skip begin/end deprecation macros.
++            m = re.search(r'^\s*G_GNUC_(BEGIN|END)_IGNORE_DEPRECATIONS', line)
++            if m:
++                continue
++
+             logging.info('no decl: %s', line.strip())
+ 
+             cm = [m.match(line) for m in CLINE_MATCHER]
+-- 
+2.20.1
+
+
+From 9e58548688c9768cf41c59ccef531d438ffb2504 Mon Sep 17 00:00:00 2001
+From: Xavier Claessens <xavier.claessens@collabora.com>
+Date: Fri, 3 Jan 2020 06:47:47 -0500
+Subject: [PATCH 2/3] typedef can be followed by decorator
+
+---
+ gtkdoc/scan.py | 30 +++++++++++++++++-------------
+ 1 file changed, 17 insertions(+), 13 deletions(-)
+
+diff --git a/gtkdoc/scan.py b/gtkdoc/scan.py
+index 7de08ad..5a5da92 100644
+--- a/gtkdoc/scan.py
++++ b/gtkdoc/scan.py
+@@ -96,19 +96,8 @@ CLINE_MATCHER = [
+         (struct|union)\s*
+         \w*\s*{""", re.VERBOSE),
+     # 12-14: OTHER TYPEDEFS
+-    re.compile(
+-        r"""^\s*typedef\s+
+-        (?:struct|union)\s+\w+[\s\*]+
+-        (\w+)                                # 1: name
+-        \s*;""", re.VERBOSE),
+-    re.compile(
+-        r"""^\s*
+-        (?:G_GNUC_EXTENSION\s+)?
+-        typedef\s+
+-        (.+[\s\*])                           # 1: e.g. 'unsigned int'
+-        (\w+)                                # 2: name
+-        (?:\s*\[[^\]]+\])*
+-        \s*;""", re.VERBOSE),
++    None,  # in InitScanner()
++    None,  # in InitScanner()
+     re.compile(r'^\s*typedef\s+'),
+     # 15: VARIABLES (extern'ed variables)
+     None,  # in InitScanner()
+@@ -267,6 +256,21 @@ def InitScanner(options):
+         %s                                   # 3: optional decorator
+         \s*;""" % optional_decorators_regex, re.VERBOSE)
+     # OTHER TYPEDEFS
++    CLINE_MATCHER[12] = re.compile(
++        r"""^\s*typedef\s+
++        (?:struct|union)\s+\w+[\s\*]+
++        (\w+)                                # 1: name
++        %s                                   # 2: optional decorator
++        \s*;""" % optional_decorators_regex, re.VERBOSE)
++    CLINE_MATCHER[13] = re.compile(
++        r"""^\s*
++        (?:G_GNUC_EXTENSION\s+)?
++        typedef\s+
++        (.+?[\s\*])                          # 1: e.g. 'unsigned int'
++        (\w+)                                # 2: name
++        (?:\s*\[[^\]]+\])*
++        %s                                   # 3: optional decorator
++        \s*;""" % optional_decorators_regex, re.VERBOSE)
+     CLINE_MATCHER[15] = re.compile(
+         r"""^\s*
+         (?:extern|[A-Za-z_]+VAR%s)\s+
+-- 
+2.20.1
+
+
+From 5bfe23f0257e1b4c6c9a4e3a2dbb180455f753f2 Mon Sep 17 00:00:00 2001
+From: Jason Crain <jason@inspiresomeone.us>
+Date: Mon, 6 Jan 2020 19:05:42 -0700
+Subject: [PATCH 3/3] scan: support deprecated struct members
+
+gcc allows deprecating members of structs. For example:
+
+struct data {
+  int x G_GNUC_DEPRECATED_FOR(replacement);
+};
+
+However, this currently causes the entire struct to be marked as
+deprecated and confuses mkdb because it doesn't understand the
+G_GNUC_DEPRECATED_FOR symbol.
+
+Fix this by having the whole struct only be marked as deprecated if the
+'_DEPRECATED' is after the closing bracket of the struct, similar to how
+it already does for enums, and having scan automatically remove all
+G_GNUC_* decorators from struct members, similar to how it already does
+for functions.
+---
+ gtkdoc/scan.py | 12 ++++++++++--
+ tests/scan.py  | 17 +++++++++++++++++
+ 2 files changed, 27 insertions(+), 2 deletions(-)
+
+diff --git a/gtkdoc/scan.py b/gtkdoc/scan.py
+index 5a5da92..6c6534a 100644
+--- a/gtkdoc/scan.py
++++ b/gtkdoc/scan.py
+@@ -538,7 +538,7 @@ def ScanHeaderContent(input_lines, decl_list, get_types, options):
+         # section (#endif /* XXX_DEPRECATED */
+         if deprecated_conditional_nest == 0 and '_DEPRECATED' in line:
+             m = re.search(r'^\s*#\s*(if*|define|endif)', line)
+-            if not (m or in_declaration == 'enum'):
++            if not (m or in_declaration == 'enum' or in_declaration == 'struct'):
+                 logging.info('Found deprecation annotation (decl: "%s"): "%s"',
+                              in_declaration, line.strip())
+                 deprecated_conditional_nest += 0.1
+@@ -953,9 +953,17 @@ def ScanHeaderContent(input_lines, decl_list, get_types, options):
+                     title = '<TITLE>%s</TITLE>' % objectname
+ 
+                 logging.info('Store struct: "%s"', symbol)
++                # Structs could contain deprecated members and that doesn't
++                # mean the whole struct is deprecated, so they are ignored when
++                # setting deprecated_conditional_nest above. Here we can check
++                # if the _DEPRECATED is between '}' and ';' which would mean
++                # the struct as a whole is deprecated.
++                if re.search(r'\n\s*\}.*_DEPRECATED.*;\s*$', decl):
++                    deprecated = '<DEPRECATED/>\n'
+                 if AddSymbolToList(slist, symbol):
+                     structsym = in_declaration.upper()
+-                    stripped_decl = re.sub('(%s)' % optional_decorators_regex, '', decl)
++                    regex = r'(?:\s+(?:G_GNUC_\w+(?:\(\w*\))?%s))' % ignore_decorators
++                    stripped_decl = re.sub(regex, '', decl)
+                     decl_list.append('<%s>\n<NAME>%s</NAME>\n%s%s</%s>\n' %
+                                      (structsym, symbol, deprecated, stripped_decl, structsym))
+                     if symbol in forward_decls:
+diff --git a/tests/scan.py b/tests/scan.py
+index ad63541..6d608b6 100755
+--- a/tests/scan.py
++++ b/tests/scan.py
+@@ -552,6 +552,23 @@ class ScanHeaderContentStructs(ScanHeaderContentTestCase):
+         slist, doc_comments = self.scanHeaderContent([header])
+         self.assertDecl('data', expected, slist)
+ 
++    def test_HandleDeprecatedMemberDecorator(self):
++        """Struct with deprecated members."""
++        header = textwrap.dedent("""\
++            struct data {
++              int x1 G_GNUC_DEPRECATED;
++              int x2 G_GNUC_DEPRECATED_FOR(replacement);
++            };""")
++        expected = textwrap.dedent("""\
++            struct data {
++              int x1;
++              int x2;
++            };""")
++        scan.InitScanner(self.options)
++        slist, doc_comments = self.scanHeaderContent(
++                header.splitlines(keepends=True))
++        self.assertDecl('data', expected, slist)
++
+ 
+ class ScanHeaderContentUnions(ScanHeaderContentTestCase):
+     """Test parsing of union declarations."""
+-- 
+2.20.1
+
diff --git a/dev-util/gtk-doc/gtk-doc-1.32-r1.ebuild b/dev-util/gtk-doc/gtk-doc-1.32-r1.ebuild
index 8d725f8fbcde..4abe6de1c034 100644
--- a/dev-util/gtk-doc/gtk-doc-1.32-r1.ebuild
+++ b/dev-util/gtk-doc/gtk-doc-1.32-r1.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-doc/gtk-doc-1.25-r1.ebuild b/dev-util/gtk-doc/gtk-doc-1.32-r2.ebuild
index 23d51c05ae3f..a434b00475f0 100644
--- a/dev-util/gtk-doc/gtk-doc-1.25-r1.ebuild
+++ b/dev-util/gtk-doc/gtk-doc-1.32-r2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit eutils elisp-common gnome2 python-single-r1 readme.gentoo-r1
 
@@ -11,16 +11,14 @@ 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 highlight test vim"
-RESTRICT="!test? ( test )"
+IUSE="debug doc emacs"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
 	${PYTHON_DEPS}
 	>=dev-libs/glib-2.6:2
-	>=dev-lang/perl-5.18
 	dev-libs/libxslt
 	>=dev-libs/libxml2-2.3.6:2
 	~app-text/docbook-xml-dtd-4.3
@@ -28,11 +26,9 @@ RDEPEND="
 	~app-text/docbook-sgml-dtd-3.0
 	>=app-text/docbook-dsssl-stylesheets-1.40
 	emacs? ( >=app-editors/emacs-23.1:* )
-	highlight? (
-		vim? ( || ( app-editors/vim app-editors/gvim ) )
-		!vim? ( dev-util/source-highlight )
-	)
-	test? ( sys-devel/bc )
+	$(python_gen_cond_dep '
+		dev-python/pygments[${PYTHON_MULTI_USEDEP}]
+	')
 "
 DEPEND="${RDEPEND}
 	~dev-util/gtk-doc-am-${PV}
@@ -40,6 +36,9 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 "
 
+# tests require unpackaged python module "anytree", and require java(fop) or tex(dblatex)
+RESTRICT="test"
+
 pkg_setup() {
 	DOC_CONTENTS="gtk-doc does no longer define global key bindings for Emacs.
 		You may set your own key bindings for \"gtk-doc-insert\" and
@@ -51,26 +50,17 @@ pkg_setup() {
 src_prepare() {
 	# Remove global Emacs keybindings, bug #184588
 	eapply "${FILESDIR}"/${PN}-1.8-emacs-keybindings.patch
-
-	# Apply upstream commit 1baf9a6, bug #646850
-	sed -e '1,/exit 1/s/exit 1/exit $1/' \
-		-i gtkdoc-mkpdf.in || die
+	# Fix dev-libs/glib[gtk-doc] doc generation tests by fixing stuff surrounding deprecations
+	# https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1488
+	eapply "${FILESDIR}"/${PV}-deprecation-parse-fixes.patch
 
 	gnome2_src_prepare
 }
 
 src_configure() {
-	local myconf
-	if use vim; then
-		myconf="${myconf} $(use_with highlight highlight vim)"
-	else
-		myconf="${myconf} $(use_with highlight highlight source-highlight)"
-	fi
-
 	gnome2_src_configure \
 		--with-xml-catalog="${EPREFIX}"/etc/xml/catalog \
-		$(use_enable debug) \
-		${myconf}
+		$(use_enable debug)
 }
 
 src_compile() {
@@ -83,9 +73,8 @@ src_install() {
 
 	python_fix_shebang "${ED}"/usr/bin/gtkdoc-depscan
 
-	# Don't install those files, they are in gtk-doc-am now
+	# Don't install this file, it's in gtk-doc-am now
 	rm "${ED}"/usr/share/aclocal/gtk-doc.m4 || die "failed to remove gtk-doc.m4"
-	rm "${ED}"/usr/bin/gtkdoc-rebase || die "failed to remove gtkdoc-rebase"
 
 	if use doc; then
 		docinto doc
@@ -101,10 +90,6 @@ src_install() {
 	fi
 }
 
-src_test() {
-	emake -j1 check
-}
-
 pkg_postinst() {
 	gnome2_pkg_postinst
 	if use emacs; then
diff --git a/dev-util/gtk-doc/metadata.xml b/dev-util/gtk-doc/metadata.xml
index 1a3871ad27fb..8c9b95e54348 100644
--- a/dev-util/gtk-doc/metadata.xml
+++ b/dev-util/gtk-doc/metadata.xml
@@ -5,11 +5,6 @@
 	<email>gnome@gentoo.org</email>
 	<name>Gentoo GNOME Desktop</name>
 </maintainer>
-<use>
-	<flag name="highlight">Enable source code highlighting</flag>
-	<flag name="vim">Enable source code highlighting through
-	<pkg>app-editors/vim</pkg></flag>
-</use>
 <longdescription lang="en">
 	GTK-Doc is used to document C code.
 	It is typically used to document the public API of libraries,
diff --git a/dev-util/gtk-update-icon-cache/Manifest b/dev-util/gtk-update-icon-cache/Manifest
index b16a056f13aa..2d6ffefd5beb 100644
--- a/dev-util/gtk-update-icon-cache/Manifest
+++ b/dev-util/gtk-update-icon-cache/Manifest
@@ -1,5 +1,7 @@
 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 897 BLAKE2B cd9f19dbdeb333e1872d0a7a2b4acd9f6051e0577dd81cd840d5e1e917f558f2ac93bb46f16df39442a1fb3a7d4f79d0f6032510ae1a5e0d421e931d37ba2ef6 SHA512 01b6d21fe354433e574ed12d598df809ac93fb6098a95e93935d8ecf7fde44b54565fdd1d7ec548779e83a70e7c45b33673d4a7ee286f1ebeb68626ccd0ef2e6
+EBUILD gtk-update-icon-cache-3.24.21.ebuild 903 BLAKE2B ee0545f00fea8535537acbdcefb75666308de4370e36e89aa1ddae46dd81442ea3f01db5ae511e1ce459aea94d4bd756811888072de25c678f219d922a520d94 SHA512 972dd1ab10307c5d4d60a0333bbd06fcb84847566ed3fe9395064074230fd93afccfd38eb9872bb9f110960135a064bf09a50b34888265c05e92c8a39fe0f35e
 MISC metadata.xml 647 BLAKE2B 2846e4ac0b5816fe7699b197958118535cac7092930d7b6ba63c23b126242102edd832d60b13baeed23bf8781babe1058f06fece732c4ecd58c9b01b621042ae SHA512 7301a9425528d65112ec9dd1eca7291473905493b1b550119c6984141b3b216c4f3825d3b2a395a8375aa8b481b29d841153bd279d593586d5ea7d77ce46d7d3
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
new file mode 100644
index 000000000000..4c02aa74fa1a
--- /dev/null
+++ b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.21.ebuild
@@ -0,0 +1,31 @@
+# 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/gyp/Manifest b/dev-util/gyp/Manifest
index ee7256a7c1f4..d9d89b990d6c 100644
--- a/dev-util/gyp/Manifest
+++ b/dev-util/gyp/Manifest
@@ -1,4 +1,4 @@
 DIST gyp-20170904022846.tar.xz 447608 BLAKE2B 41f0e28d04039358a9e4ec9628fe1d936d19748061ea882a4e47f2cb23549db3866c5281e102b8f95d6ed37cfe999e7342129a81333671ee42534fc53d2a0d0e SHA512 9336be1103048fe5f51f90fcb2a153bba7638e71e4b579c47b725db81ae4257a56a8f7dacddc936e627862ee6149a453f1c7f5bede633cbd3076e0fa2fce07a7
-EBUILD gyp-20170904022846-r1.ebuild 781 BLAKE2B 24eec3c49cbbc76040eca160424eb741f27dbe75d8bd5fff231af238a0c1ae005bbcca327848e2cdc7b2b1d02ed6d575e19898e907153b9f5d5e353e0977be1d SHA512 ff24a4714c3bebb065883d9ea66ef41a832e2848568adf531fd33c80bfd5ffe6bf06e2b4dcee34193567892a46f1d12791894a59a1bdd009b4cf0650c465b064
+EBUILD gyp-20170904022846-r1.ebuild 788 BLAKE2B 2fb14abe495c217952de94a24ba9a1d7e634dddd91139f3f20df2d97b5f78acd6fab936fe6839b92a02703889e8799aa32430713069ff86b3e092772ba887d51 SHA512 68912342b6876b7d5d3c8588fb15c19316353090da62b04aef730c06a9a706436bb8ed0d12134b2a63af709c2e5dfcdecc973fbb8760eac1e6cfb5a487a470ab
 EBUILD gyp-99999999999999.ebuild 839 BLAKE2B 23211f1919910dad238ec6c1bda075cf5fa738a8b1b4e0bc1ce5b9139f81d516d3a59dfa705f97815700c600416fffc21b6692c3a75507a7e9b9652b3a949bf0 SHA512 b80be2b5679e6c06c09264b711636593a19a709828bd0c4e4343d8784b56708c4165ffa51ea2e94b8e5d5f4518ee9a7161f00fb57f4bb4d4683ba84b80c21ae0
 MISC metadata.xml 415 BLAKE2B bee460235492c13da7eb83441f00a502d900c169b48c91802a8891f9856c5f87aa225e61d8efd90ac2aade3ec52a93db293e3927b73c9b9b2708f723370d8585 SHA512 378e53a81fa2177409ae4557c336ddfb62b8657bf2d756ae651011d5dc5e94604d52aece3cdda38fbd0f123d5a1f83b721ccee3ecc5870cc562670fd748631c9
diff --git a/dev-util/gyp/gyp-20170904022846-r1.ebuild b/dev-util/gyp/gyp-20170904022846-r1.ebuild
index 24cd176a09b9..4c94b7b218e3 100644
--- a/dev-util/gyp/gyp-20170904022846-r1.ebuild
+++ b/dev-util/gyp/gyp-20170904022846-r1.ebuild
@@ -23,7 +23,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 src_test() {
diff --git a/dev-util/idea-community/Manifest b/dev-util/idea-community/Manifest
index 7b15f3ebf878..5939ebf69d22 100644
--- a/dev-util/idea-community/Manifest
+++ b/dev-util/idea-community/Manifest
@@ -1,10 +1,12 @@
-DIST ideaIC-1.0.201.6668.121.tar.gz 524536881 BLAKE2B 645e7c0390d89d0e0f1710682a5608dc226154e83ea7368434cf5da61f73064467fe7884d90c13d0d33b8feb0a237ca83446a155a135e3884bdaeca5254191ae SHA512 e2688788188726e418cddeef2bf46a54e8b1bcf4770d7daf5b2ee0d1de7d5ab9c84fef0078622b17e884d9b9cb5b826873b4c120aaec3c592e18ee2ddca2c7f6
-DIST ideaIC-1.1.201.7223.91_20200507.tar.gz 529101163 BLAKE2B a8f7847c6fb673a58678f02c1933ee1d6a3a89946583c9488d30bbcb320c743694c5bd8a6d53f327ffdce602f93c92e6c17396af3ab4e235b24f28eaa77342ee SHA512 f272cc8ef90fb4c0ac5fba905caeb459e9657a0f4f643c8e19e5330812477acb57e558808d290ad6e9bfe9c5835d700b59546f57733310e629915c88b2533304
 DIST ideaIC-1.2.201.7846.76_20200507.tar.gz 529076492 BLAKE2B ec93303776324fca08db6e0a0e8058cdc4aa009852cf02beeb27193ea479845319f7b9a11983d56b10b31e280f4da5bfc6f43c802d42fa3c85d43ccbaa67a965 SHA512 59a6e87788dd0776ed11e882ae3f0b9e18f63d899602a4c576f946a7979d895a8750af20947f6273db8fde3fccce05cbd5b6bd4c0142450935d0abaace405679
+DIST ideaIC-1.3.201.8538.31.tar.gz 529511746 BLAKE2B d6eb9a4bc333136475432110ab767efd763d4631379f811a8b9ce70b415d621936630b1e0db55c90f572862176db40b50c76c34d1a179927d1ec7d234b6dc137 SHA512 34dcb365f0c1cd7362cd4660677e25b333557f1440b6835bf42ad365fc660849daf6733f09b1fc7aac8046752532c5a3f329656649708f629a812aa8989df50e
+DIST ideaIC-1.4.201.8743.12.tar.gz 529515629 BLAKE2B 68a14df3945d35e6b1d6780ffe9ce1a14f03289fab2770bb33960c4d6d880d5428c5fafea38ab5b22e8ab3b82abf1c92d438e77257a4f8ab3f11a3a32a9702b1 SHA512 6389c5aaa2c38dc3e920253318ac6989f57f72caef749cabda34551d1a6c235c831e9fe29078f3b92b6f6189ad90577b057396776d4d16b4ff46d096e283061d
+DIST ideaIC-2.202.6397.94.tar.gz 526710783 BLAKE2B 70ea95e09d2dcd3a09b8dbd35e4a86552800015d7f97a66d7144164bd5dc3ae40cb708e0b7541a274995cf026fa90ebbaae16967f4f4328206f653dbd16f0b76 SHA512 39a17494c31854d4dc7525af39f234cea18fcb112c1b05eeca4a0baa19069765cdc213691b5b379a4cfc05b0469e1a532ef0427955b8e1a10041db100d83b495
 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.1.0.201.6668.121.ebuild 4754 BLAKE2B e737eda8211926ecf893c02036c4df691fa46d530ec2f874d9ebd3540c0a386b82aea8292698f501f2951e6d0fe58c801221306cfe3f62f74ed144457cf50523 SHA512 f5dda7212751fd6895367c13604951d47481b054ccfd313a32b4969797b50f28a14aee04382ae650fbb02dea2af01e4d55e5bca1ed7d0eb7295d5f6e6d8d5c1d
-EBUILD idea-community-2020.1.1.201.7223.91-r2.ebuild 4626 BLAKE2B b1e6ee9900b72d2d8e269dbb3a57058ce0ea1345c087c109f14e91c16c4a21795aa2a9975154c5af7be65d091434b2b7bc5c6bb0212a3224f2cfe11f8155b8d3 SHA512 29695b8ad20ec9d14922c3b8fd33f75215f3c2af880f9ab605cb956bf0e1432a8014cc0b2b8216bb6a1464fc3dbafd8e584b915d49eeabb433692fe5a8daaf7f
 EBUILD idea-community-2020.1.2.201.7846.76.ebuild 4689 BLAKE2B 76ebcb168c22aa99bb66c9dea40ee73827457174ccd522fa9783e7ad2464f309813ac584734ad3910fb430a6ddc96896d53c750aa492bf921e5f4b4e41595d7d SHA512 50b38ae228d237ff975ecb824c585f8b97a024952d2cc5bdc02e2b45a7421831bcaa41c35472ac168151b4dedad9833eb25c6aedaa2169ef037ba1c6e5036f88
+EBUILD idea-community-2020.1.3.201.8538.31.ebuild 4693 BLAKE2B ac564614a230e6539459a2122d5ca9b9ce842697a06c44b4b10eef9cdab283a5e8967d39a40cf24c1ec2e1252f97d6569806aa3807aaca8c3a9f686aedf372e5 SHA512 e07f7c5957113f18a57281cfbe75c136b141c82d1ec6487cc0a1eb47f2b87c181f203111ae86505df7d5f2c73791ce03c68e48ae09916caf87188aa121656f7c
+EBUILD idea-community-2020.1.4.201.8743.12.ebuild 4693 BLAKE2B ac564614a230e6539459a2122d5ca9b9ce842697a06c44b4b10eef9cdab283a5e8967d39a40cf24c1ec2e1252f97d6569806aa3807aaca8c3a9f686aedf372e5 SHA512 e07f7c5957113f18a57281cfbe75c136b141c82d1ec6487cc0a1eb47f2b87c181f203111ae86505df7d5f2c73791ce03c68e48ae09916caf87188aa121656f7c
+EBUILD idea-community-2020.2.202.6397.94.ebuild 4693 BLAKE2B d325625d4804d5266b3c3e0582be84cb30fe70bec637aca319490692477064fd42adce9ab1419d9c64b521d0ba0f9d6420052cfb98a39f4c2b674eec99367e83 SHA512 608feb905e8c4898125910c834033e7f7b161f730edad005473be7522e16f1708727d9caf16dbfb35ef753341e8aed4e2235a778a1a7dd98c78718162e6c7ba8
 MISC metadata.xml 758 BLAKE2B ab45d0a8508bed2b64d02ca83d0aaffab9dfceb13a6a188accbb18f0648593ef1a9cfa03f375292b9858c05b17f003f4c6c2261b9d962ddaf679eebe7cea2eda SHA512 15ad0429ec342e939f3406e83b736ec9a273cb4ba33998a83584cee7af4ad0433a5a4758c8d01feb24efef51e4a4d9761db18d0bfc054bf9a0980ac8806eb459
diff --git a/dev-util/idea-community/idea-community-2020.1.0.201.6668.121.ebuild b/dev-util/idea-community/idea-community-2020.1.3.201.8538.31.ebuild
index b394855414db..97ec35a8801d 100644
--- a/dev-util/idea-community/idea-community-2020.1.0.201.6668.121.ebuild
+++ b/dev-util/idea-community/idea-community-2020.1.3.201.8538.31.ebuild
@@ -6,7 +6,7 @@ inherit eutils desktop
 
 SLOT="0"
 PV_STRING="$(ver_cut 2-6)"
-MY_PV="$(ver_cut 1-2)"
+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
@@ -20,11 +20,11 @@ JRE_VER="1483.37"
 if [[ "$(ver_cut 7)"x = "prex" ]]
 then
 	# upstream EAP
-	KEYWORDS=""
+	KEYWORDS="~arm64"
 	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${PV_STRING}.tar.gz"
 else
 	# upstream stable
-	KEYWORDS="~amd64 ~x86"
+	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 ) )
@@ -52,7 +52,7 @@ RDEPEND="${DEPEND}
 	>=virtual/jdk-1.7:*
 	dev-java/jansi-native
 	dev-libs/libdbusmenu
-	dev-util/lldb"
+	=dev-util/lldb-9*"
 BDEPEND="dev-util/patchelf"
 RESTRICT="splitdebug"
 S="${WORKDIR}/${MY_PN}-IC-$(ver_cut 4-6)"
@@ -61,12 +61,8 @@ QA_PREBUILT="opt/${PN}-${MY_PV}/*"
 
 # jbr11 binary doesn't unpack nicely into a single folder
 src_unpack() {
-	if use !jbr11 ; then
-		default_src_unpack
-	else
-		cd "${WORKDIR}"
-		unpack ${MY_PN}IC-${PV_STRING}.tar.gz
-		cd "${S}"
+	default_src_unpack
+	if use jbr11 ; then
 		mkdir jre64 && cd jre64 && unpack jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz
 	fi
 }
diff --git a/dev-util/idea-community/idea-community-2020.1.1.201.7223.91-r2.ebuild b/dev-util/idea-community/idea-community-2020.1.4.201.8743.12.ebuild
index 3cbd1755d15b..97ec35a8801d 100644
--- a/dev-util/idea-community/idea-community-2020.1.1.201.7223.91-r2.ebuild
+++ b/dev-util/idea-community/idea-community-2020.1.4.201.8743.12.ebuild
@@ -20,12 +20,12 @@ JRE_VER="1483.37"
 if [[ "$(ver_cut 7)"x = "prex" ]]
 then
 	# upstream EAP
-	KEYWORDS=""
+	KEYWORDS="~arm64"
 	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${PV_STRING}.tar.gz"
 else
 	# upstream stable
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${MY_PV}-no-jbr.tar.gz -> ${MY_PN}IC-${PV_STRING}_20200507.tar.gz
+	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 ) )"
@@ -52,7 +52,7 @@ RDEPEND="${DEPEND}
 	>=virtual/jdk-1.7:*
 	dev-java/jansi-native
 	dev-libs/libdbusmenu
-	dev-util/lldb"
+	=dev-util/lldb-9*"
 BDEPEND="dev-util/patchelf"
 RESTRICT="splitdebug"
 S="${WORKDIR}/${MY_PN}-IC-$(ver_cut 4-6)"
@@ -95,7 +95,7 @@ src_prepare() {
 		done
 	fi
 
-	patchelf --set-rpath '$ORIGIN' "${S}"/plugins/Kotlin/bin/linux/LLDBFrontend || die
+	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\\\\" \
diff --git a/dev-util/idea-community/idea-community-2020.2.202.6397.94.ebuild b/dev-util/idea-community/idea-community-2020.2.202.6397.94.ebuild
new file mode 100644
index 000000000000..bc1a221116ac
--- /dev/null
+++ b/dev-util/idea-community/idea-community-2020.2.202.6397.94.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-2)"
+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 3-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/intel-ocl-sdk/Manifest b/dev-util/intel-ocl-sdk/Manifest
index 9394e0e7c58d..b0c15225addc 100644
--- a/dev-util/intel-ocl-sdk/Manifest
+++ b/dev-util/intel-ocl-sdk/Manifest
@@ -1,6 +1,3 @@
-DIST intel_sdk_for_ocl_applications_2012_x64.tgz 28302946 BLAKE2B 991fe387c3bb0ce572db9bb6856141eedf8e3ba1b1d6f50e5ef9166047d610bbef49e72e44618d3761dc5cb828537a14dc7b66256968943238808a620a8533ef SHA512 6974dd67d8292400f1d0c80fd137f39290fe7dcab5146b9f0613ae48484f84e1b523f710dcc07c8600919ce01ab2dd91ab0e2d693e3723ffa9a744fcc52151dd
 DIST intel_sdk_for_ocl_applications_2014_ubuntu_4.4.0.117_x64.tgz 105808431 BLAKE2B 58b9bdf1979c070757beff7abaa2b16d43993e7dd4aeda05843facd556f25f3c695a6b2de4745890ce6b7b1a5cee1113b62ffae4059aad49a462d28d6d3461c3 SHA512 c0f65bf4d9b894f11076995744d32aef983e01b40472028e411c7be6b9117ef8b260b9abe46d6e936333aca525f98f81aaca2ab3e093ccefb09f525a3646d7e9
-EBUILD intel-ocl-sdk-2.0.31360.ebuild 1449 BLAKE2B cb0cc8870171f8eae58ce7acd3af4642c65836c71ae6ece4a58b7319e02b6e734c45c4acbc206048652b5145c3d41393f310e44652a6fa9757b9382d13115bd6 SHA512 63850e50ca33eb422e5ec9d401672188db6749fd70df2b6f99f6f09c8192c08655cc3726def1c35ff93486d9a6dfcddb656faa5cc7aa90a211538aac9aba7059
-EBUILD intel-ocl-sdk-4.4.0.117-r1.ebuild 2194 BLAKE2B 807b3d15f16547aa78f8391836cd2128dc838f4d8be70137e6f4831c3c41cf08ed372d05b866f3328b3582b7323c5a812ec8e1d4358c9f94fcfd417f3135c82f SHA512 d0f5af13de03b73ebc1aa35f7ac64f18b72087eee83e2f4911b375ce8d5140a0c492a776bfb86018a43a5c60a5252d744e6b2dbc1fc70d0c95b48b24858d4908
 EBUILD intel-ocl-sdk-4.4.0.117-r2.ebuild 2131 BLAKE2B 1d4c5b22e3cad945b429433b11ebad627ddf9e893f2d75ffa07b985b3fe757511e77e2c2aa5ba26f2f4738a9c97886d847d2e1e31a73abf6bad63aab5266bda7 SHA512 8d1bc5ca60546f2936225c4e746780eed603c1f663f0e13d926d9e76821c125cb7cabd794bf0f87705571026e2340ccf259ceb10a002c6eb7a209c242c0628bb
-MISC metadata.xml 670 BLAKE2B c3c011abaeab5730cfdc09bc89715eed709910246767fbe5b3c406189911e85ce4f2870740be95f6d1ecb9a0a3d9abeb932774de05742d275c77f1634c1754e9 SHA512 2ef3994dd0dc9ce67b02ea1d5bf5326a8dcbbe21c6a6c452376551cb803825c4cbb721b226c128bfb758b5fb6faf1d04f25c2be2929961888244f861543a78f6
+MISC metadata.xml 611 BLAKE2B ca21cce054fd665fcaf1f98df3e2562dc900b8afffd803af818e5d36541f330a4cba8b4bd1a3023a7c31c85ce9fdb3d063259d0e9979508aaf2a55a0d95d4eca SHA512 b1b403d2c7ab37dbe26dfb25ede8c7f9df69a641759b8db6b76fee9d9f28203a6b552f4a99df02a5aa74f0eaf25def03f65960fc9f8b24c5202f3f10d1c46a90
diff --git a/dev-util/intel-ocl-sdk/intel-ocl-sdk-2.0.31360.ebuild b/dev-util/intel-ocl-sdk/intel-ocl-sdk-2.0.31360.ebuild
deleted file mode 100644
index b2153e78d160..000000000000
--- a/dev-util/intel-ocl-sdk/intel-ocl-sdk-2.0.31360.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-MY_P=${PN//-/_}_2012_x64
-
-inherit rpm multilib
-
-INTEL_CL=usr/$(get_libdir)/OpenCL/vendors/intel/
-
-DESCRIPTION="Intel's implementation of the OpenCL standard optimized for Intel processors"
-HOMEPAGE="http://software.intel.com/en-us/articles/opencl-sdk/"
-SRC_URI="http://registrationcenter.intel.com/irc_nas/2563/intel_sdk_for_ocl_applications_2012_x64.tgz"
-
-LICENSE="Intel-SDP"
-SLOT="0"
-IUSE="tools"
-KEYWORDS="amd64 -x86"
-
-RDEPEND="app-eselect/eselect-opencl
-	dev-cpp/tbb
-	sys-process/numactl
-	tools? (
-		sys-devel/llvm
-		>=virtual/jre-1.6
-	)"
-DEPEND=""
-
-RESTRICT="bindist mirror"
-QA_EXECSTACK="${INTEL_CL/\//}libcpu_device.so
-	${INTEL_CL/\//}libOclCpuBackEnd.so
-	${INTEL_CL/\//}libtask_executor.so"
-QA_PREBUILT="${INTEL_CL}*"
-
-S=${WORKDIR}
-
-src_unpack() {
-	default
-	rpm_unpack ./${MY_P}.rpm
-}
-
-src_prepare() {
-	# Remove unnecessary and bundled stuff
-	rm -rf ${INTEL_CL}/{docs,version.txt,llc}
-	rm -f ${INTEL_CL}/libboost*.so
-	rm -f ${INTEL_CL}/libtbb*
-	if ! use tools; then
-		rm -rf usr/bin
-		rm -f ${INTEL_CL}/{ioc64,ioc.jar}
-		rm -f ${INTEL_CL}/libboost*
-	fi
-}
-
-src_install() {
-	doins -r etc
-
-	insinto ${INTEL_CL}
-	doins -r usr/include
-
-	insopts -m 755
-	newins usr/$(get_libdir)/libOpenCL.so libOpenCL.so.1
-	dosym libOpenCL.so.1 ${INTEL_CL}/libOpenCL.so
-
-	doins ${INTEL_CL}/*
-}
-
-pkg_postinst() {
-	eselect opencl set --use-old intel
-}
diff --git a/dev-util/intel-ocl-sdk/intel-ocl-sdk-4.4.0.117-r1.ebuild b/dev-util/intel-ocl-sdk/intel-ocl-sdk-4.4.0.117-r1.ebuild
deleted file mode 100644
index df63eebf81fe..000000000000
--- a/dev-util/intel-ocl-sdk/intel-ocl-sdk-4.4.0.117-r1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit rpm multilib
-
-DESCRIPTION="Intel's implementation of the OpenCL standard"
-HOMEPAGE="http://software.intel.com/en-us/articles/opencl-sdk/"
-SRC_URI="http://registrationcenter.intel.com/irc_nas/4181/intel_sdk_for_ocl_applications_2014_ubuntu_${PV}_x64.tgz"
-
-LICENSE="Intel-SDP"
-SLOT="0"
-IUSE="android +system-tbb system-clang +system-boost"
-KEYWORDS="-* ~amd64"
-RESTRICT="bindist mirror"
-
-RDEPEND="app-eselect/eselect-opencl
-	sys-process/numactl
-	system-tbb? ( >=dev-cpp/tbb-4.2.20131118 )
-	system-clang? ( =sys-devel/clang-3.4* )
-	system-boost? ( >=dev-libs/boost-1.52.0:= )
-"
-DEPEND=""
-
-S=${WORKDIR}/intel_sdk_for_ocl_applications_2014_ubuntu_${PV}_x64/
-INTEL_CL=opt/intel/opencl-1.2-${PV}
-INTEL_VENDOR_DIR=usr/$(get_libdir)/OpenCL/vendors/intel/
-
-QA_PREBUILT="${INTEL_OCL}/*"
-
-src_unpack() {
-	default
-
-	PKGS="base devel intel-cpu intel-devel"
-
-	use android && PKGS="$PKGS intel-devel-android"
-
-	for PKG in ${PKGS}; do
-		FILENAME="opencl-1.2-${PKG}-4.4.0.117-1.x86_64.deb"
-		einfo "Extracting \"${FILENAME}\"..."
-		ar x "${S}/$FILENAME" || die
-		unpack ./data.tar.gz
-	done
-}
-
-src_prepare() {
-	# Remove bundled stuff
-	if use system-boost; then
-		rm -f "${WORKDIR}/${INTEL_CL}"/lib64/libboost*.so*
-	fi
-	if use system-clang; then
-		rm -f "${WORKDIR}/${INTEL_CL}"/lib64/libclang*
-	fi
-	if use system-tbb; then
-		rm -f "${WORKDIR}/${INTEL_CL}"/lib64/libtbb*
-	fi
-}
-
-src_install() {
-	insinto /etc/OpenCL/vendors/
-	doins "${WORKDIR}/${INTEL_CL}"/etc/intel64.icd
-
-	insinto /"${INTEL_CL}"/lib64
-	insopts -m 755
-	doins "${WORKDIR}/${INTEL_CL}"/lib64/*
-
-	insinto /"${INTEL_CL}"/bin
-	doins "${WORKDIR}"/"${INTEL_CL}"/bin/*
-
-	# TODO put this somewhere
-	# doins ${INTEL_CL}/eclipse-plug-in/OpenCL_SDK_0.1.0.jar
-
-	dodir "${INTEL_VENDOR_DIR}"
-	dosym "/opt/intel/opencl-1.2-${PV}/lib64/libOpenCL.so"     "${INTEL_VENDOR_DIR}/libOpenCL.so"
-	dosym "/opt/intel/opencl-1.2-${PV}/lib64/libOpenCL.so.1"   "${INTEL_VENDOR_DIR}/libOpenCL.so.1"
-	dosym "/opt/intel/opencl-1.2-${PV}/lib64/libOpenCL.so.1.2" "${INTEL_VENDOR_DIR}/libOpenCL.so.1.2"
-}
-
-pkg_postinst() {
-	eselect opencl set --use-old intel
-}
diff --git a/dev-util/intel-ocl-sdk/metadata.xml b/dev-util/intel-ocl-sdk/metadata.xml
index 2b3e89f60bca..61f0f5718487 100644
--- a/dev-util/intel-ocl-sdk/metadata.xml
+++ b/dev-util/intel-ocl-sdk/metadata.xml
@@ -7,7 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name="android">Install android related files</flag>
-		<flag name="tools">Install Intel Offline Compiler</flag>
 		<flag name="system-boost">Use system boost (dev-libs/boost) instead of bundled one</flag>
 		<flag name="system-clang">Use system clang (sys-devel/clang) instead of bundled one</flag>
 		<flag name="system-tbb">Use system Thread Building Blocks (dev-cpp/tbb) instead of bundled one</flag>
diff --git a/dev-util/jenkins-bin/Manifest b/dev-util/jenkins-bin/Manifest
index 2c27f332b6ad..e573a7e98f78 100644
--- a/dev-util/jenkins-bin/Manifest
+++ b/dev-util/jenkins-bin/Manifest
@@ -3,8 +3,8 @@ 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.1.war 66437256 BLAKE2B 900f5616db3e4e1913e9e07f1d40951fdb0a467e2acd93441a52fed7d9f5961103c46b34627e0add76da11a3e4787535d0a47e5eee20a474f65c14b03fefe9a4 SHA512 1be1f1845de87316107469b9b7c4d0e1e6b0f014f495981f2ecc2ce3acbfd820275c187c61b3f9664ad2a61312e4504171c45edf05e1711bbf61554c5f3fd653
-DIST jenkins-bin-2.242.war 67003152 BLAKE2B cc20efde5196ed66af3cfb0b52404e35bf3954422734278ce2c3bfad5402c0f005579a1c406e519e8e04b28e3d0f26cff2d4fb5a40c2b722dd3a93d54cf86cb4 SHA512 22e138d4c3291b2885b9cb9db51e5dedcca13ca93a2fb8b11bd1dc81da981e9404717ff791fa2a1d9dd4530fb806e8cf9c79931cdb968723f02177fc00321f92
-EBUILD jenkins-bin-2.235.1.ebuild 1105 BLAKE2B 161bf3f0ad77e74702cfdd1db69cfaa54f6e267e814b358d3fdcac2ca5c7210410d1cf87d03a9e6f987d2ede8459d37f6bf352bc2a7fcd7f2167edf81542aff9 SHA512 d86e52237449bda33bc052d7b1dd3bc15306c4b771c485d34843973a7a7df6c0d0593ab156837cc64a018466222fd0c09bb331bb5c820807f5038300517e2283
-EBUILD jenkins-bin-2.242.ebuild 1098 BLAKE2B 0bfaac37afbe842e4e1a5572a0f56a77b4bc5915be4cb9a79cd7a56105562e8877c9686a2963c347c2feb06dea8e4aad271bcda9a9e50f17433485f189d39981 SHA512 381e5dd3c921892b0df7497fa6028ced0df8c84a2a0731142c01023cf2d63d60233f24f19e62d40699c606ea162210f54641b6742ad63d6a6c99bd29b24c0835
+DIST jenkins-bin-2.235.5.war 66477424 BLAKE2B d4917468af085358c98bd5cfe9c31232584a18a74d01e962d594dc2ea3db75d4efabf411dbf568837b56e8230d831f3c88ea4e54f1a965f570772265989a9be7 SHA512 2c9d720dfb87f68dc57e5b2b750d2cbeb24efe65decfee13f4e96b578d3b460e0e00e713a90ee9a32dc1e5c2976455f3598f1c023a279da50b0622284529487e
+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.252.ebuild 1098 BLAKE2B 0bfaac37afbe842e4e1a5572a0f56a77b4bc5915be4cb9a79cd7a56105562e8877c9686a2963c347c2feb06dea8e4aad271bcda9a9e50f17433485f189d39981 SHA512 381e5dd3c921892b0df7497fa6028ced0df8c84a2a0731142c01023cf2d63d60233f24f19e62d40699c606ea162210f54641b6742ad63d6a6c99bd29b24c0835
 MISC metadata.xml 397 BLAKE2B b1a7fd87c8d5857ab102ec3d3bf5830c26c6988bb97caf89018b05e159f038c9c3a092b4f35788929d05042ac5cfd694bd03a8381686b9472880d0d205a451cd SHA512 4087fd799f4019f09103fb32d7f120e74d94715205bcc66858d11b9457774acaed37f3ad97ca0328f4ec28230a409dcfb0cbaceec142eb0a5fd3241ca35f8810
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.235.1.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.235.5.ebuild
index 8ab8d5db213a..8ab8d5db213a 100644
--- a/dev-util/jenkins-bin/jenkins-bin-2.235.1.ebuild
+++ b/dev-util/jenkins-bin/jenkins-bin-2.235.5.ebuild
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.242.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.252.ebuild
index e3e0cd1a4eda..e3e0cd1a4eda 100644
--- a/dev-util/jenkins-bin/jenkins-bin-2.242.ebuild
+++ b/dev-util/jenkins-bin/jenkins-bin-2.252.ebuild
diff --git a/dev-util/kbuild/Manifest b/dev-util/kbuild/Manifest
index 4affac887947..2340a006c52e 100644
--- a/dev-util/kbuild/Manifest
+++ b/dev-util/kbuild/Manifest
@@ -1,9 +1,14 @@
 AUX kbuild-0.1.5-gentoo-docdir.patch 358 BLAKE2B 978d4081821098a4e035fdd41b801c72f297e24187d2681ff7aaa2b09fa0fed35ce780884bf1cf0b0ea4428a16402c20b14fcc0e918d7175b98f04e94ba74449 SHA512 468dd844de34867c7ccafabafab4d5870fcb63f38fcb8d53580787cf9600027db91cb5ad962862d6a654dcec2b58654cc62fd6146fb0903c1b2d2079a7016020
+AUX kbuild-0.1.9998.3407-glibc-2.32+.patch 1402 BLAKE2B 4dabbf9ccb5cd60aa7998d36a3766edc5a89992ae10606375774d4cf648478187ffa88aac9016b65acb77353b25d445c1f8b3f2cf17bc60106a9fcf83d2df7fe SHA512 fae4058b85da11fe8934323501193d2947e17e6b36baf83487c7543b0c6b7a4382682159d789a0f661f5cb346ed6e4b4609573255f3b5f244733049353497528
+AUX kbuild-0.1.9998.3407-gold.patch 590 BLAKE2B 654459b94017d4bacae37151c71d4b43b3d9a76d934a2a220bada87e0b96e2a8a13a6f446199eb5475faf604129966bcca6e3e34691e588df6b40fe65e4e4ded SHA512 3cf6827b482661704a8cdcdcf3152fa07d18c80a6e9cbe8979b732173f0127a5bc5009590c5cc155cdd11bed1e95d918835e697b6fecc1a1bc51127d2f13845f
+AUX kbuild-0.1.9998.3407-unknown_configure_opt.patch 697 BLAKE2B 5f974bc451a12f4b4c02656b501d07515c14499c53ee1fca00aec00cf28d6dd5faf690f262b79f34861a3bfd317a5bd37eb78cbeb61ce833d8117c2cd74e7813 SHA512 63435effcf109b40390574da09453314ffac109ffee79419cef81705b4f7ceb145f692c9a81b54dd0d58f69a1a6f80b9dc412baa5d416066f05300cc9eccc11e
 AUX kbuild-0.1.9998_pre20110817-kash-link-pthread.patch 296 BLAKE2B ffa7b0167e4a65c59510e20089a63d5c1949b5f14ce167725ee057d9ab75369758e491727d939a111de5bd63719b53a7744b08efe84d34cc81b4d7bba80a3522 SHA512 178da856a83631ca4d86a9b8c20e74b75b76426c177b87c26d4c4b3df86e72f3b6339e8f61948498ab9c4bf047119588f3df8ce78448160afa0840b2cf3aeabb
 AUX kbuild-0.1.9998_pre20120806-qa.patch 292 BLAKE2B 628ee52d1c147864dba48e37ae25a2ff9e82e38bc907f2771ee3599e9401b26e5b5d4e53a3958a4f8edb2a7c35794677bae141561cf515fd3587b9ac095a7bdd SHA512 2a311e2e79c1e85c3c2c26b3d187355167c237c334687494a8e532b84232340df44b0d896fe6638bf1a9d4ba1c5f1efb29978de3bac0490fe04f2e57f7fb1874
 AUX kbuild-0.1.9998_pre20171020-gold.patch 619 BLAKE2B e4bab6276b521752a60b94ae71f02b0963625eee06fddde79a4449a14fa235fc2dd5c7d8a450ce214dbabce9180c384f31cb2380e3fd49e8d987f56f7036a1fb SHA512 a9d084b34d8bcb431748c6c87679db764557fa2f141f4b942cfe44ca05040dc6eb7f923be89db87d6f35f8d141f3725240dff7502fc919716aa081cdb145d521
 AUX kbuild-unknown-configure-opt.patch 355 BLAKE2B 78c170c4d34d76a07925c08580245afef9859281c3d59cec1e675f19a2c3a86e9936773c62c78197d4d150ba8afd70ed7f100bcfa9fab950462224088d7aa2fa SHA512 26ae63facf7133be4fba606ad0b9488ea4c2ad2290a1e33a0f0c3283e0c8267eaae41bde6efaa52895b444178ec101a800ad580d2d85d0e69c56dc7db32b1105
 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 1735 BLAKE2B 9a88d0071cb3b1e58176cc217f8d775790d059ed621c0ac96335a78c8a6d4652a2257ab30123a2aa1a84361776971adc4c9319b0db4a9c5f1e0ed54c48dda1f8 SHA512 8e517e14e3a924432dc2a70845ac06067d520231a29ff77c3ec0cc7da38e8504b874f2101fb978fbcbbf4de1b4f3c81611ea220352fe15686a274ba82512b267
 EBUILD kbuild-9999.ebuild 1062 BLAKE2B 458a2dfe2a3b753783c49aeb819672e5c0d59858f5b67817b0544c56805d03cb3c75178c582981456e82909792f2fbf8e1873817cb94101076145c7388b2cbae SHA512 492ad0ab9e132b6379ce58eae3670114e1009cc32cf191869e153f4e72d52be17cf58347eaf4e39520909c463632d90d879860b6b361d0dd56568496e369f304
 MISC metadata.xml 251 BLAKE2B 2e2f0363feb3f8ad15ed8d2ef5130493f501acf64faf4fe567079d18a6066c0a1136f6c0cf53ba4ec854a38b5d4211e48e0a2ddac6677ca02266a3f993e36965 SHA512 0ccc4891c6c5de39cbe83d8391b0345611be252a2b1fedea6644ba1cfb283140a8250f32cd26b701db9c60d42782b214d03574592ef3b585bb15d2ffcb5f016e
diff --git a/dev-util/kbuild/files/kbuild-0.1.9998.3407-glibc-2.32+.patch b/dev-util/kbuild/files/kbuild-0.1.9998.3407-glibc-2.32+.patch
new file mode 100644
index 000000000000..68a39fc68deb
--- /dev/null
+++ b/dev-util/kbuild/files/kbuild-0.1.9998.3407-glibc-2.32+.patch
@@ -0,0 +1,59 @@
+http://trac.netlabs.org/kbuild/changeset?format=diff&new=3408&old=3407&new_path=%2Ftrunk&old_path=%2Ftrunk
+
+--- a/src/kash/jobs.c
++++ b/src/kash/jobs.c
+@@ -390,4 +390,5 @@
+ 				fmtstr(s + col, 16, "Done");
+ 		} else {
++			const char *pszSigNm;
+ #if JOBS
+ 			if (WIFSTOPPED(ps->status))
+@@ -397,6 +398,7 @@
+ 				st = WTERMSIG(ps->status);
+ 			st &= 0x7f;
+-			if (st < NSIG && sys_siglist[st])
+-				scopyn(sys_siglist[st], s + col, 32);
++			pszSigNm = st < NSIG ? strsignal(st) : NULL;
++			if (pszSigNm)
++				scopyn(pszSigNm, s + col, 32);
+ 			else
+ 				fmtstr(s + col, 16, "Signal %d", st);
+--- a/src/kash/shinstance.h
++++ b/src/kash/shinstance.h
+@@ -381,10 +381,6 @@
+ /*# define SIGBREAK         21 */
+ /*# define SIGABRT          22 */
+-
+-#   define sys_siglist      sys_signame
++const char *strsignal(int iSig);
+ #endif /* _MSC_VER */
+-#ifdef __sun__
+-#   define sys_siglist      _sys_siglist
+-#endif
+ #ifndef HAVE_SYS_SIGNAME
+ extern char sys_signame[NSIG][16];
+--- a/src/kash/sys_signame.c
++++ b/src/kash/sys_signame.c
+@@ -12,5 +12,5 @@
+ void init_sys_signame(void)
+ {
+-    unsigned i;
++	unsigned i;
+ 	if (sys_signame_initialized)
+ 		return;
+@@ -120,2 +120,14 @@
+ 	sys_signame_initialized = 1;
+ }
++
++#if defined(_MSC_VER)
++const char *strsignal(int iSig)
++{
++    if (!sys_signame_initialized)
++	init_sys_signame();
++    if (iSig < NSIG)
++	return sys_signame(iSig);
++    return NULL;
++}
++#endif
++
+ 
diff --git a/dev-util/kbuild/files/kbuild-0.1.9998.3407-gold.patch b/dev-util/kbuild/files/kbuild-0.1.9998.3407-gold.patch
new file mode 100644
index 000000000000..14d5ec7cc422
--- /dev/null
+++ b/dev-util/kbuild/files/kbuild-0.1.9998.3407-gold.patch
@@ -0,0 +1,11 @@
+--- kbuild-0.1.9998.3407/src/kmk/Makefile.kmk
++++ kbuild-0.1.9998.3407/src/kmk/Makefile.kmk
+@@ -60,7 +60,7 @@
+ ifneq ($(KBUILD_TARGET),os2)
+  TEMPLATE_BIN-KMK_INCS += glob
+ endif
+-TEMPLATE_BIN-KMK_LIBS = $(LIB_KUTIL) $(TEMPLATE_BIN-THREADED_LIBS) $(kmkmissing_1_TARGET) $(LIB_KUTIL)
++TEMPLATE_BIN-KMK_LIBS = $(LIB_KUTIL) $(TEMPLATE_BIN-THREADED_LIBS) $(kmkmissing_1_TARGET) $(LIB_KUTIL) pthread
+ ifdef ELECTRIC_HEAP # for electric heap (see electric.c).
+ ifeq ($(KBUILD_TARGET),win)
+  TEMPLATE_BIN-KMK_CFLAGS = $(TEMPLATE_BIN-THREADED_CFLAGS) /FI$(kmk_DEFPATH)/electric.h -DELECTRIC_HEAP=1
diff --git a/dev-util/kbuild/files/kbuild-0.1.9998.3407-unknown_configure_opt.patch b/dev-util/kbuild/files/kbuild-0.1.9998.3407-unknown_configure_opt.patch
new file mode 100644
index 000000000000..2714716b7806
--- /dev/null
+++ b/dev-util/kbuild/files/kbuild-0.1.9998.3407-unknown_configure_opt.patch
@@ -0,0 +1,20 @@
+--- kbuild-0.1.9998.3407/bootstrap.gmk
++++ kbuild-0.1.9998.3407/bootstrap.gmk
+@@ -151,7 +151,7 @@
+ $(OUTDIR)/kmk/ts-configured: \
+ 		$(OUTDIR)/kmk/ts-autoreconf \
+ 		$(OUTDIR)/kmk/fts.h
+-	cd $(OUTDIR)/kmk && $(SRCDIR)/src/kmk/configure --disable-load --without-guile
++	cd $(OUTDIR)/kmk && $(SRCDIR)/src/kmk/configure --disable-load
+ 	echo done > $@
+ 
+ ifeq ($(KBUILD_HOST),solaris)
+@@ -182,7 +182,7 @@
+ 	echo done > $@
+ 
+ $(OUTDIR)/sed/ts-configured: $(OUTDIR)/sed/ts-autoreconf
+-	cd $(OUTDIR)/sed && $(SRCDIR)/src/sed/configure --without-libintl --disable-nls
++	cd $(OUTDIR)/sed && $(SRCDIR)/src/sed/configure --disable-nls
+ 	echo done > $@
+ 
+ $(OUTDIR)/sed/config.h: $(OUTDIR)/sed/ts-configured
diff --git a/dev-util/kbuild/kbuild-0.1.9998.3407.ebuild b/dev-util/kbuild/kbuild-0.1.9998.3407.ebuild
new file mode 100644
index 000000000000..3c367b7ff0cd
--- /dev/null
+++ b/dev-util/kbuild/kbuild-0.1.9998.3407.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools toolchain-funcs
+
+MY_P="${P}-src"
+DESCRIPTION="A makefile framework for writing simple makefiles for complex tasks"
+HOMEPAGE="http://svn.netlabs.org/kbuild/wiki"
+#SRC_URI="ftp://ftp.netlabs.org/pub/${PN}/${MY_P}.tar.gz"
+SRC_URI="https://dev.gentoo.org/~polynomial-c/${MY_P}.tar.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# We cannot depend on virtual/yacc until bug #734354 has been fixed
+DEPEND="
+	sys-apps/texinfo
+	sys-devel/flex
+	sys-devel/gettext
+	|| (
+		dev-util/byacc
+		dev-util/yacc
+		<sys-devel/bison-3.7
+	)
+"
+RDEPEND=""
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.1.9998.3407-unknown_configure_opt.patch"
+	"${FILESDIR}/${PN}-0.1.5-gentoo-docdir.patch"
+	"${FILESDIR}/${PN}-0.1.9998_pre20120806-qa.patch"
+	"${FILESDIR}/${PN}-0.1.9998_pre20110817-kash-link-pthread.patch"
+	"${FILESDIR}/${PN}-0.1.9998.3407-gold.patch"
+	"${FILESDIR}/${PN}-0.1.9998.3407-glibc-2.32+.patch"
+)
+
+pkg_setup() {
+	# Package fails with distcc (bug #255371)
+	export DISTCC_DISABLE=1
+}
+
+src_prepare() {
+	default
+
+	# Add a file with the svn revision this package was pulled from
+	printf '%s\n' "KBUILD_SVN_REV := $(ver_cut 4)" \
+		> SvnInfo.kmk || die
+
+	cd "${S}/src/kmk" || die
+	eautoreconf
+	cd "${S}/src/sed" || die
+	eautoreconf
+
+	sed -e "s@_LDFLAGS\.$(tc-arch)*.*=@& ${LDFLAGS}@g" \
+		-i "${S}"/Config.kmk || die #332225
+	tc-export CC PKG_CONFIG RANLIB #AR does not work here
+}
+
+src_compile() {
+	kBuild/env.sh --full emake -f bootstrap.gmk AUTORECONF=true AR="$(tc-getAR)" \
+		|| die "bootstrap failed"
+}
+
+src_install() {
+	kBuild/env.sh kmk NIX_INSTALL_DIR=/usr PATH_INS="${D}" install \
+		|| die "install failed"
+}
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index 89c2bfd5118d..3255b9e3a18c 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -1,14 +1,13 @@
-DIST lldb-8.0.1.src.tar.xz 19586288 BLAKE2B afb20a8303dcbdaf76ef1d78aa3165f87713f1c16121905d7a5f71e770ceafdff40d9d19e0a983d9290da2d4eb3acd0987d50607bea17efdb7dc0127d7f5cf8a SHA512 eb031985ad4d08226ec47a90fe32c1e6d070948971ca5235fd431cf7d5b7ea20f5d5131237bf83a6419773d18c339590bf9672e7b4f884304497e63c1030988f
-DIST llvm-8.0.1.src.tar.xz 30477608 BLAKE2B 4319c837b36111401e3b0f9659b8d875c89463bcc7816df1aefe1e3ff989860bbaa92504718f8e15416cfd9f3491c13777cd5cb661877b237b342b0e515b93f5 SHA512 82e120be5cabdfd5111aebbea68a663fe229c8861d73802d6ab09a3bf48f60de333e07e61f8fb61beaa14ac2bea24fcd74fa6f761acaf62469f536b79fcb1e16
 DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
-DIST llvmorg-10.0.1-rc1.tar.gz 120834583 BLAKE2B 64244ebcb6f2c171c9f606e5eb0adff2794f06c9312a0ca627fb79c107c0c898ac242cf4e92523c3265fa717322601d7e3f4d178515fac95d03ee92312082b06 SHA512 f877f66046969a4055b166ad50ef876a9c8ecaf03e2cdd7c8e1a3348eb5f5180f222fa457b1f090a6660282a0d9f7a1d39cf09a04abe0dde0a6e1e10ccf15597
-DIST llvmorg-10.0.1-rc2.tar.gz 120883192 BLAKE2B d48f4ccb33691cd4997576a6d20b298455687515164f7d8dfa11ec32e197b58132c6bd549c1214c3b36982ef85e1018d4101e7afecee8d2ab67ad15d68c681bf SHA512 8e363d379a73e38ef570fb03d8243a21f37a48ef579a0f08118af4dac48060c0dc24e2bd8175f04241fa424e49b6c85723d2d3552bbe30dd165fe5fb43493325
+DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
+DIST llvmorg-11.0.0-rc1.tar.gz 122688246 BLAKE2B 10ff3f08ff3780abb1d86ac67942e6aac52ff5daf820a2e3d23d8b79dbade1c5b1d398d0a577028d2d7c8759ab9a8b552a0305b5750310a015585c06cdadf844 SHA512 09564ed903902a5795fffaa4679badc30bf49739889a48074b5ae2c93bd29000cfb36a650208d5cae5d74899bade066f84b4aa023fc852eec246ff67bf64a267
+DIST llvmorg-11.0.0-rc2.tar.gz 122728230 BLAKE2B 7944adf41ec7cd82489666a0a38a857de628879d59a2e3bb566b67c18500092430db66ff214d45cb324128c874a74a72c367b452df3b88ec95b33c284dd35512 SHA512 25eb2879eb22e79a1e840ef24cf3f5eec602e947101db299393e06e3d09f2d1531eef214264636e1b511eafff7f51b1834d5a03976ccd088eb680745b147e9f3
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
-EBUILD lldb-10.0.0.ebuild 2480 BLAKE2B daa5bae4bf1258a4593943b436190db4c48a3ecc57d47edca4aaf97a02a26ccf659c128cf81d57a40ff70a57d67a86528f514c94c07bf743c4b798de22abfc18 SHA512 2e4ae8ca404ff56cede68fcbca2ab712fcedd8f903f959f0cfc7bc3ac5867c4df3099f0ae129ee527a94ae34768d60522539f7efbe2d10a8e8273e80f667876f
-EBUILD lldb-10.0.1.9999.ebuild 2295 BLAKE2B a3e876ca7ae4f0c1278848003cd69ac2b72ba643fede6abfd3ca1ef93243e12ace24a4fbf46315b7e39362f9404ea57aeeaea1d521ea3ca1d453a13f14711d03 SHA512 9e907448f9a3ac8e92fefcb09444214c9b5a27b5217b8fee74f5ffe90abd82530b9ff53fd19b6f2398d336e7c6573387b520bba0d28a00bb664df9f4795007a5
-EBUILD lldb-10.0.1_rc1.ebuild 2295 BLAKE2B a3e876ca7ae4f0c1278848003cd69ac2b72ba643fede6abfd3ca1ef93243e12ace24a4fbf46315b7e39362f9404ea57aeeaea1d521ea3ca1d453a13f14711d03 SHA512 9e907448f9a3ac8e92fefcb09444214c9b5a27b5217b8fee74f5ffe90abd82530b9ff53fd19b6f2398d336e7c6573387b520bba0d28a00bb664df9f4795007a5
-EBUILD lldb-10.0.1_rc2.ebuild 2295 BLAKE2B a3e876ca7ae4f0c1278848003cd69ac2b72ba643fede6abfd3ca1ef93243e12ace24a4fbf46315b7e39362f9404ea57aeeaea1d521ea3ca1d453a13f14711d03 SHA512 9e907448f9a3ac8e92fefcb09444214c9b5a27b5217b8fee74f5ffe90abd82530b9ff53fd19b6f2398d336e7c6573387b520bba0d28a00bb664df9f4795007a5
+EBUILD lldb-10.0.0.ebuild 2477 BLAKE2B 21be1f15644d0c00a5c9fb21d0874b2784116b16a36190947b1df9d4a962a9cefae2e386c741b91b3e60709e1cb8fa8d8327f38c310198641a0c91aaecda9d0b SHA512 61bff2bfcdb91f14c8a4f70b59136df0b39fbdc86aa43e090f116e11e8e03ff0af15d3ca0b0ae7dfd516207e3457b670f08c1cf4198ecd979c5e1c2b4f7fb117
+EBUILD lldb-10.0.1.ebuild 2318 BLAKE2B 7a51d8537d244c152098e46d4b617b42257260f96eba07bffc58b36c15caa3f73295eeb2f7791bc0cc75fdf39dcf3ea62095ce7a5925326afc9d0b077c23ded3 SHA512 ecbef89dccf5f747ab3e48c76deb223e3fd00ced89f2b8abbbd413cd963d60932aa18134a967f7c7ddd6e38d33b44de182edd93b37297ee9297a5d78779394c6
 EBUILD lldb-11.0.0.9999.ebuild 2295 BLAKE2B a3e876ca7ae4f0c1278848003cd69ac2b72ba643fede6abfd3ca1ef93243e12ace24a4fbf46315b7e39362f9404ea57aeeaea1d521ea3ca1d453a13f14711d03 SHA512 9e907448f9a3ac8e92fefcb09444214c9b5a27b5217b8fee74f5ffe90abd82530b9ff53fd19b6f2398d336e7c6573387b520bba0d28a00bb664df9f4795007a5
-EBUILD lldb-8.0.1-r1.ebuild 3161 BLAKE2B 02f7f7c7461fed05baa15f6621ed8c32f669182395356a30e407582e74a63cf99b0d3b9c03031a976ea0b7734d3c61c64019b463ef68f315ae936ce679ceec77 SHA512 0a28c0147d2c37dc13dec96401f2d6e670db601735343c9befef24bf9626476a0effe715161703e4250066128c78b97b3f5e1ba5d6e67392b6cdacc0dd42dbfe
+EBUILD lldb-11.0.0_rc1.ebuild 2295 BLAKE2B a3e876ca7ae4f0c1278848003cd69ac2b72ba643fede6abfd3ca1ef93243e12ace24a4fbf46315b7e39362f9404ea57aeeaea1d521ea3ca1d453a13f14711d03 SHA512 9e907448f9a3ac8e92fefcb09444214c9b5a27b5217b8fee74f5ffe90abd82530b9ff53fd19b6f2398d336e7c6573387b520bba0d28a00bb664df9f4795007a5
+EBUILD lldb-11.0.0_rc2.ebuild 2295 BLAKE2B a3e876ca7ae4f0c1278848003cd69ac2b72ba643fede6abfd3ca1ef93243e12ace24a4fbf46315b7e39362f9404ea57aeeaea1d521ea3ca1d453a13f14711d03 SHA512 9e907448f9a3ac8e92fefcb09444214c9b5a27b5217b8fee74f5ffe90abd82530b9ff53fd19b6f2398d336e7c6573387b520bba0d28a00bb664df9f4795007a5
+EBUILD lldb-12.0.0.9999.ebuild 2295 BLAKE2B a3e876ca7ae4f0c1278848003cd69ac2b72ba643fede6abfd3ca1ef93243e12ace24a4fbf46315b7e39362f9404ea57aeeaea1d521ea3ca1d453a13f14711d03 SHA512 9e907448f9a3ac8e92fefcb09444214c9b5a27b5217b8fee74f5ffe90abd82530b9ff53fd19b6f2398d336e7c6573387b520bba0d28a00bb664df9f4795007a5
 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.0.ebuild b/dev-util/lldb/lldb-10.0.0.ebuild
index deb734360d5b..950cb52a4b4f 100644
--- a/dev-util/lldb/lldb-10.0.0.ebuild
+++ b/dev-util/lldb/lldb-10.0.0.ebuild
@@ -15,7 +15,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-10.0.1.ebuild b/dev-util/lldb/lldb-10.0.1.ebuild
new file mode 100644
index 000000000000..5b1f9a525b5e
--- /dev/null
+++ b/dev-util/lldb/lldb-10.0.1.ebuild
@@ -0,0 +1,96 @@
+# 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="~amd64 ~arm ~arm64 ~x86"
+IUSE="libedit lzma ncurses +python test"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	libedit? ( dev-libs/libedit:0= )
+	lzma? ( app-arch/xz-utils:= )
+	ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
+	python? (
+		$(python_gen_cond_dep '
+			dev-python/six[${PYTHON_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
+	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-10.0.1.9999.ebuild b/dev-util/lldb/lldb-11.0.0_rc1.ebuild
index 2dfe01834ca3..2dfe01834ca3 100644
--- a/dev-util/lldb/lldb-10.0.1.9999.ebuild
+++ b/dev-util/lldb/lldb-11.0.0_rc1.ebuild
diff --git a/dev-util/lldb/lldb-10.0.1_rc1.ebuild b/dev-util/lldb/lldb-11.0.0_rc2.ebuild
index 2dfe01834ca3..2dfe01834ca3 100644
--- a/dev-util/lldb/lldb-10.0.1_rc1.ebuild
+++ b/dev-util/lldb/lldb-11.0.0_rc2.ebuild
diff --git a/dev-util/lldb/lldb-10.0.1_rc2.ebuild b/dev-util/lldb/lldb-12.0.0.9999.ebuild
index 2dfe01834ca3..2dfe01834ca3 100644
--- a/dev-util/lldb/lldb-10.0.1_rc2.ebuild
+++ b/dev-util/lldb/lldb-12.0.0.9999.ebuild
diff --git a/dev-util/lldb/lldb-8.0.1-r1.ebuild b/dev-util/lldb/lldb-8.0.1-r1.ebuild
deleted file mode 100644
index fa7d98390e6e..000000000000
--- a/dev-util/lldb/lldb-8.0.1-r1.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-# (needed due to CMAKE_BUILD_TYPE != Gentoo)
-CMAKE_MIN_VERSION=3.7.0-r1
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils llvm multiprocessing python-single-r1 \
-	toolchain-funcs
-
-MY_P=${P/_/}.src
-LLVM_P=llvm-${PV/_/}.src
-
-DESCRIPTION="The LLVM debugger"
-HOMEPAGE="https://llvm.org/"
-SRC_URI="https://github.com/llvm/llvm-project/releases/download/llvmorg-${PV}/${MY_P}.tar.xz
-	test? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-${PV}/${LLVM_P}.tar.xz )"
-
-LICENSE="UoI-NCSA"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 x86"
-IUSE="libedit ncurses +python test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	libedit? ( dev-libs/libedit:0= )
-	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}
-	python? ( >=dev-lang/swig-3.0.11 )
-	test? (
-		$(python_gen_cond_dep "
-			~dev-python/lit-${PV}[\${PYTHON_MULTI_USEDEP}]
-		")
-	)
-	${PYTHON_DEPS}"
-
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-S=${WORKDIR}/${MY_P}
-
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	einfo "Unpacking ${MY_P}.tar.xz ..."
-	tar -xf "${DISTDIR}/${MY_P}.tar.xz" || die
-
-	if use test; then
-		einfo "Unpacking parts of ${LLVM_P}.tar.xz ..."
-		tar -xf "${DISTDIR}/${LLVM_P}.tar.xz" \
-			"${LLVM_P}"/{lib/Testing/Support,utils/unittest} || die
-		mv "${LLVM_P}" llvm || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLLDB_DISABLE_CURSES=$(usex !ncurses)
-		-DLLDB_DISABLE_LIBEDIT=$(usex !libedit)
-		-DLLDB_DISABLE_PYTHON=$(usex !python)
-		-DLLDB_USE_SYSTEM_SIX=1
-		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
-
-		-DLLDB_INCLUDE_TESTS=$(usex test)
-
-		# 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_C_COMPILER="$(type -P clang)"
-		-DLLDB_TEST_CXX_COMPILER="$(type -P clang++)"
-
-		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
-		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-		-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	cmake-utils_src_make check-lldb-lit
-	use python && cmake-utils_src_make check-lldb
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# oh my...
-	if use python; then
-		# remove custom readline.so for now
-		# TODO: figure out how to deal with it
-		# upstream is basically building a custom readline.so with -ledit
-		# to avoid symbol collisions between readline and libedit...
-		rm "${D}$(python_get_sitedir)/readline.so" || die
-
-		# byte-compile the modules
-		python_optimize
-	fi
-}
diff --git a/dev-util/lttng-modules/Manifest b/dev-util/lttng-modules/Manifest
index 9d04511cf28d..6b98037edf5a 100644
--- a/dev-util/lttng-modules/Manifest
+++ b/dev-util/lttng-modules/Manifest
@@ -1,7 +1,7 @@
 DIST lttng-modules-2.10.12.tar.bz2 306825 BLAKE2B 9f71f3102094e905bdbfc7d17888452d940f035e7c1dcaf70c004c927c976a029f9272809bf89e37cba2b62375a51cbbdcf9664b364cc14339ed58e0c5c9681f SHA512 f0f39af2308eb557ba344dc38285dd2199b54a53f92c06fad756ed853ce76c1b75e41d04b9259fc97962d9473e93132871c0e5168ca45f80cfb474d73aff2963
 DIST lttng-modules-2.11.0.tar.bz2 315192 BLAKE2B a56d2847ab48760a1fa41545a69b5c855723c71dda488b3af9555cab6b3744db98fdb7650bca74c88a36549dfefbf40c8e75390557cce5e43ace5615bfe7430a SHA512 549f78bc192bdf4e39a912d45a6918519c5c29bdda3bee0b4f7172c6c2d83c887b669dd8e17a8a5d0c17b5dde57aa6eb5087dfac3a103ccf1e5017be2d038379
 DIST lttng-modules-2.7.1.tar.bz2 297555 BLAKE2B 910720692b8801efd0335963fe8fc504bc9cd08ad772be1418c63f5c3f8aaf8c25aa7d49e0503bd355da64a9441302f14eb0b1a58fc8e76e0c2770b1c4ecb256 SHA512 77609c7b7bc0a8315dd4c635c1be2d84cc1a946438323b362bd25cfcd97f2cf9655aefdbca8b96fceb61db7b733219251d2f9f2e1a46c7534c5d1c622c03b744
-EBUILD lttng-modules-2.10.12.ebuild 1011 BLAKE2B 0f2f773116ce79394a7e49be3c8ecb88efb33cf9c5d92939285999ee32e110673d0593a6ab28e267428cad622099da2d1216f4e6665021a0f4b4a99c78e3fe74 SHA512 f3b5b55fd7cf4812744ca331d1dc958b3ccd5746da05770bc12db727df51c6296cfec9b2e3561cfa6d909eafc243cb6a5c73e1d25e6403aa00e6e8bd4f0f1d14
-EBUILD lttng-modules-2.11.0.ebuild 1011 BLAKE2B 0f2f773116ce79394a7e49be3c8ecb88efb33cf9c5d92939285999ee32e110673d0593a6ab28e267428cad622099da2d1216f4e6665021a0f4b4a99c78e3fe74 SHA512 f3b5b55fd7cf4812744ca331d1dc958b3ccd5746da05770bc12db727df51c6296cfec9b2e3561cfa6d909eafc243cb6a5c73e1d25e6403aa00e6e8bd4f0f1d14
-EBUILD lttng-modules-2.7.1.ebuild 963 BLAKE2B 8fb536297fb7132eea88d65c5ad1ccd3735c8b4f029dcccabb29aff0e93d0ec5d14b8880cd9e9c51107ea5d17454241b25a4a1276b3c3d2aae3c49b69f286d0e SHA512 5f051784283f3967573f5a48dffe7037a727a3936e333e963a9c7a9c7edf5b00cdf42646c7e3ec991ee7ee05da4811e5a492e8ae8056b87a6368a01a38005546
+EBUILD lttng-modules-2.10.12-r1.ebuild 1011 BLAKE2B 0f2f773116ce79394a7e49be3c8ecb88efb33cf9c5d92939285999ee32e110673d0593a6ab28e267428cad622099da2d1216f4e6665021a0f4b4a99c78e3fe74 SHA512 f3b5b55fd7cf4812744ca331d1dc958b3ccd5746da05770bc12db727df51c6296cfec9b2e3561cfa6d909eafc243cb6a5c73e1d25e6403aa00e6e8bd4f0f1d14
+EBUILD lttng-modules-2.11.0-r1.ebuild 1011 BLAKE2B 0f2f773116ce79394a7e49be3c8ecb88efb33cf9c5d92939285999ee32e110673d0593a6ab28e267428cad622099da2d1216f4e6665021a0f4b4a99c78e3fe74 SHA512 f3b5b55fd7cf4812744ca331d1dc958b3ccd5746da05770bc12db727df51c6296cfec9b2e3561cfa6d909eafc243cb6a5c73e1d25e6403aa00e6e8bd4f0f1d14
+EBUILD lttng-modules-2.7.1-r1.ebuild 963 BLAKE2B 8fb536297fb7132eea88d65c5ad1ccd3735c8b4f029dcccabb29aff0e93d0ec5d14b8880cd9e9c51107ea5d17454241b25a4a1276b3c3d2aae3c49b69f286d0e SHA512 5f051784283f3967573f5a48dffe7037a727a3936e333e963a9c7a9c7edf5b00cdf42646c7e3ec991ee7ee05da4811e5a492e8ae8056b87a6368a01a38005546
 MISC metadata.xml 695 BLAKE2B 958048b1eb1c07437cc982fd344eda9eb0928ebb4f136517838caa934383480d7ade6f6f000c10b36ebdca33c4ca0879644806a522ef3a991cf2fe0d3635a6bb SHA512 04c53b397e1a57634fca43761c76031f4c19299c15a0e639964de526691ad90c81326f7bfcf42afe1073830c66600b653165a752381c983a021478e112f8b6f8
diff --git a/dev-util/lttng-modules/lttng-modules-2.10.12.ebuild b/dev-util/lttng-modules/lttng-modules-2.10.12-r1.ebuild
index f0f18137d959..f0f18137d959 100644
--- a/dev-util/lttng-modules/lttng-modules-2.10.12.ebuild
+++ b/dev-util/lttng-modules/lttng-modules-2.10.12-r1.ebuild
diff --git a/dev-util/lttng-modules/lttng-modules-2.11.0.ebuild b/dev-util/lttng-modules/lttng-modules-2.11.0-r1.ebuild
index f0f18137d959..f0f18137d959 100644
--- a/dev-util/lttng-modules/lttng-modules-2.11.0.ebuild
+++ b/dev-util/lttng-modules/lttng-modules-2.11.0-r1.ebuild
diff --git a/dev-util/lttng-modules/lttng-modules-2.7.1.ebuild b/dev-util/lttng-modules/lttng-modules-2.7.1-r1.ebuild
index 340f7a869567..340f7a869567 100644
--- a/dev-util/lttng-modules/lttng-modules-2.7.1.ebuild
+++ b/dev-util/lttng-modules/lttng-modules-2.7.1-r1.ebuild
diff --git a/dev-util/lttng-ust/Manifest b/dev-util/lttng-ust/Manifest
index 2fc460ac6713..9dc55a369e1d 100644
--- a/dev-util/lttng-ust/Manifest
+++ b/dev-util/lttng-ust/Manifest
@@ -4,7 +4,7 @@ DIST lttng-ust-2.11.0.tar.bz2 824285 BLAKE2B 161d50282a95cce47ab3811216241ade73e
 DIST lttng-ust-2.7.1.tar.bz2 643906 BLAKE2B 2ef4be03ce3b2bcc8e781c2b6e798ee00bb85d7f7039ad34fc49b3bfda46142d65fc98d19fefefb3e375e6f0de95292a1e15de25318b2da62b51d9fb017b43a1 SHA512 80ba4b79df2a0ba0606a31145a427c8c5b30e2a4ace20f9e4602738ace99fe88146569de549288ff33c809a606b6973c17c3effcf9699b5dca3383b8da5b10ee
 DIST lttng-ust-2.8.1.tar.bz2 743271 BLAKE2B d6adac00525ab747306288dd71f27ce982dd93e4ff42b9938064ae1435ad1c0867acebe3030a33748dc9aa78b6200ba2c47631e4359a963772fc4685472d21ae SHA512 15c459620cb73ef5be8c7df2ef02663ef650555b973a3d1ed976ae38068b53a8c83143a611bcb53e91a3f211361c44cd2a331cb41dd53d28a69924f7ac44cc95
 EBUILD lttng-ust-2.10.6.ebuild 631 BLAKE2B 5152ec21ce38221c5ac845b5a5b7fe1d0408b2c84f564145b5b71fa868ec9c129bcd91868b138d9328e46e0ae3177b90678276b74bdcbdd07a37a463a8edb3a7 SHA512 ff342925629a70af6feb62eb11126f12f5c49d64d28ca98d26c2938d97c5187cfb2e05a7d7f60fc1c479ade9faa45f7b59d81eb867e52bb93b66cf0cd8e51e5e
-EBUILD lttng-ust-2.11.0.ebuild 759 BLAKE2B 709a839fbcdb57d7c7d2ef91aeebaf5c4733c378c9e68f335c0ac4faf83e3e7fb8d486b4fb3b9c4874c2072242355700ab1ee821761eea7be6a716775530037e SHA512 f618c8f91c9af5c1f3b69e47bfc734d2b84ef4b606a78ccef23675d5c0df00daf1f81f1659983f68a8170c8c3d8ffce47b8062af1944a302de6101e984224867
+EBUILD lttng-ust-2.11.0.ebuild 766 BLAKE2B a4fab5bd37c7f5e35c895a1d82e2b9c991259ddb37f0f9f48a68f58907e6b9b5829f7e8b461c32883a7e9049b21129fa0f391a5b08891c994750ecb5d84492c8 SHA512 d928f25eaed1b5dda4f26886bc1d0fb3a1923b34fa21e3112a48f28c2fd82607313a0b654c2f366bf505cc6e823a46634df20fa748467a3041b0f1dca8b05c0f
 EBUILD lttng-ust-2.7.1.ebuild 633 BLAKE2B 646b4940625af6ab525b2b3e5cb1736f1235cc87d9aac55e36f2766922dc1d74cad537d74f203a343ac8378aad49dc2de63412cf253780a305f468fd65794787 SHA512 ab93a93b6f670d1e7d1d4f1def1ac3710b141167d62b0c450716cdab0a47b6cde6731ea3162c94a6d58399a6d7aa5afcde26c224d1faca3599e74a65ee700cd3
 EBUILD lttng-ust-2.8.1.ebuild 660 BLAKE2B 430d2052ce40c58a00a2b8b32cb43f793f9adc2488a90f073dcdfb1ee6daf1f575a398c08b6070ec7f7e94a776322cccefd69693ac25736a011a44c79f2ea240 SHA512 0dd349fb6bd5a1892e6bfa3c4436347250a2931b9390dcdc06bb121ce2dabf5b96c3fe88d13005acfd4ffa558248edd1426b25eeef310773249dcb76fb3f768c
 MISC metadata.xml 700 BLAKE2B 868502f60e5fe09cbd2a2abd0794920341ccb496eaf2b1bbeaf377c0d894b35e950f79636e334ec910dd3ea0e3f2a205eb849b3bb2eaf17c1b7851e630a186fe SHA512 dda0af06ba5f4c5cf8b01aa61989c910acb58ff96b0e50f23f43f8d1932194a954bd3e1ae38ef052e4ad4d32dd025a082fea1de739ca1d9e4a2f60bf8ecbcae4
diff --git a/dev-util/lttng-ust/lttng-ust-2.11.0.ebuild b/dev-util/lttng-ust/lttng-ust-2.11.0.ebuild
index 3b23a277cc2d..224f06a6fe9e 100644
--- a/dev-util/lttng-ust/lttng-ust-2.11.0.ebuild
+++ b/dev-util/lttng-ust/lttng-ust-2.11.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://lttng.org/files/${PN}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0/${MY_SLOT}"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
 IUSE="examples numa"
 
 DEPEND="
diff --git a/dev-util/lxqt-build-tools/Manifest b/dev-util/lxqt-build-tools/Manifest
index 01ca1c276db3..951af615275a 100644
--- a/dev-util/lxqt-build-tools/Manifest
+++ b/dev-util/lxqt-build-tools/Manifest
@@ -1,5 +1,3 @@
-DIST lxqt-build-tools-0.6.0.tar.xz 22520 BLAKE2B 99e8032e111f776708d0a84e65db6534f517e75803d2cf747618889dccc46e9d55caa0ba3c89c88d56143a69ced015df9f1eae68a34c7ea050c6f97aedcf0f33 SHA512 f95c47d40f26defa8bc4e13a0449428945c282cb5e2201610e9529bfd5154a438ee9dcc4f556bd76efe13b97533bbed2f49ab5c100225907781093094a692227
 DIST lxqt-build-tools-0.7.0.tar.xz 24436 BLAKE2B b3bc9a62c530e682cff5412400d0fb14958d6aabddaef8c76b0073b01d356a9e7b227436428a3810f6b442dd77e57f4efb080a4902261679ad2c7898cf3098cb SHA512 7b6fd30e6ae8355ae36be55f8f7d47d78f507c11ebd9cbdd1d2ce5f14db68b845ad0bb8ca05fa1122bfd4c41f6dc792dff5100dcb8e61167517c3704527c7cde
-EBUILD lxqt-build-tools-0.6.0.ebuild 516 BLAKE2B 383ed3c5009bcd653e6a6f53b8de624b7b91c7ed2873c4fb5e26e57710efd1b4920aecc0542f453be7ee36f3af777f1b6414aeb7667239a171859f23b55045cb SHA512 c1eefa590d6ec6f29585e608aca2d43a962688bb06f3fe4b432bbe011a75a8d16cb7d38a7828aede1ce2c0881d22b1690c066ceacedcfe0d0bfc64aa8528ad75
-EBUILD lxqt-build-tools-0.7.0.ebuild 523 BLAKE2B 4ed1b96274339d24add91d6de7e2b6a07a57de60281abb6ef79a06e6f416dbc0aa17522d0ab300633114c6c9c968ee11fbd14179ad4e6469b7b0d1b44c3f30a8 SHA512 40e6ac6134676eec50e89eab19fe24eea7e085caadcc866d8091254530045ac2f9cc6079f7cf2e6126892ea8cc5189fafd1d54291364bd244fe696fe227a1fce
+EBUILD lxqt-build-tools-0.7.0.ebuild 521 BLAKE2B eb7b9f78ca0768842c4bf5cab81eb36e03a83f12212d87544afdbe2c3281478449c1abf0f464ad1243fb9362302ff6f8650c0720d9ee8448b40b996e30fa39a7 SHA512 f09c1e84e0f31a3732596bc641ebd165f2dcb0785be533c31c8db54b49ef8a9ab564b3c0f14e0c34c3a33308997cab10c814fcd478fef521f4a2157acc51f753
 MISC metadata.xml 322 BLAKE2B 8b119aeafbe57841b2e072a7a009dd20383a752d6cce052c5b2e6c98c2341baad6e74fbb8798ffbf5c17719a37ff4d25efda922fcc32bf851b82e520af69777b SHA512 ffd6f030759c5c9e6f2aa42550a0de265550a03872c7b11c12ac4429a7dd1c3cbdb7cb470238273a313e9fcddbc5072b7dc4909811c4ab7609c0acc2e385a948
diff --git a/dev-util/lxqt-build-tools/lxqt-build-tools-0.6.0.ebuild b/dev-util/lxqt-build-tools/lxqt-build-tools-0.6.0.ebuild
deleted file mode 100644
index cf8658d489cb..000000000000
--- a/dev-util/lxqt-build-tools/lxqt-build-tools-0.6.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# 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://downloads.lxqt.org/downloads/${PN}/${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/lxqt-build-tools/lxqt-build-tools-0.7.0.ebuild b/dev-util/lxqt-build-tools/lxqt-build-tools-0.7.0.ebuild
index ce1e2b0aad19..7656e424fc90 100644
--- a/dev-util/lxqt-build-tools/lxqt-build-tools-0.7.0.ebuild
+++ b/dev-util/lxqt-build-tools/lxqt-build-tools-0.7.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	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"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc64 x86"
 fi
 
 LICENSE="BSD"
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index dfebf7a8ad6c..95b46799c7bb 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -1,19 +1,12 @@
-AUX 0.52.1-test_pkgconfig_gen_deps.patch 1688 BLAKE2B f228e1d721449611799606cfb3aabcd3f347b0776a0f25dcf3b1abcfa6b5eb0506cb9e5b4069dfd9008a0c11569db9a50885c9edf59e1f4a129e6f571921bbed SHA512 4720834226b88661d7b631f1739c6ae48ebabd1604081380e143ab420e78236db7bc3141f5adc68aa03c6c074d1ed415ac515b351bd34c1d4dbbdbf1492cd5ef
-AUX 0.53.1-remove-asan-ld_preload.patch 946 BLAKE2B 2f43446f853b5233c7c959e0216eadae9d190efd4743a138afae73d42f082499793b4688e2419cb3ef38fe7c5e7f29b472e8a27e9ce8701c28f83f390f55dddd SHA512 50b7b4c269d186e3c2274297f04dae46484af4f2f090bef3fc42dfbecab94d8a91b31c27369cf40a52c7ce71cf96d9bc22601739b6e886c6c710f0665c2ef311
-AUX 0.53.1-remove-asan.patch 842 BLAKE2B 02864bbd41dd16d3e9e8e7ce9e9ef604f2fc6babd26958a4364147d392d56d8a87baec41fb009389a5fc989067019c6de89d1e2c82043ba7df463e32c99f885c SHA512 4abf8088832a1a9336fdffe04bc91a1fbab7363b72c5a1d14b22f408ea25f180d6526f8d6b3a2866a819f1895c93035869fff799da36b5040b8fb89a65ab0e23
 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.52.1.tar.gz 1507764 BLAKE2B 8daf43d84186905d5c32629ab6a250955bdffda502d2d79f991111d0ae7e3a21b3f9bc09ef5258f709eee4e17b09c6f09e7685a72153efcf8daaaec2645eef8a SHA512 fea3e85191782999de3a9431ec1d2cfacea32cf9598205443855042dca50ddac92eb3e74be4dd6a62bd80a606b73e76a04877b2c8efb275d9de5f87e3f9f8f41
-DIST meson-0.53.1.tar.gz 1552121 BLAKE2B 3f0bbbeba6307397dfe5e49c1f978d6246d8e18317d0361b6f013f5c2ba55ad7cba53c985418686c20db159b7790b45a0c2e05d86f861cd0280fb07afdbeb847 SHA512 0c96c354bcd7e6945473c7df0ddff929ef2bae9c2dfc7b48c6c6174c7f2be4f798398929f9c4d5986aa5fc882305ff76371ad0d65a499f058b33b05ff7025859
-DIST meson-0.54.0.tar.gz 1683491 BLAKE2B 3016beb44c4401672947afa898253b69769f998e18e00baedc3bcb525a9923b9154d7db79cfa4c38fcf66eeaee8137f47917689fdde33674b1f0483b21923393 SHA512 e3c97ffd9409a543e45c8be7b12d4e8437de8dbd0cd236fbe092952d7d0833728d46ff6b679c8a73dae4c4016fdf38b43b56f3959a95968a29db109ebfe254e7
-DIST meson-0.54.1.tar.gz 1687532 BLAKE2B 5bd355b35a4aa037e490615629480a194c04821fb18b137f090af89f6c33c700d0756bb2d7e9e608ecf4873886be10493bfeddce55fef3d905793ad3ccccfa68 SHA512 dbc3fed326ba208f5a6eee7e3106d07450e7a3569d425013fba8c51e7cfd6485f9b083836dc74be49bc9839bd640ce54741d9335097cbd28f6a320d5fec7ecfe
 DIST meson-0.54.2.tar.gz 1691270 BLAKE2B c1ba552b5d56e0b6b73de46ec6bc90fb520665688d2f5c809baf84749d3bb1dec1fe0131136e1539369fa666ae2427c8fccd5928cbda0b8e3e1edb4a5dc8abbc SHA512 ad5ec826879d3d85088ca40d768599a4c8e66983f2a6a7ebe8ab12051cad18b4ade9a2afd30fe543b0a75900822992c8ef7161d369489e2211dd7a1a8ccc32ed
 DIST meson-0.54.3.tar.gz 1690919 BLAKE2B 5d71731fb33397f470e2440d4d45f828d28d56351843a35b575f8b386f0b1c90faf654289e22ba7c2c4bf6c3be72d3dc8a2257d4a688bcbf9a1f2522394e7728 SHA512 2e62bf992bf337ae5a01f7a0fb842ea0cefcdbc81f5675235e41d8182f37df2e003b0a8a90d650c6cca4ff79898f7888474f75e5103a48d7ca14f51a024e4f2b
-EBUILD meson-0.52.1.ebuild 2101 BLAKE2B 5e6eaaf5c081f0749530b4a69971993e7f926ab69e8fc9f239fddb01c12f42fdc5c788736a3707746b286fdedfcd9dd3b59617bc0a794718c16f6cfbe7fc5ce3 SHA512 88a1a8256211fac613752fdfe62fc9d8f666ef7f7dac7a536ac2312357c7bea6a55316dd7e9f81e810c5d10654afc61a3b62ecd59eeeb01a786b335d1b92fc57
-EBUILD meson-0.53.1.ebuild 1981 BLAKE2B ae5dbc32f30a50456ad7bb5780b248e494c22838ba34846141551e206b20ceffcfb3c40908dd17814cdeacac2713b1f4dce69392257b9c12dd3bcc8eab18d697 SHA512 dab0953fc1fd408130d00b2c36fad8a292c0c3e8a1e3b3b97aa675522fd6aa56e9f884f39165ebcc8547d30253250a9e63a7cf922653c1bef569717d51f3f0e2
-EBUILD meson-0.54.0.ebuild 1544 BLAKE2B b326f8d159b8e75dd38300046fb7ce718335dc1717735ea0a41754f5331a0d9613260b736603f8d0194e88878cf3c34dfa18f076ed031c5f51bbbc9897465c63 SHA512 8fd2b4c23c6ace8021c0c267472b5bafc4a64092ea5fab222f1d637927769626e3d5f72f40446dba8603abda0e49a5ae88aac912df49a0d70cc8e5fae097f025
-EBUILD meson-0.54.1.ebuild 2036 BLAKE2B 23f30ffed174af8155f3a1e6cb761d085f1a8688df6137368752bac79fc57fbb6475310d6f2893beefe3754849bd579bdf50d17e4c2052ff3c9c7507f85f0cc8 SHA512 80949c24c9395631fb8c6b60a75df0360707deb3a2052449f47f9908f793b22d632b6881349278f72f9d820c52985f569719d2bbcfdf135d0ec0fbaaef65bba0
+DIST meson-0.55.0.tar.gz 1742882 BLAKE2B 5ca2c6a881a9db72532849e66a52315273033188531a446ae3571faa37d6f698562e1dbd91770156c0c959e06cc7ba62a9ff274cf0d1745e3849435418755723 SHA512 bf2a5bab19deb433e363bf569527dbd1a9e8c0f77482aa077abbaa480dadc396e43148957473a31ecd9d3965578d2f7b7dc8808839c619ae2c0d419aed72d4e2
+DIST meson-0.55.1.tar.gz 1740517 BLAKE2B faec7973d00e13d82268f04b4dd28888d5196df72db1a63c388d23e03195fe18f54207a7f62dd920f53b6001e08e036950db391656d7074ef90df76b93bcfee3 SHA512 172b4de8c7474d709f172431b89bf2b2b1c2c38bc842039cccf6be075a45bd3509a1dab8512bc5b2ee025d65d8050d2f717dd15c1f9be17fca3b2e7da0d3e889
 EBUILD meson-0.54.2.ebuild 2338 BLAKE2B f2cfb920c655509b00c6c5639fc772a049ea37e1f362e8ec84bef7d5920cb4b4be7e9048d02d38597ab8b0f60afecf589b6f290828f2f456bd237379f4a21067 SHA512 193e2c013adc68da916b0cc57650131757adc2e33c5d91e3db689e6af4ccb386d0c1f669f2a2f402bc062a3adb990baacbfc36560c5185205bdb54ae8956e783
-EBUILD meson-0.54.3.ebuild 2347 BLAKE2B 8e12969d4c7aed7050ea6cb1016cded8c7fcd42bc3b84a5f197006f71f21db310ef34fc62a9ae88a8ba861a828cda73e18d143d4e73bdc9453a76344191543a0 SHA512 ba232f75d4409a55aca941093a96bc36e7ca9794a3761d8084c1728a6f07602a5f934ed7cfdafbddd80e36f00af009fef87e015eb74ce1833168a8a26e08ecaf
-EBUILD meson-9999.ebuild 2291 BLAKE2B dd136009f68b5aab380a5edcfb23b2950262bf4fe31cad2f6a64c699da387b67b3eb7fe1bf81a8fe54cfdda5dc48516f30ec137bdce5b88cd5e58b0884de0964 SHA512 3ddb12fa7defc9faa69136bc95f2f9526e79e48828072f79879162dff4e29da6184cf5ba7951fb5354b970cef3fcd20a6c67b371a6b3b5f0342e2ae2041e9fe3
+EBUILD meson-0.54.3.ebuild 2410 BLAKE2B f7110eaa51d30fd218f599fd06001c29c9783ac9d041f545b1b3d90bd3f226978bf4a5ea55bd0916032f60e88270266968634edaffd833cd46a2e6f71af67e63 SHA512 f9a06b026528c843b0b96f99c9a0576d2d79f321564663f8a6ad8364c41c89f1fe2402b5420296906a11f9520b870a3bae61dc7e83cc1e8e3c029242dcb269b5
+EBUILD meson-0.55.0.ebuild 2286 BLAKE2B 278d16f6f840de9f634f4c8b74b71fb67916b2f89513454c038969a277437bb2db84653345facd71bceefbc70c05a85c526a905646bd9fb88019108e8c5ffbc4 SHA512 fb6207e6e33c2630d29b13fcd044ea2c86843c0802867c0e8c7313e8c2f6c5b8e1464b8409374ff75b0011fa14dc61c325c451efa468399da9d2b6691b8fb58b
+EBUILD meson-0.55.1.ebuild 2286 BLAKE2B 278d16f6f840de9f634f4c8b74b71fb67916b2f89513454c038969a277437bb2db84653345facd71bceefbc70c05a85c526a905646bd9fb88019108e8c5ffbc4 SHA512 fb6207e6e33c2630d29b13fcd044ea2c86843c0802867c0e8c7313e8c2f6c5b8e1464b8409374ff75b0011fa14dc61c325c451efa468399da9d2b6691b8fb58b
+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.52.1-test_pkgconfig_gen_deps.patch b/dev-util/meson/files/0.52.1-test_pkgconfig_gen_deps.patch
deleted file mode 100644
index ec753e00230a..000000000000
--- a/dev-util/meson/files/0.52.1-test_pkgconfig_gen_deps.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 1ce668f9163e1c912382eeb0e6ae40d123c0cca9 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Mon, 13 Jan 2020 23:46:09 -0500
-Subject: [PATCH] test_pkgconfig_gen_deps: set
- PKG_CONFIG_SYSTEM_LIBRARY_PATH=/usr/lib
-
-pkgconf automatically prunes "system library paths" from its output. The
-system library paths depend on the system toolchain. A common value on a
-64-bit system is as follows:
-
-/lib64:/usr/lib64:/usr/local/lib64
-
-So, if -L/usr/lib64 appears in the Libs section, it will be pruned from
-the output of pkg-config --libs.
-
-The pc files generated for this test contain something like this:
-
-libdir=/usr/lib
-Libs: -L${libdir} ...
-
-pkgconf may not consider /usr/lib to be a system library path, so it is
-not pruned as the test expects. To work around this, override the
-compiled-in list of paths via the PKG_CONFIG_SYSTEM_LIBRARY_PATH
-environment variable.
-
-Fixes: https://github.com/mesonbuild/meson/issues/6004
----
- run_unittests.py | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/run_unittests.py b/run_unittests.py
-index 898f05e54d..5a60b9b6a4 100755
---- a/run_unittests.py
-+++ b/run_unittests.py
-@@ -4832,7 +4832,10 @@ def test_pkgconfig_gen_deps(self):
-         privatedir2 = self.privatedir
- 
-         os.environ
--        env = {'PKG_CONFIG_LIBDIR': os.pathsep.join([privatedir1, privatedir2])}
-+        env = {
-+            'PKG_CONFIG_LIBDIR': os.pathsep.join([privatedir1, privatedir2]),
-+            'PKG_CONFIG_SYSTEM_LIBRARY_PATH': '/usr/lib',
-+        }
-         self._run(['pkg-config', 'dependency-test', '--validate'], override_envvars=env)
- 
-         # pkg-config strips some duplicated flags so we have to parse the
diff --git a/dev-util/meson/files/0.53.1-remove-asan-ld_preload.patch b/dev-util/meson/files/0.53.1-remove-asan-ld_preload.patch
deleted file mode 100644
index 4ee11829904d..000000000000
--- a/dev-util/meson/files/0.53.1-remove-asan-ld_preload.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 75f2d7a004387edc7a7e73da5097bf01daf38769 Mon Sep 17 00:00:00 2001
-From: William Hubbs <w.d.hubbs@gmail.com>
-Date: Sat, 15 Feb 2020 12:24:42 -0600
-Subject: [PATCH 1/2] remove asan ld_preload
-
-ASAN and sandbox both want control over LD_PRELOAD
-https://bugs.gentoo.org/673016
----
- run_unittests.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/run_unittests.py b/run_unittests.py
-index 676604f4..1c9aaf0c 100755
---- a/run_unittests.py
-+++ b/run_unittests.py
-@@ -4985,7 +4985,7 @@ class LinuxlikeTests(BasePlatformTests):
-                              r'Run-time dependency qt5 \(modules: Core\) found: YES 5.* \(pkg-config\)\n')
- 
-     @skip_if_not_base_option('b_sanitize')
--    def test_generate_gir_with_address_sanitizer(self):
-+    def _test_generate_gir_with_address_sanitizer(self):
-         if is_cygwin():
-             raise unittest.SkipTest('asan not available on Cygwin')
-         if is_openbsd():
--- 
-2.24.1
-
diff --git a/dev-util/meson/files/0.53.1-remove-asan.patch b/dev-util/meson/files/0.53.1-remove-asan.patch
deleted file mode 100644
index 4cc2aead0ba6..000000000000
--- a/dev-util/meson/files/0.53.1-remove-asan.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 9ddb289ca9611281a45734d92fdfd2d5fb83f050 Mon Sep 17 00:00:00 2001
-From: William Hubbs <w.d.hubbs@gmail.com>
-Date: Sat, 15 Feb 2020 12:28:35 -0600
-Subject: [PATCH 2/2] remove asan
-
-ASAN is unsupported on some targets
-https://bugs.gentoo.org/692822
----
- run_unittests.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/run_unittests.py b/run_unittests.py
-index 1c9aaf0c..171ee0f0 100755
---- a/run_unittests.py
-+++ b/run_unittests.py
-@@ -5475,7 +5475,7 @@ class LinuxlikeTests(BasePlatformTests):
-         self.assertEqual(install_rpath, 'baz')
- 
-     @skip_if_not_base_option('b_sanitize')
--    def test_pch_with_address_sanitizer(self):
-+    def _test_pch_with_address_sanitizer(self):
-         if is_cygwin():
-             raise unittest.SkipTest('asan not available on Cygwin')
-         if is_openbsd():
--- 
-2.24.1
-
diff --git a/dev-util/meson/meson-0.52.1.ebuild b/dev-util/meson/meson-0.52.1.ebuild
deleted file mode 100644
index 077d7508af29..000000000000
--- a/dev-util/meson/meson-0.52.1.ebuild
+++ /dev/null
@@ -1,86 +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 ~x64-macos ~x64-solaris"
-fi
-
-inherit distutils-r1 toolchain-funcs
-
-DESCRIPTION="Open source build system"
-HOMEPAGE="https://mesonbuild.com/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	test? (
-		dev-libs/glib:2
-		dev-libs/gobject-introspection
-		dev-util/ninja
-		dev-vcs/git
-		sys-libs/zlib[static-libs(+)]
-		virtual/pkgconfig
-	)
-"
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}"/0.52.1-test_pkgconfig_gen_deps.patch
-	)
-
-	# ASAN and sandbox both want control over LD_PRELOAD
-	# https://bugs.gentoo.org/673016
-	sed -i -e 's/test_generate_gir_with_address_sanitizer/_&/' run_unittests.py || die
-
-	# ASAN is unsupported on some targets
-	# https://bugs.gentoo.org/692822
-	sed -i -e 's/test_pch_with_address_sanitizer/_&/' run_unittests.py || die
-
-	# Broken due to python2 script created by python_wrapper_setup
-	rm -r "test cases/frameworks/1 boost" || die
-
-	distutils-r1_python_prepare_all
-}
-
-src_test() {
-	tc-export PKG_CONFIG
-	if ${PKG_CONFIG} --exists Qt5Core && ! ${PKG_CONFIG} --exists Qt5Gui; then
-		ewarn "Found Qt5Core but not Qt5Gui; skipping tests"
-	else
-		# https://bugs.gentoo.org/687792
-		unset PKG_CONFIG
-		distutils-r1_src_test
-	fi
-}
-
-python_test() {
-	(
-		# test_meson_installed
-		unset PYTHONDONTWRITEBYTECODE
-
-		# test_cross_file_system_paths
-		unset XDG_DATA_HOME
-
-		${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.54.0.ebuild b/dev-util/meson/meson-0.54.0.ebuild
deleted file mode 100644
index 77f6244e6e29..000000000000
--- a/dev-util/meson/meson-0.54.0.ebuild
+++ /dev/null
@@ -1,67 +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 ~x64-macos ~x64-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
-	)
-"
-
-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.54.3.ebuild b/dev-util/meson/meson-0.54.3.ebuild
index f29fb08b500f..cb38de99a7a9 100644
--- a/dev-util/meson/meson-0.54.3.ebuild
+++ b/dev-util/meson/meson-0.54.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 ~x64-macos ~x64-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/meson/meson-0.53.1.ebuild b/dev-util/meson/meson-0.55.0.ebuild
index a0802ef4fcb5..38ccf9179e21 100644
--- a/dev-util/meson/meson-0.53.1.ebuild
+++ b/dev-util/meson/meson-0.55.0.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} )
 DISTUTILS_USE_SETUPTOOLS="rdepend"
 
 if [[ ${PV} = *9999* ]]; then
@@ -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 ~x64-macos ~x64-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
@@ -34,16 +34,24 @@ DEPEND="
 	)
 "
 
-PATCHES=(
-	# ASAN and sandbox both want control over LD_PRELOAD
-	# https://bugs.gentoo.org/673016
-	"${FILESDIR}"/0.53.1-remove-asan-ld_preload.patch
-	# ASAN is unsupported on some targets
-	# https://bugs.gentoo.org/692822
-	"${FILESDIR}"/0.53.1-remove-asan.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/_&/'
 	)
 
-python_prepare_all() {
+	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
diff --git a/dev-util/meson/meson-0.54.1.ebuild b/dev-util/meson/meson-0.55.1.ebuild
index 053a12bbeb2f..38ccf9179e21 100644
--- a/dev-util/meson/meson-0.54.1.ebuild
+++ b/dev-util/meson/meson-0.55.1.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} )
 DISTUTILS_USE_SETUPTOOLS="rdepend"
 
 if [[ ${PV} = *9999* ]]; then
@@ -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 ~x64-macos ~x64-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
@@ -35,13 +35,23 @@ DEPEND="
 "
 
 python_prepare_all() {
-	# ASAN and sandbox both want control over LD_PRELOAD
-	# https://bugs.gentoo.org/673016
-	sed -i -e 's/test_generate_gir_with_address_sanitizer/_&/' run_unittests.py || die
+	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
-	sed -i -e 's/test_pch_with_address_sanitizer/_&/' run_unittests.py || die
+		# 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
diff --git a/dev-util/meson/meson-9999.ebuild b/dev-util/meson/meson-9999.ebuild
index edbd30f51167..38ccf9179e21 100644
--- a/dev-util/meson/meson-9999.ebuild
+++ b/dev-util/meson/meson-9999.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} )
 DISTUTILS_USE_SETUPTOOLS="rdepend"
 
 if [[ ${PV} = *9999* ]]; then
@@ -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 ~x64-macos ~x64-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
@@ -56,8 +56,6 @@ python_prepare_all() {
 	# 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
 }
 
diff --git a/dev-util/ninja/Manifest b/dev-util/ninja/Manifest
index 2a46126ec22b..36f88c0147bd 100644
--- a/dev-util/ninja/Manifest
+++ b/dev-util/ninja/Manifest
@@ -6,7 +6,7 @@ DIST ninja-1.8.2.g3bbbe.kitware.dyndep-1.jobserver-1.tar.gz 203848 BLAKE2B a6002
 DIST ninja-1.8.2.g81279.kitware.dyndep-1.jobserver-1.tar.gz 204539 BLAKE2B cee66a5d6ad7fd1254e68cf7be1e97eb796ec3103bdb9e869dc66757a96ce1d6e946018aa048855e70d6a3698ae609f75740809a8e9183057da16769f07e1fa6 SHA512 ae5f9c4c76114cabc4ec06056edccfa4027d514c4ae0f3ab08bbcd3ce2322e9ff08b8f90fe69fab989707adb6ecc78f226b65e223b41535aa5c0db5b6c61117a
 DIST ninja-1.8.2.tar.gz 185226 BLAKE2B c464c50829a0e9f0f6fd4b860946b14bf07f752adb8e7857d4072a1c1f06977eda283f633041929065c9164377ca769b3293b04fc9ceab583371708a9c4e8f2a SHA512 1650bf9e3eddeb0b0fbb415c2b8e0a7c094421e991fa8139fd77fae0f6ee7ee980b7cf5e98d883c3a884f99abcb06fa26e3980af3a3a5bb6dd655124755782c2
 DIST ninja-1.9.0.g99df1.kitware.dyndep-1.jobserver-1.tar.gz 213767 BLAKE2B bb6abbed155d39fe65a3a4bbbba3e577e4a13dfd1ccb9e018084153b0dd6928753be9d8c10a2c4c2ab6a2000c5292f912353f2234b01613f46bfa49d13aabd7a SHA512 6c3aaf8decfd792ce6b035dacb87f978f1052d13e5ceac9ce63bc7051fad0eed83cc530d2cf22649ff4186416b0478bb3eb0507c56fec2848061cdad7a0aa812
-EBUILD ninja-1.10.0.ebuild 2651 BLAKE2B 1647476789dc727cade8d4e0772e297c2da7ff6af846f612c3f735a48ed0f4a5f2e1a5273f3d416dc870cffd6e05900a25722007ccd4d9af5e7bb77d78f635db SHA512 82030199b6d01bfe1eb0bf8aa47056f6d3a7ea7c1d062ee72b41356f680c732c5ba4afa6a9023a4cdef217bef5a6515a657677ec034b5a7a63914e893176d74c
+EBUILD ninja-1.10.0.ebuild 2693 BLAKE2B a0edb1e631b9bbd059387facfc44e842fb8459eb802a1e15b26b69ace7f03ab72726088cd847a0d2c222700bf40ef31d2fc6bba2a81ee1bd53b6a1f67ed83dff SHA512 41d322758822a92f18ac2f98255a7f5ad28f053ced4b65f34812e495a29f1db404472b6b2260e8699c6b12c718dd59b7b79fed04226fdbd2cfa61f2495b96226
 EBUILD ninja-1.8.2-r1.ebuild 2650 BLAKE2B 381a358380a18d9b59da3d2850661bf47b5b8ab7a5c01a2a553b3367a5b39f1a590d08ad91ac2191e26755799ec60f8596d69db46be57cb74470fc33de1ccb85 SHA512 667d8163314f2625c730ffb4d1960d162e5c90a20c0b754657a0db5e6ca363171cde8558d4ed452194d75a10849a8d05c0c494ed94aaf8bb855537eda92cbe84
 EBUILD ninja-1.8.2-r2.ebuild 2650 BLAKE2B a4ae25652a8e2f60818dee56c7cea2c05967e0f3a4e6fae5d0f0fbbf05f253e174b2ed6fb85b0d2e0a9bd2bca6754fe82eafb50c38e1f51cef2fda616cbe464f SHA512 2bd4dc83bf719baf14d4eda839415519a8d6ff3d320830475091b3bd7ca12cc9204637a46f2155b40c9c4a87bc58f747f56f534547ba24b7306772004bd54a49
 EBUILD ninja-1.8.2.ebuild 2511 BLAKE2B 511fb24bda7d2bc511daa86d9c76217b54eeeeb2744dc9050d4c262e999ff496c91cf2800c3bc849e725f528e9d394238a38905aff48e63fbf8a17e2aad5ad6d SHA512 1346570be8d9ad9152130fdf3ed54c223ef48a6c1bf6469f34a24bca0443302fa71458d5777d479893958dd29ffcd37feba8c8ed51eb93e2120a0d0761d372a4
diff --git a/dev-util/ninja/ninja-1.10.0.ebuild b/dev-util/ninja/ninja-1.10.0.ebuild
index 5ba3ad094ec3..6a015bfe539a 100644
--- a/dev-util/ninja/ninja-1.10.0.ebuild
+++ b/dev-util/ninja/ninja-1.10.0.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 ~x64-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/objconv/Manifest b/dev-util/objconv/Manifest
index 365af0176441..d5f964998a90 100644
--- a/dev-util/objconv/Manifest
+++ b/dev-util/objconv/Manifest
@@ -1,3 +1,3 @@
 DIST objconv-2.51.zip 1033450 BLAKE2B 1029e8001bee969f177e7e47e735dc132dbf640bb472ae148cd2a33af522c190066f226a55da3bb3b47902a68eecf437edc025622781bda691a10956c84561c3 SHA512 12991b98fafbb5fad709471b25bf8acd2944f862ca1f3cbae5a6f7fd53a6009dbb6e67a2fcfa180965b519a2d6010d9b2f7585748ea58d36b28d86c0981f13d8
-EBUILD objconv-2.51.ebuild 1009 BLAKE2B cc900b6349efbda5b863d1e9c3494c1b6b2e69381903b99527b4caff9e03d94b23e68b5f847fa3a420ac65dcdac7440cec3e2c1513a019429896dd133a0f8099 SHA512 332a3dc50871b7f0dd7dc47b98f3f8f554435244ec120a3ca1d2ff95ea22619faa7eb5dbb52ba92723e1a91277a81641c6921b4e2f688496209fedab9eb8eb52
+EBUILD objconv-2.51.ebuild 1010 BLAKE2B 6574210bd8b1add496028615fc4b168aac24bebdb61e2d3b84213acecd3a16211e46c0da7278329fb425a4bcd131932607fd731fe46cd2994d591a677ee7d56f SHA512 cd37c3e72bde6775c7635c3c91002c99d3fbb204a8d1a781258b41413f02c7f4cd0379b9a9de4d3bb3462def75bee5118a7056c91c6de5768d746263604786c2
 MISC metadata.xml 251 BLAKE2B 9785c4729d0751280d104965bab25a268219a7fee217dcd8c01a5642a13f8abc471a3dff54ae0d34d3cf3dc8267fb483d93bd3b16aa3617e8fa8e9abd1703dfe SHA512 cc2bd3977894946ee4ea5b739cc3998bcd6017b9e7a52aa501409d0988954339a9a22fe751d0a5e967ddac9225d9b23f20b4fb1e2c62ee91d1d23c383d9776dd
diff --git a/dev-util/objconv/objconv-2.51.ebuild b/dev-util/objconv/objconv-2.51.ebuild
index c4d8fb209631..0623cabd95c4 100644
--- a/dev-util/objconv/objconv-2.51.ebuild
+++ b/dev-util/objconv/objconv-2.51.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,7 +6,7 @@ EAPI=7
 inherit toolchain-funcs unpacker
 
 DESCRIPTION="object code file converted (COFF, ELF, OMF, MACHO)"
-HOMEPAGE="http://agner.org/optimize/#objconv"
+HOMEPAGE="https://agner.org/optimize/#objconv"
 # original URL is "http://agner.org/optimize/objconv.zip", but it's unversioned.
 # I copy those to distfiles time to time. last modified: 2018-Oct-07
 SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${P}.zip"
diff --git a/dev-util/patchelf/Manifest b/dev-util/patchelf/Manifest
index bd7d6d456336..928caf16da55 100644
--- a/dev-util/patchelf/Manifest
+++ b/dev-util/patchelf/Manifest
@@ -1,3 +1,5 @@
 DIST patchelf-0.10.tar.bz2 158604 BLAKE2B 6aed9c2e7f37ff0330ca517a9491c46a93212140367b720bf94da4e4ec29a4978c920b53ce306ec333b3f7ac0216ff59637048c6997cfea4a34a87f2a0448796 SHA512 647ad13b7d45b3c5d20683ef8fe9760cb7f213e879231b6c5780bf32771adfbf7c5e5ce694c08e5681dceda63857d7d8a2d53efb60f799d3e7290cebc02ab501
+DIST patchelf-0.11.tar.bz2 159046 BLAKE2B 48d8dd986c681facd8d925d8f471ed6b4cae6a06472d66c1c22a32ded796f50be8d30cefc2847890558c2799707c33beb64ffc5d09f6d142120363bea5e40456 SHA512 ad3a99db6952412a2dac27256640cb9152b8bf5d189f1685b7478b9773bb612e06621511fc7338b2defc435bcdc26f67f79c2d830570a6da70f9d280b123d977
 EBUILD patchelf-0.10.ebuild 614 BLAKE2B f8746020ed527d88057d36d819def0266112d58f56f0ac1f7d66b529aa4cabbc17041ea6659cd46a53c6f941920540481d6d4ee4e81973d82fcbf3b24ddefb8e SHA512 9cc306c95e5b5cc72ec93645c829c10df6263d7929b26274c02cd1fda973812dfef85b1ba8f0437a6318a57573f1eabfaf10b318a44a7b40a46eac0fdb38eeb6
+EBUILD patchelf-0.11.ebuild 657 BLAKE2B 805020e7cbd692b91b3db4632a30dab086701bcaffe733ec0f1701c4a9c490188ccf41f3531e7fcffcbe11e317d52fd69137933fd6636e89357a9dd7d0ffa184 SHA512 ea4ddebad53558f5bf31905f55fe2d6147182e673059caf584358731780b3d2db87aa8866a2ab655da8b5dc3efd25f1881e7a8ea9035e05095e43c0849c6e118
 MISC metadata.xml 220 BLAKE2B 65b0d9db11c166b2887e1a22962830e288eb917a7f15d0ffcecb3c86a1845491cbcbf4ebc7e661ac7041443a8144b218123b4db7a962191a9e9f894ac086a4ed SHA512 512eee7a953300d5e721b64bade8be9bd1b62984e543552b58a7a72b42cb90973c8c6d557ecfe08c2355cab45f640c88dcd31ab8d116815bc01680a65c7a132c
diff --git a/dev-util/patchelf/patchelf-0.11.ebuild b/dev-util/patchelf/patchelf-0.11.ebuild
new file mode 100644
index 000000000000..ec5c769e0af3
--- /dev/null
+++ b/dev-util/patchelf/patchelf-0.11.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Small utility to modify the dynamic linker and RPATH of ELF executables"
+HOMEPAGE="https://nixos.org/patchelf.html"
+SRC_URI="https://nixos.org/releases/${PN}/${P}/${P}.tar.bz2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+LICENSE="GPL-3"
+
+S="${WORKDIR}/${P}.20200609.d6b2a72"
+
+src_prepare() {
+	default
+	rm src/elf.h || die
+
+	sed -i \
+		-e 's:-Werror::g' \
+		configure.ac || die
+
+	eautoreconf
+}
+
+src_test() {
+	emake check \
+		  CFLAGS+=" -no-pie" \
+		  CXXFLAGS+=" -no-pie"
+}
diff --git a/dev-util/pkgcheck/Manifest b/dev-util/pkgcheck/Manifest
index 8ff0b10d21a6..781354af29a2 100644
--- a/dev-util/pkgcheck/Manifest
+++ b/dev-util/pkgcheck/Manifest
@@ -1,4 +1,6 @@
 DIST pkgcheck-0.7.6.tar.gz 234637 BLAKE2B 31c31d987aed03e4a61f58a3dc3074985a4f436e3598f11257d602a668525f24e45c540d56e5779237cd36299b0ab73b9a59e3482099cb5accbb3ea8437cd7c5 SHA512 cfded3a5a0249ee9279fe93156ef524cafe7302915dfbbb01acd0bdc3acefcd1e90c6bcfbf3dc40bd5cb71680cc6453b1de045878d75a9ade00c432e663fd136
-EBUILD pkgcheck-0.7.6-r1.ebuild 1407 BLAKE2B bee6c04613beba766ca7257889d928de88cdce2cb2059c9d10ec8a4089d587387399e013dee4c6e3e52843e355be1a85ff55ed93e08327df4594f9a2b36307f6 SHA512 426d55e2e90bbacdd128d9e52e161791cdd9ed6b82b7379db53cf0670f4c06538b06b8998bdf719cc97dcb2c48912d0bdd31963685a4ede455f13a6609a926b8
-EBUILD pkgcheck-9999.ebuild 1393 BLAKE2B 55fac0abd9bff46ae2c4e5525d4cd9f37f80964d0ebdc0401186e114bc46a3e56f1c4d151d58ddcab32816ca4e037ffb1f33d4b8ff1b399bc5028618bd1cf074 SHA512 da71cc57c1e359fc57356bc711b99375e5243de295e58e1937a0c80a6a5e60a5ac6bb07deab4cdb693685f89b630d69b56545830c6e21895c87894abcf13996f
+DIST pkgcheck-0.7.7.tar.gz 236359 BLAKE2B 46628e6fe1ab711773209785f3160ad5521f7173a676363a44102bd26b443eafe4f88829d9a6c9cf10538ebfa7ca8b28cb8c27f9719f98217ff626d1b5a9a0b3 SHA512 ac88a3aa689983bfac0efa85240e3a02c822a075095ff9940fac0cdc188428126e7612807e57a7582f21fcf1d668dba29d4785d062d757f6444fa024d0437751
+EBUILD pkgcheck-0.7.6-r1.ebuild 1403 BLAKE2B ff59f3bd139cd02a5f39510c62f4a76e364e6e76b13d93c6f8a40938dd68ae1a8631b4b1369d829e5123951d42fb1d361ebd6fadddfc9a5432b08bbd75ee2ea1 SHA512 78d3fa064184d94b1bf6a026289b6595ca7f7262972f44c07a9e85b2900d6267dfde9c8fb304778f2be010411ac7652da7185d47df0ff2368d3e478a40d705e9
+EBUILD pkgcheck-0.7.7.ebuild 1407 BLAKE2B bc83dcd07125125157e16576be2e4e6e34e46932b35a91dcaa7cb5fcbd2bfb2409e7bc4c8a5bee8625585b5f675255fd616e1824e2fe4f48e4d17d8f4832f58f SHA512 e2bb02ed14cc6edf66ca20b473bcd90e24e5c5582717fc4a6abadf42fc91fb93f8003ddd19d75b53e7d9151a5cd6bb7f95580594f92d5b95e5329126638585d2
+EBUILD pkgcheck-9999.ebuild 1407 BLAKE2B bc83dcd07125125157e16576be2e4e6e34e46932b35a91dcaa7cb5fcbd2bfb2409e7bc4c8a5bee8625585b5f675255fd616e1824e2fe4f48e4d17d8f4832f58f SHA512 e2bb02ed14cc6edf66ca20b473bcd90e24e5c5582717fc4a6abadf42fc91fb93f8003ddd19d75b53e7d9151a5cd6bb7f95580594f92d5b95e5329126638585d2
 MISC metadata.xml 328 BLAKE2B b84dba717460e84f7ee3163fd8d6a5f13eb3b15dd1bb749f6ece81f062e3530988dacefadb24c1395eb36593a7ab6d868b06c8c4ee8f620a17c85faf04283b24 SHA512 5696505214a737ad495b23bfac2a51fbbc5b1e815eb6fcbabb3c6674325f05e3f6f418de05257c08935e389e47879e8a2d1b3723ec86aeb5ad97c6110fd2ec75
diff --git a/dev-util/pkgcheck/pkgcheck-0.7.6-r1.ebuild b/dev-util/pkgcheck/pkgcheck-0.7.6-r1.ebuild
index 1a6b8a9bd231..c9a7b19354f0 100644
--- a/dev-util/pkgcheck/pkgcheck-0.7.6-r1.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-0.7.6-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86"
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 fi
 
diff --git a/dev-util/pkgcheck/pkgcheck-0.7.7.ebuild b/dev-util/pkgcheck/pkgcheck-0.7.7.ebuild
new file mode 100644
index 000000000000..19f05125eb14
--- /dev/null
+++ b/dev-util/pkgcheck/pkgcheck-0.7.7.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_IN_SOURCE_BUILD=1
+inherit distutils-r1 eutils
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git"
+	inherit git-r3
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+fi
+
+DESCRIPTION="pkgcore-based QA utility for ebuild repos"
+HOMEPAGE="https://github.com/pkgcore/pkgcheck"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+if [[ ${PV} == *9999 ]]; then
+	RDEPEND="
+		~dev-python/snakeoil-9999[${PYTHON_USEDEP}]
+		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]"
+else
+	RDEPEND="
+		>=dev-python/snakeoil-0.8.8[${PYTHON_USEDEP}]
+		>=sys-apps/pkgcore-0.10.13[${PYTHON_USEDEP}]"
+fi
+RDEPEND+="
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/pathspec[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	local DOCS=( NEWS.rst )
+	[[ ${PV} == *9999 ]] || doman man/*
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "Network check support" dev-python/requests
+	optfeature "Perl module version check support" dev-perl/Gentoo-PerlMod-Version
+}
diff --git a/dev-util/pkgcheck/pkgcheck-9999.ebuild b/dev-util/pkgcheck/pkgcheck-9999.ebuild
index c05954b53f8a..19f05125eb14 100644
--- a/dev-util/pkgcheck/pkgcheck-9999.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-9999.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git"
 	inherit git-r3
 else
-	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 fi
 
@@ -29,7 +29,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	RDEPEND="
 		>=dev-python/snakeoil-0.8.8[${PYTHON_USEDEP}]
-		>=sys-apps/pkgcore-0.10.11[${PYTHON_USEDEP}]"
+		>=sys-apps/pkgcore-0.10.13[${PYTHON_USEDEP}]"
 fi
 RDEPEND+="
 	dev-python/chardet[${PYTHON_USEDEP}]
diff --git a/dev-util/pkgconf/Manifest b/dev-util/pkgconf/Manifest
index e007d3dca557..534c6a62b146 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 1589 BLAKE2B 3718d1065f7b4c5cd49a82ee2befa4f2581435bc212a9455d7fa787439651c4b987ae2fe3980283604b40edb52216f8aec29ce06f85d0e8fb3369ea09e46b73a SHA512 bd162b064e3b94dadda694fbcaf457fb33c7dddf39bf6cd426663a5bfafc036d02949b46a174f5037af218c0fd05409c6f7f4adb3882759afc061a7b2b824a51
-EBUILD pkgconf-1.7.2.ebuild 1615 BLAKE2B ee5a5a96cd20a3fc2e6028b4382531d352561d81ff6974ab21d63165be7bd0ea8c31db33e7795b8c68c57483dc13309bb54cebabdbd3fa6b85b44d7c05394952 SHA512 6cc15fc1d4d7169b1d1e7d89c48ee5d6b7a97e9dddf2e3bb26ef5ff77cd3e06ace4681e04f53aa5f86d3def82ef3c1fed09a127c598e9e50533cbe9b9d7aeff2
-EBUILD pkgconf-1.7.3.ebuild 1615 BLAKE2B ee5a5a96cd20a3fc2e6028b4382531d352561d81ff6974ab21d63165be7bd0ea8c31db33e7795b8c68c57483dc13309bb54cebabdbd3fa6b85b44d7c05394952 SHA512 6cc15fc1d4d7169b1d1e7d89c48ee5d6b7a97e9dddf2e3bb26ef5ff77cd3e06ace4681e04f53aa5f86d3def82ef3c1fed09a127c598e9e50533cbe9b9d7aeff2
-EBUILD pkgconf-9999.ebuild 1615 BLAKE2B ee5a5a96cd20a3fc2e6028b4382531d352561d81ff6974ab21d63165be7bd0ea8c31db33e7795b8c68c57483dc13309bb54cebabdbd3fa6b85b44d7c05394952 SHA512 6cc15fc1d4d7169b1d1e7d89c48ee5d6b7a97e9dddf2e3bb26ef5ff77cd3e06ace4681e04f53aa5f86d3def82ef3c1fed09a127c598e9e50533cbe9b9d7aeff2
+EBUILD pkgconf-1.6.3.ebuild 1650 BLAKE2B 6411c28961a337ac9b48554a91df80d7ac108c2338b5159f4037bf8b585b987e793967316232c50d941583129ec6dc13f4a711c44bd5ff8a5f8512879fa90652 SHA512 f7cd4151e7317aa38c6df9220893493d741b3882ef89ceb437194f1bcf3df2e80b4c6a59b1ef75796f5aa8137aa40136b53c8f30a74c0f3841800f5d750f5814
+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
 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 da69ae46ca80..114a0bfd9d0a 100644
--- a/dev-util/pkgconf/pkgconf-1.6.3.ebuild
+++ b/dev-util/pkgconf/pkgconf-1.6.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit multilib-minimal
+inherit multilib multilib-minimal
 
 if [[ ${PV} == "9999" ]] ; then
 	inherit autotools git-r3
@@ -38,7 +38,7 @@ RDEPEND="
 "
 
 MULTILIB_CHOST_TOOLS=(
-	/usr/bin/pkgconf
+	/usr/bin/pkgconf$(get_exeext)
 )
 
 src_prepare() {
@@ -47,7 +47,7 @@ src_prepare() {
 	[[ ${PV} == "9999" ]] && eautoreconf
 	if use pkg-config; then
 		MULTILIB_CHOST_TOOLS+=(
-			/usr/bin/pkg-config
+			/usr/bin/pkg-config$(get_exeext)
 		)
 	fi
 }
@@ -66,7 +66,7 @@ multilib_src_install() {
 	default
 
 	if use pkg-config; then
-		dosym pkgconf /usr/bin/pkg-config
+		dosym pkgconf$(get_exeext) /usr/bin/pkg-config$(get_exeext)
 		dosym pkgconf.1 /usr/share/man/man1/pkg-config.1
 	else
 		rm "${ED}"/usr/share/aclocal/pkg.m4 || die
diff --git a/dev-util/pkgconf/pkgconf-1.7.2.ebuild b/dev-util/pkgconf/pkgconf-1.7.2.ebuild
index c5741a924750..40e4e28319d4 100644
--- a/dev-util/pkgconf/pkgconf-1.7.2.ebuild
+++ b/dev-util/pkgconf/pkgconf-1.7.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit multilib-minimal
+inherit multilib multilib-minimal
 
 if [[ ${PV} == "9999" ]] ; then
 	inherit autotools git-r3
@@ -38,7 +38,7 @@ RDEPEND="
 "
 
 MULTILIB_CHOST_TOOLS=(
-	/usr/bin/pkgconf
+	/usr/bin/pkgconf$(get_exeext)
 )
 
 src_prepare() {
@@ -47,7 +47,7 @@ src_prepare() {
 	[[ ${PV} == "9999" ]] && eautoreconf
 	if use pkg-config; then
 		MULTILIB_CHOST_TOOLS+=(
-			/usr/bin/pkg-config
+			/usr/bin/pkg-config$(get_exeext)
 		)
 	fi
 }
@@ -66,7 +66,7 @@ multilib_src_install() {
 	default
 
 	if use pkg-config; then
-		dosym pkgconf /usr/bin/pkg-config
+		dosym pkgconf$(get_exeext) /usr/bin/pkg-config$(get_exeext)
 		dosym pkgconf.1 /usr/share/man/man1/pkg-config.1
 	else
 		rm "${ED}"/usr/share/aclocal/pkg.m4 || die
diff --git a/dev-util/pkgconf/pkgconf-1.7.3.ebuild b/dev-util/pkgconf/pkgconf-1.7.3.ebuild
index c5741a924750..40e4e28319d4 100644
--- a/dev-util/pkgconf/pkgconf-1.7.3.ebuild
+++ b/dev-util/pkgconf/pkgconf-1.7.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit multilib-minimal
+inherit multilib multilib-minimal
 
 if [[ ${PV} == "9999" ]] ; then
 	inherit autotools git-r3
@@ -38,7 +38,7 @@ RDEPEND="
 "
 
 MULTILIB_CHOST_TOOLS=(
-	/usr/bin/pkgconf
+	/usr/bin/pkgconf$(get_exeext)
 )
 
 src_prepare() {
@@ -47,7 +47,7 @@ src_prepare() {
 	[[ ${PV} == "9999" ]] && eautoreconf
 	if use pkg-config; then
 		MULTILIB_CHOST_TOOLS+=(
-			/usr/bin/pkg-config
+			/usr/bin/pkg-config$(get_exeext)
 		)
 	fi
 }
@@ -66,7 +66,7 @@ multilib_src_install() {
 	default
 
 	if use pkg-config; then
-		dosym pkgconf /usr/bin/pkg-config
+		dosym pkgconf$(get_exeext) /usr/bin/pkg-config$(get_exeext)
 		dosym pkgconf.1 /usr/share/man/man1/pkg-config.1
 	else
 		rm "${ED}"/usr/share/aclocal/pkg.m4 || die
diff --git a/dev-util/pkgconf/pkgconf-9999.ebuild b/dev-util/pkgconf/pkgconf-9999.ebuild
index c5741a924750..40e4e28319d4 100644
--- a/dev-util/pkgconf/pkgconf-9999.ebuild
+++ b/dev-util/pkgconf/pkgconf-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit multilib-minimal
+inherit multilib multilib-minimal
 
 if [[ ${PV} == "9999" ]] ; then
 	inherit autotools git-r3
@@ -38,7 +38,7 @@ RDEPEND="
 "
 
 MULTILIB_CHOST_TOOLS=(
-	/usr/bin/pkgconf
+	/usr/bin/pkgconf$(get_exeext)
 )
 
 src_prepare() {
@@ -47,7 +47,7 @@ src_prepare() {
 	[[ ${PV} == "9999" ]] && eautoreconf
 	if use pkg-config; then
 		MULTILIB_CHOST_TOOLS+=(
-			/usr/bin/pkg-config
+			/usr/bin/pkg-config$(get_exeext)
 		)
 	fi
 }
@@ -66,7 +66,7 @@ multilib_src_install() {
 	default
 
 	if use pkg-config; then
-		dosym pkgconf /usr/bin/pkg-config
+		dosym pkgconf$(get_exeext) /usr/bin/pkg-config$(get_exeext)
 		dosym pkgconf.1 /usr/share/man/man1/pkg-config.1
 	else
 		rm "${ED}"/usr/share/aclocal/pkg.m4 || die
diff --git a/dev-util/pkgdiff/Manifest b/dev-util/pkgdiff/Manifest
index ac0ca2cc13e0..c16360fb72d6 100644
--- a/dev-util/pkgdiff/Manifest
+++ b/dev-util/pkgdiff/Manifest
@@ -1,4 +1,4 @@
 DIST pkgdiff-1.7.2.tar.gz 56592 BLAKE2B 6190a8c1e018766802e12234890629efb356680dee84afdea1f989bc91196edc5460c3af3cba5229116ddcafac81f728d1d4eb52f009f9dc5f711a7718f2b0a9 SHA512 2369488e9705280be9b326b07aa9ef0e211440921b9cce5c35560a14d1ad4ac0040eb54024a88a4a5f8f831208b43124c17a817a44840500b490c89bf877b904
-EBUILD pkgdiff-1.7.2.ebuild 584 BLAKE2B d6c022ce96516b7062c65a146a8ae95408e2b26dd9782972b9937cca299033e951b7609a10b5014af75bffb90f2218976a992dc399a8d2e2fcc561d3d75214c2 SHA512 22dc106cdd4675133963ff1d5ce8b1756d4dd9a743002adb77b170efa5684fd7037ffdbd402217dc8b6864b7074c555c82816f09007c0b5020937d5009eb8c64
-EBUILD pkgdiff-9999.ebuild 569 BLAKE2B 18d4d0898882799d160dcda518e7f8ea6f8ef1aaf5af7e98aac63d289e1267787292ae532aef8612bdd81c03e043a066ec7b60e772b671165ab887e6383e5e1d SHA512 97a568f752bec4f224d9528663776ab34187718be7894bb5cb326ec9c573b2534aba897e25f23f6475a95fc2f9110cbc51f69daf4a7dc17b5217107060514444
+EBUILD pkgdiff-1.7.2.ebuild 608 BLAKE2B 0b6d09e939986db4346b95958244649ffac68dc72fb844607efc6129a214ff584c0eed63b185d7c760477f651178a7ace6c752fb90809a4e9b8ffa7df86250cb SHA512 e21aaf0b7fc5a9237ce6481e2ad61eb7a2a7b35b53738d536c227c72a23acc24e4efaa7ac079c1fe22400d82abd1af315f9c5f094523fa7c9bfca8a8516efc54
+EBUILD pkgdiff-9999.ebuild 593 BLAKE2B d3024438133dd4b606f0d2dd1bbc5ac6ebd08e8ed8abb6b8341a18122112a8ee6eec06d119e1a361eaba5f5f30685b7b0a06306093f99227724b8d2ea250f4bc SHA512 69f8c9f93e40cbed4739b7fbbbfd83b580e5e60c5e846c3d1fc67d44a903fc20ce1ec782b17dc78a42733c517e59ce0d243ecde89b4996ba2abecf29120275cd
 MISC metadata.xml 338 BLAKE2B 09bf599cfa91cc08a471c3d0c3cefaa623db3c2ce996f1a729a0e8d56239d90fcfe0276543ecd87210aecd9951a5c72603d8accf13adffd1d367181719eb95f7 SHA512 c27e02beec32aadcbbd329456a26cecc78de349422ada21067d8510eca159e623e6f55a44e1f6307cd81b5fb98d565c270d13f18dd3bb3ee6a55c4ce6347e6d9
diff --git a/dev-util/pkgdiff/pkgdiff-1.7.2.ebuild b/dev-util/pkgdiff/pkgdiff-1.7.2.ebuild
index ee28ad626a5d..fa0efba68ecd 100644
--- a/dev-util/pkgdiff/pkgdiff-1.7.2.ebuild
+++ b/dev-util/pkgdiff/pkgdiff-1.7.2.ebuild
@@ -13,8 +13,9 @@ KEYWORDS="amd64"
 
 DEPEND=">=dev-lang/perl-5"
 RDEPEND="${DEPEND}
-	sys-apps/diffutils
 	app-text/wdiff
+	dev-perl/File-LibMagic
+	sys-apps/diffutils
 	sys-apps/gawk
 	sys-devel/binutils
 "
diff --git a/dev-util/pkgdiff/pkgdiff-9999.ebuild b/dev-util/pkgdiff/pkgdiff-9999.ebuild
index c33dc82d8110..9812bb968dec 100644
--- a/dev-util/pkgdiff/pkgdiff-9999.ebuild
+++ b/dev-util/pkgdiff/pkgdiff-9999.ebuild
@@ -15,8 +15,9 @@ KEYWORDS=""
 
 DEPEND=">=dev-lang/perl-5"
 RDEPEND="${DEPEND}
-	sys-apps/diffutils
 	app-text/wdiff
+	dev-perl/File-LibMagic
+	sys-apps/diffutils
 	sys-apps/gawk
 	sys-devel/binutils
 "
diff --git a/dev-util/ply/Manifest b/dev-util/ply/Manifest
index 771fb859de6d..4378eae3476f 100644
--- a/dev-util/ply/Manifest
+++ b/dev-util/ply/Manifest
@@ -1,3 +1,4 @@
+DIST ply-2.1.1-arm-build-fix.patch 1433 BLAKE2B 305bb06ce1e5516dc3868cd276edc94d89cb7c20866094c6947092048af2c090a29bae52dc82956cbf7f36e42e15d873c553948dade17f4b1f9d490bb8191ed9 SHA512 e7572e5e777e13b483e9123fc5c62d63f3f1a2c753d7dedce8de8d78a4c5baa9c10b45b0e31ba16a92b0e2af11e206662cfe815643f0a8145f8d79e388d536b9
 DIST ply-2.1.1.tar.gz 71578 BLAKE2B b63d0bd355985035b8d1c934c13982e21eeda0d710f40b8131562e9ef6a21a3eaf04960b871f5ab83d718ab1726450996988a2aef1a6fbd2e8f1a3c55db92beb SHA512 fdc66d752989a239e01d2746e6c56610c2c945fbeeff8f2a79be1db487a6cbba365d1bd1b553d25c43a3fdc3634ab96bf4a37ab4f694c6eb6eba82c35b37231e
-EBUILD ply-2.1.1.ebuild 825 BLAKE2B a29c547816c0849664fe79e89e2f54fd53f2c89ec9b40d77fb026885ee45a3533691dcb04bc2691e64aa377451ce6e45691d1d77fb64f232b77ad6ee2414048a SHA512 592546cc3f262ade58314f976d68eb20eeca75634cac9d38a69f2246132c62ae2c912f8e43de89eee0f55b9aa5a9bff73401ab8505612b7074516f647cdd3e0d
+EBUILD ply-2.1.1-r1.ebuild 1110 BLAKE2B 973c3683c6d18eb918889d9e4ad1937d4e5a41994f3e7df0e00cd0c7cb8f6a4ff355ffda4fff22e2e0a3c0f2545beb2d0ebd293d7cfd8b5019ddec46c616a6ab SHA512 71d2e081753355e7eb08786a6d4ca9739d8b63b695dbb78f200c8ff65ae7201d72d84729b609906917f6e1d7746b12bf518ae8179f75becb9c0761be0a5b34db
 MISC metadata.xml 659 BLAKE2B dc960603c0d60aed83463b6e7b284faa759caf821a5087aeb320efe15b8a7af0c74d532b0fbe9ae67fdc6e0b07b9a5a5e9a04bc123fceaff615bb49408126872 SHA512 ee75ce0854893a75ee1bc8a2ff723e93ce4845192b7a16a5c1d217b36231c009fb1d07d05792b4fd8a700081b6f0d1b60786d1184c9b32289dbe8c6d34f9d563
diff --git a/dev-util/ply/ply-2.1.1.ebuild b/dev-util/ply/ply-2.1.1-r1.ebuild
index 55bfd433e220..995c760e574e 100644
--- a/dev-util/ply/ply-2.1.1.ebuild
+++ b/dev-util/ply/ply-2.1.1-r1.ebuild
@@ -7,12 +7,17 @@ inherit autotools linux-info
 
 DESCRIPTION="Dynamic instrumentation of the Linux kernel with BPF and kprobes"
 HOMEPAGE="https://github.com/iovisor/ply"
-SRC_URI="https://github.com/iovisor/ply/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/iovisor/ply/archive/${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/iovisor/ply/commit/1bc183af8703023e377f92716ecd3f339ffffd11.patch -> ${P}-arm-build-fix.patch"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc"
 IUSE="static-libs"
+# Bug 733248 file collisions with sys-boot/plymouth:
+# /usr/lib64/libply.la
+# /usr/lib64/libply.so
+RDEPEND="!sys-boot/plymouth"
 
 pkg_pretend() {
 	local CONFIG_CHECK="~BPF ~BPF_SYSCALL ~NET_CLS_BPF ~NET_ACT_BPF
@@ -23,6 +28,7 @@ pkg_pretend() {
 
 src_prepare() {
 	sed -i "/^AC_INIT/c\AC_INIT(${PN}, ${PV}," configure.ac || die
+	eapply "${DISTDIR}/${P}-arm-build-fix.patch"
 	eapply_user
 	eautoreconf
 }
diff --git a/dev-util/promu/Manifest b/dev-util/promu/Manifest
index d3618b9c4cdd..2d2000d0f3e0 100644
--- a/dev-util/promu/Manifest
+++ b/dev-util/promu/Manifest
@@ -1,3 +1,3 @@
 DIST promu-0.5.0.tar.gz 643970 BLAKE2B b61e8421b5e68f3cd0ec125faadf64c7491f54cfe03de9d6497cb627e5d548b58fafe735c76a5a86a55489aea56dffb6e02d52acd1ca977ea32ec974f34475ac SHA512 b895c0b5b5a33bd0c2372e8c1c698b8548b1b7086849161ffa99bf9718f4b7f3a57bcf218681d84e4cc5ef31ef39df7e6c59345a84441369ec3ec402999ac4de
-EBUILD promu-0.5.0.ebuild 675 BLAKE2B a9094322babbfc75b84eafff9026b7fe18f001a7dc8ea2849c08bb1135a3409534bce9efd0303acc214ccc0528633d6a382d6513747d70f7ae6d38f3c6f23896 SHA512 41f559803a6c7eaa7e2a4d7ecd9de42b900c4aafa9a5e0eb8c965c978f00261ecc4fd7814819dc4f04a5d03a19f42ccf9084fc467876508417d780a9eb598068
+EBUILD promu-0.5.0.ebuild 680 BLAKE2B 4a27ba78a6a643c87aab31023b9ac82038bdd2d876bccecc6fc6863682feb7cfee801ecd31fbd99f050acad23a35065f7c8c5129d950837931d333df80163577 SHA512 4c3c1d54cacda62778366d6842c47bfe948acc3a61dc102e0ef73b5f5a46112f7219112d8c03ed511189e2f764e963daa624150053f2409629ad34f7a72959ba
 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 64f6ce821f01..199f7360e01d 100644
--- a/dev-util/promu/promu-0.5.0.ebuild
+++ b/dev-util/promu/promu-0.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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"
+KEYWORDS="amd64 ~arm"
 IUSE=""
 
 RESTRICT+=" test"
diff --git a/dev-util/pycharm-community/Manifest b/dev-util/pycharm-community/Manifest
index e783bc29f1e4..9d5f88934e56 100644
--- a/dev-util/pycharm-community/Manifest
+++ b/dev-util/pycharm-community/Manifest
@@ -4,11 +4,13 @@ DIST pycharm-community-2019.3.2.tar.gz 391689310 BLAKE2B 11627839e823e2d6c946f5f
 DIST pycharm-community-2019.3.3.tar.gz 391606138 BLAKE2B a07bf941ea7a98cadf6ff15b8f69e745ceecf0a820a098811d462a638b0d1b749e1580e23f0cfbdb78a9740e0f41777dd7d505527b6bc83f9c9d5e9ff70a6c95 SHA512 566667109662cffeaba6da9b5e5837adb00f8fbb29523f8415d4fd691cb71f7a40952d28c3713c0409ecbf50ce116ef83bf34a4cbe46015a2a11593771dc97a9
 DIST pycharm-community-2019.3.4.tar.gz 391698063 BLAKE2B f089515412a769c7ffb88cd30aab43def64ff66a0d59ced35740efac4d604220fa5d293d8eb65eea0fc35c116f9d5f771f50f38fc1e61329507cd62070e39ad8 SHA512 0cb5684816eb739de5d106ab8262c9004914d174e89210866286841512c1aa80c00af4299c72f31c1da59c4ed92da10f423c9d5c37e53e1fe836f0586da30c6e
 DIST pycharm-community-2020.1.1.tar.gz 383138867 BLAKE2B 872c658709cab76636f864caff4be4086f861347f5591cf846f6e2b57593380d796a417a684e935b5d3cc6482d80d60f04553e1c11f31fb63554df6a683512ba SHA512 91465d6754981f88a1175ba7da40eb8aed128897b732ba598caa3dbbd6b928f56857c0e80c7bc6c27bb276ffa9a5529dbdcd4508ea1b038579bc7bf359d83ab4
+DIST pycharm-community-2020.1.3.tar.gz 384015566 BLAKE2B a8f69912d7f24ce81c0f4ab579423ef45de6be3f1a0d9d72c6a1566d28c4be41917b3a586964f0b3e7cba7a658da6e5d852d89844f0fd166919f55f3f487380a SHA512 d66f3fb07f06fbaf7282c81f9a81b3106c61d1f60c9b5acf9f512dd5ec12bc772f93192aa535823c808531aea973653b0d59aa770fe898eaa406be319b8873fe
 DIST pycharm-community-2020.1.tar.gz 382333125 BLAKE2B 5fa9000bad467784f2276286639c98509481ab3aef7482f8d0d166d058b2798fb027c037762c76dfd947376320e75f05045b34f172f849198c63950fe27d9855 SHA512 7e2663ac21536f7663910d0e2561a93869f46cc7b1d06bbc448d5afbdf89c4fcb834b9e7e3f61263e5c0a3d25caf35c663a42c6219ae2d5a67cb2516eba2e8e6
-EBUILD pycharm-community-2019.3.1.ebuild 1081 BLAKE2B d49f11879fd7738cc89bb207314120b1b4348085253d5cb6d125501e287f4ea30cfa0599d37eeec7ddff905f97786cb6a171c394ea352ebbac5d47d13e231396 SHA512 c67c25fc781b5219231b48aec8ddcd8051c23de6c4766b80d511d363c44cff1a5aaccea98d716ecb7ae4360c419bb9ea390d396704f1da11fb5c2de0ad6674ef
-EBUILD pycharm-community-2019.3.2.ebuild 1083 BLAKE2B 057214393559bdc2d33c91678fbb068fafde2ab6add11db7b70206df9c89c2645e74b85bc11b864140a92fd41c6681fd33f9bc5105e6971b4a7e4b0697b5cc5e SHA512 d698a7a3ff14fc505f3a340607c78ee5c2df2054e140a8f265ac5a9a84c6f8f12c33bee2ff063fc00c59b3df612cab0eeb4cee19db04a9efbb03e7f4242a144f
-EBUILD pycharm-community-2019.3.3.ebuild 1083 BLAKE2B 057214393559bdc2d33c91678fbb068fafde2ab6add11db7b70206df9c89c2645e74b85bc11b864140a92fd41c6681fd33f9bc5105e6971b4a7e4b0697b5cc5e SHA512 d698a7a3ff14fc505f3a340607c78ee5c2df2054e140a8f265ac5a9a84c6f8f12c33bee2ff063fc00c59b3df612cab0eeb4cee19db04a9efbb03e7f4242a144f
-EBUILD pycharm-community-2019.3.4.ebuild 1083 BLAKE2B 057214393559bdc2d33c91678fbb068fafde2ab6add11db7b70206df9c89c2645e74b85bc11b864140a92fd41c6681fd33f9bc5105e6971b4a7e4b0697b5cc5e SHA512 d698a7a3ff14fc505f3a340607c78ee5c2df2054e140a8f265ac5a9a84c6f8f12c33bee2ff063fc00c59b3df612cab0eeb4cee19db04a9efbb03e7f4242a144f
-EBUILD pycharm-community-2020.1.1.ebuild 1207 BLAKE2B 844dabe048848146e2cd78c03587106b66fc60fdbc97ca8acb4f29a3ac1591abe754cfec22de3c484a35517fc19a6c37626bb82431e10df980342af0fc71af0f SHA512 6feeba1cc6210b0521c1922452835f5ac15a17b6c6c443bec94f9c8c9c698e167915e0f022dccd1b1483d029ec594a159253527ac29b58851fcda63f8028a113
-EBUILD pycharm-community-2020.1.ebuild 1229 BLAKE2B 4d69c23b609ee5e74ec1aad7de75f649b80cbae5cf3e052659bd00e546152c0e28e75d83ff55e158cab52146f8413051e5bf3a0dd703352de9c3be7cbfdc00b1 SHA512 77f96e4e086dd25cf70b9b2568b1f2c530c5b443881136c33728d76e9880c502f678867a4dc9e0efa8c225439be66310e1fa1b9d6f454f80dc26876b164939bc
+EBUILD pycharm-community-2019.3.1.ebuild 1000 BLAKE2B 50f17b3d3ad772f9db163a67a6c26c809c98d23f0901435b8e3e6117687de1c52e47d59c6942355abbf5ca0d4756de9c1c68674d91b1dfb152c5cabacb79494c SHA512 2ea345700d58ed15634df0565ecfc81727b879a0924fadbdf3c611f5e4a81f3b857cb67b3c1e9782fa19f00f4938ed68473ca54cb3053b6e68c1b772957a7eb7
+EBUILD pycharm-community-2019.3.2.ebuild 1002 BLAKE2B eec9be9f7d3acf21cd183bd6f03ffc6641886143102a71dd4b6b66f172f76271865f6449939ab4e11523262d407effc95e93dac62fa7c1efbb93d40684706986 SHA512 9e93f4915d2c4822d3403bd237a05a3862a768b84649b9ce9204b31f0a4545f39c278aec8959c740340990d6e1d92cf02ebcc9349c65ec9f26ef73d7259e9f26
+EBUILD pycharm-community-2019.3.3.ebuild 1002 BLAKE2B eec9be9f7d3acf21cd183bd6f03ffc6641886143102a71dd4b6b66f172f76271865f6449939ab4e11523262d407effc95e93dac62fa7c1efbb93d40684706986 SHA512 9e93f4915d2c4822d3403bd237a05a3862a768b84649b9ce9204b31f0a4545f39c278aec8959c740340990d6e1d92cf02ebcc9349c65ec9f26ef73d7259e9f26
+EBUILD pycharm-community-2019.3.4.ebuild 1002 BLAKE2B eec9be9f7d3acf21cd183bd6f03ffc6641886143102a71dd4b6b66f172f76271865f6449939ab4e11523262d407effc95e93dac62fa7c1efbb93d40684706986 SHA512 9e93f4915d2c4822d3403bd237a05a3862a768b84649b9ce9204b31f0a4545f39c278aec8959c740340990d6e1d92cf02ebcc9349c65ec9f26ef73d7259e9f26
+EBUILD pycharm-community-2020.1.1.ebuild 1126 BLAKE2B 75505747c1022c043cd0b3ded83467eec60a08dd82308dbc625d7d022ab1c1f2e31d06804b8e81cf092ad5bd9a2050b0d98752111d36535814631a4f8db99b63 SHA512 71649bffc6eee5c6d182d7d04b42975a90e0a262857543cf109d0c6e3934bd8f71e331d77ff3ec90ed81ef3aeeec68e5791a6ed0a38aca0cab24dde6678420f9
+EBUILD pycharm-community-2020.1.3.ebuild 1126 BLAKE2B 75505747c1022c043cd0b3ded83467eec60a08dd82308dbc625d7d022ab1c1f2e31d06804b8e81cf092ad5bd9a2050b0d98752111d36535814631a4f8db99b63 SHA512 71649bffc6eee5c6d182d7d04b42975a90e0a262857543cf109d0c6e3934bd8f71e331d77ff3ec90ed81ef3aeeec68e5791a6ed0a38aca0cab24dde6678420f9
+EBUILD pycharm-community-2020.1.ebuild 1126 BLAKE2B 75505747c1022c043cd0b3ded83467eec60a08dd82308dbc625d7d022ab1c1f2e31d06804b8e81cf092ad5bd9a2050b0d98752111d36535814631a4f8db99b63 SHA512 71649bffc6eee5c6d182d7d04b42975a90e0a262857543cf109d0c6e3934bd8f71e331d77ff3ec90ed81ef3aeeec68e5791a6ed0a38aca0cab24dde6678420f9
 MISC metadata.xml 305 BLAKE2B 0a2bb327add477e508177540871b19dcfd282f2a140dc2be97698d5a2e4b5c0999e3137e1d4175a529604a960633aee4beb374c4b196d731ded3e1b545a2b3af SHA512 d1d991fd226ee6166b0d3460a7f7192824191aa4939503cd9792cb51e9f317442fcb9a700e1e2d8f9317e3f3e1031b1ef2594749b996d4f0f36e68047a8f37e4
diff --git a/dev-util/pycharm-community/pycharm-community-2019.3.1.ebuild b/dev-util/pycharm-community/pycharm-community-2019.3.1.ebuild
index 1a25b87bcd87..c27b0cdf1258 100644
--- a/dev-util/pycharm-community/pycharm-community-2019.3.1.ebuild
+++ b/dev-util/pycharm-community/pycharm-community-2019.3.1.ebuild
@@ -19,9 +19,7 @@ RDEPEND=">=virtual/jre-1.8
 
 RESTRICT="mirror strip"
 
-QA_PREBUILT="opt/${PN}/bin/fsnotifier
-	opt/${PN}/bin/fsnotifier64
-	opt/${PN}/bin/fsnotifier-arm"
+QA_PREBUILT="*"
 
 MY_PN=${PN/-community/}
 
diff --git a/dev-util/pycharm-community/pycharm-community-2019.3.2.ebuild b/dev-util/pycharm-community/pycharm-community-2019.3.2.ebuild
index 0600c9803a8d..77dfad45880f 100644
--- a/dev-util/pycharm-community/pycharm-community-2019.3.2.ebuild
+++ b/dev-util/pycharm-community/pycharm-community-2019.3.2.ebuild
@@ -19,9 +19,7 @@ RDEPEND=">=virtual/jre-1.8
 
 RESTRICT="mirror strip"
 
-QA_PREBUILT="opt/${PN}/bin/fsnotifier
-	opt/${PN}/bin/fsnotifier64
-	opt/${PN}/bin/fsnotifier-arm"
+QA_PREBUILT="*"
 
 MY_PN=${PN/-community/}
 
diff --git a/dev-util/pycharm-community/pycharm-community-2019.3.3.ebuild b/dev-util/pycharm-community/pycharm-community-2019.3.3.ebuild
index 0600c9803a8d..77dfad45880f 100644
--- a/dev-util/pycharm-community/pycharm-community-2019.3.3.ebuild
+++ b/dev-util/pycharm-community/pycharm-community-2019.3.3.ebuild
@@ -19,9 +19,7 @@ RDEPEND=">=virtual/jre-1.8
 
 RESTRICT="mirror strip"
 
-QA_PREBUILT="opt/${PN}/bin/fsnotifier
-	opt/${PN}/bin/fsnotifier64
-	opt/${PN}/bin/fsnotifier-arm"
+QA_PREBUILT="*"
 
 MY_PN=${PN/-community/}
 
diff --git a/dev-util/pycharm-community/pycharm-community-2019.3.4.ebuild b/dev-util/pycharm-community/pycharm-community-2019.3.4.ebuild
index 0600c9803a8d..77dfad45880f 100644
--- a/dev-util/pycharm-community/pycharm-community-2019.3.4.ebuild
+++ b/dev-util/pycharm-community/pycharm-community-2019.3.4.ebuild
@@ -19,9 +19,7 @@ RDEPEND=">=virtual/jre-1.8
 
 RESTRICT="mirror strip"
 
-QA_PREBUILT="opt/${PN}/bin/fsnotifier
-	opt/${PN}/bin/fsnotifier64
-	opt/${PN}/bin/fsnotifier-arm"
+QA_PREBUILT="*"
 
 MY_PN=${PN/-community/}
 
diff --git a/dev-util/pycharm-community/pycharm-community-2020.1.1.ebuild b/dev-util/pycharm-community/pycharm-community-2020.1.1.ebuild
index f8be402a51b3..722cecd0b2a8 100644
--- a/dev-util/pycharm-community/pycharm-community-2020.1.1.ebuild
+++ b/dev-util/pycharm-community/pycharm-community-2020.1.1.ebuild
@@ -20,9 +20,7 @@ RDEPEND="!bundled-jdk? ( >=virtual/jre-1.8 )
 
 RESTRICT="mirror strip"
 
-QA_PREBUILT="opt/${PN}/bin/fsnotifier
-	opt/${PN}/bin/fsnotifier64
-	opt/${PN}/bin/fsnotifier-arm"
+QA_PREBUILT="*"
 
 MY_PN=${PN/-community/}
 
diff --git a/dev-util/pycharm-community/pycharm-community-2020.1.3.ebuild b/dev-util/pycharm-community/pycharm-community-2020.1.3.ebuild
new file mode 100644
index 000000000000..722cecd0b2a8
--- /dev/null
+++ b/dev-util/pycharm-community/pycharm-community-2020.1.3.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils readme.gentoo-r1 xdg
+
+DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
+HOMEPAGE="http://www.jetbrains.com/pycharm/"
+SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD CDDL MIT-with-advertising"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+bundled-jdk"
+
+RDEPEND="!bundled-jdk? ( >=virtual/jre-1.8 )
+	dev-libs/libdbusmenu
+	dev-python/pip"
+
+RESTRICT="mirror strip"
+
+QA_PREBUILT="*"
+
+MY_PN=${PN/-community/}
+
+src_install() {
+	insinto /opt/${PN}
+	doins -r *
+
+	if use bundled-jdk; then
+		fperms -R a+x /opt/pycharm-community/jbr/bin/
+	else
+		rm -r "${D}"/opt/pycharm-community/jbr/ || die
+	fi
+
+	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
+
+	dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
+	newicon bin/${MY_PN}.png ${PN}.png
+	make_desktop_entry ${PN} ${PN} ${PN}
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_icon_cache_update
+}
diff --git a/dev-util/pycharm-community/pycharm-community-2020.1.ebuild b/dev-util/pycharm-community/pycharm-community-2020.1.ebuild
index e8f27505a926..722cecd0b2a8 100644
--- a/dev-util/pycharm-community/pycharm-community-2020.1.ebuild
+++ b/dev-util/pycharm-community/pycharm-community-2020.1.ebuild
@@ -20,10 +20,7 @@ RDEPEND="!bundled-jdk? ( >=virtual/jre-1.8 )
 
 RESTRICT="mirror strip"
 
-QA_PREBUILT="opt/${PN}/bin/fsnotifier
-	opt/${PN}/bin/fsnotifier64
-	opt/${PN}/bin/fsnotifier-arm
-	/opt/${PN}/jbr/bin/*"
+QA_PREBUILT="*"
 
 MY_PN=${PN/-community/}
 
diff --git a/dev-util/pycharm-professional/Manifest b/dev-util/pycharm-professional/Manifest
index 039ab8016c61..f1a0900fd494 100644
--- a/dev-util/pycharm-professional/Manifest
+++ b/dev-util/pycharm-professional/Manifest
@@ -4,11 +4,13 @@ DIST pycharm-professional-2019.3.2.tar.gz 513486485 BLAKE2B eba9f0adb8f289f42ee2
 DIST pycharm-professional-2019.3.3.tar.gz 513714430 BLAKE2B 7891d5290b87d8f01904860a80f2a5b7e90e41bf894decbdf04f5f322ed269eaf042954ad17656594ee85dc5518cbc69ea4c6b12b9f3febeb068021751fba5d8 SHA512 33f40be3f20370a0a62833510ed9c69b0a022e9298540bea0287038edfd6c8362cee1eb26592279728bf57f41bba2c921400ac56d4b371c8a3881d4f978115a0
 DIST pycharm-professional-2019.3.4.tar.gz 513944449 BLAKE2B 9f925eb48385abb57a833c8bd73307ba593fbea8ceae4df999b6c2a9ec54916e7e16d4ce8ed212842b1fc4f5383fac40fe6cc2ce5e99336852a96a2655c8e358 SHA512 187dd385ec07c908b13060135f1663cb5678ba82d017192ae0a4d2a8bf0f1e0ff51ec52f9b0fdc15d96f42808f801a971391de455afb52ea55cfb5f6d024d813
 DIST pycharm-professional-2020.1.1.tar.gz 507346192 BLAKE2B eb035967475fa1baf7833cf0b4ea18a7870e9ddeb68cef1ed6eaa0690ae21cb2482a61138cfe230928aa41a65e6f78078107d44b6c98b1ace7e6de22af5db555 SHA512 222f2e7284fb77018ace14907da6fbbe58bb8411f71aef9b2875e8c375ea2754a8595bfe9b5847bcfde2f8d59d0480f8fb4acf342231933a58f0f99fafc5a48d
+DIST pycharm-professional-2020.1.3.tar.gz 508036989 BLAKE2B 13bca1d093596bfedcad3c7837ab26c21631d15b5dce9ca62798baab281a7a4736e35fcbd96acc94b8e336119398c82c23583798ad53555eb8f1eac86febf031 SHA512 57a7878d3ee817778c7e1087d97e4d7a615fdd2f987fafecf4c6bcd7e1c0e7c1cb4411283214849cbd76fa92a2b98a074045b52cf1cd306f2e2995ed3b53e0e0
 DIST pycharm-professional-2020.1.tar.gz 507643980 BLAKE2B f0869ebec8ae6396a4ff9579214a913be631d52e67cf12b437800a6f3292c96bef67b8b813bb9d703a2b6893ad27835a6868cce5ac4f3db818bacc2de4aed87c SHA512 23737bdd8bafb57dab794b4c874e6d14bb3b2591706bf13a835b0172fbe914ade932c701a313d982d7c393d02b15629a8273f3be092a92178ed0bfd4eff9baa5
-EBUILD pycharm-professional-2019.3.1.ebuild 1225 BLAKE2B f391b217ab5e079cea973682a259b5c9e2a538f81536c6d52134b6316239e11bee5badf789db2850c6241b448691c8101b44d5d1b562c8c27e2cc67902b8b203 SHA512 5fa13adbab2a9e321d955dd66fd3788a3a27dcb40a8214ebb100d6fc71abc357cbd1c10b0dd5468dbfef5a4c19c61779fd9e1e26e9c6face057e25d9ffedcc0b
-EBUILD pycharm-professional-2019.3.2.ebuild 1227 BLAKE2B 32b33249906a636ce0a79164c09470c742bb7a207300c347b9fcd4c5ef660b917e58df07adfed39f8cd3d44a9905eecddb96969cb2860b9acbdd1c743fb15613 SHA512 185ca8aa08be3fefb66efd0e8e8d0fa6ca3b7f363fee26c5d152f66b29ac08fc2dbb9b99f0ce611237c5e76f33be8fba61354eb607825a4c8801b18cb9abce51
-EBUILD pycharm-professional-2019.3.3.ebuild 1227 BLAKE2B 32b33249906a636ce0a79164c09470c742bb7a207300c347b9fcd4c5ef660b917e58df07adfed39f8cd3d44a9905eecddb96969cb2860b9acbdd1c743fb15613 SHA512 185ca8aa08be3fefb66efd0e8e8d0fa6ca3b7f363fee26c5d152f66b29ac08fc2dbb9b99f0ce611237c5e76f33be8fba61354eb607825a4c8801b18cb9abce51
-EBUILD pycharm-professional-2019.3.4.ebuild 1227 BLAKE2B 32b33249906a636ce0a79164c09470c742bb7a207300c347b9fcd4c5ef660b917e58df07adfed39f8cd3d44a9905eecddb96969cb2860b9acbdd1c743fb15613 SHA512 185ca8aa08be3fefb66efd0e8e8d0fa6ca3b7f363fee26c5d152f66b29ac08fc2dbb9b99f0ce611237c5e76f33be8fba61354eb607825a4c8801b18cb9abce51
-EBUILD pycharm-professional-2020.1.1.ebuild 1357 BLAKE2B b8f06bdc4dc28720cc57ba28816a2620e1ed5a074c629754c9e2167bd156417e67927992066849ac72506d242d786b9e4259fd4409de8e95ce5d8deacb74d78a SHA512 47ab4b4fc6f3723b1f96f781000eed81f8b8e3ade754dcccc30419acc26c233fe71c008db6a4fda7eb04725f60f3393393bf5630d94f18b79f01889d763c1a92
-EBUILD pycharm-professional-2020.1.ebuild 1357 BLAKE2B b8f06bdc4dc28720cc57ba28816a2620e1ed5a074c629754c9e2167bd156417e67927992066849ac72506d242d786b9e4259fd4409de8e95ce5d8deacb74d78a SHA512 47ab4b4fc6f3723b1f96f781000eed81f8b8e3ade754dcccc30419acc26c233fe71c008db6a4fda7eb04725f60f3393393bf5630d94f18b79f01889d763c1a92
+EBUILD pycharm-professional-2019.3.1.ebuild 1070 BLAKE2B 76b072d78b685590ead13e288e125e6d29feaf090ff6b7f65af5b1b8ba0e9a773ad6a40d3141fa7f6c54a01142b1ba34f8311361b581057a83a04e4fa86c6989 SHA512 b59cbf885667cb316169e3d2e2fad32d97f384715909a994852fb4783c88e83242abea28c75ab32e114f08fbbacd6a06ece1fbe0849310c213ddd399ec174853
+EBUILD pycharm-professional-2019.3.2.ebuild 1072 BLAKE2B 71695bcbc8561ecf5a0e3ee012969443bdc9a595f54e42857908216f14b47007b8f161f123db642a427e54dc5d53cfe3f2e66d1d18fff7767ae94f2998a5829a SHA512 7ad674f1c7077e9ca26cce5005e631d66d689187b78520d28b14b9a13dc1fa4b9749c5857214c12a3110e02c2e63ba17a9f6c2a471ece4773a0159b0e476b7ac
+EBUILD pycharm-professional-2019.3.3.ebuild 1072 BLAKE2B 71695bcbc8561ecf5a0e3ee012969443bdc9a595f54e42857908216f14b47007b8f161f123db642a427e54dc5d53cfe3f2e66d1d18fff7767ae94f2998a5829a SHA512 7ad674f1c7077e9ca26cce5005e631d66d689187b78520d28b14b9a13dc1fa4b9749c5857214c12a3110e02c2e63ba17a9f6c2a471ece4773a0159b0e476b7ac
+EBUILD pycharm-professional-2019.3.4.ebuild 1072 BLAKE2B 71695bcbc8561ecf5a0e3ee012969443bdc9a595f54e42857908216f14b47007b8f161f123db642a427e54dc5d53cfe3f2e66d1d18fff7767ae94f2998a5829a SHA512 7ad674f1c7077e9ca26cce5005e631d66d689187b78520d28b14b9a13dc1fa4b9749c5857214c12a3110e02c2e63ba17a9f6c2a471ece4773a0159b0e476b7ac
+EBUILD pycharm-professional-2020.1.1.ebuild 1202 BLAKE2B c62b786e55539696fd4494546afe2a848c65e0e397709959b316d2092b27c790593d941f542de9c3e198468c3f5727faeb432c56d533a2f94b52c2f39100548a SHA512 12a116cf5b92bd4a4df64a38353f2cb859f80ddacb1007b76adc95b6e92b3a38261aa91b6df6b7883253fff5fd8678cdb7ef31e0d7af9ce9dfd3d2f1aca8ad0f
+EBUILD pycharm-professional-2020.1.3.ebuild 1202 BLAKE2B c62b786e55539696fd4494546afe2a848c65e0e397709959b316d2092b27c790593d941f542de9c3e198468c3f5727faeb432c56d533a2f94b52c2f39100548a SHA512 12a116cf5b92bd4a4df64a38353f2cb859f80ddacb1007b76adc95b6e92b3a38261aa91b6df6b7883253fff5fd8678cdb7ef31e0d7af9ce9dfd3d2f1aca8ad0f
+EBUILD pycharm-professional-2020.1.ebuild 1202 BLAKE2B c62b786e55539696fd4494546afe2a848c65e0e397709959b316d2092b27c790593d941f542de9c3e198468c3f5727faeb432c56d533a2f94b52c2f39100548a SHA512 12a116cf5b92bd4a4df64a38353f2cb859f80ddacb1007b76adc95b6e92b3a38261aa91b6df6b7883253fff5fd8678cdb7ef31e0d7af9ce9dfd3d2f1aca8ad0f
 MISC metadata.xml 305 BLAKE2B 0a2bb327add477e508177540871b19dcfd282f2a140dc2be97698d5a2e4b5c0999e3137e1d4175a529604a960633aee4beb374c4b196d731ded3e1b545a2b3af SHA512 d1d991fd226ee6166b0d3460a7f7192824191aa4939503cd9792cb51e9f317442fcb9a700e1e2d8f9317e3f3e1031b1ef2594749b996d4f0f36e68047a8f37e4
diff --git a/dev-util/pycharm-professional/pycharm-professional-2019.3.1.ebuild b/dev-util/pycharm-professional/pycharm-professional-2019.3.1.ebuild
index 849067cbac14..678583b314f9 100644
--- a/dev-util/pycharm-professional/pycharm-professional-2019.3.1.ebuild
+++ b/dev-util/pycharm-professional/pycharm-professional-2019.3.1.ebuild
@@ -19,11 +19,7 @@ RDEPEND=">=virtual/jre-1.8
 
 RESTRICT="mirror strip"
 
-QA_PREBUILT="opt/${PN}/bin/fsnotifier
-	opt/${PN}/bin/fsnotifier64
-	opt/${PN}/bin/fsnotifier-arm
-	opt/${PN}/bin/libyjpagent-linux.so
-	opt/${PN}/bin/libyjpagent-linux64.so"
+QA_PREBUILT="*"
 
 MY_PN=${PN/-professional/}
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-util/pycharm-professional/pycharm-professional-2019.3.2.ebuild b/dev-util/pycharm-professional/pycharm-professional-2019.3.2.ebuild
index bb09db041ff9..65ce101fe2d0 100644
--- a/dev-util/pycharm-professional/pycharm-professional-2019.3.2.ebuild
+++ b/dev-util/pycharm-professional/pycharm-professional-2019.3.2.ebuild
@@ -19,11 +19,7 @@ RDEPEND=">=virtual/jre-1.8
 
 RESTRICT="mirror strip"
 
-QA_PREBUILT="opt/${PN}/bin/fsnotifier
-	opt/${PN}/bin/fsnotifier64
-	opt/${PN}/bin/fsnotifier-arm
-	opt/${PN}/bin/libyjpagent-linux.so
-	opt/${PN}/bin/libyjpagent-linux64.so"
+QA_PREBUILT="*"
 
 MY_PN=${PN/-professional/}
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-util/pycharm-professional/pycharm-professional-2019.3.3.ebuild b/dev-util/pycharm-professional/pycharm-professional-2019.3.3.ebuild
index bb09db041ff9..65ce101fe2d0 100644
--- a/dev-util/pycharm-professional/pycharm-professional-2019.3.3.ebuild
+++ b/dev-util/pycharm-professional/pycharm-professional-2019.3.3.ebuild
@@ -19,11 +19,7 @@ RDEPEND=">=virtual/jre-1.8
 
 RESTRICT="mirror strip"
 
-QA_PREBUILT="opt/${PN}/bin/fsnotifier
-	opt/${PN}/bin/fsnotifier64
-	opt/${PN}/bin/fsnotifier-arm
-	opt/${PN}/bin/libyjpagent-linux.so
-	opt/${PN}/bin/libyjpagent-linux64.so"
+QA_PREBUILT="*"
 
 MY_PN=${PN/-professional/}
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-util/pycharm-professional/pycharm-professional-2019.3.4.ebuild b/dev-util/pycharm-professional/pycharm-professional-2019.3.4.ebuild
index bb09db041ff9..65ce101fe2d0 100644
--- a/dev-util/pycharm-professional/pycharm-professional-2019.3.4.ebuild
+++ b/dev-util/pycharm-professional/pycharm-professional-2019.3.4.ebuild
@@ -19,11 +19,7 @@ RDEPEND=">=virtual/jre-1.8
 
 RESTRICT="mirror strip"
 
-QA_PREBUILT="opt/${PN}/bin/fsnotifier
-	opt/${PN}/bin/fsnotifier64
-	opt/${PN}/bin/fsnotifier-arm
-	opt/${PN}/bin/libyjpagent-linux.so
-	opt/${PN}/bin/libyjpagent-linux64.so"
+QA_PREBUILT="*"
 
 MY_PN=${PN/-professional/}
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-util/pycharm-professional/pycharm-professional-2020.1.1.ebuild b/dev-util/pycharm-professional/pycharm-professional-2020.1.1.ebuild
index 921e9c358e61..035932264b04 100644
--- a/dev-util/pycharm-professional/pycharm-professional-2020.1.1.ebuild
+++ b/dev-util/pycharm-professional/pycharm-professional-2020.1.1.ebuild
@@ -20,11 +20,7 @@ RDEPEND="!bundled-jdk? ( >=virtual/jre-1.8 )
 
 RESTRICT="mirror strip"
 
-QA_PREBUILT="opt/${PN}/bin/fsnotifier
-	opt/${PN}/bin/fsnotifier64
-	opt/${PN}/bin/fsnotifier-arm
-	opt/${PN}/bin/libyjpagent-linux.so
-	opt/${PN}/bin/libyjpagent-linux64.so"
+QA_PREBUILT="*"
 
 MY_PN=${PN/-professional/}
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-util/pycharm-professional/pycharm-professional-2020.1.3.ebuild b/dev-util/pycharm-professional/pycharm-professional-2020.1.3.ebuild
new file mode 100644
index 000000000000..035932264b04
--- /dev/null
+++ b/dev-util/pycharm-professional/pycharm-professional-2020.1.3.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils readme.gentoo-r1 xdg
+
+DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
+HOMEPAGE="http://www.jetbrains.com/pycharm/"
+SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
+
+LICENSE="PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+bundled-jdk"
+
+RDEPEND="!bundled-jdk? ( >=virtual/jre-1.8 )
+	dev-libs/libdbusmenu
+	dev-python/pip"
+
+RESTRICT="mirror strip"
+
+QA_PREBUILT="*"
+
+MY_PN=${PN/-professional/}
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_install() {
+	insinto /opt/${PN}
+	doins -r *
+
+	if use bundled-jdk; then
+		fperms -R a+x /opt/pycharm-professional/jbr/bin/
+	else
+		rm -r "${D}"/opt/pycharm-professional/jbr/ || die
+	fi
+
+	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
+
+	dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
+	newicon bin/${MY_PN}.png ${PN}.png
+	make_desktop_entry ${PN} ${PN} ${PN}
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_icon_cache_update
+}
diff --git a/dev-util/pycharm-professional/pycharm-professional-2020.1.ebuild b/dev-util/pycharm-professional/pycharm-professional-2020.1.ebuild
index 921e9c358e61..035932264b04 100644
--- a/dev-util/pycharm-professional/pycharm-professional-2020.1.ebuild
+++ b/dev-util/pycharm-professional/pycharm-professional-2020.1.ebuild
@@ -20,11 +20,7 @@ RDEPEND="!bundled-jdk? ( >=virtual/jre-1.8 )
 
 RESTRICT="mirror strip"
 
-QA_PREBUILT="opt/${PN}/bin/fsnotifier
-	opt/${PN}/bin/fsnotifier64
-	opt/${PN}/bin/fsnotifier-arm
-	opt/${PN}/bin/libyjpagent-linux.so
-	opt/${PN}/bin/libyjpagent-linux64.so"
+QA_PREBUILT="*"
 
 MY_PN=${PN/-professional/}
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-util/qdevicemonitor/Manifest b/dev-util/qdevicemonitor/Manifest
index 045a4257aaf3..bf9722c3435f 100644
--- a/dev-util/qdevicemonitor/Manifest
+++ b/dev-util/qdevicemonitor/Manifest
@@ -1,7 +1,8 @@
 AUX qdevicemonitor-1.0.1-crash-after-fresh-install.patch 982 BLAKE2B d88a3ae59fbb5880c0138339384f7b326720f100207ff98af2ef698c13cf5e5d0801bb6da8d3643c148468139599934ffb69dc1f59a074cef8b7b23b4364b2ce SHA512 e3d2b2e375147397d40aec553843cbf8213941cd1ac359e09f24fd16c7f70f96058bc06c68952d514683fe9371e90181691aace0d949aec18e8bfcd0f0f96170
+AUX qdevicemonitor-1.0.1-endl-is-deprecated.patch 839 BLAKE2B 87f40970a9f4f068fd3636bfa9cb31429a5b7793c7de0ebe82037fe5ab9b74c0856e9f8ffb3aa447f36aecb9bdac3f7d63f47f5abcbfbb2457292dabc00d1adc SHA512 19d21cb203e8fb67292272a9181bb205c35b4e9052a62dfc59e1aa31187ac59a3c9cae08a9b82633b748b2e3a2b5d1282fcfffc9a4333fdd233b881d8f638e34
 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 1072 BLAKE2B 5b1f50157458fe1f8e2a2bb25fd5c23762431053b20d61425a5823917b3800cdce84e4834e35fd8c8c4ceda8063aafb20ca75694e72eb50d1dba7913f468015f SHA512 fcd5d8ccbb8b66c34ce1168d34f13b59ba666533826cfb1b359a6f1d95bcaed7852bd582ee4d78bb58b53d88c8a321017297d19b00bb9c3ab1ec1910b3bae26d
-EBUILD qdevicemonitor-9999.ebuild 919 BLAKE2B a0eee1acf84a3ba82e76b3a42a315352da8bdcb25e6f078a4ead7e90c9829efc3eb0da08f4657b5bb569161b910f1fc6e8ab1d584817e62bd2564396bfbb6466 SHA512 6f82903b9aefcef70c88766a5907e1dd14ec1bbdd9163eec724b8c6cb6c23e2ab0375796f443c73fd1944d1dbb0782c8c2a32a426a07becaefe06e38e0423f70
+EBUILD qdevicemonitor-1.0.1-r2.ebuild 1115 BLAKE2B 7a4b815218506b0338ccaed0b9e54475308b3b76609aa552c8e422dab44c9070f2fd0959003bda15bae966c3017c7773ce3e7cd5d64f2ff421592a989da3d0eb SHA512 4460208b426c43fe396ddf6bd473a85cc3dabcf5ebc04ae90e131236f207f37e147a32978598b8e866cff427b553a828710d4d2237732a321807918cdba7a623
+EBUILD qdevicemonitor-9999.ebuild 915 BLAKE2B e05fb16f77410c0478ad212b0ae18616cc8c98072b1c06e81163df9fa55694af652eeaf6d5aba943ceb9c999187210922827d12d4cd41425279e1ecad8ef5fdc SHA512 4088257b67415a9ec932ab62b2ecdaada1c544df2f828279249a49b5346a8fa3dd906561cf2549212e0caebcac8b43c7c8cf725d01c9c778193a0de9b3f16be9
 MISC metadata.xml 462 BLAKE2B 73aba43e52e799e289409d8c39de41eac87c5049a13ec1bac10ba66c309ff286d09708b30d8ee5362bb9be7e04053ec85d13628329286bfbfa374a2694e84c02 SHA512 c5211a1c7bb8b223854560f45bbdf117e92aa17a513b59ccbea2670c7334e3e1850244c636348f61f0200380601a38a8c0a833c36f9d291984ef0ec643fd41ec
diff --git a/dev-util/qdevicemonitor/files/qdevicemonitor-1.0.1-endl-is-deprecated.patch b/dev-util/qdevicemonitor/files/qdevicemonitor-1.0.1-endl-is-deprecated.patch
new file mode 100644
index 000000000000..27acb5d8ffba
--- /dev/null
+++ b/dev-util/qdevicemonitor/files/qdevicemonitor-1.0.1-endl-is-deprecated.patch
@@ -0,0 +1,27 @@
+From 9808ae3279e5816dcc85cf8f21158ecf842dc185 Mon Sep 17 00:00:00 2001
+From: Alexander Lopatin <alopatindev@gmail.com>
+Date: Sat, 11 Jul 2020 03:18:14 +0300
+Subject: [PATCH] Fix "dev-util/qdevicemonitor-1.0.1-r2 : main.cpp: error:
+ QTextStream& QTextStreamFunctions::endl(QTextStream&) is deprecated: Use
+ Qt::endl [-Werror=deprecated-declarations]" https://bugs.gentoo.org/732088
+
+---
+ qdevicemonitor/main.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/qdevicemonitor/main.cpp b/qdevicemonitor/main.cpp
+index 46f80a5..9d3fe73 100644
+--- a/qdevicemonitor/main.cpp
++++ b/qdevicemonitor/main.cpp
+@@ -43,7 +43,7 @@ void logOutput(QtMsgType type, const QMessageLogContext& context, const QString&
+             << ")";
+     }
+ 
+-    out << endl;
++    out << Qt::endl;
+ }
+ 
+ int main(int argc, char* argv[])
+-- 
+2.26.2
+
diff --git a/dev-util/qdevicemonitor/qdevicemonitor-1.0.1-r2.ebuild b/dev-util/qdevicemonitor/qdevicemonitor-1.0.1-r2.ebuild
index fd543ed3980a..0dbd37d4f29c 100644
--- a/dev-util/qdevicemonitor/qdevicemonitor-1.0.1-r2.ebuild
+++ b/dev-util/qdevicemonitor/qdevicemonitor-1.0.1-r2.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
 inherit desktop qmake-utils
 
 DESCRIPTION="Crossplatform log viewer for Android, iOS and text files"
 HOMEPAGE="https://github.com/alopatindev/qdevicemonitor"
 
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == *9999* ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/alopatindev/${PN}"
 else
@@ -21,16 +21,17 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
+	app-pda/usbmuxd
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
-	dev-util/android-tools
-	app-pda/usbmuxd"
+	dev-util/android-tools"
 DEPEND="${RDEPEND}"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-qt-5.11.patch
 	"${FILESDIR}"/${P}-crash-after-fresh-install.patch
 	"${FILESDIR}"/${P}-screen-geometry-is-deprecated.patch
+	"${FILESDIR}"/${P}-endl-is-deprecated.patch
 )
 
 src_configure() {
diff --git a/dev-util/qdevicemonitor/qdevicemonitor-9999.ebuild b/dev-util/qdevicemonitor/qdevicemonitor-9999.ebuild
index c055bb2fca97..0dd22c27ff48 100644
--- a/dev-util/qdevicemonitor/qdevicemonitor-9999.ebuild
+++ b/dev-util/qdevicemonitor/qdevicemonitor-9999.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
-inherit eutils qmake-utils
+inherit desktop qmake-utils
 
 DESCRIPTION="Crossplatform log viewer for Android, iOS and text files"
 HOMEPAGE="https://github.com/alopatindev/qdevicemonitor"
 
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == *9999* ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/alopatindev/${PN}"
 else
@@ -21,10 +21,10 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
+	app-pda/usbmuxd
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
-	dev-util/android-tools
-	app-pda/usbmuxd"
+	dev-util/android-tools"
 DEPEND="${RDEPEND}"
 
 src_configure() {
diff --git a/dev-util/qmtest/Manifest b/dev-util/qmtest/Manifest
deleted file mode 100644
index 12e296ad4909..000000000000
--- a/dev-util/qmtest/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST qmtest-2.4.1.tar.gz 2792290 BLAKE2B 315ae4f79630d367e9b8198811975600f43eec3c2e9cb253fce2523f92a59536a23a7c299094b060292c9719f6edcae521faa4a300b367a226da8597b6fbaac9 SHA512 01a8b317fd5ae3d653b81d031005975d745829eda4b7d4d57c85cc13b71c142213dce053ba13999bf42a1b9b17118075e2c244c67e5c4c8a957d35d2850ae372
-EBUILD qmtest-2.4.1-r1.ebuild 806 BLAKE2B e653e73b7d574ad8bd7b9d770363804a17b305c572ca07287b351a83f7158775e419c86e8ac6a11765ba9fb35f67c8d732cfa8ef3cf3a1e488dc5b93ac1e6846 SHA512 ba57ad071066f58d69058edffbeebec874daf0317cfbd3cb32ecdb817333d6d2aee4798e1c1d48f11c4c75a785a6747a5d19c38a422892e2a5cda6adcfb12e89
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/qmtest/metadata.xml b/dev-util/qmtest/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/dev-util/qmtest/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/dev-util/qmtest/qmtest-2.4.1-r1.ebuild b/dev-util/qmtest/qmtest-2.4.1-r1.ebuild
deleted file mode 100644
index 93ad4a8feb92..000000000000
--- a/dev-util/qmtest/qmtest-2.4.1-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1
-
-DESCRIPTION="CodeSourcery's test harness system"
-HOMEPAGE="http://www.codesourcery.com/qmtest/"
-SRC_URI="http://www.codesourcery.com/public/${PN}/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~mips x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_install() {
-	distutils-r1_src_install
-	find "${ED}" -name config.py -print0 | xargs -0 sed -i "s:${ED}:${EPREFIX}/usr:"
-	rm -r "${ED}"usr/share/doc/${PN}/{COPYING,LICENSE.OPL} || die
-	mv "${ED}"usr/share/doc/${PN}/* "${ED}"usr/share/doc/${PF} || die
-	rm -r "${ED}"/usr/share/doc/${PN} || die
-}
diff --git a/dev-util/qstlink2/Manifest b/dev-util/qstlink2/Manifest
index 5fc1f1ee4678..3c544c2878ab 100644
--- a/dev-util/qstlink2/Manifest
+++ b/dev-util/qstlink2/Manifest
@@ -1,4 +1,4 @@
 DIST qstlink2-1.2.3.tar.gz 681169 BLAKE2B e1ebf6a30de3724eedcc5fa00f8a9a79e6fd038b6276dfc424a7d78f8b55b99173037c47fbdba85bbb69a7530682bd3616e185a1bb9882c686b8c3ee34105a7c SHA512 13c06a53f44acc99e620c89052fc2f128076e3aec1cac76ddcee76a49ed473d5ef816d77fc5be23d125bbb16306c176f54c2d611c88d2b9c6e7954752a96c7e8
 DIST qtusb-0.2.1.tar.gz 47928 BLAKE2B 5215e726c111d1835033848ee9d5e3d85c4a1d47be20d04423f5c1582251f75b0cf0272028d307a7a37df1f4533f04189f9660f62a0c5461c9ac803ee8d33aac SHA512 76e6df81d9bbd5725a113932506bd6541d0bb32301ead03d92faf1f0fa4dc68749e2728d8bf3fe8efefd00a3774b46f0c8f81be8028a2c5ceb6bc1b6d36da38d
-EBUILD qstlink2-1.2.3.ebuild 899 BLAKE2B b1d806b3e66a3903bb89fe8b7ea327bef879f08a4d073cafe64dae432ca2abb261e73f6775e213615002cd967220436ccdb1a13ed950c0ea42317620adfeb9f6 SHA512 76821723e8d535eacf61cc7519922ef064f98a04a8f2a22263a3d2e7c01c6bdf99e1afe3088e20ef4b6de75e1c6b5648cc953cd76184eef6944a2b3159aba63f
-MISC metadata.xml 626 BLAKE2B ba349e967f446ed21c1df37f7433be4e009f28a161745fbc3b886544820f17b4e0c3fce00f411b2e0308106d0c19f821ef3ce83e0c44b8e522640b13081131a4 SHA512 5b086323c16218c71c03a9dff91e7c95a3be54c82a871ce3e653a5208876c08d18e4292e9126e49224e65b93315ec2e3ae82a09eede155c5f705e432ac8603a1
+EBUILD qstlink2-1.2.3.ebuild 896 BLAKE2B bff4a85e44a9d3c953dec3d8038babd412f7f872974d2cda1bf9ad86d44b4890d93f6ac48173ed571bc91bb408c45d689988f92f4e7d2b79f59c2f02c1e35c50 SHA512 ce9a1960c7f2d93ab3e16131662e3be5793ce7fe1fc4eee84c8d11c20dded840d33446da8151069b9fc94f6d33f9e5a10c0684f81f3997b30ceb72905355e39b
+MISC metadata.xml 593 BLAKE2B 8e1e6002217c771828cabce29eb7a4392412d9fa388f3e76e9db83e232f586b87e77114d2d3b6c4162427027237020431dfdea2287924539a3d0c1be3dd0d87a SHA512 db483eeddccf6c2642e090c8ae0136e028156ec05152b5fc3ac9cf60fa59310cac3cb6477f4c5d7c09c0fa4b3abe1b7535d402203a23ef4f0e3fe1094a4cebec
diff --git a/dev-util/qstlink2/metadata.xml b/dev-util/qstlink2/metadata.xml
index a8644ee61d15..caa2d5863828 100644
--- a/dev-util/qstlink2/metadata.xml
+++ b/dev-util/qstlink2/metadata.xml
@@ -3,16 +3,14 @@
 <pkgmetadata>
 	<maintainer type="person">
 		<email>no111u3@gmail.com</email>
-		<name>Boris Vinogradov</name>
+		<name>Boris Vingradov</name>
 	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<longdescription>
-		This is a ST-Link V2 (Debugger/Programmer) client developped for Linux, OSX and Windows.
-
-		It is developped using QT and LibUsb/WinUsb. 
+		ST-Link V2 (Debugger/Programmer) client developed for Linux, OSX and Windows, using Qt and LibUsb/WinUsb.
 	</longdescription>
 	<upstream>
 		<remote-id type="github">mobyfab/qstlink2</remote-id>
diff --git a/dev-util/qstlink2/qstlink2-1.2.3.ebuild b/dev-util/qstlink2/qstlink2-1.2.3.ebuild
index 680f49ef0ce4..738c3c973869 100644
--- a/dev-util/qstlink2/qstlink2-1.2.3.ebuild
+++ b/dev-util/qstlink2/qstlink2-1.2.3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 QTUSB_VER=0.2.1
 inherit qmake-utils udev
diff --git a/dev-util/radare2/Manifest b/dev-util/radare2/Manifest
index ba467478954a..3485631d56b9 100644
--- a/dev-util/radare2/Manifest
+++ b/dev-util/radare2/Manifest
@@ -1,6 +1,4 @@
-AUX radare2-4.4.0-AR.patch 412 BLAKE2B b4049473999a4f8fb6a4a82e4059aaf1f1d34c8472075a8dee0645fa839d052813dbe1f2128f3ee4a234e7700f12e0800f7a75c9839011416ac6baf05e3ef8d9 SHA512 a6dcebd239a76b598c4b4c11fdff607204da4cfd6c415018a45f74a700fbc6bb7873f3c9fc46394a16fcf0579ef2477dd00baa3d48e96ebdc74369a45980e3a5
-AUX radare2-4.4.0-RANLIB.patch 403 BLAKE2B 0086dff0a9ed8b7c6ac9a0dd55cf81ff656e8947738b95009455de7d2b3564574d9103c42e69c90463aa775283b065e6b3a0937c219d0e3ffdeb02252ea75de5 SHA512 9f0892e97d5e7944bc36e5b336b309e7ed5d57a04d9505e8f826dbe3a41c0b9599c96c3ea001b9e16f5e95d8283b67c20a710f952603e4af72922b5567998aa8
-DIST radare2-4.4.0.tar.gz 8135544 BLAKE2B 1a1a4ce97dde4b8985cbe95bb889bfdef8f9d64e2c2257030fda523b1a1aced4e6681bc0f7b14d1a3f25fbce355f2062f0edc33ab396bef98792d29d1f708a11 SHA512 6208d97f8333e72dfd04cccdb0234b60fb8979ca559b92532bf7e47d402f91e0c54678a83e6bafee65666fb7d6008b44b961600f24f9b3275cb2eec32490eaa5
-EBUILD radare2-4.4.0-r1.ebuild 1368 BLAKE2B 94524e049c09d0dd38750e5610ed34913ec1137ccb861d3b1eddacd78d2fae0126163e52f84f707ebf0e6247e06da57aabb408bb6e58a41e36ca75fdf76cdb50 SHA512 2e1716c3545ea7c2f1e2c9c70f2c059fc968c86a0e0b22760a2034ab7e1797ce59610e9c728cddd27a2748f72c9bed9994b030161dc9565dbbf5906ac47e92de
+DIST radare2-4.5.0.tar.gz 8265716 BLAKE2B 5288b393eb40f0f9355ad44a102a768924775ce11d126477d89a77d4dbb885556371125ea9f54ce81216bcef25387b816ab679b99a2e6c31c7f48db13ccc4774 SHA512 84d4ffc28f499f4360f57f31ad1b1f4b2a14e7fcbde7198bfb9ec4a85ac6606ceb5b28602624d6419b14b1586afd50330ace6232a183d7bfb876fefe07ea7bf4
+EBUILD radare2-4.5.0.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/files/radare2-4.4.0-AR.patch b/dev-util/radare2/files/radare2-4.4.0-AR.patch
deleted file mode 100644
index 406bd7ab0046..000000000000
--- a/dev-util/radare2/files/radare2-4.4.0-AR.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-
---- a/mk/clang.mk
-+++ b/mk/clang.mk
-@@ -3,7 +3,8 @@ _INCLUDE_MK_CLANG_=1
- CC?=clang
- RANLIB=ranlib
- ONELIB=0
--CC_AR=ar q ${LIBAR}
-+AR?=ar
-+CC_AR=$(AR) q ${LIBAR}
- CFLAGS+=-MD
- CFLAGS_INCLUDE=-I
- LDFLAGS_LINK=-l
---- a/mk/gcc.mk
-+++ b/mk/gcc.mk
-@@ -4,7 +4,8 @@ CC?=gcc
- OBJCOPY=objcopy
- RANLIB=ranlib
- ONELIB=0
--CC_AR=ar q ${LIBAR}
-+AR?=ar
-+CC_AR=$(AR) q ${LIBAR}
- CFLAGS+=-MD
- CFLAGS_INCLUDE=-I
- LDFLAGS_LINK=-l
diff --git a/dev-util/radare2/files/radare2-4.4.0-RANLIB.patch b/dev-util/radare2/files/radare2-4.4.0-RANLIB.patch
deleted file mode 100644
index 6ce007a5278f..000000000000
--- a/dev-util/radare2/files/radare2-4.4.0-RANLIB.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/mk/clang.mk
-+++ b/mk/clang.mk
-@@ -1,7 +1,7 @@
- ifeq (${_INCLUDE_MK_CLANG_},)
- _INCLUDE_MK_CLANG_=1
- CC?=clang
--RANLIB=ranlib
-+RANLIB?=ranlib
- ONELIB=0
- AR?=ar
- CC_AR=$(AR) q ${LIBAR}
---- a/mk/gcc.mk
-+++ b/mk/gcc.mk
-@@ -1,8 +1,8 @@
- ifeq (${_INCLUDE_MK_GCC_},)
- _INCLUDE_MK_GCC_=1
- CC?=gcc
--OBJCOPY=objcopy
--RANLIB=ranlib
-+OBJCOPY?=objcopy
-+RANLIB?=ranlib
- ONELIB=0
- AR?=ar
- CC_AR=$(AR) q ${LIBAR}
diff --git a/dev-util/radare2/radare2-4.4.0-r1.ebuild b/dev-util/radare2/radare2-4.5.0.ebuild
index 376d0a9f5210..302e356bc8b9 100644
--- a/dev-util/radare2/radare2-4.4.0-r1.ebuild
+++ b/dev-util/radare2/radare2-4.5.0.ebuild
@@ -30,11 +30,6 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.4.0-AR.patch
-	"${FILESDIR}"/${PN}-4.4.0-RANLIB.patch
-)
-
 src_configure() {
 	# Ideally these should be set by ./configure
 	tc-export CC AR LD OBJCOPY RANLIB
diff --git a/dev-util/ragel/Manifest b/dev-util/ragel/Manifest
index 1645761532b8..0f9478fe597f 100644
--- a/dev-util/ragel/Manifest
+++ b/dev-util/ragel/Manifest
@@ -1,19 +1,12 @@
-AUX ragel-6.7+gcc-4.7.patch 5585 BLAKE2B d8b7056d501ea0373f2a0381d59766e95741f963e48f40fca8dc81f097f4bced320dfbfc1e920858af7f37a14a206da43131c3175a839b30b7a911693dc91103 SHA512 160aea4100328accbe423e98f7f5741309b9e293aea992f287cb5d9fab25ae74c76933e924658dd4670d317b01e76d37c3defeeb47ada07370b819a16515ebf4
-AUX ragel-6.7-cross-compile.patch 576 BLAKE2B f284c71ecc8d801873e814f863eeb4315646b58e07e379844cbd5b5592774829b8ae7234361f64c6e459eb8d94a90b617a35fbd566da69a80544fa1a7a5bf3ca SHA512 0ab26720537bdb77194159145d5fc2e01ee96f3d197d947693141e0559e18b4da3ac7b058d7de4a9d4d9cf9c4ab63649839da359ed3aabcb5ea7163ec975d5b1
-AUX ragel-6.9-gcc6.patch 1902 BLAKE2B be17303b0e4af5edc2b9f97eca8ce4505a0f98ce7797b35bd341f8f09bb9f12845f190ad56ae9638d4d24de80ae15936acb4faffd8c6501ddbd51ebd93d61503 SHA512 3258201336296fd8d0ae7e3008ddbcee9112023801e7ba280de09398bbf7bcf4010e3f5d3e819bff7cdefb26a346e361be84fe5c84354fe03302e5bd9fb92c68
 AUX ragel-7.0.0.10-use-pkginclude.patch 1143 BLAKE2B 980f0248e9f33955b4653fb1a38aa7aa5ec10584650947e85592f9a9ef0a67c41020dca29fad57ab101e98f45c217d332933931ac7da68cb3ea5d3bbc2f02d9a SHA512 44ee69205b87c22d17b5cc419fba96bd69c9b3d4f8fc8133041b9d71b9aae434b1528bdbdcfe15825d663c1d441d6cce97d0586c4bfae58ff5d687b1c156529f
 DIST ragel-6.10.tar.gz 1232993 BLAKE2B 401e7a53b062ecd7ec98337866eb2dc0af0ac90e5d04ee304fd2a867b7b6f390985297a7ed57ce65e88b719598efbdd431bac8f53cee24199b795deb0e89da6b SHA512 6c1fe4f6fa8546ae28b92ccfbae94355ff0d3cea346b9ae8ce4cf6c2bdbeb823e0ccd355332643ea72d3befd533a8b3030ddbf82be7ffa811c2c58cbb01aaa38
-DIST ragel-6.7.tar.gz 1182734 BLAKE2B 7a74d58ddee776c5652563d2b804c12fa89d23ab98d743967ff8948d3506266c464b413ced8a2e251cd62e945947778232f483706bbdd87717190a45a9ad088c SHA512 a85c1d5d4fd7d903c823c2ddc8b5f1d5dd5f715f11bc04f10fb78ea5632b3aa33c5b4861f89179fa9d6b4944484216ee93bbd25dd0b5958d2419e434b781b78a
-DIST ragel-6.8.tar.gz 1211146 BLAKE2B 41d3feecb461cede104182d918e1f052256daa292efd94b6c722904c05e30b621f754881f07252c76b0bd3af63c65ce50b8ec98d43e1eec5c1a66ef2593506c7 SHA512 3c7fa4ca0cfcd5d19e0ff8746ca427f5a1eefb0af09db5d2ee55ced9bcc35c588a5db146dcfdec46b83fb63d94ff9ace117b4cfcb07e2c57aec67a6cbe249458
-DIST ragel-6.9.tar.gz 1226871 BLAKE2B c6edc63eaa21a1529c5600d8491fdce39cff5180fa132046f48c32971e1698fea820c41735f4d74b332de657fdd4c81aecda71beb9d5cef71c27246d606b6b72 SHA512 46886a37fa0b785574c03ba6581d99bbeaa11ca65cf4fdc37ceef42f4869bd695694cd69b4b974a25cf539f004cb106e3debda17fc26e1a9a6a4295992733dbd
 DIST ragel-7.0.0.10.tar.gz 779503 BLAKE2B 2f7b8bb858555719b0c7afa8209be76fd07f9d06a8f75df723211c48d59f50c21f09a1f1fa031d53e434db933d1bc12299c75d8932485e5a43eccef7506667ad SHA512 2d1d4c469d8581239ec21f128e94ab452b398903302f82ef59ce03d6fb89bc89de6441dbe53ea99d7689866f7aec485ab1ec9c537908f21eb1394650b55413ba
+DIST ragel-7.0.0.12.tar.gz 1543127 BLAKE2B c3024c55eb5397f78159da83e318923529d3c1f10cc802564ac13c39b18c261166e27e4f315bbaa49e7eb9afa6840ca72aa62d7ae14d46f20865db64e3ab6759 SHA512 32ec90eddfd209e50995f21b9a5fcddd2b94279828227d367d990d7bfa8e4412682631d4e6ae5081871bac23d96153b96fb4494b991c70bf38df8cc0ddc8866d
 DIST ragel-7.0.0.9.tar.gz 850078 BLAKE2B 0e7d458e9f78fc7e0fb2e9a0c6fdd3f3789a9104f4441bc878ac64d077dee716e27d3a54c3898fcf1e4ba56b8d46d956a36b92258750f2541fd96f951038d852 SHA512 87de7d41af4a08f09d422a0e58820f9b5b1218acc4733c58690feea4f872790813b5f2d7505ce147a2a6e1bcd341926c35fed7c6b55f543bdf864b119868bcde
 EBUILD ragel-6.10.ebuild 928 BLAKE2B 3c6d2b9df8ec41596c730b85285d7598a05dfdfa758c4d7c1ebc51eb40550d608c222db968ce536c6fc0b1ba891351dfe0aad5215741c13cf55393ee37b547f7 SHA512 efb62282412b3723b117b237b7a22c786a571028dd479ae98eaa4f8dc940b7b492d456510e67e77902bf8aec48b4395f3426d07f032b0cfeca3531d56555bd3d
-EBUILD ragel-6.7-r1.ebuild 1126 BLAKE2B 1600f6035a70a10d10dc64fb4f2a03b345464a222fbaeeaa05695040487914b091a54843101aa60f0aebf82ca3b99886013df857673dbb3fdd0dc0c4a3b91c68 SHA512 50d72b4ba6b9e6813aa033c89ac5be299f446a77213d5b71ac897e2d3c350de5bde4412d40433c2a8356109a7e0773e82770adbd4b222c85c5b20a8442d2d1ee
-EBUILD ragel-6.8.ebuild 1065 BLAKE2B 644a54768c3e873f8f5b0dbba6f43d90948e49862329b626d37125a93c40ab3dc35a63d529c70aef93ddd483bf81beabb3cba61d92b634fec365b8e548670221 SHA512 062e491ffdace06ad13ecbdadeb75352bf1a40e76875cf3b885cfd2264764032dd50c1b9924a684a60055f029d4aed4402e22b227d7eb4fbfa51308943379ea1
-EBUILD ragel-6.9.ebuild 979 BLAKE2B 781da2e2dc14dbf5edc004637a512b0cd60c22bf2625f7363cc640670195305a2794ef281ed4c19ec2453fdc5639f2c9b430e9df1da48186551f66b076cbc8cd SHA512 45148f500317f4f7ec13e9f53028b7677778390e6ae4114a84d7047e43854461025a39dfba1487bd861a796f9a712e4a57baaaf94eded22d48492cbf39159611
 EBUILD ragel-7.0.0.10-r1.ebuild 758 BLAKE2B 362a2dee75eb9b744af7b0fca9f26175961029165988cf6a5f8f3aeab8d4e9a4264a553509211884c3bd7d6a7992b5fe0dee7b473f61831e6ab8dcfb1f94ba8b SHA512 12f9640eb0c51a497e274bf0d5dd7dadea78a1e21dba5d8a4a114066717badfa1de28116e133f7cc688fce02b7e2859f45479846f460865982c2ced0f4ea4fc8
-EBUILD ragel-7.0.0.10-r2.ebuild 844 BLAKE2B 57993ee41782c71062ffc31df4af845fc54f8aaef22d8e6dd0619882cba894bacd554a1bf685158ca1d63d078cc5c1f1ffabb23660f7f5c43c904ac648223d36 SHA512 086c18195cfa190eed43c66e4ca3074d6596ff7cd465484eab7966bfae26ab2a1d733ea731d9201c18f89ae904f4dffc4800533910d49f27a50ed7e51146bf2d
+EBUILD ragel-7.0.0.10-r2.ebuild 779 BLAKE2B 373a5b4979da94d22d514197aadc6a4f67ddd863b7fd25f2dd5e0ea96b3c3bab5c7100a3aec73d62868803697462e907840318fefff6f83928ca536378bc47d4 SHA512 140311ff587643c81b229f2e576eba50aa1efc825210c34d650551f2d362e50f0a5cb4978b524e991b5a71cef773a65642e607abec2764e9775cebab4d913aed
 EBUILD ragel-7.0.0.10.ebuild 622 BLAKE2B 4eb1438c8fd1c8e1a3f3f2a95589b719e7b1e07d0411ee0d68bbb0eb5d433471becffdc718593beed535a6f360a3bc63f5fafb058fe6d8c50a6163552ad9da99 SHA512 9f98a2fc800727b126d5db3914ebaf699b4a1095f334906d5809edd9f08b0b5c1d90699a145d303fc06a31d95e600d85aee4a7b5ebb98fd8cfd117f20ee10d2b
+EBUILD ragel-7.0.0.12.ebuild 762 BLAKE2B a23b7f6e2b3a41c2ac697b9e6453244bd15a11aa5fd3170ea0ed881f68762ea2a5380e840c95a35926f798f04aa79cd293baf9c369a7a3be61a0c9f41cdd2218 SHA512 19015e4abbc04c2be325c607232a578be66d73dc440bb06f593f41f42d2a4346e2d212e32e539cfb6341baaf61d80999061c930262ae126f6734a28fc0bbd498
 EBUILD ragel-7.0.0.9.ebuild 627 BLAKE2B b1c47b5508878b7e13fb95333bb7158a85e4795decd4be8cfc82769934106a43878fb5c15d3df5e139a6af96df04614411ceeef20ff0c3bc695cfe424ae258d5 SHA512 1f88ee8f0bac60c073a2be525ea1dcc9128961d8383f36d992121064746d7c154b1338f4582797145fe782485c8d322119aa7ac8ee903315d056cf17a635a3c6
 MISC metadata.xml 222 BLAKE2B 1c7746701a7405c30d961a743df2c2b3b1c5f20c863057e76862844f34bcf701a01f5b31d6b6dc4b4c3192a0f833b783d0c1db3c79f25ea45b576e1c575b502f SHA512 f5b07576edb64cee121aab00dd2a5f0c080fa947e00b6ff6ad6c514a82c132230426ca81e3430d7785c212786f7ead5f6c3f48e58478507df7d96a4e734168ab
diff --git a/dev-util/ragel/files/ragel-6.7+gcc-4.7.patch b/dev-util/ragel/files/ragel-6.7+gcc-4.7.patch
deleted file mode 100644
index 80eb29a46f05..000000000000
--- a/dev-util/ragel/files/ragel-6.7+gcc-4.7.patch
+++ /dev/null
@@ -1,178 +0,0 @@
-From 27454d1e55b2a5cefc3cc1044d036add9ee9a6d3 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes@flameeyes.eu>
-Date: Tue, 22 May 2012 16:25:37 -0700
-Subject: [PATCH] aapl: fix building with gcc-4.7.0
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Starting with GCC 4.7, you have to explicit methods inherited from
-base templates, otherwise it will refuse to build.
-
----
-
-The URL reported in the README is no longer registered, so I couldn't
-find a way to report this to an upstream project.
-
-Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu>
----
- aapl/avlcommon.h  |   12 ++++++------
- aapl/bstcommon.h  |   16 ++++++++--------
- aapl/bubblesort.h |    2 +-
- aapl/mergesort.h  |    2 +-
- 4 files changed, 16 insertions(+), 16 deletions(-)
-
-diff --git a/aapl/avlcommon.h b/aapl/avlcommon.h
-index 06983bc..2e3c190 100644
---- a/aapl/avlcommon.h
-+++ b/aapl/avlcommon.h
-@@ -881,9 +881,9 @@ template <AVLMEL_TEMPDEF> Element *AvlTree<AVLMEL_TEMPUSE>::
- 		}
- 
- #ifdef AVL_BASIC
--		keyRelation = compare( *element, *curEl );
-+		keyRelation = this->compare( *element, *curEl );
- #else
--		keyRelation = compare( element->BASEKEY(getKey()), 
-+		keyRelation = this->compare( element->BASEKEY(getKey()),
- 				curEl->BASEKEY(getKey()) );
- #endif
- 
-@@ -920,7 +920,7 @@ template <AVLMEL_TEMPDEF> Element *AvlTree<AVLMEL_TEMPUSE>::
- 	long keyRelation;
- 
- 	while (curEl) {
--		keyRelation = compare( *element, *curEl );
-+		keyRelation = this->compare( *element, *curEl );
- 
- 		/* Do we go left? */
- 		if ( keyRelation < 0 )
-@@ -969,7 +969,7 @@ template <AVLMEL_TEMPDEF> Element *AvlTree<AVLMEL_TEMPUSE>::
- 			return element;
- 		}
- 
--		keyRelation = compare( key, curEl->BASEKEY(getKey()) );
-+		keyRelation = this->compare( key, curEl->BASEKEY(getKey()) );
- 
- 		/* Do we go left? */
- 		if ( keyRelation < 0 ) {
-@@ -1023,7 +1023,7 @@ template <AVLMEL_TEMPDEF> Element *AvlTree<AVLMEL_TEMPUSE>::
- 			return element;
- 		}
- 
--		keyRelation = compare(key, curEl->getKey());
-+		keyRelation = this->compare(key, curEl->getKey());
- 
- 		/* Do we go left? */
- 		if ( keyRelation < 0 ) {
-@@ -1058,7 +1058,7 @@ template <AVLMEL_TEMPDEF> Element *AvlTree<AVLMEL_TEMPUSE>::
- 	long keyRelation;
- 
- 	while (curEl) {
--		keyRelation = compare( key, curEl->BASEKEY(getKey()) );
-+		keyRelation = this->compare( key, curEl->BASEKEY(getKey()) );
- 
- 		/* Do we go left? */
- 		if ( keyRelation < 0 )
-diff --git a/aapl/bstcommon.h b/aapl/bstcommon.h
-index 888717f..7c53ff3 100644
---- a/aapl/bstcommon.h
-+++ b/aapl/bstcommon.h
-@@ -361,7 +361,7 @@ template <BST_TEMPL_DEF> bool BstTable<BST_TEMPL_USE>::
- 		}
- 
- 		mid = lower + ((upper-lower)>>1);
--		keyRelation = compare(key, GET_KEY(*mid));
-+		keyRelation = this->compare(key, GET_KEY(*mid));
- 
- 		if ( keyRelation < 0 )
- 			upper = mid - 1;
-@@ -373,12 +373,12 @@ template <BST_TEMPL_DEF> bool BstTable<BST_TEMPL_USE>::
- 
- 			lower = mid - 1;
- 			while ( lower != lowEnd && 
--					compare(key, GET_KEY(*lower)) == 0 )
-+					this->compare(key, GET_KEY(*lower)) == 0 )
- 				lower--;
- 
- 			upper = mid + 1;
- 			while ( upper != highEnd && 
--					compare(key, GET_KEY(*upper)) == 0 )
-+					this->compare(key, GET_KEY(*upper)) == 0 )
- 				upper++;
- 			
- 			low = (Element*)lower + 1;
-@@ -419,7 +419,7 @@ template <BST_TEMPL_DEF> Element *BstTable<BST_TEMPL_USE>::
- 		}
- 
- 		mid = lower + ((upper-lower)>>1);
--		keyRelation = compare(key, GET_KEY(*mid));
-+		keyRelation = this->compare(key, GET_KEY(*mid));
- 
- 		if ( keyRelation < 0 )
- 			upper = mid - 1;
-@@ -457,7 +457,7 @@ template <BST_TEMPL_DEF> Element *BstTable<BST_TEMPL_USE>::
- 		}
- 
- 		mid = lower + ((upper-lower)>>1);
--		keyRelation = compare(key, GET_KEY(*mid));
-+		keyRelation = this->compare(key, GET_KEY(*mid));
- 
- 		if ( keyRelation < 0 )
- 			upper = mid - 1;
-@@ -508,7 +508,7 @@ template <BST_TEMPL_DEF> Element *BstTable<BST_TEMPL_USE>::
- 		}
- 
- 		mid = lower + ((upper-lower)>>1);
--		keyRelation = compare(key, GET_KEY(*mid));
-+		keyRelation = this->compare(key, GET_KEY(*mid));
- 
- 		if ( keyRelation < 0 )
- 			upper = mid - 1;
-@@ -603,7 +603,7 @@ template <BST_TEMPL_DEF> Element *BstTable<BST_TEMPL_USE>::
- 		}
- 
- 		mid = lower + ((upper-lower)>>1);
--		keyRelation = compare(GET_KEY(el), GET_KEY(*mid));
-+		keyRelation = this->compare(GET_KEY(el), GET_KEY(*mid));
- 
- 		if ( keyRelation < 0 )
- 			upper = mid - 1;
-@@ -662,7 +662,7 @@ template <BST_TEMPL_DEF> Element *BstTable<BST_TEMPL_USE>::
- 		}
- 
- 		mid = lower + ((upper-lower)>>1);
--		keyRelation = compare(GET_KEY(el), GET_KEY(*mid));
-+		keyRelation = this->compare(GET_KEY(el), GET_KEY(*mid));
- 
- 		if ( keyRelation < 0 )
- 			upper = mid - 1;
-diff --git a/aapl/bubblesort.h b/aapl/bubblesort.h
-index bcc2fb6..f0f4ce5 100644
---- a/aapl/bubblesort.h
-+++ b/aapl/bubblesort.h
-@@ -72,7 +72,7 @@ template <class T, class Compare> void BubbleSort<T,Compare>::
- 		changed = false;
- 		for ( long i = 0; i < len-pass; i++ ) {
- 			/* Do we swap pos with the next one? */
--			if ( compare( data[i], data[i+1] ) > 0 ) {
-+			if ( this->compare( data[i], data[i+1] ) > 0 ) {
- 				char tmp[sizeof(T)];
- 
- 				/* Swap the two items. */
-diff --git a/aapl/mergesort.h b/aapl/mergesort.h
-index 68b8426..8cefa73 100644
---- a/aapl/mergesort.h
-+++ b/aapl/mergesort.h
-@@ -110,7 +110,7 @@ template< class T, class Compare> void MergeSort<T,Compare>::
- 		}
- 		else {
- 			/* Both upper and lower left. */
--			if ( compare(*lower, *upper) <= 0 )
-+			if ( this->compare(*lower, *upper) <= 0 )
- 				memcpy( dest++, lower++, sizeof(T) );
- 			else
- 				memcpy( dest++, upper++, sizeof(T) );
--- 
-1.7.8.6
-
diff --git a/dev-util/ragel/files/ragel-6.7-cross-compile.patch b/dev-util/ragel/files/ragel-6.7-cross-compile.patch
deleted file mode 100644
index e953a1aeeeef..000000000000
--- a/dev-util/ragel/files/ragel-6.7-cross-compile.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-https://bugs.gentoo.org/473970
-
-already sent upstream
-
-patch by Jungshik Shin
-
---- ragel-6.7/configure.in
-+++ ragel-6.7/configure.in
-@@ -27,9 +27,9 @@
- 
- dnl Choose defaults for the build_parsers and build_manual vars. If the dist
- dnl file is present in the root then default to no, otherwise go for it.
--AC_CHECK_FILES( $srcdir/DIST, 
--	[ . $srcdir/DIST; ], 
--	[ build_parsers=yes; build_manual=yes; ] )
-+
-+AS_IF([test -r $srcdir/DIST], [. $srcdir/DIST], [build_parsers=yes;
-+       build_manual=yes])
- 
- dnl
- dnl Enable arg to explicitly control the building of the manual
diff --git a/dev-util/ragel/files/ragel-6.9-gcc6.patch b/dev-util/ragel/files/ragel-6.9-gcc6.patch
deleted file mode 100644
index fb10d9fd2b79..000000000000
--- a/dev-util/ragel/files/ragel-6.9-gcc6.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Bug: https://bugs.gentoo.org/582606
-
---- a/ragel/common.cpp
-+++ b/ragel/common.cpp
-@@ -34,7 +34,7 @@
- 	{ "int",      0,       "int",     true,   true,  false,  INT_MIN,   INT_MAX,    sizeof(int) },
- 	{ "unsigned", "int",   "uint",    false,  true,  false,  0,         UINT_MAX,   sizeof(unsigned int) },
- 	{ "long",     0,       "long",    true,   true,  false,  LONG_MIN,  LONG_MAX,   sizeof(long) },
--	{ "unsigned", "long",  "ulong",   false,  true,  false,  0,         ULONG_MAX,  sizeof(unsigned long) }
-+	{ "unsigned", "long",  "ulong",   false,  true,  false,  0,         (long long) ULONG_MAX,  sizeof(unsigned long) }
- };
- 
- #define S8BIT_MIN  -128
-@@ -87,7 +87,7 @@
- 	{ "int32",   0,  "int32",   true,   true,  false,  S32BIT_MIN, S32BIT_MAX,  4 },
- 	{ "uint32",  0,  "uint32",  false,  true,  false,  U32BIT_MIN, U32BIT_MAX,  4 },
- 	{ "int64",   0,  "int64",   true,   true,  false,  S64BIT_MIN, S64BIT_MAX,  8 },
--	{ "uint64",  0,  "uint64",  false,  true,  false,  U64BIT_MIN, U64BIT_MAX,  8 },
-+	{ "uint64",  0,  "uint64",  false,  true,  false,  U64BIT_MIN, (long long) U64BIT_MAX,  8 },
- 	{ "rune",    0,  "int32",   true,   true,  true,   S32BIT_MIN, S32BIT_MAX,  4 }
- };
- 
-@@ -116,7 +116,7 @@
- 	{ "int",     0,  "int",     true,   true,  false,  INT_MIN,   INT_MAX,     4 },
- 	{ "uint",    0,  "uint",    false,  true,  false,  0,         UINT_MAX,    4 },
- 	{ "long",    0,  "long",    true,   true,  false,  LONG_MIN,  LONG_MAX,    8 },
--	{ "ulong",   0,  "ulong",   false,  true,  false,  0,         ULONG_MAX,   8 }
-+	{ "ulong",   0,  "ulong",   false,  true,  false,  0,         (long long) ULONG_MAX,   8 }
- };
- 
- HostType hostTypesOCaml[] =
---- a/ragel/rbxgoto.cpp
-+++ b/ragel/rbxgoto.cpp
-@@ -658,7 +658,7 @@
- 	out <<
- 		"	begin\n"
- 		"		" << P() << " += 1\n"
--		"		" << rbxGoto(ret, "_out") << "\n" 
-+		"		" << static_cast<bool>(rbxGoto(ret, "_out")) << "\n"
- 		"	end\n";
- }
- 
diff --git a/dev-util/ragel/ragel-6.7-r1.ebuild b/dev-util/ragel/ragel-6.7-r1.ebuild
deleted file mode 100644
index df62badfb791..000000000000
--- a/dev-util/ragel/ragel-6.7-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils autotools
-
-DESCRIPTION="Compiles finite state machines from regular languages into executable code"
-HOMEPAGE="http://www.complang.org/ragel/"
-SRC_URI="http://www.complang.org/ragel/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="vim-syntax"
-
-DEPEND=""
-RDEPEND=""
-
-# We need to get the txl language in Portage to have the tests :(
-RESTRICT=test
-
-DOCS=( ChangeLog CREDITS README TODO )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}+gcc-4.7.patch
-	epatch "${FILESDIR}"/${P}-cross-compile.patch #473970
-	sed -i -e '/CXXFLAGS/d' configure.in || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf --docdir="${EPREFIX}"/usr/share/doc/${PF}
-}
-
-src_test() {
-	cd "${S}"/test
-	./runtests.in || die
-}
-
-src_install() {
-	default
-
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins ragel.vim
-	fi
-}
diff --git a/dev-util/ragel/ragel-6.8.ebuild b/dev-util/ragel/ragel-6.8.ebuild
deleted file mode 100644
index 027b1b512201..000000000000
--- a/dev-util/ragel/ragel-6.8.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils autotools autotools-utils
-
-DESCRIPTION="Compiles finite state machines from regular languages into executable code"
-HOMEPAGE="http://www.complang.org/ragel/"
-SRC_URI="http://www.complang.org/ragel/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="vim-syntax"
-
-DEPEND=""
-RDEPEND=""
-
-# We need to get the txl language in Portage to have the tests :(
-RESTRICT=test
-
-DOCS=( ChangeLog CREDITS README TODO )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-6.7-cross-compile.patch #473970
-	sed -i -e '/CXXFLAGS/d' configure.in || die
-
-	eautoreconf
-}
-
-src_test() {
-	cd "${S}"/test
-	./runtests.in || die
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins ragel.vim
-	fi
-}
diff --git a/dev-util/ragel/ragel-6.9.ebuild b/dev-util/ragel/ragel-6.9.ebuild
deleted file mode 100644
index 21b79373ef5f..000000000000
--- a/dev-util/ragel/ragel-6.9.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils autotools autotools-utils
-
-DESCRIPTION="Compiles finite state machines from regular languages into executable code"
-HOMEPAGE="http://www.colm.net/open-source/ragel/"
-SRC_URI="http://www.colm.net/files/ragel/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="vim-syntax"
-
-DEPEND=""
-RDEPEND=""
-
-# We need to get the txl language in Portage to have the tests :(
-RESTRICT=test
-
-PATCHES=( "${FILESDIR}"/${P}-gcc6.patch )
-DOCS=( ChangeLog CREDITS README TODO )
-
-src_test() {
-	cd "${S}"/test
-	./runtests.in || die
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins ragel.vim
-	fi
-}
diff --git a/dev-util/ragel/ragel-7.0.0.10-r2.ebuild b/dev-util/ragel/ragel-7.0.0.10-r2.ebuild
index c26cbce821da..5cd81dac09e4 100644
--- a/dev-util/ragel/ragel-7.0.0.10-r2.ebuild
+++ b/dev-util/ragel/ragel-7.0.0.10-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://www.colm.net/files/ragel/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~ia64 x86 ~amd64-linux ~x86-linux"
 IUSE="vim-syntax"
 
 DEPEND="~dev-util/colm-0.13.0.5"
@@ -27,11 +27,6 @@ src_configure() {
 	econf --disable-static
 }
 
-src_test() {
-	cd "${S}"/test || die
-	./runtests.in || die
-}
-
 src_install() {
 	if use vim-syntax; then
 		insinto /usr/share/vim/vimfiles/syntax
diff --git a/dev-util/ragel/ragel-7.0.0.12.ebuild b/dev-util/ragel/ragel-7.0.0.12.ebuild
new file mode 100644
index 000000000000..fd53d7f1912f
--- /dev/null
+++ b/dev-util/ragel/ragel-7.0.0.12.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Compiles finite state machines from regular languages into executable code"
+HOMEPAGE="https://www.colm.net/open-source/ragel/"
+SRC_URI="https://www.colm.net/files/ragel/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="vim-syntax"
+
+DEPEND="~dev-util/colm-0.13.0.7"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins ragel.vim
+	fi
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-util/re2c/Manifest b/dev-util/re2c/Manifest
index ab9c5f94dac0..778afe1863aa 100644
--- a/dev-util/re2c/Manifest
+++ b/dev-util/re2c/Manifest
@@ -1,4 +1,8 @@
 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.2.tar.xz 1292972 BLAKE2B 65780a6039fda0adb5daed1020ed1b58467cf4f45c87fac8feb0ed1d6747a7a4136d307960279f3963dd3b2d4b3f67bd1040fb1bd5e09f4a5f8ac55335f9f28e SHA512 7db5bea3f3d536dfc9483edf02b6dfdc75565841d54c57795505c5a587b9b50bb588731aaebf52b08cc6e853848052869e4aa1d4b0cbf6ca7e020eae3d391e74
+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.2.ebuild 782 BLAKE2B 813525125f547a6b03e601a7858eef30e694a6b7a3d3026f33ac2c9468c19ec911e07e0352c2e4d7d4db9823d78e6505a0d7c33a7d444c44cc111f245154ca73 SHA512 e42cb52c0288fad36c02f1e489eb40db3c8ffe983b079e8ae5f67cb00811e7a4392c9bc677f5ba664ad77c0580380cc0885dcfc6edd96364e5e2dcd519a9a414
+EBUILD re2c-2.0.3.ebuild 782 BLAKE2B 813525125f547a6b03e601a7858eef30e694a6b7a3d3026f33ac2c9468c19ec911e07e0352c2e4d7d4db9823d78e6505a0d7c33a7d444c44cc111f245154ca73 SHA512 e42cb52c0288fad36c02f1e489eb40db3c8ffe983b079e8ae5f67cb00811e7a4392c9bc677f5ba664ad77c0580380cc0885dcfc6edd96364e5e2dcd519a9a414
 MISC metadata.xml 476 BLAKE2B b2dad245e1cdcbb73e8b6e53442f7e9ec41337746c50f026c0fda68d57ebe10fb6193a26fcf9fca11e23570f44b104bd40d22fa1283fa91034f7cb792d436463 SHA512 e3018ee81606a018d66169cd142a17a34248587b77deb4baeb6daae6aca2d9a70095fb5dc2180d146043030631172f6fa17b3c8ddd5bebe85eebf6f3be79f9ab
diff --git a/dev-util/re2c/re2c-2.0.2.ebuild b/dev-util/re2c/re2c-2.0.2.ebuild
new file mode 100644
index 000000000000..74c16e8376ec
--- /dev/null
+++ b/dev-util/re2c/re2c-2.0.2.ebuild
@@ -0,0 +1,27 @@
+# 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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug"
+
+src_configure() {
+	econf \
+		--enable-golang \
+		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
new file mode 100644
index 000000000000..74c16e8376ec
--- /dev/null
+++ b/dev-util/re2c/re2c-2.0.3.ebuild
@@ -0,0 +1,27 @@
+# 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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug"
+
+src_configure() {
+	econf \
+		--enable-golang \
+		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/rebar-bin/Manifest b/dev-util/rebar-bin/Manifest
index 4b75cc19bf16..9b518ad0488b 100644
--- a/dev-util/rebar-bin/Manifest
+++ b/dev-util/rebar-bin/Manifest
@@ -1,3 +1,5 @@
-DIST rebar3 694889 BLAKE2B 3a8f5562a0c984caf5d7b3ba1063a90bf110a60cea316eaf88f5199b890e186f85193dc0302b36dc31051d3552912c8d1582f563f989df97ee28364a3f47512a SHA512 8fb5c7737d70fc7a706b1e124ab660550e8637da9258338016ab2e260f1c6d662548ef723705cd18210050d052e79945578623d9e9892e08dbfdb9cb04fd89fb
-EBUILD rebar-bin-3.6.2.ebuild 590 BLAKE2B f9d0ca1c49a545709d17665e9872aee34f9a06d2c9711b5d0e701017c1b7e812ef7ff035ead1482640add65db692b8611900d62932ba5109aff766c140b755ec SHA512 725fb4d99ea3848e4a643714c01c4a7efc3230967df2bb8eef69069243e937c578ab21fc5a73a151339089761b4bd581fbf1990299d6b553d8ebe7ff902a1912
+DIST rebar-bin-3.13.2 839684 BLAKE2B f7aab86b015549bb13a7fe2b3b0c64fc6b8383f46adef2fd50a080983a411f936d1c416be60eac70a2ea72439831c9a5e0e85381168ca973d6fcfbfa198e0987 SHA512 33cb7b083cd0e90159e06d6b21c1e8047cc5a2d49c469ae15449fefb8576427f2088977a294c677548f0543eb06cb25ad4c165e8df4b373e3562a7adc6125a94
+DIST rebar-bin-3.6.2 694889 BLAKE2B 3a8f5562a0c984caf5d7b3ba1063a90bf110a60cea316eaf88f5199b890e186f85193dc0302b36dc31051d3552912c8d1582f563f989df97ee28364a3f47512a SHA512 8fb5c7737d70fc7a706b1e124ab660550e8637da9258338016ab2e260f1c6d662548ef723705cd18210050d052e79945578623d9e9892e08dbfdb9cb04fd89fb
+EBUILD rebar-bin-3.13.2.ebuild 601 BLAKE2B 61e55196804a2eb904108d36ce183fcaff72eb0cf67006256015df7e2ca5bb2972bb5188fc50526679fcb5312caba1c58833388d201bcd4d8ac0ff4648d49ffe SHA512 60cbeb39494490552b18114d11c3db68d4e82c01986b4303522ec3e481f5dfaa6fe6e2e690ec6fe8a8613b31a7114466a625853c1bb38ee6cada505c311d1d1c
+EBUILD rebar-bin-3.6.2.ebuild 601 BLAKE2B 61e55196804a2eb904108d36ce183fcaff72eb0cf67006256015df7e2ca5bb2972bb5188fc50526679fcb5312caba1c58833388d201bcd4d8ac0ff4648d49ffe SHA512 60cbeb39494490552b18114d11c3db68d4e82c01986b4303522ec3e481f5dfaa6fe6e2e690ec6fe8a8613b31a7114466a625853c1bb38ee6cada505c311d1d1c
 MISC metadata.xml 939 BLAKE2B 3d451a472d9986f1aee67c4ede6ddc28d56cac865e0fd0a33f957f3007126d47d7cb3bf87916abca0be68138c167b138d884b38da65ca26d4dab79e42b839c58 SHA512 6e6e0a14df5031fee427dc518e0b69cafca6b8dcc429fa8cbcecacf78a1a56796c9cc6a545a6e9506a752e749c06a4ef7cf4cdb889ef2c6ca53bcf0f68fa363b
diff --git a/dev-util/rebar-bin/rebar-bin-3.13.2.ebuild b/dev-util/rebar-bin/rebar-bin-3.13.2.ebuild
new file mode 100644
index 000000000000..4f7f563c355f
--- /dev/null
+++ b/dev-util/rebar-bin/rebar-bin-3.13.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN=${P#-bin}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="A sophisticated build-tool for Erlang projects that follows OTP principles"
+HOMEPAGE="https://github.com/erlang/rebar3"
+
+SRC_URI="https://github.com/erlang/rebar3/releases/download/${PV}/rebar3 -> ${P}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-lang/erlang"
+DEPEND=""
+
+S="${WORKDIR}"
+
+QA_PREBUILT="/usr/bin/rebar3"
+
+src_unpack() {
+	cp -v "${DISTDIR}/${P}" "${S}/rebar3" || die
+}
+
+src_install() {
+	dobin rebar3
+}
diff --git a/dev-util/rebar-bin/rebar-bin-3.6.2.ebuild b/dev-util/rebar-bin/rebar-bin-3.6.2.ebuild
index 9835d50cdf22..4f7f563c355f 100644
--- a/dev-util/rebar-bin/rebar-bin-3.6.2.ebuild
+++ b/dev-util/rebar-bin/rebar-bin-3.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,10 +9,10 @@ MY_P=${MY_PN}-${PV}
 DESCRIPTION="A sophisticated build-tool for Erlang projects that follows OTP principles"
 HOMEPAGE="https://github.com/erlang/rebar3"
 
-SRC_URI="https://github.com/erlang/rebar3/releases/download/${PV}/rebar3"
+SRC_URI="https://github.com/erlang/rebar3/releases/download/${PV}/rebar3 -> ${P}"
 
 LICENSE="Apache-2.0"
-SLOT="3"
+SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND="dev-lang/erlang"
@@ -23,7 +23,7 @@ S="${WORKDIR}"
 QA_PREBUILT="/usr/bin/rebar3"
 
 src_unpack() {
-	cp -v "${DISTDIR}/${A}" "${S}/" || die
+	cp -v "${DISTDIR}/${P}" "${S}/rebar3" || die
 }
 
 src_install() {
diff --git a/dev-util/redo/Manifest b/dev-util/redo/Manifest
index 3838e3b1dd76..70e0f7612f6a 100644
--- a/dev-util/redo/Manifest
+++ b/dev-util/redo/Manifest
@@ -1,7 +1,5 @@
-DIST redo-0.42.tar.gz 194344 BLAKE2B ce17ba2bc8b6a074bfc5cae58cc99c1c41b2e8bab93a10f29d1178cb2071bd68ef5528529c320ee55063a4e3bce83705b486bc92992a9c0c18b65e7fec76fde5 SHA512 41b8417136f98d12edf3c62f027f2459ae3fb92f6c5464553d79c3a52344de57220a5c64b565118da0a99c1544eaa153a468ffcdcfbf7193c76c896bcd40e900
 DIST redo-0.42a.tar.gz 195053 BLAKE2B 3e84e961eeb66396d5d5aa8a3f05f10d4000089d12c36bd8e061c163e050b9bc125cd8dcc5987c9f3b25e2b8803ff7c34d48a173ab91fc4a3e9fd63c114adc8a SHA512 8473bd8168c8e70b59a573560f8f725c8538061ee15eabeb63e467a363fa6869aa8088e8ce324726da4e2f7115e2ddf72cbb657703e9090f4f93c05f42bb67cb
 DIST redo-0.42c.tar.gz 195232 BLAKE2B b24969d71b247d02642340cebbf325e2ae68d4893d02e489930120e6aac76bd3099fd42e7dc36dae1fdea5c7825657957291876b906c2671a6319f8eb45a9d91 SHA512 3196ff5941d9e62084c7332a6771edd0db0082a499ba16fb6de273295c65b734e7dadb29a9fca3e6266421bc964369a8e725ef55f59ade2ecfb5e8bcc446ced0
-EBUILD redo-0.42-r1.ebuild 1064 BLAKE2B 76ac6a5c76fe9b73695bea9b523fbccee16de07cf77eecff673dd1d770449c6acea9b8e62bf7e3ce34fe0a0adf6b13dac8dd2bf9fcc9da647dba28ab263849ac SHA512 8f03fa82a0b69cf564e29632f5faa223f469414ad6ae1ede6e35f80e4ca700d72b17712e8a232d4700d1602b94a3ff03c69672d1455c0af0d3b04251d02d7454
 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
diff --git a/dev-util/redo/redo-0.42-r1.ebuild b/dev-util/redo/redo-0.42-r1.ebuild
deleted file mode 100644
index ea14d07a6f6a..000000000000
--- a/dev-util/redo/redo-0.42-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 2018-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-inherit multilib multiprocessing python-single-r1
-
-DESCRIPTION="Smaller, easier, more powerful, and more reliable than make"
-HOMEPAGE="https://github.com/apenwarr/redo"
-SRC_URI="https://github.com/apenwarr/redo/archive/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-BDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/beautifulsoup[${PYTHON_MULTI_USEDEP}]
-		dev-python/markdown[${PYTHON_MULTI_USEDEP}]
-	')
-	${PYTHON_DEPS}
-"
-RDEPEND="
-	${BDEPEND}
-"
-S=${WORKDIR}/${PN}-${P}
-
-src_compile() {
-	./do -j$(makeopts_jobs) build || die
-}
-
-src_test() {
-	./do -j$(makeopts_jobs) test || die
-}
-
-src_install() {
-	DESTDIR="${D}" \
-	DOCDIR="${D}/usr/share/doc/${PF}" \
-	LIBDIR="${D}/usr/$(get_libdir)/${PN}" \
-	./do -j$(makeopts_jobs) \
-		install || die
-
-	python_fix_shebang "${D}"
-
-	sed -i \
-		-e 's|/lib/|/'"$(get_libdir)"'/|g' \
-		"${D}"/usr/bin/* || die
-}
diff --git a/dev-util/rocm-cmake/Manifest b/dev-util/rocm-cmake/Manifest
index e68f99743eaf..fd03506e7244 100644
--- a/dev-util/rocm-cmake/Manifest
+++ b/dev-util/rocm-cmake/Manifest
@@ -6,6 +6,7 @@ DIST rocm-cmake-2.9.0.tar.gz 14185 BLAKE2B 7eaa8535eae99749d0a46b84daa4ee5d00fd7
 DIST rocm-cmake-3.0.0.tar.gz 14239 BLAKE2B 31876239f0bc21b2d37cacb69e3ff1199d7ffa27c92ae1af6e18959af40e6e3bf59279a2fb12b64927e741325c27e6f9b988918e0b6773181bd2ae93fe3b5d8f SHA512 c70e53256c6d4bbd40c9f32939c4aae27ade7191050cd30bcbc7ea8da07493cc1ff8911ebc4a6a4ed1bc12a3e799a5c238539916587a87fd7627408a88fe2f6c
 DIST rocm-cmake-3.3.0.tar.gz 14462 BLAKE2B 1af1b0c10a728b3a5da483c1fc529a0ea586f11f34aaf42983bd1f009c6f92f094cd209ab580ff5c6bc098dfd0a8d860a305264a9235db9ddc3a024d93c6e3c3 SHA512 529ed79a6edf8b37765b4e1af586e51b8aa646dc6f7a4b07c0ec144247b5533b996a1e16d00c7c9182706b419fe9ba598ee41a29761ea7f6eb39503ec6902760
 DIST rocm-cmake-3.5.0.tar.gz 15828 BLAKE2B 3de221b6937f3fb207bb7deb46506ad229eb3e222da4b1dbdf8bde4b8737538000c7efed5b187a4261ba6edc85fa65b672ac1f33fde488eec3ffd201f6975d75 SHA512 13e7c2377f1aaca5a07c796ad1e0a2edfd4ef0800d7ec7fa7b26a44869e1d760604dc29ca2b4ca9887549a6c287873b21bcbb8b5ca2dcd7636e96abb4e7a2679
+DIST rocm-cmake-3.7.0.tar.gz 15833 BLAKE2B 1e111ba502aa7a63b9f3785c44cf622d60f6380fbd7c86720a99d04f1bfa52201849e1316ac3af33857d257f0438f5db083877d6b6769bbd9842fdf59cc7a376 SHA512 3381ca5603a198f00b5e74fcb55e5279f1f9a63df712048c7aeb0fcfc50b94c4e090c33fd27275d2dfb257b39902d233d30df9d2da6d0a3b0962a440b3249ead
 EBUILD rocm-cmake-0.2.ebuild 688 BLAKE2B 32447191ebc2c3d010096f89ec8cc771dc7bdf8c20ccea5669e57ada0b2d8aae3acddb0a9e8de9360aa688b8108c203efe9680c0f78b8f5504e1dc1aa3ae81ff SHA512 3391731df1ccbe71e5db2040cca6a3901b48d5ae85088c0a09cdeff56ee594e94fa02029d187794c06180047e5205f6d5e6934eccdac5c2383720dd1056cd917
 EBUILD rocm-cmake-2.10.0.ebuild 729 BLAKE2B 555a1c7970659c3f01aab1f0dfa1006ed501f2b43cab52aa0a664aed61a248f9d4b7d574b0897329fc83f2da0a0df9962a981781fd0b4e7f865fd457365124fe SHA512 19a51baf03e628c04712bd1b8b83dc30ab0a0c9fd7e332140e9a6f2123f50b8e2482047608fdfc96f24bf227211eccd50ab23144b22e1f60dd0eaae91c902be9
 EBUILD rocm-cmake-2.7.0.ebuild 729 BLAKE2B 555a1c7970659c3f01aab1f0dfa1006ed501f2b43cab52aa0a664aed61a248f9d4b7d574b0897329fc83f2da0a0df9962a981781fd0b4e7f865fd457365124fe SHA512 19a51baf03e628c04712bd1b8b83dc30ab0a0c9fd7e332140e9a6f2123f50b8e2482047608fdfc96f24bf227211eccd50ab23144b22e1f60dd0eaae91c902be9
@@ -14,5 +15,6 @@ EBUILD rocm-cmake-2.9.0.ebuild 729 BLAKE2B 555a1c7970659c3f01aab1f0dfa1006ed501f
 EBUILD rocm-cmake-3.0.0.ebuild 729 BLAKE2B 555a1c7970659c3f01aab1f0dfa1006ed501f2b43cab52aa0a664aed61a248f9d4b7d574b0897329fc83f2da0a0df9962a981781fd0b4e7f865fd457365124fe SHA512 19a51baf03e628c04712bd1b8b83dc30ab0a0c9fd7e332140e9a6f2123f50b8e2482047608fdfc96f24bf227211eccd50ab23144b22e1f60dd0eaae91c902be9
 EBUILD rocm-cmake-3.3.0.ebuild 729 BLAKE2B 555a1c7970659c3f01aab1f0dfa1006ed501f2b43cab52aa0a664aed61a248f9d4b7d574b0897329fc83f2da0a0df9962a981781fd0b4e7f865fd457365124fe SHA512 19a51baf03e628c04712bd1b8b83dc30ab0a0c9fd7e332140e9a6f2123f50b8e2482047608fdfc96f24bf227211eccd50ab23144b22e1f60dd0eaae91c902be9
 EBUILD rocm-cmake-3.5.0.ebuild 731 BLAKE2B 463d3a82ab60695d46d43566435db7d3c8e09848a9d43b3c810a6c82628fa882deb81e94b134ec7b5661e4530dff9a9dd407043348bbcb100ad2d7318277a904 SHA512 6fdd1d769eaf846f8e582fa24316da54e6d4210a7b08094300930941d3bee8b671919a4589fb28d3ddb5df61f5ce6969b858de6a0c5fc9de7530e9351df9cd29
+EBUILD rocm-cmake-3.7.0.ebuild 731 BLAKE2B 463d3a82ab60695d46d43566435db7d3c8e09848a9d43b3c810a6c82628fa882deb81e94b134ec7b5661e4530dff9a9dd407043348bbcb100ad2d7318277a904 SHA512 6fdd1d769eaf846f8e582fa24316da54e6d4210a7b08094300930941d3bee8b671919a4589fb28d3ddb5df61f5ce6969b858de6a0c5fc9de7530e9351df9cd29
 EBUILD rocm-cmake-9999.ebuild 729 BLAKE2B 555a1c7970659c3f01aab1f0dfa1006ed501f2b43cab52aa0a664aed61a248f9d4b7d574b0897329fc83f2da0a0df9962a981781fd0b4e7f865fd457365124fe SHA512 19a51baf03e628c04712bd1b8b83dc30ab0a0c9fd7e332140e9a6f2123f50b8e2482047608fdfc96f24bf227211eccd50ab23144b22e1f60dd0eaae91c902be9
 MISC metadata.xml 468 BLAKE2B a05fff7df6fd53ff6793719b621d44ffec411b8c287a8fae36f6f07860cbbf819328bf579c8a0972d72fc6cbbdaee6dd628d4fadb9a2100e1fe1dc97911cb012 SHA512 2907497bd76b1a7f265c371fc55773a541647ec5c4ae42257a405bacc0b2839023a44b282719c0b9d4938e53eb55d5929679242219254db9ee728463d0b2a69b
diff --git a/dev-util/rocm-cmake/rocm-cmake-3.7.0.ebuild b/dev-util/rocm-cmake/rocm-cmake-3.7.0.ebuild
new file mode 100644
index 000000000000..a8e68baa5599
--- /dev/null
+++ b/dev-util/rocm-cmake/rocm-cmake-3.7.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 74f1d7ef9593..05ab9aa858ca 100644
--- a/dev-util/rocminfo/Manifest
+++ b/dev-util/rocminfo/Manifest
@@ -9,6 +9,7 @@ DIST rocminfo-3.0.0.tar.gz 14786 BLAKE2B 4fab1258ff9b43620c79c811678071c38db5afe
 DIST rocminfo-3.1.0.tar.gz 15113 BLAKE2B 5155819afff87a87a40d5e57c194573a29b85d654bfaf446a17a893490143546e8c706020baae4f1d23a28e53894b20f457dcabf8615730e42e4a18b2caefe12 SHA512 d0be50bab99c4df1ce74e3bf98db68249c681a5eeb6839e4ee6aa91a208ed829d1288ce3cc82f564a22ca8b6f62b65f3c40c3784e21e1fd4953c81315d044dfc
 DIST rocminfo-3.3.0.tar.gz 15120 BLAKE2B 4ac93144dc76d5b8839d3d1cca51d92fdd88ee66ec141afccd84fa3ef2fcf4b140dc78d43f8cbb57eba678e00c247c8189b80c1e0b69662226b505dca57f6be1 SHA512 f2f273882a83632f0d9e7817a722b252cb2c1c7cf5d86cc8980ea680c073f6aa666c4150fff498e8bc48396e3e23f544d05485ee1672bc34223ca8ec64226854
 DIST rocminfo-3.5.0.tar.gz 15503 BLAKE2B 4b3ae79ea2f95fa5783cbbe7ed1aed0085de65f5b4b9d1c58ae7a32b18129d614f81a09c1979132e53acafaf94c1df4b0e08d558d091e55ca412e6ea44f84c89 SHA512 41834d462caca19b3645667bf440946c37d9f2fb0bd209f2b6c506c7debd7950807d787c0bc1cee206249c8651e7a315965965f29471d4832de5ee8e42cba1bb
+DIST rocminfo-3.7.0.tar.gz 15104 BLAKE2B 728ce471e52dadca8b59aa3196c2f75933650e3002335014accd7f8eada19d4936a7404f908d50747a0e51faa8a65764200072cf598f9d0855a3052db8290160 SHA512 25a6a9216366e310ece9db50a21bc0eb7741760a7b46fa1818ee102557000348f430f9269e2ba9e872437dfafcb31ac563476e2bf83a10705fde8dd5fc854404
 EBUILD rocminfo-2.10.0.ebuild 792 BLAKE2B 87746c08f5fe212bb81d84c5d34108b6e277415c7fb0e257cb5ab45ebe3524e2269bac4abf6a80099ea8898558285fe5512a735a9c1cfc8a4766783337442e24 SHA512 f0d45221962b8be509c72ef7b08f408c3bb58366314dee421e6dab4a3e738854a3ba7597b37a1f8f994e6019d0a1b43d2ac6fd22b8af86bfc4825cafc9021ca5
 EBUILD rocminfo-2.6.0.ebuild 847 BLAKE2B 12e23752891ccb97f9bb62d0edd1465bb90858023674b3b5ea4dbd2783e6c7b722a855295dbd25de1787b42e4d5f56fa7064847a582b6e4d757cfcfd95e1f5b5 SHA512 2d2f96093c11690c13fc85868340e670c80c8578c25831a835fb2d8d724893c7a300755dde35c50c9314e778c821f2fa7bd3360ff6105369a16d1a3e2a419bfe
 EBUILD rocminfo-2.7.0.ebuild 887 BLAKE2B b9ba2da7efbdb3c05e9b3dfbdf9d3edf8b5c2f79b9362c4663ff292712f5399156119d243a335814439e537e2718e082a7d52d62e2f679ecc74a7fcd06b85865 SHA512 4ff345ad2e1c4db1429b51e1d46b1505e1a10a5c74aa3ad0c87f3b578b87ef20cc467825d2f9df9d55f29436c2b040dd85555def280d395b35b2944125192dd6
@@ -18,5 +19,6 @@ EBUILD rocminfo-3.0.0.ebuild 792 BLAKE2B 87746c08f5fe212bb81d84c5d34108b6e277415
 EBUILD rocminfo-3.1.0.ebuild 792 BLAKE2B 87746c08f5fe212bb81d84c5d34108b6e277415c7fb0e257cb5ab45ebe3524e2269bac4abf6a80099ea8898558285fe5512a735a9c1cfc8a4766783337442e24 SHA512 f0d45221962b8be509c72ef7b08f408c3bb58366314dee421e6dab4a3e738854a3ba7597b37a1f8f994e6019d0a1b43d2ac6fd22b8af86bfc4825cafc9021ca5
 EBUILD rocminfo-3.3.0.ebuild 794 BLAKE2B 8ba7a2ebd5a75e507089f0deeb49b1085175641bc0c53c0609d386f39a1d6f3d38a608703f59f798f2fc24ae453619d8154427e7bf4c02b5852b260b0d01c067 SHA512 32a8fdda420e1440df3a2b297d6030ac69c892e5be970d61647942be7f2be3c620c9fec5bfa179ec54c3af1eb1e19d51e2de82d2eeb5d2b62c57c945844ed2ac
 EBUILD rocminfo-3.5.0.ebuild 794 BLAKE2B 8ba7a2ebd5a75e507089f0deeb49b1085175641bc0c53c0609d386f39a1d6f3d38a608703f59f798f2fc24ae453619d8154427e7bf4c02b5852b260b0d01c067 SHA512 32a8fdda420e1440df3a2b297d6030ac69c892e5be970d61647942be7f2be3c620c9fec5bfa179ec54c3af1eb1e19d51e2de82d2eeb5d2b62c57c945844ed2ac
+EBUILD rocminfo-3.7.0.ebuild 614 BLAKE2B 06e1e5b14bd58c8ca3519a9b446fec7e6ce46043cbb0bfedd6bc22b9e45d3c41d03a135c742c5451aa3b23d3a811fe76dcd0d71ba29f8ea37b62b4626414c8c3 SHA512 523379bff77eee0cb15ff6fa529f724698fb4e3ea590af72555db46ae51644ecfc3c4ece36db2a3864314f66ec4bbe8fed954cccf4d1fb2afcbb8115b020a840
 EBUILD rocminfo-9999.ebuild 794 BLAKE2B 8ba7a2ebd5a75e507089f0deeb49b1085175641bc0c53c0609d386f39a1d6f3d38a608703f59f798f2fc24ae453619d8154427e7bf4c02b5852b260b0d01c067 SHA512 32a8fdda420e1440df3a2b297d6030ac69c892e5be970d61647942be7f2be3c620c9fec5bfa179ec54c3af1eb1e19d51e2de82d2eeb5d2b62c57c945844ed2ac
 MISC metadata.xml 475 BLAKE2B c1ca0f1d0ec94ae012d3a6c2e5b0a896de75fae32ab8af40d2d0e8747544c15f11ce76cc45bd429d4b5b3b3abde5c896fed362641abf995c4bf9f10077e6933d SHA512 f84d5a379fc07d3410bf6cf946c91056295dccad64f100be02959d94e39eaa47d4fcfed84ea2bd596b2ecccb4ad3267bd86cd76b50d938b235655220fcef1549
diff --git a/dev-util/rocminfo/rocminfo-3.7.0.ebuild b/dev-util/rocminfo/rocminfo-3.7.0.ebuild
new file mode 100644
index 000000000000..6de4e9b7cca0
--- /dev/null
+++ b/dev-util/rocminfo/rocminfo-3.7.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 c4cd6b38ee20..aa768acc086e 100644
--- a/dev-util/rosdep/Manifest
+++ b/dev-util/rosdep/Manifest
@@ -1,8 +1,4 @@
-DIST rosdep-0.13.0.tar.gz 301327 BLAKE2B 39c39903bb2e6c07dfd4e3aa9546acf434498db518c3bda04ef79c46ed5d13b7cd55978c78bea8294d8e5b84ddddef22814436566f3f958d91d3964650399a08 SHA512 c42aa17ee9b31f7013415e99a484a66a7a7fb52abef4cc9045658150ce0c36b475f2885ebfff537f9ce9f8fd5eeaef5482226c5bff5b4a3df03cc72b149db07a
-DIST rosdep-0.14.0.tar.gz 301534 BLAKE2B 86e4fb42e682218dc1d68851a0023f2fbddc5a8a89d90dd33cc7223080792e3d3dea7607a57692428f81589abc693c9f843be4c10ca81b6419da7e383d1c7987 SHA512 abf9c294b9fb01aa4c32bd7ad563119874e162d6031255edce642eeee1512da39a03383aa6cd55f090587df2b6bd1dc83bc53163be9d2b53be6178ec8a422f66
-DIST rosdep-0.15.0.tar.gz 301659 BLAKE2B c7e5602e78e8f4892f16ef41d7423e653750def24f043c2519646b8c038bcb39b62d60323ef4e8a496a863bb74f51cdce7aebb1b5423120562a34c1988437510 SHA512 d9def23a4c01636a42dbccf99be96b9704eb96641da00db4305c63b18fa0f69de1ae402bcf7fff4030bc20097496086ff9168794d1e5cd44153cb3a84ba18509
-EBUILD rosdep-0.13.0.ebuild 1511 BLAKE2B 074cb745dc6f0c3fb1e15418f7d9f15d881579e25b0bb3baa2b1c18a76385ccd8816423c9e1503d5bd15cd3231cf100dd0ed8fe9083ad56eadd1d166d9f4b584 SHA512 960e230395e6d533d0e9634ae02c8fc03e147938571b65e9ad04694974105d7d6b89d96a2ed6c8e76ae509a75f6f65861637dd7419c304082e5e4c7bbf9d419d
-EBUILD rosdep-0.14.0.ebuild 1511 BLAKE2B 074cb745dc6f0c3fb1e15418f7d9f15d881579e25b0bb3baa2b1c18a76385ccd8816423c9e1503d5bd15cd3231cf100dd0ed8fe9083ad56eadd1d166d9f4b584 SHA512 960e230395e6d533d0e9634ae02c8fc03e147938571b65e9ad04694974105d7d6b89d96a2ed6c8e76ae509a75f6f65861637dd7419c304082e5e4c7bbf9d419d
-EBUILD rosdep-0.15.0.ebuild 1511 BLAKE2B 074cb745dc6f0c3fb1e15418f7d9f15d881579e25b0bb3baa2b1c18a76385ccd8816423c9e1503d5bd15cd3231cf100dd0ed8fe9083ad56eadd1d166d9f4b584 SHA512 960e230395e6d533d0e9634ae02c8fc03e147938571b65e9ad04694974105d7d6b89d96a2ed6c8e76ae509a75f6f65861637dd7419c304082e5e4c7bbf9d419d
-EBUILD rosdep-9999.ebuild 1511 BLAKE2B 074cb745dc6f0c3fb1e15418f7d9f15d881579e25b0bb3baa2b1c18a76385ccd8816423c9e1503d5bd15cd3231cf100dd0ed8fe9083ad56eadd1d166d9f4b584 SHA512 960e230395e6d533d0e9634ae02c8fc03e147938571b65e9ad04694974105d7d6b89d96a2ed6c8e76ae509a75f6f65861637dd7419c304082e5e4c7bbf9d419d
+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
 MISC metadata.xml 339 BLAKE2B 98c570641ca07f96e5fcfaece9d49977136f720d77c9cf6dcecbb06bc4016410e082201d69d3c36af5de03cc70ea5a1b726289124324e2f11266e5db69a6ea97 SHA512 62ab4dc2638e4af95290eba19e1755d3bade56e5d1e7251d3cc9da410fcf7ead48562193b2cb6b6f8800daf7df31786e70ce153780b9e278891c31d2b9c257bf
diff --git a/dev-util/rosdep/rosdep-0.13.0.ebuild b/dev-util/rosdep/rosdep-0.13.0.ebuild
deleted file mode 100644
index ae19fe69509a..000000000000
--- a/dev-util/rosdep/rosdep-0.13.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 pypy3 )
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/ros-infrastructure/rosdep"
-fi
-
-inherit ${SCM} distutils-r1
-
-DESCRIPTION="Command-line tool for installing ROS system dependencies"
-HOMEPAGE="http://wiki.ros.org/rosdep"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="http://download.ros.org/downloads/${PN}/${P}.tar.gz
-		https://github.com/ros-infrastructure/rosdep/archive/${PV}.tar.gz -> ${P}.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/catkin_pkg[${PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-python/rosdistro[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-python/nose[${PYTHON_USEDEP}]
-	test? (
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/flake8[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	nosetests --with-coverage --cover-package=rosdep2 --with-xunit test || die
-}
-
-pkg_postrm() {
-	if [ "${ROOT:-/}" = "/" ] ; then
-		einfo "Removing rosdep default sources list."
-		rm -f "${EPREFIX}/etc/ros/rosdep/sources.list.d/20-default.list"
-	fi
-}
-
-pkg_postinst() {
-	if [ "${ROOT:-/}" = "/" -a ! -f "${EPREFIX}/etc/ros/rosdep/sources.list.d/20-default.list" ] ; then
-		einfo "Initializing rosdep"
-		rosdep init
-	fi
-}
diff --git a/dev-util/rosdep/rosdep-0.14.0.ebuild b/dev-util/rosdep/rosdep-0.14.0.ebuild
deleted file mode 100644
index ae19fe69509a..000000000000
--- a/dev-util/rosdep/rosdep-0.14.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 pypy3 )
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/ros-infrastructure/rosdep"
-fi
-
-inherit ${SCM} distutils-r1
-
-DESCRIPTION="Command-line tool for installing ROS system dependencies"
-HOMEPAGE="http://wiki.ros.org/rosdep"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="http://download.ros.org/downloads/${PN}/${P}.tar.gz
-		https://github.com/ros-infrastructure/rosdep/archive/${PV}.tar.gz -> ${P}.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/catkin_pkg[${PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-python/rosdistro[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-python/nose[${PYTHON_USEDEP}]
-	test? (
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/flake8[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	nosetests --with-coverage --cover-package=rosdep2 --with-xunit test || die
-}
-
-pkg_postrm() {
-	if [ "${ROOT:-/}" = "/" ] ; then
-		einfo "Removing rosdep default sources list."
-		rm -f "${EPREFIX}/etc/ros/rosdep/sources.list.d/20-default.list"
-	fi
-}
-
-pkg_postinst() {
-	if [ "${ROOT:-/}" = "/" -a ! -f "${EPREFIX}/etc/ros/rosdep/sources.list.d/20-default.list" ] ; then
-		einfo "Initializing rosdep"
-		rosdep init
-	fi
-}
diff --git a/dev-util/rosdep/rosdep-0.15.0.ebuild b/dev-util/rosdep/rosdep-0.19.0.ebuild
index ae19fe69509a..aa7a8d86538f 100644
--- a/dev-util/rosdep/rosdep-0.15.0.ebuild
+++ b/dev-util/rosdep/rosdep-0.19.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_6 pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
@@ -13,7 +13,7 @@ fi
 inherit ${SCM} distutils-r1
 
 DESCRIPTION="Command-line tool for installing ROS system dependencies"
-HOMEPAGE="http://wiki.ros.org/rosdep"
+HOMEPAGE="https://wiki.ros.org/rosdep"
 if [ "${PV#9999}" != "${PV}" ] ; then
 	SRC_URI=""
 	KEYWORDS=""
diff --git a/dev-util/rosdep/rosdep-9999.ebuild b/dev-util/rosdep/rosdep-9999.ebuild
index ae19fe69509a..aa7a8d86538f 100644
--- a/dev-util/rosdep/rosdep-9999.ebuild
+++ b/dev-util/rosdep/rosdep-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_6 pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
@@ -13,7 +13,7 @@ fi
 inherit ${SCM} distutils-r1
 
 DESCRIPTION="Command-line tool for installing ROS system dependencies"
-HOMEPAGE="http://wiki.ros.org/rosdep"
+HOMEPAGE="https://wiki.ros.org/rosdep"
 if [ "${PV#9999}" != "${PV}" ] ; then
 	SRC_URI=""
 	KEYWORDS=""
diff --git a/dev-util/rosinstall/Manifest b/dev-util/rosinstall/Manifest
index 7bd550729108..5d96975c29e9 100644
--- a/dev-util/rosinstall/Manifest
+++ b/dev-util/rosinstall/Manifest
@@ -1,4 +1,4 @@
 DIST rosinstall-0.7.8.tar.gz 26430 BLAKE2B fae82276f5376a94914272e60b2e3b0f81cb37bd7b41e0a4df73c8b58d19a73505a0c5e193495fd59c931c04265cbb372abfad19fd4043fc77e5224127bd97f5 SHA512 a53ae8fb96f9dda4671b22dfd9dbadc18d1e4adbf34a50b6706baf971c1c7ee418e14641d334346b02638f06c10d1bc984b4759c92a39510dd0044fbc346be67
-EBUILD rosinstall-0.7.8.ebuild 1552 BLAKE2B 92d2145bb35d449c54520b0b4775b6619556bb75c47ef2486dfaf7926dcdc0a20c14edb8f8c1890d9969176b6fd3193fb08de3076ab1ddfec5c7549c859e0e44 SHA512 6673b3be83adb13a099086b25c80226f9823bf99ff98aeaaeac2f6f73c1f25486c2ddb868401df0ff2746046df6626dcc3ef21596a9cc53e26dd39c1fa3ae103
-EBUILD rosinstall-9999.ebuild 1552 BLAKE2B 92d2145bb35d449c54520b0b4775b6619556bb75c47ef2486dfaf7926dcdc0a20c14edb8f8c1890d9969176b6fd3193fb08de3076ab1ddfec5c7549c859e0e44 SHA512 6673b3be83adb13a099086b25c80226f9823bf99ff98aeaaeac2f6f73c1f25486c2ddb868401df0ff2746046df6626dcc3ef21596a9cc53e26dd39c1fa3ae103
+EBUILD rosinstall-0.7.8.ebuild 1560 BLAKE2B 319fbac08cbd3560bff02b4cedac08a8923ffa44131dab6cdbb44fa7d118f31b321bcc7bc4f211864d19b195518888e8f81f09de1b47df4e391ad4c827f4d53d SHA512 064e74056610d5fa24f02e0cee528a4e31effb1a5a4748862f5ce63cc609c85d4c6f81d2d301555bb6f378b9bb0d3825e8db10b07b6485a93c1792408bd5d13d
+EBUILD rosinstall-9999.ebuild 1560 BLAKE2B 319fbac08cbd3560bff02b4cedac08a8923ffa44131dab6cdbb44fa7d118f31b321bcc7bc4f211864d19b195518888e8f81f09de1b47df4e391ad4c827f4d53d SHA512 064e74056610d5fa24f02e0cee528a4e31effb1a5a4748862f5ce63cc609c85d4c6f81d2d301555bb6f378b9bb0d3825e8db10b07b6485a93c1792408bd5d13d
 MISC metadata.xml 333 BLAKE2B 55190f2209aab41e0f1625fb699d61be2a53d0af996feff9ee5b0cbb5326363dcb915aa83427096f1723b885806a4cdb5b6cd2285c76064bf0b889b624fbcc31 SHA512 5c6ef4930985cd5c2ea51b18a25d7cc2a5e387bdbd26e42f8710d6ce903cf13fe85ee1f1d13a0ffe82c8056dd295a3e25268ec58353508f30bf10404ae4ffb8a
diff --git a/dev-util/rosinstall/rosinstall-0.7.8.ebuild b/dev-util/rosinstall/rosinstall-0.7.8.ebuild
index 9e8721ba8342..989f4ba428aa 100644
--- a/dev-util/rosinstall/rosinstall-0.7.8.ebuild
+++ b/dev-util/rosinstall/rosinstall-0.7.8.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-PYTHON_COMPAT=( python3_6 )
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
@@ -13,7 +13,7 @@ fi
 inherit ${SCM} distutils-r1
 
 DESCRIPTION="Command-line tools for maintaining a workspace of projects for ROS"
-HOMEPAGE="http://wiki.ros.org/rosinstall http://wiki.ros.org/roslocate"
+HOMEPAGE="https://wiki.ros.org/rosinstall https://wiki.ros.org/roslocate"
 if [ "${PV#9999}" != "${PV}" ] ; then
 	SRC_URI=""
 	KEYWORDS=""
diff --git a/dev-util/rosinstall/rosinstall-9999.ebuild b/dev-util/rosinstall/rosinstall-9999.ebuild
index 9e8721ba8342..989f4ba428aa 100644
--- a/dev-util/rosinstall/rosinstall-9999.ebuild
+++ b/dev-util/rosinstall/rosinstall-9999.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-PYTHON_COMPAT=( python3_6 )
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
@@ -13,7 +13,7 @@ fi
 inherit ${SCM} distutils-r1
 
 DESCRIPTION="Command-line tools for maintaining a workspace of projects for ROS"
-HOMEPAGE="http://wiki.ros.org/rosinstall http://wiki.ros.org/roslocate"
+HOMEPAGE="https://wiki.ros.org/rosinstall https://wiki.ros.org/roslocate"
 if [ "${PV#9999}" != "${PV}" ] ; then
 	SRC_URI=""
 	KEYWORDS=""
diff --git a/dev-util/rosinstall_generator/Manifest b/dev-util/rosinstall_generator/Manifest
index de563fa510e7..c5c000fced36 100644
--- a/dev-util/rosinstall_generator/Manifest
+++ b/dev-util/rosinstall_generator/Manifest
@@ -1,6 +1,5 @@
-DIST rosinstall_generator-0.1.13.tar.gz 11186 BLAKE2B bb6f95eba12ee6b9adfa22d46475d555aa9b3bed225e3be52a52f380bbd1ab3f86871a9a816c56c874f8545d2ef648e226ad5d8d3346444a92202865265260f1 SHA512 c8b5736066f8a42a324b2bed578e03282b6d8ae8df48fb30545617c2995ce53f35d7fea6fab3989383b958e7cb763b24deb67c5ec3496cc77f1ba51f110ab78c
-DIST rosinstall_generator-0.1.14.tar.gz 11419 BLAKE2B af9754f46589aac1e9bb265345319c4037d2b1e10ea8119859e2715b2828974bc4422cac25f84216c401f35b7cddde207e7562afb07e753328940db347b69a20 SHA512 45461917afaf93f38b118951c272ba71a408d2c276b4019739c9c8dc9407812bf166bb762910ce45cedc9b31e2796922a69681ad461c468c7ed2372a1d189904
-EBUILD rosinstall_generator-0.1.13.ebuild 927 BLAKE2B 740ba1c9f92b57910520ea268c5b750f4386644abee085671fcb18bd2d6dd9e3d9570e8936350e58cd3fd3357b95e5367970c83d7fac31ff7d09416eb60b4683 SHA512 e5fec4e1c60fb18156644ff02e0067eec142f316a7ec0265e975884a6b8618b238a061f87f489eeaff5e77827b203263173fae162285f0bcdb37658215a88375
-EBUILD rosinstall_generator-0.1.14.ebuild 1062 BLAKE2B f3775ef7c5961166c60dd37622bb6f24eed6b57c7893779686a161352e535f9e19ad0859ad27c8687bed21d5daed2a6b60cc676aeb607f04429d841660a9bd73 SHA512 82b38f11458e58c7fa269ed5c20a225148f0008f61d7e4fb2ebbc5388720d5258d45b0f708e3b0b1acfbf4d95fd5786afb49b44b2b8c56c9f5ca9080f29a3445
-EBUILD rosinstall_generator-9999.ebuild 1062 BLAKE2B f3775ef7c5961166c60dd37622bb6f24eed6b57c7893779686a161352e535f9e19ad0859ad27c8687bed21d5daed2a6b60cc676aeb607f04429d841660a9bd73 SHA512 82b38f11458e58c7fa269ed5c20a225148f0008f61d7e4fb2ebbc5388720d5258d45b0f708e3b0b1acfbf4d95fd5786afb49b44b2b8c56c9f5ca9080f29a3445
+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
 MISC metadata.xml 353 BLAKE2B 26692ca3eb76500607275909a9c86bc88f7c80114e7840763136902a59dddc8f23dcd766f821aa5beffff9419d39a48e18682f86c8148df7d640977c9b30ebcd SHA512 a681a9f31c4cf06a775ef57f7a942c76d0e8873c4c854fddaf44df0301f3e14bd836727e6816bc74f0ced9e54dfd9335c376c47b8af2a19455c42a3f6ed38a18
diff --git a/dev-util/rosinstall_generator/files/yaml.patch b/dev-util/rosinstall_generator/files/yaml.patch
new file mode 100644
index 000000000000..668e1ef58b71
--- /dev/null
+++ b/dev-util/rosinstall_generator/files/yaml.patch
@@ -0,0 +1,13 @@
+Index: rosinstall_generator-0.1.22/test/test_distro.py
+===================================================================
+--- rosinstall_generator-0.1.22.orig/test/test_distro.py
++++ rosinstall_generator-0.1.22/test/test_distro.py
+@@ -53,7 +53,7 @@ def _get_test_dist():
+       type: distribution
+       version: 2
+     '''
+-    return DistributionFile('test', yaml.load(test_dist_yaml))
++    return DistributionFile('test', yaml.safe_load(test_dist_yaml))
+ 
+ 
+ def test_get_package_names():
diff --git a/dev-util/rosinstall_generator/rosinstall_generator-0.1.13.ebuild b/dev-util/rosinstall_generator/rosinstall_generator-0.1.13.ebuild
deleted file mode 100644
index 7419030810a4..000000000000
--- a/dev-util/rosinstall_generator/rosinstall_generator-0.1.13.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python3_6 )
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/ros-infrastructure/rosinstall_generator"
-fi
-
-inherit ${SCM} distutils-r1
-
-DESCRIPTION="Generates rosinstall metadata about repositories with ROS packages/stacks"
-HOMEPAGE="http://wiki.ros.org/rosinstall_generator"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/ros-infrastructure/rosinstall_generator/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-python/catkin_pkg-0.1.28[${PYTHON_USEDEP}]
-	>=dev-python/rosdistro-0.5.0[${PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-util/rosinstall_generator/rosinstall_generator-0.1.14.ebuild b/dev-util/rosinstall_generator/rosinstall_generator-0.1.22.ebuild
index 2b89625c44ca..58ee6bf23a0d 100644
--- a/dev-util/rosinstall_generator/rosinstall_generator-0.1.14.ebuild
+++ b/dev-util/rosinstall_generator/rosinstall_generator-0.1.22.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-PYTHON_COMPAT=( python3_6 pypy3 )
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
@@ -13,7 +13,7 @@ fi
 inherit ${SCM} distutils-r1
 
 DESCRIPTION="Generates rosinstall metadata about repositories with ROS packages/stacks"
-HOMEPAGE="http://wiki.ros.org/rosinstall_generator"
+HOMEPAGE="https://wiki.ros.org/rosinstall_generator"
 if [ "${PV#9999}" != "${PV}" ] ; then
 	SRC_URI=""
 	KEYWORDS=""
@@ -35,6 +35,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+PATCHES=( "${FILESDIR}/yaml.patch" )
 
 python_test() {
 	nosetests --with-coverage || die
diff --git a/dev-util/rosinstall_generator/rosinstall_generator-9999.ebuild b/dev-util/rosinstall_generator/rosinstall_generator-9999.ebuild
index 2b89625c44ca..58ee6bf23a0d 100644
--- a/dev-util/rosinstall_generator/rosinstall_generator-9999.ebuild
+++ b/dev-util/rosinstall_generator/rosinstall_generator-9999.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-PYTHON_COMPAT=( python3_6 pypy3 )
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
@@ -13,7 +13,7 @@ fi
 inherit ${SCM} distutils-r1
 
 DESCRIPTION="Generates rosinstall metadata about repositories with ROS packages/stacks"
-HOMEPAGE="http://wiki.ros.org/rosinstall_generator"
+HOMEPAGE="https://wiki.ros.org/rosinstall_generator"
 if [ "${PV#9999}" != "${PV}" ] ; then
 	SRC_URI=""
 	KEYWORDS=""
@@ -35,6 +35,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+PATCHES=( "${FILESDIR}/yaml.patch" )
 
 python_test() {
 	nosetests --with-coverage || die
diff --git a/dev-util/sasm/Manifest b/dev-util/sasm/Manifest
index 07f4eff449dc..90955f17896f 100644
--- a/dev-util/sasm/Manifest
+++ b/dev-util/sasm/Manifest
@@ -1,6 +1,6 @@
 AUX sasm-3.10.1-unbundle-qtsingleapplication.patch 441 BLAKE2B 433221ce1d28357dc3897916e11f0e42ae4bb95402c1da6b6abcfcdecf33ddfd1a727b87ab2bf933f96fbeda95137f70e31d02c8e731a7ab3da7a784f148dad3 SHA512 c04977ee0f651c8cd5f56c93c32668aeeeeac5ae3c1bcc909933a660afae149dd797bf23df159f15fe8374001a9dbdf78ca5c5f6b59034922a82e19ad16c037f
 DIST sasm-2.2.tar.gz 9117410 BLAKE2B f85d120469f11fd8cdb7ae9dcdc87464d8bc64db4f99cb2787c4f2adb6294288a7fd1dc071b53badb8153e8c8220a77964b102a234ad9ebc3b6a64d505c828dd SHA512 42d4af775d37d47bcf63fb70b9142e387e33cef5589002ff3e3cee926b5fca7e1508d640d1d5a175d48fc9fd041eb1f03304cad5ddc3c22a09ff29198650b513
 DIST sasm-3.10.1.tar.gz 22349749 BLAKE2B e1337d9ab1f62b0ccab31f202f5964ab2b355ab597cf08e65dd69f7a35f72187a36767d1bbbf339e3bf8330dffcd924682e464d0e8cdc13255723b2c5ed75747 SHA512 2a1410c996e3dac1179a2c8a0140b2180ccc9e461e4695a588c6a5db787a13de5ca9124d467561905e1d445d08bd044bd99831203faa6a740614bc6680ae10d1
-EBUILD sasm-2.2-r1.ebuild 749 BLAKE2B 336ff1f57eaf6fa9beef03f49b9b6082d45072e1e89927117e9d464a56edb6717e3cda8e72a02fbe9ebce398952c650ea7adca8afc9cbf29e718e2f3e688fd4c SHA512 7e049807b11fd7acbef12900decc451979818b413718e2935e6c28ec68ac7b0a70bfbe8316c407651bb66f336308157ba75ed77db0313b3ad45dbd81fcc6fddc
-EBUILD sasm-3.10.1.ebuild 1173 BLAKE2B 78b77ce3d85ab9d4720dbf5c918e46ea1553c3f840e024e9d6cf6cc2ee8a83e305885beed42d00d03b7a577058e316eef0c19d4efd0fec4f5d847aacc7a7b3a4 SHA512 0f6aba843321330417639396ed709155d9e03ca9934b14251967a5c65e54f33db9efca0af1e0a6a1f5835ab740701c15d6b1b041262fd196470f577a96772149
+EBUILD sasm-2.2-r1.ebuild 709 BLAKE2B 843eb1da7c0081aab0306936d2234381970a0ae6b7eda4543bc5f5b7ced04e9d800b66fa393cc0e1ba414ebd3ed3af5bfae182a49836b3ebd600a9958dfbf1f5 SHA512 82386d4f7c34b704625a7d2cb34ddd0f0e8c08ae9dda9fa193a93cab456c54fb7f26cb5247a85475cfa839d3e9b38025c45ec03abe2373fda6f5a75eb75c8f2a
+EBUILD sasm-3.10.1.ebuild 1135 BLAKE2B 4073da7d0a2b0675c6ce998940986d1490960a2007efad9449459218cd7287799e610a2ceb8a1c9906125d506fcee4e73e95ab15ec568c1b86a165b22fe44dc6 SHA512 cf0cbfa63b493d4fee91bce2a0d90e18e3eccc6ae6a193f35a0bb167dbbeb37211935426e0f08e05a99a8655db743deb903b3e33573c7b16234419fe07f62640
 MISC metadata.xml 325 BLAKE2B 7fad0a2d1d4ab4f67758d702f18de025b6bf553e5f99ab43b6657ee9dbfcb858892ae5c4d6e37094b744b85fd70f1dd7f1b1e8e7ff142d86f9bf83190aa045c2 SHA512 8cb446410e74845234244cb121cf966f18ea1ce69796f6dc5c6c1d434952811e61c8b02aaeba24905578f8e8463e29269538b50768b30524af859419769b5a92
diff --git a/dev-util/sasm/sasm-2.2-r1.ebuild b/dev-util/sasm/sasm-2.2-r1.ebuild
index 7c9c73aab793..eb371161fa27 100644
--- a/dev-util/sasm/sasm-2.2-r1.ebuild
+++ b/dev-util/sasm/sasm-2.2-r1.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit qmake-utils
 
-if [[ ${PV} == 9999 ]]; then
+if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/Dman95/SASM.git"
-	SRC_URI=""
 	inherit git-r3
 else
 	SRC_URI="https://github.com/Dman95/SASM/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/SASM-${PV}"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${P^^}"
 fi
 
 DESCRIPTION="Simple crossplatform IDE for NASM assembly language"
@@ -19,8 +19,6 @@ HOMEPAGE="http://dman95.github.io/SASM/"
 
 LICENSE="GPL-3"
 SLOT="0"
-[[ ${PV} == 9999 ]] || \
-KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
@@ -28,7 +26,7 @@ DEPEND="
 	dev-qt/qtgui:5
 	dev-qt/qtwidgets:5
 "
-REPEND="${DEPEND}
+RDEPEND="${DEPEND}
 	dev-lang/nasm
 	sys-devel/gdb
 "
diff --git a/dev-util/sasm/sasm-3.10.1.ebuild b/dev-util/sasm/sasm-3.10.1.ebuild
index 90ca72d53168..33cb8195c3eb 100644
--- a/dev-util/sasm/sasm-3.10.1.ebuild
+++ b/dev-util/sasm/sasm-3.10.1.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit qmake-utils
 
-if [[ ${PV} == 9999 ]]; then
+if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/Dman95/SASM.git"
-	SRC_URI=""
 	inherit git-r3
 else
 	SRC_URI="https://github.com/Dman95/SASM/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/SASM-${PV}"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${P^^}"
 fi
 
 DESCRIPTION="Simple crossplatform IDE for NASM assembly language"
@@ -19,13 +19,9 @@ HOMEPAGE="http://dman95.github.io/SASM/"
 
 LICENSE="GPL-3"
 SLOT="0"
-[[ ${PV} == 9999 ]] || \
-KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-PATCHES=(
-	"${FILESDIR}"/${P}-unbundle-qtsingleapplication.patch
-)
+PATCHES=( "${FILESDIR}"/${P}-unbundle-qtsingleapplication.patch )
 
 DEPEND="
 	dev-qt/qtcore:5
@@ -33,7 +29,7 @@ DEPEND="
 	dev-qt/qtsingleapplication
 	dev-qt/qtwidgets:5
 "
-REPEND="${DEPEND}
+RDEPEND="${DEPEND}
 	dev-lang/nasm
 	sys-devel/gdb
 "
@@ -42,13 +38,13 @@ REPEND="${DEPEND}
 QA_PREBUILT="usr/bin/fasm usr/bin/listing"
 
 src_prepare() {
+	default
+
 	# To recompress it with gentoo tools
 	gunzip Linux/share/doc/sasm/changelog.gz || die
 	sed -e 's@changelog.gz@changelog@g' \
 		-e '/docfiles.path/s@doc/sasm@doc/'${PF}'@g' \
 		-i SASM.pro || die
-
-	default
 }
 
 src_configure() {
diff --git a/dev-util/schroot/Manifest b/dev-util/schroot/Manifest
index 4ecb6780a117..affe31a3b3a5 100644
--- a/dev-util/schroot/Manifest
+++ b/dev-util/schroot/Manifest
@@ -3,5 +3,5 @@ AUX schroot.initd 706 BLAKE2B 344eb8296714d2d40b451a07fd6e498c6134122da2d115cfc4
 AUX schroot.tmpfilesd 91 BLAKE2B f731cf3cb0037ec35f8144d2667f3a12fbfcef088454d165cfcdc63d34f433eb7abc9442917c0cccaf48b66cab028db0b04edbd9d1cb2864d257213fe54fd3e6 SHA512 381d715e2a1443d0115a6fa35cc7d43205a1dfa432f40e4903d944c219b8f5f0b076fb93c90c159f1f7edd5cf8a8766653a41e168940da92bae0b186c93eff96
 DIST schroot_1.6.10-7.debian.tar.xz 82524 BLAKE2B 664ee356f8de1215c761a771cc0700d25ff6c0513124f4d84d5b33a046cac6ff194b62dded1e8f966a922a013644edd3d9424b0d577a8bb2b371e23e8dd88ed5 SHA512 ee362cce46ec804cd0ad6bfe3c7dec37fdeffe56941d51aec9e9622057a4d2a94e47f7530d28862c948233c6623cfa4b4721c27f293e31a28ec0320ffe02a47a
 DIST schroot_1.6.10.orig.tar.xz 797328 BLAKE2B 1f91531f22c5b0a75e5bb74effc660efe4819acc59b007355c12a01c0a1de12674881dd0fbbcab00575a02629662fca799d48f5b967eb527812ed8c08ff9ad28 SHA512 25155989c7811ab4c7bf3cdceaa8d0ffb12f08388143891def96fcd205f1cc401dad9a74f0e9a9ef8610d50174ff8319a8368401431dc87e1a11c0241e61fcbe
-EBUILD schroot-1.6.10_p7.ebuild 2852 BLAKE2B 0f55571f601dd192cd0f8c799d114ed28479a9e24f1676c90bd061d3782e1a1ad7c69de4e312373c5e234a283e6152378d657f7740a558c3e71cae9424812847 SHA512 bcc610e39ebebe568fb07c31b82bb95f0022ecc8953205c2f8d1c107086598ee3032aaa8afecd5ad91f08e5c4b39e8f8d59653f770b6fe46860da102f3e76860
+EBUILD schroot-1.6.10_p7.ebuild 2859 BLAKE2B 3ae69ae9b1b89b340bf0ca4f4f177ab61e76601ac179f3e03a0e51fd705361435c6694ef7513d85cab970234ef06ba4ac7d9972c80ba5b8ab14eeca023808204 SHA512 a55af72d539e302b712f8deccbeb53d679e6c8c0b32e280b563361348d536a87a742c60ee026754aca99e509d670f6932109d4fbe47111637f4794f7c47c9748
 MISC metadata.xml 615 BLAKE2B 8f6cde0f4bd1d00fed8330dd097b9ce0de021621af06aee3534e9cdaf79ae9353c27d831916d4e53ecfe11f264a3a9111001aff469471d75e1c51a04d55be4d2 SHA512 3ed685c418e1f8aa15d1a50e695aa71c2c2d48888a0b888a06d830c40a617a804d3c2c5f0f0ff14cea4206aee821239b63df273ccaf7452246112c931e6a923b
diff --git a/dev-util/schroot/schroot-1.6.10_p7.ebuild b/dev-util/schroot/schroot-1.6.10_p7.ebuild
index 549e21110c25..d2a080698748 100644
--- a/dev-util/schroot/schroot-1.6.10_p7.ebuild
+++ b/dev-util/schroot/schroot-1.6.10_p7.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${MY_P/%-*/}.orig.tar.xz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE="btrfs +dchroot debug doc lvm nls pam test zfs"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/scons/Manifest b/dev-util/scons/Manifest
index b2112628d216..659c2c88f67f 100644
--- a/dev-util/scons/Manifest
+++ b/dev-util/scons/Manifest
@@ -1,5 +1,7 @@
 AUX scons-3.0.1-env-passthrough.patch 1507 BLAKE2B 9e21e0b14a3b6c95e2c501b5d264915a10c4c5908de98719c9a73c37f5f7de32824dce6df32a0884c4aeb53658d05cda5dbb9c6102ecd6307c085719d4e568c2 SHA512 07fa387b9ad50cd1e92495a414973acddac8c062827858b44867ff1da0560c1493d29992fe4ac2c6de8eb37ab218967df9a6d9ffa2cb26be772324a637fadbcb
 AUX scons-3.0.3-respect-cc-etc-r1.patch 3381 BLAKE2B f7003c4fc7b054dbbfe4f185876470cf04461fd1a408f44bbac2967c9e709e7f16293dcdaf2042bda811610ca65e3007dceb0f8764b7ac2ea7675e901159d097 SHA512 054037a917a8cdc57fbca940a23699bb6ba55554b4753774df7d0b5102e0468ebb770910727f96ade949e69a6db94f2ed60e84061bd3967ff2366724980eb129
+AUX scons-4.0.0-env-passthrough.patch 1472 BLAKE2B 8f44a054fdf28ca1f049cb2f85f4e344fe294abbf1112b65c4037fd57850b4f0dc3852cdbb6e86d538d1d0543ed4409b789d1e4bb0f4ea2632ff3746e7455fdc SHA512 10fee12e0e120c81d7829d65b0f69ee295c768bec7ad6d5745963b956037d6ff4ad1bc1ec2e47871e3e9352a4855932e07a3e2a9e4b69f06bec5574bfec2e50d
+AUX scons-4.0.0-respect-cc-etc-r1.patch 3241 BLAKE2B 8e9cabb597db0c1cf278169bd6010168e46fc38895d00a0b013894b2783c65c5262156ded125e080b61927e34f40ef5ed4f2852dfd341d1d42bbcc1efad7b4ab SHA512 1878dc8f28d17aecd5c61b624c135ab3d1b311ec1b92687e1f205c4913dd5f99eeea0f7758d5623e6e60470c34fc2e7ce70571593f2197c8e59fed8df1586b53
 DIST scons-3.1.1-user.html 1134061 BLAKE2B de025ff73ecacec591c63b22bb3f934962a34fa16bec47a58972b97ba28f9a88254b419b4d2edeb2d920e70cf3e0c739df5357956c8586e5377afcd4125ba0a8 SHA512 bd00bcdcd01b192a42110ec65cdb906963af08f5bbc9d5e61624b5b5b1a667b115b099ce2ef71444a8998171a5544f4caecf3acec9715876d4e9e5baa581e60d
 DIST scons-3.1.1-user.pdf 2564248 BLAKE2B 702e57a9646779ff1aa077aa7ae7a815d004cda08166f948ef3b893a786c7ccf13e9d1f8621640573802acd0b6a7acaaf68ebea984d5922112a30c4457740bc4 SHA512 0c0f8e93e3bddd9dc0ec661f629f2995ec9375908b3b7bf2b67c9518571cb31754d13fca46fc1182019976e5c0a417832447692ff61f5ee4613b7f56c7891594
 DIST scons-3.1.1.gh.tar.gz 5528538 BLAKE2B cbb13a0ec9c5ade9b965592f012af5a3ab5253a3c30a049da499631ff58fc1201666209316d9fbcc8f0a715b194327f3cebe5a50fde01635fdb0304b8fbbb2f6 SHA512 3347a7ec5c6c7b596c0d51bb4a9654b971734736febe3834df0f40e7839e1f0578dafeae838d5ddd9f3319ac3d17b6790666fa1602c30480eba25122355179a5
@@ -8,6 +10,16 @@ DIST scons-3.1.2-user.html 1126908 BLAKE2B 38e7695b6ef1e79b3eed4455fbe84ec1587be
 DIST scons-3.1.2-user.pdf 2557502 BLAKE2B 1c89d845d23c4e434c9db11d8730121f0b8dc6f2fca21dabe3e7204373cdf743d831a1835731332e39ccd7f3f49da068ba34a33a2937e9dd205e38d9c8b2b321 SHA512 9da887c157cb95f7802cb4b96080b0e56f2ad7663021b8be0839e71d473422fe9dd0dadf0ad1b067160c39511e91c6b3d9aaff8e238bb46b10a03ae89b12e169
 DIST scons-3.1.2.gh.tar.gz 5534888 BLAKE2B 63e8b069cfddfed6a2ce8bcb7816b51b1881ca7a1a3e552f2eec5ecd1deae80720b0acfb711ab17067efdc9d0e4aea696e9f4eee6b374071bfc60e7bb79cc58a SHA512 b096501ea37e62f596f16b46b4022ad7979f359b10849d4c5fa17731a6c3ec34e0890374de175a8aa7539ae677777142ccf5dfae39a74696efcdbcc00e89bccf
 DIST scons-3.1.2.tar.gz 668298 BLAKE2B 14251e2bab425dfc31d1d6d9325a67725dae42576d2a5c204f0ff7948aa2da5aadd3fdf03bbbccd615757520fedee5e18ca2ba13aaf07a4ddfec330db4221203 SHA512 bfc0d58d33408a03eb37c1eff166af8139078026e6b43d6274afceac889d0a6743e359e89ad9a30be5ca43aeed26fba92fa4732854750b7d53091ef3e99b3d33
+DIST scons-4.0.0-user.html 1414886 BLAKE2B 1005a79040a4e035fa667a7c2f6231300c5fcade558d373eb6af36f4a8fdfcdb9c48ca0e5ecc36add72548f4ce6b904a745cbd6275649e1a1ce0e9172843259d SHA512 d4ce7b528ae714617a20adf49c66beb478d432f33f095ffb05f30038b2295cfe658c1dab421563dfae674bd0d4c343b98058cb8decc5393883675f4c9a7cf5a6
+DIST scons-4.0.0-user.pdf 2468838 BLAKE2B 6541fbc9d8f409ccde07746cb2a6e046fe4a4b868c2b6b80401c30c9d99a27acb2a4aedba9f47ba9e4cf8ac62510bec43a9aac33cba6912b837e13baeb996353 SHA512 cc62fd88dc0dda77515328b434492f8dbc0b4f615a2f3bb4841391ded7fbc738050b2ca7308c820d55efa59c28540391bd546ecec909b1fa7df66a944bdaa8aa
+DIST scons-4.0.0.gh.tar.gz 5584060 BLAKE2B 316be6af0cf52181391ba3251315a0d7da6024a3c650c3de927ff9db041aba096a95f09a7a13f64f78e20473490eb08fb2b0da191c9c3957fad9113e2d3dab14 SHA512 8277c8ceeba5e9612e8c757b3ab736cf116f66e707f4127b1e09f21d3a71ca7fd13dde0453f73b97c168cd05d8ba97084c010f3dcc1e29bb26ebbbeae9ea8338
+DIST scons-4.0.0.tar.gz 2874600 BLAKE2B 439b4e32cb62f5b9546af771eb292a5ff36eddb23fbd169fe065d2dbc3c3916d0551a2807bf765952384e46e036fe4b6142b739b5cfe385217539e1a22daf5ff SHA512 38c8f6600bc5f4b5385eb65ff1e98e8464dcea2a1128173f883a06822eca2e250998c666418a9cbbe2c30ff26da4de3c5fdd68381e68708d93e59bea8680337c
+DIST scons-4.0.1-user.html 1415152 BLAKE2B 1a94b2ef5e076d883f2960825f055c7cc39cfd1848be797a9519bf94834cd4174d3da3274ef77f64106c1cc182c3f8cef363e3982f5c227d3a6dcbeadbc847c2 SHA512 f1165836ad80c90caa4d936ffc86c0ed20ea4c5e7854c36fee3a2c575b1c05c731d4ece9554e43292e6da30176ad9f31f31cf12f84264307c1494f79b06f43c7
+DIST scons-4.0.1-user.pdf 2468804 BLAKE2B f0af6bc6b41d972b98e955ee3ccec908aa366eabe31bd01022abe1f6d3a94dd6d7da26f71de23a6dfbcbc7bb4e439463f69bb7e8a5780c1300e3ba508b9eb314 SHA512 0d2733e2f1391083522a64117bfd35a2160d1366382f6f630b26eba36fc12ce797467d5e16efeb3b7f58aa9d853f96ae0d50fe78f59e78d24642b146bc7e565d
+DIST scons-4.0.1.gh.tar.gz 5578800 BLAKE2B f9ece5eaf1b133219f975e484beb5df726560a38969b8e8ad829781b960b438458bfcd7971333da87560c957675b2a4f8675e757fb0a4268cc4ecf72bb60d45f SHA512 f23c5dfd3c236e9f9f85b986ca64a36dbd85e9f3383cb3577e082a7dea4b83283020fbf064c2d919ab116195c6708fc11f906fcf3b0bc0533a4bc49a4f7371c6
+DIST scons-4.0.1.tar.gz 2874481 BLAKE2B 98377e62ae31d32758a93c4e04c578b88ea541cc292af63c6ca43e2948745e416ee6d757d98129ee30d0e0bbab90664889441a5bb86d4c9dfc649ca1dbef7536 SHA512 400b11323d48f04395b519dfafb6fce15a6dea92013f599dc4895b112629c0a06c7d2806755c74047d001d60087b94f39a118f512b7ee8de6214a4ffc7310468
 EBUILD scons-3.1.1.ebuild 2629 BLAKE2B 9b6dd42a2a625ae6110b2ead2754e0c5d1d69128c32058913d102d545c820ef9e2ca25e2cdedc69a01a777633c32fd7aa3ec598e4d8760ec349ecb1ce9b1bae7 SHA512 309b84180a14cf7233f4879832489da56dad5236f30f9c402037b9dd2737b3983fda32c233e966ce755a75c3db6392f44a385dedeee8d21c3880f9cfb364cd57
 EBUILD scons-3.1.2.ebuild 2753 BLAKE2B 5f7115fbf7d3947bd90d1d147688110e13965bbcdcfd869eb7ac7222d942bd3fefc21f90d77bc0c9bfca58afc4ff593267635d8abed69cb0ad3fcc33ee62bd36 SHA512 2e479ac016b7dbb7f7a80652121f228621e9f85780cb0a3895b0a9b610fbcd376b7482897a993abe03ebddd176a66a83dbc2d5ad4e46a7b71f83e1c9cff39165
+EBUILD scons-4.0.0.ebuild 2623 BLAKE2B 664c157b4c0f9dc13fffd17caba6db18f3e6f0440a2a584fca5695e2d2788034ae3630f3c534ae605ec001e79751ad072425e973035cef52195198e05aa8c25f SHA512 b836e5e27e1a9cfe8fa8e42d69ea9f2154ddeabca65668bf47befaff72ae46ebd0925fae55f8ae8b73a72b4397ee45b7e3677e6834caa7ed0de49f58f5b0eefa
+EBUILD scons-4.0.1.ebuild 2623 BLAKE2B 664c157b4c0f9dc13fffd17caba6db18f3e6f0440a2a584fca5695e2d2788034ae3630f3c534ae605ec001e79751ad072425e973035cef52195198e05aa8c25f SHA512 b836e5e27e1a9cfe8fa8e42d69ea9f2154ddeabca65668bf47befaff72ae46ebd0925fae55f8ae8b73a72b4397ee45b7e3677e6834caa7ed0de49f58f5b0eefa
 MISC metadata.xml 704 BLAKE2B 448bfef70e4f230008c21d8e542618a52f9761295ed33f1c7385a2a678bcb29d1028792e221441f9ba61fecb34646f5ef0f04795e28b17e8d4aeacbabf8751f2 SHA512 62e5c8c23f1c67c218ff6b33c1f941ac3c258b39a5b2d799bedceb734aa5b2e29a718f90823ab5bf199e9d1eb8236aefaddcbff99c6d03f58987fb4936b10aa6
diff --git a/dev-util/scons/files/scons-4.0.0-env-passthrough.patch b/dev-util/scons/files/scons-4.0.0-env-passthrough.patch
new file mode 100644
index 000000000000..23538395e972
--- /dev/null
+++ b/dev-util/scons/files/scons-4.0.0-env-passthrough.patch
@@ -0,0 +1,40 @@
+From f2f8536be12f1d095382e7598060c1eb51eb5337 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Wed, 9 May 2018 17:04:49 +0200
+Subject: [PATCH] posix: Support GENTOO_SCONS_ENV_PASSTHROUGH=1
+
+Support GENTOO_SCONS_ENV_PASSTHROUGH=1 variable to override the default
+of wiping the environment and resetting PATH to default, and instead
+pass all variables through.
+---
+ src/SCons/Platform/posix.py | 14 +++++++++++---
+ 1 file changed, 11 insertions(+), 3 deletions(-)
+
+diff --git a/src/SCons/Platform/posix.py b/src/SCons/Platform/posix.py
+index 8db08db1..af34650c 100644
+--- a/src/SCons/Platform/posix.py
++++ b/src/SCons/Platform/posix.py
+@@ -87,9 +87,17 @@ def generate(env):
+     pspawn = piped_env_spawn
+     # Note that this means that 'escape' is no longer used
+ 
+-    if 'ENV' not in env:
+-        env['ENV']        = {}
+-    env['ENV']['PATH']    = '/usr/local/bin:/opt/bin:/bin:/usr/bin'
++    # Force pass-through of environment variables in Gentoo builds
++    if os.environ.get('GENTOO_SCONS_ENV_PASSTHROUGH', False):
++        new_env = os.environ.copy()
++        if 'ENV' in env:
++            new_env.update(env['ENV'])
++        env['ENV'] = new_env
++    else:
++        if 'ENV' not in env:
++            env['ENV']        = {}
++        env['ENV']['PATH']    = '/usr/local/bin:/opt/bin:/bin:/usr/bin'
++
+     env['OBJPREFIX']      = ''
+     env['OBJSUFFIX']      = '.o'
+     env['SHOBJPREFIX']    = '$OBJPREFIX'
+-- 
+2.17.0
+
diff --git a/dev-util/scons/files/scons-4.0.0-respect-cc-etc-r1.patch b/dev-util/scons/files/scons-4.0.0-respect-cc-etc-r1.patch
new file mode 100644
index 000000000000..d187a17ae60c
--- /dev/null
+++ b/dev-util/scons/files/scons-4.0.0-respect-cc-etc-r1.patch
@@ -0,0 +1,88 @@
+From 929986e568446f54c2a99c309fbb4d05bd4af00a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Thu, 10 May 2018 08:01:08 +0200
+Subject: [PATCH] posix: Also force common toolchain vars for Gentoo
+
+---
+ src/SCons/Platform/posix.py | 20 ++++++++++++++++++++
+ src/SCons/Tool/cc.py        |  3 ++-
+ src/SCons/Tool/cxx.py       |  3 ++-
+ src/SCons/Tool/link.py      |  3 ++-
+ 4 files changed, 26 insertions(+), 3 deletions(-)
+
+diff --git a/src/SCons/Platform/posix.py b/src/SCons/Platform/posix.py
+index 739310a1..ef7528e0 100644
+--- a/src/SCons/Platform/posix.py
++++ b/src/SCons/Platform/posix.py
+@@ -95,6 +95,26 @@ def generate(env):
+         if 'ENV' in env:
+             new_env.update(env['ENV'])
+         env['ENV'] = new_env
++
++        # Furthermore, force common compiler/linker variables as well
++        envvar_mapping = {
++            'AR': 'AR',
++            'AS': 'AS',
++            'ASFLAGS': 'ASFLAGS',
++            'CC': 'CC',
++            'CXX': 'CXX',
++            'CFLAGS': 'CFLAGS',
++            'CXXFLAGS': 'CXXFLAGS',
++            'CPPFLAGS': 'CPPFLAGS',
++            'LDFLAGS': 'LINKFLAGS',
++        }
++
++        for envvar, toolvar in envvar_mapping.items():
++            if toolvar not in env and envvar in env['ENV']:
++                val = env['ENV'][envvar]
++                if toolvar.endswith('FLAGS'):
++                    val = SCons.Util.CLVar(val)
++                env[toolvar] = val
+     else:
+         if 'ENV' not in env:
+             env['ENV']        = {}
+diff --git a/src/SCons/Tool/cc.py b/src/SCons/Tool/cc.py
+index 590ec5fd..5f9229a0 100644
+--- a/src/SCons/Tool/cc.py
++++ b/src/SCons/Tool/cc.py
+@@ -80,7 +80,8 @@ def generate(env):
+ 
+     if 'CC' not in env:
+         env['CC']    = env.Detect(compilers) or compilers[0]
+-    env['CFLAGS']    = SCons.Util.CLVar('')
++    if 'CFLAGS' not in env:
++        env['CFLAGS'] = SCons.Util.CLVar('')
+     env['CCCOM']     = '$CC -o $TARGET -c $CFLAGS $CCFLAGS $_CCCOMCOM $SOURCES'
+     env['SHCC']      = '$CC'
+     env['SHCFLAGS'] = SCons.Util.CLVar('$CFLAGS')
+diff --git a/src/SCons/Tool/cxx.py b/src/SCons/Tool/cxx.py
+index 430851c8..ca5ab563 100644
+--- a/src/SCons/Tool/cxx.py
++++ b/src/SCons/Tool/cxx.py
+@@ -74,7 +74,8 @@ def generate(env):
+ 
+     if 'CXX' not in env:
+         env['CXX']    = env.Detect(compilers) or compilers[0]
+-    env['CXXFLAGS']   = SCons.Util.CLVar('')
++    if 'CXXFLAGS' not in env:
++        env['CXXFLAGS'] = SCons.Util.CLVar('')
+     env['CXXCOM']     = '$CXX -o $TARGET -c $CXXFLAGS $CCFLAGS $_CCCOMCOM $SOURCES'
+     env['SHCXX']      = '$CXX'
+     env['SHCXXFLAGS'] = SCons.Util.CLVar('$CXXFLAGS')
+diff --git a/src/SCons/Tool/link.py b/src/SCons/Tool/link.py
+index 5adc6ca2..a12ea8ed 100644
+--- a/src/SCons/Tool/link.py
++++ b/src/SCons/Tool/link.py
+@@ -318,7 +318,8 @@ def generate(env):
+ 
+     env['SMARTLINK'] = smart_link
+     env['LINK'] = "$SMARTLINK"
+-    env['LINKFLAGS'] = SCons.Util.CLVar('')
++    if 'LINKFLAGS' not in env:
++        env['LINKFLAGS'] = SCons.Util.CLVar('')
+ 
+     # __RPATH is only set to something ($_RPATH typically) on platforms that support it.
+     env['LINKCOM'] = '$LINK -o $TARGET $LINKFLAGS $__RPATH $SOURCES $_LIBDIRFLAGS $_LIBFLAGS'
+-- 
+2.20.1
+
diff --git a/dev-util/scons/scons-4.0.0.ebuild b/dev-util/scons/scons-4.0.0.ebuild
new file mode 100644
index 000000000000..3325adc75936
--- /dev/null
+++ b/dev-util/scons/scons-4.0.0.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Extensible Python-based build utility"
+HOMEPAGE="https://www.scons.org/"
+SRC_URI="
+	https://downloads.sourceforge.net/project/scons/scons/${PV}/${P}.tar.gz
+	doc? (
+		https://www.scons.org/doc/${PV}/PDF/${PN}-user.pdf -> ${P}-user.pdf
+		https://www.scons.org/doc/${PV}/HTML/${PN}-user.html -> ${P}-user.html
+	)
+	test? ( https://github.com/scons/scons/archive/${PV}.tar.gz -> ${P}.gh.tar.gz )"
+
+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"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	test? (
+		dev-libs/libxml2[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+	)
+"
+
+S=${WORKDIR}/${P}/src
+
+PATCHES=(
+	# support env passthrough for Gentoo ebuilds
+	"${FILESDIR}"/scons-4.0.0-env-passthrough.patch
+	# respect CC, CXX, C*FLAGS, LDFLAGS by default
+	"${FILESDIR}"/scons-4.0.0-respect-cc-etc-r1.patch
+)
+
+src_unpack() {
+	# use the git directory structure, but put pregenerated release
+	# inside src/ subdirectory to make our life easier
+	if use test; then
+		unpack "${P}.gh.tar.gz"
+	else
+		mkdir -p "${P}"/src || die
+	fi
+
+	tar -C "${P}"/src --strip-components=1 -xzf "${DISTDIR}/${P}.tar.gz" || die
+}
+
+src_prepare() {
+	# apply patches relatively to top directory
+	cd "${WORKDIR}/${P}" || die
+	distutils-r1_src_prepare
+
+	# remove half-broken, useless custom commands
+	# and fix manpage install location
+	sed -i -e '/cmdclass/,/},$/d' \
+		-e '/data_files/s:man/:share/man/:' "${S}"/setup.py || die
+}
+
+python_test() {
+	# set variable from escons() of scons-util.eclass to make env-passthrough patch work within test env
+	local -x GENTOO_SCONS_ENV_PASSTHROUGH=1
+	# unset some env variables to pass appropriate tests
+	unset AR AS ASFLAGS CC CXX CFLAGS CXXFLAGS CPPFLAGS LDFLAGS
+	cd "${WORKDIR}/${P}" || die
+	"${EPYTHON}" runtest.py -a --passed \
+		-j "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" \
+		--builddir "${BUILD_DIR}/lib"
+
+	# runtest.py script returns "0" if all tests are passed
+	# and returns "2" if there are any tests with "no result"
+	# (i.e. in case if some tools are not installed or it's Windows specific tests)
+	[[ ${?} == [02] ]] || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	use doc && dodoc "${DISTDIR}"/${P}-user.{pdf,html}
+}
diff --git a/dev-util/scons/scons-4.0.1.ebuild b/dev-util/scons/scons-4.0.1.ebuild
new file mode 100644
index 000000000000..3325adc75936
--- /dev/null
+++ b/dev-util/scons/scons-4.0.1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Extensible Python-based build utility"
+HOMEPAGE="https://www.scons.org/"
+SRC_URI="
+	https://downloads.sourceforge.net/project/scons/scons/${PV}/${P}.tar.gz
+	doc? (
+		https://www.scons.org/doc/${PV}/PDF/${PN}-user.pdf -> ${P}-user.pdf
+		https://www.scons.org/doc/${PV}/HTML/${PN}-user.html -> ${P}-user.html
+	)
+	test? ( https://github.com/scons/scons/archive/${PV}.tar.gz -> ${P}.gh.tar.gz )"
+
+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"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	test? (
+		dev-libs/libxml2[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+	)
+"
+
+S=${WORKDIR}/${P}/src
+
+PATCHES=(
+	# support env passthrough for Gentoo ebuilds
+	"${FILESDIR}"/scons-4.0.0-env-passthrough.patch
+	# respect CC, CXX, C*FLAGS, LDFLAGS by default
+	"${FILESDIR}"/scons-4.0.0-respect-cc-etc-r1.patch
+)
+
+src_unpack() {
+	# use the git directory structure, but put pregenerated release
+	# inside src/ subdirectory to make our life easier
+	if use test; then
+		unpack "${P}.gh.tar.gz"
+	else
+		mkdir -p "${P}"/src || die
+	fi
+
+	tar -C "${P}"/src --strip-components=1 -xzf "${DISTDIR}/${P}.tar.gz" || die
+}
+
+src_prepare() {
+	# apply patches relatively to top directory
+	cd "${WORKDIR}/${P}" || die
+	distutils-r1_src_prepare
+
+	# remove half-broken, useless custom commands
+	# and fix manpage install location
+	sed -i -e '/cmdclass/,/},$/d' \
+		-e '/data_files/s:man/:share/man/:' "${S}"/setup.py || die
+}
+
+python_test() {
+	# set variable from escons() of scons-util.eclass to make env-passthrough patch work within test env
+	local -x GENTOO_SCONS_ENV_PASSTHROUGH=1
+	# unset some env variables to pass appropriate tests
+	unset AR AS ASFLAGS CC CXX CFLAGS CXXFLAGS CPPFLAGS LDFLAGS
+	cd "${WORKDIR}/${P}" || die
+	"${EPYTHON}" runtest.py -a --passed \
+		-j "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" \
+		--builddir "${BUILD_DIR}/lib"
+
+	# runtest.py script returns "0" if all tests are passed
+	# and returns "2" if there are any tests with "no result"
+	# (i.e. in case if some tools are not installed or it's Windows specific tests)
+	[[ ${?} == [02] ]] || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	use doc && dodoc "${DISTDIR}"/${P}-user.{pdf,html}
+}
diff --git a/dev-util/serialtalk/Manifest b/dev-util/serialtalk/Manifest
index 3e21faa7963a..86b5f78067d0 100644
--- a/dev-util/serialtalk/Manifest
+++ b/dev-util/serialtalk/Manifest
@@ -1,5 +1,4 @@
 DIST serialtalk-1.2.tar.gz 19214 BLAKE2B c3b07e7134ac2884bf5dfb8db9433485b21b325fa025c1ea198e01e8a9037ebac5190dee2e450727adb3711615b2a2072f47cfabd84aa123c9759623f06701b5 SHA512 4634e4a044915841bf4c2ba141b479207237b1d078a3af47515adebbca3feeb8e1a8e86a673b8a77595255b017e51bbe3e3567e4914b9d603ba676525a7f1dc2
-EBUILD serialtalk-1.2-r1.ebuild 484 BLAKE2B 4749c2083b82c19c4f3467a42e6f454eefb087aafb9b5c3f3be8425a41e0f8a37168d0c6d47cab4b1016fdf388e4497beec2d94beb579f793a586e90ffbce677 SHA512 18afb06748ff4a982f14cb6e487961cc17216c3068c642f07f8cd3f777a3f3c5790ee60f21b84a2cc21a84d596c3d3b65687ad8d28aa6867ebb79828140d4921
-EBUILD serialtalk-1.2.ebuild 535 BLAKE2B f3a7ae233ca897ff10bc3757779b91b1ad26d6e17fc02d5e450d588a91c485fd95db1d3e667702102c2ee2baaff5b364358620aee8e5bbc55419a6df00c23a2f SHA512 1d9e605a1c4d203868934b04fcfdbbdd485520826d40569291d12690987a3120590f172f5e08522282e9ebf3f5ee9f957ec756c33e7160fff58710069ef8cab1
+EBUILD serialtalk-1.2-r1.ebuild 482 BLAKE2B 125e9ee0c6c01cd1ebfce153e8c0d66e3e7422b309fe9f176c149dd93794e160c7c9bbd41dfaec77ffcca8ebd3495c292522178e914f34583059100e24599bbb SHA512 0afb85341590b86216b5a2ccc9731915b0484b1da1bda7eaa83c1d75adc99fa32581d1ba967e1d5f4e32162e7281d0924e2567379ae25d279a2ca39b1594f6e7
 EBUILD serialtalk-9999.ebuild 484 BLAKE2B 3ffa80f188568337f991df8605c453fd4f5f31d1253ee003854643772ca3f6748875f0c73aef291e0318614b68e182c69f22476f95b94405089871e4ec6ed4dc SHA512 81e4590049aadbbb062c7622abba69b2d3c6b8ed38becac7ea8a57178e00e55f1cd0e2f6ae45994b516e3f4881f16028102b7d446886f71aecd34c5258840186
 MISC metadata.xml 475 BLAKE2B 4fce004e271bc77dd68ef59184469081f941d5bcc27c6710305d1a7b1376c531ab557aac8997a9ea3439a1224c8b46b32d00c02b60b536f2d90f82a02af2a13f SHA512 7b2a2b0436c52b0548534b479dcf93f68803badded46ae6147145412060286685a5e094865082b9e7614ddb6b515e8fd1b309b4879e0be8258b152a0f4867d91
diff --git a/dev-util/serialtalk/serialtalk-1.2-r1.ebuild b/dev-util/serialtalk/serialtalk-1.2-r1.ebuild
index db77b5ea4160..0ed9adb9615b 100644
--- a/dev-util/serialtalk/serialtalk-1.2-r1.ebuild
+++ b/dev-util/serialtalk/serialtalk-1.2-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/BGO-OD/serialtalk.git"
 else
 	SRC_URI="https://github.com/BGO-OD/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="Simple command-line tool to talk to serial devices"
diff --git a/dev-util/serialtalk/serialtalk-1.2.ebuild b/dev-util/serialtalk/serialtalk-1.2.ebuild
deleted file mode 100644
index b521c9dd9d0a..000000000000
--- a/dev-util/serialtalk/serialtalk-1.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/BGO-OD/serialtalk.git"
-else
-	SRC_URI="https://github.com/BGO-OD/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="simple command-line tool to talk to serial devices"
-HOMEPAGE="https://github.com/BGO-OD/serialtalk"
-
-LICENSE="GPL-3+"
-SLOT="0"
-
-src_install() {
-	cmake-utils_src_install
-}
diff --git a/dev-util/shards/Manifest b/dev-util/shards/Manifest
index afb9b1b7cdd2..200ec07cee3f 100644
--- a/dev-util/shards/Manifest
+++ b/dev-util/shards/Manifest
@@ -1,4 +1,4 @@
 DIST crystal-molinillo-0.1.0.tar.gz 23932 BLAKE2B c9bcd707a3208f5d80e6e3030523d50f86cb5977799de8ea6035d014094e3c2fff9bb189fa98f566e72e1e7ad161e47e44c89d9b264d47f109b2e891ecb469e5 SHA512 8d74d95896cd7ff510c87e2ffba6ae5f04ceeddde574930ee609851312b65d713a315cc24f9aa3fab02f9447ccb25ef2dd2e8179640b8c5cfb3d7d6b52d1ded5
-DIST shards-0.11.1.tar.gz 45913 BLAKE2B 43afeaaadc1b1ec68353580aacac2eb7d2d69547ba128fdb358682031d83fe28eaae159e39d519ef52f7b058228176fd6ca1aa47aeb03e4a1ccbae7306902e95 SHA512 59a1bd563101c3b3175bd586cc205a821b5087fc70b6bc14fbb612b325c18aa0a2d9b8159ad115e227c9321b1d40703fd7062b413b92252e6efd2ee081d1a221
-EBUILD shards-0.11.1.ebuild 929 BLAKE2B 7d8e32a3c01039c1b361e7689209d99d3b0fcfbdd942a34aad4917ae64f04bf592de8bac87ec36f690d0828f6126cc0d710b29fd72a179d056e98a2b821e4ae3 SHA512 4e314b9093b90d2cf22038d3e3c4b8c39f269584166985f3c7af81a4c478f2fb1c8daaa00af71e944ab1fbe99395bef9dd8bec0acc4c6584ee4cc70ecebee9b1
+DIST shards-0.12.0.tar.gz 52205 BLAKE2B 6aed0be06f1f7e336861705fc0e29fbc3a97336f37d3a1eef09d3ea2ebaf2e61f1e5594f893974a6c13114ee575a69cf6a71fce0cc5f8985b8c365392735e8ca SHA512 3dfdf09be8701e568614923ffd5be90c63bdefc06f310c35b1b38e4b92f8bc1f432398656c08cadd36be52491f2ae8fda3c9b4117dbc4d53dbc8068b78300468
+EBUILD shards-0.12.0-r1.ebuild 1054 BLAKE2B 0915ae7c2dac36c73051551c3def48c4acb1eccc0c6243f16591f6b7a8acd76691ad6ad7a5a2e2c114dd69450ad3c3f88e6181b3d2d49e2e0c6e12058cea4834 SHA512 446706165bc7dda679c93423feb5868a3d5ed661a0783d6a4cc12e8d87bb56535d100a23f95004177d206e8cb146dfba11656d8dd0ed73dbfa5111ea9856c5ec
 MISC metadata.xml 334 BLAKE2B 9958fd270de05b67ac94b791633635bd62770ad0ebe44630e43c26933d2059d042bc00997a8b5b8983c0e839a8adaf238359a17285e4bf8321f082077baaabbc SHA512 8010e36b15550ce7e599e30f1716b3df9d17f464f01cad097e829f3ec97624578f9bb7e24f832e14c67b4cdd5c8d25c998282e39ea0341e81baff39c1bcae658
diff --git a/dev-util/shards/shards-0.11.1.ebuild b/dev-util/shards/shards-0.12.0-r1.ebuild
index c36571a58c8e..fca8719df787 100644
--- a/dev-util/shards/shards-0.11.1.ebuild
+++ b/dev-util/shards/shards-0.12.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit toolchain-funcs
+inherit multiprocessing toolchain-funcs
 
 CRYSTAL_MOLINILLO_PV=0.1.0
 CRYSTAL_MOLINILLO_P=crystal-molinillo-${CRYSTAL_MOLINILLO_PV}
@@ -36,6 +36,10 @@ src_prepare() {
 	tc-export CC
 }
 
+src_compile() {
+	emake release=1 FLAGS="--link-flags=\"${LDFLAGS}\" --verbose --threads $(makeopts_jobs)"
+}
+
 src_install() {
 	dobin bin/${PN}
 	dodoc README.md
diff --git a/dev-util/shellcheck-bin/Manifest b/dev-util/shellcheck-bin/Manifest
index cbc4377f9562..c7dc80e8f6ea 100644
--- a/dev-util/shellcheck-bin/Manifest
+++ b/dev-util/shellcheck-bin/Manifest
@@ -1,9 +1,5 @@
-DIST shellcheck-v0.7.0.linux.aarch64.tar.xz 1401444 BLAKE2B 6e99ece01b0d5f8de482fd9cd53649d7b2df3c2bac2abfd174a765f8666d9cfcff59fb257a2030424abd716b52c63ccb9d2a9fa195e5da572eb15acf78a4bbe6 SHA512 9501dc7ee2b4e3b3bd8c4972be6687b72d97ae34f0be35b8721707ebbd21af011b32241fa133868f190ba3fceb5d1cbc9ca06b5634c57d767d7efd520136d200
-DIST shellcheck-v0.7.0.linux.armv6hf.tar.xz 2502980 BLAKE2B 5e8281a9a8bd7105bb852f917cb2fb252b7d5abdda26da8fc8a5d9aca2a3543fcaf88707ae3aae277578a4fcf973d66e1d457c1769ca4838e3131a1928b56437 SHA512 3cb41d339b0da7790b8451b9fb8c6e6d52444ab0f3115871049dbe04968ce88868b305d2be267af627991949f346ee1a8eb95dce4cb0e46c81a24b01d4f18f74
-DIST shellcheck-v0.7.0.linux.x86_64.tar.xz 1545588 BLAKE2B 30f4cfacdf9024a4f4c8233842f40a6027069e81cf5529f2441b22856773abcd716ee92d2303ad3cda5eaeecac3161e5980c0eedeb4ffa077d5c15c7f356512e SHA512 84e06bee3c8b8c25f46906350fb32708f4b661636c04e55bd19cdd1071265112d84906055372149678d37f09a1667019488c62a0561b81fe6a6b45ad4fae4ac0
 DIST shellcheck-v0.7.1.linux.aarch64.tar.xz 1432492 BLAKE2B 55bc9f0fc2c3afa598fcbe4bdf7502532fb61084a60e236b8ed8352cca7f3e3842c79b77e8d651ad235def9ae64fc290c926a6a80ce4aa7110abcbd0ba298137 SHA512 0068c11477aa7166d0940934ad0e8e243788e1626f080cd57974b03bc4c75581918e50341364e02d0e69ebb21c8c0d063e729ddc7db0a8d0543e7a0188781b6e
 DIST shellcheck-v0.7.1.linux.armv6hf.tar.xz 2527604 BLAKE2B a65f837c8370530691eda1c0bbae8b45620f0da8a6ae8dc0200d8b26369584cce18fb4ab4033ea4cda56b5b6f422db20936ccde053a2bdac06a2cd2e52afacdf SHA512 7d8fd04a7b3b7291b3f6236ad15ee1d06a893b7e878b944e22dad1c16d627b583d72d489cccbdfbb4915f85d456e3c72a39ec83c98e31a901c104c8f59f59bf7
 DIST shellcheck-v0.7.1.linux.x86_64.tar.xz 1443836 BLAKE2B dce108606eaca97b720c90efb6070d571b95c7f8ece02cde00fd991566135bb10daa6b1190bc04d92eb37ea6af60e55615c3198c7cc7d6bf89b411e877c83df1 SHA512 beca3d7819a6bdcfbd044576df4fc284053b48f468b2f03428fe66f4ceb2c05d9b5411357fa15003cb0311406c255084cf7283a3b8fce644c340c2f6aa910b9f
-EBUILD shellcheck-bin-0.7.0.ebuild 729 BLAKE2B 65c8ab866d428d18781c5222c7888ddb5084f3a61139d79b43c012f5d48d059b1b80081a9965c0c00dd48eac9ef4282750798ee20c094acd692d438f777c2f76 SHA512 125eb0976cb8d1ee36d22faf3c06b6da59802df4fe67b5271f2779552c5a700119fdfc68c0e646b9a7328feae437a0f125e406a47e159986001fa91032d6265f
-EBUILD shellcheck-bin-0.7.1.ebuild 684 BLAKE2B 55eec52b1d2addc821271f72f976d1606c4ece8d8038804e08c45a87385c1daaa49fbc58f22c3a993b77b849d4da52157bc7990ed6f58088929632860d9e5c2e SHA512 498e53d9d954dd868cdf0ffdacb243ed08d02231574643d85b9cbef7e2a32d03d0056ac2e632934bd4c09a13a10bf52463835ef3da77cf806999a0eafd3303a7
+EBUILD shellcheck-bin-0.7.1.ebuild 683 BLAKE2B b287d7090e1891cc1e383ed7177294f40b077327ec913fa7022436c0d0fddd108e52efc00cf6b029d50b5b1d0a2cdf6d969bfdc98934e715eba7bb2da9bdcbeb SHA512 3ff2d6f73c5d050ded97a29c999d7bee7944e23f60a366ad14f09f869ba6844ea051bcc2595c06557c324f829b0fdcebc816f157d784813c0f9cc8d2eff4be95
 MISC metadata.xml 335 BLAKE2B 27d3776fb25d4bb46b5fd43808367969f22a099cbef7a8bf439907cb426c9d7c29c5f725a8f6e234d6af94ac6e87e52b2840b50e3846e98c78c97013b37be345 SHA512 1df280418c88152249cbb8bdd30e81026c21ef5d01e8b9eaf2e6aff9478e6a1d968c3e058950db6fdd6e7f1d8a838a225e103a1de5c72cfdb9ca8d698c4c85dd
diff --git a/dev-util/shellcheck-bin/shellcheck-bin-0.7.0.ebuild b/dev-util/shellcheck-bin/shellcheck-bin-0.7.0.ebuild
deleted file mode 100644
index d681e4714668..000000000000
--- a/dev-util/shellcheck-bin/shellcheck-bin-0.7.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN=${PN/-bin/}
-
-DESCRIPTION="Shell script analysis tool (binary package)"
-HOMEPAGE="https://www.shellcheck.net/"
-SRC_URI="
-	amd64? ( https://storage.googleapis.com/${MY_PN}/${MY_PN}-v${PV}.linux.x86_64.tar.xz )
-	arm? ( https://storage.googleapis.com/${MY_PN}/${MY_PN}-v${PV}.linux.armv6hf.tar.xz )
-	arm64? ( https://storage.googleapis.com/${MY_PN}/${MY_PN}-v${PV}.linux.aarch64.tar.xz )
-"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64"
-
-DEPEND="!dev-util/shellcheck"
-RDEPEND="${DEPEND}"
-
-QA_PREBUILT="/usr/bin/shellcheck"
-S="${WORKDIR}/${MY_PN}-v${PV}"
-
-src_install() {
-	dobin shellcheck
-	einstalldocs
-}
diff --git a/dev-util/shellcheck-bin/shellcheck-bin-0.7.1.ebuild b/dev-util/shellcheck-bin/shellcheck-bin-0.7.1.ebuild
index 22c176998666..d42481984380 100644
--- a/dev-util/shellcheck-bin/shellcheck-bin-0.7.1.ebuild
+++ b/dev-util/shellcheck-bin/shellcheck-bin-0.7.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64"
+KEYWORDS="amd64 ~arm ~arm64"
 
 DEPEND="!dev-util/shellcheck"
 RDEPEND="${DEPEND}"
diff --git a/dev-util/shellcheck/Manifest b/dev-util/shellcheck/Manifest
index eacc35661fdc..bdbbc1d6b962 100644
--- a/dev-util/shellcheck/Manifest
+++ b/dev-util/shellcheck/Manifest
@@ -1,3 +1,3 @@
 DIST ShellCheck-0.7.1.tar.gz 163288 BLAKE2B efc8c56348ba924baf660ae16d84e023cdd1a5ef8b355b492844ca41aeb3242eb1e5862bea7f12c69fa43cce285a44afaf95125816f62fbe316d9bdca467b1ae SHA512 fc84bd67e30af1378a92c1e378693a2c181e9567d53f2590e76aedb9f607276b90abd2ac83818c36524bd77a480df347af5a0879a925a846f35440ab207fad8a
 EBUILD shellcheck-0.7.1.ebuild 849 BLAKE2B 2365d8fc4a090efeae8d407a4f9bcba47446276bcbfd3e3ec8cca544766651593b5d0ef7963f2f59e520393fe5027331fc0b9dc1679e61b755b208c320610b08 SHA512 b3e2ccb90f1405940aa7a373ba92de9d0329826ba5ed7f7b85c3ff0ec57b4ac1f50a1944fd14c6c5b32666df425c72470795833adec930f83f27905c6fa0d74b
-MISC metadata.xml 354 BLAKE2B 147d2403f29d6faf487627ed1bcc9b16cc02936a1afe0f25f7bab24071b7b0009960ec950c2bcbcc3738033c5e10f5d790f0b90a7e75d3f9242b694e1bb96cc7 SHA512 033d85c60d488513cec6cbd63c406ff12882909629acd2417e4d0b1e2046ff9aebda7dcca7b95ee144deb3d876ccc422211cc31eb259f306deb35938b56183af
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-util/shellcheck/metadata.xml b/dev-util/shellcheck/metadata.xml
index c120a64c1f9e..b7878815d80d 100644
--- a/dev-util/shellcheck/metadata.xml
+++ b/dev-util/shellcheck/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>jlec@gentoo.org</email>
-		<name>Justin Lecher</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
diff --git a/dev-util/smem/Manifest b/dev-util/smem/Manifest
index 0bde1d372d5a..cc669ff4bb65 100644
--- a/dev-util/smem/Manifest
+++ b/dev-util/smem/Manifest
@@ -1,3 +1,3 @@
-DIST smem-1.5.tar.xz 16016 BLAKE2B 7c7e5dae6b047780275eebe2b9ec4fb06b27b8d3d2e70fc50c07136c18d414d7f51203760ab3bca98906c6566633c908dd18a7a8c390339850d80ad1ffe7f188 SHA512 8f3f5447060e6d857c3eb59ccbebbd62f18280f3993b31e55369b31ea74bc0e54109fd6d3f7088a23c48af050ff67eb738efceb0adeaff1dc7466f50efd9bc82
-EBUILD smem-1.5.ebuild 764 BLAKE2B 68f9d997322ba69045c9b08fbe0d856b5b15cac3e3e38cfb6e49d25c1efa8de61df85af2bee482e29fd9baa6e2bab1016c01edc71e353efcaa25cc9a5ebeec41 SHA512 1e9d5c09d074c7068970160cc6942ebaed446ffd87def1dbac7ba310d15dd97b27c5fda516057b5d9b2d2c627c459b77fd4d4798dec6b46aab5bcf06c612828c
+DIST smem-1.5.tar.bz2 15443 BLAKE2B 31fc73b4e74c08a39957983fb02347ad18fae7a50aee8d8a259e15436911967c56e9ce14a4c89ccc3072d49d802c2b3268792992587170b795b7a08b1678d208 SHA512 bf21536294f1b84e3cc40cbed3077f30f5a1c911fd983cf6f7d7bd3f1bc6e3c4cc9ba509daa8da8f6a12ec2df63b25772a070d80cd45ee289a0725565c89a344
+EBUILD smem-1.5-r1.ebuild 836 BLAKE2B f012c39529642ba1d4cb92e835ca7bbd40031eae1d5797371482b14c3df00bb85a2135a72c7e9a861e806749e0041a6e35508d5c47c7f2e175d945c87a91010b SHA512 99c238141b55e18c5a2d47d4b5acc0e0f3713817d1f5eda6e59291fd152e16c875a26cadbbe314ff5322b2438de1e3a266b76a7138d8b74216decea596040f4b
 MISC metadata.xml 887 BLAKE2B 97eada233bb3bbc6976a34ed5e2ee6b80e0c17e36d7617b2bb109194183878fde46e59a2c38bf84216673850dc21814edf27ba24f189bd03c0240a9c3eed60f1 SHA512 6bb126678342abd8ea5b5c6b4091ffba18d28494db92715d8f2b7dbd363df48d6265579c52340d1b9514b0422b4fcebb0b2f4a9efdfea5e040bf047a1576e478
diff --git a/dev-util/smem/smem-1.5.ebuild b/dev-util/smem/smem-1.5-r1.ebuild
index 80a34b96f8e4..a910bb665c9d 100644
--- a/dev-util/smem/smem-1.5.ebuild
+++ b/dev-util/smem/smem-1.5-r1.ebuild
@@ -3,13 +3,14 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+EGIT_COMMIT="2ab5040d5633"
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit eutils python-single-r1 toolchain-funcs
 
 DESCRIPTION="A tool that can give numerous reports on memory usage on Linux systems"
 HOMEPAGE="https://www.selenic.com/smem/"
-SRC_URI="https://dev.gentoo.org/~conikost/files/${P}.tar.xz"
+SRC_URI="https://selenic.com/repo/${PN}/archive/${EGIT_COMMIT}.tar.bz2 -> ${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
@@ -19,6 +20,8 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RDEPEND="${PYTHON_DEPS}"
 BDEPEND="${RDEPEND}"
 
+S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
+
 src_compile() {
 	"$(tc-getCC)" ${CFLAGS} ${LDFLAGS} -o smemcap smemcap.c || die
 }
@@ -27,7 +30,6 @@ src_install() {
 	dobin smemcap
 	python_doexe smem
 
-	dodoc README.txt
 	doman smem.8
 }
 
diff --git a/dev-util/source-highlight/Manifest b/dev-util/source-highlight/Manifest
index 5e8a1b7d055f..9fec10d7dedf 100644
--- a/dev-util/source-highlight/Manifest
+++ b/dev-util/source-highlight/Manifest
@@ -1,5 +1,3 @@
-DIST source-highlight-3.1.8.tar.gz 1648351 BLAKE2B 1ce1590c86f7aed9d27bb21bce6b0869828b28068d71404410e080b85f6354eb6f520cec8c81d1e9170dd90b158dc4536e5287a04bf2d271fa26354fb853ea32 SHA512 00a49ab180460750614b38be9a569478d1d34d01f601ebc7452a4fee8475a19faf9bb9fb2f256c6b40d43fbc3d34962a77ba8b9833483345c4e4a42faad6976c
 DIST source-highlight-3.1.9.tar.gz 1717234 BLAKE2B 6eb40b2274df0772c4a241504e5db5dfdaac600549e0b11aba726f7b4d5ab600c3849a8815bc782ad1bb1f99b69766527645dd202731bde4b2466c663842c47c SHA512 d8e154e9a5d62c77807e4e5d36c0faed5ce2964291be5f8b83e2968a6de52229503689a4ca2109a717ae2632a14b63ec937ca0430c91684c72063f6bc0294195
-EBUILD source-highlight-3.1.8.ebuild 1389 BLAKE2B 57af29c1e8206f9851eeb8c9c3bc4a38bde9e8d7584afac23de65e757c3d5f02b5e37b58488cddb9082e0c2ffdb7c074b510ace4ab1104557852a05b1d9950dd SHA512 f01ae5c89cec2611909a5fd60c0a63520d840b3c6d48ad6a358e45e96cb93528392e0ce496e70d6e13e8da1c56adca0d35053e4d9d8f241a62a19e2472ddffc2
-EBUILD source-highlight-3.1.9.ebuild 1399 BLAKE2B b6713101735506d5f085067fcf6af4fadfc70afa515e03b24e65bc3a0c4302b9cd95bde25d4407dbcfd6b49dcefae24b44e7da18f31abf74dece4ecfa2c9a195 SHA512 ddc297ad181adea42bb8a11f8512a5c83e8329fe26e24d9a277f057334e720fd5904b2c427b12103b502e7c028639ac04dd2659aa239997aa02bb5ae222e6c6f
+EBUILD source-highlight-3.1.9.ebuild 1398 BLAKE2B 829ccc78484078881ecdb1d2f321d625996cc88a97b8f5cb4e96587a15db0b58893a0c16d4de26ac4e404b378e1468ea4ff345d582b871a674ee1cc4b2b7776b SHA512 8a2263143b563610076489b199795aa4b0de29ebe3caf1724bf37adac3e0d3ac15330d4f915ccbe7dab5786d172d2188407eedfbee4fb73f035eb6e1da0dbbac
 MISC metadata.xml 267 BLAKE2B 5267526ad53ec7bedfe46f8cba86c810629394fa4f3c59e1b69619b0a11a9edbb746ae6abf818182da7ade72c862360f43a19209007a23da9701df26b96f77dd SHA512 715bb37d958c1e508b2ef00711ab3a4abee982efe90867fd2bcf91fa91305d5a413a4f3d13d01ea6e27eb15f5f9dcb58fa13ecfed7025cae43745792ac1a105d
diff --git a/dev-util/source-highlight/source-highlight-3.1.8.ebuild b/dev-util/source-highlight/source-highlight-3.1.8.ebuild
deleted file mode 100644
index 9d9fa220ae3e..000000000000
--- a/dev-util/source-highlight/source-highlight-3.1.8.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1 flag-o-matic
-
-DESCRIPTION="Generate highlighted source code as an (x)html document"
-HOMEPAGE="https://www.gnu.org/software/src-highlite/source-highlight.html"
-SRC_URI="mirror://gnu/src-highlite/${P}.tar.gz"
-LICENSE="GPL-3"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
-SLOT="0"
-IUSE="doc static-libs"
-
-RDEPEND=">=dev-libs/boost-1.62.0:=[threads]
-	dev-util/ctags"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	# required as rev-dep of dev-libs/boost-1.62.0
-	# https://wiki.gentoo.org/wiki/Project:C%2B%2B/Maintaining_ABI
-	append-cxxflags -std=c++14
-
-	econf \
-		--with-boost="${EPREFIX}/usr" \
-		--with-boost-regex="boost_regex" \
-		--without-bash-completion \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( doc/*.{html,css,java} )
-	default
-
-	# That's not how we want it
-	rm -rf "${ED%/}"/usr/share/{aclocal,doc} || die
-
-	# package provides .pc file
-	find "${D}" -name '*.la' -delete || die
-
-	dobashcomp completion/source-highlight
-}
-
-src_test() {
-	export LD_LIBRARY_PATH="${S}/lib/srchilite/.libs/"
-	# upstream uses the same temporary filenames in numerous places
-	# see https://bugs.gentoo.org/635100
-	emake -j1 check
-}
diff --git a/dev-util/source-highlight/source-highlight-3.1.9.ebuild b/dev-util/source-highlight/source-highlight-3.1.9.ebuild
index 205374a14a52..cbf7b16e377f 100644
--- a/dev-util/source-highlight/source-highlight-3.1.9.ebuild
+++ b/dev-util/source-highlight/source-highlight-3.1.9.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Generate highlighted source code as an (x)html document"
 HOMEPAGE="https://www.gnu.org/software/src-highlite/source-highlight.html"
 SRC_URI="mirror://gnu/src-highlite/${P}.tar.gz"
 LICENSE="GPL-3"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-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"
 SLOT="0"
 IUSE="doc static-libs"
 
diff --git a/dev-util/spirv-headers/Manifest b/dev-util/spirv-headers/Manifest
index 093008ccce9d..a748c15505d3 100644
--- a/dev-util/spirv-headers/Manifest
+++ b/dev-util/spirv-headers/Manifest
@@ -1,4 +1,4 @@
 DIST spirv-headers-1.5.3.tar.gz 387520 BLAKE2B 80f210792294232b9f1ebd12e96a8070b27ca29fcfcf8f61c19b0ddef493511bd1f5f85d44f6112de6154108237147feb564334cd47fb37b6f3e7dfb50620a7e SHA512 fab90cd073aed34320d2a03c441746101e757a4bd44f0b259aaa34e1fafd450b9576d8d539d85a8066cdf0eda3e78c807ccf65cd86ab9d8660195a96e9a50795
-EBUILD spirv-headers-1.5.3.ebuild 500 BLAKE2B b4e6b598ed2ef2abe431eb4505d449a9371220ff950e196718c9dcebad0493db9a05e8378c22780bcdf2a56240b0b4d5b0f1a2964283c0ab6ba199d0de950b87 SHA512 09701ea97c560617c65e165223b07a6faca3a05ab75e746d5a1e4a90ac8321d8a4d6a7e3bdbdf1de02ed293d1e7d16466df65b8467d06c758cf886b4aefa294a
+EBUILD spirv-headers-1.5.3.ebuild 517 BLAKE2B ece572275252b124c42605a465ab4ed2215b22a6ddeccf559c3d89516956ecde0db4ed89067b02cec4bf72788d1daacae2136bccc362183f886648989b890a3a SHA512 d38257d4d62747ac69105f07c534fb3194de03f0d7aea1e2a6e27565996b78409322e4c35ea6685a035ea509fc7c79f57948811109a05b3f2a8a8c15c971f42f
 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 56d8e9cf84c5..38d9ad01c4ba 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 ~ppc64 x86"
+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 855d1a42f453..14d0a9407a58 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-8.0.1.3.tar.gz 472853 BLAKE2B 3f00aabd46dd43840b8a16f6a9a061e00385bae6d4e608ad1d2e59f943bfca747e1ce6b2f48eee7e124bc3ac47f5895274d9cf7bb587eba7133152b9658f5e9e SHA512 c10a426d83276718b116d664fd32c8457d87e336e7c99b64d323ea9a08330d206dc94e52ce8e7395bcb8ee2ddff49184b5c7810e4848d624396d0574ce48256d
 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-8.0.1.3.ebuild 1296 BLAKE2B 5781e9ac79de0decfc51a8793afd6d61a7db44dfe042bcc815abd73685c9a44d5fe90d0779c6dc8382bd9b7ae38cd45f93a2bfa8a4f1042976332cd7c9a5a017 SHA512 ed909c3a70e5e6a91c415c5694abbed36b8420fac78034d813edc1636a3f3c5cb3a5e6f95df625016dca00f6d7af87625c351fbf4368c6d57f49e165d38eb9cb
 EBUILD spirv-llvm-translator-9.0.1.1.ebuild 1291 BLAKE2B 22fd214fa80e3331da17994058a0861b5f0a3f3d12b558cba329e6e8d3cd34020bd2d5f489ea89e2916e73aca2a45446cb3c36aba203b5fa3425984a486b140f SHA512 9a7e64db4abbae7d694c17935707fa5a1a79ecd0c454e12f35dfab369bc0d5158118c010629dd4b2fc8ea418c2ed8d0342bcbb0903328b394e6d8354b6c4f30c
 MISC metadata.xml 442 BLAKE2B c63b20489865e563e064525b8df310eca993f15ff03cd533458729e5d6611b678e2f797d6efbe177e1bdeaed84e9bcf63921cb67318e948d579b57cc7f1cd28c SHA512 b036abe761b1aeb68ce5668eb3d501d2e5530be3456e85f51bee15c0aa8387a8be89c212308d7997a5f60bb0301bcdd22a7cb44a27324c05533aed94215b4721
diff --git a/dev-util/spirv-llvm-translator/spirv-llvm-translator-8.0.1.3.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-8.0.1.3.ebuild
deleted file mode 100644
index 53f2d92817b2..000000000000
--- a/dev-util/spirv-llvm-translator/spirv-llvm-translator-8.0.1.3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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="8"
-KEYWORDS="~amd64"
-IUSE="test tools"
-
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}/${MY_P}"
-
-COMMON="sys-devel/clang:8=[${MULTILIB_USEDEP}]"
-DEPEND="${COMMON}
-	test? ( dev-python/lit )"
-RDEPEND="${COMMON}"
-
-REQUIRED_USE="test? ( tools )"
-
-LLVM_MAX_SLOT=8
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-8.0.0.1-no_pkgconfig_files.patch
-)
-
-src_prepare() {
-	append-flags -fPIC
-	cmake-utils_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-utils_src_configure
-}
-
-multilib_src_test() {
-	# TODO: figure out why 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 89aa912b06be..7c2090faa334 100644
--- a/dev-util/spirv-tools/Manifest
+++ b/dev-util/spirv-tools/Manifest
@@ -1,4 +1,4 @@
 DIST spirv-tools-2020.3.tar.gz 2170858 BLAKE2B c9fdc6bbf6edbb6e3e5aba1fff9bd179b7b435ecb4ebbe29db38ce0c71166269484f8c3798a69a0fe5d936392b07fc6ccd5f058945aa70330612a6ef8fafe12f SHA512 8abb4fe227dbe9d0fc4279523eb714ce3a590a3c56e3dcd226317bc7835e2dceaef3a46c0873c2f144c61b28f41c0fcdf2985cc4f708fa496186c16738cc493f
-EBUILD spirv-tools-2020.3.ebuild 1074 BLAKE2B b8d44eb6a94f94249747846cc5a669cedda044f106f6266f4ebe9fdbb401ff03493f7976463b9bf9a02343fc11491564aaef35fc8e948d5d15ac1c5029b00c5a SHA512 9f5796e86ddaab54f363d936a4e811e3ad020e2ff7970d6672ffa042027a3c39294a7ac8f0141d6d74d4038fcf3024be84ae2151571ec05cf88fb779291461cd
+EBUILD spirv-tools-2020.3.ebuild 1091 BLAKE2B d9e28703c0dcabdcfdd2ab913f096d7780a58a4d5a85e1e952781d25a97da39d6e8045df522e7e6df4b9fb8f347dbeb3026f8dcdb9cf805994442f7aa6f17711 SHA512 9d092a46dc4a6daeddb3d50864e62abdc7b27d7ff041ed538989d7a58d01808f3656c57a9f8128a23506c5ec6f73768c65daab86f199da964cca429958150aa1
 EBUILD spirv-tools-9999.ebuild 1076 BLAKE2B f2b331dad1276fcdb1ae4029c75bca06be7136fe8f543053d8a7c0bd025d383132c756397cdab4f6c4cbebddd54f82d8a469802e66cd5906867768a952974256 SHA512 32b887f0b40bb37b1c6d63f93eb787c8982996ca94e293e531904870484ad811ea36f4c124101c6cbf33e95d3984f44fd6d013c3043632d75716356a3f5e0faf
 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 98b310bfca1b..8cf8dca6539c 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 ~ppc64 x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 	S="${WORKDIR}"/${MY_PN}-${PV}
 fi
 
diff --git a/dev-util/statifier/Manifest b/dev-util/statifier/Manifest
index f4a609136a6d..e6a765a285f9 100644
--- a/dev-util/statifier/Manifest
+++ b/dev-util/statifier/Manifest
@@ -1,4 +1,5 @@
 AUX statifier-1.7.4-fix-build-system.patch 2104 BLAKE2B 019248feff682a75b90d1aca7eea425aded1b0f01e8dff4bd24410a474ef1350ed8215803915cb52df53866f6dc996428742d0a9187f55bbff17ce30894dd6b3 SHA512 a9bf5adf1206bbca84084df0680785e1f31902fb7ce4d455593ee35e0195ef9546de641d2f5372843afb7c8584fb04b1b13ee7973813ee8561a2282f2162cc87
 DIST statifier-1.7.4.tar.gz 73245 BLAKE2B 897b78b31aa4f148b6a6a986251ba9d4f40ebad3209f71896ffffb71e06ab25d337a4a79adc0217592051f917bc71428d3032f6216ec053f62c4632edef474d5 SHA512 22d4873130bafe06144c8f6ce7089aa25e3eb047bbee5709344fee1e8d85b24aac689c88d34537fe4a690e231d768e56a2fa13672b9eccf27d945b3f8bcda756
+EBUILD statifier-1.7.4-r1.ebuild 1121 BLAKE2B 65e776a2db0b4fceb22d8c74924b917be7e014cab3283abd547bf828d06c0ce58056a23857a67f965cec652438c192e0155e527f9dd832f5d721d4a244649c7d SHA512 560cfa83d8ae2586fec125c759f2a81055cbd464749d305a435b563f5b1ab258370d10056dc2415a8f22604ace32ba9c45f65235f3dd1bd7b11791502f99c832
 EBUILD statifier-1.7.4.ebuild 1125 BLAKE2B b0b81af822f90d001cc7509a74334e8149bcc26d0f106d84aaa2ca27d5d79b033da1813d60bb37119c604eaf0f007f6c2a6c3553fedcadaacb53fbc49be116eb SHA512 9a8749dfce5361eb7771e0f330b300c1ce56f08ff6cd93abf1457a2ddcb81b3016c14c54df0fdb602f20b72c97d7f799ae496043024ddae347f3af43da19923e
 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
new file mode 100644
index 000000000000..046c0699da96
--- /dev/null
+++ b/dev-util/statifier/statifier-1.7.4-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+
+inherit multilib-build toolchain-funcs
+
+DESCRIPTION="Statifier is a tool for creating portable, self-containing Linux executables"
+HOMEPAGE="http://statifier.sourceforge.net"
+SRC_URI="https://sourceforge.net/projects/${PN}/files/${PN}/${PV}/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+LICENSE="GPL-2"
+
+RDEPEND="
+	app-shells/bash
+	sys-apps/coreutils
+	virtual/awk
+"
+
+PATCHES=(
+	# Respect users CFLAGS and LDFLAGS
+	"${FILESDIR}"/${PN}-1.7.4-fix-build-system.patch
+)
+
+src_prepare() {
+	default
+
+	# Don't compile 32-bit on amd64 no-multilib profile
+	if ! use abi_x86_32; then
+		sed -i -e 's/ELF32 .*/ELF32 := no/g' configs/config.x86_64 || die
+	fi
+}
+
+src_configure() {
+	tc-export CC
+
+	# Fix permissions, as configure is not marked executable
+	chmod +x configure || die
+	econf
+}
+
+src_compile() {
+	# Package complains with MAKEOPTS > -j1
+	emake -j1
+}
+
+src_install() {
+	# Package complains with MAKEOPTS > -j1
+	emake -j1 DESTDIR="${ED}" install
+
+	# Install docs
+	einstalldocs
+}
diff --git a/dev-util/strace/Manifest b/dev-util/strace/Manifest
index 192081a739a4..1ae50353fae0 100644
--- a/dev-util/strace/Manifest
+++ b/dev-util/strace/Manifest
@@ -1,13 +1,12 @@
 AUX strace-5.4-fix-LTO-CFLAGS-handling.patch 843 BLAKE2B 2cd4c87e972b2bfe6d5755141a64ffbca386047ea68d37c8871bc37e7475f8eb3ce978ead5082ecb3099f599e12914f087773733a7440875a084a5b452b1f92c SHA512 9606c3334d3e01aecccafaa396b5a7440a652872c590ced3c1a88ca6ef083c176a420dfb2154396f94f65b826d6fe2f20556620f364c17d01d0069d630dc5cfe
 AUX strace-5.5-static.patch 5187 BLAKE2B 9015d649d644dd4e5fe6b89d7fd4b1d759b7021627384f575e6668fa24841438c49e3acd8d09f0302374fc457001df89a9f384193ddde1da105a5b95167f944a SHA512 a1adbbcc7bc87f37b1071b888f1b2c830113cfd40c341316d7e96e72e142781f41d1b8823277ea0c61079e557460e9a43d1795e7c8cc97cbca9c6aec8d08f682
-AUX strace-5.6-AR.patch 629 BLAKE2B 91504e623c5c1710e382287fdadd8005c5a76f4a6d5b8b6d83dd9fc4a31259c241e1382e9a981abf2a2a70d0b5db8b46ca8c973e49bedd64c428e2be89affd18 SHA512 49631c075e7f0cd6ef3aa5ef4c3e734147a32f920733311a320b4b85e7e6aa9b21733a9dd3a76e0e42bf2d9d9d7a46a371ae43bcdf6a040f33c626c34a65e32e
 DIST strace-5.3.tar.xz 1572708 BLAKE2B 808bc7afc6c70137c44d0f5a47706953bc7c0214348cda2ae45e10876bd6e118c103f15abffdfe0d7fdb01d8d3de163b9c7de3970d9cd07c88ceca11a99dc7f9 SHA512 02b80a8abedb14e40235709733953005210cd328daba59cb594745e7ed3851d155546ccccdb3e43835aa75eee89f023324e542e15154bbc3269e37fd23433e2a
 DIST strace-5.4.tar.xz 1599396 BLAKE2B 0a7fd9600488f5f07042ead8123151cf0113f82329c3cc786c8f3ffb8673f73eaaa1a489f1f27c47800a20e5b6327f1bf5fb09a5b798156908f9e10374a04970 SHA512 4ddba2ec4457a2257c18b26dca851e49a275813c4eb3069379a93fcc60228f9b63a3dee9e3719ae606a7cc61d55ab21ce147327223903c302c061e381097a8d7
-DIST strace-5.6.tar.xz 1775292 BLAKE2B 6e674e4a1b70a3ebb28aa0097baa07efc7dce18039a3a7d535b4c8b3fc1b11c59ef1eb79e58bbf4b9e2b9621d0840958ba5785d22d0cdcb4c00fb5fa2a3288c1 SHA512 58c8a250e55a018206bee9468ea057c087d5d5bb523339ea3c01e0a19d8f84c95bd1398d66a6dca6ada45c6535aa44b776713a2bb080eebaa734ffb926ac5b38
 DIST strace-5.7.tar.xz 1805044 BLAKE2B 487a1481357642be21c83cf387710bc75f17bd0af87ff07f914faa99120a619f33d2caba034d50dbdbc03aa3f758dae86d04fc6c25b3f6254ac3f0578a19884a SHA512 aef481238196204495cf9507cd48ce30af799f79904478e6be57a267311a999c868f18540cc1e025f5e486730cfe9ccb256f528f6f796d204a7347ebdf2042f1
+DIST strace-5.8.tar.xz 1813640 BLAKE2B 315edf404fa57890dcff512f9fd76818e8e7d5ad06bc297b68561ec7073297c2e5aaf2c3d9a102382f5833bedacb2a54540068a9f9438094c9180f45b5dc4715 SHA512 633c3daa2dd3d273839cbb8ebd7f6512a38b39af0d0d89f4676c2067e199f346615406d85e3e13f9e4da8dbeb62095185895ffae986eb99b64775a4287e38f4c
 EBUILD strace-5.3.ebuild 2323 BLAKE2B 02812e696ba9c1f24bb8ea9b7cb21ce1ec6afc9bd5dedb2d70c3bc9b88c4523745333070be4d2a0c9297533a636964efd02b1d1ae33ed025251d18074081d114 SHA512 8c2b4b7e6a9119d226117f72209ec360365615670092370faa22fa605f0afd583749f008146eb59afafefaaab9f634b512c0893e0d10b896e7bd6221e51a7f58
 EBUILD strace-5.4.ebuild 2524 BLAKE2B 3a21233c29527856cbe1723407ddac3525b57efe6fa3bf379b6ba4d902d5dfe607049a5a9264f91f947ab2678cd36cebc4629eb49812658bb895583840fa5fdd SHA512 fae99e9ba572c1c6445ba03ec257759165d5c3be57d6de5269f1e886e6c9fb50361995956671772bfae26ec4d54785e9f40ac7dad25a5d4b2c33f8c3e2eb94b4
-EBUILD strace-5.6.ebuild 2390 BLAKE2B 5ddf8f82a86da09956e593af6ba4d61645ff506f36db87ae5fa8d66c33646eadb67dcd3ead14e16db05578c8966eaf72dedec70e0da10aac9576b0a73831a63f SHA512 837bfb8e72e02ee1cc668cf7c149de669062587ed7d2fe3dd88ee1d88720a3811cba1bf03dafee7a1c0a7dc2dafeaeb0ea78566477638c2778184585d5078857
 EBUILD strace-5.7.ebuild 2355 BLAKE2B 7a3c90be9f839968e4b7355c80cfec5d9aacfe738af9bd8e8e128a64f7f54816850173e497d28e14087ba49e3c9c80e7b0dc2bc6f9f39aeee279f601bb5e0757 SHA512 e5ddb7a75e527523c8d9e39571fb1ba68dc38aec09536bc43cf1225bbd3cd521a32c517baa5c0c16b6874407fcf31dd8e505dfd4cb61223025df6d2b5fa1e46d
+EBUILD strace-5.8.ebuild 2352 BLAKE2B 1a06ac536e79ffa2a42c62860e2e7d163d258f9cab5054cb2e7d51cec3e9e8eff56cefc67732e403569b37331bb55ea6976b5851c969078623f53c629e12ff57 SHA512 3e763a2bdcf72cf25a4981f8ad1c8d963bdf72c8d3a2e07e64e88d8bc6f71f1521a3a27902e5aa9e9ac0626bc44e2ff9fcfa44a48aa0ba7f3f8fbf485dba5c95
 EBUILD strace-9999.ebuild 2354 BLAKE2B 65b3aaf00c35f709158d0f3de01f7bcc0b1a8daaab9e614bb9d381d0b4ae26794cd6fe8e502e1d8f953a9271e8fe0bd460b84f8ca84266192635a37d54c3b653 SHA512 879a423a1786a2147484d817a89060960e1e4796f481902f2001b872a0942a84e7d78ad87869d35637bc9cd2b3ad61821067a32def5a8dbb196b3a638676f3c2
 MISC metadata.xml 705 BLAKE2B 5bbeedc586ec794a2839988f3691780c8b9d00b3279423216d57621e71c562357d4df7df3b359408779ccc0856852f7183c62c2c269c77bfb466b2d456414ad3 SHA512 b0d51447db9f1c34bb31bd519a27082d9e94d14f5ba8d19d9a9a90472f8b27a084f79e348520c92bffc2dfc408f5f45d35df2de94d13f8cf3242e042b66ea048
diff --git a/dev-util/strace/files/strace-5.6-AR.patch b/dev-util/strace/files/strace-5.6-AR.patch
deleted file mode 100644
index 8386bc418827..000000000000
--- a/dev-util/strace/files/strace-5.6-AR.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 81e11a9b8c9469002833bd1707a435b1f81baf92 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Sat, 2 May 2020 16:25:21 -0400
-Subject: [PATCH] configure: check AR variable for 'ar' tool
-
-Without this, automake always hardcodes 'AR = ar' in Makefile.in
-
-Bug: https://bugs.gentoo.org/720712
----
- configure.ac | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/configure.ac b/configure.ac
-index 6aabc2c8..da486c24 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -36,6 +36,7 @@ AC_PROG_CC_STDC
- AC_PROG_CPP
- AC_PROG_INSTALL
- AC_PROG_RANLIB
-+AM_PROG_AR
- 
- AC_USE_SYSTEM_EXTENSIONS
- AX_CODE_COVERAGE
--- 
-2.26.2
-
diff --git a/dev-util/strace/strace-5.6.ebuild b/dev-util/strace/strace-5.8.ebuild
index f19588e9f9c8..2484fd485531 100644
--- a/dev-util/strace/strace-5.6.ebuild
+++ b/dev-util/strace/strace-5.8.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3 autotools
 else
 	SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="A useful diagnostic, instructional, and debugging tool"
@@ -42,7 +42,6 @@ RDEPEND="
 
 PATCHES=(
 	"${FILESDIR}/strace-5.5-static.patch"
-	"${FILESDIR}/strace-5.6-AR.patch"
 )
 
 src_prepare() {
diff --git a/dev-util/sysdig-kmod/Manifest b/dev-util/sysdig-kmod/Manifest
index ae0714148d91..e7e5fdc793e7 100644
--- a/dev-util/sysdig-kmod/Manifest
+++ b/dev-util/sysdig-kmod/Manifest
@@ -1,5 +1,7 @@
 DIST sysdig-0.26.6.tar.gz 923918 BLAKE2B e022eba30977f5300c80a4806926d3e755b1395f05475c1fe925b86823670e397ad29e8bd18b1beaa893cb1bf83c329960c1bf9ff6faf0a5144343e88d52a4a0 SHA512 94784f0dfe46924b81d8804d950a9563cd18f4aa8b1cacd7e27e3974ecf7215223e03bdab001f408f64eb6c72f0da5082fd922d63079119427eb493c77e15795
 DIST sysdig-0.26.7.tar.gz 924647 BLAKE2B 31973410e8e166d82c3851eceee8bdcd808db8181e8330841ff746a2d2c35936fda9dcf23c16697e37da339a647b534b17d0c1bb58c547621f2a3f926fca5016 SHA512 37f3544b1994c8c9048c6ff886da0c2ea6cbfe0a1cedb930b2a06bb85fa9da80a8197409a99b95245dec9ca1957a0f1fe989f688a549739d71ff778087d20b76
-EBUILD sysdig-kmod-0.26.6.ebuild 945 BLAKE2B be025ff85bfdf7de187e06439e44e1336604d282163b889c9af3846d64b278c1454f4a9f33ff5be19f2089688227b4d980b5b9e802fda4e5e08b18f5d68f62b7 SHA512 2373a4b32538b65d293832b93167f5ffbc1b6f4eed9fdcac10104c15d5eed955cd8239368fe5be929b6bf28c59cd678ef6ead0f9701ee9fb8b90f3e82b145acd
-EBUILD sysdig-kmod-0.26.7.ebuild 945 BLAKE2B be025ff85bfdf7de187e06439e44e1336604d282163b889c9af3846d64b278c1454f4a9f33ff5be19f2089688227b4d980b5b9e802fda4e5e08b18f5d68f62b7 SHA512 2373a4b32538b65d293832b93167f5ffbc1b6f4eed9fdcac10104c15d5eed955cd8239368fe5be929b6bf28c59cd678ef6ead0f9701ee9fb8b90f3e82b145acd
+DIST sysdig-0.27.0.tar.gz 933094 BLAKE2B e412bd2a35a62b580344a49e2deee85764710f91327cd63b42913dc361ee96943ffe51b90ee745c420454f0a4be455606d486a91ab3e103d7e396f04dc3f1ff4 SHA512 102150cc641165a6c18ce71e3c6148dc10700f614fec7e1909c29172e3cce02dfa16af56aabdcd420499d0aa89f90fee8f26d92a250b0a521d1b9d416c6a678f
+EBUILD sysdig-kmod-0.26.6-r1.ebuild 945 BLAKE2B be025ff85bfdf7de187e06439e44e1336604d282163b889c9af3846d64b278c1454f4a9f33ff5be19f2089688227b4d980b5b9e802fda4e5e08b18f5d68f62b7 SHA512 2373a4b32538b65d293832b93167f5ffbc1b6f4eed9fdcac10104c15d5eed955cd8239368fe5be929b6bf28c59cd678ef6ead0f9701ee9fb8b90f3e82b145acd
+EBUILD sysdig-kmod-0.26.7-r1.ebuild 945 BLAKE2B be025ff85bfdf7de187e06439e44e1336604d282163b889c9af3846d64b278c1454f4a9f33ff5be19f2089688227b4d980b5b9e802fda4e5e08b18f5d68f62b7 SHA512 2373a4b32538b65d293832b93167f5ffbc1b6f4eed9fdcac10104c15d5eed955cd8239368fe5be929b6bf28c59cd678ef6ead0f9701ee9fb8b90f3e82b145acd
+EBUILD sysdig-kmod-0.27.0.ebuild 945 BLAKE2B be025ff85bfdf7de187e06439e44e1336604d282163b889c9af3846d64b278c1454f4a9f33ff5be19f2089688227b4d980b5b9e802fda4e5e08b18f5d68f62b7 SHA512 2373a4b32538b65d293832b93167f5ffbc1b6f4eed9fdcac10104c15d5eed955cd8239368fe5be929b6bf28c59cd678ef6ead0f9701ee9fb8b90f3e82b145acd
 MISC metadata.xml 325 BLAKE2B a4fb1518abfc94ae4f45d30f85ab3cfec6139025f302fc46725275e1a0ef9d789de1f55b07330dd7aed44cfee60c688d4ba95e3f67832f5581066ad833cf2e2a SHA512 51815b800827d94d1c554de9fde3d97b67a4f2f83847826a8aaede5c84dfab95401526ea670bd84e79ba435a1439c109ef3b27e313cb2bafc0c49639bf02ff68
diff --git a/dev-util/sysdig-kmod/sysdig-kmod-0.26.6.ebuild b/dev-util/sysdig-kmod/sysdig-kmod-0.26.6-r1.ebuild
index ba7201399d5c..ba7201399d5c 100644
--- a/dev-util/sysdig-kmod/sysdig-kmod-0.26.6.ebuild
+++ b/dev-util/sysdig-kmod/sysdig-kmod-0.26.6-r1.ebuild
diff --git a/dev-util/sysdig-kmod/sysdig-kmod-0.26.7.ebuild b/dev-util/sysdig-kmod/sysdig-kmod-0.26.7-r1.ebuild
index ba7201399d5c..ba7201399d5c 100644
--- a/dev-util/sysdig-kmod/sysdig-kmod-0.26.7.ebuild
+++ b/dev-util/sysdig-kmod/sysdig-kmod-0.26.7-r1.ebuild
diff --git a/dev-util/sysdig-kmod/sysdig-kmod-0.27.0.ebuild b/dev-util/sysdig-kmod/sysdig-kmod-0.27.0.ebuild
new file mode 100644
index 000000000000..ba7201399d5c
--- /dev/null
+++ b/dev-util/sysdig-kmod/sysdig-kmod-0.27.0.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 8b3549b88447..b81c87800e70 100644
--- a/dev-util/sysdig/Manifest
+++ b/dev-util/sysdig/Manifest
@@ -1,5 +1,7 @@
 DIST sysdig-0.26.6.tar.gz 923918 BLAKE2B e022eba30977f5300c80a4806926d3e755b1395f05475c1fe925b86823670e397ad29e8bd18b1beaa893cb1bf83c329960c1bf9ff6faf0a5144343e88d52a4a0 SHA512 94784f0dfe46924b81d8804d950a9563cd18f4aa8b1cacd7e27e3974ecf7215223e03bdab001f408f64eb6c72f0da5082fd922d63079119427eb493c77e15795
 DIST sysdig-0.26.7.tar.gz 924647 BLAKE2B 31973410e8e166d82c3851eceee8bdcd808db8181e8330841ff746a2d2c35936fda9dcf23c16697e37da339a647b534b17d0c1bb58c547621f2a3f926fca5016 SHA512 37f3544b1994c8c9048c6ff886da0c2ea6cbfe0a1cedb930b2a06bb85fa9da80a8197409a99b95245dec9ca1957a0f1fe989f688a549739d71ff778087d20b76
+DIST sysdig-0.27.0.tar.gz 933094 BLAKE2B e412bd2a35a62b580344a49e2deee85764710f91327cd63b42913dc361ee96943ffe51b90ee745c420454f0a4be455606d486a91ab3e103d7e396f04dc3f1ff4 SHA512 102150cc641165a6c18ce71e3c6148dc10700f614fec7e1909c29172e3cce02dfa16af56aabdcd420499d0aa89f90fee8f26d92a250b0a521d1b9d416c6a678f
 EBUILD sysdig-0.26.6.ebuild 1446 BLAKE2B 8cacc86c38675a24c5b8d7e6402259ee6cf88035e08967bdfa43c24025be755cc326674d10189a3dbbd4331380b3b9f911375aa98507db8da708c4f93e6668f9 SHA512 2b2bec125737f8c5741b76c83844af1694c5753a2c9e10724d0e6483e2bc985162cbe85b0f724d2f49478e3b279df6e1de67235beabb7d6fb0051d077e9c775d
 EBUILD sysdig-0.26.7.ebuild 1446 BLAKE2B 8cacc86c38675a24c5b8d7e6402259ee6cf88035e08967bdfa43c24025be755cc326674d10189a3dbbd4331380b3b9f911375aa98507db8da708c4f93e6668f9 SHA512 2b2bec125737f8c5741b76c83844af1694c5753a2c9e10724d0e6483e2bc985162cbe85b0f724d2f49478e3b279df6e1de67235beabb7d6fb0051d077e9c775d
+EBUILD sysdig-0.27.0.ebuild 1446 BLAKE2B 8cacc86c38675a24c5b8d7e6402259ee6cf88035e08967bdfa43c24025be755cc326674d10189a3dbbd4331380b3b9f911375aa98507db8da708c4f93e6668f9 SHA512 2b2bec125737f8c5741b76c83844af1694c5753a2c9e10724d0e6483e2bc985162cbe85b0f724d2f49478e3b279df6e1de67235beabb7d6fb0051d077e9c775d
 MISC metadata.xml 507 BLAKE2B 4e19c0d3370019c80eda625ae812a4485139ab8a83285946ebc6ef62abad280beaefaaac29d7a57e14b5ca5448bd9d1c23a8cf6a4f783149633dd09e7ae1465c SHA512 d218731de7acfbbfa3c3043b2d942c00b7f5aff1a020b6dca2019f202be3a5390f44337e04691a0d4641e661f7581f703db5fda3d2a116c0d63fb7d9da25ed06
diff --git a/dev-util/sysdig/sysdig-0.27.0.ebuild b/dev-util/sysdig/sysdig-0.27.0.ebuild
new file mode 100644
index 000000000000..55a20f694f42
--- /dev/null
+++ b/dev-util/sysdig/sysdig-0.27.0.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/trace-cmd/Manifest b/dev-util/trace-cmd/Manifest
index 38b55ab6226e..5882aca09242 100644
--- a/dev-util/trace-cmd/Manifest
+++ b/dev-util/trace-cmd/Manifest
@@ -3,6 +3,8 @@ AUX trace-cmd-2.8.3-gcc10.patch 4431 BLAKE2B 5a764507af7b88de0732728a4d401360c78
 AUX trace-cmd-2.8.3-python3-warnings.patch 1281 BLAKE2B 66540f016d1ca3a7f5a803bd0753ac9c458fcee43056ec05e420fbeaee8b21cd0c4d38e67286d86ddeb6e478fa1e82d45203f538921bd066aa4ef2ad1222e4d7 SHA512 5446a13e82c9be3c6ed2bdc17b91495499b9f28eaa4045869bbf847ca14953cf36411e86136133b22bba05dae46325b522c00939c33943d5135c17e845fad94a
 AUX trace-cmd-2.8.3-soname.patch 392 BLAKE2B 334e2289dd1132798b1b704b071868715b38ad9308e1ab13abc7417ef55d06f9c07dd62fa3380e55d07020ffafe7d1adea10be6013b731c46583ed21d2cc1f33 SHA512 37096da570d3a926f06ef08731ff4adecc5cdaa2d3035668aa62d813db9facaa5b78189a2a7c9066c4291a90460978886e7f24759a865514335cd3ba1680b6f2
 DIST trace-cmd-v2.8.3.tar.gz 1996617 BLAKE2B 0ab77649af90a0a9368ff118dc94e6fd003b18ceb2065ae3a4559a1d2cfa93be44d87bfb97e2e2f06898508699ff5ce18face4edefd7e40b3b9cca405a626cff SHA512 51166c4276abda209a099cc6fe9081ad6d403cbfd9d4a53bc5bb068392327e88fe647e9324a527e68730d73d1a5f7f74126718547f94c652bb12e51c7518a58b
-EBUILD trace-cmd-2.8.3.ebuild 2530 BLAKE2B 5cae23417ecaffd5a5184cd9318ac9e32f043db167e12bc0aa2ef633c403ea45094ee1e74f7b3026901b58af6280527e2d34ecd86707d6e227dadc3f778abecb SHA512 8965a74e468447dbba288faecd53abb9883d391fb3947b9a65c106928baac88cac08e2ee2ad69f76afada41406c681da978d3134c16486269a9ccc4549402de9
+DIST trace-cmd-v2.9.1.tar.gz 4298008 BLAKE2B f7aa2f12b2c90f35390857ed6f5818b74c42be36ce70835d86410f9f4931d27410123baaad007fa2795c1ba1f5bafc739db620f467ccc48021d774ee7be8a68d SHA512 186bfdd8ff1e88e9e6d3ae87b123f049892deaaa8d6a42944b6f8abee6b828946b88774029aa96daf4423a3dfc01b42835508f44f636dd02579ef9a8ef425131
+EBUILD trace-cmd-2.8.3.ebuild 2509 BLAKE2B 74a17f7fae1d2090f4a972341737fe7483ad1c2807e0956c08cbd71d83804be9c3ad6d428b6c16bc70eb1b5e7491fc5bc53cc87696d6c86c46f8492435a7101d SHA512 3ce002cfab40d78283f68bf331adbd05de442f786cb472525fecf62d58043687882284db809abbd5e91d9123049c6155d23a4e9d02138466a18ac68d7101161d
+EBUILD trace-cmd-2.9.1.ebuild 2790 BLAKE2B d342dd0e566f9b3d10f083e0457ed9da4f5a344dd93f3b208f3503236c7583150384af0cb8d0d639647d3b139587c0963fd7acde0fa1a2919654352d6de528f5 SHA512 f83d6764e15720afe0821d055382efacab5fb7f81ad2d7a6f4255b8ccbb09ece5ba6c6531d12c2304f7051fcb1232a687837d2e03e95ed839cc4371b03366485
 EBUILD trace-cmd-9999.ebuild 2217 BLAKE2B 833d79cd9903e192914760299c71da81c481d666388cafaf6470605875a747a8c20e25b4718af7bef6e8d71516ad3811eb391d7031aef1c11409c526eb55d2ce SHA512 223fce0fd6398dc101a60788b00c814246c420385f8be16a871cdf74ec4f8f55814729ae823f4a53bdd333ece36c0fa7e79781d78d4c94d1195da8cea0e80485
 MISC metadata.xml 349 BLAKE2B 1e1c9812f4cfe7bb90e2637dcf21947f2702244cabc78ac2283112af7a51064d5a4732db71aaa360e6f111f5e6e5b8492e04252e84379cd21424113d2779ea71 SHA512 0a6322fba3de56559284a0f1e4abc83791cf089a74cb369d167b30dadaa019353c8eef0e09e91ad84b130f0660c1dfa665e4252987903884029f4d08fe80c552
diff --git a/dev-util/trace-cmd/trace-cmd-2.8.3.ebuild b/dev-util/trace-cmd/trace-cmd-2.8.3.ebuild
index 8a3d0ba72d94..0a21ac314489 100644
--- a/dev-util/trace-cmd/trace-cmd-2.8.3.ebuild
+++ b/dev-util/trace-cmd/trace-cmd-2.8.3.ebuild
@@ -78,7 +78,7 @@ src_compile() {
 
 python_compile() {
 	pushd "${BUILD_DIR}" > /dev/null || die
-	python_is_python3 && eapply "${FILESDIR}/trace-cmd-2.8.3-python3-warnings.patch"
+	eapply "${FILESDIR}/trace-cmd-2.8.3-python3-warnings.patch"
 
 	emake "${EMAKE_FLAGS[@]}" \
 		PYTHON_VERS="${EPYTHON}" \
diff --git a/dev-util/trace-cmd/trace-cmd-2.9.1.ebuild b/dev-util/trace-cmd/trace-cmd-2.9.1.ebuild
new file mode 100644
index 000000000000..05cc150deeca
--- /dev/null
+++ b/dev-util/trace-cmd/trace-cmd-2.9.1.ebuild
@@ -0,0 +1,130 @@
+# 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} )
+DISTUTILS_OPTIONAL=1
+
+inherit linux-info bash-completion-r1 python-r1 toolchain-funcs
+
+DESCRIPTION="User-space front-end for Ftrace"
+HOMEPAGE="https://git.kernel.org/cgit/linux/kernel/git/rostedt/trace-cmd.git"
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/rostedt/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot/${PN}-v${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+	S="${WORKDIR}/${PN}-v${PV}"
+fi
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0/${PV}"
+IUSE="+audit doc python test udis86"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	audit? ( sys-process/audit )
+	python? ( ${PYTHON_DEPS} )
+	udis86? ( dev-libs/udis86 )
+"
+DEPEND="${RDEPEND}
+	sys-kernel/linux-headers
+	test? ( dev-util/cunit )
+"
+BDEPEND="
+	python? (
+		virtual/pkgconfig
+		dev-lang/swig
+	)
+	doc? ( app-text/asciidoc )
+"
+
+# having trouble getting tests to compile
+RESTRICT+=" test"
+
+pkg_setup() {
+	local CONFIG_CHECK="
+		~TRACING
+		~FTRACE
+		~BLK_DEV_IO_TRACE"
+
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	default
+	sed -r -e 's:([[:space:]]+)install_bash_completion($|[[:space:]]+):\1:' \
+		-i Makefile || die "sed failed"
+}
+
+src_configure() {
+	EMAKE_FLAGS=(
+		BUILD_OUTPUT="${WORKDIR}/${P}_build"
+		"prefix=${EPREFIX}/usr"
+		"libdir=${EPREFIX}/usr/$(get_libdir)"
+		"CC=$(tc-getCC)"
+		"AR=$(tc-getAR)"
+		"BASH_COMPLETE_DIR=$(get_bashcompdir)"
+		"etcdir=/etc"
+		$(usex audit '' 'NO_AUDIT=' '' '1')
+		$(usex test 'CUNIT_INSTALLED=' '' '1' '')
+		$(usex udis86 '' 'NO_UDIS86=' '' '1')
+		VERBOSE=1
+	)
+}
+
+src_compile() {
+	emake "${EMAKE_FLAGS[@]}" NO_PYTHON=1 \
+		trace-cmd
+
+	if use python; then
+		python_copy_sources
+		python_foreach_impl python_compile
+	fi
+
+	use doc && emake doc
+}
+
+python_compile() {
+	pushd "${BUILD_DIR}" > /dev/null || die
+
+	emake "${EMAKE_FLAGS[@]}" \
+		PYTHON_VERS="${EPYTHON}" \
+		PYTHON_PKGCONFIG_VERS="${EPYTHON//python/python-}" \
+		python_dir=$(python_get_sitedir)/${PN} \
+		python ctracecmd.so
+
+	popd > /dev/null || die
+}
+
+src_test() {
+	emake "${EMAKE_FLAGS[@]}" test
+}
+
+src_install() {
+	emake "${EMAKE_FLAGS[@]}" NO_PYTHON=1 \
+		DESTDIR="${D}" \
+		install install_libs
+
+	newbashcomp tracecmd/trace-cmd.bash "${PN}"
+
+	use doc && emake DESTDIR="${D}" install_doc
+	use python && python_foreach_impl python_install
+}
+
+python_install() {
+	pushd "${BUILD_DIR}" > /dev/null || die
+
+	emake "${EMAKE_FLAGS[@]}" DESTDIR="${D}" \
+		PYTHON_VERS="${EPYTHON}" \
+		PYTHON_PKGCONFIG_VERS="${EPYTHON//python/python-}" \
+		python_dir=$(python_get_sitedir)/${PN} \
+		install_python
+
+	popd > /dev/null || die
+
+	python_optimize
+}
diff --git a/dev-util/tup/Manifest b/dev-util/tup/Manifest
index e43d352e3f4e..ed9e7db3f42b 100644
--- a/dev-util/tup/Manifest
+++ b/dev-util/tup/Manifest
@@ -1,4 +1,4 @@
 DIST tup-0.7.8.tar.gz 4540974 BLAKE2B b6724113fac9920b029604af3bf4fd875c1651b89b6c772bfecef9e8d9612574265fafd0a8eac217a51e3b3fe1d4776e97174d4c89cbf97ee3203dddc0e53f6c SHA512 17d4b76c508749ca011b3c0209bc779d617a091ed2d067bf1095fc840f62ac23145071395892170390ac6217f18bcaabb0cff582aa782838eab190244313d7f5
 EBUILD tup-0.7.8.ebuild 2430 BLAKE2B 4957aa1a9f0a98ba486ecee3785a38b3676f5f8aec55ba7d202559ca19ed77d556d01f433eb9b27ac75a9c44cf2bce4724720a9647ea10fe634a4c48d1a5d06e SHA512 19e0df9bc0287d7c9fe5611f7532aa7839af5ff204dd4c32c6aa2e997c31cf5579dd00407ac0ae3821c647ec61400e0cc7d3e689597ab93ce339bd9169abfb76
 EBUILD tup-9999.ebuild 2447 BLAKE2B 3e33c0e837b8469e1906b63c96ef7a6944ff29b9c16c0e5c519b1555b044c4155ec7d787443143a2d54a1ce7356808c280294aae5211ab6ec17b18cf67325d7f SHA512 fcd9a127f316d2eb520ed14c9f8cf5da3458058f58c2dd6715fd4aa90c28c002b9cfa9a905e255f78b96b9695caf26b5d73b2185f28c162ede7fdceca9fe1f38
-MISC metadata.xml 326 BLAKE2B edaa58be0e147ba52e73b1e4ad70250ee2ebf7c31beda95bc4f639dc4759b4a2515a3f927b4c5c3e644a66a58180df7ef6874893908d6ffc55181c8a554f3a70 SHA512 cd0c6ad8e43779608355cc4bd23a03a88d2920ff15269f2b130395f955fe58d63029d6f8567b021c4f546d0c41e8af3d866c0de4b72d042be1ec6eff72cc0154
+MISC metadata.xml 242 BLAKE2B 1e34d8d82a789942bfacaa7957c074695a55b4363e2982752b4dd2c8242ad50ccaa6537bfc584a31cdf360bfb31849a39422997924ad2dac438ddbf7e25798e7 SHA512 a487da6c7fc5c14c9cbaceb95c356ceb039824f29855537f8ff45c09b2973087140481fa052603d0e8c1a7244de43bf05727c6e9fca06963f5f3e3d3e8ecf0d4
diff --git a/dev-util/tup/metadata.xml b/dev-util/tup/metadata.xml
index 390ab1cc5015..c16fe2d5fe28 100644
--- a/dev-util/tup/metadata.xml
+++ b/dev-util/tup/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>andrey_utkin@gentoo.org</email>
-		<name>Andrey Utkin</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">gittup/tup</remote-id>
 	</upstream>
diff --git a/dev-util/umockdev/Manifest b/dev-util/umockdev/Manifest
index 1413f3916a33..f8c18ed8260c 100644
--- a/dev-util/umockdev/Manifest
+++ b/dev-util/umockdev/Manifest
@@ -1,8 +1,3 @@
-AUX umockdev-0.9.4-sysmacros.patch 599 BLAKE2B fa261c73cc873ff2aadfc721cdd24dbae9ee9c84c52a02fe16aaa86a94c4b84bcdad6782be590b0f163f679281764595b2679ff0898f502621ea6c2427533138 SHA512 3deb38bb44ea4bb2cf7f4b2dc88db0c0d71045ccaae48acecd3fde9e0006262111202c8e3ae490a5fccd610abf0c24ca11699720872998dfc55bc29f58f923b6
-DIST umockdev-0.11.3.tar.xz 753152 BLAKE2B 9f78d160a653ba2c56e97d1b331dfeecd4dd8f6642744849ec3eb85866e4cbce6399679a873b730beddfac2f4bd7572937df4a3db2440ec1bf929849f928bdc6 SHA512 e9086777bb13dbd79b629dc68555d19fb8799720dfc4548926b87d032d94212814cb9e1de10e26f5940a9b5db9a15f62a594f3baf0050ffb9ea30f1563db6d6c
 DIST umockdev-0.12.1.tar.xz 756920 BLAKE2B a8c1d9734f4c0a8e7f19405e011ce964efce6621b4886efead88e040bfe07d2f5a85f063977dfed1c8fb5a5bf4668024b6e687b688a9609cdba1db419518a8ac SHA512 a8995d09179c7d2d37d319f8e675fb15c3caa605c57b56cbb2e785088909d886e790864475feb82ab2b6eb2449038c636a06250d4f9eb8b28b38f0d80574824c
-DIST umockdev-0.9.4.tar.xz 754856 BLAKE2B 92182ee856e9432f02cf3a739c7af6f2220394eb4dd81ef6e2949380d124f70d9e34c3d3e49053af43794dd0f2ce0feed8be7366df2c9a06bebee9c52d24ba53 SHA512 c291d3f40a0ab366f14021aa0960852de049f4299a0207d93cec28d5961f3bc7f89448add6f7b35c1262d805d1d638837d4d5e6b734879ffb5910da50019e1cd
-EBUILD umockdev-0.11.3.ebuild 1008 BLAKE2B 2c759f19cab5a3386d0c0fd5226e08d82c903577e7923ee2fd5ed035de80aaee3d2414d20fd9b5aee6d031ec46b999d39818d58bdf5e70ca61ea6973f149df08 SHA512 c59bc1154a73886962f992517da4b4585c8ac8ce99642cebe815d5a691240b1efc2ed323002c2bbd2ecbc752cc24341d2e367987f9eecc46f0a24f6ff79e9b79
-EBUILD umockdev-0.12.1.ebuild 1195 BLAKE2B 96364a0cbac6f75dbc5368b3e31092bced2d3abf726a882c8ca21132f032c6e627913709bb2b1875d873f3144de3f25c6845730d1d8cbcbb2f23f5143a397491 SHA512 0b687886638645c816b8442011cc3eff3b452629804a0f665a1b516deac6b8e8b524a4364df854367bf4815c2e7362547a1403d91afe356ea04fbf012bd03ae7
-EBUILD umockdev-0.9.4.ebuild 717 BLAKE2B d68eec4ddf6087fb9f0768c487595bc0617f6b746b9cd4002b8dd95a25579de89eb582703defaef005c0087c87dba0ccae28a03a9e6ccc414c393d28b9780e19 SHA512 555af33316a54fa0e7ec4c6211a0b1322b9e762b47084fe4698638c7feb95b0f1c025e80d4fcf5c3f8a09ab526f25db38b440c722beb62089b13fae3c60a0b23
+EBUILD umockdev-0.12.1.ebuild 1200 BLAKE2B c9f99392023e772edc55c016224778cc76204d232a7e29e7756f68a62cbe3e468e8a09f27db8022781c239fdd1e6ce8ec39930494c334624b4f706b535d69b36 SHA512 1604fe4fc9e3af3e5907bc2f0865da6a8af6c9612c6067b3b329b3ceb91b9484d0dd8c0776c6dbd0a9ca7d3aefe150fe172cfbff46647ca41bc193cdd1b11be7
 MISC metadata.xml 388 BLAKE2B 5140e5be03021c8b50516cddf6a51b8715a1e110e13519313cd3e30b2317874cec5c56eea5168d47496a2055635b87effcc66dac54a66a482818da15b540186d SHA512 ca1c14fa200681d916d6d4539fa9ee8c64d6894d7b78870abfc4ad03446a30703f0fe862a11c5838e26719ae66e0bc944fe0ca75f0f89195128d4e8856b6cd78
diff --git a/dev-util/umockdev/files/umockdev-0.9.4-sysmacros.patch b/dev-util/umockdev/files/umockdev-0.9.4-sysmacros.patch
deleted file mode 100644
index bfc8bc9ed535..000000000000
--- a/dev-util/umockdev/files/umockdev-0.9.4-sysmacros.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- umockdev-0.9.4/src/umockdev-record.c
-+++ umockdev-0.9.4/src/umockdev-record.c
-@@ -30,6 +30,7 @@
- #include <stdio.h>
- #include <stdarg.h>
- #include <sys/stat.h>
-+#include <sys/sysmacros.h>
- #include <errno.h>
- #include <sys/types.h>
- #include <glib/gstdio.h>
---- umockdev-0.9.4/tests/test-umockdev-vala.c
-+++ umockdev-0.9.4/tests/test-umockdev-vala.c
-@@ -36,6 +36,7 @@
- #include <unistd.h>
- #include <glib/gstdio.h>
- #include <sys/stat.h>
-+#include <sys/sysmacros.h>
- #include <gobject/gvaluecollector.h>
- 
- #define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
diff --git a/dev-util/umockdev/umockdev-0.11.3.ebuild b/dev-util/umockdev/umockdev-0.11.3.ebuild
deleted file mode 100644
index edd87b90f8a2..000000000000
--- a/dev-util/umockdev/umockdev-0.11.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit multilib-minimal python-any-r1
-
-DESCRIPTION="Mock hardware devices for creating unit tests"
-HOMEPAGE="https://github.com/martinpitt/umockdev/"
-SRC_URI="https://github.com/martinpitt/umockdev/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+introspection static-libs test"
-
-RDEPEND="
-	virtual/libudev:=[${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.32:2[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( ${PYTHON_DEPS} )
-	app-arch/xz-utils
-	>=dev-util/gtk-doc-am-1.14
-	virtual/pkgconfig
-"
-
-# Tests seem to hang forever
-RESTRICT="test"
-
-multilib_src_configure() {
-	local ECONF_SOURCE=${S}
-	econf \
-		--disable-gtk-doc \
-		$(multilib_native_use_enable introspection) \
-		$(use_enable static-libs static) \
-		VALAC="$(type -P true)"
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-util/umockdev/umockdev-0.12.1.ebuild b/dev-util/umockdev/umockdev-0.12.1.ebuild
index 6f0275625128..a3ebfc339420 100644
--- a/dev-util/umockdev/umockdev-0.12.1.ebuild
+++ b/dev-util/umockdev/umockdev-0.12.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit multilib-minimal python-any-r1
 
diff --git a/dev-util/umockdev/umockdev-0.9.4.ebuild b/dev-util/umockdev/umockdev-0.9.4.ebuild
deleted file mode 100644
index 4845f7ae319d..000000000000
--- a/dev-util/umockdev/umockdev-0.9.4.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit python-any-r1
-
-DESCRIPTION="Mock hardware devices for creating unit tests"
-HOMEPAGE="https://github.com/martinpitt/umockdev/"
-SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.xz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static-libs test"
-
-RDEPEND="dev-libs/libgudev:=
-	virtual/libudev:=
-	>=dev-libs/glib-2.32:2"
-DEPEND="${RDEPEND}
-	test? ( ${PYTHON_DEPS} )
-	app-arch/xz-utils
-	virtual/pkgconfig"
-
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-sysmacros.patch #579988
-)
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
diff --git a/dev-util/unrpyc/Manifest b/dev-util/unrpyc/Manifest
deleted file mode 100644
index 1762e729ae2c..000000000000
--- a/dev-util/unrpyc/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST unrpyc-1.1.3.tar.gz 77662 BLAKE2B e2fdf9015e67ee389ff84c49bd89c64d65178a26aaa7b8600202f491291e03a568bec2d8d09e47c407a9bcd025dab3b84e5167f07c9673d19bdb5bf7846c1eed SHA512 5883d58e11b2f52cffdeae744e17bf6bf2039340e53365f8ce58f716b991011bbca71c6473395a9d70c32bc77529eea3e7a9e3b8da7dc3cc8362cc0fdcbe5cf0
-EBUILD unrpyc-1.1.3.ebuild 1158 BLAKE2B 898637185a79afdcbf23cb55b096cf80dca9701272dc8c1386be048292cffd13dedf1bdda259adbff840a8967b50ae17bf8a0971d6bc3ef298fd37ecfddb56cd SHA512 852ff2ab7d68e6f4a155db4d0cb0b8cdae5e34a422e98f0e4b47dd8cb65c28bf78dd02d2508b36b7f04bfebfc068f3461ffc8a4a6d4616a3b5213eb909844936
-MISC metadata.xml 933 BLAKE2B 92842b89b4d9cdbc5f63ca4706f334179ec255fc834774ececb137eff7205d8ccd24142ef0fb92508087e05a6cfba2a8ffe5558315d45d3b3355632ba43e2e50 SHA512 f14501a139d75f1f71a136ed0f7acaf01aebf508e0a6b8981193ac594b8d9759c5283af93f24fd7aed56eafd88df42d9c659a909febee9196a0ccff1a7f607a8
diff --git a/dev-util/unrpyc/metadata.xml b/dev-util/unrpyc/metadata.xml
deleted file mode 100644
index 69df492b06ae..000000000000
--- a/dev-util/unrpyc/metadata.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>bircoph@gentoo.org</email>
-		<name>Andrew Savchenko</name>
-	</maintainer>
-	<longdescription>
-		Unrpyc is a script to decompile Ren'Py (http://www.renpy.org/) compiled
-		.rpyc script files. It will not extract files from .rpa archives.
-		For that, use <pkg>app-arch/unrpa</pkg>.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">CensoredUsername/unrpyc</remote-id>
-	</upstream>
-	<use>
-		<flag name="module">Build un.rpyc module for run-time decompiling</flag>
-		<flag name="proto0">Use pickle protocol 0 for un-rpyc module. May be usefule for very old games</flag>
-		<flag name="proto1">Use pickle protocol 1 for un-rpyc module. Default if no protocol is selected</flag>
-		<flag name="proto2">Use pickle protocol 2 for un-rpyc module</flag>
-	</use>
-</pkgmetadata>
diff --git a/dev-util/unrpyc/unrpyc-1.1.3.ebuild b/dev-util/unrpyc/unrpyc-1.1.3.ebuild
deleted file mode 100644
index e754cac60c4a..000000000000
--- a/dev-util/unrpyc/unrpyc-1.1.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-inherit distutils-r1
-
-SRC_URI="https://github.com/CensoredUsername/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-DESCRIPTION="Ren'Py's rpyc scripts decompiler"
-HOMEPAGE="https://github.com/CensoredUsername/unrpyc"
-LICENSE="BSD-1 BSD"
-SLOT="0"
-
-IUSE="+module proto0 proto1 proto2"
-
-DEPEND="module? ( dev-python/picklemagic[${PYTHON_USEDEP}] )"
-
-src_prepare() {
-	sed -i 's/unrpyc.py/unrpyc/g' README.md setup.py || die
-	mv unrpyc.py unrpyc || die
-	distutils-r1_src_prepare
-}
-
-src_compile() {
-	distutils-r1_src_compile
-
-	if use module; then
-		local proto=1
-		use proto0 && proto=0
-		use proto1 && proto=1
-		use proto2 && proto=2
-
-		cd un.rpyc || die
-		python_setup 'python2*'
-		./compile.py -p${proto} || die
-	fi
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	if use module; then
-		install -Dpm 0644 -t "${ED}/usr/share/${PN}" un.rpyc/un.rpyc || die
-		einfo "For run-time rpyc decompiling copy ${EPREFIX}/usr/share/${PN}/un.rpyc to your game dir."
-		newdoc un.rpyc/README.md README-un.rpyc.md
-	fi
-}
diff --git a/dev-util/valgrind/Manifest b/dev-util/valgrind/Manifest
index 852cebc56a2a..c522438020c5 100644
--- a/dev-util/valgrind/Manifest
+++ b/dev-util/valgrind/Manifest
@@ -5,7 +5,7 @@ DIST valgrind-3.15.0.tar.bz2 20241437 BLAKE2B a1bd46d46b3cd9f963773d011e7c74bf5e
 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 3761 BLAKE2B 0f839a8e208e33a879331b3791668987d51bac4bc8e9cff2eb03172736a3b9a8b24a256c01065d688f3a43845e4d915e6c68c61f68c4599f3bb7298cd5e82fbe SHA512 77bd2fce8757ef1b7e9f940c24aa184551781dfe139acfca63c92fa643e018e34b746b70e4f5f55a1a5738e4988beab986d5932711cb7c97d1e48e0daf85f72c
+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 3766 BLAKE2B 820536cd71c55c9fa35f77b014d7a5c5936fc845773b1523ef79c9c6e47d632e1633e2f60cd378b33610c396d57ca71241517de1817aad86402836376b954320 SHA512 454562b3e6725accb06c4d06450eb2e30cc5e4819932ad227d5b6f8b58b0b9b9d8f9966ac1c2294e8f7dc05a0f75bc29eb31c7084c27c3259d47306246481e26
 EBUILD valgrind-9999.ebuild 3753 BLAKE2B 546a516d9a909f44e1c8dc20ace9025826335e2910e3652e1c7592804765fd4d679f6422276399c7629e2b711236181958dfe435198b8ebd8327b6f637cd67fd SHA512 64831f5594eee66cb5ed5a1afbc44708cf0f334e05b22e46c4675f35528628f5bb6f89981de420bcae568b18dee4767150a6465f75f1451cdd128bf297dd04bd
diff --git a/dev-util/valgrind/valgrind-3.15.0.ebuild b/dev-util/valgrind/valgrind-3.15.0.ebuild
index ac8952f253c0..41693c4f120d 100644
--- a/dev-util/valgrind/valgrind-3.15.0.ebuild
+++ b/dev-util/valgrind/valgrind-3.15.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="ftp://sourceware.org/pub/valgrind/${P}.tar.bz2"
-	KEYWORDS="-* amd64 arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~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/vulkan-headers/Manifest b/dev-util/vulkan-headers/Manifest
index 2daa54318855..e1480092b1a7 100644
--- a/dev-util/vulkan-headers/Manifest
+++ b/dev-util/vulkan-headers/Manifest
@@ -1,6 +1,4 @@
-DIST vulkan-headers-1.2.137.tar.gz 740315 BLAKE2B ae7b4736f329eca6ceebac207b89f01137d121b30059361914e94c570efa9ae8276ece03d9b756d3f343db7324adc01a550bab85ef496a54c8e1e93c58e07e51 SHA512 379980e1792a3a9f10d773b178fe6db36332d17b8a5a9dfc4ca9a52747667d44d24ca8498c2110d7a04fe54bf0d20e3a94ffc97b96b7db95f957072787c5f8a8
 DIST vulkan-headers-1.2.143.tar.gz 758635 BLAKE2B e1fa8e1290d2fd1e4cef932e4dcd2bc10ef14449cdb41d57f0e4ef58f9a758add7e05d06d7884b08e080250cbb93bf0b211ac3570f0be6b256f6c70bd9eb1704 SHA512 fafd28822da050211525b289a324d333d5651e74e455a7b1010db55eac624edbbf50f5e7f899e2003c821fd06a9a61fec32ea7d07dc4d90a3b3697e03d3ddcc3
-EBUILD vulkan-headers-1.2.137.ebuild 591 BLAKE2B 127d9ed5084e0f90e171268c0ceb84b2a6173a81945e92dd9de76d1b7129062c1982dcf27b2ba036d23516d7805394c6f592488f8ce942733556d5741a29e3f6 SHA512 baa05ee223757a5efba8e72754a91344af04f3920badb7bafbe8669fdab34aa39eca2eee7bae73913c758760883615910ed1618a90183382323e9b76d02f73c8
-EBUILD vulkan-headers-1.2.143.ebuild 591 BLAKE2B 127d9ed5084e0f90e171268c0ceb84b2a6173a81945e92dd9de76d1b7129062c1982dcf27b2ba036d23516d7805394c6f592488f8ce942733556d5741a29e3f6 SHA512 baa05ee223757a5efba8e72754a91344af04f3920badb7bafbe8669fdab34aa39eca2eee7bae73913c758760883615910ed1618a90183382323e9b76d02f73c8
+EBUILD vulkan-headers-1.2.143.ebuild 608 BLAKE2B c9f1b1a10bfea7684fb3917134a8d2f4e1b54afe8db661ff9d07f00c3b1c735f693c57949aa544d1ae8a9e1acbcd004bd4c6524f15209723c648f7a4a53d628c SHA512 2e573ef97eee75ff590e5b38a510c2d0b8db5d4e4bca2a1ba66e401fea4281224b7b67e7b465f5f4ec251018b1902da3020533f602e022e8899b7f096cba5049
 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.137.ebuild b/dev-util/vulkan-headers/vulkan-headers-1.2.137.ebuild
deleted file mode 100644
index 7d33f79e5418..000000000000
--- a/dev-util/vulkan-headers/vulkan-headers-1.2.137.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# 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 ~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-headers/vulkan-headers-1.2.143.ebuild b/dev-util/vulkan-headers/vulkan-headers-1.2.143.ebuild
index 7d33f79e5418..7bea2760fcf0 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 ~ppc64 x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 	S="${WORKDIR}"/${MY_PN}-${PV}
 fi
 
diff --git a/dev-util/vulkan-tools/Manifest b/dev-util/vulkan-tools/Manifest
index 63508125f917..098e10dc7ecd 100644
--- a/dev-util/vulkan-tools/Manifest
+++ b/dev-util/vulkan-tools/Manifest
@@ -1,6 +1,4 @@
-DIST vulkan-tools-1.2.137.tar.gz 710528 BLAKE2B be7d2110f2ca9df5e3c2e898a4e985252f5e6568d061d2842a91cc95941bdd00e9662f6aeba4acacaf7c9a0abfe61915baded15be0ef2a4c43a4b57a5a04e99b SHA512 879529ccea9a894f62222cd0110b946ddf055f092994bf71942a3c5c50906dc062edc5081ea2150757cdb501426ca341e9a4260319c6565acdcb731f172d43d8
 DIST vulkan-tools-1.2.141.tar.gz 711666 BLAKE2B 0ad31cba26106ea76ddeb26e05b59302a6f35c9172eb75fe31b6a05370be0131a92db33a4c54a006b6ba5145447079239d7ff174f7be10feb172fe03d7a1a619 SHA512 5dce372f60f55570bfc7dc4e4da7b4a07f632cfac6a2862bdf773cab61a8c6260bb38cbd48d944e08479248bfe29248214618a78952fac0aeef285e5b888d337
-EBUILD vulkan-tools-1.2.137.ebuild 1868 BLAKE2B 469d21df29887ef3e51674952ea5fe5eb277c4579be7b3dc5a3573d073cc0752640377f544784d58cf4da3da3426118a62b63878db2e586510796fbdb0361732 SHA512 c2759a50c627b63170d205bfd45ef071376f4faaccc70522e7c3d177bf1185da8208029f9705dfd2c81cdae72636869bfd347302c1c2fa6d53fd522fd3e65df1
-EBUILD vulkan-tools-1.2.141.ebuild 1868 BLAKE2B 469d21df29887ef3e51674952ea5fe5eb277c4579be7b3dc5a3573d073cc0752640377f544784d58cf4da3da3426118a62b63878db2e586510796fbdb0361732 SHA512 c2759a50c627b63170d205bfd45ef071376f4faaccc70522e7c3d177bf1185da8208029f9705dfd2c81cdae72636869bfd347302c1c2fa6d53fd522fd3e65df1
+EBUILD vulkan-tools-1.2.141.ebuild 1885 BLAKE2B 145b76e22548ae638ec3eedf9b3692d03b026484a2cc611221c25a9dc4ac4d57a077531ff34533579f983d997fdf5eae9ded0c2c25e5573daa99a698e6eb9b49 SHA512 2d76c2ff116686ed5d6bfd3cca4de4c8e2bd227bd7a4373e0b1f7ef12f9c26d871be9048c92d0f9569ea11b04369215f6fe6bd7b31054db4dca675f3cd2d57e1
 EBUILD vulkan-tools-9999.ebuild 1869 BLAKE2B f47caf24e21149f31c79b2ed3d71b729d6b41ed899212c07bb40f1385e75b7db6a09d54c75a9989a10bf3da21bff2a53a57a9f42b5b28399cece42e25c1e2621 SHA512 3f8b8bf5e6490643cb051cbe7d6827f48d357e374d59a5164159be34d09397ced64a14525488d0c187fe050980c56b8eb98ceefb8a7340c2061a3835392e85bd
 MISC metadata.xml 500 BLAKE2B 2b03cd2296502530b43020bacbbef0edaabacc6b8d2458ef6d5f653fbbdf6b02ff5fba9988fd19ee9c9e14e41df359c150cbc2fd141769960f2f1b95e213d8ed SHA512 327529a5a8a57115e116c31c5b86a00f978c8612a4905eed90ad3b33671acaabbaa5e7e82bb140ad5d9b1574b0f37a53882d117c50ec320c1ea0c8d5fc25994e
diff --git a/dev-util/vulkan-tools/vulkan-tools-1.2.137.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.2.137.ebuild
deleted file mode 100644
index c2805c77cf4a..000000000000
--- a/dev-util/vulkan-tools/vulkan-tools-1.2.137.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# 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 ~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-1.2.141.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.2.141.ebuild
index c2805c77cf4a..a23ebee93695 100644
--- a/dev-util/vulkan-tools/vulkan-tools-1.2.141.ebuild
+++ b/dev-util/vulkan-tools/vulkan-tools-1.2.141.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/wstool/Manifest b/dev-util/wstool/Manifest
index a7f5cd6640d3..ce2da0c83e37 100644
--- a/dev-util/wstool/Manifest
+++ b/dev-util/wstool/Manifest
@@ -1,4 +1,4 @@
 DIST wstool-0.1.18.tar.gz 80595 BLAKE2B ed90fc5c63ab5d775dfb49ddacc6da6e285aeb5078cf471c0d504659a9e322fde27797e4d05fd56dff4b9958558200cf05e46cf7ae71fd1231ab63048e668808 SHA512 fda9c679183c605048ed024a57b07fd2d9b644978a3e4ff89c3716b74d8e4ba0124779bcdf88a75fdbbf47c765b7ab63db7c84a55a6e1744fc6f955649590c48
-EBUILD wstool-0.1.18.ebuild 1435 BLAKE2B ea801c5cf49ec2fe7bfee00e62301e28894035f40cb203333745ed39fc3b89e5f250f7a3f7870b1264487f48408401882a3cc60f04a55657ed8d150aa4511bee SHA512 5755d6da684f577894f72b2e59f860487a90a8c8f4ee32a6cbb5fa973fe5ba95484c8b16c097588643a9314f3971cb7487f050cadc640d760e3c2b900a62826b
-EBUILD wstool-9999.ebuild 1435 BLAKE2B ea801c5cf49ec2fe7bfee00e62301e28894035f40cb203333745ed39fc3b89e5f250f7a3f7870b1264487f48408401882a3cc60f04a55657ed8d150aa4511bee SHA512 5755d6da684f577894f72b2e59f860487a90a8c8f4ee32a6cbb5fa973fe5ba95484c8b16c097588643a9314f3971cb7487f050cadc640d760e3c2b900a62826b
+EBUILD wstool-0.1.18.ebuild 1452 BLAKE2B 8a1ccd2a4862990db1554772d80c1f596c42ddf9c12ec328d43544f9fcb2393b3cfc9e53c3ec43241962e3d7c1dba2753423ba97da9c3c2d07a6de4605a88f7f SHA512 5fca6659a26a6f700c0d035703c8e6d0572bb5b7c9bd5a4530ea6c96308e735bcd7e03552a11ef52172980ba516e2df3c2f1dd4597b31f191be44a1d4364733f
+EBUILD wstool-9999.ebuild 1452 BLAKE2B 8a1ccd2a4862990db1554772d80c1f596c42ddf9c12ec328d43544f9fcb2393b3cfc9e53c3ec43241962e3d7c1dba2753423ba97da9c3c2d07a6de4605a88f7f SHA512 5fca6659a26a6f700c0d035703c8e6d0572bb5b7c9bd5a4530ea6c96308e735bcd7e03552a11ef52172980ba516e2df3c2f1dd4597b31f191be44a1d4364733f
 MISC metadata.xml 329 BLAKE2B ffdb449cef2fa449771425241f9a03b49d915bed8abc73329586e9a2873e41ac669e4a347ed6f2cabc92b7132a741d5fcc79f13a9d900f7fced17fba322c460c SHA512 7bedf1430c3a2e5a8c98701ef48ce3a97ac59bebe3d42e19da193480c97ef0b2020916c7582f4083ebbf361b5c66b17ad1bfa7889e8aa62d3c945ba8dcf5b62f
diff --git a/dev-util/wstool/wstool-0.1.18.ebuild b/dev-util/wstool/wstool-0.1.18.ebuild
index 41972a54bea4..c6a9c3fd8897 100644
--- a/dev-util/wstool/wstool-0.1.18.ebuild
+++ b/dev-util/wstool/wstool-0.1.18.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-PYTHON_COMPAT=( python{3_6,3_7} )
+EAPI=7
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
@@ -13,7 +13,7 @@ fi
 inherit ${SCM} distutils-r1
 
 DESCRIPTION="Commands to manage several local SCM repositories for ROS"
-HOMEPAGE="http://wiki.ros.org/wstool"
+HOMEPAGE="https://wiki.ros.org/wstool"
 if [ "${PV#9999}" != "${PV}" ] ; then
 	SRC_URI=""
 	KEYWORDS=""
@@ -34,7 +34,6 @@ RDEPEND="
 	>=dev-python/vcstools-0.1.38[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}
-	dev-python/sphinx
 	test? (
 		dev-python/nose[${PYTHON_USEDEP}]
 		dev-python/coverage[${PYTHON_USEDEP}]
@@ -44,6 +43,9 @@ DEPEND="${RDEPEND}
 		dev-vcs/subversion
 	)
 "
+BDEPEND="
+	dev-python/sphinx
+"
 
 DISTUTILS_IN_SOURCE_BUILD="yes"
 
diff --git a/dev-util/wstool/wstool-9999.ebuild b/dev-util/wstool/wstool-9999.ebuild
index 41972a54bea4..c6a9c3fd8897 100644
--- a/dev-util/wstool/wstool-9999.ebuild
+++ b/dev-util/wstool/wstool-9999.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-PYTHON_COMPAT=( python{3_6,3_7} )
+EAPI=7
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
@@ -13,7 +13,7 @@ fi
 inherit ${SCM} distutils-r1
 
 DESCRIPTION="Commands to manage several local SCM repositories for ROS"
-HOMEPAGE="http://wiki.ros.org/wstool"
+HOMEPAGE="https://wiki.ros.org/wstool"
 if [ "${PV#9999}" != "${PV}" ] ; then
 	SRC_URI=""
 	KEYWORDS=""
@@ -34,7 +34,6 @@ RDEPEND="
 	>=dev-python/vcstools-0.1.38[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}
-	dev-python/sphinx
 	test? (
 		dev-python/nose[${PYTHON_USEDEP}]
 		dev-python/coverage[${PYTHON_USEDEP}]
@@ -44,6 +43,9 @@ DEPEND="${RDEPEND}
 		dev-vcs/subversion
 	)
 "
+BDEPEND="
+	dev-python/sphinx
+"
 
 DISTUTILS_IN_SOURCE_BUILD="yes"
 
diff --git a/dev-util/wxglade/Manifest b/dev-util/wxglade/Manifest
deleted file mode 100644
index 0344a4366e1a..000000000000
--- a/dev-util/wxglade/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX wxglade-0.6.3-wxversion.patch 357 BLAKE2B bd9f6ca3ad8b33d8f152aa067617cdee4b9b2e9302f7585ce9dfe84f7ac3c2c4cb5fbe0719eff92c61bb918a616a03a058a13e7efe6bfba404cf71bd4c165914 SHA512 6a3ab0d1365d7c511d3d360a95ded27abb4eebc1cf605712603934134c6da96d8d2fe4aea71c9b6d3a2fa1b0ff280f3cfc1b9198608b1e7b6a450ac7b62b06b0
-DIST wxGlade-0.8.2.zip 4682765 BLAKE2B b9c6a0fe5ca89dce4ba8236c1db079df76777ecff34c00b9251088f39e5c853c8b775a2d941fa7f45a4f607354b85ab6cb26b387bd7e81f4db9cf458944fecc0 SHA512 d74f0b88509232b5f573af70f643af840c96e810060fdffc413f71ad03acca0fdb0324fefe43ab2a36473d8b053259099883d4aae51afff0c1c0b0ece492f9d7
-EBUILD wxglade-0.8.2-r1.ebuild 1153 BLAKE2B 590f7fa4176cfec3de5e0630316db5e3812b363b996c4092b38b3b687331bb151ac1567cc180e596a034060d04545ef1d8e5c220a4f8906244a6d2ff152bc244 SHA512 676c04e94ddd326ea7f8f32f8416ae29a8c7af09b8933a6d1ca5e7f47aee1d5b00e87d0e1393c16e86452efca9a63d5d6f7629c56d21ed7b952e9a4a403a29dd
-MISC metadata.xml 338 BLAKE2B 646f91107076526a1d1e8c838869a20f69f0a13ed96a209ede0fedc8b10151ee18becd720646193994281de671a7d51ae7dc99c8652acda63bc73e72c6e57d33 SHA512 a5c2365b0607137be3ea999914329a9ffb3390065163f1f4bc818247ee9d8bfb7b4494c533f739870a31bd5ee484b9ff4199f279a9202708c1742513b0a48b97
diff --git a/dev-util/wxglade/files/wxglade-0.6.3-wxversion.patch b/dev-util/wxglade/files/wxglade-0.6.3-wxversion.patch
deleted file mode 100644
index f788e0bff492..000000000000
--- a/dev-util/wxglade/files/wxglade-0.6.3-wxversion.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur wxGlade-0.6.1-orig/main.py wxGlade-0.6.1/main.py
---- wxGlade-0.6.1/main.py	2007-10-25 01:03:22.000000000 -0600
-+++ wxGlade-0.6.1/main.py	2007-12-04 09:36:20.000000000 -0600
-@@ -7,7 +7,7 @@
- # THIS PROGRAM COMES WITH NO WARRANTY
- 
- import wxversion
--wxversion.ensureMinimal("2.6")
-+wxversion.select("2.8")
- 
- #from wxPython.wx import *
- import wx
diff --git a/dev-util/wxglade/metadata.xml b/dev-util/wxglade/metadata.xml
deleted file mode 100644
index a2cf0a120bb2..000000000000
--- a/dev-util/wxglade/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>wxwidgets@gentoo.org</email>
-		<name>Gentoo wxWidgets Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">wxglade</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/wxglade/wxglade-0.8.2-r1.ebuild b/dev-util/wxglade/wxglade-0.8.2-r1.ebuild
deleted file mode 100644
index f3625d5a09d5..000000000000
--- a/dev-util/wxglade/wxglade-0.8.2-r1.ebuild
+++ /dev/null
@@ -1,55 +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 eutils python-single-r1
-
-MY_P="wxGlade-${PV}"
-
-DESCRIPTION="Glade-like GUI designer which can generate Python, Perl, C++ or XRC code"
-HOMEPAGE="http://wxglade.sourceforge.net/"
-SRC_URI="mirror://sourceforge/wxglade/${MY_P}.zip"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86"
-
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/wxpython:3.0[${PYTHON_MULTI_USEDEP}]
-	')
-"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-"
-
-RESTRICT="test" #656934
-
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
-	python_fix_shebang wxglade.py
-}
-
-src_install() {
-	einstalldocs
-
-	# Install a bigger icon
-	newicon docs_old/html/mondrian_200x200.png ${PN}.png
-
-	dodoc -r docs
-	rm -r docs docs_old || die
-
-	python_moduleinto /usr/lib/wxglade
-	python_domodule .
-	dosym ../../share/doc/${PF}/docs /usr/lib/wxglade/docs
-	fperms 775 /usr/lib/wxglade/wxglade.py
-	dosym ../lib/wxglade/wxglade.py /usr/bin/wxglade
-
-	make_desktop_entry wxglade wxGlade wxglade "Development;GUIDesigner"
-}
diff --git a/dev-util/xdelta/Manifest b/dev-util/xdelta/Manifest
index 32eca5e926cc..ba92aa82b127 100644
--- a/dev-util/xdelta/Manifest
+++ b/dev-util/xdelta/Manifest
@@ -5,6 +5,6 @@ DIST xdelta-1.1.4.tar.gz 423529 BLAKE2B b565f82ba0504118b74127096939e5699ea312be
 DIST xdelta3-3.0.11.tar.gz 683605 BLAKE2B bc33c9d6a3bb21bc52d72bba54f5e2b1058ea8d7cd7474aaf6dbdc27e165e0fbea644c584402f5bbc8ace7cd6a3aefae18588a659418f93eb041168545363bf4 SHA512 41c48e28f92ad50a737cf0acac150fe17d1132e9a652c482d751c8c4e745c6922d576a183eeabae343a1a238ed8c53353e537977628c86eb599ab3d1c01e7c52
 DIST xdelta3-3.1.0.tar.gz 727607 BLAKE2B 1dd7846dad0414071a8af172fc3b73a0321fc9c841786563fe92ebe5c53d80d3eb07cc553cb5a9813432d9df5aae51d5b4a4c32a8c06a34dace5868297b5a68b SHA512 848c90a28018ec3c541ec43be59ea90328142c4705d3b59907fd89e8f6ac2758e288b1a1112fea601884c50ef7f6cf2c1634f539a76bea65a2741d3bb0e9b990
 EBUILD xdelta-1.1.4-r3.ebuild 826 BLAKE2B f343b7544101220c0b46001ee153aa46dffcd80d6277fc987864b5cc9d421a3aa4cf24bfe2539e0f885ea04c83f6ac14930e6bcaa60eebb5e72f9326dfc8b1c7 SHA512 3b1432ada0657927ca43abfc466de768758bdea5f6673bfe2d038a2b5646f635c65d12b2531f633f5d22b31ff1b20b7a4e2b9dd5fa8a2dccc6c79ec3b22b1633
-EBUILD xdelta-3.0.11.ebuild 839 BLAKE2B d6d4f4d5c9ff3f7d1c59aeab589969a7325eaf1181e3f6576c14dff9632cb26c930e890b7ff8b5e2ccdde018bff17577de30415a020f6677b49b77256e254115 SHA512 a5b275381ef15e9907052214debb03900ede767a8b14130d9028a8376902ae21ffe7919af64544fbf20478873feedd976c67f2939ea542f8a562aa8008e3893b
-EBUILD xdelta-3.1.0.ebuild 1146 BLAKE2B 214a9cd0019516af48e204567cba7d68cd370896622ffbf2e86c518ef3ac66d2900174a6fa34034e9788dafaf8d20816120e594f157470839ef6394c5433c9c3 SHA512 1e767dc1456bb84b68866d511423d916fbf1593a68d3a34ec3c863769f37442390f4a96388848e653997ae8cd81b1e12d81926580dc7fd9ee64728ed3ed7b6ce
+EBUILD xdelta-3.0.11.ebuild 846 BLAKE2B 3ed842f8bebe0f0dcb508ef9877f2f31ce901e610b41384c747349e53038b91daec98ce0385e6b34edc3ccc92a261d817285ce48ca58a00b7b596dc918dc3a6c SHA512 e8f89ad1127af72a50a246998e43c8e04b748e8b0913f02950168d333c6a8458cad83ea05e2a956f32c1d5ffbb67168cdc2566534da855640c93a109e9264025
+EBUILD xdelta-3.1.0.ebuild 1184 BLAKE2B ff6e03acdd7eb903f550d968234cd8fb1c7adde38a60ca651298e0c3b7d284c96186a36ad35aee66dd18e12695cea5e49af4c77c0c4572f6d908e8484bccfd09 SHA512 326963dbcb9a0fc7eae4c6ff3441d96bde3e1f795464ab7174fd735ff372c62ccf296276bc4abdfbbf6daa501c139597213578c2ad33d8b6c98b2c6fc84603de
 MISC metadata.xml 381 BLAKE2B 1e67843f342c5d64a78b0ec5f6b20cb6c091f020be78355e83cc5ab8d53312fa97e025d9f819e73fd0c4fe936d15bf87600835bcf2d9040ba67dc740d270d2cf SHA512 2c439c35f726e18396d3a0f2e923cf2f2d0eb7a9798907fd0f039dddcc9fdbac95d6e89d113fc8a937ceb260c90901e0657ecdea2f0bf423ca9456627b2912d3
diff --git a/dev-util/xdelta/xdelta-3.0.11.ebuild b/dev-util/xdelta/xdelta-3.0.11.ebuild
index 23d1fb802b53..12dd58fbb5c1 100644
--- a/dev-util/xdelta/xdelta-3.0.11.ebuild
+++ b/dev-util/xdelta/xdelta-3.0.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 2002-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/jmacd/xdelta-gpl/releases/download/v${PV}/${MY_P}.ta
 
 LICENSE="GPL-2"
 SLOT="3"
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm64 hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="examples lzma"
 
 RDEPEND="lzma? ( app-arch/xz-utils:= )"
diff --git a/dev-util/xdelta/xdelta-3.1.0.ebuild b/dev-util/xdelta/xdelta-3.1.0.ebuild
index 13da9efc6daa..284a07852787 100644
--- a/dev-util/xdelta/xdelta-3.1.0.ebuild
+++ b/dev-util/xdelta/xdelta-3.1.0.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 2002-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
 
-WANT_AUTOMAKE=1.14
 inherit autotools python-any-r1
 
 MY_P=xdelta3-${PV}
@@ -15,7 +14,7 @@ SRC_URI="https://github.com/jmacd/xdelta-gpl/releases/download/v${PV}/${MY_P}.ta
 
 LICENSE="GPL-2"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="examples test"
 RESTRICT="!test? ( test )"
 
@@ -33,12 +32,13 @@ src_prepare() {
 	eapply_user
 
 	# huh
+	2to3 -w -n --no-diffs testing/*.py || die
 	sed -i -e '/python/s:2.6:2:' testing/xdelta3-regtest.py || die
 	sed -i -e '/python/s:2.7:2:' testing/xdelta3-test.py || die
 
 	# only build tests when required
 	sed -i -e '/xdelta3regtest/s:noinst_P:check_P:' Makefile.am || die
-	eautomake
+	eautoreconf
 }
 
 src_test() {
diff --git a/dev-util/ydiff/Manifest b/dev-util/ydiff/Manifest
index 2e066e69e710..4d059bedf871 100644
--- a/dev-util/ydiff/Manifest
+++ b/dev-util/ydiff/Manifest
@@ -1,3 +1,5 @@
 DIST ydiff-1.1.tar.gz 36357 BLAKE2B 4465c85132bb7c7d58c13dd79903610c74edec3b2b8ab8980918a1bf3a98f2b8387872a0974743503fcaad1e7ecb24c21d312a13d9aabe94780e9d623c35175a SHA512 575b3327edd3b8796f5f150fc7ebde32561e1782582e03e9b63bf9010998913fb8b00a8245d799f6cd5599e286f07f9e97e160f23606323d1a6f6059faa59bc9
+DIST ydiff-1.2.tar.gz 42808 BLAKE2B 927482c2ed9a96efc354178679b4ba50497289bc31107e8cdef3062a71d91268fa703620f1f4b0be03aebaf339eba5254f4b43c16403f1d7818b84b0c450defb SHA512 0eb2230b64f43e20f6dc2411296389dc99356ef626152dc7f234583f70678e64a07b764fd89635479e7ac4aa7e2490db6e76c744369eefef8ab6a5386db1a7b5
 EBUILD ydiff-1.1.ebuild 652 BLAKE2B 64b7eb0fa137e38a02ff45de004eded3d9b07863d546b992a7f7e80fdee29b7ea3c82842e4183752012e64811369c3d8d54927f0fb72dd24106c46d7941edd19 SHA512 c274ee20ef7535608aeacf48704fd40f24d8b53dd398c702f7ab475cefa31d9fa44243b3361cddaa6a9fda4177eee46e1c576d81509ca308d08f05571373430d
+EBUILD ydiff-1.2.ebuild 654 BLAKE2B c5efed318721a50d0e477f7011aadf753e2ab307b26ceeab4feab11ef94699479c2a546324e94171c5d3eddfb728049e422760115d389af45b96aefc5196be82 SHA512 276c9f3ecf1f808d4bd76fafa13a2840e44bccfcc61fbbd7435fd8f34270c570bd4f9310edf2d25ad28ff5827cf0e0bdb0c95fc9ec46ed9657383ffb333948a4
 MISC metadata.xml 369 BLAKE2B e1679b4929852125cc2ce7ec0ede870da64132b820c16865d6fa4e572227c64d699871e07df5588ea46ae67cab3775be9908a76d2d222d75bc2f59ea9269b14a SHA512 798de8606d059795e57d1cfaf513e2587b132e512a8833d422d94e7708473379ddbcee63ec2cf8068653f7c1e02de516f7facb5e5fea59a9dca98698cc3c6d57
diff --git a/dev-util/cdiff/cdiff-1.0.ebuild b/dev-util/ydiff/ydiff-1.2.ebuild
index c31875065720..d3dfb7dd60a0 100644
--- a/dev-util/cdiff/cdiff-1.0.ebuild
+++ b/dev-util/ydiff/ydiff-1.2.ebuild
@@ -1,31 +1,30 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1
 
-DESCRIPTION="Colored, side-by-side diff terminal viewer"
-HOMEPAGE="https://github.com/ymattw/cdiff"
+DESCRIPTION="Colored, side-by-side diff terminal viewer (ex. cdiff)"
+HOMEPAGE="https://github.com/ymattw/ydiff"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	sys-apps/less"
-RDEPEND="${DEPEND}"
+DEPEND="sys-apps/less"
+RDEPEND=""
 
 DOCS=( CHANGES.rst README.rst )
 
 RESTRICT="test"
 
 python_test() {
-	${PYTHON} tests/test_cdiff.py || die "Unit tests failed."
+	${PYTHON} tests/test_ydiff.py || die "Unit tests failed."
 
 	./tests/regression.sh || die "Regression tests failed."
 }
author	V3n3RiX <venerix@redcorelinux.org>	2020-08-25 10:45:55 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-08-25 10:45:55 +0100
commit	3cf7c3ef441822c889356fd1812ebf2944a59851 (patch)
tree	c513fe68548b40365c1c2ebfe35c58ad431cdd77 /dev-util
parent	05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff)