gentoo Easter resync : 12.04.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-04-12 03:41:30 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-04-12 03:41:30 +0100
commit: 623ee73d661e5ed8475cb264511f683407d87365 (patch)
tree: 993eb27c93ec7a2d2d19550300d888fc1fed9e69 /dev-util
parent: ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (diff)
494 files changed, 7201 insertions, 3130 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index ce270b5eb5d5..b7d0b2924c48 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 1c04fdd0396f..c674fbd0a5b3 100644
--- a/dev-util/android-studio/Manifest
+++ b/dev-util/android-studio/Manifest
@@ -1,6 +1,10 @@
 AUX 0001-use-java-home-before-bundled.patch 927 BLAKE2B 4a04243d6c6e3712bffca951225ac8d6019fbacb4d48472cc9e8915eb0e10fd569f6421f5daf541a82e96f494203336a9fa62f2afd14b654add82819d6971b22 SHA512 ab21686432190e47bdd8ad0cb4cb9cd0a6d9e89b7c376b589024fe04eebfc2c0f0d59d8c186921726f6960b896798ee69b147663f56f21501680938b03331832
 DIST android-studio-ide-191.6010548-linux.tar.gz 774544822 BLAKE2B eeeed14c8749015f7a0c9235552c04195f81a30a727adfc48d56d2b39ead6d8b017600be801e19fd8eae25ffd2ccbd081b59d464d7ae6bbf14c0a42dd508087d SHA512 95e7befa684b02c5261244a0568f2180a3fd5cee2abe47309f4d183aae1c97b47c08af3cd228462f7db10f3bdb40c591472e74ffb9d89f08301fc25a04f41507
 DIST android-studio-ide-192.6200805-linux.tar.gz 803889418 BLAKE2B dcbfb2eef299456023a3c21a006b32a203566f1fa3d7ce9eb2e6863bfdc9db9f462b911f7ae96f4ccd62f602b424932365355a0b3a684909116ae87448111a86 SHA512 430b145f0816c06ddbd9583da9d609db52f807412b23d02d2ec3b67d947c2bc669a17c45378f3f0ed42a28108ad90b412878e0fcaa8189ae802a6cac2b19138b
+DIST android-studio-ide-192.6241897-linux.tar.gz 803889879 BLAKE2B 5d2d24de5daa317c53513e2a8985e6998891043b1fe730fadd04c6f8ca9702e8be9f2444d73e47578e4d368951897003170ea7e96c569f038f18b98286478df0 SHA512 7ef878ecbc17f542b2faaf18965a294941424f835c21250ff7fde5e29ddc261b35e5e7391cc50803babdcfc98e25390b806f33d0f7dc0f0bcaf7a94feeeab82e
+DIST android-studio-ide-192.6308749-linux.tar.gz 803133146 BLAKE2B 159192929a0cd526c789d915ad15bcc7f6d92e86f1e09f178548ae1055d3086e31f8fb88ceaff55d514728c755eacc84b2abe3c754542fea9e1f5ea117606df5 SHA512 86ce587c2e997dc623498fcf34060568fe58a26f8d287102fc458d963756ba98a4782709cb45f54e847658f64ad263ae2f59bbe1024a5a20be79be821ba9db00
 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
 MISC metadata.xml 313 BLAKE2B 623366c889e8b0d9c33a56fd3ca96156208db355e1549bbf8040a6839a953a82459b3c87e5a0f16f1d67ede403ee5a9e1747c445e855434f25d0f03fe5a6c43a SHA512 1c3e18bd57e48e7f65791f8904bcdde910f1d97d83e781c7c3815df6127aaac9063614e0a11cf7762059f762c4696e2b89ca446ffb9e631a2c85ff2b350e972a
diff --git a/dev-util/android-studio/android-studio-3.6.1.0.192.6241897.ebuild b/dev-util/android-studio/android-studio-3.6.1.0.192.6241897.ebuild
new file mode 100644
index 000000000000..e9812c3699a7
--- /dev/null
+++ b/dev-util/android-studio/android-studio-3.6.1.0.192.6241897.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-studio/android-studio-3.6.2.0.192.6308749.ebuild b/dev-util/android-studio/android-studio-3.6.2.0.192.6308749.ebuild
new file mode 100644
index 000000000000..e9812c3699a7
--- /dev/null
+++ b/dev-util/android-studio/android-studio-3.6.2.0.192.6308749.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/apitrace/Manifest b/dev-util/apitrace/Manifest
index 2cf250515b67..04f9987d3de5 100644
--- a/dev-util/apitrace/Manifest
+++ b/dev-util/apitrace/Manifest
@@ -1,5 +1,5 @@
 AUX apitrace-9.0-brotli-unbundle.patch 4728 BLAKE2B 66ff205968db551cdd8ebc7ba33dfcd39fd36356691722f593f7ce0fa615279c0e440077b3e29c5a643bf5be8a2406a656bfa91fb9f128c2afa922b3ad832a35 SHA512 0690f8d178fd7a5ca11b26d1e23c9c26e984214cef2e3619a22fc6cf58a7ee96fe0b046dd038c202cd6f60b9175dbdd346813c53ca85932f9a4d9dd40e9bdba1
 AUX apitrace-9.0-disable-multiarch.patch 1796 BLAKE2B c687c87b23f3711bd9ac70a345e7e2fbe7dab36f48cbf5a949d7fbeab41ac670054bcee203bf4db8df24cdabc418b7a04980fd1436962a15a8c6371e7d8d0f05 SHA512 5bb89dc98e5bbd92b707988d301ec50ea57f1562bd9a54fc2dada9b5ddafde5da66dd02d03efc377cbcf2bdc7d430f0b1353ed7a7f2d8703aabfeb9b563c1278
 DIST apitrace-9.0.tar.gz 3623693 BLAKE2B 885cfd22d1cc82e36f7f0d65b816784986a8a693d04b483c059d3cffb0328c2cbbfd043793b964cea84d7b09a0dc8dda5f464099e91df26fd5eecef4bbeb28cc SHA512 4234bc2d14378b1bd9554752d83f8ce0703b4e08c3edc85769dc988a2b3a44b8e55d2f5856954658155a11d69802849bae6350ed5031a5916c7ac7bc7287918c
-EBUILD apitrace-9.0.ebuild 2168 BLAKE2B 7e72e7306c94d2f81306fec1ba34f364507a583f6729bf3d445a0e0177045a5adefcf4282803708ec1cf06d253b65232b09046391c83a152f3212b0b8e7c8e1a SHA512 4a60edf54c6d6d1749d3c3a0c60ecc90045e4a1da3918b6eb0563afc7dea3c28d6d72e5101211042dfbbdf1edf986e75e0e1cac7ba8b932a944f74651fb16f43
+EBUILD apitrace-9.0-r1.ebuild 2178 BLAKE2B 99dbe5133be5108832cd8ea8b7445dc4f819706c06a943bad3fde0471c6bb799b44e9b191516378c7dfc9623cf4a565d26c01a291ea6f113013745a0e93066f8 SHA512 caa803d62d9472dd708816ca722b4aa741577a10b5465b0eb812cc2eaf0700b8c13a98e5d732497ce30a0849b02a1124cc131fb6c1b02bb54d02148cb8a539b3
 MISC metadata.xml 249 BLAKE2B eb5bf02945b5d031a07adba28359ab63035d1ce8601c8dc1d9c6aea54de6a55899672c4606b472a308e61a4b8a45d2f752d4472d7b45bb368fccec9c4c3fc739 SHA512 7230e2d97a0540aed68eb2d1f8383c4e5df9b0c09a628db997fea6224615f76744537e5476a7c1984934d27b9ee05d53b0294d00234b2d16cbc722f822a27f21
diff --git a/dev-util/apitrace/apitrace-9.0.ebuild b/dev-util/apitrace/apitrace-9.0-r1.ebuild
index 8c100383021a..76c3219d1c3e 100644
--- a/dev-util/apitrace/apitrace-9.0.ebuild
+++ b/dev-util/apitrace/apitrace-9.0-r1.ebuild
@@ -29,9 +29,9 @@ DEPEND="${PYTHON_DEPS}
 	x11-libs/libX11
 	qt5? (
 		dev-qt/qtcore:5
-		dev-qt/qtgui:5[-gles2]
+		dev-qt/qtgui:5[-gles2-only]
 		dev-qt/qtnetwork:5
-		dev-qt/qtwidgets:5[-gles2]
+		dev-qt/qtwidgets:5[-gles2-only]
 	)
 "
 RDEPEND="${DEPEND}"
diff --git a/dev-util/aruba/Manifest b/dev-util/aruba/Manifest
index 37aab4782165..1053b329c3b8 100644
--- a/dev-util/aruba/Manifest
+++ b/dev-util/aruba/Manifest
@@ -4,6 +4,6 @@ DIST aruba-0.6.2.gem 75776 BLAKE2B 569af009cc20b644878fda25b5e7f79bd2f7c6f5fa9ef
 DIST aruba-0.8.1.gem 121344 BLAKE2B 0b601a4d4bcd19159bb23b22b7975d1275ed2ab9c06e9ab550e11a151e953eba9ec4cc05280e69685a54b82996b4863b485a74f91d64270cc058f43272f6df6d SHA512 9d65778828ac1915c56862acb1db0faf6214b102eb892317b390f451aab55750067519fb6cf6e08c55f58b865eaaa78921402d745addf2d3b0038527eb5d898f
 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 1000 BLAKE2B c75db780d1ab04f28581e01619f81674576663b76900df3c6e4e9655fda80bacc35d640b20998e7f9682d3f215a8372dd99bb20e21a06c702e4814c9cd9ddd06 SHA512 53f61c000e95cf2adcc59038810bf3feefd784bf71eb7f18198b883a866076068f5d8fdaee3e9421add266acde7841c8f30947b32902dd13e44488e12a4ad0ee
-EBUILD aruba-0.8.1.ebuild 1672 BLAKE2B a01b44c435d4594b8f58c5a272c2443c40ff04d20fd186a51421dc4d11dfcb7a1d68ea96191dcf3772c8247635e4ee296101cdbc26e441d67127509574dfc827 SHA512 411dfa207e15afc3bf6d32a0bfd02c0cf2c2f1a054cedb90c768e0435890d590e5723d810884405e69697df84394a7a545bc8bc4628ac4f8ec3046d0bc99433f
+EBUILD aruba-0.6.2-r2.ebuild 994 BLAKE2B cf032592cf6b490a05587c74c15f1f1fe5f6d549cf6b17e4f0ec6153a528e7cc8472af57d44773bd4e82885391ee96aef4843c3543d4baeb15437b3dea4dd83b SHA512 97d040c90e2db2b79d725c94f73ab9c3d0884e0eddb372a47407133109401e5931ed6b153510a41f35e7cc9dcfb75e6287293de2e2eebf22dbbb5ff025165d63
+EBUILD aruba-0.8.1.ebuild 1662 BLAKE2B 343d4a5bba75f4b2f13e95486d1acace2be65ac851b24b5a7dddb102ee8c56a1d3239dd9a0ee31a430d14adf098569b5fa959636c0ed628fa009ef0ede05b8b5 SHA512 8dc0ed9d126dcf912612c5b54b8c56a9b94bfdbe51e3162a9071c68f6e2b6a1b576692ef1ba9f9381f967feda9c5c757922e25953f1013728dd5b30294ec4c5b
 MISC metadata.xml 296 BLAKE2B 5d13c2f0fdb1a3a5e8278e93124af9b7f8e069ccca8ac9327132e8aea862aaee163d778260bd0ba6cd0d6488372b04b4330cc2838447fe2d075ec5fdcb28cadc SHA512 6add4a1a905857c1d96e347089fa8f47643f990a153f6457c4d424978bcf76b89607c89f60d3e312365525b1d0dbd17db62b4baf48ee3da9a0f2ab77435d68b4
diff --git a/dev-util/aruba/aruba-0.6.2-r2.ebuild b/dev-util/aruba/aruba-0.6.2-r2.ebuild
index 590c05a71b0a..d7adcdce378d 100644
--- a/dev-util/aruba/aruba-0.6.2-r2.ebuild
+++ b/dev-util/aruba/aruba-0.6.2-r2.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="Cucumber steps for driving out command line applications"
 HOMEPAGE="https://github.com/cucumber/aruba"
 LICENSE="MIT"
 
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="amd64 arm ~arm64 hppa ~ia64 ppc ppc64 s390 sparc x86"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-util/aruba/aruba-0.8.1.ebuild b/dev-util/aruba/aruba-0.8.1.ebuild
index 389a430d1663..0c9d1822ade5 100644
--- a/dev-util/aruba/aruba-0.8.1.ebuild
+++ b/dev-util/aruba/aruba-0.8.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby23 ruby24"
+USE_RUBY="ruby24 ruby25"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_RECIPE_TEST="cucumber"
@@ -16,7 +16,7 @@ DESCRIPTION="Cucumber steps for driving out command line applications"
 HOMEPAGE="https://github.com/cucumber/aruba"
 LICENSE="MIT"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-util/bats/Manifest b/dev-util/bats/Manifest
index f4b740c562d3..2f39e1ca2f7f 100644
--- a/dev-util/bats/Manifest
+++ b/dev-util/bats/Manifest
@@ -1,5 +1,5 @@
 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
 EBUILD bats-0.4.0.ebuild 485 BLAKE2B ef5b83cc2119b9fc9d96b3a3e7bc465fa8ba6d73892a7d63f6f7de531f96c489e3f7692ac0142ba9dabd0f2871004de956032a8809453434fc1f5d26b67dc920 SHA512 48856743881d5bec9e275531d2d50897e3d31401d5f4e189a7f9b62f8fde45b108791f50ae4f6c9a9e3f129cad83c391ba220bd359527e1851ab6a97664e43ef
-EBUILD bats-0.4.0_p20170219.ebuild 665 BLAKE2B 825fa4c5da43585551664b7633cef29a75c1c02ee0c804c5bd3a1791f655b0028d64b55c1e300bab6657f956250ef0fdbcdff97dbfcf69182c888d80d1c01dca SHA512 f349a761be563e5b14e6592ffb4710a9e5e38935c3cd4170494149002bd560fd1be4b8b7eaf87b4823f57f5c6fb39557c2b5148ff6e5912db0c06ce678283fad
+EBUILD bats-0.4.0_p20170219.ebuild 659 BLAKE2B 0944a49ce57ad39b193d05750e32a9bae8f8b8e2e7c9ffd9750b8a8650049a16932b3876ae174d5c2049d3a58c749583b82335d7097c4bb9d56bc425307a8d30 SHA512 f625785af87a23e9431d4f126ff847804c412f2cd20b88aaa31f10b9486d39375f07de312bc142f22ed07e537af36e64b65562eafb11d2aaa18b36bae2bb021e
 MISC metadata.xml 896 BLAKE2B bde071263574d67573e1ff65d1be19ce34a7a91ba8fea97300a296ed163e08ff7693d126cab84109a3669683ce8a4880b0b7d64ff2827d8bce9b3c6ad89c7945 SHA512 da70a0d89d4b892128e2ce7544d2a1db3b11fbd47c17aca53b220af2d3f46c77e99abb02fdfb814bc5010f2a54cd91841ed60b894b3655d0b910b303fa75a482
diff --git a/dev-util/bats/bats-0.4.0_p20170219.ebuild b/dev-util/bats/bats-0.4.0_p20170219.ebuild
index 4851fa2b7d39..bc519b1c1a97 100644
--- a/dev-util/bats/bats-0.4.0_p20170219.ebuild
+++ b/dev-util/bats/bats-0.4.0_p20170219.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sstephenson/bats/archive/${COMMITHASH}.tar.gz -> ${P
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ppc64 x86"
 
 S="${WORKDIR}/bats-${COMMITHASH}"
 
diff --git a/dev-util/bazel/Manifest b/dev-util/bazel/Manifest
index 5e4b80e4ec2f..c6972bc04207 100644
--- a/dev-util/bazel/Manifest
+++ b/dev-util/bazel/Manifest
@@ -2,16 +2,19 @@ DIST bazel-0.22.0-dist.zip 88633015 BLAKE2B 7cb7ef53c9acb4089b92d82679ad82739fd3
 DIST bazel-0.24.1-dist.zip 174691842 BLAKE2B 56d42421ac6f5513f019f3b71ca0c5e7b499c199dd8d9f22ca4fdca832527a1974afffccd6bff6b1d29dc3156ee28ba7f91a9a37f2f8524da5c5f30645be97aa SHA512 a78c871eb517ec53a0d1d9592887288fa54e5e9f44b0b7dba44792a74a1ba0c98e38ff2f6094ab6e8b3add3ec4a0188de3b2489d94d419373e210d16db641774
 DIST bazel-0.27.2-dist.zip 247948037 BLAKE2B ee3dafbb104f434080ad803cb40585e36a8c816eddac3d1a680752dd4ac65d588f1d5f4bb759dad0f59e9f6d7aad0ea5b54cd050d75a5434ee6ef079d8127641 SHA512 5fd7c2af2123424d3e5e4c9216de10d12ce604798f4831800c8d68cfd9bcf1133f4db9a947f0ee16db1a1513be17340ab8e36fba994a016d98c74ad5e026b4ab
 DIST bazel-0.29.1-dist.zip 265744999 BLAKE2B 8495ab96947b02ec827cc2b5f542454e0d631eb077514c740d8be813495644f0be1020e706e2dbd321fa6f39af3060c4a7b2e68499201eaffc197704c1ecf760 SHA512 4da49e3f1ba681003afc2536d55954ed5a2c29de4a68e5a07f2627f3573d97bd6e244bc8a4f43c8951ecddd221041d87270ca9b7dd59ab16676306c9716f003d
+DIST bazel-0.29.1-rename-gettid-functions.patch 3303 BLAKE2B 75aaed0b8e5fe33910d1b428ad421bbf37cafdc38dc46cbe9d9fe516e957f1dc3a30333c40a6ec3e61580ca908189a8821937ddd28aa9cf119ae237d63c576fb SHA512 0d4dc5c5931ff3a16bb9ac228ec560fc0115444a3d3787f12866e11e8b3833ee8a26cc65c97aa9898c1f7a6c380820d62544d2ed7bed0d6f21aa4293e244eb04
 DIST bazel-1.0.1-dist.zip 267211562 BLAKE2B ade5fcc2a799df4da24ce23a3f2f23d3f38aeec832ef2504a1a8ca7f23acafe3d5b5d94302f101ddadb366d7144624559c96c1c343fa465a976ca2c9b258c083 SHA512 94d81697d2f181659c2d386de23dae2655c4131633f8ce6d10c60373222756e8c0330ed3fe5ed20f81a8648bcb3acfc8b4762e96eb7950b58a4a5c94c715159f
 DIST bazel-1.2.0-dist.zip 267514282 BLAKE2B 1c4f9dcf2c18e6880d701dab3de2e880e55278216ba051f9ad753b9f8c539e5734346bcb20c706307b677f97736587ee11e3c3accabe4c82ac1a82a0cdafcd36 SHA512 eaa3e27d0ddd6102fea4fcdf5f4379355954ba25cd2f4b3530071d077411f8a501041d8fda9ac90325244296f31072faaebd91cf6338893752b25212822a6be9
 DIST bazel-1.2.0-rename-gettid-functions.patch 3303 BLAKE2B 75aaed0b8e5fe33910d1b428ad421bbf37cafdc38dc46cbe9d9fe516e957f1dc3a30333c40a6ec3e61580ca908189a8821937ddd28aa9cf119ae237d63c576fb SHA512 0d4dc5c5931ff3a16bb9ac228ec560fc0115444a3d3787f12866e11e8b3833ee8a26cc65c97aa9898c1f7a6c380820d62544d2ed7bed0d6f21aa4293e244eb04
 DIST bazel-1.2.1-dist.zip 267514406 BLAKE2B f9d316ac096f503a2c7fe101b103b88e7f0247f767a8dc28eb8c9d2cd0b6df6fa785f3b187e1a3963e2f9f0ae742a3330e5104e7a8aea75cb9b9e100366a5aca SHA512 bc0e6526bfbb8725a4f2ae95fc88b22229301b64559325fca3bcf5a9bc642cec2b2284eb9a6ce0699f1f910378b89ee23657dbea7928a92cc1900f1f2f405ff3
+DIST bazel-2.0.0-dist.zip 259625808 BLAKE2B 31b62fb3da1f6fc7efc4c3f44521e12f879a1e5b532fe814d8f49c01c511b34cd65df252d6d143fdcd96f72dc94d76249f79be50fc66a459132c030ef0182ca8 SHA512 db609e9d0ee0cdbfb999de850db17907af02dc26e605f4617dfeb2fbac5c30c4c0a9f48c6ba3673ffe8babb5b9e157cc51c32832015b85ed279b6b160506cdae
 EBUILD bazel-0.22.0.ebuild 2881 BLAKE2B 695d96ecc9d2cb3639f65fa4f78b79d3c4baea2855a0b55b7bc416d4de031f38f7d80c68e774299fcf04fbeac313922783c0608e7b9a4b56a495ab51b7ea0932 SHA512 973714e250185a402177c7c73d17eae5eb44cb9267c0d5029bd9d4d252664e5a528e070ee9c9b325693e36b15ba75b86d702938c6a3292cd3dd8eee3da12b8c4
 EBUILD bazel-0.24.1.ebuild 2881 BLAKE2B 695d96ecc9d2cb3639f65fa4f78b79d3c4baea2855a0b55b7bc416d4de031f38f7d80c68e774299fcf04fbeac313922783c0608e7b9a4b56a495ab51b7ea0932 SHA512 973714e250185a402177c7c73d17eae5eb44cb9267c0d5029bd9d4d252664e5a528e070ee9c9b325693e36b15ba75b86d702938c6a3292cd3dd8eee3da12b8c4
 EBUILD bazel-0.27.2.ebuild 2608 BLAKE2B ceed3c5831778697f11113f5932c9f9cc6a169d16319707ffb57863aed8478e14e0b6fc4481e8b9a4bfb649b259f0556d75d1dd34687202a9488611cf826490d SHA512 07c7ab384e5630f272b373deefc291c75cae01263a1b98e0cca0c323f282370824aa5042474d91b7b319446ee195f321a9f8531918e268a64d0959a993e6723d
-EBUILD bazel-0.29.1.ebuild 2608 BLAKE2B ceed3c5831778697f11113f5932c9f9cc6a169d16319707ffb57863aed8478e14e0b6fc4481e8b9a4bfb649b259f0556d75d1dd34687202a9488611cf826490d SHA512 07c7ab384e5630f272b373deefc291c75cae01263a1b98e0cca0c323f282370824aa5042474d91b7b319446ee195f321a9f8531918e268a64d0959a993e6723d
+EBUILD bazel-0.29.1.ebuild 2930 BLAKE2B 8380d00dc6aafa15000242d8ef72c443bea78035e4d7efb195b541e300e80f75b34a9a097bb2b0de7ae3782e6c366e9c3db5d4e56fcbb0f57e952313954add13 SHA512 959645b7d311216b2765c5f76b5d98882c341f92d95f6aafb576ece30fba83cbcf9ad76212cffbcf3014e8c242f6e6cfd6196f2fb7e64592f0d7328c10b66ff2
 EBUILD bazel-1.0.1.ebuild 2609 BLAKE2B fcbe18a014bbf3895bdb52600b84df9c644cd33f0ff7fcd9c92ecf026bd0d36a8168d9da135c51467939add01ba6c0f4b661509721a863100d2d46e87e04e279 SHA512 4d13e0dc6a26aec266de20b3fc6310713fd3c232c6e89364a5fd607f3d15f37b4bb6d9dc402a23030942c71c0df0a243799d1dc82e7d3dc841ba1af9f104d37a
 EBUILD bazel-1.2.0-r1.ebuild 2931 BLAKE2B ea152126f1c20d98aaeaa185b66c2894e3cd8297dcfc27015cd62fcbd6c1d6e8665680fa531cab41236cddfdf00b190720ef2253f911696fd6e454f2d8fd0e17 SHA512 49a264dffcad16187685fce79693b8e87a210245b54979990019f86112da1d4db85428ddfccf657d7e1d06d13b16321b6d1e998990a241cf9725bc0ec6ddd410
 EBUILD bazel-1.2.0.ebuild 2609 BLAKE2B fcbe18a014bbf3895bdb52600b84df9c644cd33f0ff7fcd9c92ecf026bd0d36a8168d9da135c51467939add01ba6c0f4b661509721a863100d2d46e87e04e279 SHA512 4d13e0dc6a26aec266de20b3fc6310713fd3c232c6e89364a5fd607f3d15f37b4bb6d9dc402a23030942c71c0df0a243799d1dc82e7d3dc841ba1af9f104d37a
-EBUILD bazel-1.2.1.ebuild 2938 BLAKE2B 608e27e1f2c857a0ff91fb5401d5e7a9a8ff1b97113cbe002a8b054be2637cf2b406b8e446afbc222ea83595fe42f69d44d3cf048409950716259b2cc00d1721 SHA512 c8fe75b8af817f312b0e472920a5b3ba8f0b2e0e8de5a821c2fb6ffdc4b06de9e9ff8254d2c6204fa00a89b489152107085a7c69da3a3881139ad6282ee58c98
+EBUILD bazel-1.2.1.ebuild 2937 BLAKE2B 5371d6b42699c1ba2a33dc9e43d85fb17f02b243da718ff2c0825ca661743f24a8fcf359d0bf3b94f3e47dfd71304226a695de81250effe8629675ea277f60e6 SHA512 8c1f625d496ae7815edce1e1920e01228203183796e72de9973fdd3d84e6be2583f0d0b85bac00163592e1532241a97c89e7218312f8b33bce686930bf30ca0d
+EBUILD bazel-2.0.0.ebuild 2609 BLAKE2B 51ea0ad4c8d1b5e7749f8a8717668a28f534595c4825a53a481973b9163128fd2b7b401528a8413b6e14364ea0823551d87e56d8af3db89efb0e606182d6fec2 SHA512 9c419f99adf78aa95199ba3cdca46f5ba8688dc201f04b47a7d3d097ba28ab062ef97c7912e2eb798a06e650bb90fac3e51d174f771f7253d9ccf7c84493e0f6
 MISC metadata.xml 784 BLAKE2B 387004423ccbcb3b2e94cc7824e7a43067f5e455151ad3eaa06baded58ce05ef71203caf8d5a9d89c00046ac0545776bcc6c5a8306a9f76f8a9334b95a92b880 SHA512 188f8323fd19d294e8772391edb87b4a28827b40c42643d6af389f4b3e2d36bc3f0efe637cf572d80dd47a956bd2e51be1993aaf7d080bbfbb6ec4aac2e51ac6
diff --git a/dev-util/bazel/bazel-0.29.1.ebuild b/dev-util/bazel/bazel-0.29.1.ebuild
index 89f679420550..2adb3ad66192 100644
--- a/dev-util/bazel/bazel-0.29.1.ebuild
+++ b/dev-util/bazel/bazel-0.29.1.ebuild
@@ -8,7 +8,9 @@ inherit bash-completion-r1 java-pkg-2 multiprocessing
 DESCRIPTION="Fast and correct automated build system"
 HOMEPAGE="https://bazel.build/"
 
-SRC_URI="https://github.com/bazelbuild/bazel/releases/download/${PV}/${P}-dist.zip"
+GLIBC_GETTID_PATCH="${P}-rename-gettid-functions.patch"
+SRC_URI="https://github.com/bazelbuild/bazel/releases/download/${PV}/${P}-dist.zip
+	https://raw.githubusercontent.com/clearlinux-pkgs/bazel/adefd9046582cb52f39579033132e6265ef6ddb0/rename-gettid-functions.patch -> ${GLIBC_GETTID_PATCH}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -51,6 +53,9 @@ pkg_setup() {
 src_unpack() {
 	# Only unpack the main distfile
 	unpack ${P}-dist.zip
+	pushd third_party/grpc/src >/dev/null || die
+	eapply "${DISTDIR}/${GLIBC_GETTID_PATCH}"
+	popd >/dev/null || die
 }
 
 src_prepare() {
diff --git a/dev-util/bazel/bazel-1.2.1.ebuild b/dev-util/bazel/bazel-1.2.1.ebuild
index 1a39ec814877..edeaeed960bf 100644
--- a/dev-util/bazel/bazel-1.2.1.ebuild
+++ b/dev-util/bazel/bazel-1.2.1.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
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/bazelbuild/bazel/releases/download/${PV}/${P}-dist.z
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="examples tools"
 # strip corrupts the bazel binary
 # test fails with network-sandbox: An error occurred during the fetch of repository 'io_bazel_skydoc' (bug 690794)
diff --git a/dev-util/bazel/bazel-2.0.0.ebuild b/dev-util/bazel/bazel-2.0.0.ebuild
new file mode 100644
index 000000000000..8963929994ec
--- /dev/null
+++ b/dev-util/bazel/bazel-2.0.0.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 java-pkg-2 multiprocessing
+
+DESCRIPTION="Fast and correct automated build system"
+HOMEPAGE="https://bazel.build/"
+
+SRC_URI="https://github.com/bazelbuild/bazel/releases/download/${PV}/${P}-dist.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="examples tools"
+# strip corrupts the bazel binary
+# test fails with network-sandbox: An error occurred during the fetch of repository 'io_bazel_skydoc' (bug 690794)
+RESTRICT="strip test"
+RDEPEND=">=virtual/jdk-1.8:*"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	app-arch/zip"
+
+S="${WORKDIR}"
+
+bazel-get-flags() {
+	local i fs=()
+	for i in ${CFLAGS}; do
+		fs+=( "--copt=${i}" "--host_copt=${i}" )
+	done
+	for i in ${CXXFLAGS}; do
+		fs+=( "--cxxopt=${i}" "--host_cxxopt=${i}" )
+	done
+	for i in ${CPPFLAGS}; do
+		fs+=( "--copt=${i}" "--host_copt=${i}" )
+		fs+=( "--cxxopt=${i}" "--host_cxxopt=${i}" )
+	done
+	for i in ${LDFLAGS}; do
+		fs+=( "--linkopt=${i}" "--host_linkopt=${i}" )
+	done
+	echo "${fs[*]}"
+}
+
+pkg_setup() {
+	echo ${PATH} | grep -q ccache && \
+		ewarn "${PN} usually fails to compile with ccache, you have been warned"
+	java-pkg-2_pkg_setup
+}
+
+src_unpack() {
+	# Only unpack the main distfile
+	unpack ${P}-dist.zip
+}
+
+src_prepare() {
+	default
+
+	# F: fopen_wr
+	# S: deny
+	# P: /proc/self/setgroups
+	# A: /proc/self/setgroups
+	# R: /proc/24939/setgroups
+	# C: /usr/lib/systemd/systemd
+	addpredict /proc
+}
+
+src_compile() {
+	export EXTRA_BAZEL_ARGS="--jobs=$(makeopts_jobs) $(bazel-get-flags) --host_javabase=@local_jdk//:jdk"
+	VERBOSE=yes ./compile.sh || die
+
+	./scripts/generate_bash_completion.sh \
+		--bazel=output/bazel \
+		--output=bazel-complete.bash \
+		--prepend=scripts/bazel-complete-header.bash \
+		--prepend=scripts/bazel-complete-template.bash
+}
+
+src_test() {
+	output/bazel test \
+		--verbose_failures \
+		--spawn_strategy=standalone \
+		--genrule_strategy=standalone \
+		--verbose_test_summary \
+		examples/cpp:hello-success_test || die
+	output/bazel shutdown
+}
+
+src_install() {
+	dobin output/bazel
+	newbashcomp bazel-complete.bash ${PN}
+	bashcomp_alias ${PN} ibazel
+	insinto /usr/share/zsh/site-functions
+	doins scripts/zsh_completion/_bazel
+
+	if use examples; then
+		docinto examples
+		dodoc -r examples/*
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	# could really build tools but I don't know which ones
+	# are actually used
+	if use tools; then
+		docinto tools
+		dodoc -r tools/*
+		docompress -x /usr/share/doc/${PF}/tools
+		docompress -x /usr/share/doc/${PF}/tools/build_defs/pkg/testdata
+	fi
+}
diff --git a/dev-util/bcc/Manifest b/dev-util/bcc/Manifest
index e2e9b72cf552..c7b7ef4bf544 100644
--- a/dev-util/bcc/Manifest
+++ b/dev-util/bcc/Manifest
@@ -7,5 +7,5 @@ DIST libbpf-0.0.6.tar.gz 213791 BLAKE2B 9f0a08cc7bae41f7fa93d5ba2f535f76ce47fe69
 DIST libbpf-0.0.7.tar.gz 262068 BLAKE2B e77ff25449274881ddb9d32f25cd6ad8988e4524102bd109049ee6cfce3e2753fd99ebe2a080f809a4c5422dbf6b17633e4b0cea156f289bf95b92f8375a273c SHA512 c2cbc869b7e11339deab3152a6e2d0b3bba25da513d18d77fb0a698cbe61d6bd48175a58e7dd7a3695fbf27faf48b4f517ac5d3a3c66c086df2e5d1b73a2595d
 EBUILD bcc-0.11.0.ebuild 1862 BLAKE2B ed50015774cd375e2bbbf7a5be10ddc53c7864314fbb839027952860e25fafd5bcace7a42936ee316db1e18c13082be994a9b1084d94468f8293b1b780dcb978 SHA512 9701b5a605c19d4fe78ccb68477be41aac1b9fbc9990932e25d28b8e074cc528746893dc7fd70d919366d3b94e83d2b45cf806da94e793b683d07f8611b4d09c
 EBUILD bcc-0.12.0-r1.ebuild 1886 BLAKE2B f3879a2437abbfc99b87ad1a3a5c1b8b600a9e0213be90ee17ecba036b76798529de61b159dd7af7ce56000e071d44923f2707d366383c5f6ed228fb78b10858 SHA512 492110b8a4dd64c30bf8d8f5af5dce183976ee31d3ee5652efe61e7734c779b8a08d9334fdb2c4c0aa4a90df71a5a1d5374677eb9c9566ce534ee760b135caf5
-EBUILD bcc-0.13.0.ebuild 1888 BLAKE2B c43af37e8c32cf9005b377fb38c6818f1aa63abf11431c8b91985ec87a71e4b6672c91b4efbf186a1806c4b61e842953fed81c5905ad3422e3008486d552b3a3 SHA512 355813905e0ec9cbfb901773245aabfa3785d4dc5c5ed4f3a01d89f30a2ea1b166cace609f49c024a31704b75c1f72f037958f251d296aef0c367c8dbb0f1ca4
+EBUILD bcc-0.13.0.ebuild 1925 BLAKE2B 4cf4fcfd74ca4a941be56ec92c003be585b81105dc0986e0a63cdcafbb0a9c22f7803aded42ff0214338312463019f6ba7938775dcd6538afd80d85a92b0d523 SHA512 69e3e78d7f6ead73c007e821f5ea2a6e3f5244cf716703b763427bb49e89f5012ec0327fdf142dee93b6c9091c572985a8cc3738b6b238e19e9ceef0a4a9e0d6
 MISC metadata.xml 386 BLAKE2B 73062e6902dd7d7f9afb988cce26a8aa5a66e1252652ae364f2295b0a5e77013eec682b36ab65c93772843ad0ec8c7187cd29d8308a3ba17dbacd1ef193f03ae SHA512 6529fa57011cd17b9892e1b8f05e063ae6314f85665a30881335efa80e9b9238a7b61d1f732316e45496707bf350d03149e7ec5efdf1a0fee6d5a788b58a7e70
diff --git a/dev-util/bcc/bcc-0.13.0.ebuild b/dev-util/bcc/bcc-0.13.0.ebuild
index 8ff7d3262f47..748cd29f46e9 100644
--- a/dev-util/bcc/bcc-0.13.0.ebuild
+++ b/dev-util/bcc/bcc-0.13.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8} )
 
-inherit cmake-utils linux-info python-single-r1
+inherit cmake-utils linux-info llvm python-single-r1
 
 EGIT_COMMIT="v${PV}"
 LIBBPF_VER="0.0.7"
@@ -27,8 +27,8 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RDEPEND="
 	>=sys-kernel/linux-headers-4.14
 	>=dev-libs/elfutils-0.166:=
-	sys-devel/clang:=
-	>=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)]
+	<sys-devel/clang-10:=
+	<sys-devel/llvm-10:=[llvm_targets_BPF(+)]
 	luajit? ( dev-lang/luajit )
 	${PYTHON_DEPS}
 "
@@ -65,6 +65,7 @@ pkg_pretend() {
 }
 
 pkg_setup() {
+	LLVM_MAX_SLOT=9 llvm_pkg_setup
 	python-single-r1_pkg_setup
 }
 
diff --git a/dev-util/bitcoin-tx/Manifest b/dev-util/bitcoin-tx/Manifest
index 57506c3a98af..65538193ea50 100644
--- a/dev-util/bitcoin-tx/Manifest
+++ b/dev-util/bitcoin-tx/Manifest
@@ -1,11 +1,9 @@
 AUX 0.17.1-no-libevent.patch 1316 BLAKE2B 5f3f0f38394039a45b299e20ff30092d48bda0475de8c9a4c30b99c31837245e08309009aaf94cdf3395929c26d49a9c3b0f0b3e9d99c03761fea48f39923af9 SHA512 6761a62c11390bff223181237c3f61b8dc2992bcc62bdb051ed0cde8044fae285867f0cc3def1b6fd16c9e82e25e61d8fc682dc307ad119767925cc9b65f8342
+AUX 0.19.1-no-libevent.patch 2262 BLAKE2B dc743112a7addd9abd0391cad7fd15d0060cf666c0fe13b6edb0eb065b49cab18099a9c812df560ebb456e57bbab64f65a4e2617fd262fff53e88eca62ec9b53 SHA512 6d8aad17f504b862d5f8f093db6cfa0db294b6f4130fc74116059400ca39833d75454c66b78644713480dfb062484354a1c457dc2e39c9f0ff27b8ccba5539d3
 DIST bitcoin-0.16.3.knots20180918.patches.tar.xz 466344 BLAKE2B c45b96513e4b6317e6a2a55cc3b47302fbe56fb87717ae0197010694013331b5d071b85a11a73c76f08f39e9f0294d3475e89ee63272047df83893de4dbaa390 SHA512 2c3540acc668aeef4b8f01774219736d95395201ddeaccaf70e0bad4a89f05cdd5ffaf630bae0577656efb3580fae92ce0ee4bb1a720ea757ca59e3fd66e1893
-DIST bitcoin-0.17.1.knots20181229.patches.tar.xz 475988 BLAKE2B ce19ccbbeaac48f24b2833858a186494f84cb54ac380c42104f4d16b0a6acb44bc7a83c1b11311e2c566326d7067530ea5f34404def5f22b4825e2fa15aca22d SHA512 da89f9510ee523c712aa137512dda752ab8d115eb8a45a999aa742555621f557694db34162a1f6979922268a3e22563883ea6d9d9a47e5c7613235c0ff06fda0
-DIST bitcoin-0.18.0.knots20190502.patches.tar.xz 400252 BLAKE2B 0303bba89b3595a115ec8e5e743c362fc5feb0072ae493455cf3bcf1085b7f44d6b10142c05cb7ea59fadc630095de3a5f648007eb28f79551f2415db5c4f560 SHA512 b4c30c63cb6c770e04abd18e626db6e095b0d8b5aaf59e64b55eb8e19d4fdb559a3a2b939ab0e09967b4d3465b560e1379fa21b8efb3f25c22f84a2a1c655d16
+DIST bitcoin-0.19.1.knots20200304.patches.tar.xz 399864 BLAKE2B de5591072b62c65c8a0fdcee7a7ed4b74d13614e47b679a05f272207b9ca0a09d476aa8ecb66321f39953a320f4d47f7d2aa62848192d493de02525c3d5abdfa SHA512 3b08023f0788535dc5943e47a595da5637172263ac8c2ad97d42c0707da7468a9843efbf90a2eb6ac99db65e362e99cbe9209ab64785c79de908e20801ba4fe5
 DIST bitcoin-v0.16.3.tar.gz 6658712 BLAKE2B 2c20b32ea30aed264115d1bd336b62fa28de69cbf116385508718efd7ff22537c3bd402c0965e0f6ddd8e79fc8b51f388f52f885847d36207a24523e927ca63e SHA512 2da25f56fe9b1f5a81815c14e70ff1a69ec15f742424e2c24d71303a71d57c8050dea5d5ba57425bbe0a01a3995ad9b30f0beea5dbafd1632a627cd3fd9a984d
-DIST bitcoin-v0.17.1.tar.gz 6224852 BLAKE2B efc86768ee2d23db83496ff9e62bc86d10c4d24a7343f4c706a4d336aeb94087b2d496db53e393beb5a9dc228bb9fe957ca89254c2fdaf9980b03029efbac2f8 SHA512 ef911ac6b49075a4f3d8db7f9f4dc59590d49847006fa36d7b8cce1634945d418accd95b12da505df38314fb7768f544863169d4b26b230e88dd627a83947466
-DIST bitcoin-v0.18.0.tar.gz 6533794 BLAKE2B 0eb7830e215757efb024be7aff73108c4a8e2f80a204ca71f1b3b6015933a1ab740ad006e58c473c4b9609b3e47885ba6564472a3514335ab6d7f99d32903822 SHA512 a2e38754d459fac0786eaa43f23c62ee326167f325d98964546217bcdc4f68ab88314bfb674ca4efd4cbc21fc3950bd029e1375ee101e0c72bbae7197fc31cf2
+DIST bitcoin-v0.19.1.tar.gz 6660702 BLAKE2B 93ed83f663a833f6be40195ddaf62a8ef9fcd86c3f983fe0cf1e75eaf9ae54cdc88fcdfc36d798842f29636dc8037af5b67e82643c90a6c276fa504ed022f863 SHA512 bc1afad7de5b43042d24780b07e3faf73dda69af9ef0c75fa1a32bd25b0b37e315955614ffbb2864fe827b77b63446fd88cae22da3d0706ff73df495a519ba5d
 EBUILD bitcoin-tx-0.16.3.ebuild 2427 BLAKE2B c3410c5a84de81fcafedae1236e339f034938e7adf817a4dcdeed76f7ea64cc2c84e529785732de392bca904b34563cd80bf40f755a7f5f4d8afb92fcd97cc4d SHA512 0b277b10e5fd15866a07e06bb33f6f398b6fbf88fd4159ab50b33947f42e88870b67b9fc3e3375cf16dd15fe3828a550cb30067ca03eafcc9aa93fd1ad2bdccf
-EBUILD bitcoin-tx-0.17.1.ebuild 2470 BLAKE2B 81ea64fa5f95068a0d81b9e589f3672baa4f913e26ae4e03570945dde7ca00b4764be3a3e3d1ced57358f4bf25d59da431af956fc1f4cff8eff475d58ee4af27 SHA512 5f05504d9d68b025ecb0ede47e43af2fb672deaf6b06e1188678a2f15337e5d9438e927cdb6217f311e55ea7a809d0c053e1cf736dbe11cfef4e03d9245a2cca
-EBUILD bitcoin-tx-0.18.0.ebuild 2487 BLAKE2B f2493f52b3828959491dd4cb44be7647eccfee02796c66003bc001578d0274dd807cb759b7ee2f0be963934ff53989a2507f5b945962d74cc402677e20320351 SHA512 928208211ba05e806e4f987046f848dcccf9b4dc396f96354245d23eada6ac578d5c7ca3e6eabbad88e8bdd26b31eb8524ecd3371ed6c17db778b96d74e1bf0a
+EBUILD bitcoin-tx-0.19.1.ebuild 2533 BLAKE2B 88b2dfd6f40edb8e66cd9f92dae8cfb395e21e67cce278694395898079e48a7902f35e3f54d30e0f1fdd729f077da4e5de229f3781fc5e90e6eef7e84c566fc6 SHA512 f9b170301f82cf07436a30bb4ef911af0263c422866dd507673316725084c4f1f4782e8904be2d8d48d564b6bbde27e369a4309eeecddc5744b0864331fb1f54
 MISC metadata.xml 620 BLAKE2B e779b6a929a58fad28773a0aba3ef3112df14ce82ce62376b88cbc3519a857faaac6b580d2b5d866b0ec809062cf170e3c29324b03acc005246aea3cef9a0381 SHA512 c253ed29dff90ef2b9cd19b191ad870bd22cbdd371b2f353e724ba950735350225fe6d83c4ca8823ebb395dde9fb5004e781ff78987e2a30c0281ad5e0a4623a
diff --git a/dev-util/bitcoin-tx/bitcoin-tx-0.17.1.ebuild b/dev-util/bitcoin-tx/bitcoin-tx-0.17.1.ebuild
deleted file mode 100644
index 4346aa025916..000000000000
--- a/dev-util/bitcoin-tx/bitcoin-tx-0.17.1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools bash-completion-r1
-
-BITCOINCORE_COMMITHASH="ef70f9b52b851c7997a9f1a0834714e3eebc1fd8"
-KNOTS_PV="${PV}.knots20181229"
-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.17.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 libressl"
-
-DEPEND="
-	>=dev-libs/boost-1.52.0:=[threads(+)]
-	>=dev-libs/libsecp256k1-0.0.0_pre20151118:=[recovery]
-	>=dev-libs/univalue-1.0.4:=
-	!libressl? ( dev-libs/openssl:0=[-bindist] )
-	libressl? ( dev-libs/libressl:0= )
-"
-RDEPEND="${DEPEND}"
-
-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.17.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/2018/12/25/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
-
-	eapply "${FILESDIR}/${PV}-no-libevent.patch"
-
-	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-bench
-		--without-libs
-		--without-daemon
-		--without-gui
-		--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/bitcoin-tx/bitcoin-tx-0.18.0.ebuild b/dev-util/bitcoin-tx/bitcoin-tx-0.19.1.ebuild
index 9c64bb0e597b..b19f22a49f55 100644
--- a/dev-util/bitcoin-tx/bitcoin-tx-0.18.0.ebuild
+++ b/dev-util/bitcoin-tx/bitcoin-tx-0.19.1.ebuild
@@ -1,19 +1,19 @@
-# Copyright 1999-2019 Gentoo Authors
+# 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="2472733a24a9364e4c6233ccd04166a26a68cc65"
-KNOTS_PV="${PV}.knots20190502"
+BITCOINCORE_COMMITHASH="58ba7c314d552cea8cb024960a8504577aee586f"
+KNOTS_PV="${PV}.knots20200304"
 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.18.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
+	https://bitcoinknots.org/files/0.19.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
 "
 
 LICENSE="MIT"
@@ -23,14 +23,17 @@ IUSE="knots libressl"
 
 DEPEND="
 	>=dev-libs/boost-1.52.0:=[threads(+)]
-	>=dev-libs/libsecp256k1-0.0.0_pre20151118:=[recovery]
+	>dev-libs/libsecp256k1-0.1_pre20170321:=[recovery]
 	>=dev-libs/univalue-1.0.4:=
 	!libressl? ( dev-libs/openssl:0=[-bindist] )
 	libressl? ( dev-libs/libressl:0= )
 "
 RDEPEND="${DEPEND}"
 
-DOCS=( doc/bips.md doc/release-notes.md )
+DOCS=(
+	doc/bips.md
+	doc/release-notes.md
+)
 
 S="${WORKDIR}/bitcoin-${BITCOINCORE_COMMITHASH}"
 
@@ -38,11 +41,11 @@ 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.18.x/${KNOTS_PV}/${KNOTS_P}.desc.html"
+		elog "https://bitcoinknots.org/files/0.19.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/2019/05/02/release-${PV}/"
+		elog "https://bitcoincore.org/en/2020/03/04/release-${PV}/"
 	fi
 }
 
@@ -57,6 +60,8 @@ src_prepare() {
 		eapply "${knots_patchdir}/${KNOTS_P}.ts.patch"
 	fi
 
+	eapply "${FILESDIR}/${PV}-no-libevent.patch"
+
 	eapply_user
 
 	echo '#!/bin/true' >share/genbuild.sh || die
diff --git a/dev-util/bitcoin-tx/files/0.19.1-no-libevent.patch b/dev-util/bitcoin-tx/files/0.19.1-no-libevent.patch
new file mode 100644
index 000000000000..fa29f8bbac97
--- /dev/null
+++ b/dev-util/bitcoin-tx/files/0.19.1-no-libevent.patch
@@ -0,0 +1,47 @@
+diff --git a/configure.ac b/configure.ac
+--- a/configure.ac
++++ b/configure.ac
+@@ -1271,7 +1271,7 @@ if test x$use_pkgconfig = xyes; then
+         BITCOIN_QT_CHECK([PKG_CHECK_MODULES([QR], [libqrencode], [have_qrencode=yes], [have_qrencode=no])])
+       fi
+       if test x$build_bitcoin_cli$build_bitcoind$bitcoin_enable_qt$use_tests != xnononono; then
+-        PKG_CHECK_MODULES([EVENT], [libevent],, [AC_MSG_ERROR(libevent not found.)])
++        PKG_CHECK_MODULES([EVENT], [libevent], [use_libevent=yes], [AC_MSG_ERROR(libevent not found.)])
+         if test x$TARGET_OS != xwindows; then
+           PKG_CHECK_MODULES([EVENT_PTHREADS], [libevent_pthreads],, [AC_MSG_ERROR(libevent_pthreads not found.)])
+         fi
+@@ -1291,7 +1291,7 @@ if test x$use_pkgconfig = xyes; then
+ else
+ 
+   if test x$build_bitcoin_cli$build_bitcoind$bitcoin_enable_qt$use_tests != xnononono; then
+-    AC_CHECK_HEADER([event2/event.h],, AC_MSG_ERROR(libevent headers missing),)
++    AC_CHECK_HEADER([event2/event.h], [use_libevent=yes], AC_MSG_ERROR(libevent headers missing),)
+     AC_CHECK_LIB([event],[main],EVENT_LIBS=-levent,AC_MSG_ERROR(libevent missing))
+     if test x$TARGET_OS != xwindows; then
+       AC_CHECK_LIB([event_pthreads],[main],EVENT_PTHREADS_LIBS=-levent_pthreads,AC_MSG_ERROR(libevent_pthreads missing))
+@@ -1545,6 +1545,7 @@ AM_CONDITIONAL([ENABLE_QT_TESTS],[test x$BUILD_TEST_QT = xyes])
+ AM_CONDITIONAL([ENABLE_BENCH],[test x$use_bench = xyes])
+ AM_CONDITIONAL([USE_QRCODE], [test x$use_qr = xyes])
+ AM_CONDITIONAL([USE_LCOV],[test x$use_lcov = xyes])
++AM_CONDITIONAL([USE_LIBEVENT],[test x$use_libevent = xyes])
+ AM_CONDITIONAL([GLIBC_BACK_COMPAT],[test x$use_glibc_compat = xyes])
+ AM_CONDITIONAL([HARDEN],[test x$use_hardening = xyes])
+ AM_CONDITIONAL([ENABLE_SSE42],[test x$enable_sse42 = xyes])
+diff --git a/src/Makefile.am b/src/Makefile.am
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -523,10 +523,13 @@ libbitcoin_util_a_SOURCES = \
+   util/strencodings.cpp \
+   util/string.cpp \
+   util/time.cpp \
+-  util/url.cpp \
+   util/validation.cpp \
+   $(BITCOIN_CORE_H)
+ 
++if USE_LIBEVENT
++libbitcoin_util_a_SOURCES += util/url.cpp
++endif
++
+ if GLIBC_BACK_COMPAT
+ libbitcoin_util_a_SOURCES += compat/glibc_compat.cpp
+ AM_LDFLAGS += $(COMPAT_LDFLAGS)
diff --git a/dev-util/boost-build/Manifest b/dev-util/boost-build/Manifest
index b0a444b9d162..64316f49f399 100644
--- a/dev-util/boost-build/Manifest
+++ b/dev-util/boost-build/Manifest
@@ -6,5 +6,5 @@ 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 site-config.jam 688 BLAKE2B e43a7ad1a94d113a7f890e8b634770f5c60556101d428d83f655bbbe72c46b587485886a9941d05a2ae4319fc325f1e0ecfb9b660158b81c5e9fd02e0b1c0530 SHA512 b65bf1be3133f9f66d3139b00f195a288591bb20a13ba35041507c2c33d7d2da6047c3b02dc27bc4eb21798b91e1262a60e294b7fd4af90808b9de0f5af517df
 DIST boost_1_72_0.tar.bz2 106907358 BLAKE2B ab270a0e3cb24da687d86785e2d2e6d7731b4dbc07bd839eadb642dfa5a428ad584acb1f3529661a8de9a986008ff3427491041059ea2b742348d02e00761cd8 SHA512 63bbd1743e7c904b2e69fdc2eafd1c2a8a30fd70d960dcd366059d0100f000cb605d56cbd9397bb18421631f1c9552a772c434d0f0caddbe56302273f51fd1f6
-EBUILD boost-build-1.72.0.ebuild 1993 BLAKE2B 0926bf663d53d487a8a7ee4c5e125053045886f6452a6e865a0b2d0d7ba3cc8075e81c566054b2a169e3ce248b796e22c3d224d80eb26bcf1ea667aaadd30032 SHA512 70c4a1f089aa9d6b6404412a78d2d69dc07756848391ada3ee0c2246fc590ec4a83c23ac94c3a6af7542cd65c39c1bd69e048b3fb60ff4b2eb91b68679c85798
+EBUILD boost-build-1.72.0.ebuild 1997 BLAKE2B 3324ba02b442f04e3a5d46c42aeff5c860670797397f6d854590d7d63333e2feb9bf45b7a6ef8e36a520fcea8fd90f72123a13383cde2e61183577e76e44531a SHA512 3d5202a851bfccda98c8c72a080fc2e140b242640364dbdccba448de4a0cc0945a7b1d3ffc568e09e44eac1157168b0c36d9559bd1f8e561b369f71a3d79d72e
 MISC metadata.xml 329 BLAKE2B f492b1ba64c3f7bce1d3fb304bcff93357cc069dfd06b69c25cf26f4423ebea51ac4614a8d865635568f0e9db424a6904fc1edd5fa729243838e16e9887f4202 SHA512 57baf2d8e0a4c240d99f68ce122086a147d42145687b712609fdcd73b77fe3fdfecc1b078edb6a9c922213482fcc17c2fccb6762ec69890fbc9a912c4cb34827
diff --git a/dev-util/boost-build/boost-build-1.72.0.ebuild b/dev-util/boost-build/boost-build-1.72.0.ebuild
index 7a5ceed1897a..b06584c1dc8d 100644
--- a/dev-util/boost-build/boost-build-1.72.0.ebuild
+++ b/dev-util/boost-build/boost-build-1.72.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://dl.bintray.com/boostorg/release/${PV}/source/boost_${MY_PV}.tar
 
 LICENSE="Boost-1.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples"
 RESTRICT="test"
 
diff --git a/dev-util/bpftrace/Manifest b/dev-util/bpftrace/Manifest
index aee6ce21555a..ded215c8ba13 100644
--- a/dev-util/bpftrace/Manifest
+++ b/dev-util/bpftrace/Manifest
@@ -1,12 +1,13 @@
 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-mandir.patch 906 BLAKE2B d875e2523b7e719624d92c58a8f058cdd597da07bf6472d2e3dc05eb46be64718ed4056e15a93e4c22264fa35ceb6b79b428febade422ba435a2a2b9e17fb707 SHA512 11544e9e5892ae3657ff903fa2780e71223e380322b4059ddcea4a6edd80c5a7ab8d45188eb577127f64a6705a6ae41d53f3ba7e05bf450853b12a9ba3d84904
 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
 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 1443 BLAKE2B bb82e30e721881ee3b9a73a80fbfada3c408f028a2ecdd44b467ad0bdd20386a36aaa57139b43a3111d8f7075dc5e83bc670c6acb7dbf79ca36e75b724861002 SHA512 6bf0353079eb2451301334942cfccfa89c866677ca7771fa6a2c191e3b758e0688e449cace67487fa8efb784669c65d6fdea7889f0a141b5d414b5d5bb55caeb
+EBUILD bpftrace-0.9.4.ebuild 1487 BLAKE2B 1003d7865410fb246ac9aa58adafa018e3979a331543dffd7fdce772517875043f6602d7d2856aecf7eb76094d7bf6531f9cbd5e3f296c98f8e0e55178c069b7 SHA512 e122a7c9ab7db361447eb3a7ce79b416ede14b0eebe5ea0b507344fd4203f9e0cf9c9375f526494c4ec1f5c4bafc3153a97dc6bc8554001aac3e609f0f7b233e
 EBUILD bpftrace-9999.ebuild 1339 BLAKE2B 89932b8689799d37f5730662705d644059796e27abbb187e57f741450dbf1034d5322f3e94a4a493f0341f939fcc3902e3173d8b2357c70695c3f3dd957d7db5 SHA512 b7df8cb8af0c74599fb87a32ff1efff499e3559682c72fea78ea5d53e9513f0738fff86acbc91c54b21e3b20ba0e0ccea8f559e7d80f359e45e8448a7fa94000
 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.9.4.ebuild
index 0afc8a9890fa..ad25d1221e13 100644
--- a/dev-util/bpftrace/bpftrace-0.9.4.ebuild
+++ b/dev-util/bpftrace/bpftrace-0.9.4.ebuild
@@ -40,6 +40,7 @@ S="${WORKDIR}/${PN}-${MY_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"
 )
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
new file mode 100644
index 000000000000..c2131cbbc306
--- /dev/null
+++ b/dev-util/bpftrace/files/bpftrace-0.9.4-llvm-10.patch
@@ -0,0 +1,144 @@
+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/bsdiff/Manifest b/dev-util/bsdiff/Manifest
index 06a64fb9b372..2125e1dfef11 100644
--- a/dev-util/bsdiff/Manifest
+++ b/dev-util/bsdiff/Manifest
@@ -1,3 +1,4 @@
+AUX bsdiff-4.3-CVE-2014-9862.patch 304 BLAKE2B bf972f29b3ff36dad2fd656ddb9047ec0ef2b20d4d84f2e983d67478f471d1dcc82e6f577525549b7655c0f3608500dab172a39bced5cd4173fd83e05034bc22 SHA512 940c2cafc14e85a2cdd7f95d17de68f3a9d3e80828fcc302936e16a32733aa4a60d3ddb8fc9760e2fbd1fa626398669ef991688b26c23e8ff5c7e8d2612672ef
 DIST bsdiff-4.3.tar.gz 5740 BLAKE2B 869b957fac9de5977216b82ae46f5a291af4f64e8f4199b129b5e9963385e8f23d8593c307ddf953001fc54446ba66a0c57f9f9a841854afc3d32aee26fffc4e SHA512 bde46b393b74bcc9f05532ea4d45b12c104c4f182fdd49d4176aad5f02a2b357f435819f13a5a7ddefe27df0ca82980f06fad764094014a6d068622263e319c3
-EBUILD bsdiff-4.3-r3.ebuild 878 BLAKE2B 03de80ba80d21f27ad65a7b274749292f10d362c89a53fe59ac884fcd3687badd84b45dfbdc929a302da38bc8587aa3cab300b2366d60b664736e2c692c15a4b SHA512 14821ec4875e5cb4334065ed628df2f62dff66ffd8c12e8a26e9b969db5d5d0364a81c8394ee61c776858ef4670dbcd6aa48ec685e0e78efbc95109ee6e83d4b
+EBUILD bsdiff-4.3-r4.ebuild 876 BLAKE2B b319605879842a0e6c34fed4c4d34f380cb2904e7841822c5516c504f2cce55a35b5015ba403ced81da8c30c0bdd2ccbee07b9595c3a468bf6e2ee9a8303b332 SHA512 3821af1a653d7d684d902f0e87b677032116a8ca7dca36d6f87a4cc376717aa4fc0ea078a2a262e3008ff501c1cb1111257cddffe28f189561ab6adb7024e8a1
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-util/bsdiff/bsdiff-4.3-r3.ebuild b/dev-util/bsdiff/bsdiff-4.3-r4.ebuild
index 947b0c2e8c01..0bda0b152631 100644
--- a/dev-util/bsdiff/bsdiff-4.3-r3.ebuild
+++ b/dev-util/bsdiff/bsdiff-4.3-r4.ebuild
@@ -1,24 +1,23 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit eutils flag-o-matic toolchain-funcs
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="bsdiff: Binary Differencer using a suffix alg"
-HOMEPAGE="http://www.daemonology.net/bsdiff/"
-SRC_URI="http://www.daemonology.net/bsdiff/${P}.tar.gz"
+HOMEPAGE="https://www.daemonology.net/bsdiff/"
+SRC_URI="https://www.daemonology.net/bsdiff/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD-2"
-KEYWORDS="~alpha amd64 ~arm hppa ia64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
-DEPEND="app-arch/bzip2"
-RDEPEND="${DEPEND}"
+RDEPEND="app-arch/bzip2"
 
-src_prepare() {
-	epatch_user
-}
+PATCHES=(
+	"${FILESDIR}/${P}-CVE-2014-9862.patch"
+)
 
 src_compile() {
 	doecho() {
diff --git a/dev-util/bsdiff/files/bsdiff-4.3-CVE-2014-9862.patch b/dev-util/bsdiff/files/bsdiff-4.3-CVE-2014-9862.patch
new file mode 100644
index 000000000000..7aab818090d8
--- /dev/null
+++ b/dev-util/bsdiff/files/bsdiff-4.3-CVE-2014-9862.patch
@@ -0,0 +1,15 @@
+diff --git a/bspatch.c b/bspatch.c
+index 8d95633..ab77722 100644
+--- a/bspatch.c
++++ b/bspatch.c
+
+@@ -187,6 +187,10 @@
+ 		};
+ 
+ 		/* Sanity-check */
++		if ((ctrl[0] < 0) || (ctrl[1] < 0))
++			errx(1,"Corrupt patch\n");
++
++		/* Sanity-check */
+ 		if(newpos+ctrl[0]>newsize)
+ 			errx(1,"Corrupt patch\n");
diff --git a/dev-util/bustle/Manifest b/dev-util/bustle/Manifest
index aec068a2097f..84ce06e4be43 100644
--- a/dev-util/bustle/Manifest
+++ b/dev-util/bustle/Manifest
@@ -4,7 +4,7 @@ DIST bustle-0.4.0-tests.tar.gz 8340 BLAKE2B 0c0cf10a87c1fea6100828139e9781ff867e
 DIST bustle-0.4.2.tar.gz 95707 BLAKE2B 12d8c08c7a3f71684831bc27c027db33902cc727d216801448e67ed18b717796038390ee7c63f2faea6e26ad677e618c51f9ad1353d3f54bd334d49fff621b7c SHA512 8a6c1860cb655fc9bd7d42d130d87416c74b988b81749ec8cc1c25cacd3dd4516f59f5cb5954b473c3f6ac32b11853e9bc8881708962144067a0325845dd8562
 DIST bustle-0.4.7.tar.gz 114231 BLAKE2B b783f4363171cab96463519806d18113012da3bdb9040a2394f5ad9cc1c7cfab7030b99ee71f1a5bd4bcd6906ef53f2fbc1eb8c504f3b4a526a9d55e27f2f6ab SHA512 c9b93ffda797a87342f5ba506db3c892bff8084fa0ec5897d676bef5e8367507970ae3e09555cda9b4de0c7b175dc396f2ccfb394d224e64225c0e7ded2164fd
 DIST bustle-0.5.4.tar.gz 122720 BLAKE2B b5a2315919644ab5c7712f9e9bde1bdea226b4e8898981f7150558bde648a5c7965be6ad8484c09727665292e5fe3f0cb545544dbb27f2a2553e513910289620 SHA512 56eaeef831fb5929d57a008ae71d8409048ce5d12eaada98830ef742baf3479264203465d77591cb338374096eac2dc2b68b44f075b2761f16df63fad54b91fd
-EBUILD bustle-0.4.2-r1.ebuild 1576 BLAKE2B ce31d4f6e907bd306e1aee5d145c808da9d3dd2e5a77faf8781b2182e0d12145296b36e9bf6ba5c71e1ead73a3e94e9839e305f757f949d84d413b36430faea9 SHA512 0dcea13cb555d5ee779ce5c958eb9ce944d640abca46e301fb2de2d63a53d6f23cc869e2bfff379cbe4207f39a38b39f7b3f25ea867c6602b768635f0eafee12
+EBUILD bustle-0.4.2-r1.ebuild 1563 BLAKE2B b68b73ea23aaf0db3a47c5165e55996254da67836b124af160d8c746456d9b6f42d2faf2a6ac7ddcc6f6a5bab8b6b3e54bbca27457ccbf2f8a52ccb383e3738d SHA512 1cc80c9c753e24963967331b64dd9ab0110e8e0f763c4b9725f415fc66e4949b429eb89c320de0a3391db5b7905ac8ecd207e3494565388423c555433bdf1789
 EBUILD bustle-0.4.7-r1.ebuild 1512 BLAKE2B 210fd9295693ce97923fab2dfabb187c1e6a1b2b6927fd6249f728ed93d54bffa70e8dc06991aa3e63c7694b175816fab9421a0d32c0720bebb0cf69c49c8222 SHA512 60530014106fa0283cf54ecdd6cc26702e6dd9c05777d8ecbb75c61ce200f0c41cfd5540ffd46ed1f9f7233362abb8a0820aee0e70541e4030ebed3966c21f68
 EBUILD bustle-0.5.4.ebuild 1633 BLAKE2B d5c9a5d66f44b1177df25d274c7ad75ebe2e49840d87f9a0c6e3be86a820077c2fa60860b51c34d9537ed8e523d5472bb732805eb95a87f723c8741bf80c96e5 SHA512 2d6f38210385c708c9318f66c0026bfaf4c12c77a6ef32260e5e8f924fd3458a031c2dd2e989980fe9b71d5ee57986268ee092bc28146b3fe811bb6111590bc1
 MISC metadata.xml 502 BLAKE2B 3ab482910acd7936501b8c519d2da5c286d493a04afc6d5302989ca5662a4f166d84142489789cd5f5ea4071b5a5e54bc9d0586e6e6fe273f3f2f6f4c44149b8 SHA512 834e9820081006344e30580673ccb789750d1af67807f908b21fc5fe0cf1b8554b32b446aa592c52a1dd26e4d36f2f91c3cff569b8c4797ded9c5c6ea1bfa65d
diff --git a/dev-util/bustle/bustle-0.4.2-r1.ebuild b/dev-util/bustle/bustle-0.4.2-r1.ebuild
index 2371ba381c98..69821eeaea16 100644
--- a/dev-util/bustle/bustle-0.4.2-r1.ebuild
+++ b/dev-util/bustle/bustle-0.4.2-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://willthompson.co.uk/${PN}/releases/${PV}/${P}.tar.gz https://dev.
 
 LICENSE="LGPL-2 GPL-2" # bustle-dbus-monitor.c is GPL-2, rest is LGPL-2
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="amd64 ~ia64 ppc ppc64 x86"
 IUSE=""
 
 RDEPEND="dev-libs/glib:2
diff --git a/dev-util/byacc/Manifest b/dev-util/byacc/Manifest
index 838a3f1d27ee..510432ddbfd7 100644
--- a/dev-util/byacc/Manifest
+++ b/dev-util/byacc/Manifest
@@ -1,5 +1,5 @@
 DIST byacc-20190617.tgz 799465 BLAKE2B 2baf34b20da049b3b1d2a569ec6b5470fe4935c9b13062fc58e6c73de6cbb1823736532686d4c9c083771432ce1caccc369c87070b27d59e9cb7c5c5bf1391c9 SHA512 79d04d7aa976e8b4e1bbd69f75ac1f0dbe005b1a7b072ce5ef75c877e8ece043e4adf48645c10ef036ee02de639b56b9befebb34f6e46cac1a59f8f641cc7cc8
 DIST byacc-20191125.tgz 871913 BLAKE2B b779fd05a98bc794544d84568720979ede374c7c821f3883e2568dd97bb2ded2dbc85471f5dadb7aa2953d9cc9665f4f1f18b77717aa63eae0786f70683fd9b7 SHA512 ef35ec6a294b07c71958dbd7106cc9b4a99d0eb45336d71c2763b3861a2cf97ed1de7f8c242a5eeb2841578711ed4a0bd874b7d6ac5e63db7f1d418847767c7f
-EBUILD byacc-20190617.ebuild 618 BLAKE2B b85558232b0cd543c1a68d5ab53e244a48bd294f2b738f01eaa819ff3e1bd6653831cf418746538b5706ea47d783c056f880882cf86528b4bb6387dcb557f612 SHA512 11a26df54f06e287b208534e37745f230e7ba48a2f872e899b5fd02c53b32659ecc98526aa98b4240c0ef4915b0542d4d24347d38ead72d5088ad59919c4a4db
-EBUILD byacc-20191125.ebuild 628 BLAKE2B 7f22364a3b39f7f0eefb08c1a46a59e7e6575b15f97fd635ef58d24550b525f9584955cceb19423332128b6781c61d2b28bff072064954a4c09b3d259e85a26a SHA512 69977bf34eca30e0bd311395d6c9a201de6fecfa24418c4f7cd4e1011b4c045931e08ef5f4e10077aa66ddff7a121def2abbd72e76be2383f57dcf6c7660f9c9
+EBUILD byacc-20190617.ebuild 615 BLAKE2B ab2446c14262888052f7d370a0c2c104eaa7430ef9b95a4c19087e3bf074b995261e5a9428c78e865a6e203cafeae1b747a60ecc4bb946418c4febd617f244de SHA512 4427ce8d462725709c15b6ee87fd47918ba76a71cffd2a74d531eafa5a57b90150820f67e400d17c5953a0872451a8e069a283705f7ee88ae3771cf90e4e8dcb
+EBUILD byacc-20191125.ebuild 624 BLAKE2B 8828020e31c2c22c33929d4c89d5d87fd8597b78835f12868e92cec5617e7c4ea56490a801f76494c6800e69da806f8ca19dc3f5f09bedc3924aa9abf15d7ec0 SHA512 ef316d3081e414c934fccc62c4d47da6950426484a16b7a283f2a59eaae38ab0e1e67dc5ca13a3f1bfea8844b3f70af9b7b188ae4fa8df21942ede1f6425fafc
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/dev-util/byacc/byacc-20190617.ebuild b/dev-util/byacc/byacc-20190617.ebuild
index 6b11ecbe3cc6..5a73d932b404 100644
--- a/dev-util/byacc/byacc-20190617.ebuild
+++ b/dev-util/byacc/byacc-20190617.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://invisible-mirror.net/archives/byacc/${P}.tgz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 DOCS=( ACKNOWLEDGEMENTS AUTHORS CHANGES NEW_FEATURES NOTES README )
 
diff --git a/dev-util/byacc/byacc-20191125.ebuild b/dev-util/byacc/byacc-20191125.ebuild
index 52031138194a..dd0f7b254f65 100644
--- a/dev-util/byacc/byacc-20191125.ebuild
+++ b/dev-util/byacc/byacc-20191125.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
@@ -9,7 +9,7 @@ SRC_URI="https://invisible-mirror.net/archives/byacc/${P}.tgz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 DOCS=( ACKNOWLEDGEMENTS AUTHORS CHANGES NEW_FEATURES NOTES README )
 
diff --git a/dev-util/cargo-c/Manifest b/dev-util/cargo-c/Manifest
new file mode 100644
index 000000000000..4ac6c04aeeba
--- /dev/null
+++ b/dev-util/cargo-c/Manifest
@@ -0,0 +1,135 @@
+DIST adler32-1.0.4.crate 5105 BLAKE2B 344a5258e77328a24a545e32f9bc653fa25b7ea43803ed7861db261bce227aa1599520a42acea3de1f2acebb8fa9fad251e2688413b752eafe2401ca1a2ee34a SHA512 5990e1e277a1c3aae5adef5e4601b807a756a40e88578bb91f1c70d70babfa97fb3f2c1b963482ec8e18c16d5e722bf90fb42f9646c8dd840373f28965a2d123
+DIST aho-corasick-0.7.10.crate 111039 BLAKE2B 69f984dbe528ece5ce4345bc0f39c122507a88e781d7c2d5c9175d1788aeef8d21e0487c7c449e28fbbdaae8203fe68627d23ac0a58d30dc70befd26ac9af32f SHA512 e8a1cb252015435009883662ca23408f1491d8f01461f3a81082feabeeff72ec61beb4f1f3271fc8a87f1379899ecfc38036ac208dca17889f70ddaca2406a9b
+DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
+DIST anyhow-1.0.27.crate 26395 BLAKE2B f510c352ba6cb6be2e20d40e176bd48f7bf39dff4a0be288f54da60346f2fcb9b6376a4f139fbe13a9178ec8feb58a28badc209814d6ed9d1decd7b327ac8a4b SHA512 ed880d594fa5d17f14abecee56f7b2742b9ceb744bf8548c99c0ac6f3880f761df657959ecf512d7d194f75055db668eaf1a8306876d596b471b12ccffb8c959
+DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
+DIST autocfg-1.0.0.crate 12870 BLAKE2B 79e495d53298574afd3b292da7c9c363dcb3ea434fd44258efaf3628e95ebfc731f03083f8a1060272a2a3478a6452cdc41539e2dac08465cc6e6283844bf260 SHA512 451fc63148792ba1952b884170e3481359b01bacca5ec0456f43ca58f8e092b8f81c9764f8b00d4104059ff608089be5858220ee868127c064cc890c767ec3a3
+DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
+DIST bitmaps-2.0.0.crate 17026 BLAKE2B 61559f3ea68cf54ea51426a3655a095eda21f0f4078aeb1254655e97ec92b53ecd5fe29835ce073949d5277f567f11de432643258428b5223b8624e23dc318c1 SHA512 6e89076a6ebe8256b99054a62e5112e8aba12f4393905bb4f6577f8cb19179a566df4fac01533aa83e3ae25950b9818828a9526ad370936355b8e5f761b6c81c
+DIST bstr-0.2.12.crate 344435 BLAKE2B b55a55be4875d9aefcff0091be82d80a19c1c92d5d6e17b751dd41bebd37f6a5f72d884fa8a70e829905baf3526ce4d854b162d10d894573dd2801ed030460e9 SHA512 2d14ac85274814bb29439acf67c3aaf84ac32ad361dd6d2cbca58bf571c968f594eeb1443a632b625296929b84047652fc60ec39983c110737ba1950d88bce89
+DIST bytesize-1.0.0.crate 7522 BLAKE2B cd4f9687753ec1ea4e7435f34b64afdf6e5534d33515d00c413da37081dea57eb76b2f3b8e001e65ca40908efccddcfa458ce1e3b5974aa79232567d9df7faff SHA512 a8837bc05efbf6faf55ce76cffb0f8ef2f47baad2f65875da246f4a8f1052af0fcd8f156950deac0e57e015183d740e0d8ced1e6da1aaecf03244ad370d926b8
+DIST cargo-0.43.1.crate 1119258 BLAKE2B b6ab277b4c06064fc7ba84f829363a5bcc2e484136b2f50f75354234f6114bd424d2f88952dc45c7f671751cd1ebff3ba3076c5cc648de0550d5ef1e122dc3ab SHA512 950e6f30643b38c90bddcb2be34f02c7e57da1e3f8afeb2f0f1037d93a877928064748339b40ca520ed045d36ef5c25a8bb3ad294316fe657368cfb50163f399
+DIST cargo-c-0.6.2.crate 19994 BLAKE2B fe2c9a8eabaf940082628ffcc481ff45640d16fd95e6e9dc8fa447aef13569db3257e73c81b1b0abea6a61aa57ca2a86eccc28f2a9ecad9bc698c6e73f9fa6c6 SHA512 430a5c96ee230419b79d80cd979d8baf59ebd93bbb75115c0c77dcffac1dc6b1c9bdf1e91fcf45619d3aca608f91573e854dd41921c1cc2a53655a7d7c7c8f0b
+DIST cargo-platform-0.1.1.crate 7409 BLAKE2B 503bc17f9cf08cecdc02371cfb69c70b0f61203153fee4ad4e5b8adb995e1f84e6a6cbb12565607fdb1606372b744fd3d4519f2605f05eb83078c1fc14d789a3 SHA512 b8758e002ac6c4c4440707a27cd747c90e2b128f51bc80464be93bf8677aaa26bec28cc1f730cfba639fb022bb030fae5c06c41773c5692bf3a12167d04f0d57
+DIST cbindgen-0.13.2.crate 160484 BLAKE2B 9c69f957305c3bd2c3056b45875dd2115309f01541bec4bce718f5d843dfb5b3bb6746474fe8149c42c194922ff618d9e3f6cfff13f7cf9069afb81d2da3e569 SHA512 2e894c6cf2b08321418ef78228fbebb5f504aea1576b8e159b4d8d66442cb65cee4f611f0ce13fa58539c08fe21932358fcfead52acbe5413adc9fdba05faf66
+DIST cc-1.0.50.crate 49792 BLAKE2B 25ec14fd42536c381babcf697cf96fe8be61417a61ba5875a2461bb40bf3ffd9c9d03e1d9df83e2dabfc9472de3db97b08fdffb710e89b868a5e115d0463a9cd SHA512 34a721d9352f8b59cffb8cc0b9c520b972b65d6c23e83d9c6f6e88d6a6845c53ec89350a4aacd0444a5d6b03b867b97aedaf418b483afead209a7ae6d3885f5d
+DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
+DIST clap-2.33.0.crate 196458 BLAKE2B 3bb62d817afc77b421a6282746b9b61367d224de6b614c7ed66bde452ce1046728077dab3368a46635b5c74d82ba3196586d87c0201478ce5b89638910dadb1a SHA512 f1075031414d48e4340bfe308904a95a31b72460724773c52a0bc8c004e625a04c904a39fc5420cb8c26a633321f9b5f4f69019c7aae5ed89900b63ed8c21a91
+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.7.0.crate 25384 BLAKE2B fde852b7673cc972da8d2f8663c2c8372fda36fd577d19c9536f9df929f649ccf94150e1e23a57013bee3cd8cbb6fb894c4fb3a5744171bc6be607cb27e2757e SHA512 919041f431e21783193c0661b82cbd15946a56e24e5100a6a9dc02476ddc714595fb0416ae182981ebf6a8b27181e3178135c27388b41ec848423d739a265da6
+DIST core-foundation-sys-0.7.0.crate 17033 BLAKE2B 26d190931c7462ed8c13de82e86d4417e0d130f97295c8435ec666be08c7bdc37894ef25647043970fa40eae1c63503d2ad7660c2ac17ef35d7d35698652e18b SHA512 b77566aed2b572bdbce6f71ca9dcc942ef96b628a7ed9680c4d3e3ada4a9dce90c1b439a8c7c7f22d68e51becf1d22b3262e227cafdf8cfe5f42db0ffb9dadc7
+DIST crates-io-0.31.0.crate 8907 BLAKE2B f0d110103f639e348498a6df1ba796c78550c33ee3a089cf944f0cdc3541e20c05a85778d43bc1b58056010c980643f8ad9ff3fe118c1d46bc37e7f80dffa8fa SHA512 17e76ed6f34a94810e68c4a6473c689887b1d917ff76af5f0fa00697cdc455d4d82d3e6cde095a5ade81cde872f88a2cd7f754bb93f7ba75309dafe2ef34c450
+DIST crc32fast-1.2.0.crate 39161 BLAKE2B f71c85801f945602d53f93ce251c978c91f63fcd92fecba5083fff0f06738697e99d92c17a824605d5d56b3224db224ff32e4b147b6f6af47ae714dcd511e7cd SHA512 2ee73e0642f83e28034c1baca65156e65d751214e83f2a4ce94b6add5ba11f74ffc80832a3348ece1c099367be2b11e820dfb349fae89fbced1b68bd6b0466f0
+DIST crossbeam-channel-0.4.2.crate 87419 BLAKE2B 721013134069abc8f01ae5e98e1e6f10981d4892881339d3bf87f1bcb58b362348dad92e702a6b2367075dd41d860d62cca0ac8b3691954c454ca70bb5158000 SHA512 19b0ed2b5ed0fb1fe7c809e08483152fc36cf46f465c8571ca0fb9ebb1cb4b2b8f5860a303c932f336f434dafa9776ce6026ea2e64457147fb540766dc6da2ce
+DIST crossbeam-utils-0.7.2.crate 34338 BLAKE2B 3cb287c7741c4d5b0551331634a75b066f07fb4b55fa2b347370506467a05923254b1c4dca667de59ed91ff91f5496b37f40f13d3e9885a1b4f639f5b6748433 SHA512 e375f24c007bcf660d9e297527ed938f678a55696ca7b555b96fee7e0b94c31db2d3f4355675aa0baeadba68b9755ec92dc3a09a37b5db48e3723b926fd4a8f3
+DIST crypto-hash-0.3.4.crate 8102 BLAKE2B 8bcf39d195d40a2e6d899fa254c9f64e982d742fb304f4b271b75db305d5afa8ea5361c0b6adb23c0fbfd212f3c4601bc7476b4874eaac00a26c8a65b711b0ae SHA512 57d020650689c988859f51ec9252702a7e8510526364b00058b263f4decb249d7296811adf3b8c5e76f8aa744cd5e444aa198f3dfe134c98257b99cdeb824537
+DIST curl-0.4.28.crate 75395 BLAKE2B 5c837538d411958c479e4b831114044f3a4b90b8d079f64f80a8e76b42bc79b1204db00d2f85fe65f88d01df675dac6c6c958bc11280c682cd46924e40c48dbb SHA512 67d10f183334da78457283ecb90a27825723d772bc2031871d789a7173e7f5266e05195c84522d5c64697659eb7c1a6dccecbc4d3f772a71e7fff6f687a6a5e1
+DIST curl-sys-0.4.30+curl-7.69.1.crate 3006445 BLAKE2B 80c932b9e9d847258e2704a47af3edf028581a076df784b13e99af639bd9788c564bb8ed6b07900f5660a662817bb75fe3282c3ae2e2118fa26045871fed80eb SHA512 34d4e520d25215b35af150a217105cceb3934706c4170eb2e42324d352b6778e82bf23be3a3ea1cb73ff09d7c0bdd20548b6396d6b0ebe1cee4dfcb3c3c0abe0
+DIST env_logger-0.7.1.crate 32281 BLAKE2B 6f1894c64f301ca4b687270c911dbe230f674662aa0561b97c4d2537886e404664b5773d4e223e2018047c222a951232c3cb52ec5bddbfb6665e34c3e7ea52f5 SHA512 604060d2ee83ab337a2d20d6784d1b7541534d2fd9e1662fc5c709fa681672a9db5e34d00face864b56ae321962e644ebe29fbb6d68a0d556419cf5d71c6149f
+DIST filetime-0.2.8.crate 13527 BLAKE2B 49b9f7a786e3920fd0d457e8ef09fb729dcf557483e17940091ea7079d3bf331e28b7d9029b3840608c8abd6ef1ecd559644826bf5f9bec66881022da9ff72e4 SHA512 c94d3c3926972f3105be52a48654afe3ebc7822d2ef77a2000113c3a85e7f0084b3598c6845a09e8e530d68f50637c3c0b9a058fdfb68052117af3ddcee89d2a
+DIST flate2-1.0.14.crate 74183 BLAKE2B d3ef991f13e063deec70e782c07d064b033c50bebe2d92fe648cc21ff45e1716e7c50eff84f3805d3b11d7ea3510cd97d96b75b531c8f03b56e06889867dae08 SHA512 d70ee34d21b345529149b95000692e2dc590e14924d862cefdf926e77bb6e2572a99d0cea76fc0661d1149730cb3914598c1f500bd09661338713894b9a19152
+DIST fnv-1.0.6.crate 11131 BLAKE2B 220cf5463749b21e1560419ab9b1f235de08dd548c4a9a7fa6190d9516ce7db884f877b67174ee50b66b22be80d3be73ccafca80e06e94e0fa6e96fbb94475f6 SHA512 f1356b3da25f76cb3ccb4336ff54d4967f1dc7523eae6cba21a4349b8ce563516f6a2aa10d626cd5bb6046b55ac2f246e61e4e526a03fad5e78d0ea174841844
+DIST foreign-types-0.3.2.crate 7504 BLAKE2B 520818b702d990d296ecd31a8646850202509ccfa18edd0e1b260289619a6c351e758f317ec0824bd76eccb209b6f087057c25f1bd01a47897715013dd834867 SHA512 bf27b8243ed482c202d120383374f19ff09422535e24b9c1aebccc66529bf300ca17b8bbc76d67f98ac092e614497afe3add9dc68aa69c93074df05762f91232
+DIST foreign-types-shared-0.1.1.crate 5672 BLAKE2B d2e42e04b6657e7a69fe0bd20c672176629c743e49a55fd007bb30e289710b70045d445ae9cae0eeaa747ee708c90e8abd9b5fc39bad8ec0666befe1b696d4f1 SHA512 bafdb2143e136fb0818e2ffd90b5c862b7181647d6568947d4e4531012bbf7a57b597221ec7056c1b562dfc0c3b5dead26d1a4111ebc15e7863737a873518a4a
+DIST fs2-0.4.3.crate 13138 BLAKE2B a8c53130014affc276544360425718c480fe6b6583675e15e8bf25dca0cd2752aeb0793135fce1bdc12bcfc0ef21fb7f6aa298981d61ac150300eb134c2014e0 SHA512 b83fefa9123f304e4813ec1dacbb1aee5dc0c94e1316cd7c8a434aa2a242c9c42523d2bd8232d78e6c84c4e172b5c46ef8605e93b54216a2d4496fdf885dcf50
+DIST fwdansi-1.1.0.crate 8280 BLAKE2B 5c46e66a7fe25e02aaf42668853a0eea8ab3bbf9d160702770d94f8e6c4b3efcac9f840387516d1d14cf34271981ba095e3e0f7a5eb009b9d5837f94f8fdee3b SHA512 5f91a6fbc40b00a06abb6686cdc0389a837fea6513a9b9bde7cc4ce5cdb19c180ab21ecb5927c41a52c56675991ee10d127335c1f6d8c52dc7e6b30b32411370
+DIST getrandom-0.1.14.crate 24698 BLAKE2B 8139227951eb65cc2bb7bba29291c0e8ff0b8d9a8e2d7eabb01682d1683c989c44b6195952ec7d087c338538c1d6858c45514822625266e0996829e8c50f3d17 SHA512 b5cb78ae81f31fffd7d720f9ea2b5917b4eac103711faf656a3a3fdd24ae5a2e671016d39309cdd11f902de919187311401dd8fe9e6ed68c29b83987de77c957
+DIST git2-0.11.0.crate 158388 BLAKE2B b58cb940b2341acb458e0047a0758de26593a36f7dce30ae8386919dc50ef43a3094ed9ea834e9f141e9551491c1a5b7cb7cf93122f41283235fc75624d01cc2 SHA512 4625eb25e5e88c0f608917a5a6a574372942bde8697f9e2ac1a8198c263a89edaf42cae6738dc87343b1b1359f56462886a3551e9f41ac6c19837996340ebfaa
+DIST git2-curl-0.12.0.crate 9340 BLAKE2B 231859e1358e7237e683c4d243f184170fbecb49f69eef611aa92c34afc7fa86801d1be7009e6e37435a6387339ae7f92acf5a717047ed37280e20133415c594 SHA512 ec047a4a11e49c4c4ba2f132b8e6f86e52cce85cb1eb5337ee069d39033bc85234f71a7990d3357de5cc190121c4ad4ab3562ad5aae13298d830e508e182e20d
+DIST glob-0.3.0.crate 18724 BLAKE2B 1f1dd380e7d668a0c2cff9134279ebda958b4bccdd4a65ff01f9665b45ec4cce8ffbd47eb46e52cf516c5fd5803561e6bcb60cdee21ddfbb8601a95d45500620 SHA512 87098ffdbc518442995c422120cef71f83069c8f88a1970ecec5105b0f284ddd92bcee929f5c230d5b90ae1ead7e1214c3eea26f4a8b26715a00c1ab8b09bc46
+DIST globset-0.4.5.crate 22830 BLAKE2B e4e1c4924577cc8ad14f3c76e49821b2f6050395e7673cdf4d118e7025e59e6df1be807762a484ee80739121b14bee8833c10b52ba69a13537ff9919f1bd2e3f SHA512 8fca9a19953370aa5d13b876a254f71ad6ecf0df218d8f5598ff2328eec9676be56b3a44d898dd031c8d4328bda939ee198f9b8dc7e03b45a1609b6f693a9088
+DIST heck-0.3.1.crate 54666 BLAKE2B 99f7ceb44ea6af445749989730ce1e14156018ff046a136be2e6474b285088e1d90d6f8af9352affbbde5bac7e5a32971dd99f249f968105e9793b7de76def07 SHA512 134722192c46fd64b38d2fbec3a2511c560916e906491a72c4ec9d99b9f716dc58942fb99cac99b9a6ef2de5b5ad1d1c1155f292d091401b6873347d80c086d6
+DIST hermit-abi-0.1.8.crate 7581 BLAKE2B 90fef564dd39973c5ff8ee3d4a9b129f1ca00800ca459c644ee08df1542c5adbc06881a7a59d37fe6e03a72a2df21917e38544759a2833dd8f8c065261cc1512 SHA512 25f7806834ea007174001284200201895f4536d5a447dea6c165b43c30b30871f78da5f3ef0d79579e3195951e6fd7ee5e21ec80811c515fd096f2e7b3bf7b9b
+DIST hex-0.3.2.crate 9053 BLAKE2B 3ac67d26ad367df7543967a8153a2ca7c082d5f56df16cf63a37f76157ce94c68f4cb11c14cc75621a9c45d19c38425acb92b552dd6f45b9052d90cde2ea6e5f SHA512 fbb5e86da5c7fd4b7ebc505d4c0da1258b06406d40a5c6c1626f559e1a91525fa747cbb6e35a687c63216158832ceb49dc61d68cd7d74f2df3630b36ac423852
+DIST hex-0.4.2.crate 13385 BLAKE2B fb185e0888736515b8c1c4c00f831f1a4a7b2a04bc0262c80bb2425563b3ca8059fadeff8660ad738bcbb522d432dde98ed6b14aa1fb8c03cdcfec6ae282a55b SHA512 b37504fa6e41caa77c924b24893a7b505330aa8c39501b3ac283fbdffa9af2b89ccb9ae004ff415af1c813fb3da222dba62f17bb3b6210a259661e2312d099a5
+DIST home-0.5.3.crate 7890 BLAKE2B ed1cfadae63d1fb0a66f38aa5440dd09a98343e3afadcf1495bf69f3ce813774c9a49776c6b3641001b6007c01e24ffa6d2600c1bab05c4ea3353c74ddae2fd6 SHA512 cb3b7b24db30a8b29f36f90a0d345b2e187f9e76f22203e142a77c8308dcc62e97b5714fb0ed890210b31375cf30d3362b8d740fe189079a6d3a095be50dcb0b
+DIST humantime-1.3.0.crate 17020 BLAKE2B 37efaacedac293197ff7acc8b0446a73243a2d90ed8dbdcecd9cb0af6e901f135e1d92aa1a642460f531a6811a5f08075f8aabaa9941e96eddef301e205fdbe1 SHA512 2589bfdac96108951882b7ee497528b9084ddd344a67914810ea9961a1e319167d5cab959c66cbb26e398e75ca50d488a251694fff35f3c2f69a88b6f22844da
+DIST humantime-2.0.0.crate 17374 BLAKE2B 35f36b30d8fe3cb26f666dd57e31ab93924cf9d1c40d6c83cbf800f141c951634fcd641634a8f552baabf858303570bf8d1207e5455d5129f433d0c95b138c35 SHA512 5686246351af000cc38d10f65bd6cf3fe446dbedd75867f9bfc7a68c4b8183ccfc9e0cf14b7fa149d912acbfd9ff917d8ed5be3b5eab7832d23bf573a8e024e2
+DIST idna-0.2.0.crate 257203 BLAKE2B d26117124891f90b5e36af291c9038e2f4d46402c41380a6a89758459fd73839137e6faa401502be12dd81292cd9e12ec82fc611c0ff7a150510d19010767558 SHA512 375d6d73537a5c9cebfc850a2b561d57e748d80059ca27fe5e35c058cc12a5938cfbb39a76cfe57fbe589f7e36f89ccd91ccdb8899458c322e277c299293bc7d
+DIST ignore-0.4.12.crate 51983 BLAKE2B bc0e8c263b8f128ce53761bd225249f08cc81c4301eb496c8503e468832f5dd8d93f5e0ffaa5b5590cda3ba94c3b861cbe96afc4d3cd309d1aa3030224bfebd1 SHA512 5e0afb4094ba87051dc5c545aa673bfe86fbed4dc33462f444992177d114b18400936a2a018c44fc19503951645667f16504144548753a52df3a9ebb167c0c72
+DIST im-rc-14.3.0.crate 180179 BLAKE2B 6d41f9ba59c722b2c830e48f47b1e58a65888796db50831e59fb4239fc7437fca3fb46f62c6009352eef075a745bc1342c531da1160e8a72e7eebc11bbfd4e82 SHA512 525e2be44012dc79a94f662ea6bb0ce6e517131df389b3ca147b6886284f6121db09bd90217d4615dabd42117b7714e95438af714cd90b336e18be6d2a794fc3
+DIST itoa-0.4.5.crate 11194 BLAKE2B d8f0e2aaf62152c187e0987ab4b0cf842ac13255262a9ccbf8484d730ea5397572791c023d2363d0562c18c8efd2418680583e99a1f5d14450b3f0184dce69ca SHA512 79ff8774524130a4729d5e708a4a4a837b3e5052384a12c22db4ae3e208dc4391ee185365f685137a8ba55ea7dc3499f8cddddb2fd98b84177ab292c264034d3
+DIST jobserver-0.1.21.crate 21228 BLAKE2B ab1a6496d609e19235f022e920495e708571116e90f8c036edb5f7ba270c2ac938f7571e89f3fb714043c87623d4cbf1d404067ccac6a8b41e4a6768039cf02b SHA512 944249819e1e3dd09495ead941330e9abe439647c1e66ab7e2140c0c9e100b63f4f792fe06aa3c86f509f057df297ee2d35df0ccdfd4bd6a115b6a44076237ad
+DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
+DIST lazycell-1.2.1.crate 11691 BLAKE2B 9b1d6e9ced918aa94dd5dddcd3ffba59116dae922d264180ac36c288d8a6dd9244324a7c3050c5991b216a241e482ee17b2e6d27527b88339b606586128df1f5 SHA512 de74ccd6a3c32c360a12a51ba1d51d6530130396b37d63350a960956ae0ba13e9ac31e2bb70b61ddf055fdfbe7e559b20a38415cac3906839684905a01256ff2
+DIST libc-0.2.68.crate 468882 BLAKE2B c313ba0ed94de22abf2a764edaf1ca5dc4b86e98e004c3c23d53c7684996d68a4c5499fecd0afdabc4af3e1308e5e089a66cbac81d243f432ec1a9ca5b1856a2 SHA512 3f501182e814a2e4eef3a574bf5830a9ba633018164acdac115e7d8d809bc4308b08e657869206d4e5cc73d4ec4944ea98504b708201802b1b021f854a36159c
+DIST libgit2-sys-0.10.0.crate 1530695 BLAKE2B 1a46359e2a61aad9f3dbb6eca54325bbb8e39c99eff53b4877796b8007eab61801ef7ff9c7331352396c689b134bb42e2d50bde42bacf2eb7aebf97a75c8a272 SHA512 3e86cf98c01f33a242ff0117bebd1a2dfc33100ee00c46cf538d61eae56bda4b93d479baff186837d5b8dc1ba7fbaf1942287df0487a50ac23cc75efe3a1cf7d
+DIST libnghttp2-sys-0.1.3.crate 2307977 BLAKE2B 9f0ba44c0b9e51fed1b71b9b270c20633dfed6f066a150c8cf6e4be39f08e3f1bb3a606889b9286141a10cf02aeb0ae9610571e2a55ceb5eea718426dd824a35 SHA512 d8bf63f230ad394f39c3e66226bb9bf2ce9dd8931480d3bbbefc335ff9b54cc9517cfe29c69c0bdde9fdde2e81ab2e614c2650704ee34cca88998fcf52672d68
+DIST libssh2-sys-0.2.16.crate 471055 BLAKE2B 4ac133a98f466a87a441f72fc030799d38bdad71496aabcf7734f4eb0d46df53ca1a5258d899e07909aeaac37269d0d6a05ca6153635a2dbb41c2432ebb1a3c4 SHA512 ada58da5ba71d577010ecae04504c9542ca5ce13b7d1f56b3408e018d28f7a3b39ab4821e82e1b212fd52a9e80bdc57d944651b33e923602b26153caf81b2400
+DIST libz-sys-1.0.25.crate 650151 BLAKE2B dc11dc65c95f6c1f409ffbd0c9b12a809eaca5899da1073d8f302a752f9bb538b419cdf2f540b34b6f72c7ac36719e8fe21a1480533829cee305019304523520 SHA512 3c1d0754230c327876fadbaf3770f52282fedc6b373c92fba386a80261c577f6bea2983db7d3a40a231fbcfee40e560d8f738d25b634d270e2132b3162497547
+DIST log-0.4.8.crate 31297 BLAKE2B 31037fdc2fc94f4ab8a6e89a251b0bc29975027dc7efb7cc86a8e848dfc8e2ae50acdb177b7ba9f7c1f20ec01e50798f89abb772d67a33f1b060ac617cf9a8ab SHA512 0b71f97d5964134b5eea1332347e177806b2f171d0be5c410c0ff1539470b242ba9f0933fafd853e4171a43b5e373a150af18918924be431c7216022553a8a3b
+DIST matches-0.1.8.crate 2216 BLAKE2B f18176110921b1cf6e58d52d12f1d1a3455ce2dc04421fbf1b392f66cdd81a88e924571fa27e307a06301d83b04f3b8a0ca3ae40d2da6f2decb8aac4e2801fbb SHA512 98b58f6a2694b03a7dd1be69ebf7e3ad14483fc8e4cb6e6c26a4937e4e660e843efb4dd04a7312dd9659ca02acd3775678f73b8faac44a76ffafaf873c22f590
+DIST maybe-uninit-2.0.0.crate 11809 BLAKE2B 5e517b8c59f9ae4f1a4f86b48679ea64d62450ec2519c8caaa914479ce9e5b3aff24707e2e37272ba74bb60499afdc602fff17756337b0c50a9184edbd8b8805 SHA512 3006fc009c7c743d9147a4122e677cdeb2546f7bb46963b2f266839614eb906f9d763c161044fd0bf3f7b54124ac0734ac9ae7f7151b1a7a5f45cbc739976434
+DIST memchr-2.3.3.crate 22566 BLAKE2B f952070b98ef30f0d2780a6efbeb36d295710734f678517d913a8002cafebbd3cfc38975fc4546d306efc11bc815764d14320af3b7a2360bd46fc2ab3db9efa5 SHA512 922e05da920d0d94226857788878ee5e31518cd80d95ae57e1d7ecd233942c37d01565525db2f1dfdfd5b3b1f81b2c73eee058cbfd745cb4e1519518318df248
+DIST miniz_oxide-0.3.6.crate 44717 BLAKE2B 49d69fee6911ada1effe8ed73072d7815ed94a2705276698a178fc77ebf8c9e92eb286d7d71727a894f46e605afacd620d48d6aecf8975d2366e46e2c8c8bfb8 SHA512 d041b41617ae0e614f85bcfeca31d0c9d031c24942f786f43166e34ebc37bd67e3b9a44779e74b119e3d95d288d0842736ba709dd2faa3cb418415e2c86ccc93
+DIST miow-0.3.3.crate 22850 BLAKE2B edfbbda60206d0e25eaa2d8972290feffe989bc2b6d98099fe3042bd0480d63a0cdb54df1abd55827790996bdbdb61f241b7fad8d325cdd64891513876ae913d SHA512 f2b8c5f31bfa2d831f1a6c0aaa9e526dde3ef8a2ac363da5180592cdf7a30e9e0898de680692db00406a48f4ee068ec97e3d42787c807335f7d47faac9c563aa
+DIST num_cpus-1.12.0.crate 11867 BLAKE2B 49ba476ebd14f2894dcd3e017921a865ceafe62ebf990a27874d264588f5e45fc8d6c3a3e82717e661434daca8b134faafeaf55f44e6ac447b81f162a9cbc695 SHA512 502cb7c7abdaaa42e849847313e6e12b34d9d619b58dccf7f3e80458b5b7778657f352828481daa21d482c247cfbf6d167f9ada8bbf0c3186b82d30a93a6e381
+DIST opener-0.4.1.crate 10634 BLAKE2B 74668ad804ee2d39b8b1c3ec3ff2e99b62a871bec8bf295a89db0cea421f3bf1127c2bb9d886ca527402a7d05dc7477f149929507bf19be069676d83f2d947f9 SHA512 7200f4d21a0ba5e0dca5d58368c3d172a73db36d1ceb3cc978c46140e1594343c638d291685b86f0c503c970c9ce95ec2800d6840fe745005eecd32bf326d46f
+DIST openssl-0.10.28.crate 189106 BLAKE2B f08547bf5636fb83aca04d859b5ca9fa790943ed866f52d2858da0b9304f07d80540e61a5eabc4da45b242789d2e8ca43af0ba253cbfcb072ceabb7d5a54a2a4 SHA512 1b8ee9409b6e3426bca45530250c89ede93ef420058f79f7c9674ee6f33e826815045d9ad9ef78719c449f6f8a02b6216b90b6b048562fd8efbad7d2b151d09d
+DIST openssl-probe-0.1.2.crate 6427 BLAKE2B 8df00c8ab6af7887a88dd1672bf2c40c6aed5867b0b8d07dacc94b80591814e2fee4ac5dc775ea0e98cc33641b9eeebb6d5979d34717ba400b907358ceb2a469 SHA512 4001eeea5c4f859559475b4b1df8248611bd44273116b31e7ef775e02918cc989825989868f331f0f0e387787680c1e4ba721ac0fd4695f7363005ccc0815d9a
+DIST openssl-sys-0.9.54.crate 45751 BLAKE2B 7d21482f56568cdd7f8d02063f1c9b51ff355d67d20d44397f31332dccfbad36af9d6dae3294eb28feaf607b5ffcd13437ccc28df2ff0e43589b5e51c5faa012 SHA512 3c3271ac3b3825c6b8182e3d699835a4d73d774b43e9f694f4d9f1b9644de9ea1b8d8bfc2b98c9fe7af4c652d0eb7878001cd688f797d3b81bf5c8a72fd0334e
+DIST percent-encoding-2.1.0.crate 9748 BLAKE2B f3ff35ac683724b15e40c85e0fb8ececb07b61beeea82b7020f02d27df05a8a3535f157b3cd688533e414d6541de7de8640ef4756706d8061af0fec94ba04ab3 SHA512 98af4dfa7c6a3cf0d5aa929c436f9eb1ba1b576a944513f1284e6df2ad06be7cab9eba145d888d50af88f8c970bacc702b323041bec6d4fa1dc34095186c628a
+DIST pkg-config-0.3.17.crate 14533 BLAKE2B 729b15209bbbee8a6d3854e30a89b3e6041ca3cf7b1460ff6008e37866e326d9ec8b4ac582c125676e31eefa048b143beda33432b95f00a8f51cc7fa33ee4986 SHA512 42be78556adc07dffa8933ab1436d5d6a776018898377d58dfdc9f961981f9f21397301b41536c55d8a3772bf74a38069899d1a5cddce5c24a032017137044bc
+DIST ppv-lite86-0.2.6.crate 20522 BLAKE2B 6e1e4f3d0daa02148df390be19d3575626e66f6a78dbf27c1275f097c4307b80d8182f7795a270aa2c34d8c31c8c3eecc88e9507a6c9def0e91af11233aba90b SHA512 b9764a841364eb89157c828a183fdf6aeeb63d1d35e4f5dcba79e5d8e20eee8f22c845636c5c7bc980da1d141d838528d5f190546b23aa5e4e51e626a0ddce3d
+DIST proc-macro-error-0.4.11.crate 21395 BLAKE2B 86e5dfa563564c1afd63e9ad69bd294c138309d3b044b9832a60380a492bc072fc3fcd295f05bb97fcab15a352ec410d235f7f25270dc0ad89cc69212bfe0502 SHA512 8d6098bcb1b61bf6894feb10a447afb71f9862f83a0c00b2eee9b0443c77d9ad7e17f848d760c158f1070d3e6716e4490f1c31199800d72939749d71051681c6
+DIST proc-macro-error-attr-0.4.11.crate 6924 BLAKE2B 155d14ce647f9f9fc30255132cdfbfb2417234a97dc12dab97195f88171b51cde7284b6117e48c2754e89a8d21f0ddaf7086d69b223748f00aa9f0cbb44438b1 SHA512 a1e23486c7f4af41b419b4c833789e0edd0506bc774e3504fff2bc5bc88c2f8799ae545b79138e6ce686f479ec703f90112589639bae861b99daef0f08496885
+DIST proc-macro2-1.0.9.crate 35576 BLAKE2B 16c687cfd21bc3b97113f32293c1e06ca5811df6c8f279e1c5661a501c230b430f1e8bc983a2ba30d097acd01df8701a5a90ed02a93feff83a1f6f33ffa1e8d6 SHA512 005d1d31ec62a25fcf3cb0e62063d5fb53a3b15fce8fa597ab09cac5ac404a7eb441ae44c2d3acc295e24e814a413d0664a3d142155495674c4713f489ec79dc
+DIST quick-error-1.2.3.crate 15066 BLAKE2B 1c61525d383f3588c1c5017f016f60b484bbf2035e7f63c553bd9a49b638ab0c6106ac3676a41072b24da4e13dde78706e0f99fd1ec9ee329d5be81d45a85866 SHA512 f8aaf9024d20ccd42b706c756eed8320aee339f8776392b47a41cc82ca06b03df1a5b1f00854cea96689c5af261b4d8c5d2b1a242d10f2755e7e33dc41be35b9
+DIST quote-1.0.3.crate 22939 BLAKE2B c50e47b647fe1ac1930544d20b2b78ad98e6398a32c98460701d93f93fa1437c6d12c632386ab9eb733cbe64cad57e02dd201686885d0a951cb013fc10a95a9c SHA512 b4867554b86d119251db67f9d0949bf8c3cd7c64f006c76531398ebb7478cb93805b9bcafe159d921ba1a32e92773853b56685cff0e1ebdc6aadaefd3b932ef3
+DIST rand-0.7.3.crate 112246 BLAKE2B ecc7c1bd70ac874c03bd8b7faa3016bb2d5ee5c19603280a12a45a81598f706e445971ee081e6ca410ab6f0f5f7a06d9315848cd556a2d8522a82024f6ff91e4 SHA512 f9b68ef9446f1ca2c8092c50990f15c1b4cb5529eeeac4df8d69755e0b7253c663c587775e7cb0a7298c31edb444975dda34926759306541f6d43d0d3cf57b7e
+DIST rand_chacha-0.2.2.crate 13267 BLAKE2B 7908867ceac98243ade22e1b38f1903fe0249324484d91c948a5058a1e099e5213f325c5ba3400898c8319158ed69f4ed064164f235470856a8191bd990d5a10 SHA512 1e2117442e4ffdd834dcbf0ea1829e73202c0ff9041d5969d81a59330242145f2753f2a56de2fdbff65f26cf0d227c7d08b2094ab2f946b764aef88106a6ac84
+DIST rand_core-0.5.1.crate 21116 BLAKE2B e74791f941a79971f2741172d489d546373c9abcb0dfbffcb7b97b858ec800b2e0c97df4ac636f3aa1b8dd6c14685edf317336d577f31b5c6cb7d89a157e547a SHA512 4f7500b35e165e6c817fdd67a50745d5497d24e554bb554705097e37258751e8755c4d6b8a69fcb5e1977708ba78620bc35d640e4e018fcd4e88d9dbdbebdcbf
+DIST rand_hc-0.2.0.crate 11670 BLAKE2B 55fd048f2524cecd4f0e17927a81111e3070a8cc6a5b0234a46445400ad5527194edf8c91fb5ad6538f4958d53044ab02424f61a38adb2931e2cb7568c458ee8 SHA512 bca185612bed5cee4da76fb68fe854105da276f5bf2da464e596d586b925df798cc692ed881e276ab77c36b4b0551930966c93656be122ad05899d87853533b0
+DIST rand_xoshiro-0.4.0.crate 17029 BLAKE2B efee418e99b15aba76385a4320da667554effdde4f5d19dd55d16c1069d7915851f64526d4b4c9ed1cb6e5827572c0c96484f13669ff233baca124377ccbd48b SHA512 e889eb75ef40ad52eaf32692b3a405e01eacfeb20e0dc171de8f1b2ce05723ba448e293a2ee91eb3bec3cb5a2667bd05c11433b50470eea9219586afa73f519e
+DIST redox_syscall-0.1.56.crate 17117 BLAKE2B 57b1b01ef3cbc6f55def6c9a0dcde16bd98e83badcef993e26ae3ce849abcd1b1c10f4da931c605970d77f92471734764a537e7329291a221343fde23f3591eb SHA512 17a3044327aa733c830dd74e210d6bda32622617d1c5af9d70d7647232d8569ad0b04ccb14042cbabb5d97ad98e3f1f5a9968a75387354ffb4d175e9577115a1
+DIST regex-1.3.5.crate 235308 BLAKE2B 66548c392ff921815d3be3cc196c6b1ca1ddb3f1dc178935f8159335ea9b85ab7264bfca468a3c63c242c522095fc6faeb7da19b0968a40b30ad55b6536f8201 SHA512 c37c28141a9ed35250f830d1d4b84dc527cb880d6093f1e95b348aab7ecd2d2e949fe7cc23bafde217a4f704eb828bef1651854ef4ab9593e7b4ac006d2a5ef7
+DIST regex-syntax-0.6.17.crate 294004 BLAKE2B 3d203b06b8b1a5bdb42d50d395ce117ad92e41a7d36e5cb5194014eb7af1b17f944ae493041b7e9a2a9ea929381b4c1cb513c895747beff97aafef524ea2ced5 SHA512 bd9a165bcac207ec3bb87a81ae644be98d9b5ea0053b3bcc69efb334e3ebfeb85021aa372bafc3575758200640cbaaa67d372950fbb3ab210d8ec62b336d147f
+DIST remove_dir_all-0.5.2.crate 8907 BLAKE2B 585f49f83db3ace90dd0b4fc77aab7525844194c82d36cc33ab8999aaa6226d24a130c30f55e2c46a08273cc554d9d4c8bc51958aa7dbf1045085b2e22639e4e SHA512 d19a45398a93adbcef9f233f6b3eaf4a63ae95f5bbae00c880b40c5edd34449e7f798ebcd4d11843c68ddfa15e11bed21d434b224e4a175dcb64ae011c13c8cd
+DIST rustc-workspace-hack-1.0.0.crate 774 BLAKE2B 521f71467c95554c8a87ab3e10623ea3516932fe4bc9ca95c835c06b8e0bf526291dede3a5e08df8222f365f4d326c4054a99ef0d37aa6fb5210e2a35d7599be SHA512 48e4774a272e717ea571f4c22606ffca78245723ebc3f15ae5d0b28c5d767df9e772b7e2d6c5c3505bb09bf28097aa83a34b182856bb9d74b3a00b292da45315
+DIST rustfix-0.5.0.crate 18370 BLAKE2B ec580a65720ec56031efd96f082625063e85671c4877fc96b9e73181ee15c565a83f4085a26d2a2d1bc57689bda34bff7233a3e4e3555d8d1b9fb8ddccf3b281 SHA512 3bc67adb7d1012c8e832d67491c619ee376df505227738a0d83bd129c360dcbcf6330cc9c5b18038428bd8b6baa7af79686420f25c428fa8a50c9e8403706cd9
+DIST ryu-1.0.3.crate 41983 BLAKE2B 32f2b9e8b7aacee3fb86acf405efc86b44c564b4da4310567a0e1b22d09fa51e5ed8278f6b2c38c220ba235de39c596b15db8958aa413ff822c0876ebed56515 SHA512 53ee61ef116594829849b417feb02d415305783b08d3e45656a467aaf272899e4ed46ac0415cefdf3102f61faa666f21f3237244b2711ad10b528a3773aa8414
+DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
+DIST schannel-0.1.18.crate 42693 BLAKE2B 78aa68189d2b0620e139010b64a962d47096410c0dc6b839a173d4e8e7808da9f460c26180511412711448b4a30adb072580a5c485d8d2257afc5100f80589ac SHA512 eba32bc2a9722fca9b97388c13f9cb99db4f2ebfc54f28f09525ba531297303ee601cea1995334bcbcfaff207dc5c906596bfe951a948221f26f25df65517fe3
+DIST semver-0.9.0.crate 17344 BLAKE2B ae782bc78f29e45577de8574ee58959c70b54bb0b6f45a5a7b09cc4d358d9a0a80bbefc6e0f2a330e2b55adfbbe5c1f64f4ec9bb94c4adf7bb3e4fc9c142db6c SHA512 03a2ea563456f812c301721c3572370fe4934a22db60079da0dd6ffa33fa789e5e2436ef09e62fc35e0b742b06fabc290992c74eed80419a353c9de9449928dc
+DIST semver-parser-0.7.0.crate 10268 BLAKE2B e46b7cf9d292f8fc54561fca4df8534dc96f6be920a5c869c405ddb31b9d1a18eab0799207113cf4910a52cc0df5017ab1bc1883a7c3787ebf2d60f09ac0ab4f SHA512 17320468ec6b9862d595f358d70c09ac6e09db7885fe0ead7a1e596f79350a6306e8bfde5bbd6512008a7c5454da1c7ae55fe1e3bc1c1ff02ac9df54c0a6121f
+DIST serde-1.0.105.crate 73358 BLAKE2B ef75efaa654a5980648e8418553af18508f95b29fa1441f0804c78d9f8fe91764a3565ee1138c96c9245c28ed2ed8082d08c50f8ff36b9d40b12456a758ee289 SHA512 e8b471769b696b0c7f3b673879dfd056279fb49dad0228bc2ec459a2aa8bd26073d40ac1809a42c0b5ab3e9abfd32252f812c6493d17979c10796e7ab78a795f
+DIST serde_derive-1.0.105.crate 49700 BLAKE2B bbbb3a54b7eb4ca87b667c75dab007745a1e163b90c793258aa9f78b9bacd067262e3443d27c4d941b6c4ae0ad217779a4fe5ff79aaa84bb30fbac06252c5289 SHA512 1a39820708a609b3941ce6ff669068f67d65d446e208c904ffc59808ff7bb1d82148357515056fd4856e10cfdb2cfffbd968dbfba870ed23fddf1076e3f6e543
+DIST serde_ignored-0.1.1.crate 11083 BLAKE2B 990f549b8b4fbd6b67f5bfe06fa6278f357ccd1014ee3a95561a09edab7f7f2e209d80c59ee749c6bc7524a07f0b357601e327d2f96bac0cfa514b3ea73afeed SHA512 1ef241d6a22f47c22305da613554e7c62cab00584e06c81381eab9c1e3e12e7ea9a516f845a5818b33bcbe72ee7dc9be686598bfc0121b400b0a8e165c8941e8
+DIST serde_json-1.0.48.crate 72113 BLAKE2B bc522d0924044b41548b5c0ca63ed3e1fe70b7632b9e04ca6b01a63245deeae0e7154b0d913b3edfeaecfc816c1edfebfb666734c2a5371b416aaab9c1880f3c SHA512 544dd844330a26fbdaeb5246825f143cf06110065089c8be3dc44f8437f797ac083d7dcc5181656ed3d78428fcddc44e6802544ae304466eebdcd625a5a5fef9
+DIST shell-escape-0.1.4.crate 6764 BLAKE2B cbfaabec7c6b81b802ced02a33e463c39b2f27f004e0e97087adf5712f1ccf4f4405ea9d010afb49153292741aa1d51d985caea5a3c48a601dc4f25b66012135 SHA512 19cd5e79b2b610dbb26098182c1ed3a8a2cb93a88fc623c0a9e3ff719998d6bb1de632f79519905441a4e38275178dd5aebca8b9994efc24e19bac4ebe5d6329
+DIST sized-chunks-0.5.3.crate 40643 BLAKE2B f08b893f2e32eee10372c75fd6bb41b667f004e044bf271d8a4a0bb6bc9f393662ed685aae3046ec05823f0e9c70b3b7e15c40b94bd22a5aa2079873d4b4c842 SHA512 9ffe2b6d0510d8cad010f4e3015f605ea0d0f4e27ded1fdfd7d7080e338bf239bec30fe85ef4576160297ad287ed006097ffc12151a2cdc578d7031d1501440b
+DIST smallvec-1.2.0.crate 23658 BLAKE2B 7e662c79fb35e6965b409a63128da6ae6d8183992ab12f09ca7b97f15b2c7c29b1844c35cf4ff72d02d934481bebe5b2353a9c70d17d9f44a11bdcd496f2c201 SHA512 ad89826c1e999c63feb6d481e7ca3110831a08491ff8fc66825e92ad003a06b40033b365ba628c4707df06a3ac2c0d3b71e327c1caa4dc86f48150515031e52f
+DIST socket2-0.3.11.crate 27725 BLAKE2B 75c2b2ba7ac8981bb7111bb7780fcaae03c670abcc5dd464c2121fe8d3c592fb19faa2b759ff8f8d9a60f954c6059ae600cbad5a6b4592a23888b5264d7e1d25 SHA512 6b29b2e4e36fcc165f658da5a2e92980713134d3b68a43b993e4f1cd049530b7c0a119918c4a9528d8d2be27cf8642fd8b6d3ebc2469ca5525045da56022a91c
+DIST strip-ansi-escapes-0.1.0.crate 7972 BLAKE2B 39f227ba45b044bced56e944fc0ef147be93338bbfd76be5feb90e73e1faa0e0b337b6ebc6d57fe14dce11ad13e48f6db87d24c28f06b09978520c71b0e3f047 SHA512 6a8da540a7f3f820d64202024e449da7b0dc45832c4c3637cf4c8d6136098579463a1b7108c03923d2582479193e52dbf23039c4b4d0f875384066a611514a45
+DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
+DIST structopt-0.3.12.crate 50273 BLAKE2B 9d7493700cfed14a8f20cae73c807fd103623ec6502a76ec677ff6bdd5385a88d5d20a395394fa28be580ac2fac34aeb19a8fb0ffb8dd23a50e9551ce973e7a5 SHA512 a71f4cb68ff3cfdacc4600350e35ab040e7fb5c929f3e9649fc0d93f9ca74c6a6efc46e1aecaadf3690106cd281118a1c7c03dd7b265d532e033d437f5ec2e7d
+DIST structopt-derive-0.4.5.crate 19402 BLAKE2B 921dd4dcd8d19556351afa37d6ed4b1f6f3d1e847a6a33d80ff32e8fb0674d595f467cdb0d2949ffdcb95d36d6ac12db7fa37ff6a4088b9622519619ee75af1d SHA512 34205ba32a30bda80a06ca8c0cad3b17dcfdccfefec027b95769c08682736fb1462c161bbecf047ccb5f8d1ec02dcee6313dfad4fb61ef910deb1b65665b419a
+DIST syn-1.0.17.crate 198158 BLAKE2B 7093cc8aab4ae2f435aa70a54c8c2b8e4f6928ea76186059942bf5c74e2ad25d73608f469cb0f1d97071a5dc2e3d048a155084bbc28647ca39032f06bcd5a3a3 SHA512 5acf5bafb32f780e08495e1e0782c170eae54baabd72c45a1d350aa41aa4ff2e5fa84b23d088fbb8522f430526e938c459087f89e3372690bde7bd0cb8c4750f
+DIST syn-mid-0.5.0.crate 14149 BLAKE2B 87170d072ab6f5ffc6d7f4dc1a08869d4e5c0f505b9130d9b5778a55e206a488b048e47895a524e117ed58b3d45907c8877c897d1d88536a06c9319826b596e7 SHA512 759e29a2ca984eddae3c091be036ad630fb985408be31d838af3bb04fe1f26a3d2b7ef597c1ffb61a72c96383cbf39d8fe83cfe0d79ed4bc3250a585156e637b
+DIST tar-0.4.26.crate 42689 BLAKE2B 174baa480caac4734282003b5277004d87ccf9d5519b0adc3a02ceb0831e053483eb4cb7d21170ba792e2a573748aaa9589a261ffa8050d8bf2bc36e86451e16 SHA512 83ee187b253347068121d04242a488ac44ca6da159c6f9029f3e063b04544b7fa3ed40fed7e251692ffd73553dd369edb413f52f3b3718396451ec916eba15ab
+DIST tempfile-3.1.0.crate 25823 BLAKE2B a34721369923771d5f9a2fc64adaff2bff41da97a0ce79e01aaedb8d6670867220c671c0d23f7a8a9c71b09c0559efe4e7c9bab1f7f9d890866be1de1ce050a9 SHA512 a87ee51c36a81a8a8eb8f091eb57926682f38b707f7f641332d8752170e6c139a656ae49c6861f51e07c2fab5c86cc9b2ac158f5d89c6bff15d18934dd4e7ba5
+DIST termcolor-1.1.0.crate 17193 BLAKE2B c3a1a80269195f6bc92d141fce0885413c031980a4ad2f0f6e5a9051acfac10bad8a484362bfcaf3a60851a97d930e9602df4c00aec39431ea5a8a20d40a55c2 SHA512 41b05b047cbfdd5e3990eb36f635dc8ccf26a42bd5403d6d14a9f3c341e92b61c3b8d4d5f4fcd29071a97b3d96280ed59b4557b63a769390e2729fc82ab39702
+DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
+DIST thread_local-1.0.1.crate 12609 BLAKE2B 34206b5232262cda9cc0fb970e20f154d43ff1c4477a5ad5ff9200e6d874a6c7b2bcd99a2dae75a984b54574281e049ad35307ace0dd188f44c9a95fa93139cf SHA512 f2bfca4eee32a8fc88a01ff5bf24518c12142228d95916d13aae35ed6addd0b7da2235359f15220049ef197555344ac31a8833775e7a5bd49144db9c54b3165b
+DIST toml-0.5.6.crate 54341 BLAKE2B a367d22daf6169dbdc9cd58c97f824ab76567679e1032af7a0f924ca53720d2f0989c14545d1f5d82e7f46293e3d27849459157d0cd77dc78e9d76dd6d200648 SHA512 718f5d3fde823ae5d7fbea31e3cd0eaa66f6a2bcd854093d0179dfc4328930a984deff466bcabf3c81caa323aa743c609136b8d036b80087b88e888ba7577f54
+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.12.crate 91057 BLAKE2B d5b8354990e1911e093d63d9b3b3adeacb38142ac68637fbfe59c0822f34c743e348cae9f535421c12cc6a56db2112dd5ec75f96c173b1f34a68db66c8ad8dd7 SHA512 0e095a59ff965499a5d2c79bfd4826b793103bebb4d2666c09e675110a50f79d985eb29565e4c40bd8fddc30237f874324d8a24786ead697ee0698ef8f79a1b6
+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 url-2.1.1.crate 70383 BLAKE2B c4096cb1bd50e9ca97fcdae0ee8b58957e21507607eafa8d84ff71c3df1ba52c68299609776f7baa45c93b971f8b61162fd8afd4174a5c7b66f36dc673707fa0 SHA512 a16c3a625fa85be9305f8150d5711c3e3aaa1f33753e7ecb8368b176cf3ea96f51fde74598c8ea3a5db2effc338589fd2834b297a1fba4bed967fa39e670fabb
+DIST utf8parse-0.1.1.crate 13995 BLAKE2B 6b1de4afdb2837a76637de72f6e6a81e73aa683d8da04ebc94cf7ee3c542845d2244e721840511ee2725320f2f882722e2bea67914435131d7af1ab29291d1eb SHA512 543d4daddce8248b181deb1c3952ca15303d78616480b23af163ca6253a059b5ce9494652839a051c48a47816c3dd719465bbe5bb7930db676a16bcdac47c517
+DIST vcpkg-0.2.8.crate 11209 BLAKE2B e393dfbaabf1e47bc74fd89dc05e09f2dd9fd8b965a84f638edafcb2f5cf062005224d0c1b229394b40a3ecdf0fb34bfb3bf2c62a5d5b1016663e02d08bbcc8c SHA512 a239e969a02c8d8670178cc2be654bd12d6e6bb18be9eb70ec547212289fd2ef98859e6b3592aa6fbaf3178e0f2c27e2c8598d82990077a74896e739ae1374b9
+DIST vec_map-0.8.1.crate 14959 BLAKE2B f5c179ccb4349d543747d5e3bb3edfca4bc9f3f64ba3c2d40fb1d9cba98433b7a0641387aafda6347c9b3603592c64bd820b217b46fbfcd37f802f298e5793ab SHA512 026cf10dc7ba98ae51dd312fc847cbaea41c25f0da5db6e0e22c2ecf75584bbf876d7bd96035fbbcf6696d702d5a3f25977e02a2d77cf519aa21e3ed05710e40
+DIST version_check-0.9.1.crate 11459 BLAKE2B 72f002c00504f635b7d2d7ee7137e07ba9c182d2e41d32a51851896f6bf6742c5524b7f66946437ba581ccf80b9c9a57280dd4b02df0918569ac710511940fc1 SHA512 b9cf363169df2022a961f5bed4fb7da07513e0283a85aa69752f6ac567e942611ed2216ac61799db1a199e2bdf0fd9b994e35d4a40c6cd80cd26b97cbfe977cf
+DIST vte-0.3.3.crate 2397439 BLAKE2B 213fccf5b1f09b2d23bca57be2abec0a3580ab01864c51dd364676f5c66decc5184ef15f0e484f9a94e892f118863655f4b2ed2a340a47276b3fe7b4db901dec SHA512 5e00e8409ef21edb5aa6fbe482785fd5969dd17a6695f82328c4ae12ea8622712dc3473f33832fdfe0cc2395411431fd47842e86e35022149d5e958c4e5f8fe9
+DIST walkdir-2.3.1.crate 23413 BLAKE2B fc9601f4a28cec383297dbd87d422e56db1e989e4273900750f05d1f4a92e114a5b1a5a54368e290c5f4b47159ed51f52d85ce66f003cd2f52ffc737ead20f8b SHA512 ba807ff0d098aabdcd37e23204632beea1dbb7a6adfd16cb1009cae9e7b6957cfeab705cc454bf8f2b62a08743214ab995e43bf46fc510012c938f9e2a434951
+DIST wasi-0.9.0+wasi-snapshot-preview1.crate 31521 BLAKE2B 716bdd2ec46d0bc9911c5e5e29fc783840559931b2563d8619675fc11da9527ddbe653a0f1ce0b782ee0c5f7a3131aba2b0867d415f003aa9c2389357569e7dc SHA512 dbe641f796ee3a5daafcaafc911ecc6dff170340f477c2df7a61fb4858a85aefc2637c9e61973ecce66a987aa8e08a736273a4aad3ef47eaf61ed4268dbf9c47
+DIST winapi-0.3.8.crate 1128308 BLAKE2B e0e8ef6121f222b0500525192ebb69b26b71cc16f9ba92186f8ad6acc9de4cb8cc7c738f9c31f5bd223d2e34c93c496e8448c973d69797776004670c70abf69c SHA512 5a899ee5f09f30d742b8b8eba78da05cd9f4c664408fdeb9370373f8756a962a23e3f1c07619e745b3270138606c9a369076c02c3f5353f657df09d203d9a736
+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
+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
new file mode 100644
index 000000000000..1623f218879e
--- /dev/null
+++ b/dev-util/cargo-c/cargo-c-0.6.2.ebuild
@@ -0,0 +1,165 @@
+# Copyright 2017-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Auto-Generated by cargo-ebuild 0.3.0
+
+EAPI=7
+
+CRATES="
+adler32-1.0.4
+aho-corasick-0.7.10
+ansi_term-0.11.0
+anyhow-1.0.27
+atty-0.2.14
+autocfg-1.0.0
+bitflags-1.2.1
+bitmaps-2.0.0
+bstr-0.2.12
+bytesize-1.0.0
+cargo-0.43.1
+cargo-c-0.6.2
+cargo-platform-0.1.1
+cbindgen-0.13.2
+cc-1.0.50
+cfg-if-0.1.10
+clap-2.33.0
+commoncrypto-0.2.0
+commoncrypto-sys-0.2.0
+core-foundation-0.7.0
+core-foundation-sys-0.7.0
+crates-io-0.31.0
+crc32fast-1.2.0
+crossbeam-channel-0.4.2
+crossbeam-utils-0.7.2
+crypto-hash-0.3.4
+curl-0.4.28
+curl-sys-0.4.30+curl-7.69.1
+env_logger-0.7.1
+filetime-0.2.8
+flate2-1.0.14
+fnv-1.0.6
+foreign-types-0.3.2
+foreign-types-shared-0.1.1
+fs2-0.4.3
+fwdansi-1.1.0
+getrandom-0.1.14
+git2-0.11.0
+git2-curl-0.12.0
+glob-0.3.0
+globset-0.4.5
+heck-0.3.1
+hermit-abi-0.1.8
+hex-0.3.2
+hex-0.4.2
+home-0.5.3
+humantime-1.3.0
+humantime-2.0.0
+idna-0.2.0
+ignore-0.4.12
+im-rc-14.3.0
+itoa-0.4.5
+jobserver-0.1.21
+lazy_static-1.4.0
+lazycell-1.2.1
+libc-0.2.68
+libgit2-sys-0.10.0
+libnghttp2-sys-0.1.3
+libssh2-sys-0.2.16
+libz-sys-1.0.25
+log-0.4.8
+matches-0.1.8
+maybe-uninit-2.0.0
+memchr-2.3.3
+miniz_oxide-0.3.6
+miow-0.3.3
+num_cpus-1.12.0
+opener-0.4.1
+openssl-0.10.28
+openssl-probe-0.1.2
+openssl-sys-0.9.54
+percent-encoding-2.1.0
+pkg-config-0.3.17
+ppv-lite86-0.2.6
+proc-macro-error-0.4.11
+proc-macro-error-attr-0.4.11
+proc-macro2-1.0.9
+quick-error-1.2.3
+quote-1.0.3
+rand-0.7.3
+rand_chacha-0.2.2
+rand_core-0.5.1
+rand_hc-0.2.0
+rand_xoshiro-0.4.0
+redox_syscall-0.1.56
+regex-1.3.5
+regex-syntax-0.6.17
+remove_dir_all-0.5.2
+rustc-workspace-hack-1.0.0
+rustfix-0.5.0
+ryu-1.0.3
+same-file-1.0.6
+schannel-0.1.18
+semver-0.9.0
+semver-parser-0.7.0
+serde-1.0.105
+serde_derive-1.0.105
+serde_ignored-0.1.1
+serde_json-1.0.48
+shell-escape-0.1.4
+sized-chunks-0.5.3
+smallvec-1.2.0
+socket2-0.3.11
+strip-ansi-escapes-0.1.0
+strsim-0.8.0
+structopt-0.3.12
+structopt-derive-0.4.5
+syn-1.0.17
+syn-mid-0.5.0
+tar-0.4.26
+tempfile-3.1.0
+termcolor-1.1.0
+textwrap-0.11.0
+thread_local-1.0.1
+toml-0.5.6
+typenum-1.11.2
+unicode-bidi-0.3.4
+unicode-normalization-0.1.12
+unicode-segmentation-1.6.0
+unicode-width-0.1.7
+unicode-xid-0.2.0
+url-2.1.1
+utf8parse-0.1.1
+vcpkg-0.2.8
+vec_map-0.8.1
+version_check-0.9.1
+vte-0.3.3
+walkdir-2.3.1
+wasi-0.9.0+wasi-snapshot-preview1
+winapi-0.3.8
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-util-0.1.3
+winapi-x86_64-pc-windows-gnu-0.4.0
+"
+
+inherit cargo
+
+DESCRIPTION="Helper program to build and install c-like libraries"
+# Double check the homepage as the cargo_metadata crate
+# does not provide this value so instead repository is used
+HOMEPAGE="https://github.com/lu-zero/cargo-c"
+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 MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="libressl"
+
+DEPEND=""
+RDEPEND="sys-libs/zlib
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	net-libs/libssh2
+	net-misc/curl[ssl]
+"
diff --git a/dev-util/cargo-c/metadata.xml b/dev-util/cargo-c/metadata.xml
new file mode 100644
index 000000000000..486a25a9b162
--- /dev/null
+++ b/dev-util/cargo-c/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>lu_zero@gentoo.org</email>
+		<name>Luca Barbato</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">lu-zero/cargo-c</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index 2cdc34903753..ce50ae3364b9 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1,4 +1,6 @@
 DIST catalyst-3.0.8.tar.bz2 873610 BLAKE2B af6fca5dd8dea377795d1b50b942773b0cb8383e1727ba547f1511f126ad4f1494d64ca3d4b3e479664de366e8ed2f8ad8c09c206bbd213d6f95aa51ae56ea8c SHA512 b00a31d9af9b3c1d220080eb6068c924f6ca9f4d574f4805f2b833e61e0fdb79290ec6f5b190c0c7501e015068eb756ede6aea7a959d2e22cef8a055968b7203
-EBUILD catalyst-3.0.8.ebuild 1886 BLAKE2B 05d5e10409d4231123907594801cf74499053067ea5a37c151974647e941e62e6c75f950f92ea0a258ef9b051bcf196db9bd2a853840269878f5017c0b7e6b53 SHA512 df5b876ea7cf547cf28fd4a4a54660bef24e97a14127e1af5d0010e5142c7438b7a73e85d66b06b242a6b55e74e559bff0fdb4c28049cc610578f547c78e6482
-EBUILD catalyst-9999.ebuild 1897 BLAKE2B d3b994a4d569557fc56d9e94304c218aa8b6f9db7082076289e2d693ea7a8f68bac4633cac7a799a62a6eefd10d6f8db65b327c52971d799ac64b530309bf5c8 SHA512 a685312bf4cc4fb3924b9a03f88b03d92525e136553e7f381a8792398bca6b2a4f0a291188557ecb638ad64c1a539a0aafd07afd3484a661f56528730565d8d1
+DIST catalyst-3.0.9.tar.bz2 873866 BLAKE2B 293a4d52c57e73269f1f82fed8ea72934a0f939b3b9d4fb9943f4971fd4155edecc6cf0170b917eba16f0125aac9861041b7e10f85f6110a35659a2f85fd3665 SHA512 c8c25ad1c76b0040bd84b491909d364306746c660afbbb8c6a074911779aabe89b60a12cc3ac5b9cd3398bdf8986b50d24d9979c3d12d2fa9de66ebf62ded309
+EBUILD catalyst-3.0.8.ebuild 1884 BLAKE2B 9178f000151591fd90e3af46781eb5542c38bb3808c2b260bba48c0ff0877cc90a977d1e125ea3641ef9f590d8e1e0dae235a81f9229d9c409cc1619949ba89b SHA512 2252f340e107687adc3b6ec10535aecad5886d9fc21fbb619d6ca1a4be9e237076bf4c2f8847b23357ae37909f4f4518e66379c1861c1f22397b51e3d4a9bfb9
+EBUILD catalyst-3.0.9.ebuild 1893 BLAKE2B 12181979e89486f1f8e88756a1a9274ea55dc6a157591d85784a8483578f6c7d677e1c46846bd850c4a7a370e8d62f6cbe85c4e4e64c9cdc01d779e0c3c97a65 SHA512 fc73d9c32144ac93c2db9c981ec53b7cfe99edbdcf4c59c5d7088c94c842244fa1c6f4850e88a8e44ae56b2d543a3496dcbeffb34b52ea1009c446d76bbd2251
+EBUILD catalyst-9999.ebuild 1893 BLAKE2B 12181979e89486f1f8e88756a1a9274ea55dc6a157591d85784a8483578f6c7d677e1c46846bd850c4a7a370e8d62f6cbe85c4e4e64c9cdc01d779e0c3c97a65 SHA512 fc73d9c32144ac93c2db9c981ec53b7cfe99edbdcf4c59c5d7088c94c842244fa1c6f4850e88a8e44ae56b2d543a3496dcbeffb34b52ea1009c446d76bbd2251
 MISC metadata.xml 634 BLAKE2B 2616a9220096593cc1cb863a560101bb97a1672ad84093f951968ef0482950b6c72f8226e66a4e0d8bcc30dad6db9cb3511581f5d9e2f7cbf7c1ba9e7b30dd70 SHA512 ac7464e724232bf7a9211ab3c845b5b7ead26d8ff750a249c4e7646683926e4659581d3783b4e2de9b9324b8df71a6791221900629e633038a6f6aa1c8b59b25
diff --git a/dev-util/catalyst/catalyst-3.0.8.ebuild b/dev-util/catalyst/catalyst-3.0.8.ebuild
index f94e4f7fdbb8..38f72b6a4c22 100644
--- a/dev-util/catalyst/catalyst-3.0.8.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.8.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_BRANCH="master"
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 sh sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
 fi
 
 PYTHON_COMPAT=( python3_{6,7,8} )
diff --git a/dev-util/catalyst/catalyst-3.0.9.ebuild b/dev-util/catalyst/catalyst-3.0.9.ebuild
new file mode 100644
index 000000000000..9b107bd9beb5
--- /dev/null
+++ b/dev-util/catalyst/catalyst-3.0.9.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == *9999* ]]; then
+	SRC_ECLASS="git-r3"
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/catalyst.git"
+	EGIT_BRANCH="master"
+else
+	SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1 ${SRC_ECLASS}
+
+DESCRIPTION="Release metatool used for creating releases based on Gentoo Linux"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Catalyst"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="ccache doc +iso kernel_linux system-bootloader"
+
+DEPEND="
+	app-text/asciidoc
+	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
+	>=dev-python/pydecomp-0.3[${PYTHON_USEDEP}]
+	app-arch/lbzip2
+	app-crypt/shash
+	sys-fs/dosfstools
+	!kernel_FreeBSD? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) )
+	kernel_FreeBSD? ( app-arch/libarchive[xattr] )
+	amd64? ( >=sys-boot/syslinux-3.72 )
+	x86? ( >=sys-boot/syslinux-3.72 )
+	ccache? ( dev-util/ccache )
+	iso? ( virtual/cdrtools )
+	kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )
+"
+PDEPEND="system-bootloader? ( >=sys-apps/memtest86+-5.01-r4
+				sys-boot/grub:2
+				amd64? ( sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64] )
+				x86? ( sys-boot/grub[grub_platforms_efi-32] )
+				sys-boot/syslinux
+				sys-boot/shim )"
+
+python_prepare_all() {
+	python_setup
+	echo VERSION="${PV}" "${PYTHON}" setup.py set_version
+	VERSION="${PV}" "${PYTHON}" setup.py set_version || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	# build the man pages and docs
+	emake
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if use doc; then
+		dodoc files/HOWTO.html files/docbook-xsl.css
+	fi
+}
diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index f49e1e66af5f..9b107bd9beb5 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_BRANCH="master"
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 PYTHON_COMPAT=( python3_{6,7,8} )
diff --git a/dev-util/catfish/Manifest b/dev-util/catfish/Manifest
index 700d7290e811..83de53425eb3 100644
--- a/dev-util/catfish/Manifest
+++ b/dev-util/catfish/Manifest
@@ -1,7 +1,3 @@
-DIST catfish-1.4.10.tar.bz2 213951 BLAKE2B ff8f710d5f3b5d59e98bd6af9b1dd11499ea331b2d7c78945ebc1051d1b49d28069e47bd8aa3f12d57b646fc6764ccd4f365cda9fdfea15f5a3a4334b6e9b17e SHA512 baf9007b2ce2418fa5704e10884f509e4361505537e2ce70a7f8c8c61009094a09d7d032e0a6b4ca174f33bf76783ee2665f781cce47d2b236f2633e25192f29
-DIST catfish-1.4.12.tar.bz2 221813 BLAKE2B 4110ca5844a23b482d9cdc72a62ec49f7b6e2e31b861a38f454c4345642b970b9b6cc497bcbc13ce450476d812c1b6e32a762875d2af0f281a31464a43a543e4 SHA512 053b6ad1d818adc515df16952de656b5ffc44b3bcd59221828850fbcb0080958bd1154ec7dfe4952b358e33068a2b7dee4475dd9f6c6b55e6198ece0587745bd
 DIST catfish-1.4.13.tar.bz2 221999 BLAKE2B b487947954832c691a5a1b3bd2a49e7ae1aedecbe2084b86b9ae1c8bd7c95f6d3746f80723d351bed3abac0e2396fcce134072345a908f5ba9f0dfebdd95108f SHA512 a90c695e7c1a2172ea7a5f7f1a292e95aa290693a24f3988a68f2fb4597183ff7526c98925fb3ef8517fbca508a1c3853e0de87ec023be9424d994d63e29c886
-EBUILD catfish-1.4.10.ebuild 1075 BLAKE2B 7326c02274ea3c38da66a7dfd9ba7cbe0ad85cad00be64f48e0d3a3cc71728362211d1ac6d6e36c725ec09d43aea969ea6a25b1757b5255a7348b490baa0b76e SHA512 959251a1d9bf0f7571239bb968a1407c0334596f1665c42faf0b1b0f11310dac5eec49f3ef3c482a3f5b14bbc37fe566712775b11ec8846d6d5645ecdb8576ae
-EBUILD catfish-1.4.12.ebuild 1112 BLAKE2B 01892ca1651c49c113db2edd7197efb825e19f351ec26fb85aa6db9ddc2b8a3a6a0c73dfb704e1279bd469d5c64799092b8aa1702069433f879a7bea57a9fdf3 SHA512 ba310de82531eb73d6b83087e5bf4b925a0ee546bde5f5fc962d26e2f3c94ee9cd211f03afc682f18fb352d5d24f41aa88a203e42af1af6aea014beaabe6d32d
-EBUILD catfish-1.4.13.ebuild 1130 BLAKE2B 318daed3e38ce41b0ebe84f5aa4f9495d6bc390ec6b91f1b5a926095b7158164e1f46f2338f58c425ef902a06ff4fa1ce3738824bc42c8e1824a7b69799a90ab SHA512 ceaf4e68b61f87f66ccf5e8a16129b1f0697ebaf82b9119ab37191abc7c0e04a04403346cc5900a5af4dddec7f1a37094d50dbaac0ecccef0ae48be8fa26765c
+EBUILD catfish-1.4.13.ebuild 1128 BLAKE2B baa7858f58e4a1a65806a03482f840896adb5c2d3011981d9d0cc91314c54f3c7196b7eb3699697433690f23ba18ffd84501ca83c1162f5f87ad92457fd193ca SHA512 8cad083f1ab89a1401a12761ab4019c0c9a0b916e4696f6249b332eac1caca81db50c3ff9c51a8b328a733bbd070ef64a0ed544a8d48dc36e058cc73c3aa0a2b
 MISC metadata.xml 216 BLAKE2B 9fe308faad3ff5d9aac2a6d04341fe2b775153198ea734e1b17d15eab6b9eb1f781686089a6487ebc2e9cceddfd3f8c4ad1513baaacf931802201aadbe9589f6 SHA512 780eab488d269f38416e3bfc9c02d1a6bc70cee7755ac7cdc9b0bc42a3a50bb8b0b403da139629767d2f0439b15edce7d7b4078a6f528a4e04cecc1aa9bd01e7
diff --git a/dev-util/catfish/catfish-1.4.10.ebuild b/dev-util/catfish/catfish-1.4.10.ebuild
deleted file mode 100644
index 0bc71a930237..000000000000
--- a/dev-util/catfish/catfish-1.4.10.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1 xdg-utils
-
-DESCRIPTION="A frontend for find, (s)locate, doodle, tracker, beagle, strigi and pinot"
-HOMEPAGE="https://docs.xfce.org/apps/catfish/start"
-SRC_URI="https://archive.xfce.org/src/apps/catfish/${PV%.*}/${P}.tar.bz2"
-
-# yep, GPL-2 only
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-
-RDEPEND="
-	dev-libs/gobject-introspection
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/pexpect[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	x11-libs/gdk-pixbuf[introspection]
-	x11-libs/gtk+:3[introspection]
-	x11-libs/pango[introspection]
-	virtual/freedesktop-icon-theme
-"
-DEPEND="
-	dev-python/python-distutils-extra[${PYTHON_USEDEP}]
-	sys-devel/gettext
-"
-
-python_install() {
-	distutils-r1_python_install
-	rm -r "${ED}"/usr/share/doc/catfish || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/dev-util/catfish/catfish-1.4.12.ebuild b/dev-util/catfish/catfish-1.4.12.ebuild
deleted file mode 100644
index 1db3db29c0d4..000000000000
--- a/dev-util/catfish/catfish-1.4.12.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1 xdg-utils
-
-DESCRIPTION="A frontend for find, (s)locate, doodle, tracker, beagle, strigi and pinot"
-HOMEPAGE="https://docs.xfce.org/apps/catfish/start"
-SRC_URI="https://archive.xfce.org/src/apps/catfish/${PV%.*}/${P}.tar.bz2"
-
-# yep, GPL-2 only
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-RDEPEND="
-	dev-libs/gobject-introspection
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/pexpect[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	x11-libs/gdk-pixbuf[introspection]
-	x11-libs/gtk+:3[introspection]
-	x11-libs/pango[introspection]
-	virtual/freedesktop-icon-theme
-"
-DEPEND="
-	dev-python/python-distutils-extra[${PYTHON_USEDEP}]
-	sys-devel/gettext
-"
-
-python_install() {
-	distutils-r1_python_install
-	rm -r "${ED}"/usr/share/doc/catfish || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/dev-util/catfish/catfish-1.4.13.ebuild b/dev-util/catfish/catfish-1.4.13.ebuild
index d28399901b9f..b41dc7c49c69 100644
--- a/dev-util/catfish/catfish-1.4.13.ebuild
+++ b/dev-util/catfish/catfish-1.4.13.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://archive.xfce.org/src/apps/catfish/${PV%.*}/${P}.tar.bz2"
 # yep, GPL-2 only
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 
 RDEPEND="
 	dev-libs/gobject-introspection
diff --git a/dev-util/cbindgen/Manifest b/dev-util/cbindgen/Manifest
index 9acf0e1ec02b..cc5c2dd057af 100644
--- a/dev-util/cbindgen/Manifest
+++ b/dev-util/cbindgen/Manifest
@@ -2,8 +2,7 @@ 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.12.2.crate 143729 BLAKE2B 5a597d87d1d3fbe8db49c68fa729c84474394383ccc4962024938dcbccc91260e5008399027ebe444d5406e28f1b1f4b9a4ea0ccb7d29d6ce512b1ce2756af17 SHA512 9d0f58e89de86e31bb0e84b13e569951c20b7ed8e74b3854e90aa3e5d1036170956ff9c94544711c0b21a331eb2516e58b6d3580b76de7bbaf0dc367d483e4e1
-DIST cbindgen-0.13.1.crate 155690 BLAKE2B c5a4de672e932f10a571655ddc6e2c9b938ac128285e147e251711b05c814d39322dcf0de16bba17cca4524ab22871f30a18e1ac8afc7c81c4412b39afa9690c SHA512 faaf76c95e3111931fbe044909be385c2af3366ee07cd4c5d9aeb02a9715ff75c3a78370a3b5c50af145970851feadb2aef983ff0c3aaae63626d25f40a656b8
+DIST cbindgen-0.13.2.crate 160484 BLAKE2B 9c69f957305c3bd2c3056b45875dd2115309f01541bec4bce718f5d843dfb5b3bb6746474fe8149c42c194922ff618d9e3f6cfff13f7cf9069afb81d2da3e569 SHA512 2e894c6cf2b08321418ef78228fbebb5f504aea1576b8e159b4d8d66442cb65cee4f611f0ce13fa58539c08fe21932358fcfead52acbe5413adc9fdba05faf66
 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
@@ -35,6 +34,5 @@ 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.12.2.ebuild 927 BLAKE2B 678ea3f2296d0df29c9cd07ddd72727a54b4ce4ad28f419fe0a32ed818c717c5c015931b0af7bb8cda7a22255fc2af89558e9fa7eeb29cfb57174677b888fce6 SHA512 0c13b2a392bebcd8a0328fc966485183bfcfe0956918849c685d41238dd02a5321b679328bba25270a7825b49d5f45b0b347b5f398bb194bc833eb8c23515f95
-EBUILD cbindgen-0.13.1.ebuild 930 BLAKE2B 4a6df83720f661eca9fa017dcf9161881a2b525c5264ed5db754077456fec69d8d7b05d8dc528933aae6456a80021dda6895a6ae448d38a70e51e1d2007e49e7 SHA512 5c5872c423cb49beb788437b4280319bd071deb5ef0981cd62307f92a0914c0b469382111937521dfdd8d0c66afeabd17b5636ecb93c5caf913e9252cb33edd8
+EBUILD cbindgen-0.13.2.ebuild 927 BLAKE2B 1f9cbef3d3e50fa5d9ecd6ea27fba182bdab39eb5995d92f5aff57a73edaeaddb863d5dbefd84370597c87b06aa3d1df84a4a741ac5e5c53ad1166bea57c1520 SHA512 d12af7814d1812b0a9bad58262f296ba80d0c9607a1c47599c9808e86ef6868be7ec6a52432be0689f7832197511f8900312d5ebf869bf182e1b771f00807afa
 MISC metadata.xml 334 BLAKE2B 5d7ffa9456ed3cca80fc3089f9bd508e652c600b8b013d03946b674409e45cd2ff52030e8c6a1dbc8fed2aef4caa9ab697c5a0a1b2fb4f0d8b44cf3c40d92f05 SHA512 a5e105a59463430347e5a44e36b8249faa1e84c73ae4e7fced96be371a7a59539d57accbf51065e9e5cf7e8108f69ab28d23f250182ba755e49a67991f4ff029
diff --git a/dev-util/cbindgen/cbindgen-0.13.1.ebuild b/dev-util/cbindgen/cbindgen-0.13.1.ebuild
deleted file mode 100644
index 69455d588d11..000000000000
--- a/dev-util/cbindgen/cbindgen-0.13.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 2017-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-CRATES="
-ansi_term-0.11.0
-atty-0.2.13
-bitflags-1.2.1
-c2-chacha-0.2.3
-cbindgen-0.13.1
-cfg-if-0.1.10
-clap-2.33.0
-getrandom-0.1.13
-itoa-0.4.4
-libc-0.2.66
-log-0.4.8
-ppv-lite86-0.2.6
-proc-macro2-1.0.6
-quote-1.0.2
-rand-0.7.2
-rand_chacha-0.2.1
-rand_core-0.5.1
-rand_hc-0.2.0
-redox_syscall-0.1.56
-remove_dir_all-0.5.2
-ryu-1.0.2
-serde-1.0.104
-serde_derive-1.0.104
-serde_json-1.0.44
-strsim-0.8.0
-syn-1.0.11
-tempfile-3.1.0
-textwrap-0.11.0
-toml-0.5.5
-unicode-width-0.1.7
-unicode-xid-0.2.0
-vec_map-0.8.1
-wasi-0.7.0
-winapi-0.3.8
-winapi-i686-pc-windows-gnu-0.4.0
-winapi-x86_64-pc-windows-gnu-0.4.0
-"
-
-inherit cargo
-
-DESCRIPTION="A tool for generating C bindings to Rust code"
-HOMEPAGE="https://github.com/eqrion/cbindgen/"
-SRC_URI="$(cargo_crate_uris ${CRATES})"
-LICENSE="MIT MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
diff --git a/dev-util/cbindgen/cbindgen-0.12.2.ebuild b/dev-util/cbindgen/cbindgen-0.13.2.ebuild
index 11e5c46b9b90..6daa05025f41 100644
--- a/dev-util/cbindgen/cbindgen-0.12.2.ebuild
+++ b/dev-util/cbindgen/cbindgen-0.13.2.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.12.2
+cbindgen-0.13.2
 cfg-if-0.1.10
 clap-2.33.0
 getrandom-0.1.13
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index 6945288129ad..b5dcfe0bc804 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -1,16 +1,18 @@
 AUX ccache-3.4-size-on-disk.patch 567 BLAKE2B 8ac22301eabf54922f69d135ad99a8ad9ac83df956af274bd088909ae973af18c476b408f126ad59e60c69fc1ed02f90b0021074a24ca47f804f539063303dd3 SHA512 9e8eba9926fd8e8b90572365729388bf1bfdadae9cab8b739a614de10759bf69d709075fd92c77d1945e45cc4f6c3865c694a2129d7c30f0b14f2324b4df2133
 AUX ccache-3.5-nvcc-test.patch 262 BLAKE2B b33b6372e8e6c597d7ed6c781f0a3ac22c435d1309fe387e62c5f9b61c783294ec81cfd1c8a0afc60e63148dcc89f95ebc6d313a0567431a8d05c96e3d59bae1 SHA512 651e26335df8eb551f95064d67925d6e7dd15c8a082b291cdea31fcbc2e5482b2358de71c205c668173b3dc5a75ef004d95dbdd92391e4a4aa6bc1283f5f3a72
 AUX ccache-3.6-disable-sized-cleanup.patch 834 BLAKE2B a8f6ef6fc900c7cff9ae68a25f997c8e5b2cf1e98392047837efd07c91ede129dbbca2d6aa1a2532d149675f658220aa251b0fe066597f862aa2c44ec30fbda3 SHA512 3d0ab124e119b1757fd272a3585aee14e83c092459411d300fef198ca16483ec9149baedb54a9a8333b5a24a34506da550afcdf4e10ae2657c01164244e1519d
+AUX ccache-3.7.8-dev-null.patch 1915 BLAKE2B db860ccdab29862922d08fd9af5426d04e8871b74c717efc2bcff1084e66f262be287ce8c3c6ce5c84dfd3c03457183dfe38bb77afe76be2f8edeb7e97e46822 SHA512 dece4fa910f2477fc481d974915b47928b130afcdc278b3b0fe5c71eb63f2c65e400e7d07826d42cf7086ff8e1a702b348557a7b96bbe22ce25113209e1dd2b6
 AUX ccache-config-3 2147 BLAKE2B 6e703e12b6a2f83b838f8b1d1e534de3366b6e2994990b30c381b0df28be9c0ae7c0f1d7325282e97ca54881171846c13945b264bd4a793785ff1a19d0941669 SHA512 05d512b001b6a2fdc947d10d810c89683144080a060c24a37422e9b587594e1ee42fa1d7607461571f196819dae92146d861e8ae116e9226e1ff97ea035b3003
 DIST ccache-3.7.2.tar.xz 351168 BLAKE2B 6e5c8847f961bd5aa2cf325e582ece9e8bfb9c015fe3dcb01c8ca1e1834fdfb82a351ec49e203721486817df58c6aebf28e0af011f470fb739d5016f72191654 SHA512 3290f0609c27a2f063e632392be01ef163273115700f87a6d2954fcfd52fcc14bf66fc147ecbd2b692258317e113bf8be9f7efdf377560e2e8d9dd67cef58147
-DIST ccache-3.7.4.tar.xz 351576 BLAKE2B fa2a9c051ff3f9c0550c6301e8d6c9e0eb7ac68687a30a6e8c1ee794ecd6b62925fdc940d493a9fb22d9094c5f2a0f3b2788c6291430ca532661ea6ddef45456 SHA512 cc382f37f7efb30a64f6fc2b136ef7424fe51795a778dbb18dde7c9e80636515f242f51c3ef3231f74d154e65ed9e815abf8241eb1a8f4e0b4fe4f533ea27146
-DIST ccache-3.7.5.tar.xz 352440 BLAKE2B 6761d7a1a8c8086081fa46d50db1dce719856910da6324c9863a3f3731fdb0f5153e0d93a5c575074d1993650623e4e4b02d83dd3b656a31cb9be04ad6b58efa SHA512 d66eb9d923c3e4663242a034860bd198175e08274a295b6d5d94e6cd69fe32afa3fb8c228d64d5c5dda025e6f97d0aef0586ce4dbd66e8ce3a23093331f1841f
 DIST ccache-3.7.6.tar.xz 352692 BLAKE2B 97f6c3ea119b7f1f4fdab1dc88ac34a23bd8f893a1e399dd9f934b345ea27999b3750be6b474caf2bcaea77eb9281f99623312aa55dc5b5ffb7cf5e670b173f4 SHA512 c92a699b9761bbbde1666a9bc2718070a5beb24f7054d91226790c7903fe2e26a02d0782822bc811aaffcd88df3cd3e011a19061eb69569ed7140765cef8d6ba
 DIST ccache-3.7.7.tar.xz 351592 BLAKE2B 0b211cb77ceb42b7ee5dfcde98d9f53bf222cf18b8d38a7cf6fc9631c5e1c79ca82e6d0a0dbacfe2d5f61b2acefebe202e06fc3b8035f0f25a5f9954554a18cd SHA512 f93380aeb45e815964abc3b62f1963abafe22e0c6a7b61d039e710c7f935221e02678e21af65add4fd59fd5a141824ab95f4a7afc8dd557de36737c365cab816
-EBUILD ccache-3.7.2.ebuild 2125 BLAKE2B 1cb3f98ee681754ad0aa4314c668630a2aefd09bbcd538aa57b85ee93e151dac572e4260e978e337acf622ae0b8853fe3e1d3c08ea6a040210a648197e9920bc SHA512 34f30110f3c9660f1022bc68defc9c328a133e95bdb178691ecc974af5a78f9028af6e8b41dad67f94339ef04483fc86757af1a729861a02d5e5ba1a8f58b068
-EBUILD ccache-3.7.4.ebuild 2197 BLAKE2B 0a57b7416d2e5f60eebcff3f1f76a24e288a67be07ecebbc32e2bceb97a79576ef6cac6b5fefa7d2cf305ceb4db1db20df6f530d41e844f9baf757c898419252 SHA512 8e1c51681be2334da6c5ea19fddebe86965af14b16c84c790ad483fc0b62e66bf85a53ae09437d2cf3a0e334cfa91e179848b6d618b152a5d35740bd876f070c
-EBUILD ccache-3.7.5.ebuild 2207 BLAKE2B 00f468b17f0531f0ae2d3130027c0b8a9851ab2650076e708c9125f2a83af90301748a37005373b080d09931fa0de6ebd1eb8f1a95231fbf11c6f1d50286640e SHA512 e40eedd3ccf2f031902360d43b0d86a51140195acb5c19dad1e70f52aeab75759270d43263b0d60631be9b5475c72015d025a8e5dfe94d3c81f47faf90dddda3
-EBUILD ccache-3.7.6.ebuild 2198 BLAKE2B 39e6080eceb45e90120d59e45934eecbfc1bc34bddfd3c5ee5a3e6b63bfd7c69b259513fbdbc6cfae27e75137d489d3f531502933c69e14a2033456f247bf52a SHA512 0ee3637f7ec2e352113a3204a1e0bf7e6c9bfce9cf1c8965209dd9321c2293b08b73d55a3b0b9ff9047a6bec025697e6ab21aa865714b654853f5c3e80196a77
-EBUILD ccache-3.7.7-r1.ebuild 2217 BLAKE2B c4380e454dbda07ecf5a1de31b4bec0c69dc17961328ff0eb7332ac45c32a5eebfd37f1c810f9aa06a3f8e79415ec2d1f866fdd911cd2c303dcb7bc54532f24e SHA512 c9221159b609d4f7799438b345c66b12733cc848f8274802498d6d711acad970ebacc5f0f187e7ed7d9a393d266d53bda734b1a0325b35fbfbd7512672dc79f4
-EBUILD ccache-3.7.7.ebuild 2198 BLAKE2B 39e6080eceb45e90120d59e45934eecbfc1bc34bddfd3c5ee5a3e6b63bfd7c69b259513fbdbc6cfae27e75137d489d3f531502933c69e14a2033456f247bf52a SHA512 0ee3637f7ec2e352113a3204a1e0bf7e6c9bfce9cf1c8965209dd9321c2293b08b73d55a3b0b9ff9047a6bec025697e6ab21aa865714b654853f5c3e80196a77
+DIST ccache-3.7.8.tar.xz 352528 BLAKE2B 8d8896b100c43a3e9a60445c95369cd8898fdbf653fc4d5791b8e1abc0191882319078d619429213a5f6968a1dbc639808037459c80514cea775d261c83b949a SHA512 dc8cc9cd5f6f054421f0ecb50f66e0af85222c347d59fecd4555dfe1d8d6cbdca304818de8bc8a39fc1a1225567c141ce104ac315369bf6c307e9da67e14b51c
+DIST ccache-3.7.9.tar.xz 352948 BLAKE2B 791491c3f9da58f06bb0a58e411d9a7b3e39e460102793ef736820913d43d488ce7daffba572c21f507ea78d8da04edc3aaa47eb1a0fbec8cb35461a60b770e9 SHA512 5d39baeb66265451b0e9cef250f6d9c5f6869cd87e27c108c9a50bef80050122ed4280ff662a81bba8d1d1311f2004bcaf9ada6b783a42eedc67ca01ebc48bb4
+EBUILD ccache-3.7.2.ebuild 2123 BLAKE2B 9e8a30d3a311ffb521290f359f86f373722a3ed713e785dbe83b129f8807f4ff94533841f9da24e8f9d998407dc3b476d758b65f26c226a77f5e1ef29e421d43 SHA512 38aa9e79d78cc3443df189f86d6887af8bf7d753fd51e22de76fd734a8329e5111da12871344a5b5a5966be8c50927732620b2253c701a88795f0c6dfd72bc82
+EBUILD ccache-3.7.6.ebuild 2194 BLAKE2B bcb4d276405b962fefedbff9509071c00b5e5a3712514b3dca773f7710fd8ce9f3d8da24231068ff46579e58a77989d21e75c9f94e5b3ab37d1f54ba76268362 SHA512 0a8bf30ea68543c490a2c7b9e343e6c1ec4dd4487cf92ccb2eaf461102d9bd80b67164f74b99ce54fb1158738c4d34884151809d5a23b69ba47d09ceab503219
+EBUILD ccache-3.7.7-r1.ebuild 2204 BLAKE2B 168006b6402a929a5c4367d98fafcfac1f6bb0a4ae11c2aa495cc6c326a7ff21cedc81204451ffa592b1b6f04150aa7923f0eff851ad502496bc101641f7ae0c SHA512 f60bdfe797f15da5ce90a784029dce92971bd15b90e91d1503ff2da78d8ef6d57a9b98ffa75c1f9565f4e5a71bc09e0be58946a0613d3fe2fdbb20d1797c8ccf
+EBUILD ccache-3.7.7.ebuild 2195 BLAKE2B 75e92e265e3daf5d40d1d32b226ae9009bdc0848611c7594441280ddc76cec3986aaa1fb48692a6d2dcf796fda4deaccad28d9a76847072a2eb8a0f71ca54df0 SHA512 530953304727f3385e2c9998181709d273ee56e3d471ad569b8b4a8ababdb6eff1c3b47e1130ae7087e72fa4f9c1783e3851bba72a4308be7ab627a2a1f7dbef
+EBUILD ccache-3.7.8-r1.ebuild 1470 BLAKE2B 06a6684242b4dd5ac5bdd1a3fbb2c88e4d3b711757acc3ebf6d10889001404655658ed33fd0e4f5a52ec373a63cd4d21caf2e5a84e00809d7d7bed7a000604d1 SHA512 a377a4a03ff589ea08574431194ee49509beb7838d73bd6aa1f2051086126561b9f391baef2f00b4e6e1769f3803d4bec9a3bef4746a4a1763bd03eb82042120
+EBUILD ccache-3.7.8.ebuild 1428 BLAKE2B c13461bee81b00852bc29677a8db4b15aab94601694fcd2dfa28c670053bb2d3ba0a979bbe6448b9c382b6693fa9a976604a6b54994f73d5fb753b0c8e19519b SHA512 6534dfb466f2fde49af395bf1d70fbeb17b4be1fea1b235794c61cb51da6d310336aff3a7a1f02a5b099124eb0ccffd097762d9cd8e7f676739ceff24fe0fd11
+EBUILD ccache-3.7.9.ebuild 1428 BLAKE2B c13461bee81b00852bc29677a8db4b15aab94601694fcd2dfa28c670053bb2d3ba0a979bbe6448b9c382b6693fa9a976604a6b54994f73d5fb753b0c8e19519b SHA512 6534dfb466f2fde49af395bf1d70fbeb17b4be1fea1b235794c61cb51da6d310336aff3a7a1f02a5b099124eb0ccffd097762d9cd8e7f676739ceff24fe0fd11
 MISC metadata.xml 445 BLAKE2B 8ef8f120989420428ea85108180c659c72a7553f3f20ab96597d26aa04b059f491aeae8c887697a214c437f2dba30fbb934cb47c1db93821eda7dd489e6cb693 SHA512 41ffcad23c9f0274c48a058090d6404cd782dea6674b81615a6b3b7fa272ff5df4c68404fb4dcdb9d2275c13fb137f21f0f65232d5fb1ef6152cc25213893249
diff --git a/dev-util/ccache/ccache-3.7.2.ebuild b/dev-util/ccache/ccache-3.7.2.ebuild
index 898d97b2848b..bcce80b853ca 100644
--- a/dev-util/ccache/ccache-3.7.2.ebuild
+++ b/dev-util/ccache/ccache-3.7.2.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 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 IUSE=""
 
 DEPEND="app-arch/xz-utils
diff --git a/dev-util/ccache/ccache-3.7.6.ebuild b/dev-util/ccache/ccache-3.7.6.ebuild
index d516baace6e4..271109bf94aa 100644
--- a/dev-util/ccache/ccache-3.7.6.ebuild
+++ b/dev-util/ccache/ccache-3.7.6.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 ~sh 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.7-r1.ebuild b/dev-util/ccache/ccache-3.7.7-r1.ebuild
index c076f0d16ec9..915fe80c14aa 100644
--- a/dev-util/ccache/ccache-3.7.7-r1.ebuild
+++ b/dev-util/ccache/ccache-3.7.7-r1.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 ~sh ~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.7.ebuild b/dev-util/ccache/ccache-3.7.7.ebuild
index d516baace6e4..84e1e14d82b0 100644
--- a/dev-util/ccache/ccache-3.7.7.ebuild
+++ b/dev-util/ccache/ccache-3.7.7.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 ~sh 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.5.ebuild b/dev-util/ccache/ccache-3.7.8-r1.ebuild
index 998d395a3b2d..620e3f3c820e 100644
--- a/dev-util/ccache/ccache-3.7.5.ebuild
+++ b/dev-util/ccache/ccache-3.7.8-r1.ebuild
@@ -1,17 +1,15 @@
-# Copyright 1999-2019 Gentoo Authors
+# 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 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="test"
 
 DEPEND="app-arch/xz-utils
@@ -19,7 +17,7 @@ DEPEND="app-arch/xz-utils
 RDEPEND="${DEPEND}
 	dev-util/shadowman
 	sys-apps/gentoo-functions"
-# clang-specific tests use it to compare objects for equality.
+# clang-specific tests use dev-libs/elfutils to compare objects for equality.
 # Let's pull in the dependency unconditionally.
 DEPEND+="
 	test? ( dev-libs/elfutils )"
@@ -28,18 +26,21 @@ RESTRICT="!test? ( test )"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.5-nvcc-test.patch
+	"${FILESDIR}"/${PN}-3.7.8-dev-null.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_configure() {
+	econf --without-bundled-zlib
+}
+
 src_compile() {
 	emake V=1
 }
@@ -54,20 +55,7 @@ src_install() {
 
 	dobin ccache-config
 	insinto /usr/share/shadowman/tools
-	newins - ccache <<<'/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
+	newins - ccache <<<"${EPREFIX}/usr/lib/ccache/bin"
 }
 
 pkg_prerm() {
@@ -80,9 +68,4 @@ 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/ccache/ccache-3.7.4.ebuild b/dev-util/ccache/ccache-3.7.8.ebuild
index 033b34c72fe9..32f24f67e079 100644
--- a/dev-util/ccache/ccache-3.7.4.ebuild
+++ b/dev-util/ccache/ccache-3.7.8.ebuild
@@ -3,15 +3,13 @@
 
 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 ~sh sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="test"
 
 DEPEND="app-arch/xz-utils
@@ -19,7 +17,7 @@ DEPEND="app-arch/xz-utils
 RDEPEND="${DEPEND}
 	dev-util/shadowman
 	sys-apps/gentoo-functions"
-# clang-specific tests use it to compare objects for equality.
+# clang-specific tests use dev-libs/elfutils to compare objects for equality.
 # Let's pull in the dependency unconditionally.
 DEPEND+="
 	test? ( dev-libs/elfutils )"
@@ -33,13 +31,15 @@ PATCHES=(
 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_configure() {
+	econf --without-bundled-zlib
+}
+
 src_compile() {
 	emake V=1
 }
@@ -54,20 +54,7 @@ src_install() {
 
 	dobin ccache-config
 	insinto /usr/share/shadowman/tools
-	newins - ccache <<<'/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
+	newins - ccache <<<"${EPREFIX}/usr/lib/ccache/bin"
 }
 
 pkg_prerm() {
@@ -80,9 +67,4 @@ 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/ccache/ccache-3.7.9.ebuild b/dev-util/ccache/ccache-3.7.9.ebuild
new file mode 100644
index 000000000000..32f24f67e079
--- /dev/null
+++ b/dev-util/ccache/ccache-3.7.9.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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 dev-libs/elfutils 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
+
+	sed \
+		-e "/^EPREFIX=/s:'':'${EPREFIX}':" \
+		"${FILESDIR}"/ccache-config-3 > ccache-config || die
+}
+
+src_configure() {
+	econf --without-bundled-zlib
+}
+
+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"
+}
+
+pkg_prerm() {
+	if [[ -z ${REPLACED_BY_VERSION} && ${ROOT:-/} == / ]] ; then
+		eselect compiler-shadow remove ccache
+	fi
+}
+
+pkg_postinst() {
+	if [[ ${ROOT:-/} == / ]]; then
+		eselect compiler-shadow update ccache
+	fi
+}
diff --git a/dev-util/ccache/files/ccache-3.7.8-dev-null.patch b/dev-util/ccache/files/ccache-3.7.8-dev-null.patch
new file mode 100644
index 000000000000..389f9e3a1e2b
--- /dev/null
+++ b/dev-util/ccache/files/ccache-3.7.8-dev-null.patch
@@ -0,0 +1,57 @@
+https://bugs.gentoo.org/712080
+
+From 9a794689a8ba47e79c96d6c370976448b756973c Mon Sep 17 00:00:00 2001
+From: Joel Rosdahl <joel@rosdahl.net>
+Date: Sun, 22 Mar 2020 14:30:23 +0100
+Subject: [PATCH] Disable hard link mode when the output object file is
+ /dev/null
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+When hard link mode is enabled, ccache ≥3.6 unlinks the output file
+before writing to it as a workaround for a bug in Clang (#331). This
+unfortunately means that /dev/null will be removed when building as root
+(don’t do that, BTW) with hard link mode enabled and /dev/null as the
+the output file. A similar problem exists if the dependency file is
+/dev/null, regardless of hard link mode.
+
+Fix this by not unlinking the output file if it’s /dev/null and by not
+copying files to /dev/null at all. (There is no need to handle other
+non-regular output files since /dev/null is the only allowed non-regular
+output file.)
+
+Fixes #564.
+---
+ src/ccache.c | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/src/ccache.c b/src/ccache.c
+index 6e9da51..b9bafac 100644
+--- a/src/ccache.c
++++ b/src/ccache.c
+@@ -1299,6 +1299,11 @@ move_file_to_cache_same_fs(const char *source, const char *dest)
+ static void
+ do_copy_or_link_file_from_cache(const char *source, const char *dest, bool copy)
+ {
++	if (str_eq(dest, "/dev/null")) {
++		cc_log("Skipping copy from %s to %s", source, dest);
++		return;
++	}
++
+ 	int ret;
+ 	bool do_link = !copy && conf->hard_link && !file_is_compressed(source);
+ 	if (do_link) {
+@@ -1432,7 +1437,8 @@ to_cache(struct args *args, struct hash *depend_mode_hash)
+ 	args_add(args, "-o");
+ 	args_add(args, output_obj);
+ 
+-	if (conf->hard_link) {
++	if (conf->hard_link && !str_eq(output_obj, "/dev/null")) {
++		// This is a workaround for https://bugs.llvm.org/show_bug.cgi?id=39782.
+ 		x_unlink(output_obj);
+ 	}
+ 
+-- 
+2.26.0
+
diff --git a/dev-util/cdiff/Manifest b/dev-util/cdiff/Manifest
index 5bddca06e5d4..fa78841bcb08 100644
--- a/dev-util/cdiff/Manifest
+++ b/dev-util/cdiff/Manifest
@@ -1,5 +1,6 @@
 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
new file mode 100644
index 000000000000..173ec06646e1
--- /dev/null
+++ b/dev-util/cdiff/cdiff-1.1.ebuild
@@ -0,0 +1,21 @@
+# 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/cgvg/Manifest b/dev-util/cgvg/Manifest
index 494826234631..3b826dc2f28a 100644
--- a/dev-util/cgvg/Manifest
+++ b/dev-util/cgvg/Manifest
@@ -1,3 +1,3 @@
 DIST cgvg-1.6.3.tar.gz 42130 BLAKE2B e272a42cbc2c5edf08459273eb9f71036ec1afde4d20bb39593028eaf40026b83707b327ef8892a39b1e6f0f399dff3b52f9ff023e9092e26439d1e935da99d5 SHA512 9aeebd0952fc6a99ebeca54bbc54f9ff8858baed3b6c16ae391c033ba6ec6c411e34da88e25ec1208c8f0c536a47424ef09af15bf650485d54921b33c652e0ab
-EBUILD cgvg-1.6.3.ebuild 415 BLAKE2B 5771d00d00021ee19d02041a225940851209c01473ff029162d0d8caac2132c312e7082f24d9bb4e652751f74559c9a7469441ce1f7d2bdbfaef19e0b4d44d0c SHA512 1add580790845773df7226740c4dc3a1b5f456752ddee6ad9b56db532f9584a6da14bdd18e821613b8d3f23a90cafcaa24d4a59f2e4ae19da5d3c64a401225e5
+EBUILD cgvg-1.6.3.ebuild 413 BLAKE2B a4fdac05d5e5ea7b6188a1d1136bfc094aca049ea65e60a37e556bb9f26892d4768b117f0b8f6d734defc67b8609af8c63ce2951e9c2cea556fba08e8dec231d SHA512 b7330d543449276b981fbcd7c69ae1a266edd6c8b8d251a66c819b889126b57f2b5fda213d101982d019afdfc15f04301723a6832cc250a3019f1c03f6c691a7
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-util/cgvg/cgvg-1.6.3.ebuild b/dev-util/cgvg/cgvg-1.6.3.ebuild
index 175d774ab326..5a558f2026bb 100644
--- a/dev-util/cgvg/cgvg-1.6.3.ebuild
+++ b/dev-util/cgvg/cgvg-1.6.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://uzix.org/cgvg/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86"
 
 RDEPEND="dev-lang/perl"
 DEPEND="${RDEPEND}"
diff --git a/dev-util/checkbashisms/Manifest b/dev-util/checkbashisms/Manifest
index e0f7c4248ced..fafc11adea9f 100644
--- a/dev-util/checkbashisms/Manifest
+++ b/dev-util/checkbashisms/Manifest
@@ -1,6 +1,8 @@
 AUX checkbashisms-2.18.6-command-vV.patch 1155 BLAKE2B a9255aab4b358c09a211c06bc1f2357c9eb653a1d05b18f9be87e7bca47c251dd2ed9a841fd4d5e46fbf82632e2fed50d86f5e2de8a4edbe09a6e0c819e9dc7f SHA512 91f002981b918e35fff1ca9cb30a5b3f5a56f392d0222a3cce3ee1215bce529e58ff938c049e6823975825f8ebfc2d0da583fe1c360ad849b1a306aa09ef013f
 DIST devscripts_2.19.7.tar.xz 847488 BLAKE2B b3c76d9b0899c01f08d0432f8de0a65d1434afffd35eda33b6c7f442796c2165cdb316290d41313876cd5ef8108e0bba03d173dd52c139908672a6f3d6902588 SHA512 6e31862bc8f0d43678341f40ec527d76cdccc2e6e50c231eb7c6a1eb442f48b6c62e94126644224e9fdbef583be3166e2c7cc65ea15de4a7c20605089b708eb7
 DIST devscripts_2.20.1.tar.xz 854932 BLAKE2B b9523b2882625b66c7972db7c10f7d3f6055cb791b5697f92fc0e362c1b2a89ac26fc2a45739989ae9f9981c956d90ceefd514645649d1b7fca6d7eeaff9df7d SHA512 6e9505f491bf87df6c0ac384cbf307959fd86e3aea1aecd7e70e88bbe57757035612235bad0244dc7aeedcf964605508f7fd5db582b410dd715380a064389d1d
+DIST devscripts_2.20.2.tar.xz 854948 BLAKE2B ca36f2d8d4f3d975479134d02ee4c035f7f32e087be523560c2c06d7625047fcf78d0428d1e4addcfa38a299befdd23b88ab3fbbef2028f67f8b7c9f8851c29f SHA512 d9147604a718582a19c036a040c62612427163146048dbf9e3665545072e8132d08f51dccfd3f0a01453c0405a0326dad8f83afd10270eec5c69fa0612cb8510
 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
 MISC metadata.xml 433 BLAKE2B b54d1290789d3ce8931f832c8c1ca7a56fbdebe85c0a81c32a929168fdf2d5a7be0dea01881e8fcc583061db1a071d1787723c9342c77a5862e228f0203c178b SHA512 945c3b95a61d4219e98ce5be3aed255cb148867409aca572714e8679bf623ee0c3396966cd80d783ace60bae7e6c01b85fad6c7f7ac9056422d732ed07f54716
diff --git a/dev-util/checkbashisms/checkbashisms-2.20.2.ebuild b/dev-util/checkbashisms/checkbashisms-2.20.2.ebuild
new file mode 100644
index 000000000000..26d0ab390329
--- /dev/null
+++ b/dev-util/checkbashisms/checkbashisms-2.20.2.ebuild
@@ -0,0 +1,39 @@
+# 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
+
+	eapply -p2 "${FILESDIR}"/${PN}-2.18.6-command-vV.patch
+
+	sed "s@###VERSION###@${PV}@" -i checkbashisms.pl || die
+}
+
+src_compile() { :; }
+
+src_install() {
+	newbin ${PN}.pl ${PN}
+	doman ${PN}.1
+}
diff --git a/dev-util/clazy/Manifest b/dev-util/clazy/Manifest
index 48017c6e57e1..654aad009f81 100644
--- a/dev-util/clazy/Manifest
+++ b/dev-util/clazy/Manifest
@@ -1,4 +1,7 @@
+AUX clazy-1.6-clang-cpp.patch 2138 BLAKE2B c51fe27ced22c25f754583ec3b39f92dbc2f68e6ad823802b764dc85385c1f103db6f54fe0fa213386b092dd968e8b70e2fe7cb424b83ce26964ba22a26eac0f SHA512 f916a6a5dc2a25e7dfc3c75ddc9b31d189c7a1b88db8ef3bdd6168e571e03472f099877c1c998917edcc3ccc1e4eb22bac481e95ced9c8efa98aaf9d90f59de7
+AUX clazy-1.6-llvm-10.patch 3309 BLAKE2B e984da005e3ba4a07f55995e569035e52e8f897afc408313f73ea361b49b3a62df779a278cb7dfade7d814016bad3734a24fb0b1c3216f7cf09b8bb21cac01fd SHA512 6f5ef3e745159da352e867be1c3ffecbf143c3763e08dfccb8bd85db1a7676fc84d9577b53d9809d5c29ac3b570278f8e6fa426a11bd38a2706e21b426caa92b
 DIST clazy-1.5.tar.xz 352344 BLAKE2B 0f7200900f1a8bcad3020cf98522e3ac9ba01dddc9b2200f08a8a86102e4389af7a4a86e1832ee4c0e750267948a908627032385a01af94d8d0ae5f438114b9e SHA512 863cb9609d02a2260b61bc6cb3e6d8a84975d3b4e4f1c94a82e8c600d95a28483c323f47ac39c39ecef24d0f51871b358055868c63a49b136cf8ee3060df5a52
-EBUILD clazy-1.5-r1.ebuild 1236 BLAKE2B 381df225a577f1a9c801629ac08e7a4d755c98c3bacf94ed2c116472e00fb41a1325a1c0a1076bb1e9ed8ca3cfea7668d4b6b64367fe4e1d8b1788f25d95aadc SHA512 36994dab1861a6a42ab03050b64d285710d708b5f139e42329f6d64f0e8dbd89e07e6efa111933077424ebf346287cb90e4474f9a996889c8d5d82731ac4c6ca
-EBUILD clazy-1.5.ebuild 847 BLAKE2B 52865bc6ed518633036e513316d5648aac2e05e208d21c9677e2ca75d4a84aaaf9e98bc8c2a92defdba831ff24ff4b217ce4278a7c93757406616fe362d59818 SHA512 d8081cf01c51604f5f742f8c1c2f3d81b2384429d378d964eb93d90755df5211b30e3a0eb31aaeb59e33e1ddcece9fc4d64cb875f28aca20e2e852aa0ecd8548
+DIST clazy-1.6.tar.xz 364292 BLAKE2B 01da58e34d5a7cb1e812d10264cebe15e90369589535e07f2c9f4520971f2e95b2c70494e99e34f7077957ec1bf01352fa6a72a64f0572e8a5db422267ab727a SHA512 dc7cb9590bbc40a2ac51abe305b6520ebc1ff7128ff21b4f6111d18f14eb8c2ab66d907636a18c7508143b708e70ba69f9d6fad88ffce12dec981a9bdd0edcc0
+EBUILD clazy-1.5-r1.ebuild 1245 BLAKE2B 423002fe1ef029ede892c00fc8819aaf147dc9b9599778a23029b596014f27785f3c02fe61560bbb35f55d3783954f0bd4f8d1a6e22539b2b142d8cfa9acf98a SHA512 fdaba609e73bc2ccaf91d780f703736408dc4fca493f9b8d28fa950345c213867353836b312eb58c954ad048b9f1d760c0b39da799e2373e4293fdff8e38ed1e
+EBUILD clazy-1.6-r1.ebuild 1302 BLAKE2B b1b45ad5116fa3d9617c81b5a239ada8cb508bb691b9b90aa25cf98e5d45e6ff06a67c5d94ee44cd38cab2e64795dc8bb9d0988ec312a544df4949ef39cfc246 SHA512 8ed130e6a5930c1ed58fc8bd6b2e74d36d42c311f758f8a20117e34faee7eeb8135d70351346f90a433e4c29ac76a7fe641c2e8193bbd166af56727b1d3733a9
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-util/clazy/clazy-1.5-r1.ebuild b/dev-util/clazy/clazy-1.5-r1.ebuild
index d3f38a652bb6..cc5cf804601c 100644
--- a/dev-util/clazy/clazy-1.5-r1.ebuild
+++ b/dev-util/clazy/clazy-1.5-r1.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,11 +11,11 @@ SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE=""
 
 RDEPEND="
-	sys-devel/clang:=
+	<sys-devel/clang-10:=
 	>=sys-devel/llvm-3.8:=
 "
 DEPEND="${RDEPEND}"
@@ -37,7 +37,7 @@ src_configure() {
 	# 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)
+	local clang_version=$(best_version "<sys-devel/clang-10")
 	export LLVM_ROOT="/usr/lib/llvm/$(ver_cut 1 ${clang_version##sys-devel/clang-})"
 	cmake_src_configure
 }
diff --git a/dev-util/clazy/clazy-1.5.ebuild b/dev-util/clazy/clazy-1.6-r1.ebuild
index ba0428212c7a..2627d7b7becb 100644
--- a/dev-util/clazy/clazy-1.5.ebuild
+++ b/dev-util/clazy/clazy-1.6-r1.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,17 +11,21 @@ SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="~amd64"
 IUSE=""
 
 RDEPEND="
-	sys-devel/clang:=
 	>=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
 
@@ -32,6 +36,16 @@ src_prepare() {
 		-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
diff --git a/dev-util/clazy/files/clazy-1.6-clang-cpp.patch b/dev-util/clazy/files/clazy-1.6-clang-cpp.patch
new file mode 100644
index 000000000000..16b9af00ce37
--- /dev/null
+++ b/dev-util/clazy/files/clazy-1.6-clang-cpp.patch
@@ -0,0 +1,60 @@
+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
new file mode 100644
index 000000000000..f00695f52117
--- /dev/null
+++ b/dev-util/clazy/files/clazy-1.6-llvm-10.patch
@@ -0,0 +1,75 @@
+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/cligh/Manifest b/dev-util/cligh/Manifest
index fe6d2d4d96ec..dc93b3a5b1ea 100644
--- a/dev-util/cligh/Manifest
+++ b/dev-util/cligh/Manifest
@@ -1,6 +1,4 @@
-DIST cligh-0.1_p20120630.tar.gz 7848 BLAKE2B 4690330e4b353244bc1e7065759637fa9d1de0b412357f00ebbc432e88b6fb00718ba1177900e3bad77c0a0ce8bb3b0defe3de1004137c3ebe73d9d255739291 SHA512 1be944a18cad117ddceb5461f0f53c083f34afe32c79d5ce9494c587fa5d8b8f7c7acc3f7447e18677b7fce2fa96ed7bb34a228b5528f19fe4933a24fefa933d
-DIST cligh-0.2.tar.gz 7844 BLAKE2B 001e597ee60fd8b9e378c96f1ad4ab9dcf42de049bc2a914f8dece12048beebe0ec04b095cad64508af611b2fe52ca43fcf62b5bded74b3336359be85fef1235 SHA512 9b6e5e187324ccc1d9264aa259f648231f46aa443b75682206a17626f4f6f594a14538066f5e561c8a296d740506216db4cbd6ef7a9d25338a9d641cec7e3b9c
-EBUILD cligh-0.1_p20120630.ebuild 545 BLAKE2B 9480e10e97945bcdf10623417fc745ddd7f6a3751d3255d5b23e4ccd99cb5c3ce818268050a33090547df764cd90e839c4641fc45316ccb44b23022428a847e1 SHA512 fd32a8b47b20d93fc89888c1120f34bf2dde9698550e1b6eeea3bfd155cace25cf6109787dc0ce95f9829bc8e7d0efc3d6f5ad2c6fc317e240163f1c7d115217
-EBUILD cligh-0.2.ebuild 482 BLAKE2B fc1a2f481f693f513b3baacbe283408b26f4681a16f96be98435546bc66ab084ec9f10709bb7ea23d364ab980c1c06542bb78c1142479de868159dd7205abc2d SHA512 e26bd6b4af345ff67c145a55e27dfa37fdc12765a1437d17972c7ae9d7e418785c7649bcd127be9e72575a6de8a6ea032b0ac6fd9f3a545b235a07a203fe6746
-EBUILD cligh-9999.ebuild 469 BLAKE2B df181e7959b02de776a5e3130ecddb4ad8d60f2140482a9e58316063eeb25050bafcfaa93a141487a3c1a1033a64391cb57fff82ada2a44a49639b99eb681d41 SHA512 aa660c182dc699119edc982f66b454c6a30cfbad2da42bffa66e6c34598445bbff588aa466794093278d2b733cb757371a9218af30085f22e552c159b5e5e99a
+DIST cligh-0.3.tar.gz 8043 BLAKE2B 496c7d169463a2ecec66ac193480503eb4f5207c8e874fedd8a8a50047f5a3e480dc3c8f7cd401e1c1360a9fa1ae918adfd4f2e5ba928f8ff68df8032d8360af SHA512 85aa702c15e6f19b0118c642944d3151648f38d8f9e86a93f4d4c03c28245548e9910d21edc19f3ada338c33b995fee7bb03e6bafd99499d58cdba35b37faca8
+EBUILD cligh-0.3.ebuild 487 BLAKE2B b4d14f011297666b8915e2a179cc045b1b4d15aa05629e00997e3730b1a0172b97f144c53e1aa4e9b8d941fad32a083843f692cdeedd2a3347fe318db4c5164a SHA512 5ef00b3a9d7635ff81c4b24181cae54ebfa29d6d42a6ffe958eb8e15a8c808f6de5b45604e639b06f4e980979cbf11af3ed113d460ba8fd4874b539c667b10fb
+EBUILD cligh-9999.ebuild 476 BLAKE2B 022452dfafaf2f33921aba89c57b1f8b336a377bd277bea5348c2f68417286216fd1c9e41f0254d3782c8e63d6861689f2e0e1744a378a50fb2f1e4c4361d087 SHA512 b598785128a40a5ac918692ecd79d7ce3f5064a2126da47be3482f0c3592fc486420243514a96ecb1dafc9f21abba3086720681cc1f76fd47c6280c2d49c0334
 MISC metadata.xml 322 BLAKE2B 17e6d135ed46dac64053e30754ace41a45926ea930b32b4c41493eb67d03ff851301b07e4d42c37f6eef1150546eeec67994d9f3795af7197a376435acb68d2a SHA512 3d76d3e71460441beecd4bfdfd96f033d0701a2fa71918b9ffe222c4354ee5d716415ebb1aeff43818bc34a428ca60ef34894c44cee0256244f118e2b54d090d
diff --git a/dev-util/cligh/cligh-0.1_p20120630.ebuild b/dev-util/cligh/cligh-0.1_p20120630.ebuild
deleted file mode 100644
index 2727bd726c2f..000000000000
--- a/dev-util/cligh/cligh-0.1_p20120630.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="Command-line interface to GitHub"
-HOMEPAGE="http://the-brannons.com/software/cligh.html"
-SRC_URI="https://github.com/CMB/cligh/archive/401ce7405d3dc7a90bd519dce8ae9be3bdef43ac.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="dev-python/PyGithub[${PYTHON_USEDEP}]
-	dev-python/pyxdg[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
diff --git a/dev-util/cligh/cligh-0.2.ebuild b/dev-util/cligh/cligh-0.2.ebuild
deleted file mode 100644
index 88c4d2017c48..000000000000
--- a/dev-util/cligh/cligh-0.2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Command-line interface to GitHub"
-HOMEPAGE="http://the-brannons.com/software/cligh.html"
-SRC_URI="http://the-brannons.com/software/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/PyGithub[${PYTHON_USEDEP}]
-	dev-python/pyxdg[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
diff --git a/dev-util/cligh/cligh-0.3.ebuild b/dev-util/cligh/cligh-0.3.ebuild
new file mode 100644
index 000000000000..e5589bdcd205
--- /dev/null
+++ b/dev-util/cligh/cligh-0.3.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Command-line interface to GitHub"
+HOMEPAGE="https://the-brannons.com/software/cligh.html"
+SRC_URI="https://the-brannons.com/software/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/PyGithub[${PYTHON_USEDEP}]
+	dev-python/pyxdg[${PYTHON_USEDEP}]"
diff --git a/dev-util/cligh/cligh-9999.ebuild b/dev-util/cligh/cligh-9999.ebuild
index 808fce4ea2dd..186acb99add1 100644
--- a/dev-util/cligh/cligh-9999.ebuild
+++ b/dev-util/cligh/cligh-9999.ebuild
@@ -1,20 +1,20 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-PYTHON_COMPAT=( python3_6 )
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1 git-r3
 
 DESCRIPTION="Command-line interface to GitHub"
-HOMEPAGE="http://the-brannons.com/software/cligh.html"
+HOMEPAGE="https://the-brannons.com/software/cligh.html"
 EGIT_REPO_URI="https://github.com/CMB/${PN}.git"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS=""
-IUSE=""
 
-DEPEND="dev-python/PyGithub[${PYTHON_USEDEP}]
+RDEPEND="dev-python/PyGithub[${PYTHON_USEDEP}]
 	dev-python/pyxdg[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
diff --git a/dev-util/clinfo/Manifest b/dev-util/clinfo/Manifest
index 7f775b0d56ed..c8aa245f9159 100644
--- a/dev-util/clinfo/Manifest
+++ b/dev-util/clinfo/Manifest
@@ -1,6 +1,6 @@
 DIST clinfo-2.2.18.03.26.tar.gz 38519 BLAKE2B 736036f4f84c170876b9b550bfe837c67a273cef9032af8734035edf5070d17d876d10f7d5c81889966df0a9ad4192c43c1501326188782cc674611ea57130ef SHA512 dec90a314e6c52e5501339dbe594cb57cfc8cae6855db7bb88b36984fd661e55f2cc8eb29fa546998862c806ec752bfc2b6a9e0d9d962370f84b0091605c1bcb
 DIST clinfo-2.2.18.04.06.tar.gz 41459 BLAKE2B e90a515fd9318aeced510cd97cc477e1925b37e2c389ffee0ec484563acc9f0f9a8880cb38575b299c4f63e1b4a6959064d7d0d45487f67d6fcf32ce91962a47 SHA512 4aa1623bd08602e2104b4ba3150f36a9e8e8fb25728d4a1792a9cc81a2a5952a4a78ccad0928f098ce4e8bc05f30d09267e01ccd81d541fdfb0bc7de46908faf
-EBUILD clinfo-2.2.18.03.26.ebuild 654 BLAKE2B da695fb68881c2aa886f68376585ba2f499bb8ed90535da7ea007d9b9d922fdb160126f2044f81ef305e32fe1032118e8b15d70d7a416a4cabd4eb298565e2b7 SHA512 80847d385832577b91cc16559e3c7bc37b87386273bc2179f43aa335fafa1fd1d0d312b27f5193b55274307b34cb94e08b2392479ae9b97fcbfffacf05398ff7
-EBUILD clinfo-2.2.18.04.06.ebuild 654 BLAKE2B da695fb68881c2aa886f68376585ba2f499bb8ed90535da7ea007d9b9d922fdb160126f2044f81ef305e32fe1032118e8b15d70d7a416a4cabd4eb298565e2b7 SHA512 80847d385832577b91cc16559e3c7bc37b87386273bc2179f43aa335fafa1fd1d0d312b27f5193b55274307b34cb94e08b2392479ae9b97fcbfffacf05398ff7
-EBUILD clinfo-9999.ebuild 654 BLAKE2B da695fb68881c2aa886f68376585ba2f499bb8ed90535da7ea007d9b9d922fdb160126f2044f81ef305e32fe1032118e8b15d70d7a416a4cabd4eb298565e2b7 SHA512 80847d385832577b91cc16559e3c7bc37b87386273bc2179f43aa335fafa1fd1d0d312b27f5193b55274307b34cb94e08b2392479ae9b97fcbfffacf05398ff7
+EBUILD clinfo-2.2.18.03.26.ebuild 616 BLAKE2B cd523e66a26b75509ae2362e0c501a412afade736f1cfe7560e1bb05015a43aaead9f0e72e5cc843c8a6dd1a4e9bc4693de15abd0b139f0a78929afb9c54f856 SHA512 8165ecb50cef7d2645fa2a599b4fe99bf498ad268d0e807052b888d84b5134ac3a4b97b3cb79707cbd08f648d910c88d610cac80c40396cacdeaf76cd99cf999
+EBUILD clinfo-2.2.18.04.06-r1.ebuild 616 BLAKE2B cd523e66a26b75509ae2362e0c501a412afade736f1cfe7560e1bb05015a43aaead9f0e72e5cc843c8a6dd1a4e9bc4693de15abd0b139f0a78929afb9c54f856 SHA512 8165ecb50cef7d2645fa2a599b4fe99bf498ad268d0e807052b888d84b5134ac3a4b97b3cb79707cbd08f648d910c88d610cac80c40396cacdeaf76cd99cf999
+EBUILD clinfo-9999.ebuild 616 BLAKE2B cd523e66a26b75509ae2362e0c501a412afade736f1cfe7560e1bb05015a43aaead9f0e72e5cc843c8a6dd1a4e9bc4693de15abd0b139f0a78929afb9c54f856 SHA512 8165ecb50cef7d2645fa2a599b4fe99bf498ad268d0e807052b888d84b5134ac3a4b97b3cb79707cbd08f648d910c88d610cac80c40396cacdeaf76cd99cf999
 MISC metadata.xml 327 BLAKE2B 92f019eb0500214ac6f345ee38aeb8df84ebf69a503fcb9dc3284e23d9badc20fbd985aa9f60df6b4d9f515027a4e973b2439c568b0a63f5acac2be97de04dfc SHA512 20261dabbadf6a93f4b4a7d65c917872de7b81f689e111a3ea0076a066201eba82b2061cf5ae9956c00f5d6208bd4dcc922c72a3feb2643aedfa2dc998c0bf21
diff --git a/dev-util/clinfo/clinfo-2.2.18.03.26.ebuild b/dev-util/clinfo/clinfo-2.2.18.03.26.ebuild
index 3d01e885bdad..fc1ca3477ce1 100644
--- a/dev-util/clinfo/clinfo-2.2.18.03.26.ebuild
+++ b/dev-util/clinfo/clinfo-2.2.18.03.26.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=6
@@ -17,8 +17,7 @@ HOMEPAGE="https://github.com/Oblomov/clinfo"
 LICENSE="CC0-1.0"
 SLOT="0"
 
-DEPEND=">=app-eselect/eselect-opencl-1.1.0-r4
-	virtual/opencl"
+DEPEND=">=virtual/opencl-3"
 RDEPEND="${DEPEND}"
 
 src_install() {
diff --git a/dev-util/clinfo/clinfo-2.2.18.04.06.ebuild b/dev-util/clinfo/clinfo-2.2.18.04.06-r1.ebuild
index 3d01e885bdad..fc1ca3477ce1 100644
--- a/dev-util/clinfo/clinfo-2.2.18.04.06.ebuild
+++ b/dev-util/clinfo/clinfo-2.2.18.04.06-r1.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=6
@@ -17,8 +17,7 @@ HOMEPAGE="https://github.com/Oblomov/clinfo"
 LICENSE="CC0-1.0"
 SLOT="0"
 
-DEPEND=">=app-eselect/eselect-opencl-1.1.0-r4
-	virtual/opencl"
+DEPEND=">=virtual/opencl-3"
 RDEPEND="${DEPEND}"
 
 src_install() {
diff --git a/dev-util/clinfo/clinfo-9999.ebuild b/dev-util/clinfo/clinfo-9999.ebuild
index 3d01e885bdad..fc1ca3477ce1 100644
--- a/dev-util/clinfo/clinfo-9999.ebuild
+++ b/dev-util/clinfo/clinfo-9999.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=6
@@ -17,8 +17,7 @@ HOMEPAGE="https://github.com/Oblomov/clinfo"
 LICENSE="CC0-1.0"
 SLOT="0"
 
-DEPEND=">=app-eselect/eselect-opencl-1.1.0-r4
-	virtual/opencl"
+DEPEND=">=virtual/opencl-3"
 RDEPEND="${DEPEND}"
 
 src_install() {
diff --git a/dev-util/clion/Manifest b/dev-util/clion/Manifest
index 7c7f6b4cfb1d..8d70b8621c25 100644
--- a/dev-util/clion/Manifest
+++ b/dev-util/clion/Manifest
@@ -1,3 +1,3 @@
-DIST clion-2019.3.3.tar.gz 505265765 BLAKE2B fac1aab0429e09bafbb2fe6093f8f6d60384cce6a6caf3e529161cf51516ecb399c900e911807872cd773d0c641c340325640097e02a34fb06e5b53764aa19ce SHA512 33c49cb24792830dbf2246753df408213a799c4542a3284ef6a13f4f4022733d3007680822f6230c599fa1c76643834734b8c3638bf9c6cd1c54dc76b758881c
-EBUILD clion-2019.3.3.ebuild 2179 BLAKE2B 198748c33f57fedf4153c6f1d5f3982a901cc951d95e9b9e8c49d716e5ced2cbbac6bae3f186d76b84e3ea5d4f4c4ee33c3ea657c6d4b936120d66d08fbd2252 SHA512 0c223ad5cd9536eaf96b3ff9ad7deabe9f04124cf1b66b009168f676907da8c0e9d5939e428bb9f8baf1d26b48bc0c810f8b1e5abf3b4c3691f02a74116356d3
+DIST clion-2019.3.5.tar.gz 509223445 BLAKE2B 94429d0f1d32185ca8d172cdfe7583e6042a5c24b10387ef265ddafbb19e3dc379589a3992b306dfc225449b8a781be996c0d4d4308252c60dc74fa20ffebab7 SHA512 9522209ecef2b025e818ac488c7c842c7170629a8fb38e6efa578cdd6973004da5ee423ea5913e6a61595fea653facaf741f513e2b47701e78749f8188c45583
+EBUILD clion-2019.3.5.ebuild 2179 BLAKE2B 198748c33f57fedf4153c6f1d5f3982a901cc951d95e9b9e8c49d716e5ced2cbbac6bae3f186d76b84e3ea5d4f4c4ee33c3ea657c6d4b936120d66d08fbd2252 SHA512 0c223ad5cd9536eaf96b3ff9ad7deabe9f04124cf1b66b009168f676907da8c0e9d5939e428bb9f8baf1d26b48bc0c810f8b1e5abf3b4c3691f02a74116356d3
 MISC metadata.xml 458 BLAKE2B 1393fb2b8c1487a670f3c2fc7c2fe9246d8f18bc7d33e2d494f0ffc3a3492285dab041f3cf810d16e78a312dd3936eb9bad0838ff9a8c3b6a4b7d80b90764fc4 SHA512 c00a66b6722a62222d06c325df55a3d946267ce7a4a452855933d721b936cd05aae5e9acdb784fc8e97235ead35e6625522c579397f43e9755619b1a8dcaccc7
diff --git a/dev-util/clion/clion-2019.3.3.ebuild b/dev-util/clion/clion-2019.3.5.ebuild
index d50ca20ce175..d50ca20ce175 100644
--- a/dev-util/clion/clion-2019.3.3.ebuild
+++ b/dev-util/clion/clion-2019.3.5.ebuild
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index c309ba616ba1..295f6516f03a 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -18,10 +18,12 @@ AUX cmake-3.9.0_rc2-FindPythonInterp.patch 1458 BLAKE2B a70945921738f00952b40a73
 AUX cmake.vim 217 BLAKE2B 5d2cf8b4101a7204fd27a9f21d82fea4d86fc4eeed54e062b543452dc574e73d1c80167c83eb482d9eec310950ac811ba35d3eeb97b51958f12f3adf575ddbe7 SHA512 2f7e9e949f8f3030a0dfcef56f4effea703ee60555c22f6a2d1dfeaf3334f33a3e88910c666f704e4ab60cde4ebb509c7d85d812a3c1627010e52fc757f15cdf
 DIST cmake-3.13.5.tar.gz 8618821 BLAKE2B 765678bc92821207c53bfb4ac995a791b938f20236c3a6fda873b8edd11cd1401b4f4c05f170b8f600f38bde5f1227c715499eee072a8de3bb29d4f5cd230226 SHA512 99e3a8f5bc147dd90b9cab11f06892d87f289aa1354ad323711fe96ebc9c32b1e887e8f9d3575a37831c4d2153a070ff9115c5e27a185d54170bad9dbbaabc26
 DIST cmake-3.14.6.tar.gz 8861359 BLAKE2B 257a9a89fe880f8945f47a4bb1980e66f0f28ee5cebeb161012860ae8578487e50c60060ad5144ec6f5b7ea860112edd01909ebceec24b8370e3769ff2a79e99 SHA512 8cf3afadec3fe931d9f954e3148a398939cd16c1fbcb4c5303ac635e2b5029960867f317fd13a46fceebe46e7328689e847f03d7d7c74bb31e23c9cc55838f56
-DIST cmake-3.16.4.tar.gz 9113021 BLAKE2B 5aa34cadec4ed09e4d0c46f6983b88cf81ea719c47a0848a21be36911b223d9e609bdc7f5b52086762ab83e4230a3ec9e38d9c9e3c9c6f508aa2118e769e3783 SHA512 4aa36608bac3b9e29ea765003cdc684733c025d7b18fbae057f3be1f726a159d4b0231b8b1be269206aa7dbd7177fe0110d5bac8d72fb0f6ad392bb284b1fce3
-DIST cmake-3.17.0-rc1.tar.gz 9460071 BLAKE2B 53157977becff23b87c7ab4e320babef53b199b709c5446cfbb230f19666e5a43ab89c00c69ce3f750d3d2da591372f63daa681bef1626b3ceeef9374502593f SHA512 7ff9f21a488658275f61111241dca4e311441827edbc11f44dd4772e114e6f99cb0e3f85d8a8051a23783e7aa47e19683f83b5cf236e75ca9a9724ea9cb2a1c1
-EBUILD cmake-3.13.5.ebuild 6137 BLAKE2B b149b0b72b0892c75fc4b89bf4c394e000d3053dd370d4aeb7cc540b750a8ab0a6a646a09bf72f6027c57a416143ecd9ccdcb5b06bd9722c7e07cf9fbc3cbe39 SHA512 c18b86560efaa5de42de07dfe2e7932e7a98ab78dfa3cf85f25a5846647f74f4f4a016b21034e9e4f95c2c244e439ca33828b11f0be20c0ec0c7cb27eb1b67b9
-EBUILD cmake-3.14.6.ebuild 6192 BLAKE2B 0b3144295f908a5e74355cfb6e636318513ba55552c469e23a0896c4a7a2d3a763003e06e965fc4288dfe1773dfdd7c27bf6d6948869309e790b70c98ca91b20 SHA512 c6bb47e2c98653b654691341fbd458f6d47bb9e07d08c35e39e5e8902e732d7ed919968f665dc9c4bd0745850bdb963b9144f9978f52abd8cc1a500a8291e26d
-EBUILD cmake-3.16.4.ebuild 5807 BLAKE2B ca8e76982988a5cf71ff325b057dee36bc0e49f49255ccd4acdd005d6c9d2ff71210391e2193dc51358fa61cdbe3bd50f9a8f69eb26c31a07c7b510853bb4d77 SHA512 03061e7339a914278aff215cffcdba415a025aafd7bbc2847b5f5b118dc0b02e7287d68ba1e6476563315f63b5d498dd2b0dd00f8fd1a62f8738db7f7e729fec
-EBUILD cmake-3.17.0_rc1.ebuild 5807 BLAKE2B 39ea073d05783338eb14c34aa8071c05b9869c662ceac078027e73735b66fe2eaa1395ff1c20b5a2a4138f24cd27eac4b57564b7c95e13147e659a08b8f71696 SHA512 8d1fad9d9ed58411afdf858ba821bac72d472070855a281c9db6c02690b131989a40581f487b6dafb213ce7de705234c5e4497801723ffc1e73eb7e6d21fc997
+DIST cmake-3.16.5.tar.gz 9111262 BLAKE2B 5f996113a4979563d7b9f298b4b1a32d6f91eebaa79af42e1cbf247884e443de47e30030fd0f16c7755c4086e2bff0c0741911753ea7c889b68c393c0b98c876 SHA512 204ce83501c8068ff660c30a68641a354764135e1600a9a95b39476d072876e400961377e19bbe03a7b18412b36dcf21a693946a2a81cff5985e637e9f193671
+DIST cmake-3.17.0.tar.gz 9466484 BLAKE2B 63dc59a9551d6afcf009403bcc68f3bb87065f962c39f443d9a73c7babbb2e49b4237d00072d2ff4f91a6cd4c9d5ac05cd9b97acd0404c852fe03133b538f2ea SHA512 f09440681e0c414f5ca669f3aeba6666d09e0642f30a2e12c3199e7fb3da95a7dd17994fc54475c49638c37f0502ea0a2d8da0f9098805f11088ba7b299bf72a
+DIST cmake-3.17.1.tar.gz 9467298 BLAKE2B 16982bf8236568430b0b68608c4eb062e4d550a914bca59113e6f288f069681361ab88b695b91a4e62600042c542db658b209b0744e68966bb36ad18ae37a9ff SHA512 457f4f43a32cc8d966939158f2cc09768b93733426aeb9b6da71313ec060f958399d098af363c3c7f18752998347e05073a399de736e5ca0804ec2bba2cee7ac
+EBUILD cmake-3.13.5.ebuild 6133 BLAKE2B 74e3f790529aea7549461698c93c98ae21ef1bdd8a04c3c3746b00885218ed59987cb8e41e2b0e55e2d53b9629c41c7f399501dc16930e7b99a9c8f7587f90c2 SHA512 d0f1eb079cc1a3dcc3758f2cd8b420da7e48e1b9eb7e7711325175e54a2aada957c5fd65c242a567530a9185fd42e56c2277caed36ee646db8be9a219e42a73e
+EBUILD cmake-3.14.6.ebuild 6189 BLAKE2B a23a1a069fcddac06841f8c564572cad2e665f303ce7ecfd121a8c176e34036740be28a6cc86f84f19f21c43ae0aecadfe4aff6ba60143c7007e1842c2f858e5 SHA512 6e307805f633bbe96c264e4002016dc0b2f62926f29ee52df323032b6983f575e0f581cc5d627dfbeeab357cf1456ec66612b107db867ebc558644e8f3473857
+EBUILD cmake-3.16.5.ebuild 5795 BLAKE2B 61dfff41f06e29670fb1ab6a5f8ea219be073e3fd8409c3edd151770323dcd80e2c1e9329ff79586d75cb1ade1d3555f793f7619ffd45b8956eddfd688a616f8 SHA512 2eb5e856ae5fa85a6d55b8960ee0cd967597fa96cd248326a509ad318e7ce0a2a7b796fbea5598723370306bfce3c614bd1bbaa7bc14da5137728e21384ff745
+EBUILD cmake-3.17.0.ebuild 5803 BLAKE2B 672aa364282d8e8777315b468fde1147d75113cb7f8a024668f7b73dddec7413b983fefa7de64641289789d4e485c19723155c37c38c9f250b24f46f5f1648ba SHA512 a10d2c49efa4b3edf6f973c74e4279d0bb101d62e597d720f68684a2085d2412ebbf8adb4436e33d31cef67bf80a00d380f3b0d69f4bccae28f2283e95ed94ef
+EBUILD cmake-3.17.1.ebuild 5803 BLAKE2B 672aa364282d8e8777315b468fde1147d75113cb7f8a024668f7b73dddec7413b983fefa7de64641289789d4e485c19723155c37c38c9f250b24f46f5f1648ba SHA512 a10d2c49efa4b3edf6f973c74e4279d0bb101d62e597d720f68684a2085d2412ebbf8adb4436e33d31cef67bf80a00d380f3b0d69f4bccae28f2283e95ed94ef
 MISC metadata.xml 372 BLAKE2B de2835a1f98bccd88e343ab7c058b40df0e9aa4afe938770d67a6e764ac85926b369b6d9ac4851d5deec3954436d3cb8a112b5543ac1debf74205f05641ed2ee SHA512 6c457abaf6c174d6d14b77af47c4fb65b26873cbb7a5a4fbafc558ff4c5c7c6cb0200c0f69e7a492007af4b402baeaf54177f6755c3e6da0ace149eb9bcfe69a
diff --git a/dev-util/cmake/cmake-3.13.5.ebuild b/dev-util/cmake/cmake-3.13.5.ebuild
index e0c63f1d3044..b9d4d984f6dd 100644
--- a/dev-util/cmake/cmake-3.13.5.ebuild
+++ b/dev-util/cmake/cmake-3.13.5.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
 LICENSE="CMake"
 SLOT="0"
 [[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc emacs system-jsoncpp ncurses qt5"
 
 RDEPEND="
diff --git a/dev-util/cmake/cmake-3.14.6.ebuild b/dev-util/cmake/cmake-3.14.6.ebuild
index b1f72ffce411..f3f66749b58a 100644
--- a/dev-util/cmake/cmake-3.14.6.ebuild
+++ b/dev-util/cmake/cmake-3.14.6.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
 LICENSE="CMake"
 SLOT="0"
 [[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc emacs system-jsoncpp ncurses qt5 test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/cmake/cmake-3.16.4.ebuild b/dev-util/cmake/cmake-3.16.5.ebuild
index 5b1f3688d59a..1671d545b7e8 100644
--- a/dev-util/cmake/cmake-3.16.4.ebuild
+++ b/dev-util/cmake/cmake-3.16.5.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
 LICENSE="CMake"
 SLOT="0"
 [[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc emacs ncurses qt5 test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/cmake/cmake-3.17.0_rc1.ebuild b/dev-util/cmake/cmake-3.17.0.ebuild
index 8f7b237f89e3..a6e3aed2b308 100644
--- a/dev-util/cmake/cmake-3.17.0_rc1.ebuild
+++ b/dev-util/cmake/cmake-3.17.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
 LICENSE="CMake"
 SLOT="0"
 [[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc emacs ncurses qt5 test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/cmake/cmake-3.17.1.ebuild b/dev-util/cmake/cmake-3.17.1.ebuild
new file mode 100644
index 000000000000..a6e3aed2b308
--- /dev/null
+++ b/dev-util/cmake/cmake-3.17.1.ebuild
@@ -0,0 +1,216 @@
+# 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 elisp-common flag-o-matic multiprocessing \
+	toolchain-funcs virtualx xdg cmake
+
+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 ~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.0.0:=
+	>=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
+
+	# 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
+
+	tc-export CC CXX LD
+
+	# bootstrap script isn't exactly /bin/sh compatible
+	${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 \>=${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}
+
+	rm -r "${ED}"/usr/share/cmake/{completions,editors} || die
+}
+
+pkg_preinst() {
+	use qt5 && xdg_pkg_preinst
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+	use qt5 && xdg_pkg_postinst
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+	use qt5 && xdg_pkg_postrm
+}
diff --git a/dev-util/cmdtest/Manifest b/dev-util/cmdtest/Manifest
index 2b410edcd021..df13802dec52 100644
--- a/dev-util/cmdtest/Manifest
+++ b/dev-util/cmdtest/Manifest
@@ -1,5 +1,5 @@
 DIST cmdtest-0.32.tar.gz 48945 BLAKE2B 64c09a0f7dd66644d8ce785d633af2cc62ce0cba1a636cf18e650fdf0268987ad647509e17ed2c614b48164f9e9fbd6dcb64d6fa0a47ec6dcf24d82b69732857 SHA512 1d6d49f63067cd0343b0123eaa84326042a6382abccb624015ab5517809a11ad149f75fc48cdea87b608d4b8778903fe1a9e68b7942a45a6498bdf7e3dbe3216
 DIST cmdtest_0.30.orig.tar.xz 38508 BLAKE2B 7a27ed4930decdfbc49e922af9724ddba2daabc5af51faa6cafea1ca10dbf5137aa74ad9780156ff13f16e4c22fe5dba43401e22c6c2a7cabbd39d4139f4f515 SHA512 cbdebe175f09a99218d8ce0f2d1e49019f70b7f3ba112e2650e5a58e36a6f1d1b641c9aed5212e12023e956f999ef9cdba27aea7af9211f35a41874147a402af
-EBUILD cmdtest-0.30.ebuild 731 BLAKE2B f161eb02cfdc578428a12b8bfd4d5917621ff5fcafa6844ca34c647832972cb524ec43206be0fc1f39969d8d9d0bf1e106554f5c9d28a9f44ce07c01e88b3120 SHA512 5786d9e198063fc32249213ff5d10cc1ebca8259fca4110c12c04209798a439fbedc8bb197a67c380adb7cd59fd86f53759ec736a8f691b24dc9943408e1388c
-EBUILD cmdtest-0.32.ebuild 709 BLAKE2B 7ff6b576ce0fa211e3c9228018b68a39134af665cb001d2a6af32760154dbcb5b3327a17cb0dd0896a205ecbe06e09b81818a5c7ee9bb7d0d6a3c6c375c5642a SHA512 044f54e568aa21fe53f2118077472733cc9c951b3cbc46d2eb3f62ed165a7650a08ead503d52a71d6f42450754b118ae3392305bc5c57d94874a4c3ec63264a1
+EBUILD cmdtest-0.30.ebuild 732 BLAKE2B 707ea52ef032c862afba43fc87bd7b45941947eddeec9137fc16b554b2d790ee6c27077541321f6e792de80526fa3ff3ccefef96c0f423ea261dd8b595276df0 SHA512 c9aaaed50556d50d0f2c17c1bf495091b06b16970e7ace387aa391aefc603c5cd218369bf8940cd96fc9613ff5a4632567bd88ab6e93e239e8161a0552b44cdb
+EBUILD cmdtest-0.32.ebuild 710 BLAKE2B 53e8ed934dbc51fcf5cdbb3aa4d8296fd12805c27f33226c3c5bf8fd9b50dec1d01cb8e53169db063bdcad8bb58dfdaddafd1261f6372541bf6ee6a1774918a2 SHA512 414f63fd61ffdc0b6feba80713a2fc09671904a10d7e438c8f10c1636f62a6384332d9b00c96d82f0f15a9c51ed73835158410b84ad53b7e3d060e98e57faec9
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-util/cmdtest/cmdtest-0.30.ebuild b/dev-util/cmdtest/cmdtest-0.30.ebuild
index a0dcc28cef31..646a5882df16 100644
--- a/dev-util/cmdtest/cmdtest-0.30.ebuild
+++ b/dev-util/cmdtest/cmdtest-0.30.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://code.liw.fi/debian/pool/main/c/${PN}/${PN}_${PV}.orig.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 
 RDEPEND="
 	dev-python/cliapp[${PYTHON_USEDEP}]
diff --git a/dev-util/cmdtest/cmdtest-0.32.ebuild b/dev-util/cmdtest/cmdtest-0.32.ebuild
index 4e3f006b5ca8..6d6707bd00ef 100644
--- a/dev-util/cmdtest/cmdtest-0.32.ebuild
+++ b/dev-util/cmdtest/cmdtest-0.32.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://git.liw.fi/${PN}/snapshot/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 
 DEPEND="
 	dev-python/cliapp[${PYTHON_USEDEP}]
diff --git a/dev-util/cmocka/Manifest b/dev-util/cmocka/Manifest
index c424efacf363..de9c74857c03 100644
--- a/dev-util/cmocka/Manifest
+++ b/dev-util/cmocka/Manifest
@@ -1,3 +1,3 @@
 DIST cmocka-1.1.5.tar.xz 81004 BLAKE2B 5625dc293ad481c654848f3de806ef88d1b651192c2461e52b54bf9d443b5e2ea5d2a685ab85b044685f57e5723ade6c4c17e38624f59c4eab240cb4feeaab1e SHA512 cad7f04757183d004f6eaad39036fc0e24c5e0e987f80e85bc43bc66dba22389cb02b08e25531cc28a541d0a24a86b29be134a2d6fc339128e87d66952f502bd
-EBUILD cmocka-1.1.5.ebuild 1072 BLAKE2B 9904e4070a5c8cdb1d0d419c4919cd38c47d24990e7ad05596e44c8377ba049221b633583bfb0425ce215d43b117079876bb7dda20c6879010c8cec31e3baf34 SHA512 0bb8d763fbc8a5444ce39a8dae30647958a8491c514d0a662084436fe516c2de396313e1e0f9549563198007a78f914a0b38f5049cc1098c92ca014218810926
+EBUILD cmocka-1.1.5.ebuild 1073 BLAKE2B e7fda2d9cf6252da13b4fafb8f9148d290b2590bb0c42f9dfc35e2513a9c581a55d0ecd44c45b7bcf51d215ed7a4259a2cad7f518ad5fc594d17915ed7b46374 SHA512 3a983bdfb5c73f313e2cf9f96c01ea986c9b866159548c963cb941f60167c190b423b081df20be13bb6e14a10b8f3fa73a8fb349ed63c955e0f9f5d66076606c
 MISC metadata.xml 259 BLAKE2B 3044f05d4962d450917bbf89d1e3d1f97146baaa2eaa09f3318909ac3b23095296b4ab60ea7009752d7210838912803240c61e0a13e8d0f228096c08de64d9c8 SHA512 68f65bd895ef024776c04553356a38903f55b2976923374cdc3b89455f6c4adad0f2be4f3eb0d12c43c08e2feee2abe9b83e2e8af0d27901b4cda32e9d821d41
diff --git a/dev-util/cmocka/cmocka-1.1.5.ebuild b/dev-util/cmocka/cmocka-1.1.5.ebuild
index d7f046c11436..05c9f84919f9 100644
--- a/dev-util/cmocka/cmocka-1.1.5.ebuild
+++ b/dev-util/cmocka/cmocka-1.1.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://cmocka.org/files/1.1/${P}.tar.xz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/codeblocks/Manifest b/dev-util/codeblocks/Manifest
index e5a5f75e711f..b5b49eabfca5 100644
--- a/dev-util/codeblocks/Manifest
+++ b/dev-util/codeblocks/Manifest
@@ -1,9 +1,13 @@
+AUX codeblocks-17.12-fix-crash-on-copypaste.patch 675 BLAKE2B 0c388b674e86b74cbb934be4acc00109bca252d4a6705a5811fa91d6323d7a2c861b1f36354cc17d5a0dee79d2a99543f5b28b9525fc79da2a51873e1eed08c8 SHA512 89a464fa8f86d5c2900bffaee43812d475015813c8870f21b95465b1b91a05744a779187b4e46d61242f1d8ad13cd965b7bcd614b88f2072e0c3e43a819a5c61
 AUX codeblocks-17.12-nodebug.diff 611 BLAKE2B 03de6a604b0971e7b91702fd9a1f66aee6d87538177947762ce7b112bf6e81e75349c76415f1a18ac4ee0b41fa4f1257085af1031988c3346a45402b7bfebe73 SHA512 d5332803a0d9cbcbcafa5fa18d90bea07ff43d8ff93922d577b3b2dddc6349a7b01c9100f6198905d531e31edd0f5ba0b5a88db38df981c567644f8e7e11022a
+AUX codeblocks-20.03-env.patch 1365 BLAKE2B 550b86319823c8453000d0a3a5e1c9a0845bbf08464d04b0055c98d72a055e966e0a30606e3496a00da829686129faf263f4f5edb36843dd5f1d882a4b87a2ce SHA512 c20b11f463517386b95ae1a2f1acc5fe75e15f1976ac004934d8b7a6441f40d5d58ba86292ff6713c0b71a6abe9c1d99554f8928b6aedc9c6452f0aa80ea894d
 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.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-r300.ebuild 2004 BLAKE2B 6b6b47b35498949282efa068e70c235fa52611580f69d26cdcd483e8fe3c15093921152dd7c2d70a506491efedb1886b44282cbdad8594343c529e1273062029 SHA512 b10b5befad57a1bfc68a27af1eb326a2091600648bb53fb266ac271511ec04bd8005c47a097ba89f486c7f5f260e9e7d38074cb7f3ec9edbad22666ed94ba5b7
-EBUILD codeblocks-17.12-r301.ebuild 2158 BLAKE2B 88352118a259383659f4c9f2cfd820db719fc375a7615f69e5c5f1f5dd870057dde05c8c91908d0ecb2b87a60ce4e850d6bb79336ffca859d528d7c73f74526c SHA512 13336eac42465cb51e05fa81c1732408d429a758032c86909130980b1684304926fd3fd8860b17c9c9fca3c26481279350d77a9bb8c8aac0d68eb42342e36270
-EBUILD codeblocks-17.12-r302.ebuild 2075 BLAKE2B 268d201e8c4d8327c25031ca436617b15f25dd66d75b19a2b0e7e835c1cddf41944425629909d5307a68b128661cae9773e4af8835dac98fc211bb301cd5ee69 SHA512 9cb65efb26c46b96b9b8f4b48d9947c329380634d47650f6fad5b206b3574272bc720adc4a7ffb83cdc26bc2f65328b716fe9542e8cd4e5578cdc625e361f2c1
-EBUILD codeblocks-9999.ebuild 1598 BLAKE2B f2780d052fd517a2363e2d0866ed381a8eadb81d425f9337384ef4af69bf36855da1642e3628a47884c41ef35451a7f7d21ea8987b80030b73836df30384d829 SHA512 0d0b54fc9e42534c3d55a30a06b105597f1baef9613dd7df1ba23d0ace30ee4000994916b3bf2789ba10a527376e89b1184840c709f720b2a0d1033441312c24
+EBUILD codeblocks-17.12-r302.ebuild 2073 BLAKE2B a3b24b2ee38bc86119bad45038281ac8e7bdb22209841983ce0fc83be478e7292aef1e5e626e5c65b5ee1db4656e5957f992d47c1dfa71c53f786e3bd5ce9bfa SHA512 8df7ded166e72fd1d4bbabfb48c2fc3ce875d192e65f6e11fb6b8a4918cc41304ce7cab20c997ec04c98a2e722e806468f1bdda4a41e92c23b33d81f7653a917
+EBUILD codeblocks-17.12-r303.ebuild 2377 BLAKE2B 843edc779b569c87d4f65e6892f4d56a6ecedae5d6774b4d72991374ff0a7a6f17ca28ded88539016a4ac4e711b925228600407b9e7158c67b257a38059023a4 SHA512 e4d337a6febad50650902849d6b0e9efa6165dd70053f3920a59503abacd9f93edc8fa2d26144cbcf4edfa7b989136608854cf46d22e5ffaac95b2b60d4b1dfc
+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-r300.ebuild b/dev-util/codeblocks/codeblocks-17.12-r300.ebuild
deleted file mode 100644
index 7c6e5b47787d..000000000000
--- a/dev-util/codeblocks/codeblocks-17.12-r300.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-WX_GTK_VER="3.0-gtk3"
-
-inherit autotools flag-o-matic gnome2-utils wxwidgets xdg-utils
-
-DESCRIPTION="The open source, cross platform, free C++ IDE"
-HOMEPAGE="http://www.codeblocks.org/"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-SRC_URI="mirror://sourceforge/${PN}/${P/-/_}.tar.xz https://dev.gentoo.org/~leio/distfiles/${P}-fortran.tar.xz"
-
-# USE="fortran" enables FortranProject plugin (v1.5)
-# that is delivered with Code::Blocks 17.12 source code.
-# https://sourceforge.net/projects/fortranproject
-# http://cbfortran.sourceforge.net
-
-IUSE="contrib debug fortran pch"
-
-RDEPEND="app-arch/zip
-	x11-libs/wxGTK:${WX_GTK_VER}[X]
-	contrib? (
-		app-text/hunspell
-		dev-libs/boost:=
-		dev-libs/libgamin
-	)"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/codeblocks-17.12-nodebug.diff
-	"${WORKDIR}"/patches/
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	setup-wxwidgets
-
-	append-cxxflags $(test-flags-CXX -fno-delete-null-pointer-checks)
-
-	# 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 \
-		--with-wx-config="${WX_CONFIG}" \
-		--disable-static \
-		$(use_enable debug) \
-		$(use_enable pch) \
-		${CONF_WITH_LST}
-}
-
-pkg_postinst() {
-	if [[ ${WX_GTK_VER} == "3.0" || ${WX_GTK_VER} == "3.0-gtk3" ]]; then
-		elog "The symbols browser is disabled due to it causing crashes."
-		elog "For more information see https://sourceforge.net/p/codeblocks/tickets/225/"
-	fi
-
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
diff --git a/dev-util/codeblocks/codeblocks-17.12-r302.ebuild b/dev-util/codeblocks/codeblocks-17.12-r302.ebuild
index e7e1bf808573..47cecf4c74fc 100644
--- a/dev-util/codeblocks/codeblocks-17.12-r302.ebuild
+++ b/dev-util/codeblocks/codeblocks-17.12-r302.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="The open source, cross platform, free C, C++ and Fortran IDE"
 HOMEPAGE="http://www.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-17.12-r301.ebuild b/dev-util/codeblocks/codeblocks-17.12-r303.ebuild
index 93cfa9d4979d..3a4c47275908 100644
--- a/dev-util/codeblocks/codeblocks-17.12-r301.ebuild
+++ b/dev-util/codeblocks/codeblocks-17.12-r303.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 WX_GTK_VER="3.0-gtk3"
 
-inherit autotools gnome2-utils wxwidgets xdg-utils
+inherit autotools wxwidgets xdg-utils
 
 DESCRIPTION="The open source, cross platform, free C, C++ and Fortran IDE"
-HOMEPAGE="http://www.codeblocks.org/"
+HOMEPAGE="https://codeblocks.org/"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 SRC_URI="mirror://sourceforge/${PN}/${P/-/_}.tar.xz
 https://dev.gentoo.org/~leio/distfiles/${P}-fortran.tar.xz
 https://dev.gentoo.org/~leio/distfiles/${P}_update_astyle_plugin_to_v3.1.patch.xz"
@@ -23,7 +23,11 @@ https://dev.gentoo.org/~leio/distfiles/${P}_update_astyle_plugin_to_v3.1.patch.x
 
 IUSE="contrib debug fortran pch"
 
+BDEPEND="virtual/pkgconfig"
+
 RDEPEND="app-arch/zip
+	>=dev-libs/tinyxml-2.6.2-r3
+	>=dev-util/astyle-3.0.1-r1:0=
 	x11-libs/wxGTK:${WX_GTK_VER}[X]
 	contrib? (
 		app-admin/gamin
@@ -31,21 +35,21 @@ RDEPEND="app-arch/zip
 		dev-libs/boost:=
 	)"
 
-DEPEND="${RDEPEND}
-	>=dev-libs/tinyxml-2.6.2-r3
-	>=dev-util/astyle-3.0.1-r1:0=
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
 
 PATCHES=(
-	"${FILESDIR}"/codeblocks-17.12-nodebug.diff
+	"${FILESDIR}"/${P}-fix-crash-on-copypaste.patch
+	"${FILESDIR}"/${P}-nodebug.diff
 	"${WORKDIR}"/patches/
 	)
 
 src_prepare() {
 	default
 	if has_version ">=dev-util/astyle-3.1" ; then
-		epatch "${WORKDIR}"/codeblocks-17.12_update_astyle_plugin_to_v3.1.patch
+		eapply "${WORKDIR}"/codeblocks-17.12_update_astyle_plugin_to_v3.1.patch
 	fi
+	sed -i "s:appdatadir = \$(datarootdir)/appdata:appdatadir = \$(datarootdir)/metainfo:" Makefile.am || die # bug 709450
+	sed -i "s:appdatadir = \$(datarootdir)/appdata:appdatadir = \$(datarootdir)/metainfo:" src/plugins/contrib/appdata/Makefile.am || die # bug 709450
 	eautoreconf
 }
 
@@ -67,18 +71,16 @@ src_configure() {
 }
 
 pkg_postinst() {
-	if [[ ${WX_GTK_VER} == "3.0" || ${WX_GTK_VER} == "3.0-gtk3" ]]; then
-		elog "The symbols browser is disabled due to it causing crashes."
-		elog "For more information see https://sourceforge.net/p/codeblocks/tickets/225/"
-	fi
+	elog "The Symbols Browser is disabled due to it causing crashes."
+	elog "For more information see https://sourceforge.net/p/codeblocks/tickets/225/"
 
 	xdg_desktop_database_update
+	xdg_icon_cache_update
 	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
 }
 
 pkg_postrm() {
 	xdg_desktop_database_update
+	xdg_icon_cache_update
 	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
 }
diff --git a/dev-util/codeblocks/codeblocks-20.03.ebuild b/dev-util/codeblocks/codeblocks-20.03.ebuild
new file mode 100644
index 000000000000..c8915abb8e27
--- /dev/null
+++ b/dev-util/codeblocks/codeblocks-20.03.ebuild
@@ -0,0 +1,75 @@
+# 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"
+
+# USE="fortran" enables FortranProject plugin (v1.6 updated to 2020-04-06 [r277])
+# 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/codeblocks/codeblocks-9999.ebuild b/dev-util/codeblocks/codeblocks-9999.ebuild
index 5350bd29d7cc..580a1b03b545 100644
--- a/dev-util/codeblocks/codeblocks-9999.ebuild
+++ b/dev-util/codeblocks/codeblocks-9999.ebuild
@@ -5,10 +5,10 @@ EAPI=7
 
 WX_GTK_VER="3.0-gtk3"
 
-inherit autotools subversion wxwidgets xdg-utils
+inherit autotools subversion wxwidgets xdg
 
 DESCRIPTION="The open source, cross platform, free C, C++ and Fortran IDE"
-HOMEPAGE="http://www.codeblocks.org/"
+HOMEPAGE="https://codeblocks.org/"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS=""
@@ -58,13 +58,9 @@ pkg_postinst() {
 	elog "The Symbols Browser is disabled due to it causing crashes."
 	elog "For more information see https://sourceforge.net/p/codeblocks/tickets/225/"
 
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
+	xdg_pkg_postinst
 }
 
 pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
+	xdg_pkg_postrm
 }
diff --git a/dev-util/codeblocks/files/codeblocks-17.12-fix-crash-on-copypaste.patch b/dev-util/codeblocks/files/codeblocks-17.12-fix-crash-on-copypaste.patch
new file mode 100644
index 000000000000..9918c58d8e88
--- /dev/null
+++ b/dev-util/codeblocks/files/codeblocks-17.12-fix-crash-on-copypaste.patch
@@ -0,0 +1,20 @@
+# Fix crashing on paste of copied text from other applications
+# https://sourceforge.net/p/codeblocks/tickets/629/
+diff -Nuar a/main.cpp b/main.cpp
+--- a/src/src/main.cpp	2017-11-01 02:32:38.000000000 +0300
++++ b/src/src/main.cpp	2020-03-13 21:59:25.000000000 +0300
+@@ -4321,7 +4321,13 @@
+     }
+ 
+     if (Manager::Get()->GetEditorManager() && event.GetEditor() == Manager::Get()->GetEditorManager()->GetActiveEditor())
+-        DoUpdateStatusBar();
++    {
++        #if wxCHECK_VERSION(3, 0, 0)
++            CallAfter(&MainFrame::DoUpdateStatusBar);
++        #else
++            DoUpdateStatusBar();
++        #endif // wxCHECK_VERSION(3, 0, 0)
++    }
+ 
+     event.Skip();
+ }
diff --git a/dev-util/codeblocks/files/codeblocks-20.03-env.patch b/dev-util/codeblocks/files/codeblocks-20.03-env.patch
new file mode 100644
index 000000000000..2a973abe2b7b
--- /dev/null
+++ b/dev-util/codeblocks/files/codeblocks-20.03-env.patch
@@ -0,0 +1,29 @@
+diff -Nuar a_init/Makefile.am b_env/Makefile.am
+--- a_init/Makefile.am	2020-03-28 15:36:06.000000000 +0300
++++ b_env/Makefile.am	2020-03-30 18:14:12.000000000 +0300
+@@ -46,5 +46,5 @@
+ clean-local:
+ 	rm -f $(top_srcdir)/debian/codeblocks-headers.install
+ 
+-appdatadir = $(datarootdir)/appdata
++appdatadir = $(datarootdir)/metainfo
+ dist_appdata_DATA = $(top_srcdir)/codeblocks.appdata.xml
+diff -Nuar a_init/m4/acinclude.m4 b_env/m4/acinclude.m4
+--- a_init/m4/acinclude.m4	2020-03-28 15:36:06.000000000 +0300
++++ b_env/m4/acinclude.m4	2020-03-30 18:08:13.000000000 +0300
+@@ -91,8 +91,6 @@
+ AC_ARG_ENABLE(debug, [AC_HELP_STRING([--enable-debug], [turn on debugging (default is OFF)])],,
+                        enable_debug=$debug_default)
+     if test "x$enable_debug" = "xyes"; then
+-        CFLAGS="-g $CFLAGS"
+-        CXXFLAGS="-g $CXXFLAGS"
+         CPPFLAGS="-DDEBUG -DcbDEBUG $CPPFLAGS"
+         AC_MSG_RESULT(yes)
+     else
+diff -Nuar a_init/src/plugins/contrib/appdata/Makefile.am b_env/src/plugins/contrib/appdata/Makefile.am
+--- a_init/src/plugins/contrib/appdata/Makefile.am	2020-03-28 15:35:54.000000000 +0300
++++ b_env/src/plugins/contrib/appdata/Makefile.am	2020-03-30 18:14:22.000000000 +0300
+@@ -1,2 +1,2 @@
+-appdatadir = $(datarootdir)/appdata
++appdatadir = $(datarootdir)/metainfo
+ dist_appdata_DATA = $(top_srcdir)/codeblocks-contrib.metainfo.xml
diff --git a/dev-util/conan/Manifest b/dev-util/conan/Manifest
index 4d09626f4cfd..b637cad0adae 100644
--- a/dev-util/conan/Manifest
+++ b/dev-util/conan/Manifest
@@ -1,5 +1,3 @@
-DIST conan-1.19.2.tar.gz 944360 BLAKE2B 190cc2a7dbe25420ae1a6b46705078301cdf1deea2b4be3d1244ade84d27250688e2c26cd5d172d4dab68557d758a2afcfebf37c323e42f0b4514455488903d8 SHA512 e9b868561465bda28314813d4114cb2b6b97440f7683c4c91911ed51b8cb06675b37807c28aaed62d5f7b470ce9040929ad61e0e148c04b0fdba7300cb633b5d
-DIST conan-1.21.1.tar.gz 989780 BLAKE2B 2869ff0ee5df78d8b503a3d19e5a9ad8f5ffade5cbebf45a2b494e79c2765214d917e26494fc4585f02a613df2c7cd6eba67e74615b43443340f4d2a9406435d SHA512 7afc9ef6f073d38ffbfd51914758673daa4836d66c8785af393f601a81985a852d0f65807dbe07d3d7e826c76f4e1d78bdd4c748891ec1ed415a4ccea06f5f22
-EBUILD conan-1.19.2.ebuild 2466 BLAKE2B a8e952d7cba17b9f45d6f5b27beb56ef9f2e56a78894d4e08683be7e31121b3fbcde8f942d8d23406aa77178d02783077e5c4e33f45458fb9e17a50a38f50f8e SHA512 6ad1610a5bf0d752abe69d627c30363fedf5ae4708b6fcf37dca85d4e94d1c94850b47fe8588455a83e90e6a9056a9c66c30ab8e371c861436d82e71511c1797
-EBUILD conan-1.21.1-r1.ebuild 2405 BLAKE2B 0920cba1e65a77f711bb0b6f3476fb9e385b814a9dfc730a051a8679ceac398d86e95c44b3c83d4346e1918d41261f56ebab0b4d9f4c715b549452a1b6977400 SHA512 24e0e52584af9f7e1cffb1674bf55c944780e9091fd07beac9078e2532dbe5999eadc78e8bc486db9e63de1d944614c261debcbbf3c7b1a1d52eaceb0f8eb676
+DIST conan-1.23.0.tar.gz 1024905 BLAKE2B cfa3e130be13ee175b1dc167b6d61666eddaf588b5954d9889c2d167806e8fb115290257ca839f6de407c87079472dba912b730e01a232d70375f2fe63ce7c28 SHA512 fa2b1b726e29ef553774267b50b0ace4f39a30bdf0a6d0e051576bc9b0e6cd1ed6cb166101c446d15734ebef9e89e17a101c10c0ead91c15de5aa1ebb102d0a8
+EBUILD conan-1.23.0.ebuild 2405 BLAKE2B 0920cba1e65a77f711bb0b6f3476fb9e385b814a9dfc730a051a8679ceac398d86e95c44b3c83d4346e1918d41261f56ebab0b4d9f4c715b549452a1b6977400 SHA512 24e0e52584af9f7e1cffb1674bf55c944780e9091fd07beac9078e2532dbe5999eadc78e8bc486db9e63de1d944614c261debcbbf3c7b1a1d52eaceb0f8eb676
 MISC metadata.xml 739 BLAKE2B 475521b92c84335a4ebda1d68dac1905a99f96b0fbecc8f06b6918e0c075648024ba3bebeaf85cb11ef0b96b917a2ebcf2a0146bd5b37c976d90cee08365c595 SHA512 27c7a3cea74ef2e22fd3dd238fa736efd1786fea4eaf01b9b51e07f7276101ddd7022ad7aedf767d1dbcdba2c29ddf48c07581e4fe5ec089d5e10c5b880c9970
diff --git a/dev-util/conan/conan-1.19.2.ebuild b/dev-util/conan/conan-1.19.2.ebuild
deleted file mode 100644
index 784afa385e65..000000000000
--- a/dev-util/conan/conan-1.19.2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-PYTHON_REQ_USE="sqlite"
-
-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/astroid-1.6.5[${PYTHON_USEDEP}]
-	>=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-1.16[${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/pylint-2.3.1[${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.10[${PYTHON_USEDEP}]
-	>=dev-python/tqdm-4.28.1[${PYTHON_USEDEP}]
-	>=dev-python/typed-ast-1.1.0[${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==1.16:patch>=1.16:g" \
-		-e "s:node-semver==0.6.1:node-semver>=0.6.1:g" \
-		-e "s:future==0.16.0:future>=0.16.0: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 \
-		-A "not rest_api and not local_bottle" || die
-}
diff --git a/dev-util/conan/conan-1.21.1-r1.ebuild b/dev-util/conan/conan-1.23.0.ebuild
index c7272407e629..c7272407e629 100644
--- a/dev-util/conan/conan-1.21.1-r1.ebuild
+++ b/dev-util/conan/conan-1.23.0.ebuild
diff --git a/dev-util/cppcheck/Manifest b/dev-util/cppcheck/Manifest
index 84928c8e64a7..153e2ca1f496 100644
--- a/dev-util/cppcheck/Manifest
+++ b/dev-util/cppcheck/Manifest
@@ -8,6 +8,6 @@ DIST cppcheck-1.87.tar.gz 2243258 BLAKE2B ffe42bfb2e896163678c5bb24e46ae2391ba82
 DIST cppcheck-1.88.tar.gz 2364053 BLAKE2B b688974ff83019422cc5b2ec575d9838bdff4ada17d71fb3d436f07eea50429490c222659163b845667d98c0ec186b3288464827894e379fd017dd0c3fea645f SHA512 fa4ede0665546341af0ba3dae09a00b6efae09ec7838c616c580be01ff6902594d61168a059539779be0c78e1708d2bd9c8e7987dd0bb67dc8fa332a10d1de6a
 EBUILD cppcheck-1.86.ebuild 2326 BLAKE2B 292de19a52987e0c8a56458956c0f8fffaf9feda3c745805d9e1b22b8982bff7dd5405be71a467e2743b989d66a7d987b44ea5741366429c2afdfc91e692c264 SHA512 c934f617da26e49e0593c62bc44c88663a206186f4556fc7240c45f8e48a98b3c0d2552ad5cca61f284ff56c31597900400e366c5bd8bf17ac9caea5fb0dfed2
 EBUILD cppcheck-1.87.ebuild 2343 BLAKE2B 5d5b0a974743823fe8c942eb39b3d3049ed9cd7929b4e7db65ba12f34bc65c2a75c58f363fcaddfc21435782df8257319d225b9e8d55830de87fdffc655101e6 SHA512 eb10790caa7f2eb91b0ce00c5f0cde85df1da076f481fd7a8a4655d8a27c89225e238f36c271bb1f1e9e10940c642c79e014e81aebbb8040ee50e953a622c212
-EBUILD cppcheck-1.88.ebuild 2340 BLAKE2B 6f5a6683fc55d83eeb3ebcda7030c7a66875a227309cd514ac1d84adb8d5544f4f9c9853f73b7f13d59a0de5178d6aad4309d26dcc567510357ffdf42f93f642 SHA512 8220b21462c5c338d53f7c6ca472cfeced8816a3b66e5a5b3e52d9cd6969829a11fdbc58b90d64f5f6774171adae0f6bbd4c815baf15fd1b1c6e94b848dcb41d
+EBUILD cppcheck-1.88.ebuild 2339 BLAKE2B 878a18db0aad6abc71b5b28dba3b7999f09118046e65e89aab8152a2472261f8108751960829746be18fc2fffb37f5fe3ed8e05126e761891e9afa255b484f96 SHA512 7460936b8aed85c3e0f513297fa29e8449564cdb999c47dce3f29d7c308ab9a71e29aaf5a30a43b6a4153b6c7a33ef128f58b38c3f3669406d88ae8e112354ba
 EBUILD cppcheck-9999.ebuild 2237 BLAKE2B e90d8e35afcac652a03c518bdb0ed494fb2fdda35c55d0d6e9c995525274f6d0af55e05f87a0bd4948ccd2b56b6cb3cbb8caa7b189d874e55d2d83c9084e4afa SHA512 ceb118dc93351cdadc345b5a5f4fb64f76ff15afd2537680a19d24aaff13e8f572718c292734db102023eac1208884e054122a08b9508dc774493062c4d670de
 MISC metadata.xml 401 BLAKE2B b48cd9d365773e4c050d1ce2f58a108fa33bf28fb669a8fbe99a9b15d33cf203fa4a94d3411674892efb4cb5e5bd1cb5a08d97a3054b7fbdacc462695f0d1874 SHA512 08b51c30fcc21277bf320c1c9f36cd9efc7c39261b52f70f686953731c2d075482fc1959457dbe276877d508510b32a23d8f7def4ca52044fabc44a23c56a8f4
diff --git a/dev-util/cppcheck/cppcheck-1.88.ebuild b/dev-util/cppcheck/cppcheck-1.88.ebuild
index a19d40ec1004..d281fb794316 100644
--- a/dev-util/cppcheck/cppcheck-1.88.ebuild
+++ b/dev-util/cppcheck/cppcheck-1.88.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/danmar/cppcheck/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc64 sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc64 sparc x86"
 IUSE="htmlreport pcre qt5"
 
 RDEPEND="
diff --git a/dev-util/cppunit/Manifest b/dev-util/cppunit/Manifest
index 65272a1912c4..5e8cedb09348 100644
--- a/dev-util/cppunit/Manifest
+++ b/dev-util/cppunit/Manifest
@@ -1,4 +1,4 @@
 DIST cppunit-1.14.0.tar.gz 959716 BLAKE2B 581e3b73d6d152c249005ddf267100443e6c9cba12c52c43e9d6f81096b9cd13c3686fa2f73ebaf28c31193e41dbfd5d919dfb0143b190881345da65a5b7f86d SHA512 4ea1da423c6f7ab37e4144689f593396829ce74d43872d6b10709c1ad5fbda4ee945842f7e9803592520ef81ac713e95a3fe130295bf048cd32a605d1959882e
-EBUILD cppunit-1.14.0.ebuild 1701 BLAKE2B b144d1fcd505680b2de1d688b85a7536a5d25a04cf42de00806182b91a293934f6668438cee71a3298575f563f61631abe4da558970d10ca28c0ac4301a9dfaa SHA512 6200448580baafe8e2050af438edc86923f671c15615c2d97912d907298bf9faa35f58f620cd20b73fbc85bf83671b8be987733c06a3530dde7bc60882907b89
+EBUILD cppunit-1.14.0.ebuild 1702 BLAKE2B 263a7e6e41417f164f42d23e619ce752b82c1c5e68f875f3469f55981a13a0620bcc508aa72f4d46871297f7ebcd6acadf8081f27424fef9dd017e1cc55d5aac SHA512 159fab9aafa466a1cee052c6284fd0c713b10e0c1d90e1784a9ef05c0695da461def6acd88e146a5fb10e6b0eebe8e0aa0b5831b1260a3f646c379b42057861b
 EBUILD cppunit-9999.ebuild 1714 BLAKE2B 2d0395554a9ee2c68ff268ba98e33795bbfc9d8a0dd272f82c2477e3ac40840ff49aaf9aaab6d0006886a4a4f01a0f03f8fb771ac30d38d96ddb2095e7aba84c SHA512 6b8c7539bdf13f614797f5a1fecd15efcafaada6b36cbd2eddeafa7a05cfb95fbc47532027f72aea267b52efa356c21adf1ec192feb93e96d5593534fa16843e
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/cppunit/cppunit-1.14.0.ebuild b/dev-util/cppunit/cppunit-1.14.0.ebuild
index de10a09f8156..9b642afa8c03 100644
--- a/dev-util/cppunit/cppunit-1.14.0.ebuild
+++ b/dev-util/cppunit/cppunit-1.14.0.ebuild
@@ -15,7 +15,7 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 # Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
 [[ ${PV} = 9999 ]] || \
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc examples static-libs"
 
 RDEPEND=""
diff --git a/dev-util/cpuinfo-collection/Manifest b/dev-util/cpuinfo-collection/Manifest
index a5f1bcae1e54..84bc7b8aa358 100644
--- a/dev-util/cpuinfo-collection/Manifest
+++ b/dev-util/cpuinfo-collection/Manifest
@@ -1,3 +1,3 @@
 DIST test_proc-14November2010.tar.gz 95697 BLAKE2B 476cf9784d3718ca27f030bc85ca1f526db43cc740ae77fb7cd4b45fad13ead8645ab9a17fec1216d54da8390e04205960c543cf4205f9f6677afe38dafd054c SHA512 2f3b80d9b705b76911487b7349300b45622a3a49b9a3c2036d96220738e7fd525114b2523cc589b03d0fdf85ca4d35c28076ff193d1eb620d71765919058fdc6
-EBUILD cpuinfo-collection-20101114.ebuild 548 BLAKE2B 9f9946d2ad2730f0298c1764e6927e32d74d7e6a5d24ccbcfcdc123d7257ea62d9a07d324989c552a16b8c21ec67cf0055cde7902d3c2fba4986dcb875b91945 SHA512 131a6c86a7c1464cc8891b6348c240f783ebfb57d50f0a476847079ecf23db8e656031e7ac009aadd0c4a59b60ef0e56f1523b546b97e8089388322273b967fa
+EBUILD cpuinfo-collection-20101114.ebuild 546 BLAKE2B 32343311fd813df7226ecc380c6e8f67907c17a39c7eafb69e7b9c2b993809d469538c5c685b9a1bb101a1269b6a57a0cbacf14c80f71173411ddd897e74cbb3 SHA512 a8d41bd6639820d5ef8844e7eb9e0a6a528445cb126c7f1d1ade121d34769a0b129576d31c9b65c87e651db2e9686e45e2de28da2cb2e42e0f746c2907c29430
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/dev-util/cpuinfo-collection/cpuinfo-collection-20101114.ebuild b/dev-util/cpuinfo-collection/cpuinfo-collection-20101114.ebuild
index 2bedd9a2de55..1a62a4b3f647 100644
--- a/dev-util/cpuinfo-collection/cpuinfo-collection-20101114.ebuild
+++ b/dev-util/cpuinfo-collection/cpuinfo-collection-20101114.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.deater.net/weave/vmwprod/linux_logo/${MY_P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86"
 IUSE=""
 
 S=${WORKDIR}/${MY_P}
diff --git a/dev-util/cscope/Manifest b/dev-util/cscope/Manifest
index b3e8319acb2b..99a1ebf2f829 100644
--- a/dev-util/cscope/Manifest
+++ b/dev-util/cscope/Manifest
@@ -3,7 +3,7 @@ AUX cscope-15.6-darwin.patch 288 BLAKE2B 3426d3f3dcdd67764b8f3ee63bbf1ea6c457231
 AUX cscope-15.7a-ocs-sysdir.patch 582 BLAKE2B f9144657cb8d584f4d504481b986f68322d1a08b408e4f623db0ed3e22474895f4f8464e297a90e635a3dd3e71cb06f79b092a82ab8876d0ed308b71fa0d2812 SHA512 aa296d8839da73b6838c450dfabc9782940a2f9c9cfba2f738993c777c1d4096688d79205ccec58dbf931b2faf45a4c3850ddbd894c7b7e616d18a0014cacfdb
 DIST cscope-15.8a.tar.gz 601232 BLAKE2B 8c67311059a055af775ba3d42942a557b54c0214751d8756e6a5c19a7a271824004e72c533614015ddcb0ffa4c768f99eb736d441dc8467c5be4824cebf5c15e SHA512 bedba69820eca86420f6c975d1f267de67a457b182a3fe49720a2ae5ea48759c5b5b8db06ed5ffd85173ddf4a0f12ca722e87200dea4a2da7d43c8c711b00318
 DIST cscope-15.9.tar.gz 613948 BLAKE2B 66c0c85d0db810e8cd5a286925eeb1026fa4a9e9c3a5a9decd1412188fca43f831949c231acca428b5eeb476662b7ce9f81defcda81759c18027655535b855be SHA512 f3b95da5eb5c036cd39215785990c7cce7ce7b8eda4b18e60792e70d01ffb63809ce32ace310a9aefd88e6761c1609039ccfab0e8e49f81730bc1630babbcb80
-EBUILD cscope-15.8a-r1.ebuild 1377 BLAKE2B acb7c4cd6ed2c0410eb8ce53b4a891e548d96d3fad8e29c0daa848e3fd847f4212b946b3911a941a025d30a15eb0679f2bee6313a75d27ba6758d2fe0d8e9317 SHA512 37f4cd10a49fad37f323c31040777597dde4d3e97392f5e683a0d8277b31b488311d34440feb69678ebdcdc4d14051fe8eca50ac6239f42ea9da5d670b301d66
-EBUILD cscope-15.8a-r2.ebuild 1589 BLAKE2B 1e300f1f231129f1ef21ba12501ab286395c9d36bc517271aceb3b1dce9a7945182a6b2a2c583b5e33df38b4444448c9492fda1f0f534782657270c48db7b942 SHA512 d2e81a33ab5afbdeb16dc04dce5cfb9f501c18e175f282cc19431b07f6628592d8302a2e3b1deb26d945464f1a6b2c9aec11dcd691b98097bf8596f725eadb83
-EBUILD cscope-15.9.ebuild 1559 BLAKE2B 5f1bf9518bfc4c144d4331a4113ff06550bb3f8287ab2a5752c5cc22d20deedea57a976bd98eb35b7c9972767fdea6a859c8eb038538be21adef5fa017d395da SHA512 2ddc7e45b1b7c5bfa9118cb7e50bd8efa87c44b16e64f62c95a359217af13d837a2f94e62d5195ff638689ae2f8bba3249947d06d6266a553feb871cbcba83cd
+EBUILD cscope-15.8a-r1.ebuild 1375 BLAKE2B e1b216b69dc1795d202122f1053c148803af387c71cf959b0406d6ca6bb5063887a853ac1b0abcd5e6c9b36956d82e09d918fcd225e4ce02f0016471fec4928d SHA512 477e52fbb01ee7f4345cadb382b8fad60e38484097f793d330fcfe1606438b85a9c700e1ecfd97910d49a2c6de4e9d29e2d894cf9cd709a5d59f0da2b4fb16c0
+EBUILD cscope-15.8a-r2.ebuild 1585 BLAKE2B 78ea1a0d32a2e4b5c0f5378b8fadc53f0f15a2077e65d7fefdda3153fcc874faba1f2941f3eb61599fabb20b4c244d77dcdc972f35d697d2c044867a5bc2373e SHA512 42d07ea5e193691138be4006bbb03a70445571290f05e923aea4709bb2a81bfc7d07c84eb9a60b37609f5ce8603716a6338f715decfd281ea0d43bbecca6d8cf
+EBUILD cscope-15.9.ebuild 1555 BLAKE2B c9681e327719b55b4d9b1985a11364eeec1da824e6f01048a4bea013d371e89834753dd69c3aa663b4f2b7e1a6260235536c6bb03f4094f8e10080bf33751dba SHA512 618304f3cc3f2c7a49c497099cfd8cdc53e06caefed4ecf6db6896fd58042bc84683ecded1d56e9ae9081de09b7eac0bedb5812c44dcd42b0d5ecd10765cb194
 MISC metadata.xml 1086 BLAKE2B 9fecf3d723e58a1235e3ae94b6a009c16cf91ecf0b27c32de7d8a8f96308e41908b9f2881083acfbf329685cce188b8ee0fb864333d566bc915e1ca2d572ac3f SHA512 a8ebddecfe959cb05a992749f12183baba41950b39e197bd1db0528969dd4e1814dc159555b2e24d85249373da4b60bf05a7d86aac2d7b8969d6d2bed2ab59e1
diff --git a/dev-util/cscope/cscope-15.8a-r1.ebuild b/dev-util/cscope/cscope-15.8a-r1.ebuild
index c45d02106094..b8bcfad183af 100644
--- a/dev-util/cscope/cscope-15.8a-r1.ebuild
+++ b/dev-util/cscope/cscope-15.8a-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/cscope/${P}.tar.gz"
 
 LICENSE="BSD GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86"
 IUSE="emacs"
 
 RDEPEND=">=sys-libs/ncurses-5.2:0=
diff --git a/dev-util/cscope/cscope-15.8a-r2.ebuild b/dev-util/cscope/cscope-15.8a-r2.ebuild
index fa8fde9d60df..c47d3feaa6c8 100644
--- a/dev-util/cscope/cscope-15.8a-r2.ebuild
+++ b/dev-util/cscope/cscope-15.8a-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=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/cscope/${P}.tar.gz"
 
 LICENSE="BSD GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="emacs"
 
 RDEPEND=">=sys-libs/ncurses-5.2:0=
diff --git a/dev-util/cscope/cscope-15.9.ebuild b/dev-util/cscope/cscope-15.9.ebuild
index 02daf13636de..c5b4b35ef25f 100644
--- a/dev-util/cscope/cscope-15.9.ebuild
+++ b/dev-util/cscope/cscope-15.9.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://sourceforge/cscope/${P}.tar.gz"
 
 LICENSE="BSD GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="emacs"
 
 RDEPEND=">=sys-libs/ncurses-5.2:0=
diff --git a/dev-util/ctags/Manifest b/dev-util/ctags/Manifest
index 68c11dadb060..539916ec2df5 100644
--- a/dev-util/ctags/Manifest
+++ b/dev-util/ctags/Manifest
@@ -1,3 +1,3 @@
 DIST ctags-20190331.tar.gz 1537104 BLAKE2B 354ddf48cdc9421e70d9d37ec7251e51f7f78564dc4f6236d12e2e18519369c39c22585830fd301b7eff4898d550b824776541198b8c4a31425711776b14fde4 SHA512 414faef7628ecaa66fcd5f172781a32194e1d58637dded1f7e55c138239ad777796bb1510bd447af3ad8243b7178e6f4859139305b0c0efe298182408f34524c
-EBUILD ctags-20190331.ebuild 1827 BLAKE2B 702abde1be3599135c68441af750d6b03c11df462d6990b6967951b319d41265b3703631b48cf4a8de8ea71940a9d240c8f9aadcb77b5d68a203aeec111b1a23 SHA512 9d9afaa974a4c9b0add5399de1472b71e2302443155b54a77b5ac59bfdc4f56787b2a79e0a0620d2ffcc85bfa02fc6033a77f28d7509d44f3c70728f34c55189
+EBUILD ctags-20190331.ebuild 1824 BLAKE2B c1f96b3d0c12786a4b68783795dbaa5780969dfe4de326ed90f80bfab35f6e3c90552aae0af1290a75a123edb0b70072a1fe06853033c34537203622af5fe175 SHA512 af58a7ee7ccfc2c7385bd73f1488c92d092a19617baa7a93ed4a473d009135f4872d0d2d086d9030314d7166f6413f79f12747442eb370aeffe973587f36b253
 MISC metadata.xml 583 BLAKE2B 32e6225369d82b7aae04a238a314eb77911a38c2d670d4058260b75ced482199b343d1b5d7496bc3a6711b71a429b7205057ab66ed8369083b2533be5a7e0648 SHA512 df8ae31fbbb4546f21c3c06110bc6630f392cbbd937e2ccc3c504e08835e56ac2e7d8156686755217140906cc806001a18627778af0e09d753e50c9a47de28b5
diff --git a/dev-util/ctags/ctags-20190331.ebuild b/dev-util/ctags/ctags-20190331.ebuild
index a860d8d9c235..0416d1961e3d 100644
--- a/dev-util/ctags/ctags-20190331.ebuild
+++ b/dev-util/ctags/ctags-20190331.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/universal-ctags/ctags/archive/${COMMITHASH}.tar.gz -
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh 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 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"
 IUSE="json xml yaml"
 
 CDEPEND="
diff --git a/dev-util/cucumber-core/Manifest b/dev-util/cucumber-core/Manifest
index 8bba12257824..8ce4504b7b59 100644
--- a/dev-util/cucumber-core/Manifest
+++ b/dev-util/cucumber-core/Manifest
@@ -1,3 +1,3 @@
 DIST cucumber-core-3.2.1.tar.gz 49868 BLAKE2B e5d18797fb6821fa9c300898bc8c14d57559b790d77a191d7147a987e27893ce89076716f82fa2048632e1b033ad607c748fe29f6b8fc600abd523290c4a9f50 SHA512 ba45e804d8454a6ef306eb90f32e6cdf3ee25fdd6613e9ba8308ecfce4044f27ee3dc012ad7f9ca481e94fe5e1d9deb9e0c46ca811a8e25bb27981a78c528ddb
-EBUILD cucumber-core-3.2.1.ebuild 1006 BLAKE2B a8e6f61fe79e330b08412c1279d194ca335d035011b428d4ee6400436cb6e89c2f63174e438fe1af863279ff376fed008606116246f5b33f1d58d4f73d9d8a8d SHA512 97b5c496fbca180b08db13b5eba8b8081cf31254b2b8ab681fd96981876bafb056c3bca78bb17e79f4c4d495e2a7de9780143dc199e108acd4c56cbeab059e28
+EBUILD cucumber-core-3.2.1.ebuild 1000 BLAKE2B 13c5d453eb6fc8228a5c5ac1669f84968caf0ef124195fb56314e96d6d6e3ac7b793ee73a4855955d51014cf263cb3e465aec7900cf23f4e307eaeca8812770b SHA512 8dd2d8849e2785ff03ed3130f550c510ee0e795b2567952c52c39155fec669767824450bf7684ab5685f13df9b1a95c71e23ac7f3de144f98644c81f6fdd2164
 MISC metadata.xml 304 BLAKE2B 1f2a69030fdeaccf7280372ef0e8abc7e1ab0456951e88d6f1839ba3615f8a6588bb3a96d05bffdbe343cf3a4b89fc32fdbefc83faeaf2a54e0cdca9c68e03bd SHA512 1e0e844510269d137017ff7ecbe1b98c9542f7264ec0e5b8858119f06887720645c0d968228825d91fcb69016b78d7f7c7d344482f08c3fe0dd6cc3df4f52902
diff --git a/dev-util/cucumber-core/cucumber-core-3.2.1.ebuild b/dev-util/cucumber-core/cucumber-core-3.2.1.ebuild
index b67b40a50eaa..c7d72e8bb552 100644
--- a/dev-util/cucumber-core/cucumber-core-3.2.1.ebuild
+++ b/dev-util/cucumber-core/cucumber-core-3.2.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/cucumber/cucumber-ruby-core/archive/v${PV}.tar.gz ->
 RUBY_S="cucumber-ruby-core-${PV}"
 LICENSE="Ruby"
 
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="amd64 arm ~arm64 hppa ~ia64 ppc ppc64 s390 sparc x86"
 SLOT="$(ver_cut 1-2)"
 IUSE="test"
 
diff --git a/dev-util/cucumber-expressions/Manifest b/dev-util/cucumber-expressions/Manifest
index 201f08968b55..bed6b11e3e41 100644
--- a/dev-util/cucumber-expressions/Manifest
+++ b/dev-util/cucumber-expressions/Manifest
@@ -1,3 +1,3 @@
 DIST cucumber-expressions-6.0.1.gem 18944 BLAKE2B a30127598ff26ea60477bbdad9fc621d0cb1ebb09af3f38d329a15430a207616b6421a127c302ba8470089c8ee0daeccc8f38d4f951b6edb320cff1cc16760b9 SHA512 d9c6371d499ffbe9105038396cde0786cd889def866bf56284a66be77230aac03a74f565b2c3adb966a8d2c67e631ff83eaf426e4bc4b022cd7742bb3a030137
-EBUILD cucumber-expressions-6.0.1.ebuild 501 BLAKE2B 5bbf8f1285a4800fc03c84a1c357ce06cf1e661e324c267a0fde14188b867ab8486bbbeaaca0d78680a777a721f6022913c5f53be50d45cb6c16d64a4f494e14 SHA512 c74268743701fea31c0e8b0d6a58f5b08492394474f1452cac5534f6358eac0968db73f544f72aff2138146f8d7b36e21d6a41a6cb103cc9f6ca35a55137e746
+EBUILD cucumber-expressions-6.0.1.ebuild 502 BLAKE2B cacecf1acd7c0fdaab8ee35957d1a139fa573aca69fb205beb30dfbed548b67f1e9c6fcc1f50ffff8153d7fe14354ea751c6c144ca4d6515b9cb1d3303785f49 SHA512 4574b7fcc8a13504147ed65abfaf2268ca9243b4c5dd58e339e6a9188cdd9429177c011e1795c2816b9082d1ded1ff41a7b83a7ca3356c7781d5cf1c81aba0be
 MISC metadata.xml 299 BLAKE2B 1f0765d5fb94004b9a72b4b9b4c50cb14b05e611c84016704210aa24909d554a6f817d475fb924573d2ec6ccbd389165d9689ee8ccb7212744292dfbc55a0749 SHA512 b655a45650726e475ccae46d7bc062ba32c527277160c9033382684f6a7aed520220c6a197f7abb9dfe18f8ebea051b5fdcbfd10c744031f123ac684ce3225c7
diff --git a/dev-util/cucumber-expressions/cucumber-expressions-6.0.1.ebuild b/dev-util/cucumber-expressions/cucumber-expressions-6.0.1.ebuild
index 02ba8f823813..df698884dcf5 100644
--- a/dev-util/cucumber-expressions/cucumber-expressions-6.0.1.ebuild
+++ b/dev-util/cucumber-expressions/cucumber-expressions-6.0.1.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"
@@ -14,5 +14,5 @@ DESCRIPTION="a simpler alternative to Regular Expressions"
 HOMEPAGE="https://github.com/cucumber/cucumber-expressions-ruby#readme"
 LICENSE="MIT"
 
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 s390 sparc x86"
 SLOT="6.0"
diff --git a/dev-util/cucumber-rails/Manifest b/dev-util/cucumber-rails/Manifest
index 09af8af9a65b..6ce0cfc98b14 100644
--- a/dev-util/cucumber-rails/Manifest
+++ b/dev-util/cucumber-rails/Manifest
@@ -1,5 +1,5 @@
-DIST cucumber-rails-1.7.0.gem 411648 BLAKE2B 09f6e79384869e0d901cb7dda607f2db29b0a924cd57fac56f88e5a90ef5f79348246e91195ecb437ae88e2e5f3f2e17bbfc651b8ff6e01cfc92cc86c544b5be SHA512 05f91606ebfd5db6608120b7057c767efaccee1dfb2eb99113e9cc6f55e594bd4181f54c8a38780b451bf7dc53862180e80a3c62a81ee8b1ea6aaf54682599c2
 DIST cucumber-rails-1.8.0.gem 43008 BLAKE2B ac2fbc89ea952add031429b281986de37b3a8511e398b34d49435c70221b3c454589c51acd5b1fcecdf0285a8e446d4c2c0e0a77216eb78f8fa222086fb6db36 SHA512 757f50719309418353cf1e6b42902ce6166806d2e2a9cd1a27842ffde3d8ce61af97de12f4ffa9e31a50693cc8c40ece9a74e5ec91973096e77860b56034d439
-EBUILD cucumber-rails-1.7.0.ebuild 1212 BLAKE2B 3395490b1f7a8956b8a72a9a2c18978089bb4d1c9ad423e5c10e669c4e21046db58e9ee8e769dde5e875e04ebcb03ea772c1fc6754cb4eebeb6176f13eb79ed7 SHA512 40ef5370f37e771af3c681f9df15a657bb8158d96ec9f98b06893abfb19c38784a373104e7609ba9b53c6a4cb8ec48a0eb0b356668dda18618016f757a5d3785
+DIST cucumber-rails-2.0.0.gem 41984 BLAKE2B e6dd46d1957478ede25ff226d7423d54fa6aa187f398483815fd9504b23308aca01d5336b62eca152e5384fbf23328d0cd1cd6d1200cd61dc4319508353a7b59 SHA512 d48472b4c6694c612a46ade99fa20add1ee1699cbcd14ddb91c0dcadab25c0f4c18c2f22f713ed8a00dcf765d583d4f46b7e9c99b0f94f0521296e3e4846ed95
 EBUILD cucumber-rails-1.8.0.ebuild 1184 BLAKE2B 418d8325a0cd90834c31ef87e86d3fb7a7a8b6602fb73546e4c8b9cc86c492e6556055d5ef8bb2fdac12b97f9cd6b53594cf45e4892f8b356a209aaf57c3688c SHA512 fa921b40e01409ab7f3da2b5dc9b781059a2c8d05f6ef9d4e94360005f58e601d99423aae349af78c23ec17e390728f716375ac80784b2065e5c23d5f4ee91e8
+EBUILD cucumber-rails-2.0.0-r1.ebuild 1221 BLAKE2B c23a7bb31a02af2f57ddfa1820eae96c175ccd87bf7d15f74de8d0d824a6ae678b99bf1ea2bfbc8ac6f332f908418fa9ffd38739997ebb553495fcce5c0fec26 SHA512 8cc97442c6650b734bc458dcc972e6391994269a5ee03dea633548edae0b15e5e6782c06372b576d0673086bc852bbbf737235c9ec7ae3356ededf7a826e09b5
 MISC metadata.xml 299 BLAKE2B 1f0765d5fb94004b9a72b4b9b4c50cb14b05e611c84016704210aa24909d554a6f817d475fb924573d2ec6ccbd389165d9689ee8ccb7212744292dfbc55a0749 SHA512 b655a45650726e475ccae46d7bc062ba32c527277160c9033382684f6a7aed520220c6a197f7abb9dfe18f8ebea051b5fdcbfd10c744031f123ac684ce3225c7
diff --git a/dev-util/cucumber-rails/cucumber-rails-1.7.0.ebuild b/dev-util/cucumber-rails/cucumber-rails-2.0.0-r1.ebuild
index 915e9be7b616..8b941d88443d 100644
--- a/dev-util/cucumber-rails/cucumber-rails-1.7.0.ebuild
+++ b/dev-util/cucumber-rails/cucumber-rails-2.0.0-r1.ebuild
@@ -1,19 +1,19 @@
-# 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
 USE_RUBY="ruby24 ruby25 ruby26"
 
-RUBY_FAKEGEM_TASK_DOC=""
-
 # There are also cucumber features. They require a Rails project with
 # factory girl which we don't have packaged yet.
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
 
 RUBY_FAKEGEM_GEMSPEC="cucumber-rails.gemspec"
 
+RUBY_FAKEGEM_BINWRAP=""
+
 inherit ruby-fakegem
 
 DESCRIPTION="Executable feature scenarios for Rails"
@@ -21,7 +21,7 @@ HOMEPAGE="https://github.com/cucumber/cucumber/wikis"
 LICENSE="Ruby"
 
 KEYWORDS="~amd64"
-SLOT="1"
+SLOT="$(ver_cut 1)"
 IUSE=""
 
 # Restrict tests since Appraisal is now mandatory to manage different
@@ -36,9 +36,9 @@ RESTRICT="test"
 ruby_add_rdepend "
 	>=dev-util/cucumber-3.0.2 <dev-util/cucumber-4
 	>=dev-ruby/nokogiri-1.8
-	>=dev-ruby/capybara-2.3.0:* <dev-ruby/capybara-4:*
+	>=dev-ruby/capybara-2.12:* <dev-ruby/capybara-4:*
 	>=dev-ruby/railties-4.2:* <dev-ruby/railties-7:*
-	>=dev-ruby/mime-types-1.17:* <dev-ruby/mime-types-4:*"
+	>=dev-ruby/mime-types-2.0:* <dev-ruby/mime-types-4:*"
 
 all_ruby_prepare() {
 	rm Gemfile || die
diff --git a/dev-util/cucumber-tag_expressions/Manifest b/dev-util/cucumber-tag_expressions/Manifest
index 5357d650f198..6cd8cd55cb11 100644
--- a/dev-util/cucumber-tag_expressions/Manifest
+++ b/dev-util/cucumber-tag_expressions/Manifest
@@ -1,3 +1,3 @@
 DIST cucumber-tag_expressions-1.1.1.gem 7680 BLAKE2B 31e1f23c5fc008390c9221307473022107b109d409d8385a111f4fed1911fad15660faa824bee71cd87a2e183ec41a6ac9b5f7ecf5f1c417ed51d649c76712e8 SHA512 9b46d681be78b428c7cd29ca1cae21dbd410f7ca9844ec6f94368170c133f8de662a55e4f4440045704107e5428306ab81d2a90020c64102ef42f647cd8a66a6
-EBUILD cucumber-tag_expressions-1.1.1.ebuild 469 BLAKE2B f295860595f05dc5cf71197cd4017d466edca0a4a2471c5d1c71fb2ad469dc5b465e2ac875d8f1d7bbfb3c8c2accbd56df3a609801da445877aea060f61e4322 SHA512 6462a46c851aa311165342d86efeec72321dbcf4d53b717f31e70d40d90138b5104c9342c1b0ecf0881cb99a89318a40104555f1e1343b7e43256e0aab9dd498
+EBUILD cucumber-tag_expressions-1.1.1.ebuild 470 BLAKE2B e9620fad4f2530a1cde61152dd5f1a0b330a3106eac573ea0c28a66229274fd6fc3800181a632a51ea60cf1b5d6c25998e596a4d1dedbbd883700121057de556 SHA512 c42792d24d958a284912e9c1acbfa3826d80524755df5b9aed900475c9ba60c9a26823db6549d201e5bb5812a1d4090ef4a5431e5deff18715e455b970215b5f
 MISC metadata.xml 299 BLAKE2B 1f0765d5fb94004b9a72b4b9b4c50cb14b05e611c84016704210aa24909d554a6f817d475fb924573d2ec6ccbd389165d9689ee8ccb7212744292dfbc55a0749 SHA512 b655a45650726e475ccae46d7bc062ba32c527277160c9033382684f6a7aed520220c6a197f7abb9dfe18f8ebea051b5fdcbfd10c744031f123ac684ce3225c7
diff --git a/dev-util/cucumber-tag_expressions/cucumber-tag_expressions-1.1.1.ebuild b/dev-util/cucumber-tag_expressions/cucumber-tag_expressions-1.1.1.ebuild
index eca9d70aa246..fcf95fc7bf2d 100644
--- a/dev-util/cucumber-tag_expressions/cucumber-tag_expressions-1.1.1.ebuild
+++ b/dev-util/cucumber-tag_expressions/cucumber-tag_expressions-1.1.1.ebuild
@@ -14,5 +14,5 @@ DESCRIPTION="Cucumber tag expressions for ruby"
 HOMEPAGE="https://docs.cucumber.io/tag-expressions/"
 LICENSE="MIT"
 
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 s390 sparc x86"
 SLOT="1"
diff --git a/dev-util/cucumber-wire/Manifest b/dev-util/cucumber-wire/Manifest
index cea530fed3b9..711e199d1c3c 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 531 BLAKE2B 0b3e2b28dda6afe8af2a99fc1517d6783e9c001ff00a066fd064f0b406c1d4ebee9089a6491bfd67328be1c0978a6761074340efc8e12edfb7e8937baedc4dc5 SHA512 64fb1b57d56de3f2a24c60bd0e4c0c48c57c324d26877b43a2ccfa549f1080b44a809b6d2579416f30380353fdc200d64d2acce5a6439c371e4b1ec65719e520
+EBUILD cucumber-wire-0.0.1-r1.ebuild 525 BLAKE2B 36348d4e3c2be24800799e014c6f556a6f6cc5675bc7b9f7e59a8782decfb9dc6d25c4633a71dcbfc47ff33048e6ded9a4dc655e054c409539414689ddc15904 SHA512 00a3074653d100909a7975e31d377a5247ca4a45259f77770ee8973a50e105502fbec2c00093f41363970acb7f0f87bccdffbecc857e4a3909a317f9f6ab181a
 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 246ce7a4cdd8..8bdeb95eb37b 100644
--- a/dev-util/cucumber-wire/cucumber-wire-0.0.1-r1.ebuild
+++ b/dev-util/cucumber-wire/cucumber-wire-0.0.1-r1.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Executable feature scenarios"
 HOMEPAGE="https://github.com/aslakhellesoy/cucumber/wikis"
 LICENSE="Ruby"
 
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="amd64 arm ~arm64 hppa ~ia64 ppc ppc64 s390 sparc x86"
 SLOT="0"
 IUSE="test"
 
diff --git a/dev-util/cucumber/Manifest b/dev-util/cucumber/Manifest
index 8bf9773e00e8..388b773a4344 100644
--- a/dev-util/cucumber/Manifest
+++ b/dev-util/cucumber/Manifest
@@ -1,3 +1,3 @@
 DIST cucumber-3.1.2.tar.gz 267995 BLAKE2B a55d15d2c5746efd2e9f3518025b3b6d69e7712920b5731e1174ff429a9d6161d9aad7c0065c5ddf8b97fd87c9e658ff86b961b175db2c930bba52d1904d6b62 SHA512 abf0b562476653c393bc5a3c1f9669d91a2e312bcceb98bd20ac3771a61eeb696721cba76299d12871f7c61fdca176310e3a334b53d10c31ef3e201948c762d0
-EBUILD cucumber-3.1.2.ebuild 2761 BLAKE2B 28a211f6333f51dd688fd4302849fb4fa22ab3e9d6c2986752c32e061b79f042fe26d2c53676262afba100baee517a9560268cf9542cf9bcc095f5177a9a7996 SHA512 44fb49d9f57e421ec336c35e719d6c604d3c637a32e84421b7781f84d5839b93038abe6a099455f3561afc4d7791466422ac278eeb95e89607429a035dd57388
+EBUILD cucumber-3.1.2.ebuild 2755 BLAKE2B 858f7863d14af59ceb147c992a898a9dcd260d1abdd10abc81b29f49e59ffaa4d29160d38b7bed367318d36d602666327a2a94d352f0bc8d00f04e7447e97e44 SHA512 d5e4a8a5151fd78792929007ab7c7818334716ee6a33a426269fc86c66b6191e8206f0db314b8581cc25ca30d4230b3a01c854f76fd667f53bc93716aa259574
 MISC metadata.xml 304 BLAKE2B 1f2a69030fdeaccf7280372ef0e8abc7e1ab0456951e88d6f1839ba3615f8a6588bb3a96d05bffdbe343cf3a4b89fc32fdbefc83faeaf2a54e0cdca9c68e03bd SHA512 1e0e844510269d137017ff7ecbe1b98c9542f7264ec0e5b8858119f06887720645c0d968228825d91fcb69016b78d7f7c7d344482f08c3fe0dd6cc3df4f52902
diff --git a/dev-util/cucumber/cucumber-3.1.2.ebuild b/dev-util/cucumber/cucumber-3.1.2.ebuild
index 7014eedab2bc..50f428a688c6 100644
--- a/dev-util/cucumber/cucumber-3.1.2.ebuild
+++ b/dev-util/cucumber/cucumber-3.1.2.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/cucumber/cucumber-ruby/archive/v${PV}.tar.gz -> ${P}
 RUBY_S="cucumber-ruby-${PV}"
 LICENSE="Ruby"
 
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="amd64 arm ~arm64 hppa ~ia64 ppc ppc64 s390 sparc x86"
 SLOT="0"
 IUSE="examples test"
 
diff --git a/dev-util/cunit/Manifest b/dev-util/cunit/Manifest
index ace9a7e5e1d1..c94ec788db88 100644
--- a/dev-util/cunit/Manifest
+++ b/dev-util/cunit/Manifest
@@ -1,3 +1,3 @@
 DIST CUnit-2.1-3.tar.bz2 514500 BLAKE2B 919ff3345c06de44662deb3c43700dc14f3c6b0b1557e162f1f527b782874082bc866b3bbc3fd18869b975d7a0a6b4730eab87ed36847249ff8fa5cbede27797 SHA512 547b417109332446dfab8fda17bf4ccd2da841dc93f824dc90a20635bcf1fb80fb2176500d8a0906940f3f3d3e2f77b2d70a71090c9ab84ad9af43f3582bc487
-EBUILD cunit-2.1_p3.ebuild 1344 BLAKE2B 37033f904fcc555ffac7feb730a53c07bbcdcfdc2c7266d594f0cde3532106be6e542b0c8fa6a0b3944c4315dd01f4d9681f19e19e814777cbdec114188eaabe SHA512 e3a0271b63e22e656061af57b691af75d71810af9d98850beae1593e65afe7ed862dcd2b97be87713db6fdf275d80e8ae0d1ba3e0df418d7abbd4a736103424a
+EBUILD cunit-2.1_p3.ebuild 1341 BLAKE2B cdeb9574ee641279dbb07cb0dd8f3ccfa56e38e7d9fbd14c1efa6fa9e0f48091caa94c1c1bdd90f82d2cfbc574b1c88d6573de950657d8f52c0303c41e9aeabe SHA512 6b6fcc6d66df4d610ddaafa54f8b046dc83596daa6b83d1c998ddb621b6fdaae222190961a065ffe7172e6f3a4baae0c707428c480bc4b2e67b3cfce4dfc9a81
 MISC metadata.xml 242 BLAKE2B c9bc0f1e188dab4f0b4f1027441888c15919ad52adb639905a71471645438c94957a45ec043038fc19a829a6ec6b236eeb026560728dc231e5aeb484a467177a SHA512 3171a680f18023cbeeb73331a33942ddf076e0b8abc2c40284e4a4cb1803ad7264f8e38ffaf182d1f38ba28ad60e65a0ddf96c66a60e0f9a935aa941c49df87d
diff --git a/dev-util/cunit/cunit-2.1_p3.ebuild b/dev-util/cunit/cunit-2.1_p3.ebuild
index 9a51cda1919f..3ec7a05ec075 100644
--- a/dev-util/cunit/cunit-2.1_p3.ebuild
+++ b/dev-util/cunit/cunit-2.1_p3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/cunit/${MY_P}.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="ncurses static-libs"
 
 RDEPEND="ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )"
diff --git a/dev-util/cutter/Manifest b/dev-util/cutter/Manifest
index 8c0ac9d5f28c..902fb2e8526e 100644
--- a/dev-util/cutter/Manifest
+++ b/dev-util/cutter/Manifest
@@ -1,9 +1,11 @@
+AUX cutter-1.10.1-radare2-4.3.0.patch 492 BLAKE2B 3f6115c29ffcacabcb6fed3870f73bbf4dbbd5d5afd4ccf0c44d1a40e98519f44a8611571ee491f21c675edfad01ed4ff1d132e64f122c7ca7859a1081ef0c0b SHA512 ca97982571f98cb4549ddf82e0d8c13214c2006cf30710d55073b7704b8e6561b6c597157011af70af2e57a058ccade89cee56d18207453b2a367a5a18b7c228
 AUX cutter-1.4-python3-config.patch 800 BLAKE2B 33618c26a6b98330fdeaf8cabf6ba6578b2c889d851b06aad0fa7dccf7872010452c0b3d2bd0c1952835cf2d20e05e767d154634e5f21f139eea4f7154950ec6 SHA512 f0e3e6874a3dbcf88176676135896830ed57830066205cf380d13d9c2ba1495af63adcfa4cf55e4e10256d30b95a09948e9f1bc519b4717f7ba5e55090415264
 AUX cutter-1.6-python3-config.patch 800 BLAKE2B 33618c26a6b98330fdeaf8cabf6ba6578b2c889d851b06aad0fa7dccf7872010452c0b3d2bd0c1952835cf2d20e05e767d154634e5f21f139eea4f7154950ec6 SHA512 f0e3e6874a3dbcf88176676135896830ed57830066205cf380d13d9c2ba1495af63adcfa4cf55e4e10256d30b95a09948e9f1bc519b4717f7ba5e55090415264
 AUX cutter-1.7-python3-config.patch 800 BLAKE2B 33618c26a6b98330fdeaf8cabf6ba6578b2c889d851b06aad0fa7dccf7872010452c0b3d2bd0c1952835cf2d20e05e767d154634e5f21f139eea4f7154950ec6 SHA512 f0e3e6874a3dbcf88176676135896830ed57830066205cf380d13d9c2ba1495af63adcfa4cf55e4e10256d30b95a09948e9f1bc519b4717f7ba5e55090415264
 AUX cutter-1.7.4-python3-config.patch 800 BLAKE2B 33618c26a6b98330fdeaf8cabf6ba6578b2c889d851b06aad0fa7dccf7872010452c0b3d2bd0c1952835cf2d20e05e767d154634e5f21f139eea4f7154950ec6 SHA512 f0e3e6874a3dbcf88176676135896830ed57830066205cf380d13d9c2ba1495af63adcfa4cf55e4e10256d30b95a09948e9f1bc519b4717f7ba5e55090415264
 AUX cutter-1.8.0-python3-config.patch 1133 BLAKE2B ec9af0be413e7ce04dbdffe68e58e8aab5ba69e588d69aee85b93e13bacafebda27aa3eb4b0859e26b7043b1c8d56fd86353930278e624503cff770cfb052f0a SHA512 67a749d3763050b684740a7039150e675a72fd7f32395d7b00e393477be6a920f432e7ee75285a0035cbc110cb6fff7e15f41ac6ebb9f623245c6ab0c76b2202
 DIST cutter-1.0.tar.gz 614826 BLAKE2B 8f75343e57bf986d80dde3dc3ceb59675d28854744d8cc5fac783514e9c200595990d4860ee45db6544537d4f367df5b62a034e298bf273e44302edfa1647c84 SHA512 af6be59be7871d21d4f665e8ecb7f8224d99ccf7d62793e989ccd780ee521641c6ec0d941b46bb82770f5d44e5c0ef2efc29f9be303385e8e757e62a54bf53b1
+DIST cutter-1.10.1.tar.gz 1839344 BLAKE2B 883d0fa3d224d190b2dbec66e0bad1f2a542357bec9ce168706d60fa23794be23841157815323c989c1ddab9e1e428446e50ca0d71a91f7dbc8f01fe796caee2 SHA512 66f530687810a0bea3e4fcdf9962427964454a4a26e8d626d970bca358aab16b7939857fdbe22f0a611cdbdfbf67b5ab5f12959d8f04549c4cf8177cae49a54b
 DIST cutter-1.4.tar.gz 1067162 BLAKE2B 2f7eceffcfb3c542695e03ec72de1c99451f8278e91f50abc2e87542efbd2cc73d5a52b0e5303b9cea751edf91bc71b63295edd5b32d1b2b9ed3a1443cfc92e7 SHA512 54caec67e57f2ff3908942c1ebd1e909c65204c6f31d0ec95e31f46e03364f309898006b93555ba81287c0d74faf407272226e5ec65b3148ecde8feec11ca3be
 DIST cutter-1.6.tar.gz 1083427 BLAKE2B d51b88f2b9dd2655ef58d7075086959ec3ed59ed4b21db81a792ee165deda523a4e59378c954d0f2aa5b0af25d67329ed2119c004edc402c9b593a3b230a6fd9 SHA512 83aaadfbaccdaa514606408868c050e22d0a80a749b98a9f6df929467a16e69b0d454b25ce1cf53e35ebbfb74e9b39e2bd390057488c9bb3992a442ca306c2f1
 DIST cutter-1.7.4.tar.gz 1182307 BLAKE2B 7b80c99654c430c7d694b658c5757a0f75463f02867ca33baa12bbd84a16782421350b5db63c90dd999a17b89865ecc5a87783f2a5e6df2a7395f957076c3e28 SHA512 d5750e756b51a0a140f53946b7cd7ed6f12b81c798335873781d5ecb906012fe0e257ff27e5c75e0ece6000f65a8b602530d80e6f9da22abbb8beac6573db6ac
@@ -12,6 +14,7 @@ DIST cutter-1.8.0.tar.gz 1431831 BLAKE2B 8fd54238acb83f5747679e520b40981fbffa4a1
 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.0.ebuild 637 BLAKE2B a7ee78a5d5f0f988ca10b0f7af3a5d5f63d433eea111358953599db557bd4cdbb656858619aaeb53293faf2749f8cb4540670ee590e6e3a9ec373a98f099da64 SHA512 71f8a88e2ac7b0d3215cbb32c3cc3c3b9d433010deb6755d5fcabfee26e1440948eb33c658374a2070c1e5f844099c715f461935da410d3fbdf2daf2be181a88
+EBUILD cutter-1.10.1.ebuild 1057 BLAKE2B 0e69f2fe39258ebaafd1d7762bd5de7fcc5983fb5f4fba0bc87e1e1f0ba6d18c20969b2d5a5adc174f15fa6771f67b574e00e4ca4ecd6e85034cff5523394e42 SHA512 9107645f9fa7b302ec0bba142cfb80e907f22b8fa05af98b5eea7e83a0baef32aad39622719cdeab19fada018f1703f3fa5e91fe0cb8c466a82ffbec92f57d82
 EBUILD cutter-1.4.ebuild 1009 BLAKE2B a0056eeecee4e95a9b9e6332b9d8ddd9007ff569d93c473257ebc59bcc3a80a9a6bae8dc996f50ba355b8e29298d1a9c6c158402f77f4056bfca6674875135ba SHA512 9b78868d333fd97fc424e3eaa46d136098298f79860db68898dbad3841353dc81dbd513a312431f16d536c3273c968a5317f6bf58250f9f9ae792b9643ad659a
 EBUILD cutter-1.6.ebuild 1009 BLAKE2B b511368dcafb04f330ba2a9212cc5a2ce451f6ac69efc4b02dd789f63c326536af8a1b2339c2a17c50a2f47fa41f80bf5465ceced2c3880a90e482fcca372137 SHA512 3ec586afa2c3c9b040acb05e54a37b767dcf35fe0e9fe840befb0d8cd7221d2c6f91d994ce3006fb0d45666c29d79c47fdd0d3c4a3160aaf4661de077c00b903
 EBUILD cutter-1.7.4.ebuild 1177 BLAKE2B d692a0279ecfe0dec8e7b6d13c0ca45e0ed3b8ba4cfd4797a8a2853e80d0fcae422939da225a45e2df2be60740d935e1cca6d9dbf1d6e27766f5293fe11a6ae6 SHA512 3f92f93fc9c9718a688c6cd0c4b5ca3a16092c87a14cab00cfdb47430067fd20fb0a651ab4f744cebf5f735e6dc517410c4ff1686490940c421195bdeb19e48e
diff --git a/dev-util/cutter/cutter-1.10.1.ebuild b/dev-util/cutter/cutter-1.10.1.ebuild
new file mode 100644
index 000000000000..5e855969acf6
--- /dev/null
+++ b/dev-util/cutter/cutter-1.10.1.ebuild
@@ -0,0 +1,56 @@
+# 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/files/cutter-1.10.1-radare2-4.3.0.patch b/dev-util/cutter/files/cutter-1.10.1-radare2-4.3.0.patch
new file mode 100644
index 000000000000..590a07063c51
--- /dev/null
+++ b/dev-util/cutter/files/cutter-1.10.1-radare2-4.3.0.patch
@@ -0,0 +1,12 @@
+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/d-feet/Manifest b/dev-util/d-feet/Manifest
index a174cafa0135..3e9afda516e2 100644
--- a/dev-util/d-feet/Manifest
+++ b/dev-util/d-feet/Manifest
@@ -1,3 +1,3 @@
 DIST d-feet-0.3.14.tar.xz 177064 BLAKE2B be1150cead543dab3daf1c8beae4047d3c32e60dbf9a73a50ef95fe62cbafbf6af9ab174c7f9128212b0d33aa111545b598c6aab6d359625c94f0029ca5f1a20 SHA512 1ea3bd2251693884592d375f1459681043b5185c341299dc28cbc8e4e05f3ff3a423c051b650806f6b930d8b89e0d751983ada7ad9a74b380f74f3205125b1b4
-EBUILD d-feet-0.3.14-r1.ebuild 1095 BLAKE2B 765ca6630798e043b8ba5d04ad2b6d2928c4f07b46ea11612e1b0890facc4e06c3e7c4300aa41c2405e7a7091a74a159b8f9d63d8df0ce8177d79c7ea9016d1b SHA512 736a6228c6306797a14842c3cf4952fb7db8451d24720639b9bf619a7c00a07cc6f7817c72ddde6b53043e95127a6b3e31c9fbc3b3891995b9aaa988f2f91a3e
+EBUILD d-feet-0.3.14-r1.ebuild 1101 BLAKE2B fd32b89fe4ab2333eccc1a60bc4f36eb28df5301a2d07e8f528d9780b52a9e850a281baf117cb7a2855735995403ddcdbd6714766e937aece3b535fc63395cc9 SHA512 7e47dfdf9bf302c8d42910ac0a4bb033fb2d193007d0e3ee55a9a216c00259e555b89b2e45fa9eab6962c4e595c5ec949e9da3b2c8e185d63d8540111754abfe
 MISC metadata.xml 251 BLAKE2B c20c56e3f057e8bba258876f96b8ef08720698ee3aea60b765a79b1ff134df44036e6a230e071bdac6e5350a3b494975859db42c9693cbf165627bfecc566efd SHA512 0f975a0edfae95b6d15e292492de323063860e21caa4cc1e0ad70509bc3d3ead872daa50c66817efc9a8820e565ab9126d11f20d5daddf5f86b2e96100a4b9b1
diff --git a/dev-util/d-feet/d-feet-0.3.14-r1.ebuild b/dev-util/d-feet/d-feet-0.3.14-r1.ebuild
index 234a4d26646b..9958815639aa 100644
--- a/dev-util/d-feet/d-feet-0.3.14-r1.ebuild
+++ b/dev-util/d-feet/d-feet-0.3.14-r1.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,7,8} )
 
 inherit gnome2 python-single-r1 virtualx
 
diff --git a/dev-util/dbus-test-runner/Manifest b/dev-util/dbus-test-runner/Manifest
index 525e359e14d0..c5dd44e78d28 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 1245 BLAKE2B f11fd769497d1181d9359739ad0665fed13a4b241dfc54014a9f761d18bf9034469873468773d3c570a72bdb18f6730196d606d9157f1c643862eca2e1f606ae SHA512 f8d15f4118a745676378d60ed02b748d6f10e2a7d8a63341e92853e173c6878bd4bd041562234834d2be3bd88d762a0b2ab0e8c49c54ed8289a49b36edbb9010
+EBUILD dbus-test-runner-19.04.0-r1.ebuild 1251 BLAKE2B ad73e831e5b9a107ecaed2cc2eebdc845ab5024740409123934c4ee2e8105b8656f5a643e1a4133e2beec3819f931e20bd47d7d648b3844233fb1ae4794c5a78 SHA512 49717e7234c64103ca694b11ed1a581cc66c5bcaab04300c1451853a58442fe2c448c28cc435df4d95be0b6d5d254ab63bd07d954988f7850f198fcef2213f7b
 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 c4f1875532ba..cf085c064bc0 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
@@ -12,7 +12,7 @@ SRC_URI="https://launchpad.net/${PN}/$(ver_cut 1-2)/${PV}/+download/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-util/ddd/Manifest b/dev-util/ddd/Manifest
index 9288f150a96a..2d4d796f9999 100644
--- a/dev-util/ddd/Manifest
+++ b/dev-util/ddd/Manifest
@@ -5,5 +5,5 @@ AUX ddd-3.3.12-man.patch 571 BLAKE2B 88f499833e47ae279beac8dbc4aadcfaa80e8c19f38
 AUX ddd-3.3.12-parallel.patch 621 BLAKE2B 57446f5c7e797d7ddab5ed6aca01a5ffdc6af314bb797d96cfb357e214f1cf49153387635f9b585c53ebbcf7b06dcd6119b6bb2cbcaffa7d4382c4fbe9fdd181 SHA512 1157bec9212ffd4cbf86e8d36f68c80e9170091d09318effd800ce154f2b738e730db95e1e954c632dc25390e78cf88a9f1f3d14426df4069c0e5523f2dc6646
 AUX ddd-3.3.12-tinfo.patch 330 BLAKE2B f0e29f408f1e5e7fa40e386ab2a1f6786a9a14dc6722aef3fc8132558b624c233102b4290c0ba0e5d55b27aa4b25e6bcdd6fcd1b4ae237540621f3961e92bffc SHA512 a3cd3d59bdcce6c106d4488ec9a6c32d8baea49963f61e8e493a01131fd604664dca2e9e548852ff4c538c7123f5c1572bc54d6143340167fcdfa754002eb224
 DIST ddd-3.3.12.tar.gz 5687115 BLAKE2B 52c448eda46bfdc4f5720abda569a0c70f3680c3fdd543f6101c9af8c4c448496414c1c2a7be91590d9f14d0c8c2bb053a234d179bf900ca52df0ea8c2642131 SHA512 1249e4f5f25335f8f2c3616470f7a8f36262c00b8ac12b79f2b2806228de2831ebeb780fe09490e5e8b5b1ca108fe936ae70856f6a6ec02876fc75c7b4a7dbf3
-EBUILD ddd-3.3.12-r4.ebuild 2336 BLAKE2B fe0449525b930f12c5bfca323bbd67e082a3fab371fa59df5f8f9035915b696a8bec1059ac9ce88efc0d657310a8c70772593bafcb02786b199b5b231ce36ce5 SHA512 dab6b6aa1fa3487b5bcdb84cf360151affba19dac15ec925ac620f2c566316edaae180c9bf4b71ef0e2cafcb237c7b33ce213b40366f8351f19082b84a49fc20
+EBUILD ddd-3.3.12-r4.ebuild 2337 BLAKE2B f2504c9f89c7de4624b4273621c10af8d738a97ffcd9ab3966037edf3212e7cbd6bcf22ca7e91de116fce55b078f1f09a8b8ca032ceacb3f0bc2eaf927b76443 SHA512 50345e9b236f7be2f3e744e925108d3edfc311da3d33738b4c3a3b24068fa1afcd88132c2f6fe0a780ca8df4654645405752243a1ac989da27ca7bcfe6dbbe24
 MISC metadata.xml 658 BLAKE2B f2b35a9e08da89197aa56157e5d3c9adbc991d888cf798849bf7edf33fe6d9fd7dab16e0ea3068d20a836f85d133a570f3bbbcb9e57399c095292fa3390f59bb SHA512 8b304bbca5e836ff3032079f5dd2afea432b8f48e2c57575644adbefba0ddc4f64e3682f35f53c2804c27e950785ae8040f8704c05162acf302c6fb61b70c51d
diff --git a/dev-util/ddd/ddd-3.3.12-r4.ebuild b/dev-util/ddd/ddd-3.3.12-r4.ebuild
index cd435dcfd892..329b7ac91fe9 100644
--- a/dev-util/ddd/ddd-3.3.12-r4.ebuild
+++ b/dev-util/ddd/ddd-3.3.12-r4.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/ddd"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3 LGPL-3 FDL-1.1"
-KEYWORDS="~alpha amd64 ia64 ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux"
 SLOT="0"
 IUSE="readline"
 
diff --git a/dev-util/debhelper/Manifest b/dev-util/debhelper/Manifest
index 24b725d3041b..394a8ad89f56 100644
--- a/dev-util/debhelper/Manifest
+++ b/dev-util/debhelper/Manifest
@@ -1,7 +1,7 @@
-DIST debhelper_12.8.tar.xz 517508 BLAKE2B 2f72bde30638755787c93e2dabf5f60a013c58508c8872b2625e09c98dd64dca77b91063b24a5612ab7cd04ed0a94c533663cee1ef271783be5b27709008c9a3 SHA512 41c5f2e2362dc1b02c1ac60ec7c7b8e1826b9a5abd1a981f85bb90ef128362022228ba8778645492498d57676e5ba7a5563a8391ff5474065178f67f339bbb0e
+DIST debhelper_12.10.tar.xz 525416 BLAKE2B ce3a2116d9793eeda0df851047c0bed710ae6f948b6de268788e7991d683951f0eaf1a7a7a00d9195f1fbb008d21772f9a372f20d25c809fe07ef36ac91ca7e9 SHA512 79903492994a71a57a420207f3cde3fc1bef7645b9e7cf8d10b915cb52d325f947ae9f5130e28e88c3d357089fe35356aa2935480a333bc47352f6ced719a348
 DIST debhelper_12.9.tar.xz 521116 BLAKE2B 287740877b2431082baec262af581c34a9c0f3388232f7866bc7629b893c6d1f23da8f8956de5aa66d33b43d6f31d8ea31c897d313423d829750f894e5a3aeab SHA512 c8ee3040119a91b7dd2447be5c5d6bbe56d13aa53bd5e3d97be3af7c0a087a57661b36ae4eb56b20b0574c0e8702166ab75c7ffdeb7279f8ef77cc0ea367a6e5
 DIST debhelper_9.20160814.tar.xz 344328 BLAKE2B 38791ab3dfb74d12e44226b79a377889911a08505cdb45cc0a6e653906edbafcac1038d1d9ff9f5fd9f714ed36681562ce7fb1c9c1109a8528523100128fced6 SHA512 63072ba35ec8c62ee4c4d44833712925264c808a91f1522ef6a73377f2da3d11b285a21ad39158fd44693c801916189261186c8c7b28096719328a81a0a65f62
-EBUILD debhelper-12.8.ebuild 1534 BLAKE2B ebc4b0a520e3707503e89e5a417ece103f999875dae2e9abb71d944c4def528c89d113d728ca28b5607047161aaab827162569652c3b016f29a46415312961a6 SHA512 6b3d81240a5c1eb5abb27a2aeb31d5d41c17d0c10326e28f3ec76f5b816a715f24859d383f496789ad92d3792c4179e817d3a6dccff538b45413ca44ef218e68
-EBUILD debhelper-12.9.ebuild 1534 BLAKE2B ebc4b0a520e3707503e89e5a417ece103f999875dae2e9abb71d944c4def528c89d113d728ca28b5607047161aaab827162569652c3b016f29a46415312961a6 SHA512 6b3d81240a5c1eb5abb27a2aeb31d5d41c17d0c10326e28f3ec76f5b816a715f24859d383f496789ad92d3792c4179e817d3a6dccff538b45413ca44ef218e68
-EBUILD debhelper-9.20160814.ebuild 1533 BLAKE2B d47d9983f19acadb505a9cb1bf2ca5ec0085d32bf40c77649b67361381558344da5b0234a59e552574b145269951391e216bddc22b054e8ac9eca5b9bb12fd1f SHA512 fe4855a16b252325de7642cdde329295c6f93b98bf15840f2a330807ae9faae75a65c9d064ce732f483c48b7b11db471ed39986e708139603f535c0ae4a37ea2
+EBUILD debhelper-12.10.ebuild 1530 BLAKE2B 39d9f9b5772bc7806940fe0bf8f14e265ecbe9fa1a9a68e09394ad1ea6396a14b9562346f79a340c7ed3d21e54a9245720ddcd102449958554ac1e2d86f4e28a SHA512 b838f7546ecddbbecf8f07c11f0f7a92c69069297173c080a2fce21fcb06d525e0d54900698b005fc2f5f0b819ed5808f71d2ce1d4a16c66adbee7eb43cc6d7e
+EBUILD debhelper-12.9.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-12.8.ebuild b/dev-util/debhelper/debhelper-12.10.ebuild
index f3567e709e9e..99dca21e93e2 100644
--- a/dev-util/debhelper/debhelper-12.8.ebuild
+++ b/dev-util/debhelper/debhelper-12.10.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 DH_LANGS=( de es fr )
diff --git a/dev-util/debhelper/debhelper-12.9.ebuild b/dev-util/debhelper/debhelper-12.9.ebuild
index f3567e709e9e..99dca21e93e2 100644
--- a/dev-util/debhelper/debhelper-12.9.ebuild
+++ b/dev-util/debhelper/debhelper-12.9.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 DH_LANGS=( de es fr )
diff --git a/dev-util/debhelper/debhelper-9.20160814.ebuild b/dev-util/debhelper/debhelper-9.20160814.ebuild
index 38484b2c1294..9d112116aeee 100644
--- a/dev-util/debhelper/debhelper-9.20160814.ebuild
+++ b/dev-util/debhelper/debhelper-9.20160814.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ppc ppc64 ~s390 sparc x86 ~amd64-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 DH_LANGS=( de es fr )
diff --git a/dev-util/debootstrap/Manifest b/dev-util/debootstrap/Manifest
index ff43bd7a5b86..38cef08b0a99 100644
--- a/dev-util/debootstrap/Manifest
+++ b/dev-util/debootstrap/Manifest
@@ -1,8 +1,10 @@
 DIST debootstrap_1.0.115.tar.gz 75691 BLAKE2B ef2ddd8b76d7eafdf5be50e3cbb99725066562bc4a717ab42b436dcab3e5e3a2148c9e6eeaf7b6135e4bde836ee01101e7158ebc0472c08329ae0152d0845b8b SHA512 635e4feb1fb2bc247968127dc86bf0956243c8058f99e66ede177da84f0258cfc2de51873f347c099217b07e679527aeac08e7263d31b4112fb0708edb3deeb9
 DIST debootstrap_1.0.116.tar.gz 75723 BLAKE2B 3a48e0a51dcd6066af26d036df17e36bb901d7099dfa9521ca86cc1d2d70b8326ad068dd86130de1a2b686a44391d8fd0bcfb78f24cd558777b487f8bdbde699 SHA512 59ba44ecfa7c6bc3d81a814fe66a87223fa4bde24bd986f75875fe9077355a5f4268d822347f99402d4146e81b270a06f21111fb977729f4326bb5b8e017583c
 DIST debootstrap_1.0.117.tar.gz 76196 BLAKE2B 19bd9ff287da5cc050890eb22d874c8c5407196604b29de75d2cfebc8757df899f3a952c89eb0e4bb75d7d2e0a693e70a0130cc50542c700e9db3fd0b02e321d SHA512 e7cb734d2a3280f68c9b7707a20a0387c6308aea51d425d63343212301c2dae5dd2851c21b15b62bd6e8f4e855437b58e1a06373378f3e0bf659ba6c767f770a
+DIST debootstrap_1.0.123.tar.gz 78175 BLAKE2B e507ee76817eef20cfea4e37eaf893f8e64acaa791806ebd55bec97b8e60eb3c59b68bfe5e6023dc6e73706bde2468db46b84f0176ec46d086c3ea9423a206c7 SHA512 3b23f61528d4993750ba22b8765c10cfb9695793177017d9e4faf546da076be6660c5d6e0d1bf30bafe14f6d70f886190d3ec42a0057b895f40e860475eea794
 DIST devices.tar.gz 47835 BLAKE2B 03bfe097fda12a7a0aa19d3308c0d44382ad945defea05a63b17a72e4051ef94f0e60e75bde35baeace81da59d9f04126f6e463163609475b9c0fdf518f533ef SHA512 994ec8d72e3d52d2d872f7ff0da2336e4cbd3a5fa73bb6cdb9e06f5e7f5b8c69cea639c738fdba1186f382d6dcf62e7746fface664bfbd744aac24b16f034432
-EBUILD debootstrap-1.0.115.ebuild 1171 BLAKE2B b3f9cc49a48862779b37fcf782b43c0243a5358d3f3fa350938e5d4539a27bf197c3ec872a0e0f8f859c8654dc1e9a454849e5cac3ab1409479f9b4308714796 SHA512 5855ebe6c18787b152ebc6ede816db96c4a937e9bdc66aeae5671a885f3da1da8a21cc57f206389477e77d276295534c93d9c29ba4446bcd499317ceb5a43d83
-EBUILD debootstrap-1.0.116.ebuild 1179 BLAKE2B e668240a1e791eeac1ae105cd9f23a5b41be0232488364dd84bf719f5fa359d1e0feaff80ce0222a4a7af8bf5863a363bbff9d6f3a53f3d37d85241d41e30b1b SHA512 eb12d2206e869c0e88501317c41e6fe8b98c374de2b1facc345b8244778bc7d771424fadbe2a2fcfca1f8dd21562ea880c98e79acb0e49e5eb5254e6c0762b0d
-EBUILD debootstrap-1.0.117.ebuild 1179 BLAKE2B 7b79366f9cd3c4dd888998fe72d01ab05b5cb6b80f88ae011fda773569a3a6352e7aa8c15df06d9ada6ae449f14f4739d288fd7d6cf93bff2422179c24428617 SHA512 6fbbc5f65b2f1986dcf2ee46e90f57ec278cda3a4893e81b00380027e1e9bf7660827dc4928c606e506c8ffbe4254bffade82fcb0a2355a9cae820e07d8d96ce
+EBUILD debootstrap-1.0.115.ebuild 1168 BLAKE2B 9a61918f4a713360d63fa16b54abfb0bf6570b7551763a05652c190d1f1fb1256d154b16d99f82c6a6067adecea19e9ad6560fdba9caccd1a7d1076b6178bc8d SHA512 532a18dd5662d3f40b26941e8211090de602c655ea557d998431092aeec77f3e41c65919a265a1c367a5f269da5cf9ab354d86824c00a11b3175a804acdcbaf2
+EBUILD debootstrap-1.0.116.ebuild 1175 BLAKE2B cccd238e7c0069376c7e3265113d1f18a0e307c8812e0e74da55b38dadeb3bdd57aaaa5c8203856053b1333198d8ed803fbeefc45e923ccd1556b23d1bf44721 SHA512 59a8f2bc22d53358247c82784f8461c7908ce65bd74ba119f7e840aa599fb9c5cc7ca0d4772a5bff8b47b14d866431c7e2d05b94743007691f4ccc02d7dd5225
+EBUILD debootstrap-1.0.117.ebuild 1175 BLAKE2B cccd238e7c0069376c7e3265113d1f18a0e307c8812e0e74da55b38dadeb3bdd57aaaa5c8203856053b1333198d8ed803fbeefc45e923ccd1556b23d1bf44721 SHA512 59a8f2bc22d53358247c82784f8461c7908ce65bd74ba119f7e840aa599fb9c5cc7ca0d4772a5bff8b47b14d866431c7e2d05b94743007691f4ccc02d7dd5225
+EBUILD debootstrap-1.0.123.ebuild 1194 BLAKE2B 93d11f54b4432c91f748c0211c962cb509aadc7b84c1613db70303f4ee4eb5ef2355eea4c5c9a62659aafc250dad0cb64a6eb094499f41c84287e3f625babef3 SHA512 94e5dcc182f32647c89d4dbc7ae96cc0d57bdae380cd5e4b1a40a5461a7a5adc979b6ac52af94c520b37b415c7c20e817ea13d3a133180813b364cd28ea0f59f
 MISC metadata.xml 258 BLAKE2B c36fff5f8f795a075268afaf56f3ca4d8c75dc6997bd32bf2dade7b1903a27eb31a1f3c248b60fafcf77024a9300e8d0a6f8b5a6ace6aefbbec9374a295c430b SHA512 07739557f72a6f241bb1d2e4f61ca138e5dab6996ccaa4b4072057f0aa3ad2adfdfffe65683becd9d467729efc574bf158d846a8b3a7782cb180a13f0033b6b0
diff --git a/dev-util/debootstrap/debootstrap-1.0.115.ebuild b/dev-util/debootstrap/debootstrap-1.0.115.ebuild
index 882f122a397d..e1c4c43a56b3 100644
--- a/dev-util/debootstrap/debootstrap-1.0.115.ebuild
+++ b/dev-util/debootstrap/debootstrap-1.0.115.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	app-arch/dpkg
diff --git a/dev-util/debootstrap/debootstrap-1.0.116.ebuild b/dev-util/debootstrap/debootstrap-1.0.116.ebuild
index 8214beb8d505..43a821d68891 100644
--- a/dev-util/debootstrap/debootstrap-1.0.116.ebuild
+++ b/dev-util/debootstrap/debootstrap-1.0.116.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://debian/pool/main/d/${PN}/${PN}_${PV}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	app-arch/dpkg
diff --git a/dev-util/debootstrap/debootstrap-1.0.117.ebuild b/dev-util/debootstrap/debootstrap-1.0.117.ebuild
index a734c5eb67dd..43a821d68891 100644
--- a/dev-util/debootstrap/debootstrap-1.0.117.ebuild
+++ b/dev-util/debootstrap/debootstrap-1.0.117.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	app-arch/dpkg
diff --git a/dev-util/debootstrap/debootstrap-1.0.123.ebuild b/dev-util/debootstrap/debootstrap-1.0.123.ebuild
new file mode 100644
index 000000000000..8ac0c3265c7f
--- /dev/null
+++ b/dev-util/debootstrap/debootstrap-1.0.123.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit eutils
+
+DESCRIPTION="Debian/Ubuntu bootstrap scripts"
+HOMEPAGE="https://packages.qa.debian.org/d/debootstrap.html"
+SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.gz
+	mirror://gentoo/devices.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	app-arch/dpkg
+	net-misc/wget
+	sys-devel/binutils
+"
+DOCS=( TODO debian/changelog )
+S=${WORKDIR}/${PN}
+
+src_unpack() {
+	unpack ${PN}_${PV}.tar.gz
+	cp "${DISTDIR}"/devices.tar.gz "${S}"
+}
+
+src_compile() {
+	return
+}
+
+src_install() {
+	default
+	doman debootstrap.8
+}
+
+pkg_postinst() {
+	if ! has_version ${CATEGORY}/${PN} && ! has_version app-crypt/gnupg; then
+		elog "To check Release files against a keyring (--keyring=K), please"
+		elog "install app-crypt/gnupg"
+	fi
+
+	if ! has_version app-crypt/debian-archive-keyring || ! has_version app-crypt/ubuntu-keyring; then
+		elog "To check Release files from Debian or Ubuntu, please install"
+		elog " app-crypt/debian-archive-keyring or"
+		elog " app-crypt/ubuntu-keyring as required"
+	fi
+}
diff --git a/dev-util/dejagnu/Manifest b/dev-util/dejagnu/Manifest
index 3786e7ae0d27..41416d77a6ce 100644
--- a/dev-util/dejagnu/Manifest
+++ b/dev-util/dejagnu/Manifest
@@ -1,5 +1,5 @@
 DIST dejagnu-1.6.2.tar.gz 525879 BLAKE2B 1a4cf8bea350d7fca8983fe9f5f77756746e9ef81a06e2bc733a9fa32f54e3c791f28d80ab563306df4082f2d5f9f30b87f1380b57b15213bf401783e5384dde SHA512 ae527ce245871d49b84773d0d14b1ea6b2316c88097eeb84091a3aa885ff007eeaa1cd9c5b002d94a956d218451079b5e170561ffa43a291d9d82283aa834042
 DIST dejagnu-1.6.tar.gz 523969 BLAKE2B 1cc9498aacd681570cd8d8834cd2fe0594bb49e6664cfe934b824dba0bd4a6766f977de6a1dc4596095a11d68844873f5687000423f4928f0432981023d26451 SHA512 a494dd5cde8d275b397116049c93e183f5f1731d63660ee8d2f4263b099fc5be7fbddde927fab3ccd5f000c43d50242f94bbb4d95497b915ea53be418bc145bc
-EBUILD dejagnu-1.6.2.ebuild 513 BLAKE2B 662f6f3145709da786c692f0a770b6041504764d1f1338271c155748c8f94d83b66bd3177e4c314b0fcf55c0d9cb43793cf36497f8fc0cfdee16bad34124b30a SHA512 71e8e3c36b1d43656de5b3f55d3eae74d8418422a1a7baeb01f9efe471d4f62601acad949e0dd07a6fc8177e922787009093e84925ef8092ebfbe063618644b1
-EBUILD dejagnu-1.6.ebuild 717 BLAKE2B 3bb27d2604fc7c8d51497496b7fb264404259b7b1aa06c6047f47742f5a5e0218f8403b3c2ccf3c17930887fd593efcf53036f985c57279f5202508b2a101796 SHA512 af8bb17df64c5cbf1a6ae791f6533cfa0be4f115128086544e1e2cf331933644900db08349d32f6723253503bb83faf900d4e3dbfe68451ebf28b5ab90999c02
+EBUILD dejagnu-1.6.2.ebuild 509 BLAKE2B 556079a425d5f7d5b875baf02c79950c1ef1ff8d0d030b4a18055d1d9c9c56583989fcc2e3d01bdbe3c01bae2c125e0e77455717f4d514a6b1284ea936568195 SHA512 9e371c5da0a0d8c9bdaab698bc2ff17e3bd815bcab7470351084f9a1e0edf84670e6488d5e9088db8229872737e542779bd3d14988d4f648e7aa2342ea7d2812
+EBUILD dejagnu-1.6.ebuild 715 BLAKE2B 8acd7a493f1eba5b0645f48e47a3e90e7662fef43e8138c9b68c7c5a36fb808c64732ffb4cd326920e7af01452202504cf1ceb35e47d827d8f1d4cd314370d14 SHA512 eb72e606dfb9af144313af3d1e6e11fd3cbe29fcf7a95d5d72154889e17fb5d25a0c1799919ca62afb02b8f7df20b0fb13550aedad33886965166ac1925f5387
 MISC metadata.xml 257 BLAKE2B 468bd91200194cf2104205cb18f54d629954ed0d86d85a5d3e90af1942eb199d777a0ebc17d1f610f69326d3e0caa686255709f165466f5e0a675380373b30f9 SHA512 fd85d9cf15f6b7db96e4d184e32ae6f1503a5b70cb4cb1ce930ba13a1d5d4c4b24971781e95b7f3f9ead58b31760f84c368bc6fa2a793b4b5baf78259b047ff1
diff --git a/dev-util/dejagnu/dejagnu-1.6.2.ebuild b/dev-util/dejagnu/dejagnu-1.6.2.ebuild
index 6644791e1eda..fc736f0e1e48 100644
--- a/dev-util/dejagnu/dejagnu-1.6.2.ebuild
+++ b/dev-util/dejagnu/dejagnu-1.6.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="dev-lang/tcl
diff --git a/dev-util/dejagnu/dejagnu-1.6.ebuild b/dev-util/dejagnu/dejagnu-1.6.ebuild
index 1ce6a9ec227f..e6fe023e9a7d 100644
--- a/dev-util/dejagnu/dejagnu-1.6.ebuild
+++ b/dev-util/dejagnu/dejagnu-1.6.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="dev-lang/tcl
diff --git a/dev-util/desktop-file-utils/Manifest b/dev-util/desktop-file-utils/Manifest
index 1341ba3b17f6..1f0fb20b4944 100644
--- a/dev-util/desktop-file-utils/Manifest
+++ b/dev-util/desktop-file-utils/Manifest
@@ -1,4 +1,4 @@
 AUX 50desktop-file-utils-gentoo.el 250 BLAKE2B 6778fd6faecc6afe376598cdab5d890364edc33f0a55983b9a1ae76bcaf78a784fae92eaa66dc24c270ecf160f747e848872fa17e9c331dce7ad2deb498492b1 SHA512 5fc03fb9c9eea7d4c19c9b263413fb4f7f247b6bd40a7452b26f7e175646dc9b3af945d25cafc42a01a8d95059324652c56baa4bb5768b62dbd58f3ae4f05fe3
 DIST desktop-file-utils-0.24.tar.xz 137424 BLAKE2B 3cce27caa14782ef10886fdc0602c0378c1bad0d49a4b99077436a9951f13ccdb539fdc2b9d27b54430fce94fb0ee0268746b216cc5d6c1b9ba517e1af81b4ce SHA512 b19d700d4403c8757c62e49bb7650e0138a85e799f79de07b0d0099a52398a3ead90c8125ccc883df6e2a3f8f5f97696009ebb7452dc7acc25afeef20e06fde0
-EBUILD desktop-file-utils-0.24.ebuild 1290 BLAKE2B 213a12a0691f9de45620c582aa8bb40e9183fe38a063a24dee34cf36bc38c9210f45242791bd17dbe048c77d834a4f7a3d763e2e0bb867767c208da8907d2b3a SHA512 c19b182d8571012f5c99d3c081729396a0600e7d770eef8f2235b2f3b79faac3ca98a47113b6b5abcca3dae7856c429c0f8878a79a59b0a12be5eada41e8c546
+EBUILD desktop-file-utils-0.24.ebuild 1287 BLAKE2B 7ac58a5fc22f86c48162d3ef0c5f5471031a36294d8e9a68c1bc6643db4bcabb51e0ad581115e18df0e97c1b119d9c0b65737c617f6cdd3dbb984c7c90e81fd5 SHA512 09ee0891f66b52b89f6f45e909c579408cb36f0e8e535636444ab82424cb1c93f89d9cebf48c141f8bd9322c362e3948a5bc6cc3d0e844d1d8d8cb758f129870
 MISC metadata.xml 224 BLAKE2B 50a08713f8b792454787823dd56f1dcc1a1970ded78fa6ddffc6fb7301e0de75018e1e7a8c7ed890b4910f2716d2588ad21c7ae88ad8013b51cab7ba401c46c9 SHA512 12da46d8052565f62c482e6bcc714d8c00cac256f85dc1602579c8d61e0b61af95da149d1a446e56b2eba918ab9d78b556f77c6fe034a2e578f57a9dbe62fc44
diff --git a/dev-util/desktop-file-utils/desktop-file-utils-0.24.ebuild b/dev-util/desktop-file-utils/desktop-file-utils-0.24.ebuild
index 1031795ac061..dabde57ce4fa 100644
--- a/dev-util/desktop-file-utils/desktop-file-utils-0.24.ebuild
+++ b/dev-util/desktop-file-utils/desktop-file-utils-0.24.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/releases/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="emacs"
 
 RDEPEND=">=dev-libs/glib-2.12:2
diff --git a/dev-util/dialog/Manifest b/dev-util/dialog/Manifest
index e0938e5d0c07..cebe91180411 100644
--- a/dev-util/dialog/Manifest
+++ b/dev-util/dialog/Manifest
@@ -1,7 +1,7 @@
 DIST dialog-1.3-20170131.tgz 507783 BLAKE2B a98c436eabc8d06619bd64a8b1d647a0712630f0f89565253636ef2f38333ca6926177aa0c2001305b0c06fc7a1f576cda87da493183402ef9ec3cdc3fa8be23 SHA512 818b4e9d0d5ee55377b78ccceacf59a78e5e6d6fbc09e24a19e62b4988ff8de32f3364132b9ee88c86e126114eda45c82d86397d5f26fae81a6bda91be979786
-DIST dialog-1.3-20191110.tar.gz 540825 BLAKE2B 972d5b9d73c413274f09a590886838010feb55817ec94416dbf0da645824e92df9f7e02b9fbf22c226f2fa213876a6fa6de4f1af1ce94a93c53f22ede8d30926 SHA512 858a0cc095a4d52ce50bb77cc46a95ef64bcff1dc9526eb352b8d1d8884949186d1ea93af342eab8cf8a236efc9357bc5be2d1f1564a6f64536026bc1b894397
-DIST dialog-1.3-20191210.tar.gz 541569 BLAKE2B 358349c85afdbe9f1dc9c05b75337980c7ca3f7c6e9429314e8c24af722f696f12383b776828660441b5337c815fcf93b18076e0601e20dd940e0a8a304bb198 SHA512 4196287f26da2aab8376141a1442bccea52bcc6f7003042101df0c6a72aa3e25aa909d9fbcb937b047ab12a2e4349ec4b71b26f6e5cd4ba41cfd5665f732975d
-EBUILD dialog-1.3.20170131.ebuild 1222 BLAKE2B 76f2cf17d440c0c5dad2722d764c7aa651f888b70c33edca2cdf753dfe4f33b77866cdd872afdf3c9c6405cd770f0d2e9b8ac57a9079b865bc909c28981c4205 SHA512 696a2ef87e818739de6f7859221b767dbcb6ef50c825d547b1229ab18db480b9bda1c0349f2aaa85116ad8becd70d87e3e896204f111bf981a430ef4bb90136b
-EBUILD dialog-1.3.20191110.ebuild 1191 BLAKE2B 65b234c07f216c9689af30092148a715667bf05031755c6941690cd10392b9d07520da6bc3a20bda4c994ac249a99777e8ab90837e45b231705b7a8347e69ee3 SHA512 79ad367defc955861cebf64bafcff7a8ed6b9843fe21360531775b59a1c8fecd01e4aad9f61a9203da7bb654c2f1a2b73b63af82ea50a1ab6d01cee92d2aac6d
-EBUILD dialog-1.3.20191210.ebuild 1191 BLAKE2B 65b234c07f216c9689af30092148a715667bf05031755c6941690cd10392b9d07520da6bc3a20bda4c994ac249a99777e8ab90837e45b231705b7a8347e69ee3 SHA512 79ad367defc955861cebf64bafcff7a8ed6b9843fe21360531775b59a1c8fecd01e4aad9f61a9203da7bb654c2f1a2b73b63af82ea50a1ab6d01cee92d2aac6d
+DIST dialog-1.3-20200228.tar.gz 544523 BLAKE2B 18551ea08fc6ca8cce37604cc468143e57e562648b7c1b7eb8abc0157f69d7b279ea65aa81d8435fdbc60944dff15d3d716e769a1103b0abbd8f4acb7e5bc011 SHA512 c2454421d32a61c6618b0262154d770ad0d194dd3999c0a95d6f08b59527dcf3f9d2ddc082a52df9ae6e28154fde73884b3b957285ee9f765b4ed79d304ee49c
+DIST dialog-1.3-20200327.tar.gz 547962 BLAKE2B b335d8b57d9a9f3a7e303aa3b2c64736007b66618a79c79368d9dba20a8123813cdeb7d0643bf7c6d147314963ff469b6e41d2378fe9181081fa543f0aca50f2 SHA512 c8c7ccd86fa189a2b6739320f59f127512e53f908ed257280099f8c45754da98d2095835d0c14090cd071af0ed6e8ff95f9938f5ca8027b0b7001c7fd746fe59
+EBUILD dialog-1.3.20170131.ebuild 1220 BLAKE2B 68e1d0083e8888e7aaf42fd549a285a8deef84e1040d0fc49d670f69fb39acc8a5c25eff0f1dfe8882e9743f063d047359a537534a8dc1d88e7e57efc98bbd33 SHA512 2637d50b8d802002ba8de067234cfd1b56d36eb763d9ab444ce220d2ad5d9b79d3be7957cc7b69af506213579a4c482e0d5f02b2d13becc9a61016517db19479
+EBUILD dialog-1.3.20200228.ebuild 1187 BLAKE2B 70ccc9a8ede219b1697e80a1536f004d3ab39f1bbed7044304a80968817dad2517d476d3ef0749710d7478a01322c4639ea15cef8fb9bb086d5b890a393bca89 SHA512 72a7c529a10ad2806177ee0a01476d4cc34240f4d2acc6ef2a61760315742387b507969df6edd021390ef4d196b62bb1a4886199b843ab6ada1e7d2a0d96cdf5
+EBUILD dialog-1.3.20200327.ebuild 1187 BLAKE2B 70ccc9a8ede219b1697e80a1536f004d3ab39f1bbed7044304a80968817dad2517d476d3ef0749710d7478a01322c4639ea15cef8fb9bb086d5b890a393bca89 SHA512 72a7c529a10ad2806177ee0a01476d4cc34240f4d2acc6ef2a61760315742387b507969df6edd021390ef4d196b62bb1a4886199b843ab6ada1e7d2a0d96cdf5
 MISC metadata.xml 341 BLAKE2B 84cb58bb0ffe236825ae28f7f277c172eb8e8ec279aec915cdac1078342272a180aceb72400817be94b01568c24c4588d6423baa2be02c70a9971840a7e62650 SHA512 b194bfc5daa545724eaa7ec7dcc5618ec87249158d5e8fcb01a76375960b2d9dd012e596c0fc8e0d9c94eb39175a6b4424257cf0828cc73956c7a68ff4749da8
diff --git a/dev-util/dialog/dialog-1.3.20170131.ebuild b/dev-util/dialog/dialog-1.3.20170131.ebuild
index 5103256d7bcd..3ecb50050a9b 100644
--- a/dev-util/dialog/dialog-1.3.20170131.ebuild
+++ b/dev-util/dialog/dialog-1.3.20170131.ebuild
@@ -12,7 +12,7 @@ SRC_URI="ftp://invisible-island.net/${PN}/${MY_P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0/14"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86"
 IUSE="examples minimal nls static-libs unicode"
 
 RDEPEND="
diff --git a/dev-util/dialog/dialog-1.3.20191110.ebuild b/dev-util/dialog/dialog-1.3.20200228.ebuild
index f119f530eae5..7a23e6577d51 100644
--- a/dev-util/dialog/dialog-1.3.20191110.ebuild
+++ b/dev-util/dialog/dialog-1.3.20200228.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dev.gentoo.org/~jer/${DIA_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/15"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="examples minimal nls static-libs unicode"
 
 RDEPEND="
diff --git a/dev-util/dialog/dialog-1.3.20191210.ebuild b/dev-util/dialog/dialog-1.3.20200327.ebuild
index f119f530eae5..7a23e6577d51 100644
--- a/dev-util/dialog/dialog-1.3.20191210.ebuild
+++ b/dev-util/dialog/dialog-1.3.20200327.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dev.gentoo.org/~jer/${DIA_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/15"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="examples minimal nls static-libs unicode"
 
 RDEPEND="
diff --git a/dev-util/diffball/Manifest b/dev-util/diffball/Manifest
index 18088fafd8e0..f91699ea95f3 100644
--- a/dev-util/diffball/Manifest
+++ b/dev-util/diffball/Manifest
@@ -1,8 +1,5 @@
 DIST diffball-1.0.1-bug_543310_stack_buffer_overflows.patch 2945 BLAKE2B 17aa01d64464edccc490e7714dc9db8767d19b0c8b6d14223359d266d38e47aae822454aa14446c038b2b3477a4d8a8db228be7e28666528883ebf02ac2cb65b SHA512 be9a44cd9abfb41f32683d0363375902477f739f9c0dd23b30cfcd9fc6fced61111a2b101cb46db2d6320b4d70ed04627a1c178d44f23530f248bcb87e6efd32
 DIST diffball-1.0.1-bug_708736_cseek_xz_reset_avail_in_out.patch 1041 BLAKE2B de4ac71445f30546eeaaa28201640f3295bc288d83b75b8f84d3134f070249248c777edfe9b0dc705ff7990e6d4dce37d53aa1a9e153bc9a71cff6192b09f8f3 SHA512 eaa9f55b1de0d82a7c21280c4d7e6effcb90944c65f42e0230ef18044f6651512befd425128619c4ca3641111be3cef1418f1800e1854cced24433e1deffe5e7
-DIST diffball-1.0.1.tar.bz2 387787 BLAKE2B e46dbf32b2ec9bece106ca90a6ae46bdfde8b83a5fd41e67f15c4bd25d7015327b4738ce3bfba71c92fd2baa94a5d3bc507dd0fad2b3451447a39a7fe058002e SHA512 1e01fff8bf7d993c828f195d974b7df1cd4fb056e9a51f9533bc8e01666a55e0d9467c799a005f58d7b4369bbf88fc9b716d0fb68ead6171d349e3c874bddb8c
 DIST diffball-1.0.1.tar.gz 86387 BLAKE2B 1e2c6d522b00a643666e88d19d2d6986ce02c7835378dfc9799e43fa291683bf08e129546a85c332b04ab549788ae4ac3b4d57fd6140a29a9556bece4293cbf9 SHA512 3344f03a65e2b44615eaf9210d26a4438712684c438fcea9caabe89688fe3b3d5436703f0ed63412a18a63acb49ca0dacff190fa002ea76b346bbccba3388ee4
-EBUILD diffball-1.0.1-r1.ebuild 1030 BLAKE2B 6c858fa68fc164f1635faa36c825397adeaf882161b142f1c970318439c9f27278b1cf60a0c92e2b40abf84c8f920cde73825f4cf7a3bedafd3b0af1447932d8 SHA512 d42aaf98f289db6f4da12777c52b60ae1cdeb8c573b72df0c6d39fc21679c4378e34aa3b0c280752681d1bb832dc57bf0f7367d8d1a3641e6b2b99d5a8ff70c3
-EBUILD diffball-1.0.1-r2.ebuild 1200 BLAKE2B f209ecb80472d5534655b6acd7981993c380fa3b05d1c1d6107d5e7e8f49f81378925935a567241ea1099864d01361c88104e3a0a7c97fc884df9e4575d7c9fc SHA512 b3f4d294b69baf112b9612a4e88d9b6b3bef19881f945971f4a7fe27e377d347a12c388d7df2501210cfe6ef9f7bb73a9c10ca074eaae6cc9727b1f4a2e57348
-EBUILD diffball-1.0.1.ebuild 868 BLAKE2B ddc35ed4d64411b2ecb3eb107d2147cb9a91ee7caca9896b6f9fc824fcc671ddc87ca7f44247772052a0073243c9a26266185302851275704f41a13e20d4b759 SHA512 51281e45a844bec0ed30d14471b98f8b6cc06b34962d9dd63f64cc27c2a1945a8b45775ebf7b10bf90eb5aa570e3ceb048f040c189a2453158db44906de59d4a
+EBUILD diffball-1.0.1-r2.ebuild 1197 BLAKE2B 9169b0789296b6b1c3aadcabb17b5dca02245fe35efa19ca3744c870624c4f12a8644e43820b060ca6797ded6df8fb298f605c55df83d64cc7881832302bf903 SHA512 33c2758bb3538ea061e91e7438661a5757f6a2ca0bdfdd76b42ab39c6c74c5c428f1de7e9375b32415c8c6a259116ca017a1eb5a974034ed5b43e9f53534556f
 MISC metadata.xml 325 BLAKE2B d2fe2133512a06976ca331af0d318fbe888fac115af9e2635a3f682eb1ffcc0c9088e87437c39803cfa5183aaa2a5df091113efa6f7259e91960340ce095717d SHA512 8c9cb7fc1861a080e525eed799e80650b9c8ec4b0416959c9b754099cec1c26651beb5364992b8a3c80ed3285bff74f0a0b72a4032e3b243cab0191d8fd8856a
diff --git a/dev-util/diffball/diffball-1.0.1-r1.ebuild b/dev-util/diffball/diffball-1.0.1-r1.ebuild
deleted file mode 100644
index 4b2dae447bee..000000000000
--- a/dev-util/diffball/diffball-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic
-
-DESCRIPTION="Delta compression suite for using/generating binary patches"
-HOMEPAGE="https://github.com/zmedico/diffball"
-SRC_URI="https://github.com/zmedico/diffball/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/zmedico/diffball/pull/1.patch -> ${P}-bug_543310_stack_buffer_overflows.patch"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="debug"
-
-RDEPEND=">=sys-libs/zlib-1.1.4
-	>=app-arch/bzip2-1.0.2
-	app-arch/xz-utils"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-# Invalid RESTRICT for source package. Investigate.
-RESTRICT="strip"
-
-PATCHES=("${DISTDIR}/${P}-bug_543310_stack_buffer_overflows.patch")
-
-src_prepare() {
-	# fix bug 548316 by restoring pre-GCC5 inline semantics
-	append-cflags -std=gnu89
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf --disable-static $(use_enable debug asserts)
-}
diff --git a/dev-util/diffball/diffball-1.0.1-r2.ebuild b/dev-util/diffball/diffball-1.0.1-r2.ebuild
index ab5bc9dfe7b4..315c3c7a4696 100644
--- a/dev-util/diffball/diffball-1.0.1-r2.ebuild
+++ b/dev-util/diffball/diffball-1.0.1-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/zmedico/diffball/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="debug"
 
 RDEPEND=">=sys-libs/zlib-1.1.4
diff --git a/dev-util/diffball/diffball-1.0.1.ebuild b/dev-util/diffball/diffball-1.0.1.ebuild
deleted file mode 100644
index 00f22c0d31d9..000000000000
--- a/dev-util/diffball/diffball-1.0.1.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
-
-inherit flag-o-matic
-
-DESCRIPTION="Delta compression suite for using/generating binary patches"
-HOMEPAGE="https://github.com/rafaelmartins/diffball"
-SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/${PN}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ia64 ~mips ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="debug"
-
-RDEPEND=">=sys-libs/zlib-1.1.4
-	>=app-arch/bzip2-1.0.2
-	app-arch/xz-utils"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-# Invalid RESTRICT for source package. Investigate.
-RESTRICT="strip"
-
-src_prepare() {
-	# fix bug 548316 by restoring pre-GCC5 inline semantics
-	append-cflags -std=gnu89
-	default
-}
-
-src_configure() {
-	econf --disable-static $(use_enable debug asserts)
-}
diff --git a/dev-util/difffilter/Manifest b/dev-util/difffilter/Manifest
index e14be4d5c34c..263ca3575135 100644
--- a/dev-util/difffilter/Manifest
+++ b/dev-util/difffilter/Manifest
@@ -1,5 +1,4 @@
 AUX difffilter-0.3.3.man1 7592 BLAKE2B 9df9c1d7c59f129d714820c3b102adec0dfef3d17c944aaf19bede55d1746a4112d75da118bd3b1b4e5c2b639e482dc0e76c39efe14c9a7df997d7160d77f457 SHA512 6fb0ee29cc6700a9cde54c46b526d8d944a5cacefb57b0f6f579055033b007250f476a3cb86fbe3ba0b500418cf6601dd4978d03dc898ffbf897e070e91dc0c9
 DIST difffilter-0.3.3.tar.bz2 291226 BLAKE2B 95a43e025668318c1d8e216ae4259e874983f899da8bff402b2fa60c7d8d1f7cb203854b76dfe12b2577f6e2ce8f86cedb93fe50b596c1782a436346069b5eb0 SHA512 ac9aa95dd7e41b6c49c1416be9d1929a41b629587ecb90f3dcadd3982a46d8eb49d181f8f1b1645322113becd9a4b708d0df1e27f6fb9064ffb06b37e5f101f8
-EBUILD difffilter-0.3.3-r1.ebuild 548 BLAKE2B 434d276ffafb939512a4c68582b476cea84b21abca23d934427605236bbced09ecfd38a6eb9faab78bef318ed2e572fe1e1f48576eed9e7e4eb40815fee5238d SHA512 fdb3ac8748e9b5b563f8fb48759081610a5f884aa3365e14d9639f80cbec6a3a1b5e0317e51c7bd89469f5ba1184fbd7d9e9cb860b65c2ee929eabf41b34a80f
-EBUILD difffilter-0.3.3.ebuild 627 BLAKE2B d5e374dfb6c47aaf1db7b0864a2b679272f1fd4757493642ca28af48a90a6f819ca3344bb2a89466ecc039e53653eeafc42a2e3dd9fc0d10c5ee394e521647f8 SHA512 f789e1b968d0d1f79e71ce8fad490e64104ce3f1cc5f67f3e841d78a426982aa2ec7bdc88b316f6701b25663370feb8221c53ad7c2473f0cf6ebe6783e9292b2
+EBUILD difffilter-0.3.3-r1.ebuild 546 BLAKE2B 77ac90aacd7ff195972105a493e579bbc1d9879d1baa157877543593d3249351565180afda3344ad7b43c975aa0f8323d8e9a3a3aec4a6afa024f5b29aee3b63 SHA512 f0604b58c54a538ceb3d7b6da737cb1f7411c260f374f0bdc1b7315eecbcb41b6d3b8118b47555ea155a6111cae4373767045d97e69f69d2c44d323f9de774a4
 MISC metadata.xml 210 BLAKE2B 5fe5983d28e12b1e05d7cdaea69fdd87becfb2dd9a9b0353caab5f617a2f806227181e7100f623c8c814be524625c2739db8a93226b35b3cd9ec6d72db9895e6 SHA512 267d83ef7ae9579f44c22fe568d6d2064e426acdd07c00a69c735801e588ae0fb1988ae60199e349d444ddb5393a6a0a6836df89b2205fc85e25144ecbf56148
diff --git a/dev-util/difffilter/difffilter-0.3.3-r1.ebuild b/dev-util/difffilter/difffilter-0.3.3-r1.ebuild
index d8137bf00d12..1b210f172162 100644
--- a/dev-util/difffilter/difffilter-0.3.3-r1.ebuild
+++ b/dev-util/difffilter/difffilter-0.3.3-r1.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
@@ -9,7 +9,7 @@ SRC_URI="http://mirror.ohnopub.net/mirror/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 x86 ~amd64-linux"
 
 RDEPEND="
 	>=dev-libs/liblist-2.3.1
diff --git a/dev-util/difffilter/difffilter-0.3.3.ebuild b/dev-util/difffilter/difffilter-0.3.3.ebuild
deleted file mode 100644
index ec2d6786e055..000000000000
--- a/dev-util/difffilter/difffilter-0.3.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit autotools-utils
-
-DESCRIPTION="Filter files out of unified diffs using POSIX extended regular expressions"
-HOMEPAGE="http://ohnopub.net/~ohnobinki/difffilter/"
-SRC_URI="ftp://mirror.ohnopub.net/mirror/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux"
-IUSE="doc"
-
-RDEPEND=">=dev-libs/liblist-2.3.1
-	dev-libs/libstrl
-	dev-libs/tre"
-DEPEND="doc? ( app-text/txt2man )
-	${RDEPEND}"
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable doc)
-	)
-
-	autotools-utils_src_configure
-}
diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest
index 2ffda0452d88..32440f9418e9 100644
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@@ -1,5 +1,7 @@
-DIST diffoscope-129.tar.gz 1766281 BLAKE2B 7e5dfc66a20daa62783811ec6f57b32b0733c65d66d9a17379985d5a18cf0e8b2901cf49a28d72f9305b2721e10c6ac455d747dbf5b5f3b9773c63b7fee0cd5b SHA512 2c472485b594cf2fb424bed52233a422e643bf8d5d8c919b5b5ce20c83ec7345325d337bb188c1a860f85f777012bd3e0137721a418903e0d421d4fe2d5a1b08
 DIST diffoscope-137.tar.gz 1557283 BLAKE2B d4b59174eec5919ade87fa04878c469a87bb31407c35eac9a21b13b36fd7b15ca0cb5cdf38dd25c1e964db1987579c74b595b4fd38d2f3e5a028f64176f73202 SHA512 6faa0675cd203e3320071dbf60a14110cb3674984bce9edab40e28b17769cb847179973fe55e0f9a78a3d6bf903e259c432225ae31e7e4f60ece252ac9cac20c
-EBUILD diffoscope-129.ebuild 1881 BLAKE2B 901b3b35c06ef654cd3be4189cc19160483addf7ee003da320e885e8dc8fdde1c8e6878e414a12f934b1fdd3a7e6d685c3236179714bb2f070d1c4dbc0644a67 SHA512 bde4b0a72ce6c40660f7d0fd3dfcf0076082640e7e747a5080a49a9c04b937650dfdee20ce6dc46ebbcbf36d258d42762d4d1517f635a1ac040bd7b4cf99c538
+DIST diffoscope-138.tar.gz 1567753 BLAKE2B 078a61eea53e0d0a66a862ac2c86889ddb95ddb8ccdb2b58b6a8b7e9ab1a3d5550511f73e7187a0539a974f257db6da79ad02b96e179952663f11e50cef23f12 SHA512 7dbc80d9135aba48e4f83b968e39f26e39f701b1ac1e6aaa2d9a6e18f24c1387b49d46067d2b2f2a76421752a8ac06d070cf660afb4a88db79f19339b327c485
+DIST diffoscope-139.tar.gz 1567732 BLAKE2B 14c8715612849e3bbf6590f8ada7c322aa73d9c24c4de5287f5d1f10f5a51b2ee04c8f6d388a8b54a409ddb8fca52d8663b5cd53f301878a94bb302d16874f3e SHA512 cd70a041b3738f7c09c719a17c3b933741b149a9aaee1c8fcb6bae0edd99f63d24b51cf55abdb8b5eb2ec6824fe6dee1a721974f1cf8b62604f26d46d9927d53
 EBUILD diffoscope-137.ebuild 1912 BLAKE2B ec1e126fcf54b48d60a15a9807ee0ff5a94961527e6ce135c0bdefcce77c621437a16a5b46e7d03a245c0911a1a199025ac119dfc1bad6b82687ca1210ae866a SHA512 55747e556c637d812582fb374c126dcfe254dac6a1c665bace0671a279147658e5d338eb228802182917044464eecd48153bf11f5d7b70fade7f037fe9f3cc19
+EBUILD diffoscope-138.ebuild 1986 BLAKE2B 6b1d5eb357a036a5ccdd278ff4b64f4c2d079deaed88a377cee2d87f1ba0ccc1532633478221a9db26caeb9a58bb6a9eaea1b6561ac11df80c9730d3239f81b3 SHA512 1728a19c6a64097116616a4293b2a4b7eb00d1ca92bd86133c4b228162ec21d0ac93d833ef8f2409c6a9840deeb997da3791df3ae9c85007b06919bad61a8e7e
+EBUILD diffoscope-139.ebuild 1986 BLAKE2B 6b1d5eb357a036a5ccdd278ff4b64f4c2d079deaed88a377cee2d87f1ba0ccc1532633478221a9db26caeb9a58bb6a9eaea1b6561ac11df80c9730d3239f81b3 SHA512 1728a19c6a64097116616a4293b2a4b7eb00d1ca92bd86133c4b228162ec21d0ac93d833ef8f2409c6a9840deeb997da3791df3ae9c85007b06919bad61a8e7e
 MISC metadata.xml 2081 BLAKE2B 5675b792346a4864e40f5d8b2181867065d8dac0d3fb17f4d82536aca7fc453490ddf32ae39bbe16514caac81d042adfa0f151e355ec60f27bc9bdda770ccb6b SHA512 c75fe757c122bc8db219013a5c46fa8ab5d23da2dfbf873d6af61e19a92a8c8d4ab9027b105e7757da5dd8caabf33de1b82605d7f8c2efa8095a7be0bd9117d7
diff --git a/dev-util/diffoscope/diffoscope-129.ebuild b/dev-util/diffoscope/diffoscope-138.ebuild
index 70cbcbe463d5..a677a10243ad 100644
--- a/dev-util/diffoscope/diffoscope-129.ebuild
+++ b/dev-util/diffoscope/diffoscope-138.ebuild
@@ -2,19 +2,23 @@
 # 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 hex imagemagick iso java llvm
 mono opendocument pascal pdf postscript R rpm sqlite squashfs
-ssh tar tcpdump xz zip"
+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}]
@@ -47,6 +51,7 @@ RDEPEND="dev-python/python-magic[${PYTHON_USEDEP}]
 	pdf? (
 		app-text/pdftk
 		app-text/poppler
+		dev-python/PyPDF2[${PYTHON_USEDEP}]
 	)
 	postscript? ( app-text/ghostscript-gpl )
 	R? ( dev-lang/R )
@@ -57,4 +62,6 @@ RDEPEND="dev-python/python-magic[${PYTHON_USEDEP}]
 	tar? ( app-arch/tar )
 	tcpdump? ( net-analyzer/tcpdump )
 	xz? ( app-arch/xz-utils )
-	zip? ( app-arch/unzip )"
+	zip? ( app-arch/unzip )
+	zstd? ( app-arch/zstd )
+"
diff --git a/dev-util/diffoscope/diffoscope-139.ebuild b/dev-util/diffoscope/diffoscope-139.ebuild
new file mode 100644
index 000000000000..a677a10243ad
--- /dev/null
+++ b/dev-util/diffoscope/diffoscope-139.ebuild
@@ -0,0 +1,67 @@
+# 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 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 )
+	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 )
+"
diff --git a/dev-util/diffstat/Manifest b/dev-util/diffstat/Manifest
index 6b1ebfb0178b..94cb17bbc5c1 100644
--- a/dev-util/diffstat/Manifest
+++ b/dev-util/diffstat/Manifest
@@ -1,7 +1,7 @@
 DIST diffstat-1.60.tgz 255922 BLAKE2B 325be7c283580066cd5c2665078320d33f9a97761a641ce53e7a53200cfdd0d047adb3bec527a5c8489320a685bd43979066465886fefd7ce5a29926c43dd95b SHA512 6cbcff7dfe6d51583d59d2c9dfe4cb958202491ca3c4b1096616380564a1842065434d30858c55c3ddcfc76cd07b58dfc4c4cb6cfdcf6346af60998170f51bd2
 DIST diffstat-1.61.tgz 257242 BLAKE2B 8506944255991f3fb093c77e04d1c19e75cce5deffe7ade19f6917c9775e00d02cc8013fcd88440a9d116b66859ffebb0d1c92755ca0ebcca465dd0595fe4bd2 SHA512 48166e1241904b955c0f5543b1f11724a1a91516fcba5ad0603441d985728de3e0fca5f5212704dd0fc9a9e5062788b1b34062869137fd851932233d4abad114
 DIST diffstat-1.63.tgz 270855 BLAKE2B 01a54c49200396a102c42d982e952d38d23c78452ae467e799d29ae1199aa179927ff719955d700081c4b4f4296c0b73229fa35823e3e18f80b2edc51e3316e2 SHA512 e1319f95088e615d442b0b02af922605d0c76e15ba2f0e8cf8c4db56949ac63f4a6e3e42099254480b9aab388cbd6550f515ed4d4995c6723d24f392d1872b16
-EBUILD diffstat-1.60.ebuild 591 BLAKE2B c38869011b822b71893ef830a55bf6638c05f0b4f5826b3600aa9526e12fc80f74523198b3d270b7f27a17fcc62bacb1a53a007f3177ebfa0cd03f4d102fc165 SHA512 049e8ba18a2954f3fd1c2394aeff6f6fff3b44ce40d402a11e1457cb0e7fee6e838d7a26a46d468a77d7a093fb6a66790a11b968bf52d2dd003b793c5813e55d
-EBUILD diffstat-1.61.ebuild 466 BLAKE2B d746d080641ba2d19a7e0d82a45df147acc753741036e4719861850c3049f3591150ece544135868ac89efcbb62e9afece89113b8781ce1a7f1e5c3f128d31c3 SHA512 3c88b73434aadaadbd665709febdf0ed4eb9ecab0f9f850b6ff76a6ed2d6893803f71c3d629ef664197b363451deeb951c0bb873b5429f0ec23bcef8f3abb4f8
-EBUILD diffstat-1.63.ebuild 472 BLAKE2B 0c0e8c0f4ab8d1765baa7e098bacb12d9b61535d3fb4c1aa968cee4c406210ab7683bad53060cb10521d24fbf14827b0147967e066b471c6f44a3f013106e0e9 SHA512 43251d295d1e29aa18832b5bb0e8dd3ee15fd136d97595e76fefcd73eb49fc56446d0bd6cf0d4689e48c61b623da12c9add0c3e25faeaa905c63a13c86a93619
+EBUILD diffstat-1.60.ebuild 589 BLAKE2B 368617b720cd09497459e7647895e50828daf7ed8bc7dc3487e479f41fd466afbf3a8e4fe601ef878031023ff9e820794e55a3b05c47f3955be1380af25f9a6b SHA512 ca8b9382400000ad09fda8ec5dcfd068756ade88c24e8edb1de9ca84f3dcfa9eb4a3f6af6b49cb397a7663fea7e303840e5e33f7b55b68e04f57445743cf7cac
+EBUILD diffstat-1.61.ebuild 459 BLAKE2B 486a64d3a027f19bf0ce407a443d0fc0dc1648de729ceede815f4adeb4afa040683ac5a9acb1a5a838398331608ecbfba43d00dad7e77a9ea11850b3a7f5b9b9 SHA512 b5138d15cfacaef250a7939b11495a396d35a66aeeadbb85e71dacc1335939b42107c3bb353f79e53b25e40ed4789441e9a8e16abad1d8e7fa350b2c7bad6504
+EBUILD diffstat-1.63.ebuild 468 BLAKE2B d5bf6bb0cf8289bd616a66608be8c93afedfd56d2a250bac4bf7f8bda452d09a21f3c9fce27ff4d6f9b7d8d415fb448ddb824e8f2aa9c0bdab3982ec1be7a0e0 SHA512 41c8b9953e20993488e0411c2848ed30671ca3c789a24a3b83f22a15f123191a441aeef4a1836258ad7e962bf7d68a474695cf6cb8f6b120143654fc96e7026b
 MISC metadata.xml 371 BLAKE2B 2c3b630946c1fa3f6e48d84b71b09902f6bd1d325abf2addc77cf89347771b9de8851c918eb90268989c41f725ce8f44ff5383fd51b4a483e40e67fe7ee066c2 SHA512 612277ac37956a5eb62db296c83919d9b49125145a9e9408dd4cd65c4e38439ac70b965de73e8f975e0410d9b0bcdf8bf1fce6a93c4883cd806fd39c6f9ab549
diff --git a/dev-util/diffstat/diffstat-1.60.ebuild b/dev-util/diffstat/diffstat-1.60.ebuild
index 89410f2b6340..98d8e8d087e3 100644
--- a/dev-util/diffstat/diffstat-1.60.ebuild
+++ b/dev-util/diffstat/diffstat-1.60.ebuild
@@ -9,7 +9,7 @@ SRC_URI="ftp://invisible-island.net/diffstat/${P}.tgz"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 src_configure() {
diff --git a/dev-util/diffstat/diffstat-1.61.ebuild b/dev-util/diffstat/diffstat-1.61.ebuild
index 2d5941e2e68c..79ee7ff1a1ea 100644
--- a/dev-util/diffstat/diffstat-1.61.ebuild
+++ b/dev-util/diffstat/diffstat-1.61.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,5 +9,5 @@ SRC_URI="ftp://invisible-island.net/diffstat/${P}.tgz"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
diff --git a/dev-util/diffstat/diffstat-1.63.ebuild b/dev-util/diffstat/diffstat-1.63.ebuild
index 7d76d1956d4e..45af0bc677c2 100644
--- a/dev-util/diffstat/diffstat-1.63.ebuild
+++ b/dev-util/diffstat/diffstat-1.63.ebuild
@@ -9,5 +9,5 @@ SRC_URI="https://invisible-mirror.net/archives/${PN}/${P}.tgz"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
diff --git a/dev-util/diffuse/Manifest b/dev-util/diffuse/Manifest
index 644ed61ed67c..13c0bccb34c5 100644
--- a/dev-util/diffuse/Manifest
+++ b/dev-util/diffuse/Manifest
@@ -1,5 +1,3 @@
-DIST diffuse-0.4.8.tar.bz2 557966 BLAKE2B 97879c41db390c9e3f0b0634ab34b33021013aaa8e28b0afe98a1131772803129fa81ccc6532a921d28f0eee51c4ccfbecb400645ed4141e6d2fe669e552014e SHA512 0c62976526804a328f1cc1775f842e9575fab50309cc964171af5ee89d8f303d4cbdf66a078ed64bb8826f5a57c2cc7fc59afc1ee87646ece340212d34f2514e
 DIST diffuse-0.5.0_alpha7.tar.xz 531124 BLAKE2B e97b8dd1b24253c4049dd4dc0f185049f030163945d822c3dbf6763f14eff270ed6bea82ae55b6cecaaa0f90976aab286db53c3f69d54f708e403832f8b2b1c1 SHA512 280d2c3c698affbf91b0e25ba658133999ea9b0199d8c165e2cef05210386f0fb3ff8611710903c1a3cb13aed01a648d04b3b8b13227f96803b74adbebf62adf
-EBUILD diffuse-0.4.8-r1.ebuild 1239 BLAKE2B 8c34de327c24f6d2c376e86302ecebf020196d3c3e8aafcc8fa5367c57cc3ea2ae816eb256664436502ee708fe39dc1315811e55caca2aff56e74855de71c4e0 SHA512 b6b34b7f7609cd5aae6c0850346c99d73386ddb78dbd467ed3cd64949e10a73aa9d4c892720c53eb66c22df38ae739ce637ec1672696778812299257697470ad
-EBUILD diffuse-0.5.0_alpha7-r1.ebuild 1416 BLAKE2B 0df539779ca60e8a2cad6e218e889439da3988307c7b95918d559d5e7220c58a9ff8faca4493985b44637a9b3839fd7ddc6fe68ac77e29164ceb746d1b0023ad SHA512 fbfc3cd53209517743dae6bea1cc5fc46acef0e64e433ed1bc6f41991097065eabd2963b205585bf2033798bed14170beec72e49d2bcda7eb49527d0d7ce3541
+EBUILD diffuse-0.5.0_alpha7-r1.ebuild 1414 BLAKE2B 472e1cc2fcf4ba492b00a74c25dffab8f2db7fc28af51208cff12a8072812dfe0d5ce6d4c862e6692a2641716dd0095b53ea74f426567ac601ce2d7919b8ebd9 SHA512 957ca0ff76bf1bb0b9fda46e67df07cf0360accfd0254ae027f1d7bf78da9080cff2a0302194a6a12090de9feaa144368742736be05e990f41a6e3d3152e5e91
 MISC metadata.xml 408 BLAKE2B ab54e1b8b37a36b5b8e83d374b0ccc2468ed23a7a1a5fc855e41a748e7ae85c6fe85ecffda1f941b1e803ba0eb5cc7829984a2c520f6aecdd383f01c4a88bf96 SHA512 9c4f4f53b106582296f9cd3cd52e86587f0fb4767e01b0bb0464a19ba9aa0badd27f25b4438e1693313b685293c4db652a81c60c338e8673717a5a8ad6791458
diff --git a/dev-util/diffuse/diffuse-0.4.8-r1.ebuild b/dev-util/diffuse/diffuse-0.4.8-r1.ebuild
deleted file mode 100644
index 5a0d5a3968a4..000000000000
--- a/dev-util/diffuse/diffuse-0.4.8-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit fdo-mime python-single-r1
-
-DESCRIPTION="A graphical tool to compare and merge text files"
-HOMEPAGE="http://diffuse.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~x64-solaris"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	$(python_gen_cond_dep '
-		dev-python/pygtk[${PYTHON_MULTI_USEDEP}]
-	')"
-# file collision, bug #279018
-DEPEND="${DEPEND}
-	!sci-chemistry/tinker"
-
-src_prepare() {
-	local i p
-
-	# linguas handling wrt #406433
-	if [[ -n "${LINGUAS+x}" ]] ; then
-		for i in $(for p in translations/*.po ; do echo ${p%.po} ; done) ; do
-			if ! has ${i##*/} ${LINGUAS} ; then
-				rm "${S}"/${i}.po || die
-			fi
-		done
-	fi
-
-	python_fix_shebang src/usr/bin/diffuse
-}
-
-src_install() {
-	"${PYTHON}" install.py \
-		--prefix="${EPREFIX}"/usr \
-		--sysconfdir="${EPREFIX}"/etc \
-		--files-only \
-		--destdir="${D}" \
-		|| die "Installation failed"
-	dodoc AUTHORS ChangeLog README
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/dev-util/diffuse/diffuse-0.5.0_alpha7-r1.ebuild b/dev-util/diffuse/diffuse-0.5.0_alpha7-r1.ebuild
index 1cb786be52c5..c11d80eb5f9a 100644
--- a/dev-util/diffuse/diffuse-0.5.0_alpha7-r1.ebuild
+++ b/dev-util/diffuse/diffuse-0.5.0_alpha7-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~grozin/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-util/distro-info/Manifest b/dev-util/distro-info/Manifest
index fdc5de3db2cf..84a831bace77 100644
--- a/dev-util/distro-info/Manifest
+++ b/dev-util/distro-info/Manifest
@@ -1,5 +1,3 @@
-DIST distro-info_0.14.tar.xz 26460 BLAKE2B eb34e31514f7acfd283ae9405132884ccae31b77d6cf7af3a8a341ac349d589cbd5d7828e763911fc490d6504edae4c90551b3d3cc3518eec1f47ab1dcc6ac60 SHA512 aa0055f21523e30fc7e9c94c92f87cbd05fc5d082ddc109d092e94dabafac7533ced984197797252eb698232b3d8f512b3c345ed6abef0ae074bf2770224955e
 DIST distro-info_0.22.tar.xz 29104 BLAKE2B 88eab833ea34de9e62f858e1fb9acfb94efb60114d2213b8bbb77a440c114dbac70a1707d1469113c1a98ea94d953ffa36480c132c294fd8e22b816a444b25e1 SHA512 b9d97e469b9173651c1816f39cc2315622b46f1579cbaba29c417a51417425e90a45283e83c7efee35db78621df08997f5395c8c1b0259f69e5cd91dee65793f
-EBUILD distro-info-0.14.ebuild 1938 BLAKE2B bcdbcc88dc4f5d6ca4d87430755435b09e69dcdd645b7843ee7d37f2b0f32abc5b129a9847218fffc7af20ac89750a873520ed8949c3be614a0846b9b6a6b9f0 SHA512 8fc392ea0ec26dad1f89b17673b07ca71f7d35d623f759fbb66be34d7bb02ebb2f39b50660684281990b46f23fc16cfdb7340542684d4accc2cff21bec1400ed
-EBUILD distro-info-0.22.ebuild 1974 BLAKE2B 1dbe82683b54056c4fcf02342979b18a1c5adb429384686a91f87e716f8f6c3d1e92a6c5bab4fd3cc97d6d660fdc12dd302d0c54ba49fee288d676f91bfe9e26 SHA512 8d42924259c4351ee6ddff973f4af5ce5008e5b1ba80d74ef74f35424460abef15a53830f7c07dac22d763a813760d6a334d60cab81f7629a7b24a9dae95c586
+EBUILD distro-info-0.22.ebuild 1972 BLAKE2B c720d96facd7e4bae3873de432c42092d4a846b76ea76d67c25200451dc3e94f3b06c32c4dbb5b41b7fea861ad8c2ba03df479ebd64e5e0e4d3b3155e4a4b71f SHA512 c93929ed215833f00369ae03b170f38b49c25a260c609ea4712c268c3e4e5a41593c8ed7c477dd665865b9b6c00111a643b4be0560a1a53fff1d390d652e222d
 MISC metadata.xml 367 BLAKE2B 867a3664c5bbd444d69af80af19994e07e3810349258e85c2afd0c838cb140aa3f3342ee1aa5e6862d1fd5130e7e09c1f9f30443827fe7df705f4273694c0784 SHA512 3eb0be47e7eb6bfb6d8eecee66a25183da436c38272e226e7819c8748774f3aae620eab7227414cb862734d4baf8fa060290c1b2371233141abcffd7b489c7b8
diff --git a/dev-util/distro-info/distro-info-0.14.ebuild b/dev-util/distro-info/distro-info-0.14.ebuild
deleted file mode 100644
index 11fae490576c..000000000000
--- a/dev-util/distro-info/distro-info-0.14.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 )
-DISTUTILS_OPTIONAL=true
-
-inherit distutils-r1
-
-DESCRIPTION="Provides information about the Debian distributions' releases"
-HOMEPAGE="https://debian.org"
-SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.xz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="python test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-CDEPEND="dev-lang/perl:=
-	python? ( ${PYTHON_DEPS} )"
-DEPEND="${CDEPEND}
-	python? ( dev-python/setuptools[${PYTHON_USEDEP}] )
-	test? (
-		dev-util/shunit2
-		dev-python/pylint[${PYTHON_USEDEP}]
-	)"
-RDEPEND="${CDEPEND}
-	dev-util/distro-info-data"
-
-src_prepare() {
-	default
-
-	# 1. Gentoo do not provides dpkg vendor information
-	# 2. Strip *FLAGS
-	# 3. Strip predefined CFLAGS
-	# 4. Point to correct perl's vendorlib
-	# 5. Remove python tests - python eclass will be used instead
-	sed -e "/cd python && python/d" \
-		-e "/VENDOR/d" \
-		-e "/dpkg-buildflags/d" \
-		-e "s/-g -O2//g" \
-		-e "s:\$(PREFIX)/share/perl5/Debian:\$(PERL_VENDORLIB)/Debian:g" \
-		-e "/pyversions/d" \
-		-i "${S}"/Makefile || die
-}
-
-src_configure() {
-	default
-
-	if use python; then
-		pushd ./python > /dev/null || die
-		distutils-r1_src_configure
-		popd > /dev/null || die
-	fi
-}
-
-src_compile() {
-	default
-
-	if use python; then
-		pushd ./python > /dev/null || die
-		distutils-r1_src_compile
-		popd > /dev/null || die
-	fi
-}
-
-src_install() {
-	emake PERL_VENDORLIB=$(perl -e 'require Config; print "$Config::Config{'vendorlib'}\n";') \
-		DESTDIR="${D}" install
-
-	if use python; then
-		pushd ./python > /dev/null || die
-		distutils-r1_src_install
-		popd > /dev/null || die
-	fi
-}
-
-src_test() {
-	TZ=UTC default
-
-	if use python; then
-		python_test() {
-			esetup.py test
-		}
-
-		pushd ./python > /dev/null || die
-		distutils-r1_src_test
-		popd > /dev/null || die
-	fi
-}
diff --git a/dev-util/distro-info/distro-info-0.22.ebuild b/dev-util/distro-info/distro-info-0.22.ebuild
index 7e1a4d02db52..c7530dee8c22 100644
--- a/dev-util/distro-info/distro-info-0.22.ebuild
+++ b/dev-util/distro-info/distro-info-0.22.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.xz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="python test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/dput-ng/Manifest b/dev-util/dput-ng/Manifest
index 14e3689fc661..be3a66cb15ea 100644
--- a/dev-util/dput-ng/Manifest
+++ b/dev-util/dput-ng/Manifest
@@ -1,5 +1,3 @@
-DIST dput-ng_1.10.tar.xz 82608 BLAKE2B e7b3769490ec0bf4de4f763380e9a50fd2c76778c2864a4ba45eb754f2dc4aa896e556ad86939f9bf003a68b1e185b51507dd0a015453dfb39965c63beab4964 SHA512 4a883350e7a0b47c121b752d1e0ab1470924319ef895f55742fc4d8f8a0cb3a0ab4ae18d54495ebc9229b0cbf18fa375848fcdcd2431ee1f66bff6433b9a3b08
 DIST dput-ng_1.28.tar.xz 85276 BLAKE2B d205d15aad1b81dcf2cc0b765c9724b21add32df39102b63502d99e5da73aa95efdf66e94f6226105ab2ae97a4bf8c43963784f3ddf2d03217ab5023a7a98f22 SHA512 cfd4a6143b33f29eb32b88972a204ab7a6c2f062299c76167434322ae5d6d2cf8654c5b4d1e96db90dbffe372a04e2a7691694ecf46787c7743dd9ac2b7b317e
-EBUILD dput-ng-1.10-r1.ebuild 1807 BLAKE2B 6adc79ad7d463efaca3a1f2763d05b79380dab0ffad73f0079452eebc721396f4270345bda5288fc9e035f830a95338a8f3d3c0236d09404cf801910fe1de4ad SHA512 83dbafe37dfc865e767c94782bebaf0a85eba80bfe625517816e3e674139cdbeb2f6cc48457c054601033f7224c389d3a874245acdf4c50235f598e0902a0803
-EBUILD dput-ng-1.28-r1.ebuild 1885 BLAKE2B 58f773f840fefd7e4e344c9cb656dedec68260c15e5cf54c5d6f083acfc634a20609b2822a169f3e2006cac3314fa29016c99cb371b8f1a011680525577ca80c SHA512 02a496a285f40afee0a9c9065176a02e55a8692363e9d2c93fc789536ee65c222092a187844e2cafb2f26c32809b64c3e9463fc35b52de3fbd683a035cec56fb
+EBUILD dput-ng-1.28-r1.ebuild 1883 BLAKE2B 73883e273808ffd9480275b23d49034629b2b86c9d9286d0d9b0f38c915cad21d0d04f97c2f11a5831d6d17661171373aeae22a9dacc6c868798536f2154ccdc SHA512 c5535c3641a48504493e8879dd1df84135315d8fdcedbcd8947ce9e143bfd44ebafab2de3a18175b888b8603759378282523ce0e63bda21c684388662d92b335
 MISC metadata.xml 367 BLAKE2B 867a3664c5bbd444d69af80af19994e07e3810349258e85c2afd0c838cb140aa3f3342ee1aa5e6862d1fd5130e7e09c1f9f30443827fe7df705f4273694c0784 SHA512 3eb0be47e7eb6bfb6d8eecee66a25183da436c38272e226e7819c8748774f3aae620eab7227414cb862734d4baf8fa060290c1b2371233141abcffd7b489c7b8
diff --git a/dev-util/dput-ng/dput-ng-1.10-r1.ebuild b/dev-util/dput-ng/dput-ng-1.10-r1.ebuild
deleted file mode 100644
index eef660cec5b5..000000000000
--- a/dev-util/dput-ng/dput-ng-1.10-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=6
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="Next generation Debian package upload tool"
-HOMEPAGE="https://people.debian.org/~paultag/dput-ng/"
-SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/python-debian[${PYTHON_MULTI_USEDEP}]
-		dev-python/paramiko[${PYTHON_MULTI_USEDEP}]
-		dev-util/distro-info[python,${PYTHON_MULTI_USEDEP}]
-	')
-"
-DEPEND="${RDEPEND}
-	app-text/asciidoc
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/nose[${PYTHON_MULTI_USEDEP}]
-			dev-python/python-debian[${PYTHON_MULTI_USEDEP}]
-		')
-	)"
-
-RESTRICT="test"
-
-S="${WORKDIR}/${PN/-/}"
-
-src_compile() {
-	distutils-r1_src_compile
-
-	mkdir man || die
-	for file in docs/man/*.man; do
-		a2x --doctype manpage --format manpage -D man \
-			"${file}" || die
-	done
-}
-
-src_install() {
-	local DPUT_BINARIES=( dcut dirt dput )
-	local DPUT_ETC=( metas profiles )
-	local DPUT_SHARE=(
-		codenames
-		commands
-		hooks
-		interfaces
-		schemas
-		uploaders
-	)
-
-	distutils-r1_src_install
-
-	for binary in ${DPUT_BINARIES[@]}; do
-		dobin bin/"${binary}"
-	done
-	python_fix_shebang "${D}"/usr/bin
-
-	insinto /etc/dput.d
-	for dir in ${DPUT_ETC[@]}; do
-		doins -r skel/"${dir}"
-	done
-
-	insinto /usr/share/"${PN}"
-	for dir in ${DPUT_SHARE[@]}; do
-		doins -r skel/"${dir}"
-	done
-
-	# doman incorrectly treats "cf" in dput.cf.5 as a lang code
-	doman -i18n="" man/*
-
-	newbashcomp debian/"${PN}".bash-completion dput
-}
-
-python_test() {
-	# test_configs.py failing
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=824652
-	nosetests || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-util/dput-ng/dput-ng-1.28-r1.ebuild b/dev-util/dput-ng/dput-ng-1.28-r1.ebuild
index 573ed24b99a4..fb1de4c9d3f1 100644
--- a/dev-util/dput-ng/dput-ng-1.28-r1.ebuild
+++ b/dev-util/dput-ng/dput-ng-1.28-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-util/dwarves/Manifest b/dev-util/dwarves/Manifest
index 2bcc9ee3dc06..7188a790db2d 100644
--- a/dev-util/dwarves/Manifest
+++ b/dev-util/dwarves/Manifest
@@ -4,10 +4,12 @@ DIST dwarves-1.12.tar.bz2 112400 BLAKE2B e71051041dfdbefc603dc041303de82e2e44c8b
 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 925 BLAKE2B 5ad4feb0216c5aa01d600202866a1c9fe9bf407bddff547039e048d498d33054fa86d815f7f7f261069dc062e18ce55fc6b854d7613e88ef41b5421057786642 SHA512 087710e373f4313b8a7a2a006968c3eb979b0aba39d9801ed490b110001f4df6602f06057608899c8194c044c063f1973861c9ee6c5204bdc4554563d7ac42b9
 EBUILD dwarves-9999.ebuild 831 BLAKE2B f6abb8e145532fe61e11b32695938c214c98b4f7adff2ea708af5d6794a1fb909a2ae779ebb07f9150af6d323f4cbd202200e1b1f6b4690d926408f84175f7bd SHA512 543e00d8572be3d4035cbe1c68adf5d3a3aab3a5dfbd9f47a976bccc8b0f73a3d382d0e96f796181afa9d130f00fe6fa623e6c3b674fb1efd8a1a1675ee7e694
 MISC metadata.xml 671 BLAKE2B 78a2fa86c0acc136403b1477db4e2deb3bde1ceed636ced96705cdaccb7e42f76e8fbd202c3fa258c1f33b14827f95b5ce343f8f4df981be66e0ad3a8dd226b8 SHA512 0cdd2c3e4e76a9017120a409aec1f70327363ee146e5fb74684d0e08e2836f0079cb97be1c4874445b271b98c13daf04f75ee481ef21607aac8976a78437af11
diff --git a/dev-util/dwarves/dwarves-1.17.ebuild b/dev-util/dwarves/dwarves-1.17.ebuild
new file mode 100644
index 000000000000..0f8e99442d3d
--- /dev/null
+++ b/dev-util/dwarves/dwarves-1.17.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 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"
+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/edb-debugger/Manifest b/dev-util/edb-debugger/Manifest
index 765925bd2a5c..be862215dcf9 100644
--- a/dev-util/edb-debugger/Manifest
+++ b/dev-util/edb-debugger/Manifest
@@ -1,6 +1,6 @@
-AUX edb-debugger-1.0.0-climits.patch 607 BLAKE2B eb1a58c250308ca84a145f0a1333314437b9d6fb8636db8a5f6f46c6627d464f566a1d629391d5475e62ace85ffb94c387efe084301744a3a7b43ff70a25c851 SHA512 812f33bb0ed0ee83a57179701bdf8e25d70e9de73aa6f6d5c36674e4f16a124926940ce584f08537b4553749996e7c7d346bc42a8803a51ba3bbbfc968262ecf
-AUX edb-debugger-1.0.0-man1.patch 814 BLAKE2B d4c9540e0ec31b3a18d36126f92ebf850d3ca9768e6ae3d5c92d1f712f2a6542b72fe6c50dd30033a380cded0500996554c78fc0255179ade6dafdea66ce9673 SHA512 20b777ca2dd249140895658c610f74d770c757a8327f73bed7754de11bb6c50faa6fcbc71fc12ead9857f22fbc5dc20e950d2f1b1308565c02cd32fca789fc97
 DIST edb-debugger-1.1.0.tgz 1244028 BLAKE2B 87311a53f445acb28569952541269ef5ae83219468e18bc1603b6d85225b75fd00723593891e309ccf8c8c3e7a0828cd709444fe27f3328cf4386ed3e1245bea SHA512 5834cf091cd6d84ecc10cec277ec954b936dc61b0809d5f434ba4d604fae63c06ac10852f1a4ea81f150dea82645fa0861d8842eea227cbde681a895c465d744
+DIST edb-debugger-1.2.0.tgz 608773 BLAKE2B d67136b3bfb153f0e5ba0aef514756f39d63692636adcad3569e79237613004f2a4c425b4bed875408473a7caa6280b3bfc590e8eeb4beb5bafaa2326da892bc SHA512 c04b8d3972497ac170c740f2625301ee7d3ea52b81b29084628aa0091d7cd7df12a34ae707be629cde6e0dea54254bfde25e290aba1d6bad2635eff704282ea9
 EBUILD edb-debugger-1.1.0-r1.ebuild 1126 BLAKE2B c9b9391d5d06b797c3ad0e8eadab04ca983a7c344c179ded66357a99f13e26b7cb0b6fefc0d972f62b61f2599bc499243c35fd8ba77e443dd5da34d4b6cb4e95 SHA512 272eecf3dd7d6c386fbe5143a9c84baf429ae45f1c53312386567c44a4f48b472542d9f406844f015a16141066180c4c2636530b2ae8edc9b977362e52ffd0ea
+EBUILD edb-debugger-1.2.0.ebuild 1126 BLAKE2B c9b9391d5d06b797c3ad0e8eadab04ca983a7c344c179ded66357a99f13e26b7cb0b6fefc0d972f62b61f2599bc499243c35fd8ba77e443dd5da34d4b6cb4e95 SHA512 272eecf3dd7d6c386fbe5143a9c84baf429ae45f1c53312386567c44a4f48b472542d9f406844f015a16141066180c4c2636530b2ae8edc9b977362e52ffd0ea
 EBUILD edb-debugger-9999.ebuild 932 BLAKE2B 060e1be8043c1fd6f12684b197f60cd88de8f8d35c1227246de4bba18546b23f16ddcd60cdf92a54a48cda5ab1640e9e199a1429edf52bdf935ebf18f120df19 SHA512 1c09eaaecff1866de7307512ced499f0eb10f1f3defc8663111d9cfa64f6a7ef3b846365f8e9e18e14d19fde18909e1a5bbbdc60a674f1918f0476316399d929
 MISC metadata.xml 580 BLAKE2B ca6847b4ec53715b5d408e36acf6753a8da4bfb7f8da771bab017daaa92c6b7d34e9100662e209626d49e9a45d1b0624015f46ef83aac0db1b23902521731aaf SHA512 75333f5eba045b2a70efd901680f80781291e85ee3498fb65e9ac8eabf6ba466525eb0f87093d1f173742b01e53d50a8bc874a2a83689c2ae62e90a7dbcbe077
diff --git a/dev-util/edb-debugger/edb-debugger-1.2.0.ebuild b/dev-util/edb-debugger/edb-debugger-1.2.0.ebuild
new file mode 100644
index 000000000000..21c906d48591
--- /dev/null
+++ b/dev-util/edb-debugger/edb-debugger-1.2.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="edb is a cross platform x86/x86-64 debugger, inspired by Ollydbg"
+HOMEPAGE="https://github.com/eteran/edb-debugger"
+SRC_URI="https://github.com/eteran/edb-debugger/releases/download/${PV}/edb-debugger-${PV}.tgz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="graphviz"
+
+RDEPEND="
+	dev-libs/capstone:=
+	dev-libs/double-conversion
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	dev-qt/qtxmlpatterns:5
+	graphviz? ( media-gfx/graphviz )
+"
+
+DEPEND="
+	dev-libs/boost
+	virtual/pkgconfig
+	${RDEPEND}
+"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	#Make the desktop's entries somewhat better
+	sed -i -e 's/GenericName=edb debugger/GenericName=Evan\x27s Debugger/' edb.desktop || die
+	sed -i -e 's/Comment=edb debugger/Comment=edb is a cross platform x86\/x86-64 debugger/' edb.desktop || die
+
+	if ! use graphviz; then
+		sed -i -e '/pkg_check_modules(GRAPHVIZ/d' CMakeLists.txt || die
+	fi
+
+	cmake_src_prepare
+}
diff --git a/dev-util/edb-debugger/files/edb-debugger-1.0.0-climits.patch b/dev-util/edb-debugger/files/edb-debugger-1.0.0-climits.patch
deleted file mode 100644
index 929492ae670f..000000000000
--- a/dev-util/edb-debugger/files/edb-debugger-1.0.0-climits.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-https://bugs.gentoo.org/701112
-
-From f5e0bce1c1d33e11062fd61a3bbad52ee18e8a8b Mon Sep 17 00:00:00 2001
-From: Evan Teran <evan.teran@gmail.com>
-Date: Mon, 15 Jul 2019 14:44:25 -0400
-Subject: [PATCH] fix for issue #719
-
----
- src/ByteShiftArray.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/src/ByteShiftArray.cpp
-+++ b/src/ByteShiftArray.cpp
-@@ -17,6 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
- 
- #include "ByteShiftArray.h"
-+#include <climits>
- 
- //------------------------------------------------------------------------------
- // Name: ByteShiftArray
--- 
-2.24.0
-
diff --git a/dev-util/edb-debugger/files/edb-debugger-1.0.0-man1.patch b/dev-util/edb-debugger/files/edb-debugger-1.0.0-man1.patch
deleted file mode 100644
index 92625ac3701a..000000000000
--- a/dev-util/edb-debugger/files/edb-debugger-1.0.0-man1.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-https://bugs.gentoo.org/701080
-
-From c84c5a28adaacaeee65a20e1bd8a90762cbe843c Mon Sep 17 00:00:00 2001
-From: Ruslan Kabatsayev <b7.10110111@gmail.com>
-Date: Thu, 5 Jul 2018 23:45:03 +0300
-Subject: [PATCH] Fix installation path of the man page
-
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -123,6 +123,6 @@ endif()
- add_subdirectory(src)
- add_subdirectory(plugins)
- 
--install (FILES ${CMAKE_SOURCE_DIR}/edb.1 DESTINATION ${CMAKE_INSTALL_MANDIR})
-+install (FILES ${CMAKE_SOURCE_DIR}/edb.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
- install (FILES ${CMAKE_SOURCE_DIR}/edb.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications/)
- install (FILES ${CMAKE_SOURCE_DIR}/src/images/edb.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pixmaps/)
diff --git a/dev-util/edi/Manifest b/dev-util/edi/Manifest
index d98efda43b64..98c243ce4461 100644
--- a/dev-util/edi/Manifest
+++ b/dev-util/edi/Manifest
@@ -1,3 +1,3 @@
 DIST edi-0.7.1.tar.gz 736103 BLAKE2B f4c82246d66d2620cccf71bfd2b623d1ce95f28d2afb1f1077b53580eec6303748287a5332472c45a911ad83d573ffaadfd08bc0827e3b77909f1a041e0f0750 SHA512 5e7e88e547f2e8fc631d48999aa76e814735dc254381d3965f64f7c1d3006becb90f32305471cd54c4eec5f8b66a1e8595220f302bcebe25eb54e9b56c31767c
-EBUILD edi-0.7.1.ebuild 1269 BLAKE2B e16c7a3d18d92d1661575146ef4d9c93a259d84ccdf59f6d367401318e79892ce4277906b0cc1757271458141f5d780f8c22a5b8ca2ff56cddce29bd2ca802ca SHA512 4185d2aded7c8b946ce1ae988a85f491dd80a0fd120289b5150c33f6dd608cb1a7fe8398ab061d89c51803dbe29830dea6e71d896221fbc7fb610e9279769550
+EBUILD edi-0.7.1.ebuild 1376 BLAKE2B 56d8e3f106ffb0f24797ca12773f1b53512a5471816d490df84f1fcc76f215a2a808b5fc25af1574888ab9b5c95f188de5ba5867b2ad2a85880b2c8850dee4f3 SHA512 93bc00e439fdc0676209ae072648f99de306f45e96c661de76ecb70afd690de75b228d80281eba807ac620d21c7a76f3296d22617b4cdfbbd9db112cc5bbc868
 MISC metadata.xml 409 BLAKE2B 7a44e226411a90d7104f1413fbb30bf85c2e99b2ee19bece2b4d61d93427e17d0a235a88beb874f117a016299b8bdf1d1897daa4d36fcc4e2e7b9d5e45d83873 SHA512 4e1748940fb40bf5ef343f82a57794d42d9d3733d544a122d3ad8200118869902e241a4adfb38c481c69842dba2915d6b30ec96713b35019ef4615fd1298a70b
diff --git a/dev-util/edi/edi-0.7.1.ebuild b/dev-util/edi/edi-0.7.1.ebuild
index 7a4dcb2ba8a2..7d7621ec5b42 100644
--- a/dev-util/edi/edi-0.7.1.ebuild
+++ b/dev-util/edi/edi-0.7.1.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
@@ -6,7 +6,10 @@ EAPI=6
 inherit llvm meson xdg-utils
 
 DESCRIPTION="An EFL-based IDE"
-HOMEPAGE="https://www.enlightenment.org/about-edi"
+HOMEPAGE="http://edi-ide.com/
+	https://www.enlightenment.org/about-edi
+	https://phab.enlightenment.org/w/projects/edi/
+	https://github.com/Enlightenment/edi"
 SRC_URI="https://github.com/Enlightenment/edi/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1-with-linking-exception"
diff --git a/dev-util/gcovr/Manifest b/dev-util/gcovr/Manifest
index 8732b6a7c720..f9e58b1b9620 100644
--- a/dev-util/gcovr/Manifest
+++ b/dev-util/gcovr/Manifest
@@ -3,5 +3,5 @@ DIST gcovr-4.1.tar.gz 193692 BLAKE2B 5536ecbf0636a3a75083d53e2dc239a48e6df740a03
 DIST gcovr-4.2.tar.gz 222847 BLAKE2B 44864c89b58b526c5afc293168c8af2c9082a99e92f2315485f10430fa5ff959046d189c018e0fa121ff4e9fc3685c13b737c112856c841966052d5fd6c9169a SHA512 bf9e22a58b8390eca391dc8f6ba58c4ca0765e66f18ac6f8d8f80609411df2bab74a846eb179a1aded81b7774fa8a8121bb2d586556aeaf43fd729205b0d0c72
 EBUILD gcovr-3.3.ebuild 434 BLAKE2B 249d16231b14bb28164ea71c8cc654a806dd5cd74d21df8913d62a7c3c1448188fe4e72de5c2695cbdc6643125c11ec7e71da0732b53de2d4e0b187797a083fd SHA512 05e7a67f75189b60d5828bc7ede6d1beef7654c1e985b65cb9e0ae5dda95f03e5213575b584fb64b1de1f1129d09e90dd1be04315e426f09ab1d1c661777422a
 EBUILD gcovr-4.1.ebuild 792 BLAKE2B b7d05bf463adde193ac222a9fcb675f38612074b32a52c471bebd61aa861e5149d64c1be81e60e94ec614acf6d2a9fb9c2d4fea1d1d85853d3192cee360b9903 SHA512 a2315910bc8595aa066abed1a08acee5dc933d11081c72b61ae518e8513b54fb47680b64990c195b64c0c8b42aab28a08e7325091bd6b4defc097960b9c405c6
-EBUILD gcovr-4.2.ebuild 984 BLAKE2B fe009444cfe12cc94e628954563493d6725a69b5a291bd53ead78ea0120b59d5080ab6fc1aef772d5abe6ed2672cd85d2df0bdf1b668f3633f70cec96c85776f SHA512 afa17145a36a2f5204b6e058acfb335757cafe9b49e74973f892d4d7bb31671c8506f011544509798a6f9c770540fb8e5e51c4666399900099ff6fac52477632
+EBUILD gcovr-4.2.ebuild 942 BLAKE2B a1dee423a8c210ba4d06ad9bbdde360a9ee874a5136dcb69ce55cdd94434c67caf66806f319be6c64be044029adf80d21cf2b62ecfa5829998ac59e0a679b421 SHA512 40bd585685edd5793675aff704d9a1908fd73dc788e013e231ba0099f93654edc6f97733cbbfca412fd4911ad4181b07a601ba0cd244b405f7672c9744136bdf
 MISC metadata.xml 404 BLAKE2B 0c1ac87d95e969877abd8993c95d6b723d0faaf645093cc01c3c88dbadce84a218a12d4f799a1e95535d67fcdc5725b02d95cc8b53408af04a1c81382bf223c8 SHA512 472f35c3e963a0eb02f8ede9f996bad20a6b67f364c5b2f40b37b90d552dbc1414af5c01862cd4ed7586a6e02cc10a408134cca6eb994f0b897f2fdef3a2054a
diff --git a/dev-util/gcovr/gcovr-4.2.ebuild b/dev-util/gcovr/gcovr-4.2.ebuild
index a05006b79490..69dfb826c4bc 100644
--- a/dev-util/gcovr/gcovr-4.2.ebuild
+++ b/dev-util/gcovr/gcovr-4.2.ebuild
@@ -25,7 +25,6 @@ BDEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		dev-python/PyUtilib[${PYTHON_USEDEP}]
-		virtual/python-typing[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/dev-util/gdbus-codegen/Manifest b/dev-util/gdbus-codegen/Manifest
index d0ed4dfabba5..9c61d6acbd08 100644
--- a/dev-util/gdbus-codegen/Manifest
+++ b/dev-util/gdbus-codegen/Manifest
@@ -2,6 +2,10 @@ AUX gdbus-codegen-2.56.1-sitedir.patch 1898 BLAKE2B 2d3530f2c0e249254d170a7c0f19
 AUX setup.py-2.32.4 192 BLAKE2B 574320d89095d1452a3eee4404b5ebb19fbed32febf2a15422d276bc8dfb6790c41b7214aad3f88ee4927b58de639146cbf633f735df693bd437ea19eae79435 SHA512 45e823f507db103543f024ad557d35f7c09fb51db8a78b978c762ca77d941cdecc5837d2b248fc2c5da6a93b56fe8ded359efd98fb0a74fdf9533783d8eebcfa
 DIST glib-2.60.7.tar.xz 4590568 BLAKE2B a3f2a3bd0443a27326e8359c2ad1e6022ca1634f5c7cb4502a8011fbe85df690fff7d67665cf160bf4ed426214b87f6501a69158fb1656bdb86cacdcf076ee15 SHA512 d56d805a5abf6f7aeb8bf5be06b60ad049177ee23f78eacef4ce2ea88a8be49966a95e48fed17c752649f6e80937fd0ebc8f959709f623ec1f2f43ffd42d078a
 DIST glib-2.62.5.tar.xz 4702492 BLAKE2B 03e04cb149b3301959013c5db20b1f3606951ed80105e0580d40177586a5834afb975ace0d25d5311fd63d29a48129128bdddf29a808e371f1400c00033be1a3 SHA512 2f99422ff8245524aabdb52f5d388ef4bde0fc075eab24499b4023f6ca143b80a74e265117b9e7a9de68a347b0c7eaa8655c836d7bbb63d54cad5c6dda630371
-EBUILD gdbus-codegen-2.60.7.ebuild 2018 BLAKE2B 70174b965972fd7b0d41e8b8c5c0e5a43e49eb25be916885fba29953531feb16fe08401539e64b50709a4e29794afd976b711bbff990e0e3e90b4dbf7c9fd0f9 SHA512 2f4b4340b2864fb93c59b10c73af2e821311414cae49a565689ff3705ded42da7c80764788d7de70e9e8be0387bd9fc497aff3d0388315ed3bfac2558ab0702b
-EBUILD gdbus-codegen-2.62.5.ebuild 2056 BLAKE2B 057ecc1cf5f087a505dc945f8ae6adebd62062e220ca4b2955a79be440537766261b527b1fe11f1fcb5a1c17195bb41362af43879f4d41c430a0fef027a277d0 SHA512 ec96253503abd83089c9a5598f2062f8434b9df5d0152fb9c4a6085d1f949c1a55214f02129e9426e07c14043d5a6e3440a4da71b7737026807cad4d2a650859
+DIST glib-2.62.6.tar.xz 4703424 BLAKE2B 0a27245be2575c574dcc730dd051a8c284f421dbc46579aadc5fbbacb8f934af4374b61bb26085e5c9ab78a868c567818f3fb9d67adddce37f5c4fec00e0d276 SHA512 8e3972a371f3c1a50b7d245b30e4f740583ad72ba4ab325e0e15e0732be44dfb69b603fb39dcf4989255a23a181e9ea5dd25982dd94c386cd9f21952243ad6f5
+DIST glib-2.64.1.tar.xz 4758548 BLAKE2B 5585d23fee28d7c32b1bb9e1defbc31ba469aa259e3c328760d1e702d98706cf251bfb50b5e2aed37b2cdfa6ab4319372ddcd0a9937c97a2614741b504af17a5 SHA512 1cefe49a42233f24ac6bd09c134ceea7119f4f74f42204a731be56100a180eec69c8224674f0b08d1538ad0859896ed08260a6af0fed469c7d10b4508116a6bc
+EBUILD gdbus-codegen-2.60.7.ebuild 2015 BLAKE2B 2753c57ee4842a4ca3867e041d1767ababce6f569a0214a8f04df6963783ac297ccbac768a08b82cb9ea6ca9e9ba609b36b6ac818b311ef8a998d927648815b8 SHA512 a6771f6323bfc1e0fb7d117e940b5b48f02170861c337c24ca1cac0a13e1fca0200257d484ad7e22e46c19ee1b3b3c38469b4a0be5dd6b4b7379a8fb11c4827c
+EBUILD gdbus-codegen-2.62.5.ebuild 2052 BLAKE2B 4448c882cdb2b9673d18f7d5ee4c16e1a390fda6c84b0424c2eaf9f0a57b7f91078f7ba162c78f81f5c7fcc8c8ee3dfbedadadc98c8fe394312ebb37342990f1 SHA512 de6f2070c3ba0082ad0c1ccff51afd65e55d84447cc1a1dc9f0bed85596baeb2417598967c2357702825c2c7e0606752d98529cb98cc6a63a6ef493967e28a72
+EBUILD gdbus-codegen-2.62.6.ebuild 2052 BLAKE2B 4448c882cdb2b9673d18f7d5ee4c16e1a390fda6c84b0424c2eaf9f0a57b7f91078f7ba162c78f81f5c7fcc8c8ee3dfbedadadc98c8fe394312ebb37342990f1 SHA512 de6f2070c3ba0082ad0c1ccff51afd65e55d84447cc1a1dc9f0bed85596baeb2417598967c2357702825c2c7e0606752d98529cb98cc6a63a6ef493967e28a72
+EBUILD gdbus-codegen-2.64.1.ebuild 2210 BLAKE2B 33183b64bb0580f471c75fa8013896e72040482bd17b24bd159418649d6ade174c16d7964732afb86aeebc81bd6692a77e5ed5fc1d4309908abc7dd762075466 SHA512 8a850c678739ca20f6bb55edfad22a2733363784ee7f42aeb8b9775a13d89fd901137a39600ab8921468f2635d8b1c2cb650b5fd696c80e7406ce8a5188da1f5
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.60.7.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.60.7.ebuild
index 32d59a05616d..f27f350a4f1d 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.60.7.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.60.7.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.gtk.org/"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="${PYTHON_DEPS}"
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.62.5.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.62.5.ebuild
index 3e6dd45f2bdd..fe957c7d3de0 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.62.5.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.62.5.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://www.gtk.org/"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="${PYTHON_DEPS}"
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.62.6.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.62.6.ebuild
new file mode 100644
index 000000000000..fe957c7d3de0
--- /dev/null
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.62.6.ebuild
@@ -0,0 +1,69 @@
+# 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
+
+	sed -e 's:@PYTHON@:python:' gdbus-codegen.in > gdbus-codegen || die
+	sed -e "s:@VERSION@:${PV}:" 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.1.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.64.1.ebuild
new file mode 100644
index 000000000000..7ac039681680
--- /dev/null
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.64.1.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/geany-plugins/Manifest b/dev-util/geany-plugins/Manifest
index a9e69b453e4f..9d41b0ef05dc 100644
--- a/dev-util/geany-plugins/Manifest
+++ b/dev-util/geany-plugins/Manifest
@@ -1,9 +1,11 @@
+AUX geany-plugins-1.36-libgit2-0.99.patch 2345 BLAKE2B 8cbaf858dd62c692279b863a8c594fd768c43ef4042fc10093eb608f6c6f7f71d3fadbebf41e98ab1045303b3e921b20aa453467c314132807fb285aab5560bd SHA512 49897e68b7617e429fc98cee9bc6dc47b60f2e526563ab7b3a58fe4aa8c04bec522ad357225ff5d75378a551c8eee4374382c25381ca368769137b045fbbae6b
 DIST geany-plugins-1.30.tar.gz 4469990 BLAKE2B 3cb8434765667814dc95227a82bdf204b2f918c951de8d5d9b56549c3fc343e1fe1c3e225d9f907da6b3227440dbdad09d0318d2738c213640a4629e9f7b42fe SHA512 11dc44215aaa369831c249ef84b5dd0ee7eecdfbbf4707fc6165d78201e9e755447463c171ac6c8b2bc70df28a97b23762073ab9b31f7c33285d4728089da807
 DIST geany-plugins-1.34.tar.gz 4640059 BLAKE2B f6a2e001db42e348c129b503fd969f142fecbaa06a10bd220d348f70e6af087a0a856a403bdf866f65fdff02889fa03a2f3a662be3efad0a17401266ab883bcf SHA512 31d25e9b0946b7feeae40b81c4e0c177568cc161c24bfa1c8271dda1c15a44e86f5de9b5992a4acde6cfafe2924a1cc22e95c7b6fb253e8a358931fa5f8ecca3
 DIST geany-plugins-1.35.tar.gz 4656963 BLAKE2B c7c96c7bbd1d17083f75a90eaa741277626db8aeb693cb78d3fcca57136923c58eba1755cc55263d431ff7a992e22b365f91be5e424b4f02eb25299ae3d3cd93 SHA512 9fedb4237096d939919fa40c39a7d19debb19211260a2797b5566c555052dcd8bf9a31a694d057f1dcded794bc75883d0007f8dd9427e3d899434fbf0e8a8e9f
 DIST geany-plugins-1.36.tar.gz 4693634 BLAKE2B a7c319a77cb92a55a0a53063ab75d9375f7d2a0e419eb3e0acd063b8fda4b4d9798c103ce53b80090c73bd86804c58f815aaf8d0eecc0d7fbf7ad1c8470cb9b5 SHA512 b3e58b42432d17c27289fa20d10b833a2d7f5d8c72b51abe5b1ebdabcb952b18e0984b15ef6ac9753102d839f3174f28798269e1e94bf032bdaa189e98d72b2d
-EBUILD geany-plugins-1.30.ebuild 3484 BLAKE2B 346df564c43a4d006bbdfb4878132adc62dfc2e36be5f6a1dcac970a31c11210a8be3578ec1c62f8860a24a85f21e9cbc14fdc1853168247969cb2d248b5f367 SHA512 3d4e3fe734994d43b1a6dd5c7aff71d8ee3c82fda13f5a0951326a7f16ecbd84ac9e186f60ccf5182ec60d7c980e1878a59d7b6aa17ab3bbbe93163583d92ae6
-EBUILD geany-plugins-1.34-r1.ebuild 3389 BLAKE2B f5b8ad2fd7381e2430189bbb26004508c93373c2794a9dda09a362c030cf54674feb086f4018071278f51d62702ec38d7ee596575409d0f6cc91e0f5245eb557 SHA512 409833863b6d1a6b12ac16bbad915b910d9fc1a59067a52039a170751da0e4f9a06e16bb2e98ad4f3503ff886a74327a4f63986e72b3550b7c6d4a09441b07d0
+EBUILD geany-plugins-1.30.ebuild 3486 BLAKE2B 780841b267551815696d4f15fa15c8677355e8ca14b69a8a9865ff5284036ef1086d61577678dd8d1c32af1580ed224a7baf991d928acd48f63aec071dc57d49 SHA512 35c7282e23cac683a215f35144f7c988fed8ff4f2b556617540dc752138f7e3d126816da7113cfd63d02605f1a7a95d08fcde777bb0ee56daa0faf3202828cda
+EBUILD geany-plugins-1.34-r1.ebuild 3391 BLAKE2B 0c2731c639d829e496038aea52907828d54bad2d00c444bfabd7122463eff5209551990b232cb7e0ab8c2c3aa456e20815b5e3b5dbea969b1b186cfa21854c86 SHA512 7a5cc59f1e02dba2adc6e5fabd735d84a50cf11246d5d7530b02ff35a41b6ff7d727f37bcc498d3f1fce37806d318f109a67a5e70216138c39fa515f60c8cb17
 EBUILD geany-plugins-1.35.ebuild 3358 BLAKE2B 917d11c0797871d74e4db1a08264f7ee539b32a4cd78d523b51a45b89621dd1011e47e262f9c5170168e62c55246cc92608273a0f9df8bbc9e952f8bfffa076e SHA512 7c77e1266185fc4569f10c56fc6d1dfc11dbe7ff7bb199ace577a0483a89e3f4426c84390f761407c56d379da098592c7fb5519ff144b910bb64f5834cfcc2a4
-EBUILD geany-plugins-1.36-r1.ebuild 3423 BLAKE2B 83e441ff75fa3fb15c7c3c66fd224cbe6dc4e87063972d995274fc0c6ad5d883324569732a9979e57b43c53d57804fd5633976838136d84fa8fd48f355026dce SHA512 05d59bf153c3ff2dd45af7c8dde95a54ef9aaea609209fceeba40c2e99082dd1abc86b4a6af3c738b5703cd8e0222a211007171c59ac482222d01917ad69205b
+EBUILD geany-plugins-1.36-r1.ebuild 3474 BLAKE2B c1f3bd654e32bdbf9a3fe518651b398cad4680b23ad9c43a61d2ac921c988319370b9b442cc6f669ff4165087e9300771f31ff07546545ffd0c31725e124754d SHA512 c5ccf6304578171e26e3b754196f381782928fb6c27a62238e7f6c346281744a1268c610f48579a2295e70486597a86ba401e6ec58e3b69fee478952eb71ecfb
+EBUILD geany-plugins-1.36-r2.ebuild 3039 BLAKE2B 1672a7b1921cfbf0dfef9f9a0399f6d8a083b2d0da9f62549e13fd9eefb6fa0ba8ae55613179520f0dae0789854eb9c4f14a3fe868e1f2998fe8c57a7ee3e8f7 SHA512 bc9a48b7723e652686a3bbb08f9d1999d422e075a60f5cd197b34740ea49bb35f4ac901b6e194a5419ff951b4e031fa8a79ccbd227c0aca5b51d1ce17ee21768
 MISC metadata.xml 1647 BLAKE2B b46873a3918b3506a6331aecf522f78467c4ab88e3d9f1b3caa300afbb83986f377d193ed2da43246eacb3ea104396989569f3e8ea663ee766c580d6b96abac5 SHA512 0030c7fb50c9ed0da05c34ef122762c86a5b9f8345403e80cd2cdff0447a62980608ca7ee484520eb097907bc6d9dfe4b390b0d4888775e3b4125d3ccd198d94
diff --git a/dev-util/geany-plugins/files/geany-plugins-1.36-libgit2-0.99.patch b/dev-util/geany-plugins/files/geany-plugins-1.36-libgit2-0.99.patch
new file mode 100644
index 000000000000..25e5ac4ea28e
--- /dev/null
+++ b/dev-util/geany-plugins/files/geany-plugins-1.36-libgit2-0.99.patch
@@ -0,0 +1,55 @@
+From 9497d829e1b207eb83575dc6f617feecfb89bc16 Mon Sep 17 00:00:00 2001
+From: Dominik Schmidt <dominik@schm1dt.ch>
+Date: Sun, 23 Feb 2020 19:15:30 +0100
+Subject: [PATCH] Make libgit2 version preprocessor conditionals compatible
+ with libgit2-0.99
+
+LIBGIT2_SOVERSION is defined as string literal, e.g. "0.99",
+from libgit2-0.99 and beyond. Arithmetic checks against this
+variable whill hence fail. This patch switches the checks to
+compare against the LIBGIT2_VER_* family, which should be more stable.
+---
+ git-changebar/src/gcb-plugin.c | 6 +++---
+ workbench/src/plugin_main.c    | 2 +-
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/git-changebar/src/gcb-plugin.c b/git-changebar/src/gcb-plugin.c
+index b7083199..a911815f 100644
+--- a/git-changebar/src/gcb-plugin.c
++++ b/git-changebar/src/gcb-plugin.c
+@@ -32,11 +32,11 @@
+ #include <geany.h>
+ #include <document.h>
+ 
+-#if ! defined (LIBGIT2_SOVERSION) || LIBGIT2_SOVERSION < 22
++#if ! defined (LIBGIT2_VER_MINOR) || ( (LIBGIT2_VER_MAJOR == 0) && (LIBGIT2_VER_MINOR < 22) )
+ # define git_libgit2_init     git_threads_init
+ # define git_libgit2_shutdown git_threads_shutdown
+ #endif
+-#if ! defined (LIBGIT2_SOVERSION) || LIBGIT2_SOVERSION < 23
++#if ! defined (LIBGIT2_VER_MINOR) || ( (LIBGIT2_VER_MAJOR == 0) && (LIBGIT2_VER_MINOR < 23) )
+ /* 0.23 added @p binary_cb */
+ # define git_diff_buffers(old_buffer, old_len, old_as_path, \
+                           new_buffer, new_len, new_as_path, options, \
+@@ -45,7 +45,7 @@
+                     new_buffer, new_len, new_as_path, options, \
+                     file_cb, hunk_cb, line_cb, payload)
+ #endif
+-#if ! defined (LIBGIT2_SOVERSION) || LIBGIT2_SOVERSION < 28
++#if ! defined (LIBGIT2_VER_MINOR) || ( (LIBGIT2_VER_MAJOR == 0) && (LIBGIT2_VER_MINOR < 28) )
+ # define git_buf_dispose  git_buf_free
+ # define git_error_last   giterr_last
+ #endif
+diff --git a/workbench/src/plugin_main.c b/workbench/src/plugin_main.c
+index 6fa6fc84..25ecdf6d 100644
+--- a/workbench/src/plugin_main.c
++++ b/workbench/src/plugin_main.c
+@@ -36,7 +36,7 @@
+ #include "tm_control.h"
+ 
+ 
+-#if ! defined (LIBGIT2_SOVERSION) || LIBGIT2_SOVERSION < 22
++#if ! defined (LIBGIT2_VER_MINOR) || ( (LIBGIT2_VER_MAJOR == 0) && (LIBGIT2_VER_MINOR < 22))
+ # define git_libgit2_init     git_threads_init
+ # define git_libgit2_shutdown git_threads_shutdown
+ #endif
diff --git a/dev-util/geany-plugins/geany-plugins-1.30.ebuild b/dev-util/geany-plugins/geany-plugins-1.30.ebuild
index 2cd19bd8134b..2c40f13fccf9 100644
--- a/dev-util/geany-plugins/geany-plugins-1.30.ebuild
+++ b/dev-util/geany-plugins/geany-plugins-1.30.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://plugins.geany.org/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 ~sparc x86"
 
 IUSE="gtk3 +autoclose +automark +commander ctags debugger +defineformat enchant git gpg gtkspell lua multiterm nls +overview python scope soup"
 REQUIRED_USE="
diff --git a/dev-util/geany-plugins/geany-plugins-1.34-r1.ebuild b/dev-util/geany-plugins/geany-plugins-1.34-r1.ebuild
index 857c3af11c6e..f9ec3ba2ff8b 100644
--- a/dev-util/geany-plugins/geany-plugins-1.34-r1.ebuild
+++ b/dev-util/geany-plugins/geany-plugins-1.34-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://plugins.geany.org/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 ~sparc x86"
 
 IUSE="+gtk3 ctags debugger enchant git gpg gtkspell lua markdown multiterm nls pretty-printer python scope soup"
 REQUIRED_USE="
diff --git a/dev-util/geany-plugins/geany-plugins-1.36-r1.ebuild b/dev-util/geany-plugins/geany-plugins-1.36-r1.ebuild
index a52dca03895f..d893f9de3ae9 100644
--- a/dev-util/geany-plugins/geany-plugins-1.36-r1.ebuild
+++ b/dev-util/geany-plugins/geany-plugins-1.36-r1.ebuild
@@ -69,6 +69,8 @@ BDEPEND="virtual/pkgconfig
 	nls? ( sys-devel/gettext )
 "
 
+PATCHES=( "${FILESDIR}"/${P}-libgit2-0.99.patch )
+
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }
diff --git a/dev-util/geany-plugins/geany-plugins-1.36-r2.ebuild b/dev-util/geany-plugins/geany-plugins-1.36-r2.ebuild
new file mode 100644
index 000000000000..9c2a97394909
--- /dev/null
+++ b/dev-util/geany-plugins/geany-plugins-1.36-r2.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A collection of different plugins for Geany"
+HOMEPAGE="https://plugins.geany.org"
+SRC_URI="https://plugins.geany.org/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
+
+IUSE="+gtk3 ctags debugger enchant git gpg gtkspell lua markdown nls pretty-printer scope soup workbench"
+REQUIRED_USE="!gtk3? ( !markdown )"
+
+DEPEND="
+	dev-libs/glib:2
+	>=dev-util/geany-1.35[gtk3=]
+	gtk3? ( x11-libs/gtk+:3 )
+	!gtk3? ( x11-libs/gtk+:2 )
+	ctags? ( dev-util/ctags )
+	debugger? (
+		gtk3? ( x11-libs/vte:2.91 )
+		!gtk3? ( x11-libs/vte:0 )
+		)
+	enchant? ( app-text/enchant:= )
+	git? ( dev-libs/libgit2:= )
+	gpg? ( app-crypt/gpgme:1= )
+	gtkspell? (
+		gtk3? ( app-text/gtkspell:3= )
+		!gtk3? ( app-text/gtkspell:2 )
+		)
+	lua? ( dev-lang/lua:0= )
+	markdown? (
+		app-text/discount
+		net-libs/webkit-gtk:4
+		)
+	pretty-printer? ( dev-libs/libxml2:2 )
+	scope? (
+		gtk3? ( x11-libs/vte:2.91 )
+		!gtk3? ( x11-libs/vte:0 )
+		)
+	soup? ( net-libs/libsoup:2.4 )
+	workbench? ( dev-libs/libgit2:= )
+"
+RDEPEND="${DEPEND}
+	scope? ( sys-devel/gdb )
+"
+BDEPEND="virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+PATCHES=( "${FILESDIR}"/${P}-libgit2-0.99.patch )
+
+src_configure() {
+	local myeconfargs=(
+		--disable-cppcheck
+		--disable-extra-c-warnings
+		$(use_enable nls)
+		--enable-utilslib
+		# Plugins
+		--enable-addons
+		--enable-autoclose
+		--enable-automark
+		--enable-codenav
+		--enable-commander
+		--enable-defineformat
+		--enable-geanyextrasel
+		--enable-geanyinsertnum
+		--enable-geanymacro
+		--enable-geanyminiscript
+		--enable-geanynumberedbookmarks
+		--enable-geanyprj
+		--enable-geanyvc $(use_enable gtkspell)
+		--enable-keyrecord
+		--enable-latex
+		--enable-lineoperations
+		--enable-lipsum
+		--enable-overview
+		--enable-pairtaghighlighter
+		--enable-pohelper
+		--enable-projectorganizer
+		--enable-sendmail
+		--enable-shiftcolumn
+		--enable-tableconvert
+		--enable-treebrowser
+		--enable-vimode
+		--enable-xmlsnippets
+		$(use_enable debugger)
+		$(use_enable ctags geanyctags)
+		$(use_enable !gtk3 geanydoc)
+		$(use_enable lua geanylua)
+		$(use_enable gpg geanypg)
+		$(use_enable soup geniuspaste)
+		$(use_enable git gitchangebar)
+		$(use_enable markdown) --disable-peg-markdown # using app-text/discount instead
+		$(use_enable pretty-printer)
+		$(use_enable scope)
+		$(use_enable enchant spellcheck)
+		# Having updatechecker… when you’re using a package manager?
+		$(use_enable soup updatechecker)
+		$(use_enable workbench)
+		# GeanyGenDoc requires ctpl which isn’t yet in portage
+		--disable-geanygendoc
+		# Require obsolete and vulnerable webkit-gtk versions
+		--disable-devhelp
+		--disable-webhelper
+		# GTK 2 only
+		--disable-geanypy
+		--disable-multiterm
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	find "${D}" -name '*.la' -delete || die
+
+	# make installs all translations if LINGUAS is empty
+	if [[ -z "${LINGUAS-x}" ]]; then
+		rm -r "${ED}/usr/share/locale/" || die
+	fi
+}
diff --git a/dev-util/geany/Manifest b/dev-util/geany/Manifest
index 89625270972c..0d952b7bc6a3 100644
--- a/dev-util/geany/Manifest
+++ b/dev-util/geany/Manifest
@@ -2,8 +2,8 @@ DIST geany-1.30.1.tar.bz2 4352154 BLAKE2B 6efceb21e07aba3b0698196543746e926d6a73
 DIST geany-1.34.1.tar.bz2 4474211 BLAKE2B 25c9b3f752b0b19582120ea342d8029f811040ef433adb065aec028f0bcc0909ea1b0005445bae70a53cbb2b1d3bfe0c2dd9d9c25c5e3f89bcdedebc0a392301 SHA512 3e075b23b22682324e4a56046d238d9d0087d095a6157b98c342fbe40a2bfa7118f72cfe1f414d110fff1411e4cc9c33fff800e0a2e32f9f0e5fd7b6fb560c9a
 DIST geany-1.35.tar.bz2 4593705 BLAKE2B 1d411da04a82987abccb33385d3b50025078b68dc2cc4accfb7822000a786b97f613a35864fde2389d0525b9547972d0e56699b75aae40686f0ad7e6e2beb4a6 SHA512 9ae2f168b1b5e9fa9029a32f5d1e9b591e50ea4e79041760524a4389572400c6f8f56f1fd6973299f152f9fd653cf3d52ca50136f0bbdbc15d3395bcf7388ccf
 DIST geany-1.36.tar.bz2 4644521 BLAKE2B 80eeceee31a49e9728a358904ad40e353d3407a22492340e6aa9a82091d32fa004f4494d3ae027732174e7cf7f6fae620b511680e06e58c5b71dd259125900c4 SHA512 15005772b64e8321d7fa8552363df425eb25e9d7b0760c561c8fb3f34d7acae2bf25da8e04fda38a2a1b64cc31ff613b7ff2786d432ff014050c138c7473c810
-EBUILD geany-1.30.1.ebuild 1488 BLAKE2B cb64eb6c3feef9302d1e1768023ba20b01b5d8c83ca4ca579d3e0b21a3c7c8a398a7d6cc9751fec25fd12ba4b66cfba9be37c740bd3cc32066d91b5584578934 SHA512 d5aa296906a7a8701de7527bad2dec008b36b88b185d2d91b0c7a3ef68fcc29bea0ac9d6321e8a6647fbe66dc57263f0e62ba36bc3be83702ea1bc7adc3230f6
-EBUILD geany-1.34.1.ebuild 1679 BLAKE2B 2fe7ff47d2a7f1affb5a52e83cf6df869e6b972d22653ef45e6429828c2fb9ce00cbdc5493dc9d130bb7d990f28dfdb99b354eb8d0c1e91aad3ebead11bc9bea SHA512 cd00f21bff30f58d3c29525b7fbf3f9d69c7822dda4e0622704f569e262b56a04bd764763e0673d6693bbc674155b38533b57a78acc673adc6f33890c43f4e71
+EBUILD geany-1.30.1.ebuild 1489 BLAKE2B f0784cdb5dfd21690102b6846b61da6d8660c8c9bbf634faa734ad50edbc9105007cc18db0bec86a166ec9dce4e992cfb35b1ee18052fa32a59e29f79a4f7136 SHA512 fb82ed450b0fae73dfd7051eaf8d260a74f0276c72fa4a68d72ac96cd5a8d61491bf7dec395b3e77fe2c8aecd53ed4c0813c9b807ed57b8d9071e717c6992cdc
+EBUILD geany-1.34.1.ebuild 1680 BLAKE2B 2dc3754c1e7aa9cfe0e9a809f3b6b0ef72af9a33f3593bca1a859f52bbc848c7022ae5decca4a4119f6d8462f3b4ec2880e3212d6074df234bb8bd9a38e9a962 SHA512 2e202c6d74b6aae785b2a1a62ccd53ffbc7f030a4e2246efdb8b8706ffc9e1b0f1a6d5e47316e3ededd4dd5a9d602b4501f35e8697525e315737f415c7c06e3d
 EBUILD geany-1.35.ebuild 1684 BLAKE2B d7189974c07cd414eb5ccf9643166827b8e54198a3ece8bba836c5881664cfcd6518c5f9e4cacdd56c75559579aba7dda204c8766ece74c6bc14e1921d4d4180 SHA512 0f9a0c235765833d275ee3d100eb38dcc9272de31ef1f142fb6c0ebdff70ac6205201353fc84ffbbe3fedf877b735d937fecdf83178a42bfd3a062cd1960ffed
 EBUILD geany-1.36.ebuild 1696 BLAKE2B 0bcc4976766c82e966a30072cd4fa453f09b509b90a4d6ed6a7dbc7408a06b604f8b2363ea99ca014ce9e1285644961e0363be6b7823d06485c3b77aeec05422 SHA512 f965f0aa0ec721fe2168847136b8f010f4de2e2f5bb74382c4c9302f8e738f82bae4d59169c5a0265f450078cecca88038cd23cb7929e32a3f352dab8f4ca711
 EBUILD geany-9999.ebuild 1684 BLAKE2B d7189974c07cd414eb5ccf9643166827b8e54198a3ece8bba836c5881664cfcd6518c5f9e4cacdd56c75559579aba7dda204c8766ece74c6bc14e1921d4d4180 SHA512 0f9a0c235765833d275ee3d100eb38dcc9272de31ef1f142fb6c0ebdff70ac6205201353fc84ffbbe3fedf877b735d937fecdf83178a42bfd3a062cd1960ffed
diff --git a/dev-util/geany/geany-1.30.1.ebuild b/dev-util/geany/geany-1.30.1.ebuild
index 0b432ac99a40..3786c41ed1cd 100644
--- a/dev-util/geany/geany-1.30.1.ebuild
+++ b/dev-util/geany/geany-1.30.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://download.geany.org/${P}.tar.bz2"
 
 LICENSE="GPL-2+ HPND"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="gtk3 +vte"
 
 RDEPEND=">=dev-libs/glib-2.32:2
diff --git a/dev-util/geany/geany-1.34.1.ebuild b/dev-util/geany/geany-1.34.1.ebuild
index c5e4a3b2fd3f..dee55101743f 100644
--- a/dev-util/geany/geany-1.34.1.ebuild
+++ b/dev-util/geany/geany-1.34.1.ebuild
@@ -15,7 +15,7 @@ if [[ "${PV}" = 9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/geany/geany.git"
 else
 	SRC_URI="https://download.geany.org/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 fi
 LICENSE="GPL-2+ HPND"
 SLOT="0"
diff --git a/dev-util/gertty/Manifest b/dev-util/gertty/Manifest
index 16618c89d029..348e09fc2636 100644
--- a/dev-util/gertty/Manifest
+++ b/dev-util/gertty/Manifest
@@ -1,4 +1,4 @@
 DIST gertty-1.6.0.tar.gz 122570 BLAKE2B 8c3628f9b0b56aaff30f183a1ab0d852b8ee487927833f41b8aa61f94f8d14eaf3a8d515d5edcb3fa7dd18ca36f42a977d12790c52d6c629a720b4f29252b030 SHA512 0fe5224f5b4b06910bba0d19453ea0f273f6ea0688b9aa092e11f929b71801581f6d7cead1d64c00912ee3363b98d4b36e903fa992a7ce36f190a4f3c09375d2
-EBUILD gertty-1.6.0-r1.ebuild 1197 BLAKE2B 03abee5914e5cf2483d178323eccb428077ae6176db11b82ce9595cbfe30a2c14e45e685bf1c69f862fc5693d9834caa8b412a0573f3a13db5ea498d64c20bf3 SHA512 2a43f3a43e6e4d99aa657c452ac889d8bd271d85841f74f3a5e829564329dbc7823603daefccbe7832ac46951d003e2902f44eef1419329eaa0afeaffdba5cc3
-EBUILD gertty-9999.ebuild 1199 BLAKE2B 6eb5442bb8ec3aa01a57505805f9e2e62e337f3d98ed2e9a2f135efc4bd3fcacdd4483a2b5e94e836a950903fae94b4314da295bcdbedd3212d13ce658ba9a2b SHA512 560803e94b3386aeeff1495d1810064b2938b781b2c2a9ea3482442a20a5d971993688e20c694a1f06be7ed08178d18eb7277a7993c5d98d324a560abd612a91
+EBUILD gertty-1.6.0-r1.ebuild 1196 BLAKE2B db6f3fe1f1d925a5eeb74ff585607aabf8372b6daff87df416fbbbf5a48adeab45e2dd1ef99d3d3e6a1c68811b9a6872655ee8da454f3baa579d2ab77f1d27e8 SHA512 7e3bcc4e9a5672d87d3167ed0537c1e1b993539bedd4e0c5892251ff321413628f77acb893f69803532aa3a0349708946bb943639ba01729495373b3f00b5cc1
+EBUILD gertty-9999.ebuild 1198 BLAKE2B cb47a966e5b1b43910aca40e8895db4fa38ab880e889ff189419836332d62d98e097e8030c822a19933465658494c00e9b2cf204787c985136781f75165eb478 SHA512 8d6056ecb66c49bce7c605c6d15574517cb7ea7247909fb17fa01926c9beca12febe64cc9fc30f78ae048b93aa3ccc7361f68d24a13d34bed2be88d62eae0b31
 MISC metadata.xml 379 BLAKE2B b46a401263c266a0900d16e3c63e3bf5dd2a6b9d85d81e119ad88270530fb1a5345d6853683bfebe22738192e12f18c0bbd02390bcf540ac1a122ba5f4fba675 SHA512 a37a6ec1e287489f1c8f9058829b927d7ebdca15024fe01643cc888ae45e4567ee9a7897f4d0e4d0facfea89605f2db9c04170b974cf8e9ce9aed43e405d3b84
diff --git a/dev-util/gertty/gertty-1.6.0-r1.ebuild b/dev-util/gertty/gertty-1.6.0-r1.ebuild
index 357e03afb462..74a745757acf 100644
--- a/dev-util/gertty/gertty-1.6.0-r1.ebuild
+++ b/dev-util/gertty/gertty-1.6.0-r1.ebuild
@@ -29,7 +29,7 @@ RDEPEND="
 	${CDEPEND}
 	>=dev-python/urwid-1.2.1[${PYTHON_USEDEP}]
 	>=dev-python/sqlalchemy-1.0.4[${PYTHON_USEDEP}]
-	>=dev-python/git-python-0.3.7[${PYTHON_USEDEP}]
+	>=dev-python/GitPython-0.3.7[${PYTHON_USEDEP}]
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
 	>=dev-python/requests-2.5.3[${PYTHON_USEDEP}]
 	<dev-python/requests-3.0.0[${PYTHON_USEDEP}]
diff --git a/dev-util/gertty/gertty-9999.ebuild b/dev-util/gertty/gertty-9999.ebuild
index 1f82d9932882..c22ac8ed0f14 100644
--- a/dev-util/gertty/gertty-9999.ebuild
+++ b/dev-util/gertty/gertty-9999.ebuild
@@ -29,7 +29,7 @@ RDEPEND="
 	${CDEPEND}
 	>=dev-python/urwid-1.2.1[${PYTHON_USEDEP}]
 	>=dev-python/sqlalchemy-1.0.4[${PYTHON_USEDEP}]
-	>=dev-python/git-python-0.3.7[${PYTHON_USEDEP}]
+	>=dev-python/GitPython-0.3.7[${PYTHON_USEDEP}]
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
 	>=dev-python/requests-2.5.3[${PYTHON_USEDEP}]
 	<dev-python/requests-3.0.0[${PYTHON_USEDEP}]
diff --git a/dev-util/glade/Manifest b/dev-util/glade/Manifest
index c9af3d62ea9b..273dd5de2def 100644
--- a/dev-util/glade/Manifest
+++ b/dev-util/glade/Manifest
@@ -1,6 +1,6 @@
 AUX glade-3.14.1-doc-version.patch 853 BLAKE2B b7cad3cc9d49cfe24189ba21bffaec2c524d3c7953d722b3b03d57ad68297fee6757330c1a2d90f36bcfe52d1d9ef4d95b81eeb19109bc8957f671ac40d31573 SHA512 cc9aec06f6acdfdf538de7043f9f753768e0e4c26fa9eef7e52b4e42aa6fd3836185c18ffd51abfc2aa3e6f5b2472e68914112230d2b8856e8a3c61e9d865ecf
 DIST glade-3.22.1.tar.xz 3592952 BLAKE2B 53f769198a093ff5d4dc98bb4ea98c6e5195933caf24247a99db980312ae3398fca3abbd640d08c02e8fb5f8647ee3e4b18e65073b1500e9017ee0586993a331 SHA512 e1bdc49b89bc5010c0abf6357dbae05c921182655b2ee5a4b161af6adfd596cfbcd495c9851ba956abbf3d6156616a6c0e94640cd72cee11551ca388674ac908
 DIST glade-3.22.2.tar.xz 3550008 BLAKE2B e1217e221b36938937c57ae465a3707eeadc52bc9127b3af2fb6514e572676e3e284811d5332876dce110fd321e2bb33b9ac8b0afbd97dd747725eb73309dc15 SHA512 cb82684423ae055bc8e84a8705529ecdc72957563f444633c2c5c24a922130de84c212537323b6ed259f0e29349b52dff608822610b87babb8fc3cb468a5f4b0
-EBUILD glade-3.22.1-r1.ebuild 2343 BLAKE2B 93c4d4e44d12d882e611675681a2df462788f5945c09f5b83dfffce1eb4c8d9582e48effa6198aecbb58dd3b66e46c29381764ca152353ea9d8dadfd9316d310 SHA512 3428c28c9dbbbcfa4f8ce3296dea55b22245597d31d6966d74cf530640e2e231f4c94a785df1d2c662b9bfc0353a4a7cacd53a8ca57337d3b9a7f821cfb96e6b
-EBUILD glade-3.22.2.ebuild 2326 BLAKE2B f43ce674c9731f626c27260efcda3c7af3b54ad9a2389e7e1679fa0e31310ca4b430a928214146c1c1293683adac52a1a758507456da54dc099449bdc71cd8de SHA512 96eb27b3ea7b6934f85209ca9ccb9952fe28943321b9037eb1164135590cd421792627826533f0f9b3796cde2d69b28bfbbf18ccd7c051f5a8155d7e29c3e21e
+EBUILD glade-3.22.1-r1.ebuild 2340 BLAKE2B 1e331215e2808e90e8a92e719f7903b8f4c41966c9abb55b188cd7a56d00763722da09ad703498d947f3db9ee95da64b7942c40abe946d7da898783232b1e176 SHA512 94409f97bb91fd56bdfe3c2113d61810f03fbf1a4e601935cd96ff0b467992b86af86919b642a4062ac6615def2a49e5e4094a215f2a8ce092e0883a670e9fd1
+EBUILD glade-3.22.2.ebuild 2322 BLAKE2B a8ccc620c4569335eb7a3b79c03c44371538d4549d7203f4584d7f12d64a7740729d0f8e883c246e0286fb9ff695ba6b21ec8cf66522fa8449378d49e66140ee SHA512 75a56e1540477c84bbffc6e38f2e96b4f0ca84ff216d2943e1f5f6a41e62b0aa28c0409c908b5b673f8d0bbfaad78cddaae4ff7a871be25a957032b710338d3c
 MISC metadata.xml 358 BLAKE2B 33f3b46ab877b311931205095fb2b357fe7fe2da8820944d32e8a16f2dbcf99033f95a17f4cefa4aa6d0f731c72d0f65683a8cc3b947ebf09d084f92e796f887 SHA512 8840ebde12f26a2caf856e75f3f706e3c9a7a7a771d0deeae99ca6b16f4bbeaf119bae7776a8a0bef8b7422f52ebd6498a8b5e862af4548886249386dcb44480
diff --git a/dev-util/glade/glade-3.22.1-r1.ebuild b/dev-util/glade/glade-3.22.1-r1.ebuild
index bfb3e487bea2..465f7d6c7989 100644
--- a/dev-util/glade/glade-3.22.1-r1.ebuild
+++ b/dev-util/glade/glade-3.22.1-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://glade.gnome.org/"
 
 LICENSE="GPL-2+ FDL-1.1+"
 SLOT="3.10/6" # subslot = suffix of libgladeui-2.so
-KEYWORDS="~alpha amd64 arm arm64 ia64 ~mips ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86"
 
 IUSE="debug +introspection python webkit"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-util/glade/glade-3.22.2.ebuild b/dev-util/glade/glade-3.22.2.ebuild
index 83c8db833e50..55d4695620e4 100644
--- a/dev-util/glade/glade-3.22.2.ebuild
+++ b/dev-util/glade/glade-3.22.2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://glade.gnome.org/"
 
 LICENSE="GPL-2+ FDL-1.1+"
 SLOT="3.10/6" # subslot = suffix of libgladeui-2.so
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 
 IUSE="debug +introspection python webkit"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-util/glib-utils/Manifest b/dev-util/glib-utils/Manifest
index 2e0abcf23dd9..547c93627617 100644
--- a/dev-util/glib-utils/Manifest
+++ b/dev-util/glib-utils/Manifest
@@ -1,5 +1,9 @@
 DIST glib-2.60.7.tar.xz 4590568 BLAKE2B a3f2a3bd0443a27326e8359c2ad1e6022ca1634f5c7cb4502a8011fbe85df690fff7d67665cf160bf4ed426214b87f6501a69158fb1656bdb86cacdcf076ee15 SHA512 d56d805a5abf6f7aeb8bf5be06b60ad049177ee23f78eacef4ce2ea88a8be49966a95e48fed17c752649f6e80937fd0ebc8f959709f623ec1f2f43ffd42d078a
 DIST glib-2.62.5.tar.xz 4702492 BLAKE2B 03e04cb149b3301959013c5db20b1f3606951ed80105e0580d40177586a5834afb975ace0d25d5311fd63d29a48129128bdddf29a808e371f1400c00033be1a3 SHA512 2f99422ff8245524aabdb52f5d388ef4bde0fc075eab24499b4023f6ca143b80a74e265117b9e7a9de68a347b0c7eaa8655c836d7bbb63d54cad5c6dda630371
-EBUILD glib-utils-2.60.7.ebuild 2393 BLAKE2B 1458fed297fa9b524efeddafe6a64e726d42c154990dbe881e0136eb26dac26029b67988e2b77d511de027f6810978ea58ab60af9d3333b9da5b9c365fbddbcd SHA512 a57be7ab562758d400b975bcd66b77b682f9ac81ec44a8266e4696d1ac22561dc39e81a4f41cbb4325b26749c177cd46f6d556d33991939bc6d33b557c8b237d
-EBUILD glib-utils-2.62.5.ebuild 2403 BLAKE2B 245fb5f47ebac44f4c64f4bf906f73be07afeecf2e1770f304f0da9c27345e43b54c75ac509cd3ab11b11aa3a450d09e541da76850832cd2e63f161cb6f00f33 SHA512 957e586a87e93a70c9163ddd290377277ffded79d1dc36cb855325d99db474326834d60f6582f96c91fd10b924d29ce3e1ef0132b7607b9b44c335624a8d9f64
+DIST glib-2.62.6.tar.xz 4703424 BLAKE2B 0a27245be2575c574dcc730dd051a8c284f421dbc46579aadc5fbbacb8f934af4374b61bb26085e5c9ab78a868c567818f3fb9d67adddce37f5c4fec00e0d276 SHA512 8e3972a371f3c1a50b7d245b30e4f740583ad72ba4ab325e0e15e0732be44dfb69b603fb39dcf4989255a23a181e9ea5dd25982dd94c386cd9f21952243ad6f5
+DIST glib-2.64.1.tar.xz 4758548 BLAKE2B 5585d23fee28d7c32b1bb9e1defbc31ba469aa259e3c328760d1e702d98706cf251bfb50b5e2aed37b2cdfa6ab4319372ddcd0a9937c97a2614741b504af17a5 SHA512 1cefe49a42233f24ac6bd09c134ceea7119f4f74f42204a731be56100a180eec69c8224674f0b08d1538ad0859896ed08260a6af0fed469c7d10b4508116a6bc
+EBUILD glib-utils-2.60.7.ebuild 2390 BLAKE2B 1b5593fbfae292b25bf6131c5535f9133dff55d3e63089f5074c78bd8736e510220f277720c081ac7767ffff85e2393da4a8e0e127b13821e5f7fc5bd7d6c24b SHA512 3783dc9671c78d5aeab4fde397ac82654d63875b98e59bfd10cf0fe58fe392c76ebb2ef6d52cca9cdcdba84f600d6627912fdf2e2f7dd5b52b840fe67df199d3
+EBUILD glib-utils-2.62.5.ebuild 2399 BLAKE2B 68065e66c639d695af972944e37e40eb633c6b7033d9d6d4f032f5c016017529cda1ea8d1e264dcaaa6ebdf0c3c2c643b59dae936b87f787c68703f1bb560526 SHA512 15730dd4f08903d49d4c462eb045b557b5c237e581699fcd9253199dc1c953415552dc908e110c701d7ef1803e336a25547509ba15c8bcd95ce8515e1d5914d7
+EBUILD glib-utils-2.62.6.ebuild 2399 BLAKE2B 68065e66c639d695af972944e37e40eb633c6b7033d9d6d4f032f5c016017529cda1ea8d1e264dcaaa6ebdf0c3c2c643b59dae936b87f787c68703f1bb560526 SHA512 15730dd4f08903d49d4c462eb045b557b5c237e581699fcd9253199dc1c953415552dc908e110c701d7ef1803e336a25547509ba15c8bcd95ce8515e1d5914d7
+EBUILD glib-utils-2.64.1.ebuild 2399 BLAKE2B 68065e66c639d695af972944e37e40eb633c6b7033d9d6d4f032f5c016017529cda1ea8d1e264dcaaa6ebdf0c3c2c643b59dae936b87f787c68703f1bb560526 SHA512 15730dd4f08903d49d4c462eb045b557b5c237e581699fcd9253199dc1c953415552dc908e110c701d7ef1803e336a25547509ba15c8bcd95ce8515e1d5914d7
 MISC metadata.xml 332 BLAKE2B 1e3c081ae9a2c8ae53cee6c3ae133cbd5e8543a68c03d4a4f7e164437502d996ea9364789e93114687271e1f472bcf13a418cca5b74ecb95a51849f0a5f3dafa SHA512 f7680d9be4071b841f50ece99b5041dc492901d84ae05383c1ff05b6a73bab804b153a50eb70f5417137f6e2041230c5ba8eaede10f7a0bf8a899508642588c6
diff --git a/dev-util/glib-utils/glib-utils-2.60.7.ebuild b/dev-util/glib-utils/glib-utils-2.60.7.ebuild
index 61433eead925..f6222baf9113 100644
--- a/dev-util/glib-utils/glib-utils-2.60.7.ebuild
+++ b/dev-util/glib-utils/glib-utils-2.60.7.ebuild
@@ -15,7 +15,7 @@ SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 
 RDEPEND="${PYTHON_DEPS}
 	!<dev-libs/glib-2.56.2:2
diff --git a/dev-util/glib-utils/glib-utils-2.62.5.ebuild b/dev-util/glib-utils/glib-utils-2.62.5.ebuild
index a2afdf89b132..0dd0c2ddd686 100644
--- a/dev-util/glib-utils/glib-utils-2.62.5.ebuild
+++ b/dev-util/glib-utils/glib-utils-2.62.5.ebuild
@@ -15,7 +15,7 @@ SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 
 RDEPEND="${PYTHON_DEPS}
 	!<dev-libs/glib-2.56.2:2
diff --git a/dev-util/glib-utils/glib-utils-2.62.6.ebuild b/dev-util/glib-utils/glib-utils-2.62.6.ebuild
new file mode 100644
index 000000000000..0dd0c2ddd686
--- /dev/null
+++ b/dev-util/glib-utils/glib-utils-2.62.6.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.1.ebuild b/dev-util/glib-utils/glib-utils-2.64.1.ebuild
new file mode 100644
index 000000000000..0dd0c2ddd686
--- /dev/null
+++ b/dev-util/glib-utils/glib-utils-2.64.1.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/glslang/Manifest b/dev-util/glslang/Manifest
index b12804b02bce..bd5c8958fe3d 100644
--- a/dev-util/glslang/Manifest
+++ b/dev-util/glslang/Manifest
@@ -1,6 +1,10 @@
 AUX glslang-7.12.3353_pre20191027-fix-relative-includes.patch 663 BLAKE2B 4d0e8efd9152610b16813d45251a83b8b685c07d3491c6bc1a1c2656ecabde2eed8840a53712bfd9aa9e6f047f332f56ead1e3c0d8185a81c4de0eb286f5d048 SHA512 db8bf5424aca0eb215db3059665eb7e6ffbbab029979de9f5b574e577274f6d0ca8a27acde10bd53769561eaae2996ec6da1a4916b2c39e82f343c33b120915f
 AUX glslang-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-files.patch 4974 BLAKE2B 9bb7807618a2dd6c322244557bf93809c21631be064bde4fc659724c45cb27d3e615fecde8692658edc1e3d229b4daadfa2b51732ebddb5d49f85abdb3af5399 SHA512 a07654d40172d6669d3ee3c3685463dbd58cc163ce726a20db18237ab710044b011e511defc8828f7ccd8b4fc128bb38f75669686085f7572ce8cc98887266d3
 DIST glslang-7.12.3353_pre20191027.tar.gz 3119760 BLAKE2B 4a7eda7bf89b1589cb8a712660589e2746ff13ce3cac589a5651486fbdaa149b0fd8fceb791af0e43c9342aa9ca31459f66d0236c31d22959e519e8eb4457018 SHA512 6f247dbf9a50cdfe7b6ffbf79f73c46c57f8f61ef10037e0775ddd6faf4c5fd4b9b6b6761ecf26cc71c3711a650ee8619e2f0a33dfcf8ca8dc2974e497a685a7
+DIST glslang-8.13.3559.tar.gz 3122936 BLAKE2B 856e6068a06407195f97478b3e6bd91aa619213d8468a8c9ff7ee8e7a36a904e4896e34e021e8e4e047fab6ea406d89206849058a659de8075c52a06118b0e7b SHA512 d2f09888dd1b6edb4f324502627aeca0c78411f61ab50e672fa2a6d9ae46611849e1d13b9c6069b77f31092d843abcf3d74ed7cfc3c9144ced80e65876f4b781
+DIST glslang-8.13.3560_pre20200404.tar.gz 3185684 BLAKE2B fac831212b46b22f10657ee44afc788d174779dd36e9d5f045f8e84ab3cca448aee89aab13771a29598b242653d6a29e4eb8fd8965e1c03ceec599e7ab1fafa9 SHA512 ec5b89d918cf55bb0a166f59eeea3662d54f29a986f979a9b04ab35bc8e02e5b01d13c24f336666669115f90d3d97eb91abe7ba4b9108590ec9b8a78e976223f
 EBUILD glslang-7.12.3353_pre20191027-r2.ebuild 848 BLAKE2B c21ffc390e783a2abae679b7c10b20b0f6b2c7c0240638a54b2717c0e65289006b367ddc96115f6234a3c999515314736011649283c14ec73aec8c37abd26710 SHA512 d6b739906ffc084106aa5dcd0182980c91a0874b1425f1eaa2b05e206597e2f7c807f87c02c8fca0db5c1f9860a378579cbfb4646f429bca72de672c151e87ee
-EBUILD glslang-9999.ebuild 617 BLAKE2B 30fd7c4245a34d125051b5f41cfe2aa37ba9fa3c921b464f5a6dca09af90a6dfffd13c0dc1551c0da2c56875842c08a2189243e4bd8009ec032d7b5d690d05fc SHA512 6b36df67fd05adc8e89af5da2775ccdd69b6c999b9c9f65808e3660e6d2eb089e52a841bf522d3647aeba7b617af0fcd08cc76b9c53f6d00e6de7e597f9fde9e
+EBUILD glslang-8.13.3559.ebuild 759 BLAKE2B 64a7cb4e904a835110d41ce432dbb04a2e60efd884daa5daea7f36eaa6356126793239889b0b69ce87ebdcaea2987550b84405c58553dd87276a579a61b788f2 SHA512 0a362fa37d32551a976a8ced67b9dee1556b3c8f5c90cdb7446643c4ea4f07e388bfc9594e9de9ad3daa5f8c638db3373ef6592566ed72349dd892c5a24777b6
+EBUILD glslang-8.13.3560_pre20200404.ebuild 884 BLAKE2B 126abfde9be25dbbbd33e08f45d8462f49e36fa617534f1307bcc9f0a8be8214c5fa7aa360fceb5987aa5a96aef13711533c7ab1a91dbafd5499864822eef1e4 SHA512 ffe09ee75aa4fcf0553d7304a9d326b36db517173b19d32f2e768ae74372216b396dac4180ee479ea8a6c1c5d339671b35293f0f9d6d2c77853389fe930ac188
+EBUILD glslang-9999.ebuild 770 BLAKE2B ea332118b323713227c3cf942ced066a9a787a989787051e92b330adf1c64285e3b2fdd7a78757c7128898131c5421403a5493aab30c4bec0b96b076b3696d31 SHA512 9adedff6a45bfada507ac9b09ee8d23d05cc6e957842273b11d88129a4c93c236ed6c4d65a20efaf7c42d19c073dd8733fbf70448bc3f2c7c9e434adc923d88d
 MISC metadata.xml 425 BLAKE2B e1b34c7d88a8c0b001aa77a4ad4a1242e4d9ab45e98c0849cdff45a8cb6d1510e31e358c7e65c2a5d83bc8af7e3651532c69791146d92e4ff6a16ed823d142a0 SHA512 f13cc9858160b65a80fde54a9d3881a371225b1f15a15fe60b8ed066373e80c6e595f2e51fe38cc3d3b6f1f58968390ce419f810f66de8a3e5053d7fc8833b41
diff --git a/dev-util/glslang/glslang-8.13.3559.ebuild b/dev-util/glslang/glslang-8.13.3559.ebuild
new file mode 100644
index 000000000000..7ce2721cbd0d
--- /dev/null
+++ b/dev-util/glslang/glslang-8.13.3559.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS="cmake"
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit cmake-multilib python-any-r1
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/KhronosGroup/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator"
+HOMEPAGE="https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/ https://github.com/KhronosGroup/glslang"
+
+LICENSE="BSD"
+SLOT="0"
+
+RDEPEND="!<media-libs/shaderc-2019-r1"
+BDEPEND="${PYTHON_DEPS}"
+
+# Bug 698850
+RESTRICT="test"
diff --git a/dev-util/glslang/glslang-8.13.3560_pre20200404.ebuild b/dev-util/glslang/glslang-8.13.3560_pre20200404.ebuild
new file mode 100644
index 000000000000..4279ffe872c9
--- /dev/null
+++ b/dev-util/glslang/glslang-8.13.3560_pre20200404.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS="cmake"
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit cmake-multilib python-any-r1
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/${PN}.git"
+	inherit git-r3
+else
+	SNAPSHOT_COMMIT="b5757b95005bbf6b0287096c5b708c5e25645311"
+	SRC_URI="https://github.com/KhronosGroup/${PN}/archive/${SNAPSHOT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc64 ~x86"
+	S="${WORKDIR}/${PN}-${SNAPSHOT_COMMIT}"
+fi
+
+DESCRIPTION="Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator"
+HOMEPAGE="https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/ https://github.com/KhronosGroup/glslang"
+
+LICENSE="BSD"
+SLOT="0"
+
+RDEPEND="!<media-libs/shaderc-2020.4_pre20200405"
+BDEPEND="${PYTHON_DEPS}"
+
+# Bug 698850
+RESTRICT="test"
diff --git a/dev-util/glslang/glslang-9999.ebuild b/dev-util/glslang/glslang-9999.ebuild
index bbdb6606eab1..3d445bb75ed1 100644
--- a/dev-util/glslang/glslang-9999.ebuild
+++ b/dev-util/glslang/glslang-9999.ebuild
@@ -1,24 +1,27 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=(python{3_6,3_7})
+CMAKE_ECLASS="cmake"
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit cmake-multilib python-any-r1
 
-inherit cmake-multilib cmake-utils python-any-r1 git-r3
-
-EGIT_REPO_URI="https://github.com/KhronosGroup/glslang.git"
-SRC_URI=""
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/KhronosGroup/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc64 ~x86"
+fi
 
 DESCRIPTION="Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator"
-HOMEPAGE="https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/"
+HOMEPAGE="https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/ https://github.com/KhronosGroup/glslang"
 
 LICENSE="BSD"
 SLOT="0"
 
-PATCHES=( "${FILESDIR}/${P}-fix-relative-includes.patch" )
-
-RDEPEND="!<media-libs/shaderc-2019-r1"
+RDEPEND="!<media-libs/shaderc-2020.4_pre20200405"
 BDEPEND="${PYTHON_DEPS}"
 
 # Bug 698850
diff --git a/dev-util/gn/Manifest b/dev-util/gn/Manifest
index 4dea2e7aa157..916effe0d626 100644
--- a/dev-util/gn/Manifest
+++ b/dev-util/gn/Manifest
@@ -1,9 +1,7 @@
 AUX gn-gen-r1.patch 2045 BLAKE2B dcc370a2625f59475cc5c818800e5b8aa6d3ff0b24a356dc7defb42041ce525230fa691d0ead08ec32581aebda188121bd9115985a3d2bda65bff38557cbdd08 SHA512 77ea25769255879903556961446c731cbc609e911288f64f0600dfc364e2a05896251c3e02b241f94072b2a67c4a6fb7541f7bf7f409339a13902446476c2993
-AUX gn-gen-r3.patch 1560 BLAKE2B b76caed0277797f9e478465d329933be1418ea01d54cbf2620dfd8bd77fde428705c188a1a5eb2ac0d755622a870c30cebf7e027550ec69698297a64d04145a0 SHA512 80d18a413523ccceccbe8669527cca4b402a400d61c067ece21f8dc2bc9a00d3ac38b24c3f4f399f352d7af20675e1b81eeef3fbde2c681d50354296a8b4cbf5
+AUX gn-gen-r4.patch 1559 BLAKE2B b92f487d4153ebd885d9cb1ca6889ca52b5afcccdb9a781fae568b861152a2cc3d9e61d5c406c5365311337a131fa99447528011af511b7aadd0975f692fe85b SHA512 b286651983f94894faf992da12a1ed51776c8207275e1b1e1776d0caf83615b02cb3d57198aec8b3736944b9cb8749028f79ebc7a700dd30babf122cfe5884d3
 DIST gn-0.1463.tar.gz 905571 BLAKE2B e048e642704533d478fb751748a97f60283f63868ab1ab6fa5b8e7bc0322745cf21464eaa16194f684869b50f306668d3c7d3b4f72c3985b865d8492d1ff0901 SHA512 f32861a8fa44034b932e6aae4787fd7da6e4c6c19c5b6919de7b0d0f1ba20f415c1c55db95a08958a338b7b9de740ff49a29ab894a9c4e9049a89450d8c88281
-DIST gn-0.1544.tar.gz 911124 BLAKE2B b8bac7783c373e8101cf727c254c2ee50af49c3e679a8df2cb337a0637e305f1f9094517e6af6a76a19300f533a41d9433624a7963ba0151a88a636bc7e6b4f8 SHA512 5cb3a25b66d44cd26063453ddf96563d62b24e8a961ca7fa29a48ee7bde4a423bd0dace36c432b46b677e042fcac9a4fb23afa5dc27e994fca54030b972dad29
-DIST gn-0.1616.tar.xz 660332 BLAKE2B dab581d9f05cbe7ed91758d0ec68c61bd4e9fd0357b9cfa04f5276185ed6e810b37d9e2177cf3daec29e25633af2d32c6f733507a77cee7e37681bb977a59818 SHA512 42f68b40eebc423b785b1ba735548b3e5d2b64abd0dc1bb22940b9336c491308f062f547f81b5366c1dfe1f0e3bb41390ed3e3712637765cac1a50499a5e04d2
+DIST gn-0.1726.tar.xz 663480 BLAKE2B 26920a1594e9cc664293efaeaa8725568b78ecc1f2ac8c9a3cd27333e5fe89f1fa5bdee9e42c408f3c4a7cfb630e79220926c5694e31131d3e7627be49b5d6b2 SHA512 3e93ba02f251386c4aa320a45b8a045c2a1fa686a8f170455f3c06bb25b1a628c44530ae2e56bcbb2ff4b2a84dd065d54dde90955a55a325a8d219acce69ec2f
 EBUILD gn-0.1463.ebuild 1034 BLAKE2B b415c7f196a387de4d3460b9b56f4546a76da2c400d246d14cb9e56ca2eb30c3aa8647b5f58ba73c51f7be41793fd799ffc0152a70f81d47c40407eb2e9756f7 SHA512 8a02e407c0a6b78107932705df99ffc1d8180f66f5d3e23ef3c3121d6d42434ba176012ede5ef1b21d47a3a3bda61578af7165d177c4f8d5b1350af0f57a1790
-EBUILD gn-0.1544.ebuild 1202 BLAKE2B c4af8539a46361bedc5bb0d214b36c5fad5fff7e5fe541ad53db4dde9d322988461d826b4f3ce4d1888b3eb6a897d6332efff066f1b1a8b49d4c0beb8c90097a SHA512 4b6544fc24a36e926fa72eb7856cbd47d635ff9c800683105830d12b287b4edc3e410cdf8d74523602e94ee615bba8f650109b8eef930cb1dc65ded4c02a6624
-EBUILD gn-0.1616.ebuild 1206 BLAKE2B a86a974723a4f08f00f079fb201881e611a31482a6e739d19f13d49ad1ee1ad8000df1425dcfd6b4a073543ccf151eafa20d94c6173b2df26dae9a179a5bb149 SHA512 b45b2280e03ba74f60b48a6b719937efe1b88955cfd277f442b1ce555d1c2751f6babc1591d8ffad8747b296503cfc77001cf548948ce4f8c909f47d773bf7b2
+EBUILD gn-0.1726.ebuild 1263 BLAKE2B 45c9eca5d2bc2055effbaeb96b505bfa8a1049ba9a8fdc8f20be6d62cb8beaf69bd7dd367a2906b10f47d2803aae1ee7bfde251f9260fe96958b3c6e8f338848 SHA512 ac112856fb7bbe85a3dbb8af9b9e84a0ed87bb657d0bf95116962e666a7e8c23218889c59bc3e3621721ded93dd855e0d3839031ffcbc1ba1ba37c9bbc576115
 MISC metadata.xml 220 BLAKE2B da4da8d60764ec3b2181bd9ea602d6e3cf830e73e05b09fe8984f147215a2082b030e402c21098ad33de4b3621d1cbc1328bd52f4f9c32d6b0485773251b1d77 SHA512 a1e65cd8b02b8ffb12754e5d12dfd44ad9973de7c61ec867f1454e79563519182baae7d10cee3488622bbba8636fc7a6dca5806208f204a9b66df8436e3cd696
diff --git a/dev-util/gn/files/gn-gen-r3.patch b/dev-util/gn/files/gn-gen-r4.patch
index 362a6854a264..717c908f29dd 100644
--- a/dev-util/gn/files/gn-gen-r3.patch
+++ b/dev-util/gn/files/gn-gen-r4.patch
@@ -1,6 +1,6 @@
-From bedf2161dea8cf4813fd14891feee2e8e8d5bf28 Mon Sep 17 00:00:00 2001
+From ad008cd029c995226fef36554e2e3cc657ef1380 Mon Sep 17 00:00:00 2001
 From: Mike Gilbert <floppym@gentoo.org>
-Date: Sun, 14 Oct 2018 20:34:07 -0400
+Date: Sat, 14 Mar 2020 18:02:51 +0000
 Subject: [PATCH] Remove unwanted cflags/ldflags parameters
 
 ---
@@ -8,10 +8,10 @@ Subject: [PATCH] Remove unwanted cflags/ldflags parameters
  1 file changed, 9 deletions(-)
 
 diff --git a/build/gen.py b/build/gen.py
-index a7142fab..06d5e2b3 100755
+index bcd9f15d..b48e844c 100755
 --- a/build/gen.py
 +++ b/build/gen.py
-@@ -278,11 +278,6 @@ def WriteGNNinja(path, platform, host, options):
+@@ -288,11 +288,6 @@ def WriteGNNinja(path, platform, host, options):
      if options.debug:
        cflags.extend(['-O0', '-g'])
      else:
@@ -23,7 +23,7 @@ index a7142fab..06d5e2b3 100755
        # 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.
-@@ -311,7 +306,6 @@ def WriteGNNinja(path, platform, host, options):
+@@ -325,7 +320,6 @@ def WriteGNNinja(path, platform, host, options):
          '-D_FILE_OFFSET_BITS=64',
          '-D__STDC_CONSTANT_MACROS', '-D__STDC_FORMAT_MACROS',
          '-pthread',
@@ -31,18 +31,16 @@ index a7142fab..06d5e2b3 100755
          '-fno-exceptions',
          '-fno-rtti',
          '-fdiagnostics-color',
-@@ -320,11 +314,8 @@ def WriteGNNinja(path, platform, host, options):
+@@ -341,9 +335,6 @@ def WriteGNNinja(path, platform, host, options):
+       if not options.no_static_libstdcpp:
+         ldflags.append('-static-libstdc++')
  
-     if platform.is_linux():
-       ldflags.extend([
--          '-static-libstdc++',
-           '-Wl,--as-needed',
-       ])
 -      # This is needed by libc++.
--      libs.append('-ldl')
+-      if not platform.is_mingw():
+-        libs.append('-ldl')
      elif platform.is_darwin():
        min_mac_version_flag = '-mmacosx-version-min=10.9'
        cflags.append(min_mac_version_flag)
 -- 
-2.21.0
+2.24.1
 
diff --git a/dev-util/gn/gn-0.1544.ebuild b/dev-util/gn/gn-0.1544.ebuild
deleted file mode 100644
index 2ab8a04093f4..000000000000
--- a/dev-util/gn/gn-0.1544.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 2018-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 )
-
-inherit ninja-utils python-any-r1 toolchain-funcs
-
-DESCRIPTION="GN is a meta-build system that generates build files for Ninja"
-HOMEPAGE="https://gn.googlesource.com/"
-SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="vim-syntax"
-
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-util/ninja
-"
-
-PATCHES=(
-	"${FILESDIR}"/gn-gen-r3.patch
-)
-
-pkg_setup() {
-	:
-}
-
-src_configure() {
-	python_setup
-	tc-export AR CC CXX
-	unset CFLAGS
-	set -- ${EPYTHON} build/gen.py --no-last-commit-position --no-strip
-	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 "${PV}"
-	#endif  // OUT_LAST_COMMIT_POSITION_H_
-	EOF
-}
-
-src_compile() {
-	eninja -C out gn
-}
-
-src_test() {
-	eninja -C out gn_unittests
-	out/gn_unittests || die
-}
-
-src_install() {
-	dobin out/gn
-	einstalldocs
-
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles
-		doins -r tools/gn/misc/vim/{autoload,ftdetect,ftplugin,syntax}
-	fi
-}
diff --git a/dev-util/gn/gn-0.1616.ebuild b/dev-util/gn/gn-0.1726.ebuild
index 4f6815837be9..2baaf308ab77 100644
--- a/dev-util/gn/gn-0.1616.ebuild
+++ b/dev-util/gn/gn-0.1726.ebuild
@@ -21,7 +21,7 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}"/gn-gen-r3.patch
+	"${FILESDIR}"/gn-gen-r4.patch
 )
 
 pkg_setup() {
@@ -32,12 +32,13 @@ src_configure() {
 	python_setup
 	tc-export AR CC CXX
 	unset CFLAGS
-	set -- ${EPYTHON} build/gen.py --no-last-commit-position --no-strip
+	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
@@ -58,6 +59,6 @@ src_install() {
 
 	if use vim-syntax; then
 		insinto /usr/share/vim/vimfiles
-		doins -r tools/gn/misc/vim/{autoload,ftdetect,ftplugin,syntax}
+		doins -r misc/vim/{autoload,ftdetect,ftplugin,syntax}
 	fi
 }
diff --git a/dev-util/gnome-builder/Manifest b/dev-util/gnome-builder/Manifest
index 001a0fc49343..f2513f3956d0 100644
--- a/dev-util/gnome-builder/Manifest
+++ b/dev-util/gnome-builder/Manifest
@@ -1,7 +1,11 @@
 AUX 3.32.4-optional-vala.patch 898 BLAKE2B ed1ed208eb7b38a2dacee42e0e699c605c8632e12ac1f48b0077a6af18725f8792653317f9c86580056f58e1de645b8b7320c30353fa0f1e3e126066e2afac66 SHA512 a848963d5f3680c995e5342900b987a6481ab26c2650fdd365a0a580814e821a914a10c4481df16f010940c51b0f72868dbb660be955d9a19aa7c7cfca1f7900
+AUX 3.34.1-optional-vala.patch 1249 BLAKE2B dcec506c976b6438cec14d941b911cdc11fe0941c4a1a1590e6069fc42dcf12d6e76fedcc0b356e2ac6e5f4558851bb041fa3de4b54d7d9161cf2232965ead21 SHA512 e037dddb89330807c48228600d43ef34569e9fbfbb4b75b9ca2561d7d5ee25d1953ea94afb85ee3555eeefdd3105cd402c2b231584ae241ba661ca0ced28c046
 DIST gnome-builder-3.30.3.tar.xz 9486164 BLAKE2B b983fd71b1bab31386ab8f4c3a6ff57b33afd2da5aff5e41e7d1cba388a9b6998a0f799c0843bde95f8ce0456fe46457d0c0c46622d59eeb7729d2e8868898f7 SHA512 468605dbd2bd712a76c333a974bb19ca889dfe8493c2e85101641034f3e2c8eba2c0ee2f98ad01f3466f0f42946f05790763ccfaf786d73da192d64360eec47f
 DIST gnome-builder-3.32.4-patchset.tar.xz 34740 BLAKE2B 6e29ce42b2b1878b5fcec7cf057bcdc015da8817d7f9209f4d03e02bb5837525e329d0627d4465123fb20a0a46415053d7e08b445634659123ebff12d2fb9d09 SHA512 494cf1ff370c7d86d42ec352966169e73b99556dc5a1be0bf0ec53cd78e8550897bb44187ae8f471fe3e10a85dc7d44d44c5edef0569b1d0a7dff7b5d78b1fa1
 DIST gnome-builder-3.32.4.tar.xz 11886980 BLAKE2B a7901566238dd39fe180d1e47089d7f99018be115f407d174472a8371374361fe50f2f15cb6d496a1afa3e30117d83788944636fb6a9487d4a719442ba6ae744 SHA512 a050161465edd448b0359ff781bf97b0cda6c184ea4f89193711a1bac3c7b79f76bac0d3600e3823a86aa19538228619b5d64aea94e8a67f480b5c1f79bc3b93
+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
 EBUILD gnome-builder-3.30.3-r1.ebuild 7089 BLAKE2B d6bbc1128f8575e1d9435c1c147762374743a187347bad7aecaffe3757359991e1d581c2b407f6fbb7edb4c51b29db32470ed7ed8f7dc2a5023cac891dd1a43b SHA512 3b3c214ff96705f21724a29e3766352327acf21953fce4f5ef81a5ab089adc6c29e3b4e0c64716a7f2f1bf6997b434544fc8301ead43faa216e3bdc97bf621a0
-EBUILD gnome-builder-3.32.4-r1.ebuild 7195 BLAKE2B 474f453807cb692dbaa78cd1beff9c6258eaec21ad228e0fd2c70e38eb2ca28cd45ea465d2e09ee8c480dcbf6b43bb6cc9ae789639d6db24fc2fa12b79e4d9d0 SHA512 37e3737cdc2162e842c586ad34f70e8fc5d72b179b6d85d7a064e0b4bd6bbff91076e02e408ef4f44ab33bf5a8cba67e7fbca042f2c17b79e78df912d22e3ddf
+EBUILD gnome-builder-3.32.4-r1.ebuild 7199 BLAKE2B 811cad7dd28146b856faa9ff0eaba8783842ca268812cd20960f6137ebfad6579553c61ebb869a0f6a39b74d7984f8a19f74ed1eae00a2b2f80b787590db577c SHA512 348293ca77e48692004b81e61823c6e56cd767957ba24614a8663e80a5ad86fbfbeb4b8e1cfedbd7450a5b96a6e3e2ee02e749506cdc1b4dbfd0b48a188b20ae
+EBUILD gnome-builder-3.34.1-r1.ebuild 7304 BLAKE2B 17bed51dd94a33b312cb0b80ebf8c08184fe4f104bf425ecf3e3f7c3546dbbbb30a04289bd2aef8f6d3135f10131b67894647d658831dffba09a68d3703b3b2a SHA512 a43243dc6bd2a9fbf604cc5d6023554fcc5aa6cd8f86b5a9063306972771ab10bde4cd9259d965b3361d46924c93233d04ad2ddaf9041e01a14b2c92c346c237
 MISC metadata.xml 1212 BLAKE2B 83f431217b3d0b759597a250e40902979fde0a130e5666427824fe3d48fb05120dd596a8f0292ad23373c00bb8bd807cac667ae51f9a996b0275fbb6039084af SHA512 828803d2518b1684db6f0076e4aa851614682198722c67298ee8e73c29726fdae808d1ee17626d15559a9f6fd28d1abb6f651c39fc59de9c233081ba925d826d
diff --git a/dev-util/gnome-builder/files/3.34.1-optional-vala.patch b/dev-util/gnome-builder/files/3.34.1-optional-vala.patch
new file mode 100644
index 000000000000..6116de17267d
--- /dev/null
+++ b/dev-util/gnome-builder/files/3.34.1-optional-vala.patch
@@ -0,0 +1,42 @@
+From 84249e315c4a95b3ef9421dbf8492e10422e40d9 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Thu, 12 Mar 2020 13:28:38 +0200
+Subject: [PATCH] build: Make vapi generation optional
+
+---
+ meson_options.txt | 1 +
+ src/meson.build   | 2 ++
+ 2 files changed, 3 insertions(+)
+
+diff --git a/meson_options.txt b/meson_options.txt
+index 8984e9f69..27f9a368b 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -13,6 +13,7 @@ option('channel',
+ 
+ option('help', type: 'boolean', value: false)
+ option('docs', type: 'boolean', value: false)
++option('vapi', type: 'boolean')
+ 
+ option('network_tests', type: 'boolean', value: true, description: 'Allow networking in unit-tests')
+ 
+diff --git a/src/meson.build b/src/meson.build
+index 113a142ad..b0510270b 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -134,6 +134,7 @@ libide_gir = gnome.generate_gir(gnome_builder,
+            extra_args: gnome_builder_gir_extra_args,
+ )
+ 
++if get_option('vapi')
+ configure_file(
+           input: 'libide.deps',
+          output: 'libide-' + libide_api_version + '.deps',
+@@ -165,3 +166,4 @@ libide_vapi = gnome.generate_vapi('libide-' + libide_api_version,
+ 
+ # Must be after vapi generation
+ subdir('plugins/vala-pack')
++endif
+-- 
+2.20.1
+
diff --git a/dev-util/gnome-builder/gnome-builder-3.32.4-r1.ebuild b/dev-util/gnome-builder/gnome-builder-3.32.4-r1.ebuild
index f569bf3bd9c8..2101d6527e85 100644
--- a/dev-util/gnome-builder/gnome-builder-3.32.4-r1.ebuild
+++ b/dev-util/gnome-builder/gnome-builder-3.32.4-r1.ebuild
@@ -59,7 +59,7 @@ RDEPEND="
 	glade? ( >=dev-util/glade-3.22.0:3.10 )
 	spell? ( >=app-text/gspell-1.8:0=
 		app-text/enchant:2 )
-	sysprof? ( >=dev-util/sysprof-3.31.90[gtk] )
+	sysprof? ( >=dev-util/sysprof-3.31.90:0/0[gtk] )
 	vala? (
 		dev-lang/vala:=
 		$(vala_depend)
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
new file mode 100644
index 000000000000..db914cde14e8
--- /dev/null
+++ b/dev-util/gnome-builder/gnome-builder-3.34.1-r1.ebuild
@@ -0,0 +1,191 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+VALA_MIN_API_VERSION="0.36"
+DISABLE_AUTOFORMATTING=1
+FORCE_PRINT_ELOG=1
+
+inherit gnome.org gnome2-utils llvm meson python-single-r1 readme.gentoo-r1 vala virtualx xdg
+
+DESCRIPTION="An IDE for writing GNOME-based software"
+HOMEPAGE="https://wiki.gnome.org/Apps/Builder"
+SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
+
+# FIXME: Review licenses at some point
+LICENSE="GPL-3+ GPL-2+ LGPL-3+ LGPL-2+ MIT CC-BY-SA-3.0 CC0-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="clang +devhelp doc +git +glade gtk-doc spell sysprof test vala"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# When bumping, pay attention to all the included plugins/*/meson.build (and other) build files and the requirements within.
+# `grep -rI dependency * --include='meson.build'` can give a good initial idea for external deps and their double checking.
+# The listed RDEPEND order shold roughly match that output as well, with toplevel one first then sorted by file path.
+# Most plugins have no extra requirements and default to enabled; we need to handle the ones with extra requirements. Many of
+# them have optional runtime dependencies, for which we try to at least notify the user via DOC_CONTENTS (but not all small
+# things); `grep -rI -e 'command-pattern.*=' -e 'push_arg'` can give a (spammy) idea, plus python imports in try/except.
+
+# FIXME: plugin_flatpak needs flatpak.pc >=0.8.0, ostree-1, libsoup-2.4.pc >=2.52.0 and git plugin enabled
+# Editorconfig needs old pcre, with vte migrating away, might want it optional or ported to pcre2?
+# An introspection USE flag of a dep is required if any introspection based language plugin wants to use it (grep for gi.repository). Last full check at 3.28.4
+
+# TODO: Handle llvm slots via llvm.eclass; see plugins/clang/meson.build
+RDEPEND="
+	>=dev-libs/libdazzle-3.33.90[introspection,vala?]
+	>=dev-libs/glib-2.61.2:2
+	>=x11-libs/gtk+-3.22.26:3[introspection]
+	>=x11-libs/gtksourceview-4.0.0:4[introspection]
+	>=dev-libs/json-glib-1.2.0
+	>=dev-libs/jsonrpc-glib-3.19.91[vala?]
+	>=x11-libs/pango-1.38.0
+	>=dev-libs/libpeas-1.22.0[python,${PYTHON_SINGLE_USEDEP}]
+	>=dev-libs/template-glib-3.28.0[introspection,vala?]
+	>=x11-libs/vte-0.40.2:2.91[introspection,vala?]
+	>=net-libs/webkit-gtk-2.12.0:4=[introspection]
+	>=dev-libs/libxml2-2.9.0
+	git? ( dev-libs/libgit2[ssh,threads]
+		>=dev-libs/libgit2-glib-0.28.0.1[ssh]
+	)
+	dev-libs/libpcre:3
+	dev-libs/libpcre2
+
+	>=dev-libs/gobject-introspection-1.54.0:=
+	$(python_gen_cond_dep '
+		>=dev-python/pygobject-3.22.0:3[${PYTHON_MULTI_USEDEP}]
+	')
+	${PYTHON_DEPS}
+	clang? ( sys-devel/clang:= )
+	devhelp? ( >=dev-util/devhelp-3.25.1:= )
+	glade? ( >=dev-util/glade-3.22.0:3.10 )
+	spell? ( >=app-text/gspell-1.8:0=
+		app-text/enchant:2 )
+	>=dev-util/sysprof-capture-3.33.1:3
+	sysprof? ( >=dev-util/sysprof-3.33.4:0/3[gtk] )
+	vala? (
+		dev-lang/vala:=
+		$(vala_depend)
+	)
+" # We use subslot operator dep on vala in addition to $(vala_depend), because we have _runtime_
+#   usage in vala-pack plugin and need it rebuilt before removing an older vala it was built against
+DEPEND="${RDEPEND}"
+# TODO: runtime ctags path finding..
+
+# desktop-file-utils required for tests, but we have it in deptree for xdg update-desktop-database anyway, so be explicit and unconditional
+# appstream-glib needed for validation with appstream-util with FEATURES=test
+BDEPEND="
+	doc? ( dev-python/sphinx )
+	gtk-doc? ( dev-util/gtk-doc
+		app-text/docbook-xml-dtd:4.3 )
+	test? (
+		dev-libs/appstream-glib
+		sys-apps/dbus )
+	dev-util/desktop-file-utils
+	dev-util/glib-utils
+	>=dev-util/meson-0.49.2
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+DOC_CONTENTS='gnome-builder can use various other dependencies on runtime to provide
+extra capabilities beyond these expressed via USE flags. Some of these
+that are currently available with packages include:
+
+* dev-util/uncrustify and dev-python/autopep8 for various Code Beautifier
+  plugin out of the box functionality.
+* dev-util/ctags with exuberant-ctags selected via "eselect ctags" for
+  C, C++, Python, JavaScript, CSS, HTML and Ruby autocompletion, semantic
+  highlighting and symbol resolving support.
+* dev-python/jedi and dev-python/lxml for more accurate Python
+  autocompletion support.
+* dev-util/valgrind for integration with valgrind.
+* dev-util/meson for integration with the Meson build system.
+* dev-util/cargo for integration with the Rust Cargo build system.
+* dev-util/cmake for integration with the CMake build system.
+* net-libs/nodejs[npm] for integration with the NPM package system.
+'
+# FIXME: Package gnome-code-assistance and mention here, or maybe USE flag and default enable because it's rather important
+# eslint for additional diagnostics in JavaScript files (what package has this? At least something via NPM..)
+# jhbuild support
+# rust language server via rls; Go via go-langserver
+# autotools stuff for autotools plugin; gtkmm/autoconf-archive for C++ template
+# gjs/gettext/mono/PHPize stuff, but most of these are probably installed for other reasons anyways, when needed inside IDE
+
+PATCHES=(
+	"${WORKDIR}/patches" # gnome-builder-3-34 branch 2020-01-22 (commit bf485934b37) + cherry-picked meson link_whole fixes
+	"${FILESDIR}"/${PV}-optional-vala.patch
+)
+
+llvm_check_deps() {
+	has_version "sys-devel/clang:${LLVM_SLOT}"
+}
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	use clang && llvm_pkg_setup
+}
+
+src_prepare() {
+	use vala && vala_src_prepare
+	xdg_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dtracing=false
+		-Dprofiling=false # not passing -pg to CFLAGS
+		-Dfusermount_wrapper=false # meant for flatpak builds
+		-Dtcmalloc=false
+		-Dchannel=other
+
+		$(meson_use vala vapi) # TODO: doesn't work anymore; crude patch included
+		$(meson_use doc help)
+		$(meson_use gtk-doc docs)
+
+		-Dnetwork_tests=false
+		$(meson_use clang plugin_clang)
+		$(meson_use devhelp plugin_devhelp)
+		-Dplugin_deviced=false
+		-Dplugin_editorconfig=true # needs libpcre
+		-Dplugin_flatpak=false
+		$(meson_use git plugin_git)
+		$(meson_use glade plugin_glade)
+		-Dplugin_podman=false
+		$(meson_use spell plugin_spellcheck)
+		$(meson_use sysprof plugin_sysprof)
+		$(meson_use vala plugin_vala)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	python_optimize
+	if use doc; then
+		rm "${ED}"/usr/share/doc/gnome-builder/en/.buildinfo || die
+		rm "${ED}"/usr/share/doc/gnome-builder/en/objects.inv || die
+		rm -r "${ED}"/usr/share/doc/gnome-builder/en/.doctrees || die
+		# custom docdir in build system, blocked by https://github.com/mesonbuild/meson/issues/825
+		mv "${ED}"/usr/share/doc/gnome-builder/en "${ED}"/usr/share/doc/${PF}/html || die
+		# _sources subdir left in on purpose, as HTML links to the rst files as "View page source". Additionally default docompress exclusion of /html/ already ensures they aren't compressed, thus linkable as-is.
+		rmdir "${ED}"/usr/share/doc/gnome-builder/ || die
+	fi
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
+
+src_test() {
+	# FIXME: can't run meson_src_test together with virtx or dbus-run-session
+	virtx dbus-run-session meson test -C "${BUILD_DIR}"
+}
diff --git a/dev-util/gob/Manifest b/dev-util/gob/Manifest
index b5f331649479..7ce6f7ab322f 100644
--- a/dev-util/gob/Manifest
+++ b/dev-util/gob/Manifest
@@ -1,3 +1,3 @@
 DIST gob2-2.0.20.tar.xz 202540 BLAKE2B 942fdaa77e660d3c8ea49e9b326ae8201893e01f335b2cb5c518597f4638058c7cb51e89061a6f707f39044a40c71cd1ec91b5fd514aa36904e91401abd9c9b1 SHA512 9d09692ef208f8d6422fd573aa1955ca5dcfc3feaf9e0fb64c27e52f4638fe19a5e08a7282f682ed5241a8fafce3852e4168ba4f3865890df972dad4ee342b7a
-EBUILD gob-2.0.20.ebuild 540 BLAKE2B 6f04db1fa19cf04d8ced56ca5c71fefcd20e7b6b98e4b4086faaaa4315ea5391f7da51303ad22f04588f7de04da0cfb99c54809a0d11c0e3715f9fc0e56d0cdb SHA512 c36d47eba0509337c6d0056e8e190388c99d203a8e404544ba876591d2d3c71c1ff49b3663aced6cc6d4008a3d64a631a515bcbc83436bfb9e65b9963ad382ef
+EBUILD gob-2.0.20.ebuild 534 BLAKE2B af5143f85a830e9fbd9d8451860f4cbf4ff72a6d0d49b0f5767b1a0fe8b600138412bb7033023b459c399bfa694b208784427f5fe59fd714f9742ebe86bdb64d SHA512 8a17d6c33261d8508b0284fbc857d87afe15588a82d7286da4678a0fe1f27027a8651fd63e4036b2fc083eadccff1b810b9f8c880aa30ddbcc164283109d2b41
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/gob/gob-2.0.20.ebuild b/dev-util/gob/gob-2.0.20.ebuild
index 27f6942ffb25..aaf9bf91b070 100644
--- a/dev-util/gob/gob-2.0.20.ebuild
+++ b/dev-util/gob/gob-2.0.20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.jirka.org/gob.html"
 
 LICENSE="GPL-2+"
 SLOT="2"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 m68k ppc ~ppc64 s390 sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 m68k ppc ~ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.4:2"
diff --git a/dev-util/goland/Manifest b/dev-util/goland/Manifest
index 495c028fd6ec..e7a29554bee8 100644
--- a/dev-util/goland/Manifest
+++ b/dev-util/goland/Manifest
@@ -1,3 +1,3 @@
-DIST goland-2019.3.tar.gz 360367644 BLAKE2B d11756d3e077491d361a65dfaad019b68fdfeb8fa14e187f0d5cd5329f5789869b7254305820115cd3e32b55c63c560f1d5524810f1270e8a0a0831f9f12bd73 SHA512 d066292160e0927928a9a96feba6d8040687172df202ea8a22c714492262bf0936993704a16cea3d4111044a1d0d9963e9ffa7de08baab46366de9b0ab442709
-EBUILD goland-2019.3-r1.ebuild 2324 BLAKE2B ad312e4abe6c3cc7a855f12dc9d16dd6d83253b626fe8674e9bd14fb2a85e0eb3d9dc32139808baae3c094f7158dc85ca113e23703413119a00043bac3259b3b SHA512 4ad3c32d29b19c47b87f9626c875c9e57608f22bbc555274d81b94a9df60506b94ba6748bc0266ba37c0b3fa3bb50ee34eb628f300ac0dc656fe71b96acf1ad8
+DIST goland-2019.3.4.tar.gz 370064668 BLAKE2B d0774ca8d463653de7f7256de9dc42de441aa701a18bf3d58af775737b54c7c3120b85a57ce17fab20dc7da921ca7761c32873aedf49111a3960ef91a4391ed1 SHA512 4874502bf6a031221419a015993a78d7139afafda7c92d6567e0fc81eb7b15f6766b1b934567a9b7c1f1395c7529bc838d7df3c42dcd5045e1086e8176e5e578
+EBUILD goland-2019.3.4.ebuild 2324 BLAKE2B a6388065840643b9dc6f423ee6e1b6f2b2b7393f1a56faebe96ddaa9a37eeba7dd007070de2eb76b58ee6d12a4fd8c6277e8e8b19d2a1c49dd5ee9b77227af5e SHA512 1b4d62bb9322895b3b57261b9c915866276660d6e5075c10f1d148f6cefdd24089bfab01b4ec0fcf103e126bc88f3f5248a696692480a223982e79b202a31bc5
 MISC metadata.xml 244 BLAKE2B 2ac557d4fb04230c7b4f706b52203ab6dc62d90aebc8e916561e6e3f6e41bf61bac231a0e7afe07fb18752177c6163b79fee124a171c3e8933041f4648db3a22 SHA512 da08729fbf0eceb858cadc8413dd857600ab595860ca483054e4d1422e3cacc52ce94f89d633a25c25d6b30df4a48ac7de011731418072238adb43bc8e7b3f3f
diff --git a/dev-util/goland/goland-2019.3-r1.ebuild b/dev-util/goland/goland-2019.3.4.ebuild
index de6131bb420c..24835d77a65e 100644
--- a/dev-util/goland/goland-2019.3-r1.ebuild
+++ b/dev-util/goland/goland-2019.3.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
diff --git a/dev-util/gperf/Manifest b/dev-util/gperf/Manifest
index cd5240e61faf..6c133060e90b 100644
--- a/dev-util/gperf/Manifest
+++ b/dev-util/gperf/Manifest
@@ -1,3 +1,3 @@
 DIST gperf-3.1.tar.gz 1215925 BLAKE2B bc4c54ade3f7dce484714d77cb5759dcc02b7a607d7b1aff6bdbcd06ee4c83e9449038a7217d5f25bcbef058ba56e1fce9383b9599de005154e5a9b566ac9c69 SHA512 855ebce5ff36753238a44f14c95be7afdc3990b085960345ca2caf1a2db884f7db74d406ce9eec2f4a52abb8a063d4ed000a36b317c9a353ef4e25e2cca9a3f4
-EBUILD gperf-3.1.ebuild 656 BLAKE2B 28a7d4d3bbb968d5589a9a6de95e71253c629c863ff96a3693d815353096c1ed5b6f9f40328bebffe25a4317067ff174930dcee11bce6968acabafc429c206c9 SHA512 ab5f741de843e33448009e92035e3d0680f7e22d129633a0a1cb357463e2b91741f75cf2b27bd4843212b3c1545ad1398b5e036bc9754ee4a81180c17c22e8f1
+EBUILD gperf-3.1.ebuild 654 BLAKE2B 7a6486b2f82b61f199168cf608d525ff4499529715d3413e579f5fca1a9cdecf80ed261ac86e4682ba76d0fa7132a5c4627354e5791f5f665dad8804413869c5 SHA512 3d5a691903416b54c3a8629248d86239ba12f8168646f6f3ecfcb2eec458f819b0222d4cba5bf4deb4c5ca42ecf317a0aff973029cbbd81f4a3c721edb4f7610
 MISC metadata.xml 219 BLAKE2B 0f485ab3a0acbd2d5cf0a8b2014662a56862057721a4bc34494c2dca52f97bba8d54994461ef33bc965d3470d3e733fec71ed60e9aa4f1b5c565c048d60865d8 SHA512 a1cca99a7d8d8ea9893e7147264184a1605ddbd61ba07971df5a2bd54d6d74ecec39145faa2b303132a31db8fa61484b9224a2748bff4da638b63f930bd394df
diff --git a/dev-util/gperf/gperf-3.1.ebuild b/dev-util/gperf/gperf-3.1.ebuild
index 1a06518f0b75..563152cbc215 100644
--- a/dev-util/gperf/gperf-3.1.ebuild
+++ b/dev-util/gperf/gperf-3.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/gperf/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~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"
 IUSE=""
 
 src_prepare() {
diff --git a/dev-util/gquilt/Manifest b/dev-util/gquilt/Manifest
deleted file mode 100644
index 5c366f034541..000000000000
--- a/dev-util/gquilt/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX gquilt-0.25-desktopfile.patch 402 BLAKE2B 3ea9944012cd638bdf5d182daf4d2a7ce83751b77e448bd4771c8197ff9df9076b967188f61d46e0389bfb0ed79007d4b543bf888f9ee8e20f116c745e35f6f6 SHA512 194fbe15da3a7c89c9fc534d7fc57e8248f004ebbcb9a39298a53561e6bbb18956f9a287ee1f56074ad6d1846eccd4ff06be06b06c388c385e776b754577d6bc
-DIST gquilt-0.25.tar.gz 124957 BLAKE2B a8b293c51511d80ee99b8d0898dd8c9b6f71988a855bf67c4743d745d3c02ecb55d1b6dbdf93e82352a19af8fabe29fa624aead33feca7d73b3cc080bcf85b19 SHA512 fd1b98e87b3bc8438620a7105664c487a5fcfed50ade3e144802fc080dfe3a7d94c76f7ff7274d5a98003cffd8305cf9f193b2f799f4846d59e60233f1782f0d
-EBUILD gquilt-0.25-r2.ebuild 824 BLAKE2B 8e15775c0a8191be9a113081fb39f8399e53c31c6597a57a0c705683e8b6c0c7692d37be4198fbbe83ac24a425998974205a9fa726245a77d036320892807af9 SHA512 5b221b06099c0f07682d7b6e71078f61251ee94b6a9b762231cf1501b47fdd7ea7d4dbfc3ceba7c1297843a0a5f2fa38dc78a04643c7cf2c9f19da7bc51a8194
-MISC metadata.xml 243 BLAKE2B 17a642a344b88fae8d8900450079e8af46c64bf782bbe91cde98b92eae1103cecc69b3afb16e24888748d86cd5a4e752ca44920d6c8801f5ac4ab891459b1eeb SHA512 409f547397c4745ced5764a70f2d57ee1b71ce617116f5adbfa07556d97019a63e1a2ff309544cc52991a4859bd70f63c4920ecb917853f7c95c981281df25e1
diff --git a/dev-util/gquilt/files/gquilt-0.25-desktopfile.patch b/dev-util/gquilt/files/gquilt-0.25-desktopfile.patch
deleted file mode 100644
index e5134a6caa91..000000000000
--- a/dev-util/gquilt/files/gquilt-0.25-desktopfile.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Sun Dec  2 13:22:44 UTC 2012
-Subject: match fd.o spec
-
---- gquilt.desktop
-+++ gquilt.desktop
-@@ -1,9 +1,8 @@
- [Desktop Entry]
--Encoding=UTF-8
- Name=gquilt Patch Manager
- GenericName=Quilt Patch Manager
- Exec=gquilt
- Terminal=false
- Type=Application
- Icon=gquilt
--Categories=GNOME;Application;Development;X-Fedora;
-+Categories=GNOME;Development;X-Fedora;
diff --git a/dev-util/gquilt/gquilt-0.25-r2.ebuild b/dev-util/gquilt/gquilt-0.25-r2.ebuild
deleted file mode 100644
index ed04793640e7..000000000000
--- a/dev-util/gquilt/gquilt-0.25-r2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1
-
-DESCRIPTION="A Python/GTK wrapper for quilt"
-HOMEPAGE="http://gquilt.sourceforge.net/ https://sourceforge.net/projects/gquilt/"
-SRC_URI="mirror://sourceforge/gquilt/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND="
-	$(python_gen_cond_dep '
-		dev-python/pygtk:2[${PYTHON_MULTI_USEDEP}]
-	')
-	|| ( dev-util/quilt dev-vcs/mercurial )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-PATCHES=( "${FILESDIR}"/${P}-desktopfile.patch )
-
-python_install_all() {
-	distutils-r1_python_install_all
-	domenu ${PN}.desktop
-}
-
-python_install() {
-	distutils-r1_python_install
-	python_doscript ${PN}
-}
diff --git a/dev-util/gtk-builder-convert/Manifest b/dev-util/gtk-builder-convert/Manifest
index a6efd661f932..82e4e3c523d5 100644
--- a/dev-util/gtk-builder-convert/Manifest
+++ b/dev-util/gtk-builder-convert/Manifest
@@ -1,3 +1,3 @@
 DIST gtk+-2.24.32.tar.xz 12620860 BLAKE2B 03f4c0a8be98473f62bc8c86859937969c4169960a5f93d37ff6dcde00413215fa6c7125b15781bf50d67b40aa0056cb71b83fb50acb2c3467b5deb3c8d938f0 SHA512 8e8fd9ae32f1d6fb544da260f00599f0f05090d910d767b06ef086ab4f1f8373a29bb0da9767761c9b5f4cfd51b5c45d0fa5d39b0428c839ddf0a579df806696
-EBUILD gtk-builder-convert-2.24.32.ebuild 1131 BLAKE2B 5b7ff3591ccacdecb8fbcdc047dadc60ed8ea8db294e5eb9d06f4330ecadea1488bb2eec074536953b71a4d275548b33c8155eaa6c78cdbd1ba26ae53679c810 SHA512 c8c99e831e81ef9ea5ea50a2a46a2a220ff36811f5ff8fba2f7a655b6637def093829a8b9463412fcf7abf97c8671416ceacc65089d98c37e6670e5513d45f59
+EBUILD gtk-builder-convert-2.24.32.ebuild 1128 BLAKE2B 2825466c954bccebc69b8b70b90dd3bfbeecdd4dedeb682f2c41d2fae1a2f2cfda990ebd379be42f2ea47128b9ec5de4ec87cad8bc4fbe4c99fc4bb3d2da3e3d SHA512 b4b4a33d84f0363e22d322391206811b47ddd59cc8a8d885eb6c319574cc0de69ec8dfb5045da512dfa013481f91b747ba0d4f0b0feef6757e3a0c2b8a19c9ba
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.32.ebuild b/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.32.ebuild
index cc5f7c81d7c1..323ce94de3e6 100644
--- a/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.32.ebuild
+++ b/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.32.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.gtk.org/"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-util/gtk-doc-am/Manifest b/dev-util/gtk-doc-am/Manifest
index b97ce125227d..4f1b8c2b7fa6 100644
--- a/dev-util/gtk-doc-am/Manifest
+++ b/dev-util/gtk-doc-am/Manifest
@@ -1,5 +1,5 @@
 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 1228 BLAKE2B 2d450abf6a4923c6f7e34e6e0edf5bd05b8f688755330bbc5487ee3703946d452ca976b0907560d38025b651f789806e753766751e16543946d8959dd082ad55 SHA512 9218b4dc41e27d3d9302f2d027fdaa197386c7b658f0c46f5d94815cf2fb2527e79b4eafbd81ee60728ef9437c1ef20e4faa90ed1a4c57b60c709f9d309d1b1c
-EBUILD gtk-doc-am-1.32.ebuild 858 BLAKE2B e316968cd39867ddeb722a3201d0b1565d2cff80646226c79ac21008b3c0fc1ab204da677e665462c4fd457e29d564b0269ad366dde9d74a44d89cdd1f1709d9 SHA512 bdeb721234543b7c8a63c4653b36ef6e27c2ab737ce071114003c3162448b052d6c8ce9600cc0d111093f2ec5062c8d3005d01c907708212fa749df91f99139e
+EBUILD gtk-doc-am-1.25-r1.ebuild 1226 BLAKE2B 35269374204699c254f0e22ff60530f1049788800125b68555ed5fd6bba58ae5c439cc140f0ac6076128c5a71c60c9308e4401edfab24f4307ad7c36ad81f825 SHA512 db250e9c5e92ad34f8fcc5214516a5d07b8c0c7d4993f45a562ad23c5c905a116c4470ebba4f6f722f582ce96d89164bba1491a57aef2f4641440c6c5dff0d46
+EBUILD gtk-doc-am-1.32.ebuild 854 BLAKE2B 734b8d9e923d4e427a807cb5c4a08a3a3d4ec5005cf9afc64ca4fda354cc06630341af71bc1dfaca5234585e184f02e13542caf6d07fb4f3c9cab84426c514a1 SHA512 edc488debdaff2a52fa3bfe8a3b24013a82f89f19202b3a920a8252c94850922fe6b1dcf9483dc00a7ba3257ef5ed22e6ccc0a4e213de5e367043946c189a48f
 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
index 394ed867b46f..a3701fa6ee67 100644
--- 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
@@ -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 sh 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=">=dev-lang/perl-5.18"
 DEPEND="${RDEPEND}
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 b7417a1b6064..9a3ecfc7dae8 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 ~sh ~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 57e9c848858c..d8313c4511fb 100644
--- a/dev-util/gtk-doc/Manifest
+++ b/dev-util/gtk-doc/Manifest
@@ -2,6 +2,6 @@ AUX 61gtk-doc-gentoo.el 283 BLAKE2B 116d2b43d42b05130482c5bff7a10f13930a0d04f348
 AUX gtk-doc-1.8-emacs-keybindings.patch 582 BLAKE2B 9591f8f58dbd2c5897abf020f96a3ad8124830c274bfa581756ccaa43c67002264cc6d5a04c0316e4bb2dfa75a3cb08b5de6217a81a295b3a31e18dae8d1ad7d SHA512 360e97c0d2603c17dd1c1ca92739eb5ac229f3bcda6dc76267b95cac73db1008a52164ac9cba5a0e43f7b6359b5e6d3b242fde757fa1b7409051bade5f6f35a6
 DIST gtk-doc-1.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 2767 BLAKE2B 18a2ba8d94e5aeb23d9cb89298a257a228fcce69c48b4f664c5801c4385914f49071b388d7a5244cae4ac81daf730ab1ead7732189bc530099b407d436982cf2 SHA512 279b3b0ea1015b9bb7a0381f8e0ca59ba7a55f919f38d4f89d044224d83df163955ee5190ab9b521b544407383192405e1fed88cad1a3d3c30f52e2c7f025203
-EBUILD gtk-doc-1.32-r1.ebuild 2353 BLAKE2B 2bdb453f6f6cd8debe11765014f8ba1fe9249831952c7796a1b622bd8408247d8a970e27e5a1d83f5a92e7cf3575950a029f6176063380df9160791280facd4b SHA512 141831ddd5bd6a9c1fe93b8955837a5989fd3d8f80bd2b82c98f629a82288915a4d35e7c317b13ee03f8c81b6e271a9859fec22f218765bbcc770f7442ec8eae
+EBUILD gtk-doc-1.25-r1.ebuild 2764 BLAKE2B c038d0737340ecc172d6bf11977b98ab45c22cfb36c412548c67f89e6b9fe09727a59100160bf9ff885b8e0453b84de9707cb6ed77cfb248ff6ce6bb6b585077 SHA512 95ac0021363d8b8bc6e0d9309f2d9c56d8ada1c8ba88ab75cad0f8ebfba66bebf5131745327867325dfbb66368f559e6f74c5e722083bbb21422c6c9ace4fef6
+EBUILD gtk-doc-1.32-r1.ebuild 2349 BLAKE2B c33126191560f90b9f9d894f14c5d79ab52a9f917906239d8da74d25220cdcb0f5cb8f36cb144c66646eb7150e1b2e594ba6e45dcb943f8683119093830a0697 SHA512 0d06e425c37ceaf8c39d6188b7634b9d7f1e645880da12dfdc2a8649e030254fc07783bd0f80718b0b9538ca766d2d0a420a1f07b681dbd3764aa15e0e930836
 MISC metadata.xml 659 BLAKE2B 8c57567cad76724388d746e74bd1056a062c7280552494d6265b5fa38be518983188f22948bdb389916ec6384c17308e1ec292ec36f633b6ecd6f27102f74f94 SHA512 4ffcd239d0a5788ed94a204395a51d8b706663ac69139965e7d28282c473b55cd006cf3786a3cfd60386439f9ffa5d9242ed43ba05783962cbac002f8a00539b
diff --git a/dev-util/gtk-doc/gtk-doc-1.25-r1.ebuild b/dev-util/gtk-doc/gtk-doc-1.25-r1.ebuild
index 6c653820480a..23d51c05ae3f 100644
--- a/dev-util/gtk-doc/gtk-doc-1.25-r1.ebuild
+++ b/dev-util/gtk-doc/gtk-doc-1.25-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 ~sh 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 )"
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 902b77297ded..1754b664d78f 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 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 
 IUSE="debug doc emacs"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-util/gtk-update-icon-cache/Manifest b/dev-util/gtk-update-icon-cache/Manifest
index e37d31048464..5f9e32bf9603 100644
--- a/dev-util/gtk-update-icon-cache/Manifest
+++ b/dev-util/gtk-update-icon-cache/Manifest
@@ -1,7 +1,3 @@
-DIST gtk-update-icon-cache-3.24.11.tar.bz2 91127 BLAKE2B 048e42e680e1d7b3697f6609205327c1aeded4cbde03350acc7c907bd781c4ded0c749d0375fb20919e5c3ccb45927dbc6fd7c521d59ddaf6b8c4c7b86a0b06c SHA512 40d8f415fcbfec2d7ba4bec94c92d16b40e5bb62ac3a31db1c3f05939336073e8dc376cc450b3649bc06b2ebbf7cf080f3139e5251a7b0707d306e23337b977d
-DIST gtk-update-icon-cache-3.24.13.tar.bz2 91090 BLAKE2B 26ba67b9b6660d20a4b321f74a43f586628317ef16280413c1c728d2f3d3703f77210e54c5e1a87f02e9bd5de32c54203d686341e19c216d807603fd117a5c4b SHA512 55513079d3da40c29fee5899631d21f699d5846ba3e7b028de3b5f49f200168eab60c96126309e29de6f520cdd7855cfb63b5a1aba3c1061f85d2322a117c6c5
-DIST gtk-update-icon-cache-3.24.14.tar.bz2 91713 BLAKE2B c4ecb1a0d0481a69dcacc158aa618b7524f86a307bc667a78c9e4a20f90fc9caf580d867a089147bb2f605197e338055481df79cb6061e5867420125eb272b02 SHA512 b679c460bf072de4710ccd2c87ce009f467ee71a69c395718cb6b3a6bec02e5c4942a56bc8d4fe90ba6cb22401dffb7de43adc5b26c148a601605882264f9c21
-EBUILD gtk-update-icon-cache-3.24.11.ebuild 897 BLAKE2B 673701ed3dad55e015b8f45dce011f476c15408e1723cc18e8b0f6689553a8cde27fb668c40cdf8ee2f1b0d7d9b013508afb333787629a13260a692c083bc10f SHA512 8b7797fbd6da8d487fa194231cc579b8bbc72636b843830511ff564b42568743633edd133f744e2518e873745b985b89ba0beda20fa51c3a497cd8a09a0dbaef
-EBUILD gtk-update-icon-cache-3.24.13.ebuild 899 BLAKE2B 8b2dac08e2f9df76fcd0b97b3e22c2ffe2a645c6a20f8b4e4e984d9ed6e85b5dadeed37f7b1e6c67cdb4c1d1fcb3d5a401059f607e8b8eb118df65032e1180a0 SHA512 295cdf644641461177087d3bebfc5c42fff64ee700088e5a048a2b8af506aa52721c4819c0ff3e6abf706554e732d5c128819c77fde0a261c599dd52e651e289
-EBUILD gtk-update-icon-cache-3.24.14.ebuild 907 BLAKE2B f798340e7fd2329b25f9512cdeaf217177f0ebe24d950ff455e131c107bbb38732b74ec1244de7122534c691bf3691e8f93af670c18ae94c31d4865082b70cd2 SHA512 c2e048056afbb84a10a6f3719613a061ec747143a306940fd69d8cba548e3cfba751d9f9d2457e4f402bd5b4dfde8be90f4bf2a3340fa98060348818c0a5f95d
+DIST gtk-update-icon-cache-3.24.16.tar.bz2 91713 BLAKE2B 883c1437ecbff8cdec545fb3a59270569de32f59c48cb7e2401332a2547ccf41487ff2778e382815695eca34cf88baddc955acf8b2b7b7ab1edf06dec5be8683 SHA512 53bdaa8d29e1c343cf9e5d0acddd852d1a3d43a9c03e8e7c186245f5ab536742b39bd7c76b9fee3a2b5342ab573be621d59f7282f41b08097061c8f5df158c06
+EBUILD gtk-update-icon-cache-3.24.16.ebuild 894 BLAKE2B c3534d66ac52481507d5a722eba0b98eb780cc18be33e18e336228def9d67d0a41a067507e83d3cfddac74c57fe2d33f26f1caeca77565f64a1a6197e0c664df SHA512 a3173194e30215c653e2d10fc7e864c2a9f70a35f0bd0d8e3e72d5eed8e8f98552de249bd5c4ff59320fd4bd0be7aac90896434ec7b70a44de12e3c1afb899dc
 MISC metadata.xml 647 BLAKE2B 2846e4ac0b5816fe7699b197958118535cac7092930d7b6ba63c23b126242102edd832d60b13baeed23bf8781babe1058f06fece732c4ecd58c9b01b621042ae SHA512 7301a9425528d65112ec9dd1eca7291473905493b1b550119c6984141b3b216c4f3825d3b2a395a8375aa8b481b29d841153bd279d593586d5ea7d77ce46d7d3
diff --git a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.13.ebuild b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.13.ebuild
deleted file mode 100644
index 27cb27560929..000000000000
--- a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.13.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit meson
-
-DESCRIPTION="GTK update icon cache"
-HOMEPAGE="https://www.gtk.org/ https://gitlab.gnome.org/Community/gentoo/gtk-update-icon-cache"
-SRC_URI="https://gitlab.gnome.org/Community/gentoo/${PN}/-/archive/${PV}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE=""
-
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-# man page was previously installed by gtk+:3 ebuild
-RDEPEND="
-	>=dev-libs/glib-2.53.4:2
-	>=x11-libs/gdk-pixbuf-2.30:2
-	!<x11-libs/gtk+-2.24.28-r1:2
-	!<x11-libs/gtk+-3.22.2:3
-"
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.3
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
diff --git a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.14.ebuild b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.14.ebuild
deleted file mode 100644
index cf8d30cf424f..000000000000
--- a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.14.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit meson
-
-DESCRIPTION="GTK update icon cache"
-HOMEPAGE="https://www.gtk.org/ https://gitlab.gnome.org/Community/gentoo/gtk-update-icon-cache"
-SRC_URI="https://gitlab.gnome.org/Community/gentoo/${PN}/-/archive/${PV}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE=""
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-# man page was previously installed by gtk+:3 ebuild
-RDEPEND="
-	>=dev-libs/glib-2.53.4:2
-	>=x11-libs/gdk-pixbuf-2.30:2
-	!<x11-libs/gtk+-2.24.28-r1:2
-	!<x11-libs/gtk+-3.22.2:3
-"
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.3
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
diff --git a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.11.ebuild b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.16.ebuild
index 0f373df6a8fd..c82aa749e296 100644
--- a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.11.ebuild
+++ b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.16.ebuild
@@ -13,7 +13,7 @@ LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE=""
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # man page was previously installed by gtk+:3 ebuild
 RDEPEND="
diff --git a/dev-util/idea-community/Manifest b/dev-util/idea-community/Manifest
index 14960a99334e..ffe787b684c7 100644
--- a/dev-util/idea-community/Manifest
+++ b/dev-util/idea-community/Manifest
@@ -1,6 +1,8 @@
-DIST ideaIC-3.2.193.6015.39.tar.gz 563811740 BLAKE2B 393adfb070e3cc41f290056cd4a55d676726dbf4ebcf2729cb25673a669c5f04185c267e64d687795e2555a543142d78f26c9ac83dab7415f3b9e3aa2136f2de SHA512 b71817d51ddac8f41e65d96ec8138d28d871465c52938f6cec837c9fdf5c16fb48bd0d08d3ee545aa3953516f2a56ee9faee0de3052361ad58685be26a15ee29
+DIST ideaIC-3.3.193.6494.35.tar.gz 563410584 BLAKE2B 765c22e5cf25f8daf465e14cbaca2803a560fe175ce8bd678c9d3890b033b50301aae6ced5c5e2c3a682158c7b5cce3daa38ace25e178a6be49cee5c51b60305 SHA512 c8593434fc230a9e3214cac6782130c42b5a98aadd2d27811be2bec3dae1a311b1af3995739b8eb198e6641974b55cb993b9505496e2688c8a8a67c210e3d9d8
+DIST ideaIC-3.4.193.6911.18.tar.gz 563415699 BLAKE2B d7f76da2251042c2141c39861b9a737cd7350e4140c6d9ff39182b489e5f14b8cdd033f402cecd08ff367e2a171b2137227813e6bf6d120b97cbf81e3eca3684 SHA512 39fb2aca3da78cf8282beae812662d237eba1ea2f55c30db5ebfcadd74af001d8fe07dc5cbb99794c3723487814eb096e5e70c4f654a6dafd0930432dfa86b83
 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-2019.3.2.193.6015.39.ebuild 4773 BLAKE2B 0ab6ddcee52c45bf03a46cf87750e4806ea7e46d0282aa1633743a6c7050ebb812a81071f6a30800938fcd85f4be427c33e46a1d7ccdea0be045482f4a52cb92 SHA512 f2c1c618f195424680801ddc730661ed821c3d97b29c37b01e6d05384e70b49ac2cbc46bb0e05e47e0d9c1284d93099118a130775a678ebbb2d86fef0b95abbf
+EBUILD idea-community-2019.3.3.193.6494.35.ebuild 4754 BLAKE2B ef634f522764d63b63ab4b8c333fc9bf38b496f9f9ed370a2e4f1c3393acba58888e08e47c4801552d80ded55e50b356c6152fa1bed8248a02895d2003fa24eb SHA512 334e344deb40b90a6ca5789f48fc667930791d3f365a04d0afba8218459ee2f92eaec5131e89b0c443a116a2cc52c7e852c1be9f2ba759a48536aa8e6c34cc9f
+EBUILD idea-community-2019.3.4.193.6911.18.ebuild 4754 BLAKE2B ef634f522764d63b63ab4b8c333fc9bf38b496f9f9ed370a2e4f1c3393acba58888e08e47c4801552d80ded55e50b356c6152fa1bed8248a02895d2003fa24eb SHA512 334e344deb40b90a6ca5789f48fc667930791d3f365a04d0afba8218459ee2f92eaec5131e89b0c443a116a2cc52c7e852c1be9f2ba759a48536aa8e6c34cc9f
 MISC metadata.xml 758 BLAKE2B 2009b0e669ca0b3cdaee71ac45bf1bbddf940ae8130b0b5c275fa825781dd71aa1c522307ee44cbcf75dde0796f6f2f77a7f4226917e5da52020cde563f4951b SHA512 9a2dfb6862b8f49de5680af6a8ee703c0e6687b5cd312cf304a60547075ee9e1f888516e2172ff54172f89524bf5bdc33d53848b6fbdb708bbea320b804de591
diff --git a/dev-util/idea-community/idea-community-2019.3.2.193.6015.39.ebuild b/dev-util/idea-community/idea-community-2019.3.3.193.6494.35.ebuild
index b33ce52f9b75..fac1ff804200 100644
--- a/dev-util/idea-community/idea-community-2019.3.2.193.6015.39.ebuild
+++ b/dev-util/idea-community/idea-community-2019.3.3.193.6494.35.ebuild
@@ -61,9 +61,6 @@ QA_PREBUILT="opt/${PN}-${MY_PV}/*"
 
 # jbr11 binary doesn't unpack nicely into a single folder
 src_unpack() {
-	echo "S is ${S}"
-	echo "SRC_URI is ${SRC_URI}"
-	echo "unpack ${MY_PN}IC-${PV_STRING}.tar.gz"
 	if use !jbr11 ; then
 		default_src_unpack
 	else
@@ -80,19 +77,25 @@ src_prepare() {
 	else
 		JRE_DIR=jre
 	fi
+
 	if use jbr8; then
-			mv "${WORKDIR}/jre" ./"${JRE_DIR}"
+		mv "${WORKDIR}/jre" ./"${JRE_DIR}"
+		PLUGIN_DIR="${S}/${JRE_DIR}/lib/${ARCH}"
+	else
+		PLUGIN_DIR="${S}/${JRE_DIR}/lib/"
 	fi
 
-	rm -vf "${S}"/"${JRE_DIR}"/lib/*/libavplugin* || die
-	rm -vf "${S}"/plugins/maven/lib/maven3/lib/jansi-native/*/libjansi* || die
-	rm -vrf "${S}"/lib/pty4j-native/linux/ppc64le || die
-	rm -vf "${S}"/bin/libdbm64* || die
+	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 [[ -f "${JRE_DIR}" ]]; then
-		for file in "${S}"/"${JRE_DIR}"/lib/amd64/{libfxplugins.so,libjfxmedia.so}
+	if [[ -d "${S}"/"${JRE_DIR}" ]]; then
+		for file in "${PLUGIN_DIR}"/{libfxplugins.so,libjfxmedia.so}
 		do
-			patchelf --set-rpath '$ORIGIN' $file || die
+			if [[ -f "$file" ]]; then
+			  patchelf --set-rpath '$ORIGIN' $file || die
+			fi
 		done
 	fi
 
diff --git a/dev-util/idea-community/idea-community-2019.3.4.193.6911.18.ebuild b/dev-util/idea-community/idea-community-2019.3.4.193.6911.18.ebuild
new file mode 100644
index 000000000000..fac1ff804200
--- /dev/null
+++ b/dev-util/idea-community/idea-community-2019.3.4.193.6911.18.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit eutils desktop
+
+SLOT="0"
+PV_STRING="$(ver_cut 2-6)"
+MY_PV="$(ver_cut 1-3)"
+MY_PN="idea"
+# Using the most recent Jetbrains Runtime binaries available at the time of writing
+# As the exact bundled versions ( jre 11 build 159.30 and jre 8 build 1483.39 ) aren't
+# available separately
+JRE11_BASE="11_0_2"
+JRE11_VER="164"
+JRE_BASE="8u202"
+JRE_VER="1483.37"
+
+# distinguish settings for official stable releases and EAP-version releases
+if [[ "$(ver_cut 7)"x = "prex" ]]
+then
+	# upstream EAP
+	KEYWORDS=""
+	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}.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"
+BDEPEND="dev-util/patchelf"
+RESTRICT="splitdebug"
+S="${WORKDIR}/${MY_PN}-IC-$(ver_cut 4-6)"
+
+QA_PREBUILT="opt/${PN}-${MY_PV}/*"
+
+# jbr11 binary doesn't unpack nicely into a single folder
+src_unpack() {
+	if use !jbr11 ; then
+		default_src_unpack
+	else
+		cd "${WORKDIR}"
+		unpack ${MY_PN}IC-${PV_STRING}.tar.gz
+		cd "${S}"
+		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/imediff2/Manifest b/dev-util/imediff2/Manifest
index d0dfa26f5d16..543287088c84 100644
--- a/dev-util/imediff2/Manifest
+++ b/dev-util/imediff2/Manifest
@@ -1,4 +1,4 @@
 AUX 1.1.2-python-3.patch 4553 BLAKE2B bc16393f3c7071017255e8f188456e77d89a2ab2d605d6d99882aef4c65c7e5270a9348cf278a98d5ff7527423e899feffbb93b00f12a8c6e9a7b131acb86eba SHA512 fa5065572eb7fdbf38e3d7785ae92bddaeae8eadd9dbd006f5691c8647087df7529015750b66ea7618dd3306fcda80083c8dc2d2f019787137095db5b2c1a4d7
 DIST imediff2_1.1.2.orig.tar.gz 17974 BLAKE2B f83b6ab652b1dd044587e75e4e7551a8132e1860b14f0d85d37f35383bd161a672860162e93554cf4db844d6a4700fa1876a30874c50fcb8442b4190a9b19185 SHA512 54d196d67107283bc3339eba30acb1c60972f256a268e86da397e0bdafa05220facc7979638a6a917b0c2dc7171edc3aa6b188295c9f40e9debf87a63731e748
-EBUILD imediff2-1.1.2-r5.ebuild 776 BLAKE2B a5462198fde0e0ff5c6e7ca588cec316d0893334c70f60db02d883ce5e76fbed2fda81535108b63ad924fae832f97506721814d7f9fc961dd88f94bfb8a19ea6 SHA512 5f819b60a76ab9eef863e912acece735323b868370ac08074069ca9961076c088b0d6a81f61bfb134483a586647b4424b98b550dbbe13c95d0578d35147a4975
+EBUILD imediff2-1.1.2-r5.ebuild 781 BLAKE2B b9ead2e81dc7ae8c220c7f8bd49e9ba4db66c72fbf2c2f9c59ece8c757ede11e7b1bb72f6e089c05d793b1497cd98ef00cb7b2776f7f4d72e75ae583c831602b SHA512 5ab6deb4fdb12cc8746ed7b6f42e0fcd651761d2aa3ec0bd91da7f3df3ff57aa76e2162d9349172822df0d8089c787ec6a8101bedc582f0b7f3e2ef4c706b697
 MISC metadata.xml 246 BLAKE2B 464fa3d4dae2c15dd040a7580e6324ebe6cd2fa1d37a746ce991ec34484621fe6d3ae2362ea7696bde10cd6c466e1c8e0fd1fdcc161de4a502970e9e2841faa4 SHA512 30ecd86dc0fd1e0c83b4401da36f040346046e260e53c9ce77336869a2442d6b432863b031f61aa2209e58e43d172ef471c6fae5ef19a4c9e2a653e60e96c73a
diff --git a/dev-util/imediff2/imediff2-1.1.2-r5.ebuild b/dev-util/imediff2/imediff2-1.1.2-r5.ebuild
index a6ac1bd2e641..367b5313edfb 100644
--- a/dev-util/imediff2/imediff2-1.1.2-r5.ebuild
+++ b/dev-util/imediff2/imediff2-1.1.2-r5.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://debian/pool/main/i/${PN}/${MY_P}.orig.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 DEPEND="${PYTHON_DEPS}"
diff --git a/dev-util/include-what-you-use/Manifest b/dev-util/include-what-you-use/Manifest
index a56daf17b226..b18e02c03440 100644
--- a/dev-util/include-what-you-use/Manifest
+++ b/dev-util/include-what-you-use/Manifest
@@ -1,7 +1,3 @@
-DIST include-what-you-use-7.0.src.tar.gz 541840 BLAKE2B bf20a5598f02f03e5f714582653b8062eab6e414967ef2374c28bb6c1cdce8f73f80e3b2f4953fd943587ce17dc657cf6ab2a9db4208a59030d432f6a40532e5 SHA512 50d186b2e09c3595cc2dc7513e5db74da0038987158c2c45ef4279c67c50de621ca6499b07894ee203f25566aafaddde4b05840946f921678499d2efc131575a
-DIST include-what-you-use-8.0.src.tar.gz 545788 BLAKE2B 7b70d951b7ab2d62a8a6168ebf86dc76fd406159155dd93a509b8c39953506166ac18da3028be8dc7edfbb39eb96613b0e344067154dd8614fe7c63ad3ef04c6 SHA512 e75e91ce198b1ec446ed34afcf9fdbcb0534c5edc5346e4884f0f589c73512d778c428aa71c1b109d45a45543a952438610ab21e32ef1f03ff1a014823ed8425
 DIST include-what-you-use-9.0.src.tar.gz 589377 BLAKE2B b695354787070948d81e3e80b07bbe47a84b5609262df2220b6a62e6d648865b17e060951819f45956c6ca858977614d6e0401640509599b391a1165521b20de SHA512 f2d6ba05121a9968da9e42e8ac66f83ca0f35bfbe7cb1d616e2c6479cf2833c4668cb86e46a04ffcd5e77f10a575da9eeee5272c7609b5afad555d79cb640fb4
-EBUILD include-what-you-use-7.0.ebuild 1202 BLAKE2B b5ee7e2bc4b9826c748942afaef191fb766d316408ededda7f816de104c0ea80f1202fd93db5c1206a9fcf00182299773626905b2594abb0173630c70111c128 SHA512 8b4ad10f59bb40e71440b83a000837648899c1976a5952f412e88a6fc449ac1e5eb467543703c3f307b5b988d801528b7e2286a634527113da4477aed73e1b45
-EBUILD include-what-you-use-8.0.ebuild 1202 BLAKE2B 0f23eef8cedf2dcff9f825869e712d03646611bd1d0d021bcbd3b7c5bc8a6918022e99c8f1b501334d452026099b9a880ae45d8488d5538a67fb0d01b7cb2bf9 SHA512 bb3c6e997a6858ba5137bd4a2aa5224b89e4b142d35bafd0bde9dfb7fd38f4dc5c8f32b579f3e935180c36602209667abe629a206436dc79d7eb408f9e87257d
 EBUILD include-what-you-use-9.0.ebuild 1202 BLAKE2B 648f680ade33ceb1f8fbe231b2131e93455b70047033ac4f606d8e9155f9d753353027c93dd2cbd1144f3592b3f55ff9342897644ae8b985b71c07bbbceb3810 SHA512 5c634f121475b8a1b1afded6452c33849a4bcef4b6191630ebabba46c30b69eb0719385074077dd877c7cf9d4f4b9ae078c334e310b400e2b3ffb25c41a318d7
 MISC metadata.xml 357 BLAKE2B f14a0380bab03b4bb916602ed495cf9c29a4ca5839f71dca0d5f4f14eeb5fd0ddaa66dfcb15d94cbeec2a9021a9e5522ef7ae531b5b6f111b769462596da4216 SHA512 03c298d184adee1c8bd96855ba3856dbc6797f6f866397485cc10c3e02956f7bb04811a086e9cf50bbd6f996011d08ca2d272aa4b06f13ee62af5a585f67b492
diff --git a/dev-util/include-what-you-use/include-what-you-use-7.0.ebuild b/dev-util/include-what-you-use/include-what-you-use-7.0.ebuild
deleted file mode 100644
index a63ca135ef22..000000000000
--- a/dev-util/include-what-you-use/include-what-you-use-7.0.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=( python3_6 )
-
-inherit cmake-utils flag-o-matic llvm python-single-r1
-
-DESCRIPTION="Find unused include directives in C/C++ programs"
-HOMEPAGE="https://include-what-you-use.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/clang_${PV}.tar.gz -> ${P}.src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-LLVM_MAX_SLOT=7
-
-RDEPEND="sys-devel/llvm:${LLVM_MAX_SLOT}
-	sys-devel/clang:${LLVM_MAX_SLOT}
-	${PYTHON_DEPS}
-"
-DEPEND="${RDEPEND}"
-
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-S=${WORKDIR}/${PN}-clang_${PV}
-
-pkg_setup() {
-	llvm_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-	python_fix_shebang .
-}
-
-src_configure() {
-	local mycmakeargs=(
-		# Note [llvm install path]
-		# Unfortunately all binaries using clang driver
-		# have to reside at the same path depth as
-		# 'clang' binary itself. See bug #625972
-		# Thus as a hack we install it to the same directory
-		# as llvm/clang itself.
-		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix "${LLVM_MAX_SLOT}")"
-	)
-	cmake-utils_src_configure
-}
-
-src_test() {
-	"${EPYTHON}" run_iwyu_tests.py
-}
diff --git a/dev-util/include-what-you-use/include-what-you-use-8.0.ebuild b/dev-util/include-what-you-use/include-what-you-use-8.0.ebuild
deleted file mode 100644
index 8c945d51878d..000000000000
--- a/dev-util/include-what-you-use/include-what-you-use-8.0.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=( python3_6 )
-
-inherit cmake-utils flag-o-matic llvm python-single-r1
-
-DESCRIPTION="Find unused include directives in C/C++ programs"
-HOMEPAGE="https://include-what-you-use.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/clang_${PV}.tar.gz -> ${P}.src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-LLVM_MAX_SLOT=8
-
-RDEPEND="sys-devel/llvm:${LLVM_MAX_SLOT}
-	sys-devel/clang:${LLVM_MAX_SLOT}
-	${PYTHON_DEPS}
-"
-DEPEND="${RDEPEND}"
-
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-S=${WORKDIR}/${PN}-clang_${PV}
-
-pkg_setup() {
-	llvm_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-	python_fix_shebang .
-}
-
-src_configure() {
-	local mycmakeargs=(
-		# Note [llvm install path]
-		# Unfortunately all binaries using clang driver
-		# have to reside at the same path depth as
-		# 'clang' binary itself. See bug #625972
-		# Thus as a hack we install it to the same directory
-		# as llvm/clang itself.
-		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix "${LLVM_MAX_SLOT}")"
-	)
-	cmake-utils_src_configure
-}
-
-src_test() {
-	"${EPYTHON}" run_iwyu_tests.py
-}
diff --git a/dev-util/indent/Manifest b/dev-util/indent/Manifest
index 66024b5e38db..bf593f6d38ed 100644
--- a/dev-util/indent/Manifest
+++ b/dev-util/indent/Manifest
@@ -5,7 +5,7 @@ AUX indent-2.2.11-texi2html-5.patch 2666 BLAKE2B a92ecd54bead00609c45f3193b3c022
 DIST indent-2.2.11.tar.gz 778563 BLAKE2B 8fe0f245fb852613587da8355a4aa8962e09e1614faf61cf7cea62d6922054547d0739cd1373298af08e4e0cca8d5f4bfc654e03d859c0fe560d0ddb0f63a298 SHA512 f5670e5edc76b9d599ef9e8cc498e13ac15e10eb6a8d674e1612918c4b67ffb15c94d73b9590434e0cdea6ead4b8d1f5bcda1c2f3838acbdeb4d732a0bea89be
 DIST indent-2.2.12.tar.xz 620280 BLAKE2B c3414ebe58d75b74356b5c37234639dc34998b73e45a4c28ee20ab2932c523b528d577c45c32db88f2ee4aed58d1dceeda2fe68b8975d211dc0dad4a3a20f7c7 SHA512 dbe73bd3729074825f9f5b4241a4c539ad32069df56511963417caf0351ff9ec5edd77e9580338301c8abf89ab9c0592bc7e82c14eec7450c496259d7e9045dd
 DIST indent_2.2.11-5.debian.tar.xz 6540 BLAKE2B c4d0805f39e1af503bcfcc49a8e9e679fb0df1021de9952af5a80c81f0c36c70e8dd6609b7e7ec5e36596f974d9c9ac31a7cad831a431cd9401758981d46a7ec SHA512 f89f04bb3b9772c5428ef6df939b5cbe92761f3a39869020dad4f98a5e48c57c34de526803141258c9d55ba6edaedf05127009530aa09b1a54cfa15c8a421a31
-EBUILD indent-2.2.11-r1.ebuild 1233 BLAKE2B 348aeddc85cc69619ba98137b52e0036e95d440a78ec6e8602dd5f8ad8fa798b20002bbb93cdba62e4a8c7900dc0fac88927fdc61c74afb38308b6960cc018b6 SHA512 370b1317f7e4de19bd6e9cd26f361ba66291721c344b1a7eb26d29c3f4e4783db07daa0de3fbee977237519e4b200d95c99cadd2baa00b9581f696d7ef947ef5
-EBUILD indent-2.2.11_p5.ebuild 1396 BLAKE2B 622161e143756007c341218d2903657263340b6ce7d907e26028f61e06ff2b2f347e6b3f05951f21f5c3aa8a4d5986a9c7cb39e4543b3fa75343f3f828da9105 SHA512 b407c09630aa12b55bd58e7875bfb0ef2b54148ca6e9b4da94b9991b8396a0af7a94f728752b9725e0934384fb902037295b25e67579fa91de4eac8ae8e9b732
-EBUILD indent-2.2.12.ebuild 1127 BLAKE2B 7e38608fb850a2249c1fe44edeebc7fb6c875be53120037df3cf173dcf9df45bf312a3f8a7dcbf327436f71a35667234dd50a132509028f517156ac4aadfdd89 SHA512 546599303c7ce7bff6586756a81df6890af9a711a45d1857d37d3e0417a7bb552392dd40fd108d7b84fc6d51867bdb7a6de58ad2b71e280f8b621ed55b395dac
+EBUILD indent-2.2.11-r1.ebuild 1231 BLAKE2B 89908894927dbcf9a423998aca2f3d5052a6912bad1ff67a68dafee6bd651b402a388873dab797efb196c2a4cb8208b9a0f259b0b1af5be64ba16267885e9571 SHA512 1ddfa9c9624bf7409a063fbf2707a095e120f64c3b2a86abd86ad0e8b9b2200e0a2ba2cf7bacf221d3d9c1553fa71971c94ff4e19bc59fa90ee87bf198177fa7
+EBUILD indent-2.2.11_p5.ebuild 1392 BLAKE2B de097169420daf098c4a3a1f88cd973f0047bc282e3ae5e08be60ea27c18eef908d91d44d418b395ac79af0c6caa4f4fc742a4423d7f3162c5e9ea37a7c77af7 SHA512 9b1b34cdc5fbdc205fa448ba9ddb47a313c2842eb6f0872078c0b1769fe98a8fc491f6b2d4af4c425dacc1f105f2dbe88eb1b27682d339f9cc98185ea1fede1a
+EBUILD indent-2.2.12.ebuild 1123 BLAKE2B 042021ce75527202ed59073fbb4810152ca10955b49baa3ffa0bb874dbea56aaa284a0d1864f02ca0c604a02d328cd74ff6622f6bdc98d844ffd227a541053ef SHA512 cc85dba62c15974d85fe6d3533fd579a394d1b60dd4706b5222f370a204a3a7e2e6dbd61115c00a66a5f9aad8a0817a4492abce0cd4cff062f2bc337502e264f
 MISC metadata.xml 371 BLAKE2B f331934c0c8063b13ae4e4290894da6faa7e6f135d1684b7a621b4199b13304496866e7eea31a158a2a0f36ae29da184bca16020425799a6542dd6d213e1b36c SHA512 c3859c430b4d976869789476e59c66bd2967802748abc9a3f53395d170114c21ca11e81c6046fa160ad31d422188dc92f63c9df947ac75ef31bcb1965a7f5dd8
diff --git a/dev-util/indent/indent-2.2.11-r1.ebuild b/dev-util/indent/indent-2.2.11-r1.ebuild
index e989d7df4dae..c9f84d2ad06b 100644
--- a/dev-util/indent/indent-2.2.11-r1.ebuild
+++ b/dev-util/indent/indent-2.2.11-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dev.gentoo.org/~jer/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="nls"
 
 DEPEND="
diff --git a/dev-util/indent/indent-2.2.11_p5.ebuild b/dev-util/indent/indent-2.2.11_p5.ebuild
index 84120c0044d3..4b76c2fb0708 100644
--- a/dev-util/indent/indent-2.2.11_p5.ebuild
+++ b/dev-util/indent/indent-2.2.11_p5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="nls"
 
 DEPEND="
diff --git a/dev-util/indent/indent-2.2.12.ebuild b/dev-util/indent/indent-2.2.12.ebuild
index 6ba9d6e6fd5e..593d2b3c78a9 100644
--- a/dev-util/indent/indent-2.2.12.ebuild
+++ b/dev-util/indent/indent-2.2.12.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="nls"
 
 DEPEND="
diff --git a/dev-util/intel-graphics-compiler/Manifest b/dev-util/intel-graphics-compiler/Manifest
index 65188847ab26..965aa0448b45 100644
--- a/dev-util/intel-graphics-compiler/Manifest
+++ b/dev-util/intel-graphics-compiler/Manifest
@@ -1,8 +1,7 @@
+AUX intel-graphics-compiler-1.0.3445-Fix-for-building-separated-dynamic-llvm-libs.patch 1335 BLAKE2B 6b710f0f02f36bc795c407fd70e4f4ef6931794114f692b16ed48b98547345e60293c1d8d03bddff2db20722e362a4cc9493d36ceb2eb7f4fd8abdffd72b6144 SHA512 4af69610c65be18700f9d14f6d856ea8016fb5b9ed0aae6ad8ca0e0c663fd7ea30779f0b17c61a330edad2b550bea1b723a4a64f5807822252725fbc65adfb98
 AUX intel-graphics-compiler-1.0.9-no_Werror.patch 272 BLAKE2B 079fe334413dfddb7681940f2a8920a365e8e72526cfc09ea1c7d218e8b19468f80ea9a215be125b441ee5238d7856b8dec02ebfc4bfd76b1850aa9917da35ef SHA512 d3d27943e84e228b480172b4fe91ba9aed8bb1c98700eb8c8beebafb7f1cc6265279031f56181e67eff74f55e1bbc8ee24bdc4d14fc1200c5aff670ef019410d
-DIST intel-graphics-compiler-1.0.2878.tar.gz 5920418 BLAKE2B 99522118d08183836c6e62f80c98b2cc716dd22d7dc82d05841e87e42f10025508c6254cebe2f886da8454cc4cc4b3a9ee06ce5a3bc04246c88f499f63f8f1ae SHA512 3b6dc9b945fddb3d0bc716f4598c4dacb6431c342b580c90f7e9ff8682bdcbde410a960adbfd9e67601d121adc70d2cf23de01bc99c1d0cb86d14b4db77afde5
-DIST intel-graphics-compiler-1.0.2990.tar.gz 5930890 BLAKE2B 038761e74dde52de53eed511a74a39d9b4c69a510ef289d2941b859aea018d6776b5179d2be006b12d3245ffe43a06bfacd9d03ee2d227c2ba2ea39805bf40d2 SHA512 65287348e98f09096418afa02262ad6ce07dd918aa040ac1fb49f7176545c0a6449e68c5e74a11c41641d90495edc7be8e24b32e68d798df906ea3b16e675827
 DIST intel-graphics-compiler-1.0.3151.tar.gz 5950502 BLAKE2B 8ccbfc5d3cd6307eb5db602822d42e8744e6ca7696494a0dd349847aff0defde2434b9192f17645f1fcbf732ec98a66dbdcc7d03eed48702d90911f912135fc1 SHA512 a6e04a3a90aae9046f2698bf15d5f60862c93e7a87a6e4ae6b6c43c65490583608f201e94a2ef32fc2f72e9fa0da7d6c202f64ef610f03a81384ac537541df14
-EBUILD intel-graphics-compiler-1.0.2878.ebuild 875 BLAKE2B 197981d2f6605e23d85f45cf804e3772c54561f1b6813c3593db7f025b89d370390034c195e5a91af4e9c218ddafecb51b77c77afb8bf23deaef0e7fa8c9dfdd SHA512 b6f6cb8d65aab2eda3822add23647126d0e9e39f5f291640beed4c22dbfbb4df63821319feacb6cf917e7334a1e30e74de01eb49d6e643857de93895553e7119
-EBUILD intel-graphics-compiler-1.0.2990.ebuild 875 BLAKE2B 197981d2f6605e23d85f45cf804e3772c54561f1b6813c3593db7f025b89d370390034c195e5a91af4e9c218ddafecb51b77c77afb8bf23deaef0e7fa8c9dfdd SHA512 b6f6cb8d65aab2eda3822add23647126d0e9e39f5f291640beed4c22dbfbb4df63821319feacb6cf917e7334a1e30e74de01eb49d6e643857de93895553e7119
+DIST intel-graphics-compiler-1.0.3445.tar.gz 6026437 BLAKE2B 4a4708109d125891dfe967186efbc2ebe70ce59dc0302f534dad74c0b1f2af36de0d7ee7cb69059e776ab4669236f5d62750159a44d44a6444ab85a205273563 SHA512 044b941adb921b25a1ab6da3ebe0f7c4d67769b43e5b855ae94871281cf387ce45351b8b46a6e98e3bd573022d7cfd9316629d590327c8f4007e1b1ae9f7071e
 EBUILD intel-graphics-compiler-1.0.3151.ebuild 895 BLAKE2B 9924a3f7db2a7a8e75bdbdbe3d50f42b60c5265ae6e2cb50df52ed860c2178f6a2f00bcac075d5914f47d5e2abd8b7f4fb8e7d2fd06a7aa6d3dcb5d90f91dd6f SHA512 e5d68db8303f165259c399e2d786991ace0628aac5667ac28200d9ba9952c16c23cfb872914cc6e6e4dc00cb9b7bd11b023627f62de5aca661d8bc3de8ecd782
+EBUILD intel-graphics-compiler-1.0.3445.ebuild 1448 BLAKE2B c8175562df6d37f1fddfa760b69fe20a5b1e35ee88493750e659bbdad83b6f4cb3edeadf8f94f0ec47b5f808a04a05f17711ea1ca410d6679dc087d4631b5918 SHA512 00db2187b0869417835a78aec5361df6cf3606ed952b3f3fc51b7a43d027548302723ab02bd613d0dd5f1632c5bd660f208d72b6eb7f1bc6abfffe8d584f646e
 MISC metadata.xml 340 BLAKE2B 6c0e5d932084dffd300a1dc70b29eb0871dfe2187ed8591a5a2f8cba001bf681e908c58a6f9471f7b08842ff538365258305da91004ed63ff97314a07fda529f SHA512 d24016b4ae0ffb05be475f86bb8d72ab4a85475655f409b8826dcd69726e048aa048e321f26ac36f2f52aec40abbfa66a95354a711332df94dc3e57e6c396a0c
diff --git a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.3445-Fix-for-building-separated-dynamic-llvm-libs.patch b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.3445-Fix-for-building-separated-dynamic-llvm-libs.patch
new file mode 100644
index 000000000000..931ba4437b14
--- /dev/null
+++ b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.3445-Fix-for-building-separated-dynamic-llvm-libs.patch
@@ -0,0 +1,45 @@
+From 5a07111005b570875da8796f91b385edc483c0da Mon Sep 17 00:00:00 2001
+From: "Wesierski, Lukasz" <lukasz.wesierski@intel.com>
+Date: Mon, 24 Feb 2020 05:27:13 -0800
+Subject: [PATCH] Fix for building separated dynamic llvm libs
+
+Change-Id: I3796e7a925e32bfee2dfda60fbaa3f21122e62cb
+---
+ IGC/CMakeLists.txt | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/IGC/CMakeLists.txt b/IGC/CMakeLists.txt
+index 8634c456..891a3f5b 100644
+--- a/IGC/CMakeLists.txt
++++ b/IGC/CMakeLists.txt
+@@ -82,7 +82,6 @@ set(CMAKE_CXX_STANDARD_REQUIRED TRUE)
+ 
+ # ================================================ Flags ===============================================
+ 
+-
+ # Escapes text for regular expressions.
+ #
+ # @param retValName Name of variable placeholder where result will be returned.
+@@ -3309,12 +3308,18 @@ else()
+         "LLVMDemangle"
+         )
+ 
+-    if(LLVM_VERSION_MAJOR EQUAL 8)
++    if(LLVM_VERSION_MAJOR GREATER_EQUAL 8)
+         list(APPEND IGC_BUILD__LLVM_LIBS_TO_LINK
+           "LLVMInstCombine"
+           )
+     endif()
+ 
++    if(LLVM_VERSION_MAJOR GREATER_EQUAL 9)
++        list(APPEND IGC_BUILD__LLVM_LIBS_TO_LINK
++          "LLVMBitstreamReader"
++          )
++    endif()
++
+ endif()
+ 
+ # ==================================== WrapperLLVM package =============================================
+-- 
+2.24.1
+
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.2878.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.2878.ebuild
deleted file mode 100644
index 03d09a9af2dd..000000000000
--- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.2878.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-multilib llvm
-
-DESCRIPTION="LLVM-based OpenCL compiler targetting Intel Gen graphics hardware"
-HOMEPAGE="https://github.com/intel/intel-graphics-compiler"
-SRC_URI="https://github.com/intel/${PN}/archive/igc-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-COMMON="sys-devel/llvm:8=[${MULTILIB_USEDEP}]
-	>=dev-libs/opencl-clang-8.0.1:8=[${MULTILIB_USEDEP}]"
-DEPEND="${COMMON}"
-RDEPEND="${COMMON}"
-
-LLVM_MAX_SLOT=8
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.0.9-no_Werror.patch
-)
-
-S="${WORKDIR}"/${PN}-igc-${PV}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_LIBRARY_PATH=$(get_llvm_prefix ${LLVM_MAX_SLOT})/$(get_libdir)
-		-DIGC_OPTION__FORCE_SYSTEM_LLVM=ON
-		-DIGC_PREFERRED_LLVM_VERSION=8
-	)
-	cmake-utils_src_configure
-}
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.2990.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.2990.ebuild
deleted file mode 100644
index 03d09a9af2dd..000000000000
--- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.2990.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-multilib llvm
-
-DESCRIPTION="LLVM-based OpenCL compiler targetting Intel Gen graphics hardware"
-HOMEPAGE="https://github.com/intel/intel-graphics-compiler"
-SRC_URI="https://github.com/intel/${PN}/archive/igc-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-COMMON="sys-devel/llvm:8=[${MULTILIB_USEDEP}]
-	>=dev-libs/opencl-clang-8.0.1:8=[${MULTILIB_USEDEP}]"
-DEPEND="${COMMON}"
-RDEPEND="${COMMON}"
-
-LLVM_MAX_SLOT=8
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.0.9-no_Werror.patch
-)
-
-S="${WORKDIR}"/${PN}-igc-${PV}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_LIBRARY_PATH=$(get_llvm_prefix ${LLVM_MAX_SLOT})/$(get_libdir)
-		-DIGC_OPTION__FORCE_SYSTEM_LLVM=ON
-		-DIGC_PREFERRED_LLVM_VERSION=8
-	)
-	cmake-utils_src_configure
-}
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.3445.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.3445.ebuild
new file mode 100644
index 000000000000..7076388bbd05
--- /dev/null
+++ b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.3445.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib llvm
+
+DESCRIPTION="LLVM-based OpenCL compiler targetting Intel Gen graphics hardware"
+HOMEPAGE="https://github.com/intel/intel-graphics-compiler"
+SRC_URI="https://github.com/intel/${PN}/archive/igc-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+LLVM_MAX_SLOT=9
+
+COMMON="<=sys-devel/llvm-${LLVM_MAX_SLOT}.9999:=[${MULTILIB_USEDEP}]
+	<=dev-libs/opencl-clang-${LLVM_MAX_SLOT}.9999:=[${MULTILIB_USEDEP}]"
+DEPEND="${COMMON}"
+RDEPEND="${COMMON}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0.9-no_Werror.patch
+	"${FILESDIR}"/${PN}-1.0.3445-Fix-for-building-separated-dynamic-llvm-libs.patch
+)
+
+S="${WORKDIR}"/${PN}-igc-${PV}
+
+multilib_src_configure() {
+	# Select the same slot as the best opencl-clang
+	local ocl_clang_ver="$(best_version -d dev-libs/opencl-clang:=)"
+	einfo "Selecting $ocl_clang_ver"
+	local llvm_slot=$(ver_cut 5 $ocl_clang_ver)
+	# opencl-clang brings the right slot as dep
+	has_version -d sys-devel/llvm:$llvm_slot || die "LLVM slot matching $ocl_clang_ver not found ($llvm_slot)"
+	einfo "Selecting LLVM SLOT $llvm_slot: $(best_version -d sys-devel/llvm:$llvm_slot)"
+
+	local mycmakeargs=(
+		-DCMAKE_LIBRARY_PATH=$(get_llvm_prefix ${llvm_slot})/$(get_libdir)
+		-DIGC_OPTION__FORCE_SYSTEM_LLVM=ON
+		-DIGC_PREFERRED_LLVM_VERSION=${llvm_slot}
+	)
+	cmake_src_configure
+}
diff --git a/dev-util/intel-ocl-sdk/Manifest b/dev-util/intel-ocl-sdk/Manifest
index 116f7a0d84f5..0e64985d837c 100644
--- a/dev-util/intel-ocl-sdk/Manifest
+++ b/dev-util/intel-ocl-sdk/Manifest
@@ -2,4 +2,5 @@ DIST intel_sdk_for_ocl_applications_2012_x64.tgz 28302946 BLAKE2B 991fe387c3bb0c
 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 2132 BLAKE2B 55650a4285aa867f3fd52396a122eed5cc29d155f2b6c65ed15a7a63f659f442e30318cbfae5c53af30d3d9e377205e8d65d7f04f00751198141fede738fdb4f SHA512 3e519c09f8e9ef63198f0de62ce1a323cb0282e4d757a2e34ed2544b72731267fbf45cf524990cef68b475e3043f27bba80a4b36843f2c33e5cbcfe723e9adb8
 MISC metadata.xml 670 BLAKE2B c3c011abaeab5730cfdc09bc89715eed709910246767fbe5b3c406189911e85ce4f2870740be95f6d1ecb9a0a3d9abeb932774de05742d275c77f1634c1754e9 SHA512 2ef3994dd0dc9ce67b02ea1d5bf5326a8dcbbe21c6a6c452376551cb803825c4cbb721b226c128bfb758b5fb6faf1d04f25c2be2929961888244f861543a78f6
diff --git a/dev-util/intel-ocl-sdk/intel-ocl-sdk-4.4.0.117-r2.ebuild b/dev-util/intel-ocl-sdk/intel-ocl-sdk-4.4.0.117-r2.ebuild
new file mode 100644
index 000000000000..0d0b0d0a8d3c
--- /dev/null
+++ b/dev-util/intel-ocl-sdk/intel-ocl-sdk-4.4.0.117-r2.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2020 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="https://software.intel.com/en-us/articles/opencl-sdk/"
+SRC_URI="https://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=">=virtual/opencl-3
+	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"
+}
diff --git a/dev-util/intltool/Manifest b/dev-util/intltool/Manifest
index ba97807f1bb6..8fb4cba45c4b 100644
--- a/dev-util/intltool/Manifest
+++ b/dev-util/intltool/Manifest
@@ -2,5 +2,5 @@ AUX intltool-0.50.2-absolute-paths.patch 1798 BLAKE2B 9648c96b7f4a65a19e6e62ee5d
 AUX intltool-0.51.0-perl-5.22.patch 2184 BLAKE2B 8655ee9b830828a9a0fa8841b02f1c3d213331b11bae8724d5a6767b0c3cf157959e8efdc4fb62d4d4c2ca07c712ef8ac391463304ebdfd745c0e5891d7f3aa9 SHA512 ca125f5284bba789139d9733c79c077074cbeee7e263ce98953868590e50d32d80b94935eec7965f1c2817388e0fd8e1d5c87a9faac7936c9ee7e8d0b5758177
 AUX intltool-0.51.0-perl-5.26.patch 586 BLAKE2B bc79617f7cd22794a06c93a63a3fa9ef2e3337c8b1488207ed08e11e340a726f3979703450b580bee2f5b482366843f44fc0e4d710da2eb4fa4f98b60e3b2eaf SHA512 86fe1b795118975f1930535d9bb7d01564852546fb234bddadbc4a5ac66ccf6a43c9944ede1ea72dc6c4296dc8db3dfff4ebd1989dce57e623689be444c8e591
 DIST intltool-0.51.0.tar.gz 162286 BLAKE2B 98fe40e4d669fdf65a777152ddee0a9656412b9cf5d1e682d1b4b7bd666f3e5aa623a50481b6df47e16a935550836c66c666229b0bb7ef143f7cde6893b97a69 SHA512 4c93cb26592ed0b1622d3b7800b5d6622ffa36f58ac73f2ef0bddfab522565fdfb8fa73d81914b9a202f1d62bc995a08960f8adb9f62c86918e75498e85fbfdf
-EBUILD intltool-0.51.0-r2.ebuild 969 BLAKE2B 0f0638344bf9b50b2010e5315f932ec557c00c0cb982df2178f63d5432fd1424aca398edef1f2023e7f221d2a201fb0ec0c0a306d68dd172c082624d6897ce45 SHA512 91a0de1301dcb2df994910563cf704ffef64cbedcd1a1106ba7bc1af566c54209e963d0d1d34426df479415ce0bf2be0dd7c1e5da8d1f194df2018d0511869a6
+EBUILD intltool-0.51.0-r2.ebuild 967 BLAKE2B 193b5532c0add3d00de19a6bf74f0ea030694aca5ddaa3d7c007de55ee1b3eab0d842fd2652843d5bef698ce6acfbc63f8abc537e9b7437d2c394b1a9848f4e9 SHA512 867ed614c60963739d5c15d4f8a705d1176ac833cb8e2a71b8872ef2da28eb3eaddca6f31d996cd43925c2cb917895111dd5d629cab6b5afade10a493c5c1ab5
 MISC metadata.xml 304 BLAKE2B 87e449f29a87153e258fe194afc64202ff133f6a8bdf333cee64d907246348f504133bc8195e005039647deb28680f5762068770bb09126328aa9d9b7e76bde9 SHA512 e9f0bede4c5ab13dda61ae7ea0f5d39988373388f78a05b08f4099204154160ab0d88d21989a8bf8249aa98448744969643e118883c418968c9030a6919a9727
diff --git a/dev-util/intltool/intltool-0.51.0-r2.ebuild b/dev-util/intltool/intltool-0.51.0-r2.ebuild
index 7047142c73a6..fa973f4b8df4 100644
--- a/dev-util/intltool/intltool-0.51.0-r2.ebuild
+++ b/dev-util/intltool/intltool-0.51.0-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh 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"
 IUSE=""
 
 DEPEND="
diff --git a/dev-util/itstool/Manifest b/dev-util/itstool/Manifest
index 406727e01e02..a1fe1e96ef44 100644
--- a/dev-util/itstool/Manifest
+++ b/dev-util/itstool/Manifest
@@ -1,5 +1,3 @@
-DIST itstool-2.0.2.tar.bz2 96748 BLAKE2B 7eb8f52c233878a35c01b7eea51c46f9700e9de827d38df41bb3ea78ca4ef284ab59c423aaf9876fceef023cb9d13d2d50c9ab57caff9e5fad217363412cf472 SHA512 b7915c4d463fe5969e282029c2080730c78e18d2d5878da53c6a370f471056b51a7b3f3c08417b801212ba674f55548a112a12a9d81634f60d1e52a8a47a4aa2
 DIST itstool-2.0.6.tar.bz2 103067 BLAKE2B 72d3254cb88ef9d02f9b3509a46c2208e98bf6327f139e5d29b99cc6d80651bd41ea3bfb78e48e23cf7c217770cd8c6c74b00946ad9d2608a92925e43457edf0 SHA512 51058bdcb208f6fb84810f71f9bf67e42b00bf157a9756be45f060849c0aff36f695f4403404193720d4446818fa77de61fa94eed9e8789d26c07a2926072eb7
-EBUILD itstool-2.0.2.ebuild 870 BLAKE2B 45e161c7bfa072db3057f5d1a33ffd3d02360cc23702fe337fb208e6a4fd90d269d6af641ccb713d0d78cf0effe1a67ff4ab7c30f6cf80e602d9645a9e6171b4 SHA512 f663b0a482419ac9bc0223939a9c4c5514b779d487b380766c8ce99c50cfc62fbbc21256ed8242dfd59617635c2129d7182a72d88c18309a8e6bc53606349241
-EBUILD itstool-2.0.6-r1.ebuild 915 BLAKE2B 6c071f9d6e7b5cee14ebf5e4f7a9f27609a690b0a3a3266bf3cc6dcf6c9592f5ab872a57f55b2ce836136a19a5c69dae86fdbba3b5a941aedf44bb7a6a5a8583 SHA512 4cccece82e692b9f0af87ef43ce11220f9d1e4b5e1438c6a2e701510eadb08e93fc1e2b95422c9f18e5259675fd27de935141328d370de0b42663fd80f746552
+EBUILD itstool-2.0.6-r1.ebuild 912 BLAKE2B 3641bf2b38473fb68390dfdd52b635b5bce0eedfa0fb624c2349d4417f9f7c46e91d039a56d21a08992094b45c77b708ba5c2a4b673c515e395bccb78850d3a8 SHA512 78abde8cad4ee509b3e30448a2f63f1a413e9bea724eba931622e5aaeb5bd6521f0384501f348d2a7d19b221e2373f7f5cba546f956cb7e7f22e3430a97b11ae
 MISC metadata.xml 525 BLAKE2B a7e426bd9dd273bed10ad74315547eb758df04ceb7ee6ef66f643ba23e60ad8b9c80aa344688e4af7a16fd699a500cf7ceb9d24eb94a930eebf1637e09919a5f SHA512 ad9928fa0359257e3418c0fb6bba6c416fc4505911f35e97377ef7c1426e228b34312fc3156e98f3657974f1156ee2bdc58bbb4b51903bb40b10c97b0714b39b
diff --git a/dev-util/itstool/itstool-2.0.2.ebuild b/dev-util/itstool/itstool-2.0.2.ebuild
deleted file mode 100644
index 2606e551b647..000000000000
--- a/dev-util/itstool/itstool-2.0.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-
-inherit python-single-r1
-
-DESCRIPTION="Translation tool for XML documents that uses gettext files and ITS rules"
-HOMEPAGE="http://itstool.org/"
-SRC_URI="http://files.itstool.org/itstool/${P}.tar.bz2"
-
-# files in /usr/share/itstool/its are HPND/as-is || GPL-3
-LICENSE="GPL-3+ || ( HPND GPL-3+ )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-linux"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-libs/libxml2[python,${PYTHON_MULTI_USEDEP}]
-	')"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	DOCS=(ChangeLog NEWS) # AUTHORS, README are empty
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	python_fix_shebang .
-}
diff --git a/dev-util/itstool/itstool-2.0.6-r1.ebuild b/dev-util/itstool/itstool-2.0.6-r1.ebuild
index d277093282fd..9dd83ba8686a 100644
--- a/dev-util/itstool/itstool-2.0.6-r1.ebuild
+++ b/dev-util/itstool/itstool-2.0.6-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://files.itstool.org/itstool/${P}.tar.bz2"
 # files in /usr/share/itstool/its are under a special exception || GPL-3+
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x86-linux"
 IUSE=""
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-util/jenkins-bin/Manifest b/dev-util/jenkins-bin/Manifest
index 0579ab74eb8c..d40b5df5bda7 100644
--- a/dev-util/jenkins-bin/Manifest
+++ b/dev-util/jenkins-bin/Manifest
@@ -3,12 +3,10 @@ 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.190.3.war 78247363 BLAKE2B 99d4c13236b4b4f7308c7993033d1e5f9dd2fd9926febf52ffdacea595fecaba0d0eb8962761d8a6f983eaf9738f8be1ba4df785bb2fe6b613ac8cadcc618e23 SHA512 4ffa2ce3be4d55f0df8021026115d9ce8f1d0f4faa16eaf9f327ce17105f61731730c2a0124fb9af5d8c16c8fee9200f9b785b23856896e292a19f5404a9d2c2
-DIST jenkins-bin-2.204.2.war 63422555 BLAKE2B b39c46c81bfc1f6cfbf930fef0125d7a335784a8c4638d54b76986369c17e9308dcd023782cdee414c2302fdf2b002c24731d8f9eb36ce24196887bdcf054916 SHA512 923ae49caf5b3d2054cf698badb31ea2c4dd4420d6c6488b389a6c62b9fc6d841e672d71cdc8b0c6152ef5ea9b921570a32d0466a423d76d83eeb96effeb0998
-DIST jenkins-bin-2.205.war 62738246 BLAKE2B de350469e3a6e0d93f6d05c38f7669ce630f01a0284db83a0ba002e15ef712b4dddca6dcac804ab45c898f5c73cdac99bfe9b9bb99f6534c1446d8f4545660ec SHA512 1c0b12cdf7dadaba8d81ede769f76b059c7869732610353658cc928dd8c4943f8cf8beb15498a0dd4e064688cfdb7f88faaa9165c6da97c20d5e99080a12f413
-DIST jenkins-bin-2.219.war 66378696 BLAKE2B 82fd19d4dc00d81d1b9798c795ab4ce9f0d3c6d36f1e048edd1aae41d9e239a260aa56f116e478dc13abbdc59e1c72e4f3072628e17e0d0280ddc7bd0efca919 SHA512 f3cd84fa3e99c291d0af0b80de0f43e41d762b1b1a2133dcd589694fa6e1a2a13a5d82992c06fce7a41952db2f8b553a822cac79f7ee9f7e646c9640a428d753
-EBUILD jenkins-bin-2.190.3.ebuild 1105 BLAKE2B f7a952c5ee25eb45ece299eef7ff68bda7794af0b353cbaa870397f80bf018ac17b9bff1795278b3786bcbc4b0010b0fb6bbac62c7c78b939ef0d6617bab06a0 SHA512 23407545cfce8da7faef840493908e1eadbbbbca816de39766623b140743592d9aa9d7b0aaee886f3c92fa4ccf0a7e4e65f8bc901df2203402030fedf69c3cec
-EBUILD jenkins-bin-2.204.2.ebuild 1105 BLAKE2B 161bf3f0ad77e74702cfdd1db69cfaa54f6e267e814b358d3fdcac2ca5c7210410d1cf87d03a9e6f987d2ede8459d37f6bf352bc2a7fcd7f2167edf81542aff9 SHA512 d86e52237449bda33bc052d7b1dd3bc15306c4b771c485d34843973a7a7df6c0d0593ab156837cc64a018466222fd0c09bb331bb5c820807f5038300517e2283
-EBUILD jenkins-bin-2.205.ebuild 1098 BLAKE2B 2f3db1567a93bd44e04e1441a0275204c628e4e197100362aa9f3705b3bbe911d4e34e19d1c40dc934df1ca7f8d865e339593d8ee4d13b7220f89aaca8d3f6ec SHA512 7f02c505993ea3293284583f07ffdcf1a47331fcb8b8505da9b40b5d18ef81baee7cbc0eb750f95acb01e8680a62ec96547e8a36b8adc0d812d67e64bfa2960a
-EBUILD jenkins-bin-2.219.ebuild 1098 BLAKE2B 0bfaac37afbe842e4e1a5572a0f56a77b4bc5915be4cb9a79cd7a56105562e8877c9686a2963c347c2feb06dea8e4aad271bcda9a9e50f17433485f189d39981 SHA512 381e5dd3c921892b0df7497fa6028ced0df8c84a2a0731142c01023cf2d63d60233f24f19e62d40699c606ea162210f54641b6742ad63d6a6c99bd29b24c0835
+DIST jenkins-bin-2.204.6.war 63478210 BLAKE2B afbe2a9c0f54a006f372549db448c66a07e6d1ab6e07f0795abf730cb0c6e4ef478c6a7f1091d61720fe5f543a06abfc0861d16bd5442f3eb3410a9a5f1c8e34 SHA512 640c75b9346e5eb28ac24c7def72eba69c0b664a14bb04fc3fb55d307e63b1edbd8375e6ee1fe002b1773b1aa62d926eb658d4c34bd6dfa815254c8d5dd23ac2
+DIST jenkins-bin-2.222.1.war 66288019 BLAKE2B 53d8c1edfc9670d6690af881cfa422baba1ba7ebff9f378370eda85655d3d08b109ef02cf5207991f9c2c825f46658325bb3d936addcfb0a43be5b1780cfd282 SHA512 3db18c6cbe903f09a743058f63c372a9daa7b9193e6693240ad0b3b573df4572ca88fb28040be6e5af38e888132ada0d333dde65c74a56ed615ee4fc41d25d99
+DIST jenkins-bin-2.228.war 66137156 BLAKE2B acd1414745f0ffe12ca3025149d5ef8dcdebe6415e54e18f71eb4ef05bb578279409fbf5605763d86144726a82057ba796ea8ce3b79301ea33ddfed1f03ad9f4 SHA512 899c5838cc46f87020c18b0863b8f160c22b0422e7adec1bfd48dce5f06264b5e33ec8411bf9133e28fa8723daeeb5d2cd14a92c261d82e2b2b804d0b1c21250
+EBUILD jenkins-bin-2.204.6.ebuild 1105 BLAKE2B 161bf3f0ad77e74702cfdd1db69cfaa54f6e267e814b358d3fdcac2ca5c7210410d1cf87d03a9e6f987d2ede8459d37f6bf352bc2a7fcd7f2167edf81542aff9 SHA512 d86e52237449bda33bc052d7b1dd3bc15306c4b771c485d34843973a7a7df6c0d0593ab156837cc64a018466222fd0c09bb331bb5c820807f5038300517e2283
+EBUILD jenkins-bin-2.222.1.ebuild 1105 BLAKE2B 161bf3f0ad77e74702cfdd1db69cfaa54f6e267e814b358d3fdcac2ca5c7210410d1cf87d03a9e6f987d2ede8459d37f6bf352bc2a7fcd7f2167edf81542aff9 SHA512 d86e52237449bda33bc052d7b1dd3bc15306c4b771c485d34843973a7a7df6c0d0593ab156837cc64a018466222fd0c09bb331bb5c820807f5038300517e2283
+EBUILD jenkins-bin-2.228.ebuild 1098 BLAKE2B 0bfaac37afbe842e4e1a5572a0f56a77b4bc5915be4cb9a79cd7a56105562e8877c9686a2963c347c2feb06dea8e4aad271bcda9a9e50f17433485f189d39981 SHA512 381e5dd3c921892b0df7497fa6028ced0df8c84a2a0731142c01023cf2d63d60233f24f19e62d40699c606ea162210f54641b6742ad63d6a6c99bd29b24c0835
 MISC metadata.xml 397 BLAKE2B b1a7fd87c8d5857ab102ec3d3bf5830c26c6988bb97caf89018b05e159f038c9c3a092b4f35788929d05042ac5cfd694bd03a8381686b9472880d0d205a451cd SHA512 4087fd799f4019f09103fb32d7f120e74d94715205bcc66858d11b9457774acaed37f3ad97ca0328f4ec28230a409dcfb0cbaceec142eb0a5fd3241ca35f8810
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.204.2.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.204.6.ebuild
index 8ab8d5db213a..8ab8d5db213a 100644
--- a/dev-util/jenkins-bin/jenkins-bin-2.204.2.ebuild
+++ b/dev-util/jenkins-bin/jenkins-bin-2.204.6.ebuild
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.205.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.205.ebuild
deleted file mode 100644
index 7d232cbccacd..000000000000
--- a/dev-util/jenkins-bin/jenkins-bin-2.205.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit user systemd
-
-DESCRIPTION="Extensible continuous integration server"
-HOMEPAGE="https://jenkins.io/"
-LICENSE="MIT"
-SRC_URI="http://mirrors.jenkins-ci.org/war/${PV}/${PN/-bin/}.war -> ${P}.war"
-RESTRICT="mirror"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE=""
-
-RDEPEND="media-fonts/dejavu
-	media-libs/freetype
-	!dev-util/jenkins-bin:lts
-	>=virtual/jre-1.8.0"
-
-S=${WORKDIR}
-
-JENKINS_DIR=/var/lib/jenkins
-
-pkg_setup() {
-	enewgroup jenkins
-	enewuser jenkins -1 -1 ${JENKINS_DIR} jenkins
-}
-
-src_install() {
-	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
-
-	insinto /opt/jenkins
-	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}-r1.logrotate ${PN/-bin/}
-
-	newinitd "${FILESDIR}"/${PN}.init2 jenkins
-	newconfd "${FILESDIR}"/${PN}.confd jenkins
-
-	systemd_newunit "${FILESDIR}"/${PN}.service2 jenkins.service
-
-	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
-}
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.190.3.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.222.1.ebuild
index 323b88955105..8ab8d5db213a 100644
--- a/dev-util/jenkins-bin/jenkins-bin-2.190.3.ebuild
+++ b/dev-util/jenkins-bin/jenkins-bin-2.222.1.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
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.219.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.228.ebuild
index e3e0cd1a4eda..e3e0cd1a4eda 100644
--- a/dev-util/jenkins-bin/jenkins-bin-2.219.ebuild
+++ b/dev-util/jenkins-bin/jenkins-bin-2.228.ebuild
diff --git a/dev-util/jfrog-cli/Manifest b/dev-util/jfrog-cli/Manifest
index f07248517bc6..bddcebb65d53 100644
--- a/dev-util/jfrog-cli/Manifest
+++ b/dev-util/jfrog-cli/Manifest
@@ -1,3 +1,135 @@
+DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod 34 BLAKE2B ce54a247aef91043830bdf0603c8452ba38eceb1495af6e7a74c9119234a0dc5cd080cb25258c28f5e270acf91189a5ed33e361cbf17de2be5e37dadbda1d90d SHA512 320941bc3b7fb8bc595e6135cbc513a7583d129f0cd92508055291e141191066303cf75148e25198c21f6c6c539a790ea3210f3ecf5de6a2a03b70c753091146
+DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.zip 56132 BLAKE2B 5edcfe991d7fc40094d637bae8d8d6f1f897ab3d3786ade2bb80287738103264520681ced8d30d2037253206c32d3f867f4d024a571cb9aad030ebc451e198eb SHA512 43ed64ae515738487e9b75a2290d0b2bc25e83c021a9f29b21487c37adbf34e74e1e7d3d5ec0dfe678c8396356f95c3993a5f5610d1791ff62056cd182a4272f
+DIST github.com%2F!vivid!cortex%2Fewma%2F@v%2Fv1.1.1.mod 35 BLAKE2B 7b5030936400bbff37dc3e2c1d6b7224df6d5f5f97a2e22fd1dc08f3d6ef08894eec30004589dbe81e56a9e71b3ca391e088996a84c98ddabc4d934db7c9fa22 SHA512 e6d91e44ed614c66a668e8423e7657d0696cdd5c6fc0fc4d6ecf741849f1e4891e47262376d4787c967c88c907c5bc668d437d613afaf628fcbbcb352f5d2033
+DIST github.com%2F!vivid!cortex%2Fewma%2F@v%2Fv1.1.1.zip 8064 BLAKE2B 3fb2dca3bf31d7c8e0bfa67193ca30e7ed76e270fc6ee5e1f1acadaf5be7047dc63afed2f4e55a16d3a641ebbcb8111a6a580b91964081b3e3621e8d62d70f9d SHA512 0a6ea5758fd0d42e2ce8366405eb0ed42da5737c830b36a9cc24cf99541d7d7760a2ee868c99901fb9a103f8113183771f0dbe139deac3667222692c4d025eb9
+DIST github.com%2Falcortesm%2Ftgz%2F@v%2Fv0.0.0-20161220082320-9c5fe88206d7.mod 32 BLAKE2B 9bf3bf45ceb1891fcb6ecbd977b3968e249d293377508fc645c3fac44f8ebfa0e6aac924836fadc02888ac771c7d641472c2022a31f3c3b068ba94b0dc0e27cb SHA512 678d2ba568fcff09b59e5110b204af334fa1a8357e14194b88d67bc982d4eb3d9c26000fb6f2d51e2a2ce2424681c7ff203b98a5cd3d0fdcb32145a5f05b49e6
+DIST github.com%2Falcortesm%2Ftgz%2F@v%2Fv0.0.0-20161220082320-9c5fe88206d7.zip 6229 BLAKE2B d323214228551dc39895094d5b14844455ee189c8fed81fbf6bedc54a6b4d89bdc17868ac9ffe6bb7b4afb8d7f2b07472bc32147d819daea80720417105d94c6 SHA512 43b0c75102ab46b13aa65072da441e775eba55ec7d7b8b5a8f298441664750d29cfe4301d10b63b2cb5491517881a6647f7725421c4b79e9cc08ad899b718331
+DIST github.com%2Fanmitsu%2Fgo-shlex%2F@v%2Fv0.0.0-20161002113705-648efa622239.mod 35 BLAKE2B f41c90b71b4b9e1876a13df9703b57f52ec6d7fd4258a7c44bca15c12310b512e400b32715180bfbe4726887aa7284fa21832ca9f9eb1dd759ee7d0c627307ac SHA512 5a93ead508f4f5e229e5d0e59dc820840819d9b32158ddecf2d6dae7ee96ce92af6bd80d18a98e437cbdda5de6df6cac03f7b535017fa92ef868dcccbc6e1f27
+DIST github.com%2Fanmitsu%2Fgo-shlex%2F@v%2Fv0.0.0-20161002113705-648efa622239.zip 5273 BLAKE2B fd47f46372a66797bb7028a856f903e9768589b550f869b80cb271fc6ae602f57fed7a296cac6ca14d668d4220f2c3f9f6e6e67bf23801ceed6b2b8e3c8a4494 SHA512 7002be4436a93e90cf69cdf16b92d93b4651e3f18bbae099c3780c6b8abc24363044807dcda3d943c0d6f6fb5f428effeea6a3b8e456eb151b072edf5f4fbfed
+DIST github.com%2Fbuger%2Fjsonparser%2F@v%2Fv0.0.0-20180910192245-6acdf747ae99.mod 35 BLAKE2B 87fd74b3a198f0c8a9897797611b73c9017378af758bc559464b3e91a6f57ecc39752ad6ea9d73ec0df128a794a3caa6384cf1092808275fe6a55731b6f0bf8b SHA512 082d6dfd13dc8bbe32bb5fc0c8c7e0e2d8fe412397df32f87639179374e57eed96f7eea00a3cda8c0c9a78b354f9275c0be3fcea4b6c797aa627dec71870a41a
+DIST github.com%2Fbuger%2Fjsonparser%2F@v%2Fv0.0.0-20180910192245-6acdf747ae99.zip 57658 BLAKE2B f1090d733f65d8093ab33c4fdd59d267ea84028927f226da468cb3ea7c2c9efb55913e6d4e7af988f158ab90264e7985546b09cb9e675f88117b400bb0b77c59 SHA512 0dd1dcf993cac38f2b2390dbd33c683bcc7206acf2b5afea3ff9bfb27442c5775ead04e3ecaba27b1370f33aef92cca6934df21e13ccbedc2e59996dd8089cf1
+DIST github.com%2Fc-bata%2Fgo-prompt%2F@v%2Fv0.2.3.mod 35 BLAKE2B 275030ee2ce09666c11f6b20ba9d787119ced543b4e3f310900f5030544e956af15b407003d01849e807f0c8c256bb709619fdacba8c19b93e4806be5a1ae5d8 SHA512 cd905646c7ab3d19d41de121be3c8630c40ac2c55ca77b73afab555c54d1130f7c41c966ad91b84744fc2d52cbe3f6f7e7d1f2f9db5c8a29e7c799ec007bd4b2
+DIST github.com%2Fc-bata%2Fgo-prompt%2F@v%2Fv0.2.3.zip 57200 BLAKE2B d6a5743b2c4bfea6c13ba74cc881be287dcff718ce91a7b203d66568e3d1ec79a9f96ae0aba33912450635fc3012e5e7fec27b9fc24fafd47062c4d2aed4bbd2 SHA512 d3c2fee999e1e3969175581e12f46f106ad5625710e53b96c0721ede4bfe882d6d17da32eff770b531e12d2c72aa02b64c908535ea6a10053d22d3f2db4852d6
+DIST github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.mod 31 BLAKE2B 683f04ea11a77fcee27cfc84f41a1974ca6d61ee854dc77f072493358099ec03e94f01b5cd5cbb5ef69c856dc36790b660a3e90d7d520fd553e572f1b01a2304 SHA512 0e40cd7ff22a86cd23b49b509f5b5653f67e31ca67a07ab82743f56e5504f126cb2c11d88da644afbaf024dffa657560a420ec6d82f6b463452ad8a8bdb576d2
+DIST github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.zip 5802 BLAKE2B 7e7b32a77adacd47318e42255dbbb59c85b38dbd3f80adf2795ed3b2d01ed714e8c6f1139b91c6ce19066414acd53eed14762806f28b6978bddb918fe756414b SHA512 4021b26f08a3fb25b71a3191445c9be56424f3f118f5a4839ee8957a9cabeeb33f8d5e4735ffdbccc20b84b45e4a61d3da9c2ecb6cceef6638901143bb6ea339
+DIST github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.mod 34 BLAKE2B b1e2e3052b202324b63ddd8e580c76da40ff0bdf1df2e9e2f3d7b2f5287d75469a544e1a586352130ce636bb08c9d4ca517f0fd49c892bc17365412cb791dcaa SHA512 c0d4f293bac15a26df2433bb909794b75ecbc5cb4ffdb33a8fbf3c8f421597780eb6bb036cfb11a8346ec959ceb8e36efa8ebb84d8ebbd606485735ba171f98d
+DIST github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.zip 56640 BLAKE2B 4a31c288981856d09a5a4fcf4f0b8223502952284ec1e2ae698214e2f950cbf618c3a938096bba4f8f3531b8b75d62c17396ae7a5b7a29304c138e32f4529978 SHA512 e63fa5b49cd41a7166b01167bab86540635ea079a36763e559da108046923897adc43b0ff7e19faa7060e0580b2042981c9a32d10ffcdcf6fea1f22eaf32313c
+DIST github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.mod 30 BLAKE2B 9ec507e8410331513ba11ed5432f95b9141e41125975204c2dcb50b5fbe6f7117430ed9b1b0df44fcb45843f75ca862070f85cb40a5c4f6a8d13c066d2d6741a SHA512 528f23910ca94ddf6f811331dc7ed615b2949b2cb04c630e4e2b0ba4a6dadac1396268c4c3251a77af25db3e94dc8b0a0a66d365a8d3feaa78f31192a40e2556
+DIST github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.zip 5024 BLAKE2B debe8a3f8f81708baa936e0b9c2acca92d41e718efd59a605a5352d8eea7918211c89dce1a093755bd6b051e78eaff1036c86ad48c7700d1e332c4b83a8a44f1 SHA512 05859e1e715542b64c7d63789b447f971f7cceb6fd01bd78e661891acdd94da873ae6d3f612748fefaf9507d374b62526fcfe7db5655cc297c07208bc9f22bc2
+DIST github.com%2Fcodegangsta%2Fcli%2F@v%2Fv1.20.0.mod 34 BLAKE2B 7a0262643eb160a5f679f4599cf391a7c76ec183874b69c64483d3255a0baf8a68578d1a1d160b5b947c28b124785a2209e9f1b25dbb8cea15cd58e0df481560 SHA512 ee383b82e3fcc05ecc8b39399b1dacbacf3ea7e89e00569c682d565da000a46e79d8cb330d1eb7e483508c0d0f152033df9d21f6f71f5fb6fc3834d50655111e
+DIST github.com%2Fcodegangsta%2Fcli%2F@v%2Fv1.20.0.zip 73185 BLAKE2B a95637f817f28d8f0bf474bca38ae9c778a6bd9d27fd261888d0627b39e59c2bcf97d5d1584eb78d2e858492c88979b00d2506078a78432fdddaa0e57b9e8ff1 SHA512 f13656ee101090479ac7a98e2c0afb76e0b1216b2b20d261515fcd4155543ea7cc3f223058d0d491a5fbbea523b599bcfdf76483191cf03e7473e7105bb584a0
+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%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip 60320 BLAKE2B 86bdbc333e5c23ccf4f805945ca9f2aecc5c242d2ae824d20127eceaa2bf7bbab239ff2799572a2c8fa206166a36e97d5eccc8fc5021743d8ad32f39cd53b9eb SHA512 7b4e4df2fea731e23e05437f26f24e32b2e99028d685b72e3a726c1cb616ada4a77ca4fb9db4a6fae48178cc5172e724b74499bc776d63a9110cb97377d5edeb
+DIST github.com%2Fdsnet%2Fcompress%2F@v%2Fv0.0.1.mod 230 BLAKE2B 26d8e2a5e9603273dd84ed9aae1bcf49e1fece530a5dc41cae3b5d2ca8bb4288023ac8eeedd0ecc76fa355bc9dd808d06196db03ccda186df5184fc6134e121b SHA512 132067629eb47d7ba22dcedd81467693f7abda7b050244bac8b8ddc9f8dec5d1ff4fd64a6ed0ed1537f400c516594df0f3a2aa392258dfc817176e4030f81cac
+DIST github.com%2Fdsnet%2Fcompress%2F@v%2Fv0.0.1.zip 10103918 BLAKE2B d484c7a50585a27d9910c4f9c4c0f179346bea4f373c0fec5b6af24205f69ca6afc4dda6f9b069f23617487f8edd7422379478d88a5a1e113104098fb2476cf3 SHA512 5c16e51cd71051795ca20e338b3eb4fe17e423fa26c4e188d966761ee7d23cf5b21d37a6cca7faf8f31c3110289d2da4e18e6777b8b26cc69563b244d94fc17d
+DIST github.com%2Fdsnet%2Fgolib%2F@v%2Fv0.0.0-20171103203638-1ea166775780.mod 30 BLAKE2B 3601cf72262d9c828eff3520a9375eb981b2a9193aee46e93406d491cb8db7b864c3eb32f65f02b75284170856b2264a1a24cc63196695e58365210b216cedbc SHA512 36ff5f52bec7fbf395cce04f20bc61cbe4e5f77ed550a5a869967d1e145e2dcd8e7bca23c3cf81882d8f7053e566dd95e78e97cdcf06c1556b78a5b9b51662d1
+DIST github.com%2Femirpasic%2Fgods%2F@v%2Fv1.12.0.mod 33 BLAKE2B bf061bb336cde22e7cbf1abc36be47d4d272c0e454ac2cb60c55e33976167d75571cc490dd73761e31e597f2a8daa8244ea4d05a55120f6038dd2abcd1bd4cd4 SHA512 ff65ee51114426fd17d1a36b6e7fa5b37d9ec0cec79b6eee9041f3506373582ef0208f33131ab27e0c4d20a13fc9657e55921a704ce5df1ed3bb7ba8f28a9e76
+DIST github.com%2Femirpasic%2Fgods%2F@v%2Fv1.12.0.zip 148704 BLAKE2B 10ad3722d4a9d021df0f6966c2c814e5b494eb58aa0c7928f32c6de54fbef4f92aea690def61dd9ccffb014ed7392a15fea713d17f862f57e46851a6d2af40bd SHA512 1cc850fc9776273855dc7816d96062e676ef0e53458ba9f156e69d58020f1ae64be7f6a8c1adcc4160aca5b3c86d6d8ece9291ac04b2280ecde12306b32e55ec
+DIST github.com%2Fflynn%2Fgo-shlex%2F@v%2Fv0.0.0-20150515145356-3f9db97f8568.mod 33 BLAKE2B 2c279a40bce4e61e5aad9d25a1c374b6c154586c296cfdfd56f52435c7739c8d9a8958e19d6da8026c2a03b728e0cb9bb512d5c094aa6111f9b10af24ab894ee SHA512 2bb0f125a91c8f92dc1cb5ec16441b27027585606a3862c216434b76324f3069941055c4bdc98372547543b095a4014155446de1be98264842504450121c941c
+DIST github.com%2Fflynn%2Fgo-shlex%2F@v%2Fv0.0.0-20150515145356-3f9db97f8568.zip 9718 BLAKE2B 1e0c02ef1bd74bd1ee2b8eb2752428274657d31781042fb3fd14c6c1a9acf15d64a427b08fed6cd34f39de28e44f23cce4bb330dbeac1a8e6ca98598c463a748 SHA512 d7b49daaa77088d1fcc932e1a3cbb2e85302e6b3e486657468396e407fadb69b28763cf5811c0c1c60a8f02033de2488035b020a0d2aecabc75364526b429e46
+DIST github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.7.2.mod 121 BLAKE2B 023fc722091ade6051165a9058ff74674f43aeea249b530be92b7f05534f0b0e738a7dade302f6733e29315fcfd34bd0d8c7554795b524e596a408e248051d12 SHA512 151f687b4d5c2b5a8fa26134332222105f40422530e49930b4533831fd5a0133ea7a8038f2d851196dd615b658729a10ec42d0a6efb15bc3abf55903bf42bd49
+DIST github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.7.2.zip 43121 BLAKE2B ae8c0baab3324c9d60363b216e00ccd5e27b746ddd8a3b1b231f9f018dce8f3bacf5c2f9a8f1a3db97fce8db290d05f7c397141d278d585e0e44f0bea099549d SHA512 8f4610eba24604d46bcf1f9c4c7da0723a99f37224c298022823160d14469b85a911a6d18b8f084aa2730dd100721e52a8cd6bbe0215d72843daefe0f79fb141
+DIST github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod 36 BLAKE2B 2b77fbdbb6c6c20767c120b390fbd2992bf79dcae0a35c27121a6e755233da3ecb7d74e74c38c0a2463976b546ed8bbfb8a8d8cb140526dd9a0c4f524cc131a4 SHA512 5749d33fb085d63b7c12f43df824c96f168323cf6d88cfea3e2536eeb7b56689dab9dddb8cde1ec8bc9c2848e7148b8a37abf8523a99c55ce10f896245c5f341
+DIST github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.zip 41278 BLAKE2B e0b440a81efbe3c7c16ad276b4509652fd58bc94cd162b9ab13bb37c1e6edcd561e3fbb999e55619d58c8e3279b785b8eb67fa4e200b38fe6fcb60f0918e6e8a SHA512 9b1075ccd3d1f53773db97687e06fb777741d6c3b228bcc329be580562fb3c34006768eb3f989f92367ca116c597140045b3c345fe36065f5015d1d4652633c3
+DIST github.com%2Fgliderlabs%2Fssh%2F@v%2Fv0.1.1.mod 33 BLAKE2B 18725478b6c6a565e4adc96f4edf09f8369553b8b6523f36f8e4733ae64eb9a859af67e14646e61d2faf5cfd651ada0a6bb2bae455ba6bb4570c92696b31f23c SHA512 e6592e0b4e0c9f344378efbc06365296f5978e173421824512ce6f8921212691aad2f35e73ff4562c72014897a4992b7b3e56e3c424a82159747f1fe328eaf50
+DIST github.com%2Fgliderlabs%2Fssh%2F@v%2Fv0.1.1.zip 30134 BLAKE2B 07218f941f9f4f99f08079a18c9429a1648a6940aed9235f902fc42d2ad6a69f1ea829bcc45a134de3883e0a9a5ed2bd8527b778c6f120acbe32b2baafee353f SHA512 e2d91cf1c5efdff4703f4b2c10e5662f112aa3d085641d178fb18de2ec13ddb526d4850979e658d0759faa445de6f91bb0c38371b264afb2fc8dfbb83b765abd
+DIST github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.mod 32 BLAKE2B 8b498b103962181cf69cf5de686eee1a7f0e481ccd35430e33999c951b91ebb98e9dcb1dc9c4e40cb379fe4abae40a47eb36d9456fea076e44245022552d055a SHA512 c9faa5760addf2869df9a3ec5ed9da02944823afc5be93b8b6193c43261d167cff2aeb65bb844d959d368ada83932c86056aefbff799be326e889d3de4c2b8f5
+DIST github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.zip 69641 BLAKE2B 7d5306ebb893e705188699f7b5e690c375bda9e0ab4c904aec10560dd75f278016c9f69ce4973260a4e5a8d8d7dd7c2f12a59f98e96a4456af6f23fd0db224c2 SHA512 fa400e3e1b6f57e29c93ecfb1dd94ccb1e4e4924f3b62ae125ad0bd88d56b5c48080ad78dbf545c1056bcacf860b93363a27780dbce2b812c5b58ca3c74fd11e
+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-cmp%2F@v%2Fv0.3.1.zip 99651 BLAKE2B 14632f8da685fecc046b2cc9e61eecca02e7bd4720ebb1d3cd01a299e59d47cc604abc57d5518e18dea69785e3d5d539d87da211279e238a78dd23e3d7f8c7bd SHA512 4b47aa3677a464af17f3e320f41f59e775b45f04cabf2cf749e00ba1aa97e27ee78a07daad347bac4b5c41e2c430634fba57c6edbcd7ad405b5a084142871362
+DIST github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod 75 BLAKE2B a44a3c2185418f331e2648bdef36882414dbf8416884b8fd385b7e926c9b837d317322a433e7312e14c27eb095cbed26a74eec9822f0f063a2d14e753031f632 SHA512 045ed40015294ebd8f7a6df06b418415da8f091d09fb4d34fd70718bbf5ce9f49dca7399dc5649336de3fc83bbbd93e740ad6f62d41ea540fae3b17f349cd66b
+DIST github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.zip 121655 BLAKE2B 071d008723f19fcac3ee740e1b4898414cf09a2813bdb6922705cdcad5913d7fe4682d11219ef10d8bd3921fcf93c7d568daadd33b8e7c307a55eea6ac0d54ca SHA512 19403c36137b6ec9247fab3a9255dc98ad9dc46ba03ad3788e11298f8a310756b24dbfd3a0d9893ad93dc111dd228c421f96daae09e2058438c3c7c58386a71b
+DIST github.com%2Fjbenet%2Fgo-context%2F@v%2Fv0.0.0-20150711004518-d14ea06fba99.mod 36 BLAKE2B 3face566779516d32818939bfc87f0c24ef4b03ec89330763cb2de2ab371a6a391eb5fbf24d9619a07719f160c4f6c403dd4fbe1c650764c5e0ff43a43051aa0 SHA512 fc1cd659d6210d91ef66189a759c3850b242b76267035f38959be2b2f35283b54a61334f4416b619ff017d39646433c5a13c6b181e53bdfb28fbc3f9c35f3dbd
+DIST github.com%2Fjbenet%2Fgo-context%2F@v%2Fv0.0.0-20150711004518-d14ea06fba99.zip 8654 BLAKE2B 2a43429e35596402b196284d0b67ab0d12a380f87dedc2866ad300280095ef93e3c67c924949870a6e5109f4cca46c18e79adcc44a3689a1ac089177c56ce686 SHA512 bd003ca9570bd363ac70b7e2e6084c033b1255939759c2e07ff8e247a46b54e299980a310c430a0b3d81280fa61d49959e7c4fed94e6b70d36f16a034568a5a3
+DIST github.com%2Fjfrog%2Fgocmd%2F@v%2Fv0.1.12.mod 285 BLAKE2B 6e10480f0b53e03a87139ebabccdac8237765f7831cc73ca90fd8007c294ddc5b1be382144aac65abc2f00f7d7ca71ed3c49f11b0ad90c52a73621341f21b9bd SHA512 9000cb0ea2d2f145ca5ca681d35866dfe91d2c7c41ec13bb8cdae80f290c8b608822b58fda17cc3b0337464fc19ac9177387689bd8cb509bd18be20ae9e6b984
+DIST github.com%2Fjfrog%2Fgocmd%2F@v%2Fv0.1.12.zip 36420 BLAKE2B f73677b3de8833875ebca293bd1c21435cd0fdf7019e1c55d365bf45bc47febd0d866ee6f289e20b1491f06ee24c802b6c362a79e96075e32143abe23f544897 SHA512 5facc403caaac0443ddb824c41c80b04f601a2ffae781f1e796b0aff909e91cb4b3004baa968c4de2d78d0d60d906352e41e7fdeb8accf41324f5a5220ebc3dc
+DIST github.com%2Fjfrog%2Fgocmd%2F@v%2Fv0.1.13.mod 370 BLAKE2B 28199a8da5635514aa204063ff02bdfcc96acc2fba060dbafac0a921d69a461a257a239986cdda10e0e81a372fc47f3a0f353ec7b74d0e0cfafd436be1498199 SHA512 b73cbbf69d945d7b5676a38840147e0236fd4dd5ee821b862ba8ef3a69cd3a450f08dd9eefb1db738d8d57657b1f1291322c86f876045eafdf07174448820ee0
+DIST github.com%2Fjfrog%2Fgocmd%2F@v%2Fv0.1.13.zip 36467 BLAKE2B 9d43c0d9768b635c9aac163dc563468f2cfa63b23bd06a2e5c9ae71de4395d437a0668bcd63b95b89291b2c56020530a52ebcdf1ec430ed7fc403b66437b3cc4 SHA512 ebcb612231e0861d0c695bfbd397d0e6fbdfbe5f6a57a276064e98e0d8003c1d7d7890db46358c5c15d1a5674c1afecfbc55dcc9479eea38345ab1f82b152ee7
+DIST github.com%2Fjfrog%2Fgofrog%2F@v%2Fv1.0.5.mod 69 BLAKE2B f4cfa08077dcb6d514cc1974d2954e828282c2b0f0e0d9a3df08c5d99079dc648e0c11fb5481d2271a0b9d62180ce16fd99adafed57e10a23cd8b7d4c9fe4bf0 SHA512 4c7d9399504c7d75e0790ec73b5b6dc098828df7d6be5cc97151fbcf3a07d0daaa8f170fcfdf211c72872213ec00df2c493bbe8a5949e43765c0cea6ef431a7a
+DIST github.com%2Fjfrog%2Fgofrog%2F@v%2Fv1.0.5.zip 20508 BLAKE2B 30217f9f27f9bd0375964befda877639d6c916e5357c81ca0ffc1bbd487fead2b764fb4bfb20975f1d8e4a94f448832433ca9a33897fa19fc4cb21209063357c SHA512 ce7bda743007e9cbd3232ae1e39568c2ce02d91fbd5750837e34ddf4c80954535793b3a88ca7055d760a203694b8769a63434476a803e45404e2596d048a6e88
+DIST github.com%2Fjfrog%2Fgofrog%2F@v%2Fv1.0.6.mod 78 BLAKE2B 55a1898496ee14c3ec16c6b3c701300a6bf8b9ae2183dfbcfe4030d1d59a32f95a6d5d80f535bf08d7b33494ec07ff9651afca5482e9302ec0a7198f97185fcf SHA512 70ae7519556ff52e0260a17393f9fbaf5f329bc22667032cfef0b81dbe9195c46665e59bddd8c1673f1b69dcdee2bf7ed2f5b2303b11915c362215ba5b9b2b47
+DIST github.com%2Fjfrog%2Fgofrog%2F@v%2Fv1.0.6.zip 20670 BLAKE2B 575a4f844af7834dff1d66f797f214e4e063c84adca60b4cb908f3900bc4d66f57ac4502037ce69ac26a14961ef9e6eafc70cb40d58b10df929a0b53279fc0da SHA512 1ab1640c18bad7d6b741d038c83722b1a58f8604f925295d8ea29986e9eae6ce0e046246c88679f0c150b17e9b0e8e240cdaf087b494694b5d58c0e3d0f3f099
+DIST github.com%2Fjfrog%2Fjfrog-client-go%2F@v%2Fv0.6.2.mod 1884 BLAKE2B c86353d1eb28ff2a665217b22fc4c016cde7b8a5404422569dfdfdd0db6b312dd08e71519113f10eee60a98994d53670c5713701188155ed186d7a58a1b18d18 SHA512 136b1f42b5644b4a7ad57e110054f149b2fa191adfae98e111a2b13a9e54d13ffb15de0e2a8a7e9fe31d0b203d1d473a564afb093173eddeacb13f38b63352f6
+DIST github.com%2Fjfrog%2Fjfrog-client-go%2F@v%2Fv0.8.0.mod 1823 BLAKE2B eb4b995fb5456e57ea724f75bc49f03198cd6b92cc92173223e0764d460233d99e1f2aa093c26118e9f44c22cf3c52ae26bd0e96c7a70dd9ab3259c45b337f27 SHA512 4386edfec128742a70655b42cc519d1d1edfda21b196f1478b7f0d15a69a0c41dd94476e6d0308bd254bd5f5d465815965fc7a26112283a3d3af67fdf34e6ae4
+DIST github.com%2Fjfrog%2Fjfrog-client-go%2F@v%2Fv0.8.0.zip 219825 BLAKE2B e812f563b85daf75fe7de19d148a999758387f76d9a69fa87a31319866b2ce4dc388010942fe7346ea0eab67fcf8c4ba0f9e7206c4fac39d84ee6443b49ad0dc SHA512 d017e7ccdc483f9744f09b6ef76514d5a0bc1707193f8e766d08dcd18fd8e60e0f1ddf61002c8121ceedaf678ed13b27f5cecae65578f34672d6a116f77524ff
+DIST github.com%2Fjfrog%2Fjfrog-client-go%2F@v%2Fv0.9.0.mod 1823 BLAKE2B ca233156d7504f68cf54cd115f9ad6a70fc699f8f09aca8967066448f2bc86de7abfbd3c4e297906988dd38ccad485af8dcbe1972e23b7985b089db09108c823 SHA512 62b563262fcda766edfcd85a67c4249b535d32bf21fd85e753ab79788a425ec547b88ed44a67a143a9fb4306a83646ada05c0d84e9247e24ab13f9644c365af0
+DIST github.com%2Fjfrog%2Fjfrog-client-go%2F@v%2Fv0.9.1.mod 1823 BLAKE2B ca233156d7504f68cf54cd115f9ad6a70fc699f8f09aca8967066448f2bc86de7abfbd3c4e297906988dd38ccad485af8dcbe1972e23b7985b089db09108c823 SHA512 62b563262fcda766edfcd85a67c4249b535d32bf21fd85e753ab79788a425ec547b88ed44a67a143a9fb4306a83646ada05c0d84e9247e24ab13f9644c365af0
+DIST github.com%2Fjfrog%2Fjfrog-client-go%2F@v%2Fv0.9.1.zip 261043 BLAKE2B 84dc2857def7448fd74dae6b35d9c543f48470552d733745d4a3bfe92c0d0fed11b982780152efae26e7722fa647743eb9b2227f5cd0690b91a7f4c87d09f78f SHA512 3c7ef22466b5f627a03c4b99700559737ba3736b33bda35977210e2de57dd123c26f7b2c583b3b411384d3394915be6bf073e279e46318864ba78297cbb2c244
+DIST github.com%2Fkevinburke%2Fssh_config%2F@v%2Fv0.0.0-20180830205328-81db2a75821e.mod 40 BLAKE2B fcc716fd56980eec2613156eac1c731cd653369416946bf532a2ac27df56a894cd6dcdbaee1f55d6b9bf2b7215cf21c6beae58404e55fa71a666b9958e69f7c5 SHA512 208caa4a93b3f365428dbd324ac42ca09f073c4028e06427c75a1883100eb1de0031aed9a63eb283742efc0d64e7abe644000829e704891362f59dd32da40b45
+DIST github.com%2Fkevinburke%2Fssh_config%2F@v%2Fv0.0.0-20180830205328-81db2a75821e.zip 27363 BLAKE2B 5e8de631620e5387a08f81f467a62b750e3feef6f34241f60722bebaf4304fe2085dc9abb9f096a390c4a0edff3fac045217df307571675d91d06bc1467bba03 SHA512 d3a611d7270d1855aa1f8201854bbcb9ecfa8924c8b64712570fa05ee70fa2a83dc6260724d27ffbe81c21378285e972451731e0dd9d70eb4c180888f59f4bd2
+DIST github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.4.1.mod 37 BLAKE2B aee0c04f2b8e92b2b4fb2aed9691b2e55f27eae078ca0d7161866b1f815b14e6b7de03c80c567e6f1407cf9e48606bb097eaa0a26c5b7d46db4a0d18852fd233 SHA512 18830e82c89186889b494ac46cc8c4fb398f3aff5416eb1cec3e3b09af281ebd50bb0e8ac7751f6cd89bb1bab3738a354183ba12eb3ea42aa7dab36177b613ec
+DIST github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.2.0.mod 34 BLAKE2B 1fea82f0ae24add73e084ada4930a6192f6f1d7afac47e2fd4a018e0167779741e4c948ebe67965751a845fcee894fe88e57a1e42a00a8aba2a6589dc73b30e6 SHA512 c71392a06cc0dea75b46dcab30bc5b374eeb432aaffc678213d5896015cd31ef085387446a8086c3275b97bbfb02c93c0180f7b3bac5fc1cdf1fbe5bf7af9887
+DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod 67 BLAKE2B 2e1b4a8a38998179a32db321d331db54f881770a89719410876cdde1799cb8558ca2862bc70838d606540606d05918c4b115cf1c125945a77ed376c2efc4aa85 SHA512 4d841fc7a022e4e09e0a95925ad92a75809a67c30fb88de9190e4a2196383038dab9a5b3294b6a0b4786248977a0e09eea857a34100cbf22f8a52912ce9fa58d
+DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip 11159 BLAKE2B c176e4bc9b5534b0df153e027f22be7d28eefbea1c0adab10979f19d601b95d300c54086b5ee388f453c73b9931339b9b04208fc5e6512385b348c49faff5488 SHA512 bad73f3c47f70de55a90a977a1e2b4a68de545a8425c71533de081c7a8f71d7ab1b489001c56ba2e88dcb78c08804275f7f8128c812f50d005a074ed6dd9286f
+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%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip 12591 BLAKE2B 944b0b9a802757e78e3dfb11d6c4d79e0e0d90489d49262b7079e6ea4728328457f8773b392c8a618aacb5fdec78948a16cc852eff71ca6f4fb9eb422c03890b SHA512 3f0d00b0545769ad882e25a9a6f30b96ce4b72a8a46bb3c064907c94e2dda4e499eb32354c149f89752f9bc5d1ee5cb2ee5cafa46e2f65ea329fb432d0c0029f
+DIST github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.0.mod 40 BLAKE2B b8e71ef21c42894c31d75cce0e7423b21e716de0539a8a7ff462e0d5c05c77795238598630208055ad808af2db8c56a997e7e114ef391c07d380b996ce533544 SHA512 8a724e5cfce28512549e7b06ec42c9e02625adfb3398fd45af07f8c512782002a262e8567669929626814758f9d12041c318bd4258f88d110a851630537bd5d1
+DIST github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.0.zip 38603 BLAKE2B c0b783439b139f5df0c9bd7654e4a85b5eff2a37349f0c68b713a00018764ef355622756e7ed23d9eceb3201c93e45d0c0f7a7b17e3ed27dddadf523e79e7a89 SHA512 b10057680da719464890d8bf7ae3c3d375c9fcf6ff833250eddbe897b9ef68790bc5e2d4cc5936caa69cea311999263cdfbcc71431839df8214f6b0a1d1fdfc7
+DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.mod 80 BLAKE2B 486156a648d66786de2a05b45b054ffbc6ccbb45ffe98230d3b3126ff533fd546af1b348fdcf67b1b3ae9310918869355fc39390a4f67b99cd7a1bbd1c6cf891 SHA512 f69ecc2e8097c17a9c0002181451d56a8a7496f62e87f437802420e9af27c5f80da2be189597759f2a5ee2656dca8c1cf91a5374b8e46919f7a6e0f9579d2526
+DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.mod 160 BLAKE2B 10c23e5a0edbdd398d6913ee8e4665e15ab0c30c6aad4d8e113533d421058858a4c23898f8f360b72cc39922bf9b4e7c6c656faab76ec4616e05285932bfef03 SHA512 60840c731813699f19e9a23f3cc0e890c0b0e8228510b0021aa2696f35f3aefa1fc06eb396c5035214ac185816d5757896da1bfaf59e2dd24ca750f5b792e6c5
+DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.zip 13586 BLAKE2B 8f8bc0b542920d0effcd6939a66e34609401f564af0c1f6330bff2925abc664add3c36534bdf8602ac176e74ed85ec8c8597f748a7ec82db9e9f86207c563fee SHA512 bd6adb6aaf44c6c59bda2407a05e192d3336154cec35d0a6b6244cc5b93dc5e53509abded7c5999af166821749dd2e55333a8813ce64c310ba5db2df597bc171
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.10.mod 104 BLAKE2B ee5067e0e89fe2d374ea852dac828c094db84c3a3d2d8a991abeaf40385431015577eeb6b11a66033e8da599e808f9385a84843fd8f87dea487bd3bc9ba233da SHA512 f144089cc85271c7d91b9a6faf169018bb12177dd770db0092dfd0b4c71846e5cc6dea385c0158a974cfe86971e5642858a6d633c64d3b598f1ab254fd47db28
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod 104 BLAKE2B a8f54d5566d54ac27763dd535705d64dddd862f32d23f234b1ffbf759cbf4aa16886c90a96198ae2f4c0d0bc892932f1b8244e8ff0f8150bb87123947d734016 SHA512 7bd9f6a38aa9a16c3569142164389d1c4046170f66b5e9044f7aaa3192e9d2e2ccec486e3bc7fbac868c9693b6d333068c1a34ccd9e79dec1746a86348951503
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip 8902 BLAKE2B 7257687403b9f8f066147fdd4ee1bec7e4b02cfd3fddda8349a89d9b9ea5b93d9bef61280ed48d68adac4dfed7e382ee96886aa0d65d85406fb93dc6fe0c53b1 SHA512 79ba14a04838c509500e6098553e8aadcd7105445387160a8aa1a6d7b0e70f0e807c99036c31faf51920544da2156195174c8530e317a72728719cb0a9a66098
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod 95 BLAKE2B bb0de423d1270e7ec38c7ee345c788b23e2083b05e4f745832327358c4c054ef8d2f3f48d9bb7bc669ddc67796ca0abae164c1d40b2def5f38749d8ee4bd6f32 SHA512 923114bfd285393d06f681ba57db69f042f57d8cd7817a1611c7719121c812de8023a049024165e10112bda31a7f99d3bfe0d4c4f419557ba8909a2d005be405
+DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.6.mod 45 BLAKE2B a7d3b1ffaf20b96cc98161ea6756d62d8380e7557859606dc7975b3de91a2d4142932d5008caf40b41d8ff2ac1ff33f672dbfac351f3e518922a036d7c116a93 SHA512 0cfd4101dd8ed90f80b7f4ce2928cd322b93855764abae65d66c5ff9888a7c8aec6ee6581c7f05d1c80db5c78003ee2afc8537fda8a3855e2349bfb8267aba61
+DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.mod 45 BLAKE2B a7d3b1ffaf20b96cc98161ea6756d62d8380e7557859606dc7975b3de91a2d4142932d5008caf40b41d8ff2ac1ff33f672dbfac351f3e518922a036d7c116a93 SHA512 0cfd4101dd8ed90f80b7f4ce2928cd322b93855764abae65d66c5ff9888a7c8aec6ee6581c7f05d1c80db5c78003ee2afc8537fda8a3855e2349bfb8267aba61
+DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.zip 20005 BLAKE2B c0f71323efd262296b78867d2b387a74491cfae3f4498e0dd22c036b20dd6fc1b6569171eebf267effd140ec009527fa5ccbcedda4f8cebab2679582766331ea SHA512 fad08292597cbd4a359e06f85bc7cc37b3d3d84b8046e47828259e36872063069c4ab17b7c89f2a5de4b5d0ab1ca5cc66cc515847a7887339a3a04b5f44e3c92
+DIST github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.3.mod 38 BLAKE2B ddc3076fa3a93a287dcc66d087fcfa08483a03baeccc6fcfdca7c390908cd0b83017754103a78f6977c929d24868a9ce78859bf9e270fd84b5fb38ef8f939f9c SHA512 79ad90998c2a3e01501014598c152d4d08a92d354678b5e395c4a16ded8519f12e4ea883485ef49f07e240c52e075c7f9a07a410eaa9a1aca3657cfbfe4b6368
+DIST github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.3.zip 4770 BLAKE2B 942414d29a4ed18f2a99f05de430d1f35fa946c5d48c0cb745427c210dd3f30a65c9b7d7c3dab344a2f7914f6ad0e98e47d07173155829c92266dddb1a22695c SHA512 45fbd1eba329ea142e4f4030465bb7a6593261286e2bf5343c95860f2a5bb1623380570e407a33a5b342be21a0e6a2e1dad774d3c94765e323af327146216d56
+DIST github.com%2Fmattn%2Fgo-tty%2F@v%2Fv0.0.3.mod 272 BLAKE2B 484cb3660777f39c9c1fcff527b4a8b31d78f6150f362d648a29df008e681b32faa8374500edd2f18ec9c94df93e89a339b9661e27f38f0fa0284d6f74268af2 SHA512 64df798c54270a8893af97285fe0914af14dbc7f87228e13e0de5c29927d786e34d009ba2b0f9d2db2ba743e443bbb49f51fab1b8f9af921b856ecfc31cf0e4b
+DIST github.com%2Fmattn%2Fgo-tty%2F@v%2Fv0.0.3.zip 11986 BLAKE2B 76f2e98def36d186c1e5ef5d7a9cb05129dc3cf5878311a8fc39cd83f8b58bc0c3d6100e7492ec44f6c01c5c88d859e59b03da389d35f4617b2d7d14e1856374 SHA512 52d18022f3dd4faecb00fb54aad9b184db033a6c143dfad72173e38545e8d2ae9f4d26d925cdb56b0e4b78a747a224d73bcf0716d44db4d4f3adaaa0bc4f404b
+DIST github.com%2Fmholt%2Farchiver%2F@v%2Fv2.1.0+incompatible.mod 33 BLAKE2B c73b0d8e5f9af8150c62bc122e0b922e97dc8b5f8993ae6f912ba0ef961b53c29e0adb1ef41bddb4cd5983fee29609aa848ad3e2851e926ba27c5e6b843c54aa SHA512 11edd5885994fbf94cdfade07c7556c229da61ce64c8697a67f7a1d3ebf1127da0db78438720998b053971bc225777741450794471b02f0e684aedd5e23b3ffe
+DIST github.com%2Fmholt%2Farchiver%2F@v%2Fv2.1.0+incompatible.zip 29927 BLAKE2B 69a5d55099dec6cffa7df9e05be7b46b42243d0d9a2f31f02f2d2e27675b11c60896cd4a8311eaffb1f4875e50d8eea01bd8aa646aad479954b90395a572d1b8 SHA512 20b9d87fab7700b8b72e5feadb5764b7bb1165d2641136e04af06911cbe627e1a602906b957ee55254e5492074148855de432d61075a46bf608bfdd980595835
+DIST github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.0.0.mod 39 BLAKE2B e28ca0cdd6db21c4b97e47151a6c11487314f26d5a259f9d7f5581f3d92648a57d931e1d6b004597f76cf10916fbe14728c99192e24b6da674de2cdc9cc4e78e SHA512 a2b7ed5a25e6dcab620357d5c216546bdb554edbc6fd927a0703e788d7e7a10a743471d10f5c7cc56ad829ab35c7272c61d210e55947363447832e924844e9ee
+DIST github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.0.0.zip 4039 BLAKE2B 7ddabda9d19c3468c1568dada882ea500a4bc8927bb780e8d714fccf9c77a4a33bf2d2108d3c7decc9330b6ca4e3fe12ae9e02aa3391b319e88086319893b398 SHA512 0ec6241bd37dff2b6c700be9eba99a39e5d5fd57933678647d56120d450c3619a2f51c9469a6caa4f48118e2d38b4c90091cd120f42d1067f99d649a39cf6cac
+DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.0.0.mod 41 BLAKE2B 291f73049327af60c94a2b2113b8e370f90d2a3fc7074c58ac523ce2a613ebada88ce048a73cf882c68ff552dd6df0be42f796f4ed11a549c0b7ca6c67f61c38 SHA512 7816e3703475601df65f20ad4e5d1f6bbedc4a7c87c594518358c1a9c24421aa5ccb6e8389ad983a514a823674c6f0f771f1f367b10d99691dbd8db7105ec44e
+DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.0.0.zip 23571 BLAKE2B 407fa686b0f9cf5ff4679bf9e9ab05d26bd4f84002967cc277b700b36f3ae27870e3a6c491e38d62904b28c1855f6ed3de3b2d142be4da2f6b54500c9f216bc8 SHA512 6b2ee475151b737d53630292bcd8a6c3f48944b8b6b2b0f09b36e5a017030742eefc1729db786f076a514ef71fe4313b66523261b3c65f5dc18e051b4c951bb8
+DIST github.com%2Fnwaples%2Frardecode%2F@v%2Fv1.0.0.mod 36 BLAKE2B 95e7eefa116cbe98c2f2f8889f07ddddd72ed4c279c12309467d951f07d623b23bef341943b06656ff522f363bef7ebabbcdb75d1485e918245fcdeba9914052 SHA512 349c415bb3798e8a9e023a34ecc362a0522fa46c62c1ecffa3332fc48a2fc338e25ff568ec88570d7cad235997d1dade730620855c1f6222c782674ad5ece690
+DIST github.com%2Fnwaples%2Frardecode%2F@v%2Fv1.0.0.zip 42455 BLAKE2B ac689c165d48fc499b75a9779ed0e91807ccb28b314323254162ac7eaa5bfedace11f4e2fbf25eb89d35eda7aefb587b5b6c59719b6b7fe82dffecea52d5f952 SHA512 1404714fdc6aebfa75cdfcf41668f01f4bb6192423ed92e354bf6c8af59a291b4e997cb39c58bda1f8e56ea1a1f88e3665d76c7e45b2a310329fe5de1ab60dd2
+DIST github.com%2Fpelletier%2Fgo-buffruneio%2F@v%2Fv0.2.0.mod 42 BLAKE2B 26e88451ad5d521cc8f48a08c91f2fd3fe6dc2e2ea084cb0012f25d8399f0e43329de5e96fd741255d910cf5a2146d3568718249980876c816a67f79e8b3290e SHA512 9f82f0d4d467420830ab8fb80ff97215e5fb47653b48d88304a6effdecabfc735f55dba9959319014ba943b2cbd27394ce86ebfba8a6d068c9c3d368f6b0cdfe
+DIST github.com%2Fpelletier%2Fgo-buffruneio%2F@v%2Fv0.2.0.zip 3906 BLAKE2B c38f08bfa854947d01674b90e1d6623013849642db5ed1d43ae442ab41c9b9eeecefa5dae4a1151dbf5309514fa61116fb915ef22034c30404403e78cd8515f9 SHA512 da82c61fce944323bd7bfbaa90d0d0da24c220060a47658b04420f67a12eac4f882c8f71684a48b9ef4da7e9cbeaef039dc9c9d12b4532a859913b25dcaa1359
+DIST github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod 36 BLAKE2B a388b7d0db7c8b9a589164ac639887f1e54d3f5d59ed9bfdbb427b88d381d95455cec1f3474d6dadf847925b7b0e9944a3713656f4870db4fadaa1774595c3f1 SHA512 b74e16c113ace53ce6b7a4df1fc73f21a5acdcf3d2343a4c4f1ad7a2cd8d2282ef7ede98de8c1c46f7d35feae28c9f49ba4a2dff1071357cb4e88e93f25b521d
+DIST github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.zip 75347 BLAKE2B a6f74be69c8d42d3cc84e957dacd59f5f96fc49d48972c04ff26b623dbfcd3b5c2de13ae3e561e9a491a32cd52cb83d26e171f624191ceb4d659e5b0a3bc7623 SHA512 5dedfbc126ef5a3d146b2f3df2e4efa21cd4f1132bdb9f71801e55bc8583959777e57ee2664a85f3a222d656b910e1017b9b855378c93f65e2f623b568ef12ab
+DIST github.com%2Fpierrec%2Flz4%2F@v%2Fv2.3.0+incompatible.mod 30 BLAKE2B 007bbbe9dc603d92170e1aa89946c3df382b73e60a01f247ff3c28c56eec5c06b1f901cd3f52a81ed967949436fe0d2a7b4dc70088dbb38de97705967f127aa3 SHA512 e3f6142da79fb97efb98b7bac49f4fdcc16f2c59b40ac87ca98b633874bac81105a0bcff20045bed75d39ba3922093102f9e74462356d6dda6147f6be4d31703
+DIST github.com%2Fpierrec%2Flz4%2F@v%2Fv2.3.0+incompatible.zip 20571789 BLAKE2B a74410fe44cf86af6b96ab4d2fe1c0228273b8a709450ac61947b9136324648cbcbd4cd9251c87749d32c3ff8ea277932833f4e80fc3c9b2d3291be0dd2436d7 SHA512 d0d4b7fc04cd0776ae31af2e217c08b5c7a6caae72e3d71bb19c8e3487194564f2960975f408213b94bde51167aa0ee3d3ad7f597d03e31e1a6bf855bbf9bb1d
+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%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
+DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.zip 14339 BLAKE2B 9332d9cac7dd3aa2f4d756f0d92c911cd0fb8e00232db3bb013a0ef12addae0aea2388ce3adf79407a81e13cfe9cd4b45aeb2bc9f8b84b4e3c5dfa63b59d46a1 SHA512 f97471d54c5e73b3f59326847cdd4dbbb142a9ae790df83493f11a851d716fb407e01a857152812caf731b8f3e0f37ae151ee83300feaa73152173f6cb5b8515
+DIST github.com%2Fpkg%2Fterm%2F@v%2Fv0.0.0-20190109203006-aa71e9d9e942.mod 27 BLAKE2B c44820090e3e6b67eb062638dd9251af75ef1262a034430d43ee34024051c45bfd596f258ba3f9238f1a8f25374fb55ab3840503310e1f97e6e6e5c98ea0725c SHA512 5b8d46571cfdd120c406dd6d48a943d4484053ddf05edd078529c3f927b4acfa1bf15c775e1adf9eddef260673fd6c591541fa1d781310017e421a9f164dd9ca
+DIST github.com%2Fpkg%2Fterm%2F@v%2Fv0.0.0-20190109203006-aa71e9d9e942.zip 25000 BLAKE2B 5470dce573b7e354aecac309ff208c340dd25f660bd4707101d5dc4bb57ad740a45c4aad7c3207c3955d07ce2f82108f48a59aad79e636856fc83eb64c7bc0fb SHA512 d1ef751c72755912e131976daadfab11a19910a392f27f9ccfd37751b8523822f3de331623631e17c1b13b8d2647d73ec5346cf2b8dafd9d034a10a5fcfbef16
+DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod 37 BLAKE2B 94636062c94f8ff68cdcab7593a3acae7b9ffff616cad7b1d5c9cd147a4a1042d33666cbeed6fd816d6793113abfb595183097dcc46de7a3dfadc1423ed43e79 SHA512 c3d5c48cdb8ba6af7071a07cfede06e0ab67e3726d9de592a952fad40167dcbdd9621dc2c4df1bd3c28eb99d70b1b6d8d812441237c35bf492e5b7f07bd33902
+DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip 12433 BLAKE2B 0c911c9d173080abd8edbbab1f47222343801d8eeae36b4add24773e3282fc2a39283fdf519a3d4483e39cdb7d9509b8570d151f46841ac1a616f312dc4cb0ba SHA512 3b85697185ba85cdef6202444ab6cabeabfad8a03d66b3839a852586b1f91ddae7897a57c8c138d5647022aa44906c7ef3c5339d520f90eeea0742a935da8cf2
+DIST github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.mod 32 BLAKE2B 9c0be7f17fe7a9156f124f7f67c3e15e14719d0b271f36d5d41ccfa5ff6c1b7887e0051df6eb3b29f29b40357d8e438598088b3c4f4df28fb81f030c8efa7ff3 SHA512 8b8b8958405a188b93adcdda0634aaa2961b5b8e0d3b3e1f768fb9c49c02b73cf3bb39027431e0c1d209abea6cb72a651c5776bf26391e81f4dc18c7bafa692c
+DIST github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.zip 52931 BLAKE2B e511ef9edf7d968d848e021658001daefe7c8cc7169b1c6984ca5388fc4d6a5f54def9060483e57392711617892d21322d9de099234901bd1c251e57e6489f6b SHA512 e3d8a20d1cc351b8944579988feff39cb0aa3e1f2aacf2e2307180c25c153a0473f2a5a3ebda9d96868cb1f477ccccffdce06b117be7fa5409b2d1926b4c270a
+DIST github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.mod 30 BLAKE2B 9bf213acd16f9456f4a010a7c300a1fb7bf1ab248d1ac9eed7883deae7f9a6f6d0c761127b7b2c84e8dc46e7b0da2eecac9b334fd5a94d2995d56858d345edb9 SHA512 3166c898d741be502c0b733653cdca0e8ac4999fa6a5d67460b3962799287c9176b7f0243f0c0da394a4b7737ed1d1a6a2ee4f84a8917cf7076c774ba9a2a648
+DIST github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.zip 67427 BLAKE2B a05dbd2305c67d453c5e8ad02b407be2fde660ca88ebbe2c4b4ec7e89666900248cf0170c19b82bd9679c542395e893d5efd833669738b4232d4a18949569f86 SHA512 aeb73f790a1b6804aa46a4031c4df4ff9bdfe809d225622da428119ecc83b02d3f45bf58f39fc9364540a0eb7c7f3ddb66e3f6949136b3d0d52786804728cead
+DIST github.com%2Fspf13%2Fcast%2F@v%2Fv1.2.0.mod 29 BLAKE2B 329362a4a6143a3ae3fa01298ec9a677e0e6f4054edcad3d300db7fe5a095fd9347d5a239b9ead9beab72bdaa18e6411ac342b56e841f67eba226b802261870c SHA512 961f65a3d308161a97fa3c3d85749f53b7e7b0cb44704f330616c46898ff12e837c9dbca88a02826f40fb70d2b3fcded34a69bcf0f133157291ec3e17439f7a4
+DIST github.com%2Fspf13%2Fcast%2F@v%2Fv1.2.0.zip 11416 BLAKE2B d808721d77f6f74e586ada11f0ddc62dee5ae33d9a4b4f397a6154e2e0cb69db851a0ff6accf30a022e1134573d47998345805ae47ab6c80720f627a97dab014 SHA512 0c51f3ebb6fd3a77eba4786942f04ea62c32293a0705e478b52c57e9e538653b07147cbe26ffc0332d9b5edb5bcfd0628dbd3dbd248c3f9a666f966aafec3112
+DIST github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod 42 BLAKE2B 1f0af0f4518708edd09c0f02aec6103960b023a6bc178181276c54cd86b653e8bd1ddd60c5d49fa75a85f1fa0d18f670a9c2ead381da7c4f2d5e611b24f51ca9 SHA512 748b5648bf8bec4d1efe13f4dc37608e7378acc2a7d954e9d3b649a4b170a1e2d1c61338f6bee8d9007ad75a5bde87487612b47a692d6f966bca56490dcb834d
+DIST github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.zip 9350 BLAKE2B 04c151cdab19dc03754e44d0f6d158e3130b6f8d5556247c13e5ff28636ea611ee41251855431d722dd57a369463a32f14d1a46ae2f68417031acd00af0358aa SHA512 6010feab0201548f0a6e9423b39d0506da0923a2022558de88eb17428346c4eb130023b4eea8640d5e52ec68aef84eab5b4aa2ca5ab761d43cf649e86089f226
+DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.2.mod 30 BLAKE2B 18c9fb79a291aaf800991a296c8d7b1933cf45bf56082301a64ce17ea64dd15fd304094fd4b0561bd99c48ada545dfe7fa8cf47a15593cd3166eb66657a5e114 SHA512 d08b4540b799cee9c5f088c4e1fe002c9fda86f1634380409eec1404598b84376d3ca26b4c1cbcf58bc19234ab56531ab11db8a00c6dd2e15a53f3b4ae757efc
+DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.2.zip 69513 BLAKE2B f0245b6dc9af841a0671ccc537c5b8db24d1339cbe4357060df7a81985654b8795af2da9019fe9af6e6796837fc5a3899049a6045875951ebde93aeebdc8c455 SHA512 4cb9a49c18f230383add346759d68f5831347227d202da227527971d6ca071a9832ffbf051740a4ac8f07fd1f2df41691dd297a9f17b023b889d99506aa6da23
+DIST github.com%2Fspf13%2Fviper%2F@v%2Fv1.2.1.mod 496 BLAKE2B c15c798ade5e42a6659a32034ceab8c93dc65a2003ffcca9d89f672c464b2a722b645026a4a023206c87f5def62e85f01beee65688978eb3cce2a2eade595703 SHA512 3f30f50d4860802ba5a6a713135b6259e27d29a52c175ef5f356baebbee5eb0f63c4eea86be509dadf47f2e409ec96733b173d105e2032f9c89411d7da6540e8
+DIST github.com%2Fspf13%2Fviper%2F@v%2Fv1.2.1.zip 39417 BLAKE2B 2fe7e7a667ede97b5726a3dafde1d89a100c2a83c4fa0857c821e4350e2b1b91a458121197aba860fad8f82761ccd90ffd787fd130eecefff7b97e4470dfb70b SHA512 1022f374a3ae8fb78cf4b4de5a0da4f2e3d587088662a416f6fcb6c43689959334572a161dbccdd81c1f5a431a24a401d12458df5f21a6f288f5a8e785147e21
+DIST github.com%2Fsrc-d%2Fgcfg%2F@v%2Fv1.3.0.mod 29 BLAKE2B b5d4003e44ee3e61a72146f100f7d669aac7047b096fdaf549194cde409e0ca927af590140e4344f57e77e2db5aa16e92055e3ef2edcb73c8616ddb0edf6c62c SHA512 59c1f5827727d54b89814acef7026a976343019b58d7c673b853382e661b72231e04e251c60377f8bfbaab0bd6768cb8144dc18f1fb207b6fbfd3d5534dea160
+DIST github.com%2Fsrc-d%2Fgcfg%2F@v%2Fv1.3.0.zip 38639 BLAKE2B a2887c9181185a1d1ea5b918db69b30aa8fe2bbd0c2450a982e8e58f0419b6bf947ef322b76e426aff6552611d75b55dea76b60f42f7b3ce14785b759abd2e5e SHA512 3df4686ca2938b756e8cc89ff3662d2a744a301c61afbedc940a6fd10e3e4827273db044265b3028e32f4d78b1871e8a6b0ec38ce4e6f0a70424a898590f9e32
+DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod 35 BLAKE2B 0357260904c9ba41892132c7e07d2add9b10ce4a09e8db4966219d1f515f917581e2afa0987094c90759634bc2aeb66e758074e023ff331a8337f5090c0102f6 SHA512 5b7ce867497852e4918b8cde5f75ecf2f24b9c95ad112478ac132322e904243f1cea3d16f5731646efb669256dbefc129ac70a499c8b1d25403a14c7e4fad10b
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.zip 81710 BLAKE2B 245149718759e71d8c882731fb51813924beee131aa16c9d6ea83a72738721011bceee80411d88dedf91653219d3c8ae33f66349e2d373b08931c28aa2e16d8d SHA512 b2cb918d623065d391a318f4f5c532aec12635662d176a441c30cbe3b042b60be848c7eb685679c5258e661f5780ebc3db3f9dbbb8a37e157da214b4f57fde88
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod 179 BLAKE2B 3bb7cee3118f0d335ade107dfefc3a594dc3883564fe4c9e96d615e179d394a49a3d6cd6584ba9c684772bc3dc6479af6a168dd3841c03957252667384f6ba11 SHA512 243bf1f69c146252164ad72f853773dcc77f15d7c9e9b731bee26a95e7c8f4ce9ed9738db601b01edb82f4b3808873e1f153a6d4a0c97be0babbe65abc0f8d52
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.zip 90474 BLAKE2B 2f79f0cac2c15acaeae764aeb640534f58ec2ae86fe88a82533498e718cf37d67c563606090ad39b38e22ffca1e63a25cd881d6a472b862ddaf150c7d329b16a SHA512 a047ba8d5f529d459fb6ae8dd39367e6f6cd2e785e90f54a5f8759ff76e4cfff990f1b8c1e0cf49c67b97ca8de36ecf8fdeb3b8f16e579aeae2d563d38da69db
+DIST github.com%2Fulikunitz%2Fxz%2F@v%2Fv0.5.6.mod 31 BLAKE2B f8ed4b103891625af3043d86905f693014b245198a180911efb7e33480d81b93babd35912c5768df62cd26199e3a742f94365a82de619a97385d7407baa22424 SHA512 33639405743ddf22f19ca03d348c47d9cf963aa151fdab9e7303679ccd5cec373ceebce456eb96ef52dcf933f96e4ef7d4a8099822dfc183996d8cd4f09cba2e
+DIST github.com%2Fulikunitz%2Fxz%2F@v%2Fv0.5.6.zip 509178 BLAKE2B 28a9600f1f26be089d65e264b2cdaf73bb2c0971b2e702ae31f130543c2b81cbbe93ef3f1593ced77394dcce5c1f5dbd8388cc5402c7d0d0a3fe38fbe8b63903 SHA512 1db053fc95051f1481b88b367cf4843137f0d23c6a0c3d350b52a7393319fb2c68a2fcc785d88d79f4128def271d2e3e51ec80a6fe7486af5f5e48b8b07c17cb
+DIST github.com%2Fvbauerster%2Fmpb%2Fv4%2F@v%2Fv4.7.0.mod 206 BLAKE2B 02b757c210bf330d3acba93e02899c0d2ae155601e30a8499c6080753e4f7deb4c81d5c049fce14a621956b2403a6db06e73a04ee48e69e3a3a2165e50fb40a3 SHA512 49d081250c6ee139c43c5af0ab9ad107d641f7f9dd3f4228011f865cdd2f776413adad2d127e8706f8bcbfca405fa25a10a8ddc2dc244489874442dc857b10d2
+DIST github.com%2Fvbauerster%2Fmpb%2Fv4%2F@v%2Fv4.7.0.zip 78561 BLAKE2B 67fab6a066d45754fa45436f17146e5368043618d19c69ddd60f9b49a8a6ef99719bc10128a8aa54b4315338d3ccbe916974fda5d39f0ba2e8db40aa999266d7 SHA512 84669d64d66da48d317616276770578adc0da17e4280992502a70f1589b2861b6687e557c013fdd8d2ff94ad1389cad138601f8f8f4677c353f31cb9cea99e61
+DIST github.com%2Fxanzy%2Fssh-agent%2F@v%2Fv0.2.0.mod 34 BLAKE2B 1c824ffff1153d780abb089e618153485d1e135868bc07c824af3f1d32884f7b0f8f6ff4a267c5658c6e1557177e9939bc4a48fd6085a8ab369d92f9a3a15f92 SHA512 d114cab301fbb78c159b06972beb8d246f50bf3b8bc0ef7109b89e616dd630ad009cd85b9a3ab2a28ead0e1250a6dd8e930afd3faa409f34f40356e67f1d7601
+DIST github.com%2Fxanzy%2Fssh-agent%2F@v%2Fv0.2.0.zip 9621 BLAKE2B 39e1831190d6c3586fef1ef570dc42a5bfb7814cd9edba1789b8e0dfbac4a032330a284e69d99ee7d2b1d6722f6c104b2e0f0d55af6c39fda232de29a00f3f2b SHA512 d814306a9a3f47187f8f37677243601ef790a76e068871c88966ecba930ffc303744072fde446eab67acf46340670f059271b53d37ba537a1b64ce2bb877759c
+DIST github.com%2Fxi2%2Fxz%2F@v%2Fv0.0.0-20171230120015-48954b6210f8.mod 25 BLAKE2B 21e5b310a30482f79ce878f1649fa49b3d1b34db022063882a89a83e18e58db00042a2dc35005a715f1d75a3cb8fe72dc3637a91649946f2205582aad092a1fe SHA512 5b8492ae7974c4282c5302607f891aeb4f49dbc4c04bc492f99edd9e9cf89e4f6a37f52a0897ec28440cd2aa1c91ebd8e10075eae4156ea574f7ff4363845e74
 DIST github.com-VividCortex-ewma-v1.1.1.tar.gz 6042 BLAKE2B 03a1a3b89113adb1a99133aade2b30847f201cfa18d7de1fecff036dab397865293e4faa7edf66b7a6e5a9221989da6daa64e0a77a4ad7c26f7a9a2283aae13c SHA512 cbeb946dc6ca9a16631b3df900754d7b85ca6863b1be596612780fcd1907f4f8c301460b3a5aac97578948a591efcf2e64b574517c2652e09dcebb14076c6395
 DIST github.com-buger-jsonparser-6acdf747ae99cad92d1e8134606008acaca71844.tar.gz 47610 BLAKE2B 447c04edd86fe6dfed8ccaa9d607653e8dcceb6ec802ce889e4cd21a131085565ab553dbb25af2c0bf9130535b8373d262aab7cc19b6b9c72d2394ea4d13e9c4 SHA512 a429445c72498c9a92870c3936ab1fe220f9a6e3f5d5a98379d37d0b7dc8b3296f4bb09f94ff8b55c989d579f795ab1f5d51a6da04fae788563d3e927573c6e2
 DIST github.com-chzyer-readline-2972be24d48e78746da79ba8e24e8b488c9880de.tar.gz 36832 BLAKE2B a66fdb5126e9a9f7dfd52360d0a26916764a96df95b1d995ea1a83aac26227e16d3a2c3a419746c8ad03ba5bef4724a6abadf0ee3fdd84f347d595b9db88b6e1 SHA512 fb84020d5519cd0c5c2c06df598122e1bad3a31ed6b545aae66547e43d48d3da04a75799db9ca8957af1bd47ce2c1542440287c6722e0ab2c27b23ea9631e09a
@@ -42,6 +174,58 @@ DIST github.com-src-d-go-git-v4.7.0.tar.gz 375873 BLAKE2B 0d010a8522ce858a812a16
 DIST github.com-ulikunitz-xz-v0.5.4.tar.gz 477002 BLAKE2B f1805bf4aeec4492376d1c94f7b92d56c4096445d295c00e4db2e7d2b1170842f4bc64ec102ac6c146202a432ed0083948dc44cc443955cbf01981ad194017e2 SHA512 b9adad794a11ba6534cf31a722683995d517d55dbbb5510403538247931b88c00118b3d676b07c46d1e7c95805938240e4af88a428e41afc1c3d65b159820702
 DIST github.com-vbauerster-mpb-v4.7.0.tar.gz 53244 BLAKE2B 61945f6bc07015ab1f3bf2b202ed5e9af59fb52b090258802aa04bc97974c1d14a5c7e838dd381de5485285bd39623fe5faa7e1ec3273e587c09c7803c59be51 SHA512 ce35988092ab30ce6a5531024b976a9fff33024c5b3a066d885c7804c153c0846710e58a624184654cd5df5dd13712dcea5370d569bfe73834149828f3edce9e
 DIST github.com-xanzy-ssh-agent-v0.2.0.tar.gz 7273 BLAKE2B 5a73c92d4190e3f9c10754b4ddbd958a445e666c3e716b5465e8d667d1ce6b4e4421da6d00dd39bb214868fc72c0d85e11df13b54bd78a0f3759d815b42d8225 SHA512 7305f3db69ef1ed816d0884baf24c072af02afd5b5988cef7191ea3d3b80b23c282c412e8460856267ebc5cb8c6af2be357c7e680c417c99ed76b770fb198e70
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181001203147-e3636079e1a4.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod 88 BLAKE2B aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a SHA512 2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190426145343-a29dc8fdc734.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190426145343-a29dc8fdc734.zip 1806150 BLAKE2B 55682fbe3693b848335acdd64fe896a8a61bb63423192160926bf89ac20435d96b3743f1409fdf423a93352fead9ada4be631f5d319c730d0067f6af6acbe12d SHA512 4e3dc4ab13b622a0941b1417c47b572b7850fc225ef8614d287e2f2532d03e8da4b6f13ef1d002323ccf1b14e1b3af206efea7a5550c0a64dbbc29705120972f
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.zip 1812396 BLAKE2B 6a78f16355c218fd5670a85d17dbe4b66b2ed80dbf08cc62827ef873a6c10fc0850cf2285d839446978980513b6d048eba2b054884da91244abd25fc2eb8dd85 SHA512 da2da56521490eae98c27ff1099f8c7a8681402d0db46e9f981576bae3df5e0968b15dc6b0ffefaab889ae4c08c78bef50c6b18120a63bc504047acb987405a2
+DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.1.0.mod 97 BLAKE2B 54b5bbd5b0908619326ca8bcebebf13f45b2838737d22008f20d3f40ae52fb4f8fdb8c73cbd98b57873aefc8b37c7328aab2bf02ad82a7d5f83e0d75a9283e81 SHA512 4e955424df3c1cce0b716fc518eed10196feb34ec718c1fe537350ce99efd0676276c2000feca6faaa6f3db8ce626e2d330f700fa43a10c73120dd13f5f1a764
+DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.1.0.zip 71446 BLAKE2B 2d127036cb3c1b28be698f2528462e344c02e0e9db6ca79c060d56a054f9ae1905de8a42243282ec56af23d6d3e795f55d4b7174d2cc6c0bbdfbf0e84ab6d76b SHA512 d0242e65d3d02b71706afe823cc1251dc914c0fb41147f7b2c7cc3e252b709f92300fdd13a8d22b1acf91252a95a2226b1637be46317c3b3a76f9c2c6b147342
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180926154720-4dfa2610cdf3.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180926154720-4dfa2610cdf3.zip 1331113 BLAKE2B 0797deb103f92efeba23f9735203f9ee78c6dafc4291c33809eaab145d59effd886d3c2cef53aad00c9d64def5447d607c6f7d40cbd2491e110924d26808f5eb SHA512 21596677e174ae2b4850983f54a2979e79fb0dc576c7b5cb3e1aa4c78db63923e3760e79a3c8dc1653f445e5fa2fa6002d501faea741cffb270c334d9ef4cbd0
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.zip 1322507 BLAKE2B 5b9988629da614ea3908f5f72307b64e02f2e9005ddb51177be32ebf670c9c89e3d62d4222d996728572bdb4716cbe492f77d966c22aefd4d31700c9ff9cca3e SHA512 0e757735d9080f79e627dd107607c1b9f9163be08dbb304d4a9219564ae5f34727ad622e84c650eacbd4eb5cc939086e8364c847c21e768a70e08cc1d3e1af4d
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.zip 1277629 BLAKE2B becbc737f58b56645d8b449a7cdaf786a6bf70ab4db8d1876a4825b2f3d52b85e506fc9caf6a23a5857f992104b662e0f824e6fa23e7c92e27ba0ada574b255d SHA512 0d740cd05300d902cf60f54692cbdf91758457ac21a66738beac133b3a31930b3833b10978750efb59450d75f0b750985e28218d04e1d8e3e68c4c883fadab58
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180903190138-2b024373dcd9.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180906133057-8cf3aee42992.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180906133057-8cf3aee42992.zip 1392918 BLAKE2B 39ed4b9c664e7e024b00ebc8b0d211b29eda8457fdcef2e51c144391538bd8c2c088e5e1674ff7430d2fb1cebe3e659f02fba8b9c765ca5387e5a55635ccd196 SHA512 899d0fd7a21fa5d68f0ab96a0d17b95113dcb099e65bdc12d6961313f64c4820fe7b9859a0bee7b8837e4d03574da2ef087b2ad3b90ef889c0f44c08a59e96fd
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.zip 1438775 BLAKE2B e8b4b6a5ed32eb337abc8df4ba122356c664b4b23fd7f4bf7e08772a031795a293e26aefee819865ef381593807f0af82d9333822f31979d217414edc8b8288a SHA512 3a3f9adfced28713c60cb0047a0fd8a9b4de774fbd96afa7494d7fcb062f172e33024be15abfdeb7565987ee44e71390366fe43b78e8709d21cdc11be491a927
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190429190828-d89cdac9e872.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190429190828-d89cdac9e872.zip 1743430 BLAKE2B bf294f5821489f3e5aa55ca20dcaf47a72a1f238a71f40fc594e407e616883b6a6ab5379c1475b53f9397358477532f10174711f000fa503d43f9b2b8f4595eb SHA512 90e667ca4df4e53799778f15799a5c619d3f66edc0dcaa23016dea66dec757297f9ad40ddc7cd7806e65bd7c320b1de8fc89303f9957705675424d0a514adf8b
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191008105621-543471e840be.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191120155948-bd437916bb0e.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.zip 1918660 BLAKE2B 015e9ad74f145cdd7cdeb55d7b2d8949d6e7baedaae36089fa53cb257b4fb49830aeb299ea3a1f782b2f033443a18d009cafcf0211d1709d4d37b4b97d5f3d08 SHA512 24a653028d079c52ba8128d9f43452d2ecabd374c8eba36d44704c3f70cac50761597c7b7bb6524ba50fcde696fbcded57c29f04f35e42c62e23a9790852bb56
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.zip 6349244 BLAKE2B 0aa464ac7b7d17fa7ec0627b64cd2301ed4f2819f837807db7a55725950dacb40be899b5148b07ea31b51530818edcccc6444a9800755e1d369ba8f1bce949b0 SHA512 982d78f580a7eac99a0c51e6f1fd2b2c3b91f56cd5e2b96fe960510049f7daf5915264f73f55f05675eee232a52998f9667fa84a9ccba15ed7819e4c93f583a7
+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%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.zip 41465 BLAKE2B 9a7183d3ac6591399b5208026208047a670c85e8b6014ad29955b168c63bb4953fa972d31025613c2ab12d7207adeebe9578b3c15b65ebb792f1e41df2668297 SHA512 fa7c68a2b5a6bb14f99cda92a3e77aad0e4160f659c54ea73e9813af9ff9449df6b0cab42ee283971e778b6b9da4a6098df805dd284c3b1aedfcd3a0b8504bde
+DIST gopkg.in%2Fsrc-d%2Fgo-billy.v4%2F@v%2Fv4.3.0.mod 195 BLAKE2B 2c1990b016a6cabab6e210b4c9a1e873c350c8b38ff2f87ce155f1917d5aae2c7130c54a3874d523884dc5bfb9f58b6a5885708137c8b458aa5ef733a96a361e SHA512 8cfb164ba3aded529dc0100ad9c4ab8fa35570d231fa59de9e0c2c255dfca542135a79693fe63e194b6fae90c8df2e24d4a5d4932ed2a366e353ac57f0dcf7cd
+DIST gopkg.in%2Fsrc-d%2Fgo-billy.v4%2F@v%2Fv4.3.0.zip 42390 BLAKE2B fe92b03c944d438640037fc9c4f6a00fa1f0b760255be886d1f1881cd7b19b681346ab39d781a63736810d995e4a34cfd39cc21fe2a63262b96a403d241dc771 SHA512 1426af4156a527eeb1f24bf6cec488541ed7b2ec07a6adc26ee29c20c1d83802d4b63e10c7e376f6da904690a7a415b0935869b94a0ee4eae4085e2259d13e6d
+DIST gopkg.in%2Fsrc-d%2Fgo-git-fixtures.v3%2F@v%2Fv3.1.1.mod 41 BLAKE2B 03ca301a47c343c381196bfbcfda429e85a7af164f9b299043c5ed8ce3f3c31254ed733b2ae946dbf69b57d8ac0852b4e4be05ff4e2288ff37cc1bac3f902251 SHA512 cf6f2393997a22a6e1f8549bd632b9406ae54a300c1d0981453a1bd6bdb084de71e6f5515cde2d875cc006651d689769159fa3d38fb761c194402d484bde02da
+DIST gopkg.in%2Fsrc-d%2Fgo-git-fixtures.v3%2F@v%2Fv3.1.1.zip 48327830 BLAKE2B 3dffb3c4ed58a924d167ae6f90aafcdf54bcc8c7ace3c12eb08589bd2a7c6b2cb2d81cad461f985e32c3d8f12f229fbfeb1b60127cb3c77bf89c94b8112c2835 SHA512 e37abd77cb964c3431b35f290b7163f2bb03ce8539966cb5ba727620a1b7597d456ae36ff8d1403b1aeab130f514d4220bff4a6085a447ec1d4cd97411ff3500
+DIST gopkg.in%2Fsrc-d%2Fgo-git-fixtures.v3%2F@v%2Fv3.3.0.mod 41 BLAKE2B 03ca301a47c343c381196bfbcfda429e85a7af164f9b299043c5ed8ce3f3c31254ed733b2ae946dbf69b57d8ac0852b4e4be05ff4e2288ff37cc1bac3f902251 SHA512 cf6f2393997a22a6e1f8549bd632b9406ae54a300c1d0981453a1bd6bdb084de71e6f5515cde2d875cc006651d689769159fa3d38fb761c194402d484bde02da
+DIST gopkg.in%2Fsrc-d%2Fgo-git-fixtures.v3%2F@v%2Fv3.3.0.zip 48423904 BLAKE2B 7b2204de8cb97f40d5e4c78ec3ee6a6c574fda1812459980d9ae717184f43dbce1a5c8999b965eae4edd71cbf869b0183e349966176fff05ffc6707e97cd41dc SHA512 1dd9d5c481268e369f85a766377cb3f7283cc170da72bea7b54d6e92e0dbc452a408a1563835b99fc31bf195f615116542032ed0d3e4d2b3f5a87f78038ca0c2
+DIST gopkg.in%2Fsrc-d%2Fgo-git.v4%2F@v%2Fv4.7.0.mod 32 BLAKE2B 6c6d1cd35325b75c26eb4cf73046b03177446ba3fb4ed471a50940bd14d60019bcd5131377b58809438b2211e47e2774f16b8a10f0746e558be359c7de4cde71 SHA512 7a687403819671adf368e3c276e4a1ca6ef8452aa8056c89ad8a1fa45c7379b75d44d5fde5289e9d96496ac31714f104fc4e3fce150e11de8cd0aacdbf4815d2
+DIST gopkg.in%2Fsrc-d%2Fgo-git.v4%2F@v%2Fv4.7.0.zip 528007 BLAKE2B 243c8687f1e231003780e047c04558f405a6ad3ee17da9b379b9af77840b0ed637ed74954488c7ba88b53e2eba1a1832e55d71376b2875ff6eeff31ce35cf04c SHA512 f770b231d96b8d0d527caf281e676f16f4d15c6e4b61cce62ac08a80bffcceecadc3dfe73d292565759c357be806bab673127103a9549370f2c5f2b055573bf4
+DIST gopkg.in%2Fwarnings.v0%2F@v%2Fv0.1.2.mod 28 BLAKE2B 39555ca91c4818bcc1955c20438d83965ad6f1b2058c6d8590f4c30688eab2ac08dfa1655d4de34bd68006afea1788a89fb0240d60b048be9616c8e44d8a801f SHA512 6fe714c089847582c8c01e055e4bd6b991e8fddc6e420aa03a40efb35fc4ecc5e87a60c44aa82fe004899eab427d4b82262cfebb3331b7443a2c7a68718f8f75
+DIST gopkg.in%2Fwarnings.v0%2F@v%2Fv0.1.2.zip 4950 BLAKE2B 35fad8c7c0a1de9e47bc540f34dd391c0284593466f5c99855fd204882e78cd06d0b32c144d689f516b4b8d23d90a11fd68e9dd0655a5d6dfd930300dc29c01c SHA512 d2be1d6e319c3114e44504d49c37da38c5f58ddde8b39f22e55134aff013447465d0f9354f2b899ffca4bf37bd597960860d16809ee427a0542d94b6b08cf2ba
+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 jfrog-cli-1.30.4.tar.gz 305474 BLAKE2B 5b8666608640a366cc094c1f330456d9e97710ad8968f7c92dc0a8fa69745f7910533104257ce60957b51c1db10175dc57107625557789a5fd45c5f314899bc0 SHA512 3b7670ce138499630bfc9135e4d88e85fa1e65b871d5ee1b313dec388f229d00f228fcd350fa6156a5a0b64cbc8338753e4f94a237e54d6058f61b92e9629c30
+DIST jfrog-cli-1.34.0.tar.gz 316882 BLAKE2B c0ff356da5fea8eb94d1da7a252876bdc4d40874e83b2af74aa0a13eaf6219c95f32bf493724914e75ec40cba3c1c44f0e006b1c97a4c0289e2c2337560ce109 SHA512 1e9092e38cc08a5b11dd43aceb991c36ea47c9ac3bdffcd1606693c522eebaff947db2b80ab74d4bf7669b5d1a22198d7d68fcff7d86da38002d768912219a46
+DIST jfrog-cli-1.35.3.tar.gz 346736 BLAKE2B 5b88a54c328ae6cf83b72e420a8d6d7224a67226465c7101b817bccb2d6024b283a84a118516c85f8056b5e0b9f2f74cde3322a44b2c8b40ba8fb36932437d06 SHA512 1a0a088611df84dbace620c90e2a51372c7b3b19cf55b0616d5629bd61da190300f38ce2c9db96785bfe871e83cc03bdace9e0fd4161380acda7a2a3dc24df1b
 EBUILD jfrog-cli-1.30.4.ebuild 3312 BLAKE2B 061a9d784e01cb78bd91512f40e91ae57f4fa5e1a4282af01a972d53d356d8b02695262b0f2aa2ae549a775ab93cd7af6272284a73396102c8066acac3d797b0 SHA512 41b670bc76937927e77e6fec83e0e083f2bd55ab13562dde99c230c89a9bf543e603a3890813e0f873d1256952757671cf27c0f5f232f7513e712bc586b02901
+EBUILD jfrog-cli-1.34.0.ebuild 7561 BLAKE2B 98ff5234136f883a78a0c95b4c065167d10bfe7dc9e099f7ff08f78ff4d41450c1853be3ea38c630159c8dcfaf09f13efafe9c4d1c680a08d0b84e0af340e581 SHA512 3034add4b42992921ee34b4b552c0b35309d198870324dfe9647296bacdd7b4cf3d0e91a4dcdfd8b5a7effaca841b0313b9abb2d7d830de54e068024d539f298
+EBUILD jfrog-cli-1.35.3.ebuild 8554 BLAKE2B f8e18f89c76515556742af759c58178bb356db8f7213ebff56f3abe667f771a2fb23c1c41bd8e0a07c547790688a67f3848e183f680ff035a7c3b91bc1ca9551 SHA512 77ea3eecdf8139aa7747ac00efa8c98ce285431314b87e59c3a64385151c4be06fc49fc0f1b9293f098aa7690214039e195419c2ed29fdfe5a2b71ee68eb8ee1
 MISC metadata.xml 244 BLAKE2B 69bff1931d3487cac65b10ff2068c2ffeb68b772ca4ed4842f39d8c92403572314769f3babca3204dbf3ebec92d813821ab79ba7c78e8ca9d161149e4db88fba SHA512 ee1587876b1ab6b66fc7a7eaa9d6c1c8fa0389f885da6fd6dd88bfcea3d179f0dc36a5c8be70fefa35cfb16eb4f92f41c24a438e9db57580949a1e796b1b2d78
diff --git a/dev-util/jfrog-cli/jfrog-cli-1.34.0.ebuild b/dev-util/jfrog-cli/jfrog-cli-1.34.0.ebuild
new file mode 100644
index 000000000000..ff47b68e5a08
--- /dev/null
+++ b/dev-util/jfrog-cli/jfrog-cli-1.34.0.ebuild
@@ -0,0 +1,176 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+
+DESCRIPTION="Command line utility foroperations on container images and image repositories"
+HOMEPAGE="https://github.com/jfrog/jfrog-cli"
+
+EGO_SUM=(
+	"github.com/BurntSushi/toml v0.3.1"
+	"github.com/BurntSushi/toml v0.3.1/go.mod"
+	"github.com/VividCortex/ewma v1.1.1"
+	"github.com/VividCortex/ewma v1.1.1/go.mod"
+	"github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7"
+	"github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7/go.mod"
+	"github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239"
+	"github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod"
+	"github.com/buger/jsonparser v0.0.0-20180910192245-6acdf747ae99"
+	"github.com/buger/jsonparser v0.0.0-20180910192245-6acdf747ae99/go.mod"
+	"github.com/chzyer/logex v1.1.10"
+	"github.com/chzyer/logex v1.1.10/go.mod"
+	"github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e"
+	"github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod"
+	"github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1"
+	"github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod"
+	"github.com/codegangsta/cli v1.20.0"
+	"github.com/codegangsta/cli v1.20.0/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/dsnet/compress v0.0.1"
+	"github.com/dsnet/compress v0.0.1/go.mod"
+	"github.com/dsnet/golib v0.0.0-20171103203638-1ea166775780/go.mod"
+	"github.com/emirpasic/gods v1.12.0"
+	"github.com/emirpasic/gods v1.12.0/go.mod"
+	"github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568"
+	"github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod"
+	"github.com/frankban/quicktest v1.7.2"
+	"github.com/frankban/quicktest v1.7.2/go.mod"
+	"github.com/fsnotify/fsnotify v1.4.7"
+	"github.com/fsnotify/fsnotify v1.4.7/go.mod"
+	"github.com/gliderlabs/ssh v0.1.1"
+	"github.com/gliderlabs/ssh v0.1.1/go.mod"
+	"github.com/golang/snappy v0.0.1"
+	"github.com/golang/snappy v0.0.1/go.mod"
+	"github.com/google/go-cmp v0.2.0/go.mod"
+	"github.com/google/go-cmp v0.3.1"
+	"github.com/google/go-cmp v0.3.1/go.mod"
+	"github.com/hashicorp/hcl v1.0.0"
+	"github.com/hashicorp/hcl v1.0.0/go.mod"
+	"github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99"
+	"github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod"
+	"github.com/jfrog/gocmd v0.1.12"
+	"github.com/jfrog/gocmd v0.1.12/go.mod"
+	"github.com/jfrog/gofrog v1.0.5"
+	"github.com/jfrog/gofrog v1.0.5/go.mod"
+	"github.com/jfrog/jfrog-client-go v0.6.2/go.mod"
+	"github.com/jfrog/jfrog-client-go v0.8.0"
+	"github.com/jfrog/jfrog-client-go v0.8.0/go.mod"
+	"github.com/kevinburke/ssh_config v0.0.0-20180830205328-81db2a75821e"
+	"github.com/kevinburke/ssh_config v0.0.0-20180830205328-81db2a75821e/go.mod"
+	"github.com/klauspost/compress v1.4.1/go.mod"
+	"github.com/klauspost/cpuid v1.2.0/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/text v0.1.0"
+	"github.com/kr/text v0.1.0/go.mod"
+	"github.com/magiconair/properties v1.8.0"
+	"github.com/magiconair/properties v1.8.0/go.mod"
+	"github.com/mattn/go-shellwords v1.0.3"
+	"github.com/mattn/go-shellwords v1.0.3/go.mod"
+	"github.com/mholt/archiver v2.1.0+incompatible"
+	"github.com/mholt/archiver v2.1.0+incompatible/go.mod"
+	"github.com/mitchellh/go-homedir v1.0.0"
+	"github.com/mitchellh/go-homedir v1.0.0/go.mod"
+	"github.com/mitchellh/mapstructure v1.0.0"
+	"github.com/mitchellh/mapstructure v1.0.0/go.mod"
+	"github.com/nwaples/rardecode v1.0.0"
+	"github.com/nwaples/rardecode v1.0.0/go.mod"
+	"github.com/pelletier/go-buffruneio v0.2.0"
+	"github.com/pelletier/go-buffruneio v0.2.0/go.mod"
+	"github.com/pelletier/go-toml v1.2.0"
+	"github.com/pelletier/go-toml v1.2.0/go.mod"
+	"github.com/pierrec/lz4 v2.3.0+incompatible"
+	"github.com/pierrec/lz4 v2.3.0+incompatible/go.mod"
+	"github.com/pkg/errors v0.8.0"
+	"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/sergi/go-diff v1.0.0"
+	"github.com/sergi/go-diff v1.0.0/go.mod"
+	"github.com/spf13/afero v1.1.2"
+	"github.com/spf13/afero v1.1.2/go.mod"
+	"github.com/spf13/cast v1.2.0"
+	"github.com/spf13/cast v1.2.0/go.mod"
+	"github.com/spf13/jwalterweatherman v1.0.0"
+	"github.com/spf13/jwalterweatherman v1.0.0/go.mod"
+	"github.com/spf13/pflag v1.0.2"
+	"github.com/spf13/pflag v1.0.2/go.mod"
+	"github.com/spf13/viper v1.2.1"
+	"github.com/spf13/viper v1.2.1/go.mod"
+	"github.com/src-d/gcfg v1.3.0"
+	"github.com/src-d/gcfg v1.3.0/go.mod"
+	"github.com/stretchr/objx v0.1.0/go.mod"
+	"github.com/stretchr/testify v1.2.2"
+	"github.com/stretchr/testify v1.2.2/go.mod"
+	"github.com/stretchr/testify v1.4.0"
+	"github.com/stretchr/testify v1.4.0/go.mod"
+	"github.com/ulikunitz/xz v0.5.6"
+	"github.com/ulikunitz/xz v0.5.6/go.mod"
+	"github.com/vbauerster/mpb/v4 v4.7.0"
+	"github.com/vbauerster/mpb/v4 v4.7.0/go.mod"
+	"github.com/xanzy/ssh-agent v0.2.0"
+	"github.com/xanzy/ssh-agent v0.2.0/go.mod"
+	"github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8/go.mod"
+	"golang.org/x/crypto v0.0.0-20181001203147-e3636079e1a4/go.mod"
+	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+	"golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734"
+	"golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734/go.mod"
+	"golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529"
+	"golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod"
+	"golang.org/x/mod v0.1.0"
+	"golang.org/x/mod v0.1.0/go.mod"
+	"golang.org/x/net v0.0.0-20180926154720-4dfa2610cdf3"
+	"golang.org/x/net v0.0.0-20180926154720-4dfa2610cdf3/go.mod"
+	"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a"
+	"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/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/sys v0.0.0-20180903190138-2b024373dcd9/go.mod"
+	"golang.org/x/sys v0.0.0-20180906133057-8cf3aee42992"
+	"golang.org/x/sys v0.0.0-20180906133057-8cf3aee42992/go.mod"
+	"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5"
+	"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
+	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
+	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
+	"golang.org/x/sys v0.0.0-20190429190828-d89cdac9e872"
+	"golang.org/x/sys v0.0.0-20190429190828-d89cdac9e872/go.mod"
+	"golang.org/x/text v0.3.0"
+	"golang.org/x/text v0.3.0/go.mod"
+	"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/src-d/go-billy.v4 v4.3.0"
+	"gopkg.in/src-d/go-billy.v4 v4.3.0/go.mod"
+	"gopkg.in/src-d/go-git-fixtures.v3 v3.1.1/go.mod"
+	"gopkg.in/src-d/go-git-fixtures.v3 v3.3.0"
+	"gopkg.in/src-d/go-git-fixtures.v3 v3.3.0/go.mod"
+	"gopkg.in/src-d/go-git.v4 v4.7.0"
+	"gopkg.in/src-d/go-git.v4 v4.7.0/go.mod"
+	"gopkg.in/warnings.v0 v0.1.2"
+	"gopkg.in/warnings.v0 v0.1.2/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"
+	)
+go-module_set_globals
+SRC_URI="https://github.com/jfrog/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}"
+
+LICENSE="Apache-2.0 BSD BSD-2 MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+src_compile() {
+	./build.sh || die
+}
+
+src_install() {
+	dobin jfrog
+	einstalldocs
+}
diff --git a/dev-util/jfrog-cli/jfrog-cli-1.35.3.ebuild b/dev-util/jfrog-cli/jfrog-cli-1.35.3.ebuild
new file mode 100644
index 000000000000..88c235e53330
--- /dev/null
+++ b/dev-util/jfrog-cli/jfrog-cli-1.35.3.ebuild
@@ -0,0 +1,196 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+
+DESCRIPTION="Command line utility foroperations on container images and image repositories"
+HOMEPAGE="https://github.com/jfrog/jfrog-cli"
+
+EGO_SUM=(
+	"github.com/BurntSushi/toml v0.3.1"
+	"github.com/BurntSushi/toml v0.3.1/go.mod"
+	"github.com/VividCortex/ewma v1.1.1"
+	"github.com/VividCortex/ewma v1.1.1/go.mod"
+	"github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7"
+	"github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7/go.mod"
+	"github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239"
+	"github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod"
+	"github.com/buger/jsonparser v0.0.0-20180910192245-6acdf747ae99"
+	"github.com/buger/jsonparser v0.0.0-20180910192245-6acdf747ae99/go.mod"
+	"github.com/c-bata/go-prompt v0.2.3"
+	"github.com/c-bata/go-prompt v0.2.3/go.mod"
+	"github.com/chzyer/logex v1.1.10"
+	"github.com/chzyer/logex v1.1.10/go.mod"
+	"github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e"
+	"github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod"
+	"github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1"
+	"github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod"
+	"github.com/codegangsta/cli v1.20.0"
+	"github.com/codegangsta/cli v1.20.0/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/dsnet/compress v0.0.1"
+	"github.com/dsnet/compress v0.0.1/go.mod"
+	"github.com/dsnet/golib v0.0.0-20171103203638-1ea166775780/go.mod"
+	"github.com/emirpasic/gods v1.12.0"
+	"github.com/emirpasic/gods v1.12.0/go.mod"
+	"github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568"
+	"github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod"
+	"github.com/frankban/quicktest v1.7.2"
+	"github.com/frankban/quicktest v1.7.2/go.mod"
+	"github.com/fsnotify/fsnotify v1.4.7"
+	"github.com/fsnotify/fsnotify v1.4.7/go.mod"
+	"github.com/gliderlabs/ssh v0.1.1"
+	"github.com/gliderlabs/ssh v0.1.1/go.mod"
+	"github.com/golang/snappy v0.0.1"
+	"github.com/golang/snappy v0.0.1/go.mod"
+	"github.com/google/go-cmp v0.3.1"
+	"github.com/google/go-cmp v0.3.1/go.mod"
+	"github.com/hashicorp/hcl v1.0.0"
+	"github.com/hashicorp/hcl v1.0.0/go.mod"
+	"github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99"
+	"github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod"
+	"github.com/jfrog/gocmd v0.1.13"
+	"github.com/jfrog/gocmd v0.1.13/go.mod"
+	"github.com/jfrog/gofrog v1.0.6"
+	"github.com/jfrog/gofrog v1.0.6/go.mod"
+	"github.com/jfrog/jfrog-client-go v0.9.0/go.mod"
+	"github.com/jfrog/jfrog-client-go v0.9.1"
+	"github.com/jfrog/jfrog-client-go v0.9.1/go.mod"
+	"github.com/kevinburke/ssh_config v0.0.0-20180830205328-81db2a75821e"
+	"github.com/kevinburke/ssh_config v0.0.0-20180830205328-81db2a75821e/go.mod"
+	"github.com/klauspost/compress v1.4.1/go.mod"
+	"github.com/klauspost/cpuid v1.2.0/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/text v0.1.0"
+	"github.com/kr/text v0.1.0/go.mod"
+	"github.com/magiconair/properties v1.8.0"
+	"github.com/magiconair/properties v1.8.0/go.mod"
+	"github.com/mattn/go-colorable v0.1.4/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.8/go.mod"
+	"github.com/mattn/go-isatty v0.0.10/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.6/go.mod"
+	"github.com/mattn/go-runewidth v0.0.9"
+	"github.com/mattn/go-runewidth v0.0.9/go.mod"
+	"github.com/mattn/go-shellwords v1.0.3"
+	"github.com/mattn/go-shellwords v1.0.3/go.mod"
+	"github.com/mattn/go-tty v0.0.3"
+	"github.com/mattn/go-tty v0.0.3/go.mod"
+	"github.com/mholt/archiver v2.1.0+incompatible"
+	"github.com/mholt/archiver v2.1.0+incompatible/go.mod"
+	"github.com/mitchellh/go-homedir v1.0.0"
+	"github.com/mitchellh/go-homedir v1.0.0/go.mod"
+	"github.com/mitchellh/mapstructure v1.0.0"
+	"github.com/mitchellh/mapstructure v1.0.0/go.mod"
+	"github.com/nwaples/rardecode v1.0.0"
+	"github.com/nwaples/rardecode v1.0.0/go.mod"
+	"github.com/pelletier/go-buffruneio v0.2.0"
+	"github.com/pelletier/go-buffruneio v0.2.0/go.mod"
+	"github.com/pelletier/go-toml v1.2.0"
+	"github.com/pelletier/go-toml v1.2.0/go.mod"
+	"github.com/pierrec/lz4 v2.3.0+incompatible"
+	"github.com/pierrec/lz4 v2.3.0+incompatible/go.mod"
+	"github.com/pkg/errors v0.8.0"
+	"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/pkg/term v0.0.0-20190109203006-aa71e9d9e942"
+	"github.com/pkg/term v0.0.0-20190109203006-aa71e9d9e942/go.mod"
+	"github.com/pmezard/go-difflib v1.0.0"
+	"github.com/pmezard/go-difflib v1.0.0/go.mod"
+	"github.com/sergi/go-diff v1.0.0"
+	"github.com/sergi/go-diff v1.0.0/go.mod"
+	"github.com/spf13/afero v1.1.2"
+	"github.com/spf13/afero v1.1.2/go.mod"
+	"github.com/spf13/cast v1.2.0"
+	"github.com/spf13/cast v1.2.0/go.mod"
+	"github.com/spf13/jwalterweatherman v1.0.0"
+	"github.com/spf13/jwalterweatherman v1.0.0/go.mod"
+	"github.com/spf13/pflag v1.0.2"
+	"github.com/spf13/pflag v1.0.2/go.mod"
+	"github.com/spf13/viper v1.2.1"
+	"github.com/spf13/viper v1.2.1/go.mod"
+	"github.com/src-d/gcfg v1.3.0"
+	"github.com/src-d/gcfg v1.3.0/go.mod"
+	"github.com/stretchr/objx v0.1.0/go.mod"
+	"github.com/stretchr/testify v1.2.2"
+	"github.com/stretchr/testify v1.2.2/go.mod"
+	"github.com/stretchr/testify v1.4.0"
+	"github.com/stretchr/testify v1.4.0/go.mod"
+	"github.com/ulikunitz/xz v0.5.6"
+	"github.com/ulikunitz/xz v0.5.6/go.mod"
+	"github.com/vbauerster/mpb/v4 v4.7.0"
+	"github.com/vbauerster/mpb/v4 v4.7.0/go.mod"
+	"github.com/xanzy/ssh-agent v0.2.0"
+	"github.com/xanzy/ssh-agent v0.2.0/go.mod"
+	"golang.org/x/crypto v0.0.0-20181001203147-e3636079e1a4/go.mod"
+	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+	"golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734"
+	"golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734/go.mod"
+	"golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529"
+	"golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod"
+	"golang.org/x/mod v0.1.0"
+	"golang.org/x/mod v0.1.0/go.mod"
+	"golang.org/x/net v0.0.0-20180926154720-4dfa2610cdf3"
+	"golang.org/x/net v0.0.0-20180926154720-4dfa2610cdf3/go.mod"
+	"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a"
+	"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/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/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod"
+	"golang.org/x/sys v0.0.0-20180903190138-2b024373dcd9/go.mod"
+	"golang.org/x/sys v0.0.0-20180906133057-8cf3aee42992"
+	"golang.org/x/sys v0.0.0-20180906133057-8cf3aee42992/go.mod"
+	"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5"
+	"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/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-20190429190828-d89cdac9e872"
+	"golang.org/x/sys v0.0.0-20190429190828-d89cdac9e872/go.mod"
+	"golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod"
+	"golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/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/text v0.3.0"
+	"golang.org/x/text v0.3.0/go.mod"
+	"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/src-d/go-billy.v4 v4.3.0"
+	"gopkg.in/src-d/go-billy.v4 v4.3.0/go.mod"
+	"gopkg.in/src-d/go-git-fixtures.v3 v3.1.1"
+	"gopkg.in/src-d/go-git-fixtures.v3 v3.1.1/go.mod"
+	"gopkg.in/src-d/go-git.v4 v4.7.0"
+	"gopkg.in/src-d/go-git.v4 v4.7.0/go.mod"
+	"gopkg.in/warnings.v0 v0.1.2"
+	"gopkg.in/warnings.v0 v0.1.2/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"
+	)
+go-module_set_globals
+SRC_URI="https://github.com/jfrog/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}"
+
+LICENSE="Apache-2.0 BSD BSD-2 MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+src_compile() {
+	./build.sh || die
+}
+
+src_install() {
+	dobin jfrog
+	einstalldocs
+}
diff --git a/dev-util/kdevelop-pg-qt/Manifest b/dev-util/kdevelop-pg-qt/Manifest
index 419c3a711084..aa1ba3abdb3b 100644
--- a/dev-util/kdevelop-pg-qt/Manifest
+++ b/dev-util/kdevelop-pg-qt/Manifest
@@ -1,6 +1,3 @@
-AUX kdevelop-pg-qt-2.2.0-qt-5.14.patch 1988 BLAKE2B cffef4d7f61981b3f8e236e225e54b9ccb1964b1648c78b506678a76c0082f4e9ad8b6f1b68ff5d7e7a6f2413c7589513bf0db288d57cbc176d37a3b5959d7c9 SHA512 6b4429de2c8770c869e821a1a196cafdb52c6aa350c8d0dffd9d232fb1cb1ca3ef1da01fee70195b7344685ee82b735f9baea6e1365e58a98b52dbb4d29fdf2d
-DIST kdevelop-pg-qt-2.2.0.tar.xz 660284 BLAKE2B 103572038bc3c3c43eecd3ff9411e2d28aeabf60bfc0bb91c6056d05901711f2dfe03ba098c658000b1a68998644efe34cede2857b3131e2a59f4accf8cecbf2 SHA512 a34bbdbf6e99d3b004c8a1d925fa5d45d9084b1542551f71de6a79c7ef851ca7057593f09c8824ae7961072c9f5e16199d7c4d7a037174f81163f669c96970f4
 DIST kdevelop-pg-qt-2.2.1.tar.xz 660904 BLAKE2B b3874ee4f36d43f6d39a28a79f4638601340ce0545c2fe965393e9fe266a960e904ce5cd3215a7903f7b011f2e138d3be8999563366ce796f50524084a36192b SHA512 0ef3daba60ee6c7d4602b31610bdc68709a730d4c3443770eac1aa1d298fc03e10b38bc0d2e34dd44df5bba1c3af945c87e80d8aaa818e0b1787121f056c78a9
-EBUILD kdevelop-pg-qt-2.2.0.ebuild 531 BLAKE2B 00ef3f6743a06fd8fd3a7c2bc3e1a8f0bf49110b6c75908d935924930420ec7ae886b3473f062a3358b7e59e9b4803dd9d7b1a30879e484497741fa446c6bcc9 SHA512 920d51678d03733ba0a2cac526fc84f6ef1456e1353127a0f30f13201bb148253c5a6df42f9ccd53bea7539a96fed794cd039277262e9abd976cd501e5641cbb
-EBUILD kdevelop-pg-qt-2.2.1.ebuild 494 BLAKE2B 43152b853defb577067030dd3b02f33591d63f711682b3ee4c644be0b0059c59d79a004c494aa0877a699dc1b42083b897055950fb3a3b81d94a0298514dc6d5 SHA512 157b6276f146565be3f22db86b7ae1746fa55b7e7b9eb8dad71cb63adcdc7ba411190e8feb33ec392114dada2a0ca93cf8c8869939147ff7c3c08e2ac1534437
+EBUILD kdevelop-pg-qt-2.2.1.ebuild 492 BLAKE2B db1956e6282aa0caf8ef3ba25430d663edb699a05b26d16951f66c2552aabc1d7af75e9804050e76836a62da2ff1b138ab5b036c875839a9c29a9fe2fbaf3eda SHA512 2be1178ad167df317436653d1154b1ce3d5ffb425e34117c1e451d3bae4f35766edfeec0351dba1912b92f52e57939dfd4a8a8b4b33fdad7761faf61d58d504e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-util/kdevelop-pg-qt/files/kdevelop-pg-qt-2.2.0-qt-5.14.patch b/dev-util/kdevelop-pg-qt/files/kdevelop-pg-qt-2.2.0-qt-5.14.patch
deleted file mode 100644
index 5a4dec36d887..000000000000
--- a/dev-util/kdevelop-pg-qt/files/kdevelop-pg-qt-2.2.0-qt-5.14.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From d05d0b19e9d6f47fee3e11d837c2c21125589763 Mon Sep 17 00:00:00 2001
-From: Alexey Min <alexey.min@gmail.com>
-Date: Thu, 24 Oct 2019 14:34:45 +0300
-Subject: Fix build with Qt 5.14
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Summary:
-Trying to build kdevelop-pg-qt with Qt 5.14 results in an error:
-```
-.../kdev-pg/kdev-pg-regexp.cpp:44:23: error: redefinition of ‘struct std::hash<QBitArray>’
-     template<> struct hash< type >                          \
-                       ^~~~~~~~~~~~
-.../kdev-pg/kdev-pg-regexp.cpp:53:1: note: in expansion of macro ‘q_Hash_to_tr1_hash’
- q_Hash_to_tr1_hash(QBitArray)
- ^~~~~~~~~~~~~~~~~~
-In file included from .../prefix514/include/QtCore/qvector.h:47:0,
-                 from .../prefix514/include/QtCore/QVector:1,
-                 from .../kdevelop-pg-qt/include/kdev-pg-char-sets.h:36,
-                 from .../kdevelop-pg-qt/kdev-pg/kdev-pg-regexp.cpp:20:
-.../prefix514/include/QtCore/qhashfunctions.h:209:1: note: previous definition of ‘struct std::hash<QBitArray>’
- QT_SPECIALIZE_STD_HASH_TO_CALL_QHASH_BY_CREF(QBitArray)
- ^
-```
-
-std::hash<QBitArray> is already specialized in Qt 5.14, so avoid redefinition with conditional compilation
-
-Test Plan: try to build with Qt 5.14
-
-Reviewers: apol
-
-Reviewed By: apol
-
-Subscribers: kdevelop-devel
-
-Tags: #kdevelop
-
-Differential Revision: https://phabricator.kde.org/D24914
----
- kdev-pg/kdev-pg-regexp.cpp | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/kdev-pg/kdev-pg-regexp.cpp b/kdev-pg/kdev-pg-regexp.cpp
-index 8cc0b95..9fee81c 100644
---- a/kdev-pg/kdev-pg-regexp.cpp
-+++ b/kdev-pg/kdev-pg-regexp.cpp
-@@ -50,7 +50,10 @@ namespace std                                               \
-     };                                                      \
- }
- 
-+#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0))
-+// Qt >= 5.14 already has std::hash for QBitArray
- q_Hash_to_tr1_hash(QBitArray)
-+#endif
- 
- namespace KDevPG
- {
--- 
-cgit v1.1
diff --git a/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.2.0.ebuild b/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.2.0.ebuild
deleted file mode 100644
index 7aea0fc71f7d..000000000000
--- a/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.2.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-inherit ecm kde.org
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-	KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="LL(1) parser generator used mainly by KDevelop language plugins"
-HOMEPAGE="https://www.kdevelop.org/"
-
-LICENSE="LGPL-2+ LGPL-2.1+"
-SLOT="5"
-IUSE=""
-
-PATCHES=( "${FILESDIR}/${P}-qt-5.14.patch" )
-
-BDEPEND="
-	sys-devel/bison
-	sys-devel/flex
-"
diff --git a/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.2.1.ebuild b/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.2.1.ebuild
index 196935633101..715ae9df9aa8 100644
--- a/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.2.1.ebuild
+++ b/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.2.1.ebuild
@@ -8,7 +8,7 @@ inherit ecm kde.org
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 fi
 
 DESCRIPTION="LL(1) parser generator used mainly by KDevelop language plugins"
diff --git a/dev-util/kdevelop-php/Manifest b/dev-util/kdevelop-php/Manifest
index d97a54a4212f..8d70f40964a4 100644
--- a/dev-util/kdevelop-php/Manifest
+++ b/dev-util/kdevelop-php/Manifest
@@ -1,7 +1,5 @@
-DIST kdev-php-5.4.5.tar.xz 1045544 BLAKE2B 3b003b24637493a49b8a4416510c324fe9b588a890b692de0414e2e3595c565a9c19018137ee85a97175f7f1d9c4d1b79b5fc7817cb8ebf7f0741e1c6a6851b1 SHA512 f6432671d46c197648049310a246baa1b7ac03582cef72006c31766ece7d3a42f28809e3ce1831d2fd66c7df524817b360e806d9f53c5954dac2cabf0ad14aeb
 DIST kdev-php-5.4.6.tar.xz 1046776 BLAKE2B b69539971ed666c7887e1aed0998da59c887000c785e965d2220e829e485f46c28e12e04b3c084681dd2a96dae1d4d5fa73bd2501359de8960f8bca0e64a1968 SHA512 6711dd9034054ce2bfd684d7fabb3349436a4a8ae0924b8a6ae56a8b39aa83d4501fec389cb73d3c4c20abcfcf8c5f7dd04f63e059b987adc7991806c7eee252
 DIST kdev-php-5.5.0.tar.xz 1050144 BLAKE2B 3db5b426503b05237484ec50a5a6afe4b970e7eea36b1ad921c530c3e10848fe7a367a093cb41adf8030963c76c93e7889662eb1c8e99e58bf8ada57fc10a1b9 SHA512 2df777ff1446d5c0ae75a6f2e4d7ef50aed8c752acef0dd7f60d66b41df582d2f3c012b470e6db8aac412ab72ecdc6753c3d817652bde0ffa6ff347e3a1fef16
-EBUILD kdevelop-php-5.4.5.ebuild 1237 BLAKE2B ae25bed02dd98e93b441ceb983dd48dfee27823b2f02b689fa4b1b232823998b7e0768c601dcf3f61b63f1ce66ed1b20e00138f494dca5afef3a393a9a09ad65 SHA512 256e896c11d6ce4d63debb844328371497fdb989dfc1c0c8051f481dd8c5a495f0daa6cf053e38eba87ec412c9e5a27744b7b065de07bbe0037042c764991425
-EBUILD kdevelop-php-5.4.6.ebuild 1239 BLAKE2B 3b5d44fc31da740ff5043c38251e67daf7cd061415502f3ad2ee423148ce5b47c6a6361e2bc44797230bb721fc610f7c07dc040757523a17dd41cc668185ea3e SHA512 795ed215b6749694961c4ce157a791149274bb8ab927105a63428bde8680efe8165a3d212d38f3852887a1a3d2c3c10ad2e03d4959e28c70fe66a17103ee3471
+EBUILD kdevelop-php-5.4.6.ebuild 1237 BLAKE2B ae25bed02dd98e93b441ceb983dd48dfee27823b2f02b689fa4b1b232823998b7e0768c601dcf3f61b63f1ce66ed1b20e00138f494dca5afef3a393a9a09ad65 SHA512 256e896c11d6ce4d63debb844328371497fdb989dfc1c0c8051f481dd8c5a495f0daa6cf053e38eba87ec412c9e5a27744b7b065de07bbe0037042c764991425
 EBUILD kdevelop-php-5.5.0.ebuild 1239 BLAKE2B 3b5d44fc31da740ff5043c38251e67daf7cd061415502f3ad2ee423148ce5b47c6a6361e2bc44797230bb721fc610f7c07dc040757523a17dd41cc668185ea3e SHA512 795ed215b6749694961c4ce157a791149274bb8ab927105a63428bde8680efe8165a3d212d38f3852887a1a3d2c3c10ad2e03d4959e28c70fe66a17103ee3471
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-util/kdevelop-php/kdevelop-php-5.4.5.ebuild b/dev-util/kdevelop-php/kdevelop-php-5.4.5.ebuild
deleted file mode 100644
index 085316c767e6..000000000000
--- a/dev-util/kdevelop-php/kdevelop-php-5.4.5.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_HANDBOOK_DIR="docs"
-ECM_TEST="true"
-KDE_ORG_NAME="kdev-php"
-KFMIN=5.60.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="PHP plugin for KDevelop"
-HOMEPAGE="https://www.kdevelop.org/"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="5"
-IUSE=""
-
-BDEPEND="
-	test? ( dev-util/kdevelop:5[test] )
-"
-DEPEND="
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/ktexteditor-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/threadweaver-${KFMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	dev-util/kdevelop-pg-qt:5
-	dev-util/kdevelop:5=
-"
-RDEPEND="${DEPEND}"
-
-# remaining tests fail for some, bug 668530
-RESTRICT+=" test"
-
-src_test() {
-	# tests hang, bug 667922
-	local myctestargs=(
-		-E "(completionbenchmark|duchain_multiplefiles)"
-	)
-	ecm_src_test
-}
diff --git a/dev-util/kdevelop-php/kdevelop-php-5.4.6.ebuild b/dev-util/kdevelop-php/kdevelop-php-5.4.6.ebuild
index c5e4f236e045..085316c767e6 100644
--- a/dev-util/kdevelop-php/kdevelop-php-5.4.6.ebuild
+++ b/dev-util/kdevelop-php/kdevelop-php-5.4.6.ebuild
@@ -13,7 +13,7 @@ VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="PHP plugin for KDevelop"
diff --git a/dev-util/kdevelop-python/Manifest b/dev-util/kdevelop-python/Manifest
index 19c870214241..6c5b4111a575 100644
--- a/dev-util/kdevelop-python/Manifest
+++ b/dev-util/kdevelop-python/Manifest
@@ -1,7 +1,5 @@
-DIST kdev-python-5.4.5.tar.xz 1072356 BLAKE2B 5ad613c5a32d1fd8661a007f96aac228aeaf0b6b3baa33d2234672e13e70b70adab40f78b914c6b4ce5592e3a90e7e12442c988cc577ac103ca3fc51c2dc6d74 SHA512 d21a4032304b742885718d52bc3ea36885f48ef3f778a1b36b2d75a007cd7a84941a764950d3b2510060809e5c56e541a6216faab723b9c6334331c2c39eb5a1
 DIST kdev-python-5.4.6.tar.xz 1072228 BLAKE2B 199b8f1b0f6a4f072f2fdafa25b2653cfe855c10d601f3be7f47db84140aea84987cf1ae5f0ae19e08af5b3092cfab16aac0704f20ed46c6d872345482a663f3 SHA512 116b5649f59c2ec46aba083f9e0edebfb481c86d7677ce08fe69e161e344addbd6b4f9c955ebc2866ea118d3139377c59315c46b9e7defec119a47ff50bdd2ac
 DIST kdev-python-5.5.0.tar.xz 1073728 BLAKE2B 44a2d2ab47dced0c3c2b91a6bb269ff84e022bd4ae1036358bb7586baf8116432944363ea540ee90b22ff2bddd2cf1047c838a2404f31d6206779c53b35cf721 SHA512 6fde0221de7407a12d29c4a1df8d0d6e965613956d1b5a7fd375f4dd8ab34784b92e5b22dc523c8ce6a4aca80dc3dad16b3e549c0569959b35023b18434add26
-EBUILD kdevelop-python-5.4.5-r1.ebuild 1248 BLAKE2B 3c8f35f9469adeee5814470cbb1d48a8c2c5481e1621d3c8e81281771cb2e5ff0e74d1366ad4d5ad2f1b1f1870e35e3aef6b7a092160ed3d53beb7f4b772a7cb SHA512 ee6ae3311298a2a3e5ba52ce377265ce58e7fd927471821f55ec5e4ce5efeb6d0ab58701955c82a4c46fd09e9c754862917de0c6268e1d0fe00f1a5ff68b45cd
-EBUILD kdevelop-python-5.4.6.ebuild 1250 BLAKE2B b1d8ef9a9156c286ae962a351e8a00511f3f2c5fe0217930f0c2073634eb013a20ed2eebb24793209efd4fda43f95fca2874a54bee32820ff7e21fe2117a7bfe SHA512 348765baf12fb2f4b4b7d3f38582a6ebae407afb32b54ea2b3a78c29025067543eac3efe7db7ce4008b01104685aee686b9d2f7921a5904dd29fae75b87e4489
+EBUILD kdevelop-python-5.4.6.ebuild 1248 BLAKE2B 3c8f35f9469adeee5814470cbb1d48a8c2c5481e1621d3c8e81281771cb2e5ff0e74d1366ad4d5ad2f1b1f1870e35e3aef6b7a092160ed3d53beb7f4b772a7cb SHA512 ee6ae3311298a2a3e5ba52ce377265ce58e7fd927471821f55ec5e4ce5efeb6d0ab58701955c82a4c46fd09e9c754862917de0c6268e1d0fe00f1a5ff68b45cd
 EBUILD kdevelop-python-5.5.0-r1.ebuild 1250 BLAKE2B b1d8ef9a9156c286ae962a351e8a00511f3f2c5fe0217930f0c2073634eb013a20ed2eebb24793209efd4fda43f95fca2874a54bee32820ff7e21fe2117a7bfe SHA512 348765baf12fb2f4b4b7d3f38582a6ebae407afb32b54ea2b3a78c29025067543eac3efe7db7ce4008b01104685aee686b9d2f7921a5904dd29fae75b87e4489
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-util/kdevelop-python/kdevelop-python-5.4.5-r1.ebuild b/dev-util/kdevelop-python/kdevelop-python-5.4.5-r1.ebuild
deleted file mode 100644
index ed59051526ef..000000000000
--- a/dev-util/kdevelop-python/kdevelop-python-5.4.5-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-KDE_ORG_NAME="kdev-python"
-PYTHON_COMPAT=( python3_{6,7,8} )
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org python-single-r1
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="Python plugin for KDevelop"
-HOMEPAGE="https://www.kdevelop.org/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/ktexteditor-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/threadweaver-${KFMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	dev-util/kdevelop:5=
-"
-RDEPEND="${DEPEND}
-	$(python_gen_cond_dep '
-		dev-python/pycodestyle[${PYTHON_MULTI_USEDEP}]
-	')
-"
-
-RESTRICT+=" test"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	ecm_pkg_setup
-}
diff --git a/dev-util/kdevelop-python/kdevelop-python-5.4.6.ebuild b/dev-util/kdevelop-python/kdevelop-python-5.4.6.ebuild
index 35aff36588ac..ed59051526ef 100644
--- a/dev-util/kdevelop-python/kdevelop-python-5.4.6.ebuild
+++ b/dev-util/kdevelop-python/kdevelop-python-5.4.6.ebuild
@@ -11,7 +11,7 @@ QTMIN=5.12.3
 inherit ecm kde.org python-single-r1
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="Python plugin for KDevelop"
diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
index adc9e0c65c4c..96f520107a0a 100644
--- a/dev-util/kdevelop/Manifest
+++ b/dev-util/kdevelop/Manifest
@@ -1,7 +1,5 @@
-DIST kdevelop-5.4.5.tar.xz 7011816 BLAKE2B d067b0b034014b2f3ef7e177b59bde7c86672e8718d6860c5945ad8c8df7531cb427bed1f96b8a8d470da5a51e32134c389df53386a5c4a635825e6892cb060d SHA512 9c795402e10fceda63d0847260018f73d0318ea23a8b67db5c369259b79906a0877f1c43cdaccd5d6a456fef6bc06157dddc99bddc0b742c686057690656d5f5
 DIST kdevelop-5.4.6.tar.xz 7011868 BLAKE2B f8dc80e88592aaff6c2cc90667006a235cb4930aa6249558ee69feee8180b012b3ca6ad39bf553743a3b35bdd2c40754dd1f6081d3630566cad1d71ec75e42f2 SHA512 bcc7ee982f48982c63dbe8ac3dcfc9bdb4dda855d0d8b82740e12a616eaca71fe9e2f4a39626d70ce28d09c5f805a462ade06829f04db682fde72a2594ea4234
 DIST kdevelop-5.5.0.tar.xz 7018184 BLAKE2B 165c54ffe021c420cb688180c44a856b620248180611356429e6a98523afef3d3ea5d7edaed10cee232e614bdb470246f3c9e7b46d3bfbb288efb9e04f6258fd SHA512 6dcce4c9b124fffbd278279e6b5b9f90dff8b2f90faacd8208256951dcf7ac1ab5ae21610347ab508d3e5df49df3096a6c049271f30b1ed84b0f8401e760380f
-EBUILD kdevelop-5.4.5.ebuild 4182 BLAKE2B 62d749e681d2ae1c04696116c07eb61febb5a8ba5037a940922ddd7af14152d286d975941adfca671e403ab6bc443c9c35e7f5a289095feeea414f9454c7b64a SHA512 805bc1f19cc1f7e83fcba44599a6c785a3dd6fdf2f283501f44e37e39643c649a3d82c35142d3108db428219cfe388966e60534b52062c82960734901f55ed85
-EBUILD kdevelop-5.4.6.ebuild 4184 BLAKE2B 46fbf4262b65b695ff06236e98811ef3d6f9f8331c025efce48cd1c97f572dca90b98fe3ba2e79c00df417a82551dca39013d6f950132634a240ac39b1a8b71e SHA512 b18b97ccaa683d913bbe706d5cbd555c21147b328fd7ce078958a8495bcb63e8a7f5105d7de62bda893ca87926d60d83a90dca7d6433ca248c6e6b530f296b8e
-EBUILD kdevelop-5.5.0.ebuild 4191 BLAKE2B d270b0b82d6e0fa7867ed0f2153cd01e65213c411bb6e211f01e13ac927b65b0b2ce9736c6feb2b523c06e021137af094b5be2ae8c02c86825c2094cf5e6cc0a SHA512 26f82691b6244f63e09a6c845d47ad756a03426438be3a96409ddd8afa38d41823e8c50ca8c5b5fe7e0e8520cff7755d26bb942411982e8cf2df9d25dafbdf38
+EBUILD kdevelop-5.4.6.ebuild 4182 BLAKE2B 62d749e681d2ae1c04696116c07eb61febb5a8ba5037a940922ddd7af14152d286d975941adfca671e403ab6bc443c9c35e7f5a289095feeea414f9454c7b64a SHA512 805bc1f19cc1f7e83fcba44599a6c785a3dd6fdf2f283501f44e37e39643c649a3d82c35142d3108db428219cfe388966e60534b52062c82960734901f55ed85
+EBUILD kdevelop-5.5.0.ebuild 4353 BLAKE2B 4bb792442105fb21353d106e186d3c984156e378a50fa52e9b292d5e2df4462e5f62701d5c446f4fd13daf8dd5bd97d7932e74f948d889fcfe07949303c57da3 SHA512 5cf9cc4b26714eba6a095d2a149070b3b71451ef697ee77ab885424ef2e2d0c8dfeea685458fb0d63645addf20fed8848b52bcd33af69404724808bbd1264d77
 MISC metadata.xml 698 BLAKE2B edf6f5784cae9be6ea0013e2f4b85234c748ff5b716511cea8b401e7267178a821d27bbd5b66d38833e018c6a90855ed28390be385818e67f25105674b73aacd SHA512 62228270953a089d69530e11f5dd9a55c86f9758d6d86f9a3eb46a1a6e3efaca38c066bacff5b5f49a409d6c65be96e84f1be63cf6aa3fc7bc04706b674501f0
diff --git a/dev-util/kdevelop/kdevelop-5.4.5.ebuild b/dev-util/kdevelop/kdevelop-5.4.5.ebuild
deleted file mode 100644
index aed3f2eb6593..000000000000
--- a/dev-util/kdevelop/kdevelop-5.4.5.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="true"
-KDE_APPS_MINIMAL=19.04.3
-KFMIN=5.60.0
-QTMIN=5.12.3
-VIRTUALDBUS_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and much more"
-HOMEPAGE="https://www.kdevelop.org/"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="5/54" # look at KDEVELOP_SOVERSION inside CMakeLists.txt
-IUSE="+gdbui hex +plasma +qmake reviewboard subversion webkit"
-
-COMMON_DEPEND="
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktexteditor-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/sonnet-${KFMIN}:5
-	>=kde-frameworks/threadweaver-${KFMIN}:5
-	>=kde-apps/libkomparediff2-${KDE_APPS_MINIMAL}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qthelp-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qttest-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	dev-libs/grantlee:5
-	>=dev-util/astyle-3.1:=
-	>=sys-devel/clang-3.8.0:=
-	gdbui? ( >=kde-plasma/libksysguard-5.16.5:5 )
-	hex? ( app-editors/okteta:5 )
-	plasma? (
-		>=kde-frameworks/krunner-${KFMIN}:5
-		>=kde-frameworks/plasma-${KFMIN}:5
-	)
-	qmake? ( dev-util/kdevelop-pg-qt:5 )
-	reviewboard? ( >=kde-frameworks/purpose-${KFMIN}:5 )
-	subversion? (
-		dev-libs/apr:1
-		dev-libs/apr-util:1
-		dev-vcs/subversion
-	)
-	webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 )
-	!webkit? ( >=dev-qt/qtwebengine-${QTMIN}:5[widgets] )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-"
-RDEPEND="${COMMON_DEPEND}
-	>=kde-apps/kapptemplate-${KDE_APPS_MINIMAL}:5
-	>=kde-apps/kio-extras-${KDE_APPS_MINIMAL}:5
-	>=dev-qt/qdbus-${QTMIN}:5
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	dev-util/ninja
-	>=sys-devel/gdb-7.0[python]
-	reviewboard? ( >=kde-apps/ktp-accounts-kcm-${KDE_APPS_MINIMAL}:5 )
-	!dev-util/kdevelop-clang-tidy
-"
-
-RESTRICT+=" test"
-# see bug 366471
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package gdbui KF5SysGuard)
-		-DBUILD_executeplasmoid=$(usex plasma)
-		$(cmake_use_find_package plasma KF5Plasma)
-		$(cmake_use_find_package hex OktetaKastenControllers)
-		$(cmake_use_find_package qmake KDevelop-PG-Qt)
-		$(cmake_use_find_package reviewboard KF5Purpose)
-		$(cmake_use_find_package subversion SubversionLibrary)
-		$(cmake_use_find_package !webkit Qt5WebEngineWidgets)
-	)
-
-	use reviewboard || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KDEExperimentalPurpose=ON )
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-
-	if ! has_version "kde-apps/konsole" ; then
-		elog "For konsole view, please install kde-apps/konsole"
-	fi
-
-	if ! has_version "dev-util/cppcheck" ; then
-		elog "For static C/C++ code analysis support, please install dev-util/cppcheck"
-	fi
-
-	if ! has_version "dev-util/heaptrack[qt5]" ; then
-		elog "For heap memory profiling support, please install dev-util/heaptrack"
-	fi
-
-	if ! has_version "dev-util/clazy" ; then
-		elog "For static C++ Qt code analysis support, please install dev-util/clazy"
-	fi
-}
diff --git a/dev-util/kdevelop/kdevelop-5.4.6.ebuild b/dev-util/kdevelop/kdevelop-5.4.6.ebuild
index b13b61d8b882..aed3f2eb6593 100644
--- a/dev-util/kdevelop/kdevelop-5.4.6.ebuild
+++ b/dev-util/kdevelop/kdevelop-5.4.6.ebuild
@@ -13,7 +13,7 @@ VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and much more"
diff --git a/dev-util/kdevelop/kdevelop-5.5.0.ebuild b/dev-util/kdevelop/kdevelop-5.5.0.ebuild
index 11aa55dc6a6f..0355a681dc46 100644
--- a/dev-util/kdevelop/kdevelop-5.5.0.ebuild
+++ b/dev-util/kdevelop/kdevelop-5.5.0.ebuild
@@ -101,7 +101,11 @@ RESTRICT+=" test"
 # see bug 366471
 
 src_configure() {
+	local clang_version=$(best_version sys-devel/clang)
+	local llvm_root="/usr/lib/llvm/$(ver_cut 1 ${clang_version##sys-devel/clang-})"
+
 	local mycmakeargs=(
+		-DLLVM_ROOT=${llvm_root}
 		$(cmake_use_find_package gdbui KF5SysGuard)
 		-DBUILD_executeplasmoid=$(usex plasma)
 		$(cmake_use_find_package plasma KF5Plasma)
diff --git a/dev-util/kyua/Manifest b/dev-util/kyua/Manifest
index bb4f39791ead..323de54c1c4e 100644
--- a/dev-util/kyua/Manifest
+++ b/dev-util/kyua/Manifest
@@ -1,3 +1,3 @@
 DIST kyua-0.13.tar.gz 663776 BLAKE2B 5bb6b2a7723567395baeace0b70085a631856ac98ddb304bb5300f26bc89a1a1add589486cd08f1569ca9c7534fd5071a62cdcbb519a10d59221df63c0aef932 SHA512 80ecf4fd888d4759122f3c1d1d5b06a19135e06f7bca1ef8458c7a5e78c1b6baff54969c863c93f11c40611ca256fc0334402531397b16788fb3ec701dd278ae
-EBUILD kyua-0.13-r2.ebuild 623 BLAKE2B fb64880e845115fb4f011b291cf7ac91f40a94c660afbda14fc3060b0c5b0db2d4d63f301eccfedf05e6be7b076ea85d98fbefac1d3c7c6dafa666a4e099c03b SHA512 01fcd8519de995bccb799274702a9e9d15a2571bf6a26c1f6033ec28eb1b3a3a555475384b8049c0dbe590c7b662037ba75ccab5ce95cf361d66a1437bffbfef
+EBUILD kyua-0.13-r2.ebuild 620 BLAKE2B 339aab18bc74a0c572fc0e2fbfd2dbfe15d27151fcccfdbe243db2060ca36a691ea8d8e256bb940db2b3b4a31c9f28944d99d721cf7bcd7eaba90fb28f01f7ba SHA512 e5518a5c1d11a899c10f2a0b971d528699a9d91b6b65e6dd41fa56a433c6a688a1765d5fdc8049d7866126fe8e7888b5034b56458773c28d868daf125fc033c0
 MISC metadata.xml 246 BLAKE2B f94a229d0ffd7220f14c23ca2b0b6b84128338b5af27cd18ddb0c9e2f95f51c943fdfbc368c03b4a87d7bb381c668158fdc169fd067cc0cd8cd35852acc29d62 SHA512 b6df287a6e1f18bf267a05d8eb6dea788ae7ec74de31d9cea76fea038e4090c6a83d62221505d280d55e9b314d059c409e442951d78eb3a58928307ff118147b
diff --git a/dev-util/kyua/kyua-0.13-r2.ebuild b/dev-util/kyua/kyua-0.13-r2.ebuild
index 064cc82a1b6f..55e06fa0e6d5 100644
--- a/dev-util/kyua/kyua-0.13-r2.ebuild
+++ b/dev-util/kyua/kyua-0.13-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/jmmv/kyua/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
 IUSE="test"
 
 # Tests fail
diff --git a/dev-util/lcov/Manifest b/dev-util/lcov/Manifest
index 3ae504e1bd21..e966d2a8f835 100644
--- a/dev-util/lcov/Manifest
+++ b/dev-util/lcov/Manifest
@@ -2,8 +2,8 @@ AUX lcov-1.13-gcc-8.patch 3049 BLAKE2B ec0e22a61851ec2acbb0ac8909f1fc91d57d8dc29
 DIST lcov-1.13.tar.gz 156709 BLAKE2B d0f2635a6e6c29d29bd15d15c7f6c22ff80052b12deb4e88c77a9331d6d151aa2718ad4e4af1aa192757c1fc3189cc0d1688fc5086e5552c74078206cf27e1df SHA512 54033c0f99dbf7b332fcd70730df8672713ffc36c010809353dfd83a73fcc4f504b6a68e3b5010002d6992da5fa940a7d5f4e03dc3fe6930ab713a7b980dff9e
 DIST lcov-1.14.tar.gz 177359 BLAKE2B 17069d38bf607217b8ff59f573fc02badf56afe65965d2a359a14835af57e2b6c512bff06fac3dbf4e94cd35701216edb8026d333b2baa8772d0ef551de37af1 SHA512 2d60c3a63e300dda96171c432fe304840acc76bf6275f60934d08e80765f9f85671e8b77bfed758fc45842a80156586dc0d67c42c9f215f4f163840fc5cf65bc
 DIST lcov_1.14-2.debian.tar.xz 25740 BLAKE2B ca1a84ed98e0cdd13aae88f0f550cac84f00b3dbf6bd764abe0c7eee7b73c0796abbf20e76cb51707d0d644bb17ee7ad283abbfaa7456dc2a3ade5e12cfbaabc SHA512 10fdb1f82be8cc9aef3b92aa7ca18f2736e5130d8b6ef9703b9444cb88f75f475e8bc48c441ed5cf7e4d11f383c226fc711e8609ea11772b01f454bb6a5bd45a
-EBUILD lcov-1.13-r2.ebuild 863 BLAKE2B 225a3bc7d5ddd4cf45c145788cb42b28a77292080facee66a59677855cb14ef32986545adbd601e9240cc9732fe18514a6ad40b714ec99bbdcc04b163a870ccb SHA512 15c4ddbe6e88b6c41a31398a2684b4c5c74819a6030eade8c8735ad2959d2dd9bb58fac90957b17c3f57dc58898f56ce2901ac9e2239bb2e2ec6af04291c8332
-EBUILD lcov-1.14.ebuild 813 BLAKE2B ee220647f69ce9d789b296922ee6dc2324124aabc5e12f7d705787cbe69c21dc19fcb89804b19dc71645aba34b71d11116ff99fa137f2dc3b9d2674af3aa0e58 SHA512 4c7dc995012ba8b9f15b2b507e819a3da9da01b25a3f6b24544d36f1a46017e4fafef35b58795071043c473179ec0ef59fac769d3874e170b770d1de10c1674a
-EBUILD lcov-1.14_p2.ebuild 1396 BLAKE2B b159f23ae9b33d60365773141cd64833e2b8d70993b13d4361f73ee1d550ca371380f9f2b8df20b97cd95e269ca27bda01f2f4457ac21fab58d5597ceb3d7f6c SHA512 f234978b961b7bde29f36b73a4bc719ce63af4291fb58304ab846f053114ac3152835d401bcfe1cce67bb41e74aaae6e994f53627792c13f887597cfeb87a6e7
-EBUILD lcov-9999.ebuild 850 BLAKE2B fd1abd672df98cf8329ffbb0bd46a13477c0700ec6f63b33fddc1ab3b9d44d2e5a24c8aba47a90ff761bbb283fe28bff7d9a621383265eed349f90a0726c8e56 SHA512 86de86036f1e89fb53bf84da63fc30457cb300158a66caae3f2baf8ab525de3924677c7c3f2c8675e72c6533b5ea63080590c86c553ec27afd68cdcde606c9d8
+EBUILD lcov-1.13-r2.ebuild 859 BLAKE2B d43e1aa8b6117e5296d73da09d943961a86218ccea9f90d890ef0f49835df8fdbf28ebcf78b2a30f57749a54ef22a2cd24a982f66e969f7e80b83803cb8ec66c SHA512 449744a363d44e90cd7fd06cc3beff631a74fd93e6d905c897016b36ec23e85554b163a8274ad951de6cda21adcd4291b754353ae59a6d26e278b61fb4e9b7f5
+EBUILD lcov-1.14.ebuild 809 BLAKE2B b856f279855281d6f25dc6c5ec751e5c4400df33d22a5e098525e0aa1b69edb8decc207d9becf6bbf6b2d53238046cc13dcce9e458a003854cce6349d46aeecf SHA512 4ab08b43adda29c198e59f67e2ebf648884389df131e03eb143bbf777905525d96b59041d8034aeebeaffd621e4f2a22e6d6d4f0c985f20fc09adc95346bd1ed
+EBUILD lcov-1.14_p2.ebuild 1392 BLAKE2B e7040438fa2428563288d5232a1737345622a7c393c57480e193e70c86f5991e6b98c2df9d6b7be33add13dc09c4bff33088e32a01a117d877dc8e62cf451a76 SHA512 4e94503dc00789b4812655b532816f6f49828f83c25906819f73d2b4aed8d3bcd0099077ba995dfd7381309af89c7c2a4a08c435a21b34edc53186bfbf8f1cc0
+EBUILD lcov-9999.ebuild 846 BLAKE2B 9732de1816816254e334946cb3ff24e9806af0542d8948aa7478f956dfa7e044bf491b92f541d35bcd021c67bd794b8b66d927ec2db20c0c37467554709071fb SHA512 a2eaf7ea9fa5328d329991e639f2257f34608fdf67ba330b460a5c186557d0d3429646577a161aadf6f412e2a308154ec4290aecfc9be97dfd515850b9e28cd0
 MISC metadata.xml 545 BLAKE2B 04986c839db27a72dd78580642dc394723107ae8bd5790fcd0017db1f3324faf27ce0bfca537504a882ae8fdd12b8c451bcd8014d078309a5dad9b01c3457753 SHA512 e5753b7dc704699d98540483ec24632095c63cc8eb39cd8b20d91420ea96f79f4de95787bc7e7547fe2b1078d0c1f694e52a69065e1bccd4e18a1e86a3999289
diff --git a/dev-util/lcov/lcov-1.13-r2.ebuild b/dev-util/lcov/lcov-1.13-r2.ebuild
index ab94d37030ad..309969b8a69e 100644
--- a/dev-util/lcov/lcov-1.13-r2.ebuild
+++ b/dev-util/lcov/lcov-1.13-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://sourceforge/ltp/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-linux ~x64-macos"
 fi
 
 inherit prefix
diff --git a/dev-util/lcov/lcov-1.14.ebuild b/dev-util/lcov/lcov-1.14.ebuild
index 594a85453908..f5ded7d1a5c4 100644
--- a/dev-util/lcov/lcov-1.14.ebuild
+++ b/dev-util/lcov/lcov-1.14.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
@@ -8,7 +8,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://sourceforge/ltp/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-linux ~x64-macos"
 fi
 
 inherit prefix
diff --git a/dev-util/lcov/lcov-1.14_p2.ebuild b/dev-util/lcov/lcov-1.14_p2.ebuild
index 41677b6255db..df29f3e698b3 100644
--- a/dev-util/lcov/lcov-1.14_p2.ebuild
+++ b/dev-util/lcov/lcov-1.14_p2.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
@@ -14,7 +14,7 @@ else
 		mirror://sourceforge/ltp/${PN}-${LCOV_V}.tar.gz
 		mirror://debian/pool/main/l/${PN}/${PN}_${LCOV_V}-${DB_V}.debian.tar.xz
 	"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-linux ~x64-macos"
 fi
 
 inherit prefix
diff --git a/dev-util/lcov/lcov-9999.ebuild b/dev-util/lcov/lcov-9999.ebuild
index b9b110f57286..295385b60d64 100644
--- a/dev-util/lcov/lcov-9999.ebuild
+++ b/dev-util/lcov/lcov-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://sourceforge/ltp/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-linux ~x64-macos"
 fi
 
 inherit prefix
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index eef0fe401be4..173b40b9b2f0 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -2,14 +2,12 @@ DIST lldb-7.1.0.src.tar.xz 19384976 BLAKE2B a1d5afea255f06221516e21e80120cb35d87
 DIST lldb-8.0.1.src.tar.xz 19586288 BLAKE2B afb20a8303dcbdaf76ef1d78aa3165f87713f1c16121905d7a5f71e770ceafdff40d9d19e0a983d9290da2d4eb3acd0987d50607bea17efdb7dc0127d7f5cf8a SHA512 eb031985ad4d08226ec47a90fe32c1e6d070948971ca5235fd431cf7d5b7ea20f5d5131237bf83a6419773d18c339590bf9672e7b4f884304497e63c1030988f
 DIST llvm-7.1.0.src.tar.xz 28313784 BLAKE2B b78d9a7fc5ef6e352e77d339e5c4eef5ccedf67c05e7abd949e72619aa8a5ed65e7e5e2008354be8e7916d75581719b99f34227838fcc86c5d0080913c2fb22c SHA512 a7dbd5693d1f2dae6b6e52893a100f9349cbfcfb25c5fdcad46364acbff0dbd3573f8fbc026c68eb9fd56335198aa94b866cc3dd7ea0cbd2cbfb5f8fe3444a7a
 DIST llvm-8.0.1.src.tar.xz 30477608 BLAKE2B 4319c837b36111401e3b0f9659b8d875c89463bcc7816df1aefe1e3ff989860bbaa92504718f8e15416cfd9f3491c13777cd5cb661877b237b342b0e515b93f5 SHA512 82e120be5cabdfd5111aebbea68a663fe229c8861d73802d6ab09a3bf48f60de333e07e61f8fb61beaa14ac2bea24fcd74fa6f761acaf62469f536b79fcb1e16
-DIST llvmorg-10.0.0-rc1.tar.gz 120755822 BLAKE2B a729d37d96ba498cb865c6f708734dccb796b2caabb69167b9aa3b0e12c788f2a5980a048b99d5603da3d26af909fb31f406b4f4743cabae56c45f829a7bf695 SHA512 27137fc700971147c00ded6787eaae9f0bcf98c938fe227a5a559b38d983736f3d086f4ff6772d802c5f48a7d97a97c293261e4af88fcb5a720693b9cb5a4f02
-DIST llvmorg-10.0.0-rc2.tar.gz 120795019 BLAKE2B 6e701eddbd2313e777c7b37dff8455a08d3c599d01055b60afc0319373d4709deb429aac6bf9e80c4d2e2ab8ade03bf5b398b6ccd8882e4bde608d10cdbf2284 SHA512 ee571c9258a2d9fc411964f56b0b92b2e7134349ed21dbe7963eb61ef65da506e0c4f7c69259a3b6cecec23f55d24636608287ee4457ee667031e141f8f09aae
+DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD lldb-10.0.0.9999.ebuild 2464 BLAKE2B 2461d6e5f70fe28fa6c646a2ca4f878cf6e0d4e2b49af9500a458589f0efec4ae476746765e43084c2e2e243877e69dc77488553b8a38fc89f3b0723a03f9749 SHA512 107cc1adb1f88e50bda9d47b03b57ab1f46b06536fe5feb7f36601ea4d2ef46120be1f4cf37e15e5cf1cf71eb2b2ea73db2cbc62104eb1015bf327f6461086f6
-EBUILD lldb-10.0.0_rc1.ebuild 2462 BLAKE2B b37292bd9fffc2a07989afa7a75b49c04ee625db4d8b47d741e54bf4fb9378c1269ea155f616d4e7936ea915ddbe14648755c2d97cdd00f994e645eb83e5c702 SHA512 bb528c1c6f08fd5b114ac63a06947920615c9573c02f9f33c3910bb2a55c53851a988d680db7e367bcd86e79e016d7be8e6c0f5e417042d41e9d5be8c8695c68
-EBUILD lldb-10.0.0_rc2.ebuild 2464 BLAKE2B 2461d6e5f70fe28fa6c646a2ca4f878cf6e0d4e2b49af9500a458589f0efec4ae476746765e43084c2e2e243877e69dc77488553b8a38fc89f3b0723a03f9749 SHA512 107cc1adb1f88e50bda9d47b03b57ab1f46b06536fe5feb7f36601ea4d2ef46120be1f4cf37e15e5cf1cf71eb2b2ea73db2cbc62104eb1015bf327f6461086f6
+EBUILD lldb-10.0.0.ebuild 2487 BLAKE2B 52cb94adc5066aa054ec34131a64859dff28bf1971ae61c808c1e1aa8d9d62d10881925cb253aa4b4fe86eca6b84cc88486a461552f170f6c1b2d73717820ab7 SHA512 e5b6db1ba1cc29f7063feaad0088376d0e151f8bdaabc99eefb0e10c3f58119df5b467f285d3d83d3e06a881c72c1bad29052f36ead2c544194f9c3d08fb2e5e
 EBUILD lldb-11.0.0.9999.ebuild 2464 BLAKE2B 2461d6e5f70fe28fa6c646a2ca4f878cf6e0d4e2b49af9500a458589f0efec4ae476746765e43084c2e2e243877e69dc77488553b8a38fc89f3b0723a03f9749 SHA512 107cc1adb1f88e50bda9d47b03b57ab1f46b06536fe5feb7f36601ea4d2ef46120be1f4cf37e15e5cf1cf71eb2b2ea73db2cbc62104eb1015bf327f6461086f6
 EBUILD lldb-7.1.0-r1.ebuild 3171 BLAKE2B 9f53fa589292b8b2ac77c950172c5a9c8c63b1e76906f560ff1f9564c910b4fea6fc5366c55a4479782209df7de2c40c14c967d733aa524b9fd45ff446b69a2b SHA512 d7440c64bffcbb075b2752e939ba3495f1618a0debb88ff00b31fcd0bb31b4b29005b48094e37ad04fb9231571a1ffc123b7d8048ae909f71e1a21b85c3b2bca
 EBUILD lldb-8.0.1-r1.ebuild 3161 BLAKE2B 02f7f7c7461fed05baa15f6621ed8c32f669182395356a30e407582e74a63cf99b0d3b9c03031a976ea0b7734d3c61c64019b463ef68f315ae936ce679ceec77 SHA512 0a28c0147d2c37dc13dec96401f2d6e670db601735343c9befef24bf9626476a0effe715161703e4250066128c78b97b3f5e1ba5d6e67392b6cdacc0dd42dbfe
-EBUILD lldb-9.0.1-r1.ebuild 2398 BLAKE2B d7200682b56826e28979ec37b822d460f6fe01746d735a6cc2da56210798e6cd24e5d7fa8f6b386e913674363f473033f657d639b945bfe07ef2c033194ddd55 SHA512 64b2a9b48049ef8c3156b30231655d87528259497e73cd5b93af2118f32377787b61ca8f7e6c4246d581a9c4fbc0b879ba7b2832ec2b09f70c9b43eb3dae5168
+EBUILD lldb-9.0.1-r1.ebuild 2397 BLAKE2B e4a89885b08e3a582f7f02a935f4761f8bd24695caaab4732c928d82e69d4c4785de038994a3cbd80c0711a08da554b406e249390f2c9631838dc9d629be681b SHA512 61ea7725394294cfaa4125059cc687a42a11067a24ba35970403da69a083f24d9e5b1c81e2617100c1eb1ada125bbb9e8167651de8afd10ee208f3d2a8b840fc
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-util/lldb/lldb-10.0.0_rc2.ebuild b/dev-util/lldb/lldb-10.0.0.ebuild
index f5bbc5b68a26..e03f8d5300b4 100644
--- a/dev-util/lldb/lldb-10.0.0_rc2.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=""
+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.0_rc1.ebuild b/dev-util/lldb/lldb-10.0.0_rc1.ebuild
deleted file mode 100644
index 33100fdcdcc4..000000000000
--- a/dev-util/lldb/lldb-10.0.0_rc1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
-inherit cmake-utils llvm llvm.org multiprocessing python-single-r1 \
-	toolchain-funcs
-
-DESCRIPTION="The LLVM debugger"
-HOMEPAGE="https://llvm.org/"
-LLVM_COMPONENTS=( lldb )
-LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest )
-llvm.org_set_globals
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS=""
-IUSE="libedit lzma ncurses +python test"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	libedit? ( dev-libs/libedit:0= )
-	lzma? ( app-arch/xz-utils:= )
-	ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
-	python? (
-		$(python_gen_cond_dep '
-			dev-python/six[${PYTHON_MULTI_USEDEP}]
-		')
-		${PYTHON_DEPS}
-	)
-	~sys-devel/clang-${PV}[xml]
-	~sys-devel/llvm-${PV}
-	!<sys-devel/llvm-4.0"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	python? ( >=dev-lang/swig-3.0.11 )
-	test? (
-		$(python_gen_cond_dep "
-			~dev-python/lit-${PV}[\${PYTHON_MULTI_USEDEP}]
-		")
-		sys-devel/lld )
-	${PYTHON_DEPS}"
-
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-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="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	local -x LIT_PRESERVES_TMP=1
-	cmake-utils_src_make check-lldb-lit
-	use python && cmake-utils_src_make check-lldb
-}
-
-src_install() {
-	cmake-utils_src_install
-	find "${D}" -name '*.a' -delete || die
-
-	use python && python_optimize
-}
diff --git a/dev-util/lldb/lldb-9.0.1-r1.ebuild b/dev-util/lldb/lldb-9.0.1-r1.ebuild
index 2afd2452347e..cbe2269ee479 100644
--- a/dev-util/lldb/lldb-9.0.1-r1.ebuild
+++ b/dev-util/lldb/lldb-9.0.1-r1.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 ncurses +python test"
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
 RESTRICT="!test? ( test )"
diff --git a/dev-util/ltrace/Manifest b/dev-util/ltrace/Manifest
index 5b412021904b..9285c98346d7 100644
--- a/dev-util/ltrace/Manifest
+++ b/dev-util/ltrace/Manifest
@@ -1,9 +1,15 @@
 AUX ltrace-0.7.3-alpha-protos.patch 541 BLAKE2B 727e9acb2c12cfda3d5c15903bda8bff9e8f8823a03daa3031d4cb022b9735026e14d9e6d756c568a92401f546589aa94b099c27d6fa1555d365b0d00ce041a2 SHA512 32738dd0688c861961703a5e5c0e14324218f3ecdfdbcef0977522e2de1c9d77fc0fa1a3ea0d2074190293bf360cf8b5adfa16c67a002a1df38e37c70c024595
 AUX ltrace-0.7.3-ia64-pid_t.patch 184 BLAKE2B 4d739f7ad6474541cec166cc1262637edbf30b32ef3335ac92e834bd611472de5473801ad307b7ba56eec0657bbcceea48d7fe17517663c6389d0843e9a9d5bc SHA512 1029f86f3b3e33eebcdbafa6dc56e2ece2a33234a6b7a0b05e4bb87424829c5f512e019e6c6a962e639a9cfeac56edea3d0ac250fc31489755e68d2181ce254f
 AUX ltrace-0.7.3-ia64.patch 1538 BLAKE2B 2a407d2e19e74ddf22da1371cf72585cec5c630d00670798c6c8e9b3991d3aac641784bceeda544b49e76ae572c487bc5455de4239aa967e25318625e0307e0f SHA512 c6e7576047aa06eca67a80ecaa008854a2e312b1d38693cc802a6b6be6f671003716c6a0d3268fb3f076f3311fb27c228f55220bcb2432afd0210542020764ad
+AUX ltrace-0.7.3-musl-host.patch 313 BLAKE2B 3ff936391668b118db37aabcf197081b85ed1ac67759a275ae3d18b398fb7af96ec74475f1c50d1dfa22153c459c079fe95789826b8c4eaecb6c38575f7be8aa SHA512 4aa92f406a45aa10cf8b456fd4eb1421d74c682040c71a6819f9caea60dd275cd268a42d0c656e68d7cda70b152bc4e83bc70461c5ac0732d09b70abc77f0ed8
+AUX ltrace-0.7.3-no-REG_NOERROR.patch 1367 BLAKE2B a321d9f621a3b919382bff3e42cfdd5f172780acdfb4f2ee4bde15d3f265641bb16aea41cc5c25562d7b64d69c5cae94a5d6500e64cf38c008db5ec80295280a SHA512 c22055e97bc7dfe5af150093e024fd1557751cb7181abcafb38fceb87d83cda5002a20bae39178ccdfaa9aa6f07fbd88d38104b79c9270109ce5ea667a43f684
+AUX ltrace-0.7.3-no-error.h-2.patch 1676 BLAKE2B 55451613cb1a5e37503dcfe38ac5535c79525c64bcb1c91f4cadff9958416a23bbde57c379c2c3df67363af6a1c444c98a14ecd4d6d5f593b1105894677c9c78 SHA512 570b8bbe2b86f12898841da9f24d7d8ef2389f657cde2faebb820348011f128732a6491a746de5ea93aa6fea88cdd4a8eff0702373e9d5d7305277304011d000
+AUX ltrace-0.7.3-no-error.h.patch 885 BLAKE2B a893550c62e4a479405f8dd3e4c41c01d0a027bee2ed6a25e104c407e7c4372cbb2b0774c6feb3e7691f3b8f1b194d0e2377d0e9244564c2edb6d143574952c1 SHA512 193fc57ef6df54c39a099db7991237dbd2bcb1454fd5b889074c54e005fc50175f5702e118b25a3c4d09bb2d1e03ce38734798ce0143cd3b7293383b93775e2d
+AUX ltrace-0.7.3-pid_t.patch 179 BLAKE2B 7782ab18e9ec8233ed4d60aed339175e1a30f6f3f589d8a7e9eeaa228918cfba6b00528790cf2908adc785c28231e208b96a7c76fd0daa914f9ce6bdb91b01ba SHA512 87e5f49c89dcdd3218547bcd57f0ae05253d4756abb4d4981d78501a6b1de2d5389987fd90d59fe41348a0ad2b56b62a8e087e9092533e12f2cdcd800abfa8db
 AUX ltrace-0.7.3-print-test-pie.patch 774 BLAKE2B e67bedbd0ea2470007390634fe588ee7cd074cff4b90f57fe821f6124d4aee9e2cb8f60b46b7007659d5a29d929cf579c38d858c31b8667ba50f64d579909c81 SHA512 9f407805719f21838fa3d2c48aaa96025fb4785a28b5b4e50b2593093067ed6cb406dbb662e0178e84e9db101b4cfa12867127cd212abf6417130e7cb4c21002
 AUX ltrace-0.7.3-test-protos.patch 2551 BLAKE2B 48998f9db4875b8e2af6727b51fc8666cc4f10cbc55bbc4bf32a2b54f1f1032f7c7f07c5196ffff53e23183010eb68df862b4fceaab56d30a580eeaadeeb6f17 SHA512 4652b3f920ad3669d2e6076775b9a598bd999a0fa5319c490f580d93c63f53bd0e3db61cf7a61c5db3a436789802b8fa9646f84ee76e8f37f4f3afb827b84f34
 DIST ltrace_0.7.3-4.debian.tar.gz 11373 BLAKE2B 3004bef4e0181e28606e1c50dcc2265d9869e51bf11288185da46f7a77a0aaffb41af75f84baa7d094f9f752071c9e8f53c565982a955e3250a7fc721c529b20 SHA512 67a868c95703ca9cd8407905e3be416e3a66920f41d9deb78fadb71719d7d3f1a3f67ffcb575acff4bf7e4715102f3a6b0f67c6adb74f37ee66c398c132ff04b
 DIST ltrace_0.7.3.orig.tar.bz2 482658 BLAKE2B 30d1dbb178a41043e4bbbac17a23676db202b64327c9bb4393ae7ace9f5e1a1e2a5ded56cabc7faf2ea55b22ed17126a94c121147aeefb40250710b7307a50d3 SHA512 a842b16dcb81da869afa0bddc755fdff0d57b35672505bf2c7164fd983b1938d28b126714128930994cc1230ced69d779456d0cfc16f4008c9b6d19f0852285d
+EBUILD ltrace-0.7.3_p4-r1.ebuild 1728 BLAKE2B 1d12553b815b042f46da65d32ee9d31e6d475b28eecf607060830934739121fd7cfcfa7846c3f5ba1fcd4418125ee1c3f5bbaf4c7bc61e7595daf37b3c520286 SHA512 ba5e03642a85c89cf091d12b0c097c99e5c40892587d65fa4ad8390bb7828bfa9da4e61272075c4ea0ce2e910f2c40105d601074fd38f4d43af071434b3d1946
 EBUILD ltrace-0.7.3_p4.ebuild 1366 BLAKE2B b3f31392f8643006a79bd8007f97458fba5bbefbd7875c20364e95d9204a1b7af7c8dbb30e6a4d5fa138aa6c089fe6fd72bd0d16a631abe6e743e7c49c46397a SHA512 6d2b829a0694b8d59de72ace57391a0d1cb685c0d0f71806440055416ff80a1f5281e31d05531a2aa60ee96ed12d265f791a36de1c91dc1b7483eb32ff92c6b0
 MISC metadata.xml 357 BLAKE2B 393847ec554b92576d20a2e88b3f89b86d93ad51107161c0e5fe198415ad6f8d941418d89b438237f52c6e2cef942b449e8112f5619e219058a7f797a6b261dc SHA512 fff13f831e3d3994abc654ab5c5cb97e14cbec653d42074300cf81b22da05e5318a55ae4b28198fdc7aa8169464385939f5a889ca5ba86c45aa39dfe24772a95
diff --git a/dev-util/ltrace/files/ltrace-0.7.3-musl-host.patch b/dev-util/ltrace/files/ltrace-0.7.3-musl-host.patch
new file mode 100644
index 000000000000..7729449d0604
--- /dev/null
+++ b/dev-util/ltrace/files/ltrace-0.7.3-musl-host.patch
@@ -0,0 +1,11 @@
+https://bugs.gentoo.org/713428
+--- a/configure.ac
++++ b/configure.ac
+@@ -33,6 +33,7 @@ AC_CANONICAL_HOST
+ 
+ case "${host_os}" in
+     linux-gnu*) HOST_OS="linux-gnu" ;;
++    linux-musl*) HOST_OS="linux-gnu" ;;
+     linux-uclibc*) HOST_OS="linux-gnu" ;;
+     *)		AC_MSG_ERROR([unkown host-os ${host_os}]) ;;
+ esac
diff --git a/dev-util/ltrace/files/ltrace-0.7.3-no-REG_NOERROR.patch b/dev-util/ltrace/files/ltrace-0.7.3-no-REG_NOERROR.patch
new file mode 100644
index 000000000000..7fc8b60aa48a
--- /dev/null
+++ b/dev-util/ltrace/files/ltrace-0.7.3-no-REG_NOERROR.patch
@@ -0,0 +1,50 @@
+From b6c5c8c51f954cfbe76424fd57c33a87166f0545 Mon Sep 17 00:00:00 2001
+From: Petr Machata <pmachata@redhat.com>
+Date: Sat, 8 Dec 2012 03:23:39 +0100
+Subject: [PATCH] Avoid using REG_NOERROR
+
+Not all systems define this (IRIX 6.5 doesn't).  Comparing to 0 is not
+terribly less readable, so do that instead.
+---
+ glob.c    | 4 ++--
+ options.c | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/glob.c b/glob.c
+index 9af633f..b26637f 100644
+--- a/glob.c
++++ b/glob.c
+@@ -180,7 +180,7 @@ glob_to_regex(const char *glob, char **retp)
+ 			goto fail;
+ 	}
+ 	*retp = buf;
+-	return REG_NOERROR;
++	return 0;
+ }
+ 
+ int
+@@ -188,7 +188,7 @@ globcomp(regex_t *preg, const char *glob, int cflags)
+ {
+ 	char *regex = NULL;
+ 	int status = glob_to_regex(glob, &regex);
+-	if (status != REG_NOERROR)
++	if (status != 0)
+ 		return status;
+ 	assert(regex != NULL);
+ 	status = regcomp(preg, regex, cflags);
+diff --git a/options.c b/options.c
+index e8fd2a2..4c7441e 100644
+--- a/options.c
++++ b/options.c
+@@ -204,7 +204,7 @@ compile_libname(const char *expr, const char *a_lib, int lib_re_p,
+ 
+ 		regex_t lib_re;
+ 		int status = (lib_re_p ? regcomp : globcomp)(&lib_re, lib, 0);
+-		if (status != REG_NOERROR) {
++		if (status != 0) {
+ 			char buf[100];
+ 			regerror(status, &lib_re, buf, sizeof buf);
+ 			fprintf(stderr, "Rule near '%s' will be ignored: %s.\n",
+-- 
+2.25.2
+
diff --git a/dev-util/ltrace/files/ltrace-0.7.3-no-error.h-2.patch b/dev-util/ltrace/files/ltrace-0.7.3-no-error.h-2.patch
new file mode 100644
index 000000000000..6b798b274909
--- /dev/null
+++ b/dev-util/ltrace/files/ltrace-0.7.3-no-error.h-2.patch
@@ -0,0 +1,72 @@
+From 1233b37167097dffa9a78bd7bd0a8117c75fe8ff Mon Sep 17 00:00:00 2001
+From: Petr Machata <pmachata@redhat.com>
+Date: Sat, 8 Dec 2012 03:13:29 +0100
+Subject: [PATCH] expr_node_zero and expr_self should be stack-allocated
+
+---
+ expr.c | 14 ++++++--------
+ zero.c | 14 ++++++--------
+ 2 files changed, 12 insertions(+), 16 deletions(-)
+
+--- a/expr.c
++++ b/expr.c
+@@ -21,7 +21,6 @@
+ #include <string.h>
+ #include <assert.h>
+ #include <errno.h>
+-#include <error.h>
+ #include <stdlib.h>
+ 
+ #include "expr.h"
+@@ -327,12 +326,11 @@ expr_eval_constant(struct expr_node *node, long *valuep)
+ struct expr_node *
+ expr_self(void)
+ {
+-	static struct expr_node *node = NULL;
+-	if (node == NULL) {
+-		node = malloc(sizeof(*node));
+-		if (node == NULL)
+-			error(1, errno, "malloc expr_self");
+-		expr_init_self(node);
++	static struct expr_node *nodep = NULL;
++	if (nodep == NULL) {
++		static struct expr_node node;
++		expr_init_self(&node);
++		nodep = &node;
+ 	}
+-	return node;
++	return nodep;
+ }
+--- a/zero.c
++++ b/zero.c
+@@ -18,7 +18,6 @@
+  * 02110-1301 USA
+  */
+ 
+-#include <error.h>
+ #include <errno.h>
+ 
+ #include "zero.h"
+@@ -93,13 +92,12 @@ build_zero_w_arg(struct expr_node *expr, int own)
+ struct expr_node *
+ expr_node_zero(void)
+ {
+-	static struct expr_node *node = NULL;
+-	if (node == NULL) {
+-		node = malloc(sizeof(*node));
+-		if (node == NULL)
+-			error(1, errno, "malloc expr_node_zero");
+-		expr_init_cb1(node, &zero1_callback,
++	static struct expr_node *nodep = NULL;
++	if (nodep == NULL) {
++		static struct expr_node node;
++		expr_init_cb1(&node, &zero1_callback,
+ 			      expr_self(), 0, (void *)-1);
++		nodep = &node;
+ 	}
+-	return node;
++	return nodep;
+ }
+-- 
+2.25.2
+
diff --git a/dev-util/ltrace/files/ltrace-0.7.3-no-error.h.patch b/dev-util/ltrace/files/ltrace-0.7.3-no-error.h.patch
new file mode 100644
index 000000000000..56aea7a54d4d
--- /dev/null
+++ b/dev-util/ltrace/files/ltrace-0.7.3-no-error.h.patch
@@ -0,0 +1,36 @@
+From 86a7b48310e0fd551f7f3d88ea9ad39c1a2807c6 Mon Sep 17 00:00:00 2001
+From: Petr Machata <pmachata@redhat.com>
+Date: Sat, 8 Dec 2012 03:33:47 +0100
+Subject: [PATCH] Avoid using non-portable error.h in generic code
+
+---
+ read_config_file.c | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+--- a/read_config_file.c
++++ b/read_config_file.c
+@@ -27,7 +27,6 @@
+ #include <stdlib.h>
+ #include <ctype.h>
+ #include <errno.h>
+-#include <error.h>
+ #include <assert.h>
+ 
+ #include "common.h"
+@@ -1258,8 +1257,11 @@ void
+ init_global_config(void)
+ {
+ 	struct arg_type_info *info = malloc(2 * sizeof(*info));
+-	if (info == NULL)
+-		error(1, errno, "malloc in init_global_config");
++	if (info == NULL) {
++		fprintf(stderr, "Couldn't init global config: %s\n",
++			strerror(errno));
++		exit(1);
++	}
+ 
+ 	memset(info, 0, 2 * sizeof(*info));
+ 	info[0].type = ARGTYPE_POINTER;
+-- 
+2.25.2
+
diff --git a/dev-util/ltrace/files/ltrace-0.7.3-pid_t.patch b/dev-util/ltrace/files/ltrace-0.7.3-pid_t.patch
new file mode 100644
index 000000000000..b54a5bf3a00c
--- /dev/null
+++ b/dev-util/ltrace/files/ltrace-0.7.3-pid_t.patch
@@ -0,0 +1,10 @@
+--- a/proc.h
++++ b/proc.h
+@@ -26,6 +26,7 @@
+ #include "config.h"
+ 
+ #include <sys/time.h>
++#include <unistd.h> /* pid_t */
+ 
+ #if defined(HAVE_LIBUNWIND)
+ # include <libunwind.h>
diff --git a/dev-util/ltrace/ltrace-0.7.3_p4-r1.ebuild b/dev-util/ltrace/ltrace-0.7.3_p4-r1.ebuild
new file mode 100644
index 000000000000..8ca6b5a1233e
--- /dev/null
+++ b/dev-util/ltrace/ltrace-0.7.3_p4-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+LTRACE_V=${PV/_p*/}
+DB_V=${PV/*_p/}
+
+DESCRIPTION="trace library calls made at runtime"
+HOMEPAGE="https://gitlab.com/cespedes/ltrace"
+SRC_URI="
+	mirror://debian/pool/main/l/${PN}/${PN}_${LTRACE_V}.orig.tar.bz2
+	mirror://debian/pool/main/l/${PN}/${PN}_${LTRACE_V}-${DB_V}.debian.tar.gz
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug selinux test unwind"
+
+RDEPEND="virtual/libelf:=
+	selinux? ( sys-libs/libselinux )
+	unwind? ( sys-libs/libunwind:= )"
+DEPEND="${RDEPEND}
+	sys-libs/binutils-libs
+	test? ( dev-util/dejagnu )"
+
+# under musl tests need major work upstream, half of them does not work.
+RESTRICT="
+	!test? ( test )
+	elibc_musl? ( test )
+"
+
+S=${WORKDIR}/${PN}-${LTRACE_V}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.7.3-test-protos.patch #bug 421649
+	"${FILESDIR}"/${PN}-0.7.3-alpha-protos.patch
+	"${FILESDIR}"/${PN}-0.7.3-ia64.patch
+	"${FILESDIR}"/${PN}-0.7.3-print-test-pie.patch
+	"${FILESDIR}"/${PN}-0.7.3-ia64-pid_t.patch
+	"${FILESDIR}"/${PN}-0.7.3-musl-host.patch #713428
+	"${FILESDIR}"/${PN}-0.7.3-no-error.h.patch #713428
+	"${FILESDIR}"/${PN}-0.7.3-no-error.h-2.patch #713428
+	"${FILESDIR}"/${PN}-0.7.3-no-REG_NOERROR.patch #713428
+	"${FILESDIR}"/${PN}-0.7.3-pid_t.patch #713428
+)
+
+src_prepare() {
+	eapply "${WORKDIR}"/debian/patches/[0-9]*
+
+	default
+
+	sed -i '/^dist_doc_DATA/d' Makefile.am || die
+	eautoreconf
+}
+
+src_configure() {
+	ac_cv_header_selinux_selinux_h=$(usex selinux) \
+	ac_cv_lib_selinux_security_get_boolean_active=$(usex selinux) \
+	econf \
+		--disable-werror \
+		$(use_enable debug) \
+		$(use_with unwind libunwind)
+}
diff --git a/dev-util/lttng-ust/Manifest b/dev-util/lttng-ust/Manifest
index af594e6991b8..ec03768ef25b 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 629 BLAKE2B bb11edf5827c34386d9d39f840e7bb73fd02e77b21fd769c927ce9c9984eee985f649de56cbc12651e37ade948441a31cc0bf632fb7e0bb8dccb40c2923c61b1 SHA512 f0ad45a743fa0c193054a2c1f02294d36b8a56f7319dc7767ee9928eada6b839fa58c2888e3eff412a56154a6e8f7f74beb521cda3dbdab7da44ba93ab945b05
-EBUILD lttng-ust-2.11.0.ebuild 763 BLAKE2B 9e1b0a2e373d664950ba4699722f5f297b4f63ec27c04f89e69550032a9d6210cdcbaf13f7cf2f69f54098e2ee465ce97108067d457d02891308bd98125f7eb8 SHA512 13ef787073ed65de6f3c0bcc647ee756742003abf994cae0b8a416c45225ca603092aaa767e506c8270d6904570669a3df82b1022584abf2af08ee3f9f88ea43
+EBUILD lttng-ust-2.11.0.ebuild 757 BLAKE2B 4d93edb46919a00c622164a79ac50ed08d20f5cacae7f65856af544183a745980fc55931a1e0e305ac12644f7b43c40acd1d55632b828442c3132e90fe98fba8 SHA512 f1284adb2d46a4f7f97870ae69ed4bf73c086106e0057e33b7b9f818ab6a58cccb37f003bce1c0ef0b6dfa140ee32afeacda86dcbd60f7be1da6427ebddb89b7
 EBUILD lttng-ust-2.7.1.ebuild 631 BLAKE2B 3012f0943c2fa067ada1d93652b7bcefb4742c3a5f2407815827c0ae1648be4b78869d7d353fb5cd7db7676831df8804f56f5cfd5feb443fce8a5a99199bf6dd SHA512 c4c5260b4a5877d48c8bbfac051d7324e53866b46b6cab51d358e5ace976c1a972e929d7915331ca74be191f236f55330d5a0f0014c813d13fc08d945efcaa39
-EBUILD lttng-ust-2.8.1.ebuild 658 BLAKE2B 6feeab50ab203d51bbd7773b180242a84fb5d9d75eb8ec6df6e9ef9bbcd6c4e99dd5a05ae7ad164d79b2bcc9f24c96acebcab9ea19c7070ae858547392508781 SHA512 777d2fc75a517f13a6aa0d724b9212139d8da5f5570ea564355b617ac238b03ab95d704965426fe13fad55c9b22638674d63ee8342807a8bdd8172ab6c7ef70f
+EBUILD lttng-ust-2.8.1.ebuild 658 BLAKE2B 00605e05772070322d38ce6ed27fcfa6494818316497558ae21afc2ad4eeba8b329b54cdc6e98418cce05231e89a741b277ae81e5dcdb645fc55523cc3f34ffa SHA512 ff3728ca2907ee149dceba68eda38e707ba8266bbe8ede7fad7f89d3f00fe1760a38d762adc161d6ac0f2210d8af4ba7162867edc5ae0aa238e09f002cef1820
 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 5c31aecfe564..0fd5171d90d8 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="http://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 x86"
 IUSE="examples numa"
 
 DEPEND="
diff --git a/dev-util/lttng-ust/lttng-ust-2.8.1.ebuild b/dev-util/lttng-ust/lttng-ust-2.8.1.ebuild
index b100667935a2..800ad61647b7 100644
--- a/dev-util/lttng-ust/lttng-ust-2.8.1.ebuild
+++ b/dev-util/lttng-ust/lttng-ust-2.8.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://lttng.org/files/${PN}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0/${MY_SLOT}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="examples"
 
 DEPEND="dev-libs/userspace-rcu:="
diff --git a/dev-util/mdds/Manifest b/dev-util/mdds/Manifest
index 3c7ea6e09d8c..7688d5b6ca46 100644
--- a/dev-util/mdds/Manifest
+++ b/dev-util/mdds/Manifest
@@ -1,5 +1,10 @@
 AUX mdds-1.4.3-buildsystem.patch 893 BLAKE2B 7884c16fcf8b6f1ddde0dbae6e4059e121fed73e7dcbffdf730e1623d0e7b7d0748f06c07433d73a73a7b4729ce32a6742125c8baac946db62a856149b468173 SHA512 0cd8c83f1a354a97871bb0d9bd7662d73765639f3ec4dcd6b922574062e2f1b33c259c322ff6e60c4c9f55e0c581c022b7546a05e0b551ad11123bb1a9dc7b53
+AUX mdds-1.5.0-buildsystem.patch 1006 BLAKE2B a6205a749a5a619443a060912bd863c93f74eb88cc68e62b077bdbab0a3e67e2f9ab35774ec5fcd23599b5b10478f529ebd2f89806fe926786d63967f83a9075 SHA512 eb03daf08605c9e54326621af3be39214659627fc4922c9cd3f031073f78a0823c2f1bb7267eb671c189b0326f9ff5d1fe3f60cda14fe9a7ac58d293972d67b9
 DIST mdds-1.4.3.tar.bz2 334515 BLAKE2B 3a42b7858346b2907040b8e42b1fae56626fc0881737ed04e20ffe4f9a23d2a2459c45e4244ac77745d2b1c7e3ff1642fe883b16def36e56c5c3d15077445793 SHA512 fd54a93fde89bff74a5ccf84ce5e2e002114297b165ded56a1bae92b28d70864775add140e165c7750f7dbe8ca1bfe83179cd9a835e53312c2e893c9e1f4434c
+DIST mdds-1.5.0.tar.bz2 346888 BLAKE2B c5c33649b6d8ba7d289eafe39c00c4334caa04f2a619d396e4f2499db9d66f48cb3ad0081805e7cef93bda49c24e6ce1a50c85a5e738120ee575c319959f6129 SHA512 9ed434dbc00285defbf3e0989396a1b52439bfdda01e5fd5822fef5e42e2c9b0b9436dd11b99af84a09a1965191ec106114e4046834f5b733474759f43bbfd95
+DIST mdds-1.6.0.tar.bz2 350406 BLAKE2B 70a99d779f318140f37bb3f873f1845c153f389a9e671a4d9ee4d1f0e762db312d536392061923c3c02494df6945a5a7743480eca1020d9cda6f3495888d7b00 SHA512 7c66894748e998f24374a5c6ea342ae2736e4bdba53be89510a1674690517ed7303786e1290fcfa26b07f236788c192ad29790129c228074397ab43699cdb290
 EBUILD mdds-1.4.3.ebuild 945 BLAKE2B 8c945f2c3cd18546b58277c5d8089518b7ab92b2ecfd2241b14e0c4023fd4aef722da5cc0a95950d925925a2a47e1966f529a5539e4ecd8fae79ed2c14f450f6 SHA512 858233cb5c378ea314d01c808baf8dae428d4420ecb49eb7d34983eb7892d17ba9b736526faa03008e48515a0172969b8edd57e5e9c96c08d11eb98eefd8ae08
-EBUILD mdds-9999.ebuild 955 BLAKE2B c3650b390950e15ed23c484f03109071a308d82edecf8f91bd346fc975fdd123946d7bea3602670cf6c79ae72c09272e176104ef072d481ea9bb22a5f7e1094c SHA512 8d0f822ed67dca2929466191a5cdf1d4bdc50d082ff120281abd5b438788b28b087df409599384d4e4add09fd6f9d01d8c172f75c8e7524312aa720716f1b7ba
+EBUILD mdds-1.5.0.ebuild 1001 BLAKE2B 33712cf9f867d9e257c03a57c3d05bbac176ef660bd596e1e3561b037a3dc870fc325c19b3e8b71e630a51f231e8046fb90339871fb240ce0ad56615ed8fb821 SHA512 6fdf56616f78cc9e9e1325ad90a71756a554bbb2f020ed3c41be9369e5228dccbc40846a3452cb565fd429389d10e7017f6f56a7745dcf7b9f15ea521c19c979
+EBUILD mdds-1.6.0.ebuild 1003 BLAKE2B ee9ffa2044258a1e866d05e96c39935476bfbe74a182ea31857943ac2e4d3e86b4681939e6df259b2ffaececf60c7efea9947f80edd3cd567b245a10c6ab9054 SHA512 c1647a6b6418b8ce585efdb0343e7cc64d32a1733fc19ae490e05eeec5894d2405f479d97dcd79fca0c82fa76dd0d56f97246e41ef7724eff3e5f3d96556e960
+EBUILD mdds-9999.ebuild 1046 BLAKE2B 35163f18579cab3525c9c18d53fdbc40f6500ee444dbcf989acc010145feb33dae930a9e7d72da28f4ed2f5db3c11c1e48c5863b3b9beaa209b70eb510c5c3fc SHA512 d488d16176ce95b4e4846053b220a24e7e1f301e677e24ea601c74c7a5361eb9295e0132ce977ffab91d313fd9bde1e25f7e822991dbf8af205eef4f0f4cf649
 MISC metadata.xml 456 BLAKE2B 18fd8f49cbbb2b86b19ef2aaa0dcc1ae57c16597e4357c7f18eeb529972931234fa165e3d1a8a65f1f5b004fed57bfb09896a6b5505fd71d2ffe7cd2a2a42f3b SHA512 51aa3106f9bb7b962e7225e88fb56335b0bef35dc1749866a4e44290ca0cac510be348aa6b5542f536a8b3bdc83dbf39c4af6b79dc603047a7a6ba6980842d71
diff --git a/dev-util/mdds/files/mdds-1.5.0-buildsystem.patch b/dev-util/mdds/files/mdds-1.5.0-buildsystem.patch
new file mode 100644
index 000000000000..113581a8de63
--- /dev/null
+++ b/dev-util/mdds/files/mdds-1.5.0-buildsystem.patch
@@ -0,0 +1,39 @@
+# Nils Freydank <holgersson@posteo.de> (2020-01-08)
+Avoid auto installation of files we install later manually.
+Adopted from asturm's patch for mdds-1.4.3.
+
+--- a/Makefile.am       2020-02-08 20:00:00.000000000 +0100
++++ b/Makefile.am	    2020-02-08 20:00:00.000000001 +0100
+@@ -4,7 +4,6 @@
+ 
+ AM_CPPFLAGS = -I$(top_srcdir)/include $(CXXFLAGS_UNITTESTS)
+ 
+-dist_doc_DATA = AUTHORS README.md
+ nodist_pkgconf_DATA = misc/mdds-@API_VERSION@.pc
+ 
+ DISTCLEANFILES = \
+@@ -14,8 +13,6 @@
+ 
+ EXTRA_DIST = \
+ 	autogen.sh \
+-	CHANGELOG \
+-	LICENSE \
+ 	doc/conf.py \
+ 	doc/doxygen.conf \
+ 	doc/flat_segment_tree.rst \
+@@ -164,14 +161,6 @@
+ 	rtree_test_bulkload_mem.mem
+ endif
+ 
+-install-data-local:
+-	$(MKDIR_P) $(DESTDIR)$(docdir)
+-	$(INSTALL_DATA) $(top_srcdir)/LICENSE $(DESTDIR)$(docdir)/COPYING
+-	$(INSTALL_DATA) $(top_srcdir)/CHANGELOG $(DESTDIR)$(docdir)/NEWS
+-
+-uninstall-local:
+-	rm -f $(DESTDIR)$(docdir)/COPYING $(DESTDIR)$(docdir)/NEWS
+-
+ if BUILD_DOCS
+ html-local:
+ 	(cd doc && $(DOXYGEN) doxygen.conf)
+
diff --git a/dev-util/mdds/mdds-1.5.0.ebuild b/dev-util/mdds/mdds-1.5.0.ebuild
new file mode 100644
index 000000000000..3b7f1556f29a
--- /dev/null
+++ b/dev-util/mdds/mdds-1.5.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == *9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.com/mdds/mdds.git"
+	inherit git-r3
+else
+	SRC_URI="https://kohei.us/files/${PN}/src/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+fi
+inherit autotools toolchain-funcs
+
+DESCRIPTION="A collection of multi-dimensional data structure and indexing algorithm"
+HOMEPAGE="https://gitlab.com/mdds/mdds"
+
+LICENSE="MIT"
+SLOT="1/${PV%.*}"
+IUSE="doc valgrind test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	doc? (
+		app-doc/doxygen
+		dev-python/sphinx
+	)
+	valgrind? ( dev-util/valgrind )
+"
+DEPEND="dev-libs/boost:="
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-buildsystem.patch" )
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable doc docs)
+		$(use_enable valgrind memory_tests)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	tc-export CXX
+
+	default
+}
diff --git a/dev-util/mdds/mdds-1.6.0.ebuild b/dev-util/mdds/mdds-1.6.0.ebuild
new file mode 100644
index 000000000000..dce25723cffd
--- /dev/null
+++ b/dev-util/mdds/mdds-1.6.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == *9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.com/mdds/mdds.git"
+	inherit git-r3
+else
+	SRC_URI="https://kohei.us/files/${PN}/src/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+fi
+inherit autotools toolchain-funcs
+
+DESCRIPTION="A collection of multi-dimensional data structure and indexing algorithm"
+HOMEPAGE="https://gitlab.com/mdds/mdds"
+
+LICENSE="MIT"
+SLOT="1/1.5"
+IUSE="doc valgrind test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	doc? (
+		app-doc/doxygen
+		dev-python/sphinx
+	)
+	valgrind? ( dev-util/valgrind )
+"
+DEPEND="dev-libs/boost:="
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-1.5.0-buildsystem.patch" )
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable doc docs)
+		$(use_enable valgrind memory_tests)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	tc-export CXX
+
+	default
+}
diff --git a/dev-util/mdds/mdds-9999.ebuild b/dev-util/mdds/mdds-9999.ebuild
index 2709004f0637..1bede682c2d9 100644
--- a/dev-util/mdds/mdds-9999.ebuild
+++ b/dev-util/mdds/mdds-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-if [[ ${PV} == 9999 ]]; then
+if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://gitlab.com/mdds/mdds.git"
 	inherit git-r3
 else
@@ -16,8 +16,9 @@ DESCRIPTION="A collection of multi-dimensional data structure and indexing algor
 HOMEPAGE="https://gitlab.com/mdds/mdds"
 
 LICENSE="MIT"
-SLOT="1/${PV%.*}"
-IUSE="doc valgrind"
+SLOT="1/${PV%.*}" # Check API version on version bumps!
+IUSE="doc valgrind test"
+RESTRICT="!test? ( test )"
 
 BDEPEND="
 	doc? (
@@ -29,22 +30,24 @@ BDEPEND="
 DEPEND="dev-libs/boost:="
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/${PN}-1.4.3-buildsystem.patch" )
+PATCHES=( "${FILESDIR}/${PN}-1.5.0-buildsystem.patch" )
 
 src_prepare() {
 	default
+
 	eautoreconf
 }
 
 src_configure() {
-	econf \
-		$(use_enable doc docs) \
+	local myeconfargs=(
+		$(use_enable doc docs)
 		$(use_enable valgrind memory_tests)
+	)
+	econf "${myeconfargs[@]}"
 }
 
-src_compile() { :; }
-
 src_test() {
 	tc-export CXX
+
 	default
 }
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index 98e07b1fef07..ae35453e1547 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -3,7 +3,7 @@ AUX 0.53.1-remove-asan-ld_preload.patch 946 BLAKE2B 2f43446f853b5233c7c959e0216e
 AUX 0.53.1-remove-asan.patch 842 BLAKE2B 02864bbd41dd16d3e9e8e7ce9e9ef604f2fc6babd26958a4364147d392d56d8a87baec41fb009389a5fc989067019c6de89d1e2c82043ba7df463e32c99f885c SHA512 4abf8088832a1a9336fdffe04bc91a1fbab7363b72c5a1d14b22f408ea25f180d6526f8d6b3a2866a819f1895c93035869fff799da36b5040b8fb89a65ab0e23
 DIST meson-0.52.1.tar.gz 1507764 BLAKE2B 8daf43d84186905d5c32629ab6a250955bdffda502d2d79f991111d0ae7e3a21b3f9bc09ef5258f709eee4e17b09c6f09e7685a72153efcf8daaaec2645eef8a SHA512 fea3e85191782999de3a9431ec1d2cfacea32cf9598205443855042dca50ddac92eb3e74be4dd6a62bd80a606b73e76a04877b2c8efb275d9de5f87e3f9f8f41
 DIST meson-0.53.1.tar.gz 1552121 BLAKE2B 3f0bbbeba6307397dfe5e49c1f978d6246d8e18317d0361b6f013f5c2ba55ad7cba53c985418686c20db159b7790b45a0c2e05d86f861cd0280fb07afdbeb847 SHA512 0c96c354bcd7e6945473c7df0ddff929ef2bae9c2dfc7b48c6c6174c7f2be4f798398929f9c4d5986aa5fc882305ff76371ad0d65a499f058b33b05ff7025859
-EBUILD meson-0.52.1.ebuild 2101 BLAKE2B 28e4a775dfda6eca957f883e8d21edecea83b46fbe9c0f16f0f967a41f80a4a6aa05196c51f23910d7ea19b4f985888a30d62a147279834a4d06d132a0eb1790 SHA512 043c7b168433388c1ec86b20767bdc533e5cbe7ac1a8786ea604091836dfbc84f1f5b2584d06d2f10f129558ff0ea869e4eabc363cee6416a1d71cd3d58f531b
-EBUILD meson-0.53.1.ebuild 1984 BLAKE2B 2271a68437e0f0afa1575f2d63fc92afbebbf1cf3197ae192137eebef1e8846b5752b6553c5a11ecd36aae233fd91ae949a39a3b78887b236281799a10795562 SHA512 cd2e1320ba38968dba45899e7cd232eca898794086eabe8887d2a2079d4e9c1d78bdae94650573141ea5c279b7575a53912a1592ef0b76cfc8894485713f181f
-EBUILD meson-9999.ebuild 1547 BLAKE2B 249b0a4fdf18d4be2f8a9143c8925988a76742d1a6fb845fb5b00c2a238c6c555d7e57e7442083c7686679207e725a40869958ca230e46c4a986a4db5aa2e1f9 SHA512 3df015631191572d52425270fc64d2331b8d8c28ddf8cedf681b9943e79e293e630675c62931cd8767943c67c7dfdcd67bf7520f49ff769b433bc734bf237c6e
+EBUILD meson-0.52.1.ebuild 2099 BLAKE2B 2ec3ee910716247d78f701c283d1d98de405c142e8f420bf5f381703f072d0cc1ca72e53dbac2a61c15dd5a037a24180daa04a9e6f737a3135a72b75670014b9 SHA512 dc59db1ff0e24206bb18b3fdc1862bf3bc4fab86d8b66ec6b96e6b5cfc108c83381ecdd46ede0accbce0299db43f5469feed7cece8776ed7fe739aaedcac7880
+EBUILD meson-0.53.1.ebuild 1980 BLAKE2B 97d27410b495edd1c85818593d2422031825e2933793e9c3b838b4fad7c339a7a7b4543f371449c9e8cc150e82d8033f4c371a299c3ba4a54774f55318bfb9fe SHA512 3316d47f924e64c576e9acc74ab2912c503a4698c5facc7c366e4a249dd0ba188ab975ba2a29d5afcf703d34ba8431b311e07b7c59127f1bad7b25c2d0a3bb6b
+EBUILD meson-9999.ebuild 1543 BLAKE2B d888fe595fc099515fd1ea247f82617560a99f75d6c9eedf4966c60a6429d16db3a7ed894d9ebcf7693e3b391c48cc59d2729b3a5625aad923d1f39057996bf3 SHA512 d99ef333252c2d5222156f777a2ac6c31360f3ff12f5f1790bb084dc47b59c8ae3a087a19a963b95e022f133d24b20488436e0ffc63dad0b1e0e0b7cae8e4b3f
 MISC metadata.xml 423 BLAKE2B 3dc99d370f7c1f4e9d9e47b3e472c1cb26ffedf4dacf20d84a27c4bddb9a47aa09849cdb4d1307f6980cf63511584f71dc3c1c9f20debb32134e004bd57130fe SHA512 417736194719d102e906ae6efcfa37930d4706a8a1e94b09a266e044ee806ef25ded2f935fed76a2d29f6443c0387b2ebd37f9d084887bce30a7079e2ff76467
diff --git a/dev-util/meson/meson-0.52.1.ebuild b/dev-util/meson/meson-0.52.1.ebuild
index f4c8341e4700..0eced5aeae4e 100644
--- a/dev-util/meson/meson-0.52.1.ebuild
+++ b/dev-util/meson/meson-0.52.1.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 sh 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 ~x64-macos ~x64-solaris"
 fi
 
 inherit distutils-r1 toolchain-funcs
diff --git a/dev-util/meson/meson-0.53.1.ebuild b/dev-util/meson/meson-0.53.1.ebuild
index 0d8071675585..e101c51b6bef 100644
--- a/dev-util/meson/meson-0.53.1.ebuild
+++ b/dev-util/meson/meson-0.53.1.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 ~sh ~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 ~x64-macos ~x64-solaris"
 fi
 
 inherit distutils-r1 toolchain-funcs
diff --git a/dev-util/meson/meson-9999.ebuild b/dev-util/meson/meson-9999.ebuild
index ab875e3bb07b..6154c7a5df15 100644
--- a/dev-util/meson/meson-9999.ebuild
+++ b/dev-util/meson/meson-9999.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 ~sh ~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 ~x64-macos ~x64-solaris"
 fi
 
 inherit distutils-r1 toolchain-funcs
diff --git a/dev-util/netsurf-buildsystem/Manifest b/dev-util/netsurf-buildsystem/Manifest
index c68997b7ec68..599369ed0ae6 100644
--- a/dev-util/netsurf-buildsystem/Manifest
+++ b/dev-util/netsurf-buildsystem/Manifest
@@ -3,6 +3,6 @@ AUX gentoo-helpers.sh 286 BLAKE2B 8f8ed2932cb2a0c954851804f727f1099bf3f0acd4b2ec
 DIST buildsystem-1.7.tar.gz 38597 BLAKE2B d0981ef282ac0d93d81a1a6a6bee1fc2a0151c962be6ce2900a67843ba8ebc67e00508cded2a7375f6bbe0d45572690f127872936a282de80eb08655ac571603 SHA512 f6a46ac25f41e695ec13d7b2b564250c4cc44a40a688904eb17aa4b547c2df0102cc0effb7a23a2ffa6b9178ae5cf452b63980caf26e06e479168c85803f1e58
 DIST buildsystem-1.8.tar.gz 38617 BLAKE2B 0fd5539feae0b81828efe90c82baf6ce7fceec2f2189adddb0e32d2106f9263ebd14b32f3dce8daae13110f0e69801caed48ce81709ce09d809ba50041690cc7 SHA512 0f577f4867e5e12770f9b9c42ea55e884362180bc195b6ebf56e56305ce84e230407cd2ebb3b182cc03087ffef5f39187e52e2e2f8f2b86aa20a16fa33bdff8b
 EBUILD netsurf-buildsystem-1.7-r1.ebuild 703 BLAKE2B e899d1dabcffcb2de57ebfc6cf9cc3881293eb6ec8f326ecd0bb2cbb67cfaa259f5f5b0e2171a87cafb3028618053066b4b377b947f8c16e17625ea6658d44da SHA512 0c3ae21fed977aec71868fbcf65592d07e53d54ceceaf0403be67da250c1579aebd1180cfdaebabeeaa2034b5ad3612ef5ae68c41402daecc431ae30da00e9ba
-EBUILD netsurf-buildsystem-1.7.ebuild 667 BLAKE2B cdbe161417b6c3d2a94bcad84cdf915fb22fb2631c0c960973bc3a41d943f9bad9cff9a9c6f25877a064e79444183f2e3f6d11d4ec6650e5d337ebdc4255017c SHA512 b2d9f4cc9b9918ada7c37712de99220ed457099d0b9bd3e4dcdaf10875c1e8ee48501a407956ac6ea00392b56a495570108696edd8134152b998f99f253a40a7
-EBUILD netsurf-buildsystem-1.8.ebuild 697 BLAKE2B 2aa1b000abf3d8b3ad0c5c15c5e60619a9108709f8272e8a390ad478f23285117c76b7bf958b68a1be9070d373455235bac1cb0f6e2b38f26162bdc8f9ca767c SHA512 6dd95f3bd5bd75b3b302229aa160fc2078f31db8991dc09106ddb6fd3b3ccf48527c3e5df9d8eba79b344de283ced8d622e97c8714d3f76fe62056714dcb6d6c
+EBUILD netsurf-buildsystem-1.7.ebuild 668 BLAKE2B 656f9cbbf8f9737f294f80dc87718fb8e9b2c5708d992c936bc580c6d874d66c5dc85c36022b9200e744eeda1354a2c36b44b7d98666b60b3d382c584577c69c SHA512 a81667243d00735ed937c3d18316a8394427c4260325904db55546bc77b16fbd57b6d6b35aba45d3823a7b597560e4fdabd93c63c308141ae05be78bef389a84
+EBUILD netsurf-buildsystem-1.8.ebuild 697 BLAKE2B cb90d3ea54183c4cab9404565527d94aa457a5f800e91372e64fe09417366203731589acd7a9a0d49916da6792c139b488bdd47dcf6a83f71090d5e717b6d700 SHA512 766c37724926da1318584e4156d56447a56daa04bbe5ec0aba1d306cdc96f8df7456d3695f13cfeb344ffd1363902cdfab93ef54fe8c8b1473a57ff799dc3ba2
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-util/netsurf-buildsystem/netsurf-buildsystem-1.7.ebuild b/dev-util/netsurf-buildsystem/netsurf-buildsystem-1.7.ebuild
index a0961f64eec5..9c649380d53a 100644
--- a/dev-util/netsurf-buildsystem/netsurf-buildsystem-1.7.ebuild
+++ b/dev-util/netsurf-buildsystem/netsurf-buildsystem-1.7.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://download.netsurf-browser.org/libs/releases/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~m68k-mint"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86 ~m68k-mint"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/dev-util/netsurf-buildsystem/netsurf-buildsystem-1.8.ebuild b/dev-util/netsurf-buildsystem/netsurf-buildsystem-1.8.ebuild
index 9d572ce4508b..118d502dcb9c 100644
--- a/dev-util/netsurf-buildsystem/netsurf-buildsystem-1.8.ebuild
+++ b/dev-util/netsurf-buildsystem/netsurf-buildsystem-1.8.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://download.netsurf-browser.org/libs/releases/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ~ppc64 sparc x86 ~m68k-mint"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ~ppc64 sparc x86 ~m68k-mint"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/dev-util/ninja/Manifest b/dev-util/ninja/Manifest
index dd3f5338f7c6..09bf7a7eff2b 100644
--- a/dev-util/ninja/Manifest
+++ b/dev-util/ninja/Manifest
@@ -1,11 +1,15 @@
+AUX ninja-1.10.0-readme.patch 1334 BLAKE2B 22543d95e66045b5b2c489cbb823c9c75ca20d415bef6af311cc076c0a1dd329c4056bc68b644b07aab42d4e165aabdb0227463532a06e3abaff1b5a37ee0c5e SHA512 b968751a9bf3df633461a919bc35a5b9d0a210a18afe7c81c04b01676723495ea9b90eee7206f395012e37f2b5503fc2d6e63e92649b4fa13c4f0dc4b1d5f229
 AUX ninja-1.9.0-musl.patch 1997 BLAKE2B 5fa4e9b171a87ebb8fb618a2b4b0c47668d0aaf0a2b3a5b08a3be5649235228d2cd38c3891d52b1d1e0217f16b1e13175a1a077567c07e83ba8cd36aae96c7aa SHA512 78b29a57ec3c4feedf2bcfe9370b30cecd5302f29e8e14c6a3bc01becb555be6330aafba12f9225625af0644ea1f534feba8396d32bb944253a9daa5dd0e98d8
+AUX ninja-cflags.patch 738 BLAKE2B ec025836197d41d96cfcab0a7363ab3bda50cb7fc3f91f096ccfaa16babdc353269738aef92e68a261f43ba617720f677766f7044acb1a01dd7e07d6c9eca13e SHA512 97935accbef92e6eeda7d38bae6978016f4423e3989fcfb13c6de55644133ddef43db49811fc85d2649d68473d8b81e1bfb70f59a5e63d2607741d90152a4f42
+DIST ninja-1.10.0.tar.gz 210313 BLAKE2B 0a3db145deaea8a990958ad2e812bc18ed014aaba94911a2905b082745a0d08f10ce1113badabaa362f3834540b7bd3858f07e2a5fce268c66d3d6c73e974e76 SHA512 5ed47ef1ff18a03eb73296629679a8617a08ee443e10e28ae9cb24e4506f84fe1eb142888adea9a62364b626b35817def8c55ba956c9b3cbc7b82d3e62293044
 DIST ninja-1.8.2.g3bbbe.kitware.dyndep-1.jobserver-1.tar.gz 203848 BLAKE2B a6002abcfe4003dd5c9ccb8fd504b98736a6bc249323ca7afabc042a5091b9e7f0c0c19853cd7a270e00b0825ea14a7ba47c1b35d15f725c7b4866de1a79c07a SHA512 74f42181a2a712653450b0ab7ce5ad93b5ec010f4ab8411c732f682be5a6a991a7481ae1649ad70a7b903c45427b1e238b001aef29702f0896a1ae393ee22bec
 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.8.2-r1.ebuild 2654 BLAKE2B 5d0757bf132dd69674690f2c5f51655f93f0aea24d8d7e38bb4350ea654bfb282bfb9701e2a8c60d79874e51e87957303ffa8dd4847959487c5c092cd7218fc7 SHA512 cd6dbd86067de10d3aaf5b1d770ac326f0f6cdff956cc7fcf3f52a315ede06cbcb49bbded6f738563b6ed81fa058c1491a7ca71864872a89ec8265d499e7313b
-EBUILD ninja-1.8.2-r2.ebuild 2654 BLAKE2B fd8f1228cf17a6ffc0d7e639ccd01adc30074fb176845d6356640623e6d63c8f0cabe16fac2251fae1fe8377d2b6a5df317a7f1eb5748cf05d8985473e79d8ea SHA512 994796da508fca452ae76fe1dadc4b1fb278a5f0f406a948fde2823eabca2167be4a57f020c3675e61e8b496c856e77420ba5c3a51ef6fc3afd14bff12756e8e
-EBUILD ninja-1.8.2.ebuild 2512 BLAKE2B 3f0f843aa2ca6a0b59a89171519065080a66fd6216bbfb23ae9fdc9c51851e4f211efb70048bd650d1dad1ba6006b5091e3dea7f00c174e10f71c2d2fd7355c4 SHA512 60bfe10982ccb0b6a44aa17a690fe674aa740a2c3c6fc251d999c1537b8fbfba56af47b4a1dc30e6de32b097f38d19beece276f7e3e404d6748b5adcd4def9ed
-EBUILD ninja-1.9.0.ebuild 2758 BLAKE2B 741a1dd283d4230ca400290abf865cc00256deadd1796633c563d9c31b4587436dedc85015a6e86471755d054941ee86cdca79c5f82bc80c2ec6fdf1b90d671b SHA512 0494684f2f2f2bab98b9c45f0c3cb7aa414b92636a0494aedb46ee860ea59bc9d59146f850c4a481f6ddb11d75ae4a92001c995b59c3d8a0ecbd07773d3d3689
-EBUILD ninja-9999.ebuild 2707 BLAKE2B 691b88ffd652b9ad6aaa5e881fe6f47a08e9f6e87d8d80b3e9fb20947c59b2b833da7c6bc7ec778945ac8c2316a3496fea1d84d78502460b35808c15ad80842f SHA512 cce1a3a1900b27d9dd1cb2517f70ff65735f8c2c189886797c9d8608681634ce0de6c2a319e12b6c8bfe99dc5bffd51bf296e2260b54ed8dd8057217c732ff56
+EBUILD ninja-1.10.0.ebuild 2651 BLAKE2B 30b09b2a60ef6a996434ff23be9bafc0f5e82b775fd1861de74fce6e8eb61aa40462bd9681a7298911f5bb7cc319c9f23cba7b69ffa7120d5a5286112a718735 SHA512 1576d281b83d7e7c066fd6918fe3b9a83f23f10edd386494445c3a6bfee09fc72f038949928d2a8dedf5716c96cf9010ed46a9aac8a10365dae85027e57c8f5f
+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 2510 BLAKE2B 1e759e02b6ae7cdb5921b4031ba8267ffb3d9b3e9e75eea0769539f01754fa8116b7cacca459111eb4b6932a0f3764b7056b5d54330435cb94aa912e608b031b SHA512 cb7127e4ec9d6971cbad5e7408610ce9bdff203c87e320547086b6c2d6bd1c0bd7bc53b04b7e2a5a4ecd25cce748de85f0b1f5f68a611c04933445f630174026
+EBUILD ninja-1.9.0.ebuild 2761 BLAKE2B 1899c84c449d0d55379c60da5cb94f3086e3cc9a28ecd75ab0833b378767daa0e04ab90adb275d2dd1432451c4c646db07a0701adc166ec425b29e8b9ef997cb SHA512 52fa94fc5af0a2ef15df5f013368066f38ccc2d44e68d655f16545dcf17ba9cd4f2479b7cfe34a02036b5f838dc2f4ab175ba0daec83d921db946eb70a76ba5f
+EBUILD ninja-9999.ebuild 2603 BLAKE2B ca20e4c0ce6bb238b81f33dafe9fbb2922d68f27ea55d2bcc2900057f1d464a7ba94ee123080444b53c726cf449db9ca9f92dea693d1910c34562399a26f0914 SHA512 faf4b642e2c53cad0a01e52815112f0bacb64fafea111d8949a705f0e7aae5dc1622af250b4e1d80f0819e3feeed3e1493fcd15449603652531b0909386a3581
 MISC metadata.xml 340 BLAKE2B 7cf71b1a09f74328ea74362db4250bf038c0455dcd5f65676ceb5d80a61b5c2923696ecfeccf9d6cd264633e7dc00daa80bf960cc67e5b889d18d487d8e89b97 SHA512 4b78365b98eb9b8a1ef27115261dbf426942cccb7be03c8264e2728e60dedfec8fa51ee3f43488043be5af21b28a74c1c81f4767bcc58574873c2223172447b2
diff --git a/dev-util/ninja/files/ninja-1.10.0-readme.patch b/dev-util/ninja/files/ninja-1.10.0-readme.patch
new file mode 100644
index 000000000000..1d84f123daf0
--- /dev/null
+++ b/dev-util/ninja/files/ninja-1.10.0-readme.patch
@@ -0,0 +1,38 @@
+From b748d085618bf5e802de6a13b07d632d20ab04bf Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Fri, 20 Mar 2020 19:36:01 -0400
+Subject: [PATCH] Replace references to README with README.md
+
+The README file was renamed to README.md in commit
+a37da20ae74c81703b1c811182fc154d95ed46fe.
+---
+ configure.py              | 2 +-
+ misc/packaging/ninja.spec | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.py b/configure.py
+index 7d8ce9045..8eef7e6eb 100755
+--- a/configure.py
++++ b/configure.py
+@@ -649,7 +649,7 @@ def has_re2c():
+        command='$doxygen_mainpage_generator $in > $out',
+        description='DOXYGEN_MAINPAGE $out')
+ mainpage = n.build(built('doxygen_mainpage'), 'doxygen_mainpage',
+-                   ['README', 'COPYING'],
++                   ['README.md', 'COPYING'],
+                    implicit=['$doxygen_mainpage_generator'])
+ n.build('doxygen', 'doxygen', doc('doxygen.config'),
+         implicit=mainpage)
+diff --git a/misc/packaging/ninja.spec b/misc/packaging/ninja.spec
+index 05f5a079a..36e518186 100644
+--- a/misc/packaging/ninja.spec
++++ b/misc/packaging/ninja.spec
+@@ -32,7 +32,7 @@ cp -p ninja %{buildroot}%{_bindir}/
+ 
+ %files
+ %defattr(-, root, root)
+-%doc COPYING README doc/manual.html
++%doc COPYING README.md doc/manual.html
+ %{_bindir}/*
+ 
+ %clean
diff --git a/dev-util/ninja/files/ninja-cflags.patch b/dev-util/ninja/files/ninja-cflags.patch
new file mode 100644
index 000000000000..0c4ef2813bb7
--- /dev/null
+++ b/dev-util/ninja/files/ninja-cflags.patch
@@ -0,0 +1,25 @@
+From e4530769ef6a497f8f5f06159f6be049dc20e2ea Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Thu, 19 Mar 2020 11:21:29 -0400
+Subject: [PATCH] Avoid adding -O2 -DNDEBUG to cflags
+
+---
+ configure.py | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/configure.py b/configure.py
+index 7d8ce90..7566147 100755
+--- a/configure.py
++++ b/configure.py
+@@ -344,8 +344,6 @@ else:
+     if options.debug:
+         cflags += ['-D_GLIBCXX_DEBUG', '-D_GLIBCXX_DEBUG_PEDANTIC']
+         cflags.remove('-fno-rtti')  # Needed for above pedanticness.
+-    else:
+-        cflags += ['-O2', '-DNDEBUG']
+     try:
+         proc = subprocess.Popen(
+             [CXX, '-fdiagnostics-color', '-c', '-x', 'c++', '/dev/null',
+-- 
+2.25.1
+
diff --git a/dev-util/ninja/ninja-1.10.0.ebuild b/dev-util/ninja/ninja-1.10.0.ebuild
new file mode 100644
index 000000000000..aed66121807b
--- /dev/null
+++ b/dev-util/ninja/ninja-1.10.0.ebuild
@@ -0,0 +1,133 @@
+# Copyright 2012-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7} )
+
+inherit bash-completion-r1 elisp-common python-any-r1 toolchain-funcs
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	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"
+fi
+
+DESCRIPTION="A small build system similar to make"
+HOMEPAGE="https://ninja-build.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+IUSE="doc emacs test vim-syntax"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-util/re2c
+	doc? (
+		app-text/asciidoc
+		app-doc/doxygen
+		dev-libs/libxslt
+	)
+	test? ( dev-cpp/gtest )
+"
+RDEPEND="
+	emacs? ( >=app-editors/emacs-23.1:* )
+	vim-syntax? (
+		|| (
+			app-editors/vim
+			app-editors/gvim
+		)
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/ninja-cflags.patch
+	"${FILESDIR}"/ninja-1.10.0-readme.patch
+)
+
+run_for_build() {
+	if tc-is-cross-compiler; then
+		local -x AR=$(tc-getBUILD_AR)
+		local -x CXX=$(tc-getBUILD_CXX)
+		local -x CFLAGS=
+		local -x CXXFLAGS=${BUILD_CXXFLAGS}
+		local -x LDFLAGS=${BUILD_LDFLAGS}
+	fi
+	echo "$@" >&2
+	"$@"
+}
+
+src_compile() {
+	tc-export AR CXX
+
+	# configure.py appends CFLAGS to CXXFLAGS
+	unset CFLAGS
+
+	run_for_build ${EPYTHON} configure.py --bootstrap --verbose || die
+
+	if tc-is-cross-compiler; then
+		mv ninja ninja-build || die
+		${EPYTHON} configure.py || die
+		./ninja-build -v ninja || die
+	else
+		ln ninja ninja-build || die
+	fi
+
+	if use doc; then
+		./ninja-build -v doxygen manual || die
+	fi
+
+	if use emacs; then
+		elisp-compile misc/ninja-mode.el || die
+	fi
+}
+
+src_test() {
+	if ! tc-is-cross-compiler; then
+		# Bug 485772
+		ulimit -n 2048
+		./ninja -v ninja_test || die
+		./ninja_test || die
+	fi
+}
+
+src_install() {
+	dodoc README.md CONTRIBUTING.md
+	if use doc; then
+		docinto html
+		dodoc -r doc/doxygen/html/.
+		dodoc doc/manual.html
+	fi
+	dobin ninja
+
+	newbashcomp misc/bash-completion "${PN}"
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax/
+		doins misc/ninja.vim
+
+		echo 'au BufNewFile,BufRead *.ninja set ft=ninja' > "${T}/ninja.vim"
+		insinto /usr/share/vim/vimfiles/ftdetect
+		doins "${T}/ninja.vim"
+	fi
+
+	insinto /usr/share/zsh/site-functions
+	newins misc/zsh-completion _ninja
+
+	if use emacs; then
+		cd misc || die
+		elisp-install ninja ninja-mode.el* || die
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-util/ninja/ninja-1.8.2-r1.ebuild b/dev-util/ninja/ninja-1.8.2-r1.ebuild
index def8432c182b..366073aff8a9 100644
--- a/dev-util/ninja/ninja-1.8.2-r1.ebuild
+++ b/dev-util/ninja/ninja-1.8.2-r1.ebuild
@@ -15,7 +15,7 @@ else
 	MY_P="ninja-${KITWARE_VERSION}"
 	S="${WORKDIR}/${MY_P}"
 	SRC_URI="https://github.com/Kitware/ninja/archive/v${KITWARE_VERSION}.tar.gz -> ${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 fi
 
 DESCRIPTION="A small build system similar to make"
diff --git a/dev-util/ninja/ninja-1.8.2-r2.ebuild b/dev-util/ninja/ninja-1.8.2-r2.ebuild
index 155653a132cb..17b2dfc3f74c 100644
--- a/dev-util/ninja/ninja-1.8.2-r2.ebuild
+++ b/dev-util/ninja/ninja-1.8.2-r2.ebuild
@@ -15,7 +15,7 @@ else
 	MY_P="ninja-${KITWARE_VERSION}"
 	S="${WORKDIR}/${MY_P}"
 	SRC_URI="https://github.com/Kitware/ninja/archive/v${KITWARE_VERSION}.tar.gz -> ${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 fi
 
 DESCRIPTION="A small build system similar to make"
diff --git a/dev-util/ninja/ninja-1.8.2.ebuild b/dev-util/ninja/ninja-1.8.2.ebuild
index 3f0879829033..29fe9a3efed9 100644
--- a/dev-util/ninja/ninja-1.8.2.ebuild
+++ b/dev-util/ninja/ninja-1.8.2.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 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 fi
 
 DESCRIPTION="A small build system similar to make"
diff --git a/dev-util/ninja/ninja-1.9.0.ebuild b/dev-util/ninja/ninja-1.9.0.ebuild
index c0e633894cb9..8d2dd26cb265 100644
--- a/dev-util/ninja/ninja-1.9.0.ebuild
+++ b/dev-util/ninja/ninja-1.9.0.ebuild
@@ -15,7 +15,7 @@ else
 	MY_P="ninja-${KITWARE_VERSION}"
 	S="${WORKDIR}/${MY_P}"
 	SRC_URI="https://github.com/Kitware/ninja/archive/v${KITWARE_VERSION}.tar.gz -> ${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~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 ~x64-solaris"
 fi
 
 DESCRIPTION="A small build system similar to make"
@@ -48,6 +48,7 @@ RDEPEND="
 "
 
 PATCHES=(
+	"${FILESDIR}"/ninja-cflags.patch
 	"${FILESDIR}/ninja-1.9.0-musl.patch"
 )
 
@@ -66,8 +67,8 @@ run_for_build() {
 src_compile() {
 	tc-export AR CXX
 
-	# configure.py uses CFLAGS instead of CXXFLAGS
-	export CFLAGS=${CXXFLAGS}
+	# configure.py appends CFLAGS to CXXFLAGS
+	unset CFLAGS
 
 	run_for_build ${EPYTHON} configure.py --bootstrap --verbose || die
 
diff --git a/dev-util/ninja/ninja-9999.ebuild b/dev-util/ninja/ninja-9999.ebuild
index 8c9e987cef2f..95a15369f8c9 100644
--- a/dev-util/ninja/ninja-9999.ebuild
+++ b/dev-util/ninja/ninja-9999.ebuild
@@ -11,11 +11,8 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/ninja-build/ninja.git"
 else
-	KITWARE_VERSION="1.9.0.g99df1.kitware.dyndep-1.jobserver-1"
-	MY_P="ninja-${KITWARE_VERSION}"
-	S="${WORKDIR}/${MY_P}"
-	SRC_URI="https://github.com/Kitware/ninja/archive/v${KITWARE_VERSION}.tar.gz -> ${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+	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"
 fi
 
 DESCRIPTION="A small build system similar to make"
@@ -47,6 +44,10 @@ RDEPEND="
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}"/ninja-cflags.patch
+)
+
 run_for_build() {
 	if tc-is-cross-compiler; then
 		local -x AR=$(tc-getBUILD_AR)
@@ -62,8 +63,8 @@ run_for_build() {
 src_compile() {
 	tc-export AR CXX
 
-	# configure.py uses CFLAGS instead of CXXFLAGS
-	export CFLAGS=${CXXFLAGS}
+	# configure.py appends CFLAGS to CXXFLAGS
+	unset CFLAGS
 
 	run_for_build ${EPYTHON} configure.py --bootstrap --verbose || die
 
@@ -94,7 +95,7 @@ src_test() {
 }
 
 src_install() {
-	dodoc README HACKING.md
+	dodoc README.md CONTRIBUTING.md
 	if use doc; then
 		docinto html
 		dodoc -r doc/doxygen/html/.
diff --git a/dev-util/nvidia-cuda-sdk/Manifest b/dev-util/nvidia-cuda-sdk/Manifest
index f3c2dc7ba8e0..569290502358 100644
--- a/dev-util/nvidia-cuda-sdk/Manifest
+++ b/dev-util/nvidia-cuda-sdk/Manifest
@@ -1,4 +1,5 @@
 DIST cuda_10.1.243_418.87.00_linux.run 2572375299 BLAKE2B df9cb4faeeeeecc536e72697c6c73d544219f1b23cacb7fed646b0908fc7e573e85920861d56f76776ba637d84964cd1c789a0fe0d6541a4e0adf618b6c74d3c SHA512 f92b19d0242969a65a6e6db43bc293e442abc07a9e168c9e995692e1a401679504598c782e511be3879e1650b90f71a50bbc63c9ee45654c26b5007cdf33c4fe
+DIST cuda_10.2.89_440.33.01_linux.run 2645419389 BLAKE2B 236aa70a7b45e3636c2c229fffa7d1ca0699ab4365865a73edab607a209c42c2899133dd6a83c61c5929fa754668ad15aec4d847639af1c00a8e6657c8487c77 SHA512 ad8da539ff5df7caf411d1e497ff3d6978cfa8a1fd9150fa4846089e92a604ea56be8631f3efdfe7229a655b8d2d28e6edb32f5731530a77d6f00241cc7aab6e
 DIST cuda_6.5.19_linux_32.run 81882112 BLAKE2B cf55ef7c969503c156431fc56301ed4e9a1234ae0cb867f12649636069f35e56bf6fc9df7482b6baade45d78c8baa2d98c41a28696da59294e0f575c4a0344ce SHA512 1ce9bd6b472b7e4f1fb181eb340dfcb757714d59a89aaa02146cfe1a97c8ccb7eb7699b4ec823276f277eb4d82d95050eaba17e7ed5fd2e47b9b5d78531c5d4e
 DIST cuda_6.5.19_linux_64.run 982446238 BLAKE2B 517ac07d4717f4f5d9427616a387dbe01fe35b7b6845b5d9e29aad18814243d38cc9a3cd0ff9042c027fcb056618e9a8535d560c16a6ac7998ff39fcf3ada654 SHA512 06854f020a5f72cf4bd714859e6966248ac2f589284113674e869fdaa1254cae27d4101940758ecda5df4724ad3e448a1f6d0c053b6cbc28107750872b6a5797
 DIST cuda_7.5.18_linux.run 1195424633 BLAKE2B 35933c3c3355231cd59e579e6ac6a30cca57ed0e3de26ce5cac368ff22595f39cb041c9696415d4d76a49e772b7828eacab24a3e581c1e9a8ef7981e1b044eee SHA512 97459dfd124060200f1c43f763e5bce0bea53e35ed4bef72bee6c8ba1c04ecffb8695af11755443513316f91fdb5cb4d35662f7b87bca7e3de85d562d4e49363
@@ -8,6 +9,7 @@ DIST cuda_9.0.176_384.81_linux.run 1643293725 BLAKE2B 4155de544f877f6c420c2463bc
 DIST cuda_9.1.85_387.26_linux.run 1639829845 BLAKE2B c9f6544893b8e4d0b4c51d66f1cf17a593e65af6e7748e2994abda8ffcb839a7bb19cb0eebfbc52347293296025f000241d1c9842af0c41d31928770c4639b79 SHA512 492a5fa58fc93ac718ca093f24bb5e74dd2586338c42f2e11e328c7f16756e3511a1c555b12cb1990bb782d0d1600976f4c9e5b3d4857e371b0431daf06b2827
 DIST cuda_9.2.88_396.26_linux.run 1758421686 BLAKE2B 5068b2dfae87e43c124a6a72ac98b7c562aebc7161e7c977cfba68342127e99705228be531aa5bb8af0318e17c4ef8fe36257452d0f507fc3b82e3fbd0184bdc SHA512 2d0d87926e11a1b21d6d3377138753df458a53ba9539d8399f9f252e0784cb41e2c63a5c724ca81ded82b9657b97fda51d812b467b0827e7d361aa2ad73b2dba
 EBUILD nvidia-cuda-sdk-10.1.243.ebuild 3855 BLAKE2B 38641a5f691355ddaf84b7e24800e4758245fb2237ca6589c0e589a674f1d0dbdf2ca4396cb61f0d6572374833c9756a751d7b79edb693bd14b1cbdf42d53f44 SHA512 6ec429c1d57814d98050040644aa407247ef0e47c2634fe7e4dd68d8e6c33fc0975ea4688418c07efbee109c3b16f69c08ef16a1812169bacef38307a41f32ee
+EBUILD nvidia-cuda-sdk-10.2.89.ebuild 3848 BLAKE2B 54e6e210099b41a583c7410a856a21a0f32a816f7282dae5361480e53fa0bbf61489dafe0ed5082992d8ac0e6a0f836ce5d0deaa6a9c6b2a0c20ffcc6a491eeb SHA512 c786a2001fc28583eb0c38290bef6b7a9167dd8b406e940f77f67a2c4a34ecb98849fa1e65e6d13cd540bcbad218a64a4ee64e3b67acde5949771f5fb90e5cee
 EBUILD nvidia-cuda-sdk-6.5.19.ebuild 3992 BLAKE2B 3cd45f806009b7ef888c59c566af037109d20a6a4f5306ff6a6187266cfba019575f94c35df3780377a437074d630edcc88e3c4c3510a2511a27808f4d7d1012 SHA512 367460c2bc89549774ead4cde22c875ed3df9f8002fdd6666289649c6749295389204a11cd0cd6ab201cb2eed1e43d1cda45aea42b9864c9a7fb5ba813aaa04e
 EBUILD nvidia-cuda-sdk-7.5.18.ebuild 3568 BLAKE2B 45c89d2ea4116aa687ea797997cdf03bd7f14626ef49e505144ef9864aa88c7130878dee1896e0b0fbffec5b7815a4f753c1b5a71e4582676efb03aa62c0663a SHA512 199004e748db588de447c71ac2bddb08fdfbbc099a335ecbcd7e57978cc3cbb9cfdd6a87765c6b315cfac067248c133eeff1a98fc2e9d331a138ccb5266a1f7e
 EBUILD nvidia-cuda-sdk-8.0.44-r1.ebuild 3757 BLAKE2B 2a63de4062e746841c0e975aa68a5e40b358267b7682ca54bcad4c4b97ca3a1ac463c98ce081138d56013945cd22e9ff818d9b4391f8f6e15c1ddb8f4813aa70 SHA512 b2270c56dc77e85db6963c01965afb4a85b7acf3790630d955adf0d64d2ca09203c9423285684c99432037c8378dd5856c5ccf4b91a0b364f54c282765c149d9
diff --git a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-10.2.89.ebuild b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-10.2.89.ebuild
new file mode 100644
index 000000000000..d51ba03d0bb9
--- /dev/null
+++ b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-10.2.89.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cuda flag-o-matic portability toolchain-funcs unpacker
+
+MYD=$(ver_cut 1-2 ${PV})
+DRIVER_PV="440.33.01"
+
+DESCRIPTION="NVIDIA CUDA Software Development Kit"
+HOMEPAGE="https://developer.nvidia.com/cuda-zone"
+SRC_URI="https://developer.download.nvidia.com/compute/cuda/${MYD}/Prod/local_installers/cuda_${PV}_${DRIVER_PV}_linux.run"
+
+LICENSE="CUDPP"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~amd64-linux"
+IUSE="+cuda debug +doc +examples opencl mpi"
+
+RDEPEND="
+	~dev-util/nvidia-cuda-toolkit-${PV}
+	media-libs/freeglut
+	examples? (
+		media-libs/freeimage
+		media-libs/glew:0=
+		!prefix? ( >=x11-drivers/nvidia-drivers-${DRIVER_PV}[uvm] )
+		mpi? ( virtual/mpi )
+		)"
+DEPEND="${RDEPEND}"
+
+RESTRICT="test"
+
+S=${WORKDIR}/builds/cuda-samples
+
+QA_EXECSTACK=(
+	opt/cuda/sdk/0_Simple/cdpSimplePrint/cdpSimplePrint
+	opt/cuda/sdk/0_Simple/cdpSimpleQuicksort/cdpSimpleQuicksort
+	opt/cuda/sdk/bin/x86_64/linux/release/cdpSimplePrint
+	opt/cuda/sdk/bin/x86_64/linux/release/cdpSimpleQuicksort
+	)
+
+src_prepare() {
+	cuda_src_prepare
+
+	export RAWLDFLAGS="$(raw-ldflags)"
+
+	local file
+	while IFS="" read -d $'\0' -r file; do
+		sed \
+			-e 's:-O[23]::g' \
+			-e "/LINK/s:gcc:$(tc-getCC) ${LDFLAGS}:g" \
+			-e "/LINK/s:g++:$(tc-getCXX) ${LDFLAGS}:g" \
+			-e "/CC/s:gcc:$(tc-getCC):g" \
+			-e "/GCC/s:g++:$(tc-getCXX):g" \
+			-e "/NVCC /s|\(:=\).*|:= ${EPREFIX}/opt/cuda/bin/nvcc|g" \
+			-e "/ CFLAGS/s|\(:=\)|\1 ${CFLAGS}|g" \
+			-e "/ CXXFLAGS/s|\(:=\)|\1 ${CXXFLAGS}|g" \
+			-e "/NVCCFLAGS/s|\(:=\)|\1 ${NVCCFLAGS} |g" \
+			-e 's:-Wimplicit::g' \
+			-e "s|../../common/lib/linux/\$(OS_ARCH)/libGLEW.a|$($(tc-getPKG_CONFIG) --libs glew)|g" \
+			-e "s|../../common/lib/\$(OSLOWER)/libGLEW.a|$($(tc-getPKG_CONFIG) --libs glew)|g" \
+			-e "s|../../common/lib/\$(OSLOWER)/\$(OS_ARCH)/libGLEW.a|$($(tc-getPKG_CONFIG) --libs glew)|g" \
+			-i "${file}" || die
+	done < <(find . -type f -name 'Makefile' -print0)
+
+	# Upstream suggested us skip cudaNvSci https://github.com/NVIDIA/cuda-samples/issues/22
+	rm -rf 0_Simple/cudaNvSci || die
+	rm -rf common/inc/GL || die
+	find . -type f -name '*.a' -delete || die
+
+	eapply_user
+}
+
+src_compile() {
+	use examples || return
+	local myopts=("verbose=1")
+	use debug && myopts+=("dbg=1")
+	export FAKEROOTKEY=1 # Workaround sandbox issue in #462602
+	emake \
+		cuda-install="${EPREFIX}/opt/cuda" \
+		CUDA_PATH="${EPREFIX}/opt/cuda/" \
+		MPI_GCC=10 \
+		"${myopts[@]}"
+}
+
+src_test() {
+	addwrite /dev/nvidiactl
+	addwrite /dev/nvidia0
+
+	local i
+	for i in {0..9}*/*; do
+		emake -C "${i}" run
+	done
+}
+
+src_install() {
+	local f t crap=( *.txt Samples.htm* )
+
+	if use doc; then
+		ebegin "Installing docs ..."
+			while IFS="" read -d $'\0' -r f; do
+				treecopy "${f}" "${ED}"/usr/share/doc/${PF}/
+			done < <(find -type f \( -name 'readme.txt' -o -name '*.pdf' \) -print0)
+
+			while IFS="" read -d $'\0' -r f; do
+				docompress -x "${f#${ED}}"
+			done < <(find "${ED}"/usr/share/doc/${PF}/ -type f -name 'readme.txt' -print0)
+		eend
+	fi
+
+	ebegin "Cleaning before installation..."
+		for f in "${crap[@]}"; do
+			rm -f "${f}" || die
+		done
+		find -type f \( -name '*.o' -o -name '*.pdf' -o -name 'readme.txt' \) -delete || die
+	eend
+
+	ebegin "Moving files..."
+		while IFS="" read -d $'\0' -r f; do
+			t="$(dirname ${f})"
+			if [[ ${t/obj\/} != ${t} || ${t##*.} == a ]]; then
+				continue
+			fi
+			if [[ -x ${f} ]]; then
+				exeinto /opt/cuda/sdk/"${t}"
+				doexe "${f}"
+			else
+				insinto /opt/cuda/sdk/"${t}"
+				doins "${f}"
+			fi
+		done < <(find . -type f -print0)
+	eend
+}
+
+pkg_postinst() {
+	if use examples && use prefix; then
+		ewarn "Gentoo Prefix does not manage kernel modules.  You need to make certain"
+		ewarn "the function counterpart to >=x11-drivers/nvidia-drivers-${DRIVER_PV}[uvm]"
+		ewarn "is available from the host"
+	fi
+}
diff --git a/dev-util/opencl-headers/Manifest b/dev-util/opencl-headers/Manifest
new file mode 100644
index 000000000000..41f670f2ab5f
--- /dev/null
+++ b/dev-util/opencl-headers/Manifest
@@ -0,0 +1,3 @@
+DIST opencl-headers-2020.03.13.tar.gz 48540 BLAKE2B 5befbf7b1ed9df7e45789f1a5c3ec15a2bb0bee4cf50f89e424b6c69534c045c0774fd6f6424d5311c5415c9e6714033b6c70d3c641f60c037a9c3fab3e00bb6 SHA512 4bf368325f6034b2c59b9d3a22f7c12eec078e5e5a0bdcc3f1f5870e211bf7d03ae7137897262440a9c98a35592f4405d85fae1b53246e56b5544af51bf9b39a
+EBUILD opencl-headers-2020.03.13-r1.ebuild 609 BLAKE2B 9c9e9b5811b0526f2884dac2a3a525168004e080c8ab45f32fd136981bfaf13482239dc54e1f2eeba8647ac688fd92cfeeb4495748ebbd71f9d1502e9ef9f1f8 SHA512 b6f5014c64795d56055ee41a9fa0da3f226571d1f164f62d9522f9c656aada3ff2980ee0339ca31d157ba04b44a410df2e44005cf47ea1c967c69353dab99506
+MISC metadata.xml 1055 BLAKE2B bda38a579f6d6369a25342297ec81205dee40d42fc81ccaedb68b0d5b90ae6cd9d3b32eb3fad7d6f4f67f4da5d1dceeb5e9167f94d5619176376778dfa831f97 SHA512 4e75ba94c11582a73e4896f759ce965047357ff123408a2ba3d502c2598269a4273cadb7f02d8b1335a119f2e450fc1c5c07271a3a7c4383d378118af2eed7e2
diff --git a/dev-util/opencl-headers/metadata.xml b/dev-util/opencl-headers/metadata.xml
new file mode 100644
index 000000000000..f5bc8eb8de51
--- /dev/null
+++ b/dev-util/opencl-headers/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+	<longdescription lang="en">
+		The OpenCL API headers in this package are unified headers and are designed to work
+		with all released OpenCL versions. This differs from previous OpenCL API headers,
+		where version-specific API headers either existed in separate branches, or
+		in separate folders in a branch.
+
+		By default, the OpenCL API headers in this repository are for the latest OpenCL
+		version supported. To use these API headers to target a different OpenCL version,
+		an application may #define the preprocessor value CL_TARGET_OPENCL_VERSION before
+		including the OpenCL API headers. The CL_TARGET_OPENCL_VERSION is a three digit
+		decimal value representing the OpenCL API version.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">KhronosGroup/OpenCL-Headers</remote-id>
+	</upstream>
+</pkgmetadata>
+
diff --git a/dev-util/opencl-headers/opencl-headers-2020.03.13-r1.ebuild b/dev-util/opencl-headers/opencl-headers-2020.03.13-r1.ebuild
new file mode 100644
index 000000000000..917c0cad3500
--- /dev/null
+++ b/dev-util/opencl-headers/opencl-headers-2020.03.13-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="OpenCL-Headers"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Unified C language headers for the OpenCL API"
+HOMEPAGE="https://github.com/KhronosGroup/OpenCL-Headers"
+SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# To avoid file collisions in /usr/include/CL/
+DEPEND="!app-eselect/eselect-opencl"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	insinto /usr/include
+	doins -r "${S}"/CL
+}
diff --git a/dev-util/packer/Manifest b/dev-util/packer/Manifest
index 8f0b03ed0ad1..793b2a6d067e 100644
--- a/dev-util/packer/Manifest
+++ b/dev-util/packer/Manifest
@@ -6,6 +6,6 @@ DIST packer-1.4.5.tar.gz 13705057 BLAKE2B d23527e8bb0104e3f0206f5a82eb93fbe15a95
 EBUILD packer-1.3.5.ebuild 790 BLAKE2B 017172611fb382cf7c9f3f374c404de971d09f68cf44202bf05180fce8255b321132a91e5cfa7d1d7bc517e8b59849e9bed6cdde4db4244eef07993f7f87212c SHA512 4b2aa5d90c965ad271c688565bc1e37cc0e91b7222b8d33a7f6d9fd271e60a5721f31e496df7cb921c0fe3546678fbe9da5cbecaa3609415566a98eea1456a9f
 EBUILD packer-1.4.0.ebuild 792 BLAKE2B 98101308b1243d57463057ac8be281bab376eb32c5b78156f3d00645335a5de62b71e3422fc14b4c8d4b33994563773e47970a9c671e4341c28e77e731680a0c SHA512 0529bbe8e372bcc7e89ceb7b2f3b3d6a14122d1b1c0276dde64f230430049c3c41f1d443df65ce1413713abf138d7f0eeec81b91909ef92aa675dc5facc59135
 EBUILD packer-1.4.1.ebuild 777 BLAKE2B 6123da351bda25d983b0032e68d842954ac3468b06b85f71070c8021b83644a39a3ae9ab13b7dd9a3849637170613c3ad8a0c9693dbb487905ddf5e9311ec081 SHA512 70a934dc3fda8efffe92a17a67e024c2831859fdb4e5e0f2732017866b296afee87280fabf3ab8c26ab5be86418b4de15366d07b9d6252f0eb53ed93e2a6d96c
-EBUILD packer-1.4.4.ebuild 751 BLAKE2B d67b3a56a978907284edd5306f2284a3c1145eeda73d11d5100cb78c11ea003caaa559d4a53e7a3942576ce9cb4fa9d8de7b1db0ea266d8fd2912716fdb00f19 SHA512 56d14027df5fec480812b730626fc31e7ceba8efca492432d4aeeab5c8501bd8dbad41d59d09d097be76193d30deaacd18b98716a2b7cdab0948adb1e6abe906
-EBUILD packer-1.4.5.ebuild 751 BLAKE2B d67b3a56a978907284edd5306f2284a3c1145eeda73d11d5100cb78c11ea003caaa559d4a53e7a3942576ce9cb4fa9d8de7b1db0ea266d8fd2912716fdb00f19 SHA512 56d14027df5fec480812b730626fc31e7ceba8efca492432d4aeeab5c8501bd8dbad41d59d09d097be76193d30deaacd18b98716a2b7cdab0948adb1e6abe906
+EBUILD packer-1.4.4.ebuild 674 BLAKE2B 8a7aaa2252962053ab87a9c7c7aca766b7dc2328b74f545f55e04136bae9289eb3786cc42b1291578ec6eb2554e3813f6fec426246ddcb5cf7c2a19cfeacdc0a SHA512 0bb54a2f36020864c0ccafed3f6aa525a414ab9cdf3ad6417a6b791af6cfcfa2d7b6cbc1089275ce6a2368cbf5887fcb80a343e4d85fb184de657bec5a228951
+EBUILD packer-1.4.5.ebuild 674 BLAKE2B 8a7aaa2252962053ab87a9c7c7aca766b7dc2328b74f545f55e04136bae9289eb3786cc42b1291578ec6eb2554e3813f6fec426246ddcb5cf7c2a19cfeacdc0a SHA512 0bb54a2f36020864c0ccafed3f6aa525a414ab9cdf3ad6417a6b791af6cfcfa2d7b6cbc1089275ce6a2368cbf5887fcb80a343e4d85fb184de657bec5a228951
 MISC metadata.xml 1367 BLAKE2B 30b2ebc8ec0449bb63f4bf97431bf841a09ef98dd7bf59064bd3d6ac8ed697d254de3ed940274795fd35e56ebf582a3880b4e0a3063074b7fae04bbcc07396fa SHA512 dfb93bd681962fc8290c886248021e8b281c4b184acba7133824a7c00eb9ca03a378769329469ffbaa1559ff6427988d925acbcd68cbe76518f4052831e2ac2b
diff --git a/dev-util/packer/packer-1.4.4.ebuild b/dev-util/packer/packer-1.4.4.ebuild
index a361a43a1fa3..ab0e1cbcd571 100644
--- a/dev-util/packer/packer-1.4.4.ebuild
+++ b/dev-util/packer/packer-1.4.4.ebuild
@@ -3,25 +3,21 @@
 
 EAPI=7
 
-inherit golang-base go-module
+inherit go-module
 
 DESCRIPTION="A tool to create identical machine images for multiple platforms"
 HOMEPAGE="https://www.packer.io"
-
-EGO_PN="github.com/hashicorp/packer"
 SRC_URI="https://github.com/hashicorp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0 BSD-2 BSD-4 ECL-2.0 icu imagemagick ISC JSON MIT MPL-2.0"
-
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE=""
-DEPEND=""
 
 DOCS=( {README,CHANGELOG}.md )
 
 src_compile() {
-	GOCACHE="${T}/go-cache" go build \
+	go build \
+		-mod=vendor \
 		-work -o "bin/${PN}" ./ || die
 }
 
diff --git a/dev-util/packer/packer-1.4.5.ebuild b/dev-util/packer/packer-1.4.5.ebuild
index a361a43a1fa3..ab0e1cbcd571 100644
--- a/dev-util/packer/packer-1.4.5.ebuild
+++ b/dev-util/packer/packer-1.4.5.ebuild
@@ -3,25 +3,21 @@
 
 EAPI=7
 
-inherit golang-base go-module
+inherit go-module
 
 DESCRIPTION="A tool to create identical machine images for multiple platforms"
 HOMEPAGE="https://www.packer.io"
-
-EGO_PN="github.com/hashicorp/packer"
 SRC_URI="https://github.com/hashicorp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0 BSD-2 BSD-4 ECL-2.0 icu imagemagick ISC JSON MIT MPL-2.0"
-
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE=""
-DEPEND=""
 
 DOCS=( {README,CHANGELOG}.md )
 
 src_compile() {
-	GOCACHE="${T}/go-cache" go build \
+	go build \
+		-mod=vendor \
 		-work -o "bin/${PN}" ./ || die
 }
 
diff --git a/dev-util/patchutils/Manifest b/dev-util/patchutils/Manifest
index 75608af09d76..0021b5867df9 100644
--- a/dev-util/patchutils/Manifest
+++ b/dev-util/patchutils/Manifest
@@ -1,6 +1,6 @@
 AUX patchutils-0.3.3-format-security.patch 715 BLAKE2B 48be5e5e0376b6520cd0baffca1cc385bf3a267c8443b4ec195d302da6b165604471b919c47104943c1ccdc01d3c9866d93d1d8730e1a8b6889f433f607fb73a SHA512 b98932e5e48dfefb2ef8550c7f212cb0bf7417b0ed42705e3ddd9164d522ebdb47a0610539769a49a19d10e6389eb9e764fc5ef7bdd03af9b29feeb76a51c8fa
 DIST patchutils-0.3.3.tar.xz 156328 BLAKE2B e7da090e1fc7f95f5c2e4c02828702b485dc92fa22a4f45d69f5d9f610fb5a5e3267794fa572cf3aa73be45a86a5c889776eeadf5cca98237d97e53cb1b9be91 SHA512 4ec085078e9ae2e878dc10fbfea5974d9772716aef5d8e130a0023ceaa26640bccfaf1022c8153923b38230b36c8d4dddf4aaa674076c733bb1277895b63a268
 DIST patchutils-0.3.4.tar.xz 166400 BLAKE2B 382be328bfd1ab848f38126ad7a41a4c953844956c181265953a7496c8de3df5d90d071a823b226ceeddd7321bd4ecae1e06c8583155b08826c97177efa9b68b SHA512 ede006122fad180b78feaf69294f1c40c0a764981fa581f1893abeeb0421f9d586fc33f79d065690a6bc6187a31f11311b086669879dde12c6e49c7c8a2aa440
-EBUILD patchutils-0.3.3.ebuild 769 BLAKE2B cf126011cebf7bec3b268eada0d1a64514fd1478ae0ad29451b05e07f3cc4eb90d7903136f045969b7062a68c3e6deeec0c9cc0031b5d01dd22ddff372c35ffd SHA512 bfdd140efae27221e6684f720a2c96b7f8c014aff740976940305f3e9ea04093f6e40aef377122b45d41740179359da24312451976d41e9bd3b3010bbebb2321
-EBUILD patchutils-0.3.4.ebuild 808 BLAKE2B 3702cb9d711c00040fa59253b61bee46941cfe20e7d452955c42b9b9dd45b62e985775091fa1b12b4a144133cc568a990bc1f97a1013debdc9c090bd62be5cba SHA512 b50e98fdb34d2d8d2d871425bff747643c6cced4e6a54731aea3c0b0406a4bdf463524980937d9ceb5ca6c79cd30f2dae32a88a72310066e2883fa43ef10ef19
+EBUILD patchutils-0.3.3.ebuild 767 BLAKE2B c432d86b0f6a0c5534bb9040032ecce1b533a9166e8df0dd5514b5dc4cc2d51a484a5eec8609add8c9c18c3704fa5151c0f0a69f528a1a6025a1a7dc4c1337d2 SHA512 36184238703b25a63dbf29a4d4d20f9fe1f1ae4b551821a3eed1b955b7b3286260319eaeb3846e8de79e325331bbe4040eb8e97a87967c04eaa01770176099be
+EBUILD patchutils-0.3.4.ebuild 805 BLAKE2B 2d964a52cc789920409dd8af715031330bca84790bb24e6be9cc37c7b05e950f52b20ad682b9133a6e703a36812624cc648d8c47e31e22de7a01538b220e7a4a SHA512 b31bfa216052f97c3766ea7527f6cc54879d61091b5237d1d390360bf9064610aaf525d2c120bbe0f7c07797d4bfcb6f5b2ac9837fe0514fbc9905c677c4ddfe
 MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25
diff --git a/dev-util/patchutils/patchutils-0.3.3.ebuild b/dev-util/patchutils/patchutils-0.3.3.ebuild
index dc7dc7ad05c1..3dfe96343452 100644
--- a/dev-util/patchutils/patchutils-0.3.3.ebuild
+++ b/dev-util/patchutils/patchutils-0.3.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://cyberelk.net/tim/data/patchutils/stable/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/patchutils/patchutils-0.3.4.ebuild b/dev-util/patchutils/patchutils-0.3.4.ebuild
index 323ac499dd83..fae95d7d4131 100644
--- a/dev-util/patchutils/patchutils-0.3.4.ebuild
+++ b/dev-util/patchutils/patchutils-0.3.4.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://cyberelk.net/tim/data/patchutils/stable/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/pkgcheck/Manifest b/dev-util/pkgcheck/Manifest
index 4e79ea0d4534..20add417c4b2 100644
--- a/dev-util/pkgcheck/Manifest
+++ b/dev-util/pkgcheck/Manifest
@@ -1,6 +1,4 @@
-DIST pkgcheck-0.7.5.tar.gz 229979 BLAKE2B 134a67e139fed22f70fc5af5a1644df17ac46ca093b47cae0d362702ff33be320b838ac7c3c6e6d3c309644f7399ff0c33d6e6152d385be8312311b760d636d8 SHA512 eb46847ad5293e5cd6043e5f1edbb4307bf41593bc19a44c73ccb67590545055ce9fd3cddc25e4cc693bb2666aaf24944070796546743e0d7417f8e47cd516d0
 DIST pkgcheck-0.7.6.tar.gz 234637 BLAKE2B 31c31d987aed03e4a61f58a3dc3074985a4f436e3598f11257d602a668525f24e45c540d56e5779237cd36299b0ab73b9a59e3482099cb5accbb3ea8437cd7c5 SHA512 cfded3a5a0249ee9279fe93156ef524cafe7302915dfbbb01acd0bdc3acefcd1e90c6bcfbf3dc40bd5cb71680cc6453b1de045878d75a9ade00c432e663fd136
-EBUILD pkgcheck-0.7.5.ebuild 1328 BLAKE2B de00cf2b30071fd2f9ae0dfe001cd1b42a41f77fba341ab06e0f2f623fd8ac10fd56593ab228d37b53e588fa79c5161eafa08c853842bf6255ec9bb7a9a8af4b SHA512 900be48478f2a12947263464f937c3f1b2868744ffbbee755c35fb08e1d982ab62ed165b4cb0d8cb11dbd3902a965691705885cb6e6ced6e6e481d96a54d4fc3
-EBUILD pkgcheck-0.7.6.ebuild 1328 BLAKE2B 6c4e1486d82f4adf6bdbd84697bae4a74c28c9c380ed256fab6dc431d4abf7007b70a54e4065a9d010d50aca2626e4d83346c19102b976eb0a8b1c95a0fbd153 SHA512 3bf0d03e5e931913f0721ba3474f59542bae97721428ff6cac17dd8e7c26ca17aef695933d492b98999dda6ec34eea7877a40bcf1bcc59246df5a92bdba301e1
+EBUILD pkgcheck-0.7.6.ebuild 1339 BLAKE2B 4ffced551a5b003351ed3495dab9c93482de13a88a28b3ff808241bb61c3d6058f16ac82b159f6f3a307617d40d81e7ee3b275ad5d8f07299e7a3ccc78231abd SHA512 545bd3d837581128a2b4c8d29cc10f116c984c915c34fa3ebf9da8f3f2b99e33a51f918840305bf90cd2feaf8eaa35281060304b67fd71aa0f877926cc3fed3f
 EBUILD pkgcheck-9999.ebuild 1328 BLAKE2B 6c4e1486d82f4adf6bdbd84697bae4a74c28c9c380ed256fab6dc431d4abf7007b70a54e4065a9d010d50aca2626e4d83346c19102b976eb0a8b1c95a0fbd153 SHA512 3bf0d03e5e931913f0721ba3474f59542bae97721428ff6cac17dd8e7c26ca17aef695933d492b98999dda6ec34eea7877a40bcf1bcc59246df5a92bdba301e1
 MISC metadata.xml 551 BLAKE2B 69f4e4b0c2ae515433db1c0bbdc47d1bb06e5f17feb6183bf81e41f971994bbd6c1ef2b57f17ac7bfeb504351177cde249f8f81aef416be44606a436b487ad61 SHA512 dfb7087bfd20b8b435faf246d9c689e82c669790abde1886d88822692493ce08083b3a8b9fd1781519becf0399727ed7c65ce079039b5201a66e950ccb28280e
diff --git a/dev-util/pkgcheck/pkgcheck-0.7.5.ebuild b/dev-util/pkgcheck/pkgcheck-0.7.5.ebuild
deleted file mode 100644
index 61ffc645f69f..000000000000
--- a/dev-util/pkgcheck/pkgcheck-0.7.5.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{6,7,8} )
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git"
-	inherit git-r3
-else
-	KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-	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="network perl 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.7[${PYTHON_USEDEP}]
-		>=sys-apps/pkgcore-0.10.11[${PYTHON_USEDEP}]"
-fi
-RDEPEND+="
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/pathspec[${PYTHON_USEDEP}]
-	network? ( dev-python/requests[${PYTHON_USEDEP}] )
-	perl? ( dev-perl/Gentoo-PerlMod-Version )
-"
-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
-}
diff --git a/dev-util/pkgcheck/pkgcheck-0.7.6.ebuild b/dev-util/pkgcheck/pkgcheck-0.7.6.ebuild
index d3aed7fc337b..eb8f739d6267 100644
--- a/dev-util/pkgcheck/pkgcheck-0.7.6.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-0.7.6.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git"
 	inherit git-r3
 else
-	KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 fi
 
diff --git a/dev-util/pkgconf/Manifest b/dev-util/pkgconf/Manifest
index 73f27781eda2..d01b6c41fad9 100644
--- a/dev-util/pkgconf/Manifest
+++ b/dev-util/pkgconf/Manifest
@@ -1,4 +1,4 @@
 DIST pkgconf-1.6.3.tar.xz 291216 BLAKE2B 04bf58590e2f0b37bac7b24b3d595ad08680e85647548cbd642495398d95706f9f738af5c6f9b9ad8801567caa20ade85d4c4d74179f08313420683cb1b34263 SHA512 437c5a5c9866e2047e62e0592639930b2420d4afd41d98cef51f3475165418a39e916477860025314828a6ee0a4eefc10fdf26bda66f80c291f324d9674fa5c1
-EBUILD pkgconf-1.6.3.ebuild 1592 BLAKE2B 4b2ddb151025087800078ea98c5da2ce049209a2fb41116aed6cd17d0ab821435a390c81795a0fe608dcdf908ff96ff018a51de6353785c461a508cf67d783e8 SHA512 0015e660daac678be15853d93ca41e17c03579d000f94552ad017cce6ec6d253cb9d1689fa75f9fdaad41d246e8eb35c418e9f0bb9f02cea0974a750932a46d7
-EBUILD pkgconf-9999.ebuild 1602 BLAKE2B 1ba7450e57f37336244018485b633c33362dd1bd6416ce35e796277e0bedc151ec52d05a44775c1cfb397d0b46449396f618b67f6d2394a771067ebfdbc16263 SHA512 71bcf548c986c23df8828dd7cadbad978eb38a0b2d894b818fdf23d8fe471d6fa71770bc975ec8be7e59f198ba17324f52ceb5d9fa5899d782451f66ba52ad88
+EBUILD pkgconf-1.6.3.ebuild 1589 BLAKE2B 3718d1065f7b4c5cd49a82ee2befa4f2581435bc212a9455d7fa787439651c4b987ae2fe3980283604b40edb52216f8aec29ce06f85d0e8fb3369ea09e46b73a SHA512 bd162b064e3b94dadda694fbcaf457fb33c7dddf39bf6cd426663a5bfafc036d02949b46a174f5037af218c0fd05409c6f7f4adb3882759afc061a7b2b824a51
+EBUILD pkgconf-9999.ebuild 1598 BLAKE2B 18b98b9185d35d845499e6b0a90c088c888efab2a37b40c8e28df720592a511599f9640743dfcfe8710fb9c7edb66380052f134f832932c0e745002b92d78134 SHA512 f1c57374bc4d5bb5ed0fccebbb7360b3f16ce76d75a93165418c3322a341ecd3a14b19c0d952d9c5283c2541cb2831c5b37e0adfe0d2839564d4f74d15fe3518
 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 9ad432e4fc3c..da69ae46ca80 100644
--- a/dev-util/pkgconf/pkgconf-1.6.3.ebuild
+++ b/dev-util/pkgconf/pkgconf-1.6.3.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://git.sr.ht/~kaniini/pkgconf"
 else
 	SRC_URI="http://distfiles.dereferenced.org/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 fi
 
 DESCRIPTION="pkg-config compatible replacement with no dependencies other than ANSI C89"
diff --git a/dev-util/pkgconf/pkgconf-9999.ebuild b/dev-util/pkgconf/pkgconf-9999.ebuild
index 28e58496a4d8..6297af6bdd01 100644
--- a/dev-util/pkgconf/pkgconf-9999.ebuild
+++ b/dev-util/pkgconf/pkgconf-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2012-2019 Gentoo Authors
+# Copyright 2012-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://git.sr.ht/~kaniini/pkgconf"
 else
 	SRC_URI="http://distfiles.dereferenced.org/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 DESCRIPTION="pkg-config compatible replacement with no dependencies other than ANSI C89"
diff --git a/dev-util/pkgconfig/Manifest b/dev-util/pkgconfig/Manifest
index 9ddf40bef7c5..9c7ac18ef5f6 100644
--- a/dev-util/pkgconfig/Manifest
+++ b/dev-util/pkgconfig/Manifest
@@ -3,9 +3,9 @@ AUX pkgconfig-0.28-strip_system_library_dirs_reliably.patch 777 BLAKE2B fab15ae7
 DIST pkg-config-0.28.tar.gz 1931203 BLAKE2B bafdd4e838623965c6bd454421ddd9051fc43fc29948e1615b49fef463c3c3a18807aabe6416f96cfdf58d6b1c9e114d77f97bd985facee7c14284a8a64a768b SHA512 6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320
 DIST pkg-config-0.29.1.tar.gz 2013454 BLAKE2B 5f33022b2df83de1c9202e090ea9be926d1f2b796152969d46ad45772ceb792c3f2bb95714cf1def28393b32db1b4052c3fdfe9f71076d130a57172987c04d0e SHA512 d2963355929d7aae0fbadad445d67b5c6762934fc4963a10a4b72ae90f7f6df4e6a38694884b924ff37eedaf636b49f3f521fe4eb3009e0322a402f330f1b4c2
 DIST pkg-config-0.29.2.tar.gz 2016830 BLAKE2B e8f0420033524ad768cac3c82138546e4cd76c47f5835b7b98662ab01eaf3feef08f495a69c04980d51b57935567ab1d465ef4e1d0529735ad0031c828585324 SHA512 4861ec6428fead416f5cbbbb0bbad10b9152967e481d4b0ff2eb396a9f297f552984c9bb72f6864a37dcd8fca1d9ccceda3ef18d8f121938dbe4fdf2b870fe75
-EBUILD pkgconfig-0.28-r2.ebuild 2882 BLAKE2B 58676841460922b699d1399675a6327b0a464e18fe72362d68e38186c378d5a73b0b785a0d65604e5bf956ce612aeb1aa51162bfac98489fff10883a42559c22 SHA512 252d5102e727efb3519123923bc79e4430076789cb185a475993d7da262dc11ac17c7514948970816ab09a188f8cea90df07ac2ae5b7ce0e477fdcc70d1b3092
-EBUILD pkgconfig-0.28-r3.ebuild 3407 BLAKE2B fe8af7216656d1b541e2d90cf3f0fbc8f14f57ba44f20ecde0e0e0c107c685ee17bd710b31b9bb87d0d4d955c5f1e118b332fe2409b5c09cc648686e9b143064 SHA512 c426d31cf521c00edfa554fe8b1cdc4f1588f3e804af228d168f6a729ca45206b8d4f8c96a0e7f8af331cca7ebb379b7f37c514ccd70fe582e7f2df0511a80ba
-EBUILD pkgconfig-0.29.1.ebuild 3771 BLAKE2B a86d9a18a4d9509816fe4332f3d9558cde720438dae73e5e7ecf3abd78a0c8f999abf7923fbf63eb40e6a19e83911fe139cfc8903fe518c7f479964aac643e78 SHA512 e5b8ce820b4d1ee9db40ad8248ebac2050e3af964916464b3484855787e7a56c8bf16974c30ea79ed9362c39fc058d7cb3ebf81e9c4e9e3ef69f79b854af01e3
-EBUILD pkgconfig-0.29.2.ebuild 3763 BLAKE2B 9bd49c0614192c347843172fac939ebe84c612f6fce301851ac07d7a7724c9f5e097cf4b08e98d1838d6af4844186121107a1f3a841ea2ea10cc0e787296928b SHA512 8ac880b17abb27f603df0f2756443d1b4248adf2ed0004afcfd06b07af815acba237373bd718f01e4e3f1d963ee9906659c37a8ef6661f6b2ce52d0da6a297bb
-EBUILD pkgconfig-9999.ebuild 3771 BLAKE2B a86d9a18a4d9509816fe4332f3d9558cde720438dae73e5e7ecf3abd78a0c8f999abf7923fbf63eb40e6a19e83911fe139cfc8903fe518c7f479964aac643e78 SHA512 e5b8ce820b4d1ee9db40ad8248ebac2050e3af964916464b3484855787e7a56c8bf16974c30ea79ed9362c39fc058d7cb3ebf81e9c4e9e3ef69f79b854af01e3
+EBUILD pkgconfig-0.28-r2.ebuild 2880 BLAKE2B ffcee257c446994ffa70c5d869000e5fd28eb224f466ccdbf2267b212657e706b6944dac5d0e869c1f072f6008e6f7d96df1a8e59656d4efd9fae40a12de44c9 SHA512 3f14fdd42ba7c64baf9155fa022658be249c7caafa27e31b76fef06ba1843f31cb7558eb5b126119718b3dc551961517d2f6c99c2346a4f8d4d380ffe93d9a71
+EBUILD pkgconfig-0.28-r3.ebuild 3400 BLAKE2B e182f6c4d85f0018865b32d89ec4e4884ddfb1f293665c2a71a8c2a41a72756b8074c775f61befecaebd3df8ab0a713a5a83085ce254a8421cd3105572abcdce SHA512 96da7a2c861d6775b89f9e73876bbf22972f508a2664df05c96a599992842e612da94ae863a87dfe0451b39ce898e17ac90f1b55440345d990fa5b1058bda40e
+EBUILD pkgconfig-0.29.1.ebuild 3764 BLAKE2B 9fadfa03b0d010b0edf9e862b2faef1fa7ca5db3f3d579b9e21ab7eea318e44d9cc724b84907a77cb0bc11e4e930b7cdd37728e599419e9ce59d547e49c337e4 SHA512 951d6c913c745ae31e55ba9008558b4bf91f0900f4066ca5f2ecf65323f0389004cad4326920ffae5c07c106be5f49a265b4be1c10144f80c362d1a90d6e704e
+EBUILD pkgconfig-0.29.2.ebuild 3761 BLAKE2B ec96a00b28bce59b182111dbd33e3c694bcc85d56c83441f40600cc29716874644c5370324225d86cd64051f9477c8334282850f3605271b040499d4993b3d72 SHA512 23c3ea8301f7e64aa92b8a0511fc2aee222dd66e92641db699bfef34c732ef0a78de92610d81e315110ad70d28c2f294814c83a5dd053185dffaf88e7545ce95
+EBUILD pkgconfig-9999.ebuild 3764 BLAKE2B 9fadfa03b0d010b0edf9e862b2faef1fa7ca5db3f3d579b9e21ab7eea318e44d9cc724b84907a77cb0bc11e4e930b7cdd37728e599419e9ce59d547e49c337e4 SHA512 951d6c913c745ae31e55ba9008558b4bf91f0900f4066ca5f2ecf65323f0389004cad4326920ffae5c07c106be5f49a265b4be1c10144f80c362d1a90d6e704e
 MISC metadata.xml 325 BLAKE2B af0abf473903faa5ce1e6d1918fa87b558b99b82d95c7f95ecb596684f7f55ee365a10e943752d1f3c8b6b1684ac4e0985329b89a6f19de2c926bcc0c3127382 SHA512 0db9510bbe132efa03acbbb4fb31407188edd83a6ac5c1d84316fa682db9399879957e8cd4447c1cbde01638f6d220f9a30a17611cd31e35769e71e5d38287a4
diff --git a/dev-util/pkgconfig/pkgconfig-0.28-r2.ebuild b/dev-util/pkgconfig/pkgconfig-0.28-r2.ebuild
index 5493aaafb192..f65c63e3db4c 100644
--- a/dev-util/pkgconfig/pkgconfig-0.28-r2.ebuild
+++ b/dev-util/pkgconfig/pkgconfig-0.28-r2.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://anongit.freedesktop.org/git/pkg-config.git"
 	inherit autotools git-2
 else
-	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~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 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SRC_URI="https://pkgconfig.freedesktop.org/releases/${MY_P}.tar.gz"
 fi
 
diff --git a/dev-util/pkgconfig/pkgconfig-0.28-r3.ebuild b/dev-util/pkgconfig/pkgconfig-0.28-r3.ebuild
index 12bfcf9d3e96..66e587988338 100644
--- a/dev-util/pkgconfig/pkgconfig-0.28-r3.ebuild
+++ b/dev-util/pkgconfig/pkgconfig-0.28-r3.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=5
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_CHECKOUT_DIR=${WORKDIR}/${MY_P}
 	inherit autotools git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~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 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SRC_URI="https://pkgconfig.freedesktop.org/releases/${MY_P}.tar.gz"
 fi
 
diff --git a/dev-util/pkgconfig/pkgconfig-0.29.1.ebuild b/dev-util/pkgconfig/pkgconfig-0.29.1.ebuild
index 1872abeebff9..80dfe836e0a4 100644
--- a/dev-util/pkgconfig/pkgconfig-0.29.1.ebuild
+++ b/dev-util/pkgconfig/pkgconfig-0.29.1.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=6
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_CHECKOUT_DIR=${WORKDIR}/${MY_P}
 	inherit autotools git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~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 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SRC_URI="https://pkgconfig.freedesktop.org/releases/${MY_P}.tar.gz"
 fi
 
diff --git a/dev-util/pkgconfig/pkgconfig-0.29.2.ebuild b/dev-util/pkgconfig/pkgconfig-0.29.2.ebuild
index f7da36a99da9..5bc0f454bfb0 100644
--- a/dev-util/pkgconfig/pkgconfig-0.29.2.ebuild
+++ b/dev-util/pkgconfig/pkgconfig-0.29.2.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_CHECKOUT_DIR=${WORKDIR}/${MY_P}
 	inherit autotools git-r3
 else
-	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SRC_URI="https://pkgconfig.freedesktop.org/releases/${MY_P}.tar.gz"
 fi
 
diff --git a/dev-util/pkgconfig/pkgconfig-9999.ebuild b/dev-util/pkgconfig/pkgconfig-9999.ebuild
index 1872abeebff9..80dfe836e0a4 100644
--- a/dev-util/pkgconfig/pkgconfig-9999.ebuild
+++ b/dev-util/pkgconfig/pkgconfig-9999.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=6
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_CHECKOUT_DIR=${WORKDIR}/${MY_P}
 	inherit autotools git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~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 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SRC_URI="https://pkgconfig.freedesktop.org/releases/${MY_P}.tar.gz"
 fi
 
diff --git a/dev-util/pycharm-community/Manifest b/dev-util/pycharm-community/Manifest
index 70d347cef48f..974312ff4996 100644
--- a/dev-util/pycharm-community/Manifest
+++ b/dev-util/pycharm-community/Manifest
@@ -2,7 +2,11 @@ AUX README.gentoo 169 BLAKE2B fc7191056cb5de1fedf9a7e9516029e8ee50f7ab3749e05c73
 DIST pycharm-community-2019.3.1.tar.gz 389620376 BLAKE2B a780ab27feef9747539d9cd607b67c7e047d0a7c1eb6b090a63c4f1c11c80c49e5091a29d80ea249ace1f16acdcd418f0a4901e10c2c623e792da9d7d0e7c9d6 SHA512 4bfa78a5f3993e85ad5ba624ed9e586d195b9f4bffa8bd764e8dba27edc1cdc0bd2b3bba86135156c1f306601db290703e61e7561badc7dcb634dc5826134b1f
 DIST pycharm-community-2019.3.2.tar.gz 391689310 BLAKE2B 11627839e823e2d6c946f5fa25df28cb919960300c51dcc2883989341228604dad9ebf365ffc055809bf3768d757b40cb059a7b5cc492935733c5576ff3f9933 SHA512 6c9e607d938a23be78b4acb5aa39e6276720347aac6fadfbaf456e4f05af4b55ef24f4a97f3aca91b6f09d68af7ec834a5af5e08b775d1439d573cff6c6d3e7c
 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.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.ebuild 1083 BLAKE2B 057214393559bdc2d33c91678fbb068fafde2ab6add11db7b70206df9c89c2645e74b85bc11b864140a92fd41c6681fd33f9bc5105e6971b4a7e4b0697b5cc5e SHA512 d698a7a3ff14fc505f3a340607c78ee5c2df2054e140a8f265ac5a9a84c6f8f12c33bee2ff063fc00c59b3df612cab0eeb4cee19db04a9efbb03e7f4242a144f
 MISC metadata.xml 243 BLAKE2B cb7dd17733891ded65a8bf58abb3bdbdf30cd714d8dfd0cc9f83c6a53e979dca2cf2b1a31e3dbb2610df6000ef9c774f1840e9f453855c286687649a01984225 SHA512 0d6cf75e47bf075548f8c3e929caad7d6db621737788cbaadcf00e761a6b5ca50341db48171e6a16e905c91bcb9af57f6a98acfbf3d127dcdf84c17a4c4821e8
diff --git a/dev-util/pycharm-community/pycharm-community-2019.3.4.ebuild b/dev-util/pycharm-community/pycharm-community-2019.3.4.ebuild
new file mode 100644
index 000000000000..0600c9803a8d
--- /dev/null
+++ b/dev-util/pycharm-community/pycharm-community-2019.3.4.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="Apache-2.0 BSD CDDL MIT-with-advertising"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=virtual/jre-1.8
+	dev-libs/libdbusmenu
+	dev-python/pip"
+
+RESTRICT="mirror strip"
+
+QA_PREBUILT="opt/${PN}/bin/fsnotifier
+	opt/${PN}/bin/fsnotifier64
+	opt/${PN}/bin/fsnotifier-arm"
+
+MY_PN=${PN/-community/}
+
+src_prepare() {
+	default
+
+	rm -rf jre || die
+}
+
+src_install() {
+	insinto /opt/${PN}
+	doins -r *
+
+	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
new file mode 100644
index 000000000000..0600c9803a8d
--- /dev/null
+++ b/dev-util/pycharm-community/pycharm-community-2020.1.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="Apache-2.0 BSD CDDL MIT-with-advertising"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=virtual/jre-1.8
+	dev-libs/libdbusmenu
+	dev-python/pip"
+
+RESTRICT="mirror strip"
+
+QA_PREBUILT="opt/${PN}/bin/fsnotifier
+	opt/${PN}/bin/fsnotifier64
+	opt/${PN}/bin/fsnotifier-arm"
+
+MY_PN=${PN/-community/}
+
+src_prepare() {
+	default
+
+	rm -rf jre || die
+}
+
+src_install() {
+	insinto /opt/${PN}
+	doins -r *
+
+	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/Manifest b/dev-util/pycharm-professional/Manifest
index 22d9970e9a33..d60bc3ba87c9 100644
--- a/dev-util/pycharm-professional/Manifest
+++ b/dev-util/pycharm-professional/Manifest
@@ -2,7 +2,11 @@ AUX README.gentoo 169 BLAKE2B fc7191056cb5de1fedf9a7e9516029e8ee50f7ab3749e05c73
 DIST pycharm-professional-2019.3.1.tar.gz 509724729 BLAKE2B cd466d9c2b0f9be8442c719066d5647f0b9631dde38b782d23250207760247380419d7470826da2d5c4203dbca2742aa8fcd1987a4204d229cd700ac6f6a68f2 SHA512 3c3ad0546926dac4a0e336e04a16bb5f630066c7b2abeb16eda698fcc92dd0c165237bb3ad9b6382b38b989e67b8c3a4649bf8361421c7da6916a99eb3ea4633
 DIST pycharm-professional-2019.3.2.tar.gz 513486485 BLAKE2B eba9f0adb8f289f42ee2f50df506dfe628e3b835aedd7a8c0c03da39e5bc5921a6600ea7194c81674a5aad50cbc2f2afb0387dcc88a037e1a92a4fa0f2f3984b SHA512 e3a0e750c821ebd6736e39641d635db1c0a3aa00592d7ede204ce547fc12d69209a253caa4284f76607543f08da594f29ca38c3f8b586848c5b2277ae7227b8a
 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.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.ebuild 1227 BLAKE2B 32b33249906a636ce0a79164c09470c742bb7a207300c347b9fcd4c5ef660b917e58df07adfed39f8cd3d44a9905eecddb96969cb2860b9acbdd1c743fb15613 SHA512 185ca8aa08be3fefb66efd0e8e8d0fa6ca3b7f363fee26c5d152f66b29ac08fc2dbb9b99f0ce611237c5e76f33be8fba61354eb607825a4c8801b18cb9abce51
 MISC metadata.xml 243 BLAKE2B cb7dd17733891ded65a8bf58abb3bdbdf30cd714d8dfd0cc9f83c6a53e979dca2cf2b1a31e3dbb2610df6000ef9c774f1840e9f453855c286687649a01984225 SHA512 0d6cf75e47bf075548f8c3e929caad7d6db621737788cbaadcf00e761a6b5ca50341db48171e6a16e905c91bcb9af57f6a98acfbf3d127dcdf84c17a4c4821e8
diff --git a/dev-util/pycharm-professional/pycharm-professional-2019.3.4.ebuild b/dev-util/pycharm-professional/pycharm-professional-2019.3.4.ebuild
new file mode 100644
index 000000000000..bb09db041ff9
--- /dev/null
+++ b/dev-util/pycharm-professional/pycharm-professional-2019.3.4.ebuild
@@ -0,0 +1,58 @@
+# 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"
+
+RDEPEND=">=virtual/jre-1.8
+	dev-libs/libdbusmenu
+	dev-python/pip"
+
+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"
+
+MY_PN=${PN/-professional/}
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+	default
+
+	rm -rf jre || die
+}
+
+src_install() {
+	insinto /opt/${PN}
+	doins -r *
+
+	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
new file mode 100644
index 000000000000..bb09db041ff9
--- /dev/null
+++ b/dev-util/pycharm-professional/pycharm-professional-2020.1.ebuild
@@ -0,0 +1,58 @@
+# 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"
+
+RDEPEND=">=virtual/jre-1.8
+	dev-libs/libdbusmenu
+	dev-python/pip"
+
+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"
+
+MY_PN=${PN/-professional/}
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+	default
+
+	rm -rf jre || die
+}
+
+src_install() {
+	insinto /opt/${PN}
+	doins -r *
+
+	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/radare2/Manifest b/dev-util/radare2/Manifest
index 506c7886be89..6cccb508468a 100644
--- a/dev-util/radare2/Manifest
+++ b/dev-util/radare2/Manifest
@@ -1,4 +1,4 @@
-DIST radare2-4.2.1.tar.gz 8077107 BLAKE2B 490b063d7340b60cec1f77577985818c9dec34dd9206ce7d9db29f5d1836d515044e67d143f81fd7f6c58269f6f62f0bd87adcdb7cfb2cca5c0120d98ea29fd3 SHA512 aed37f6ff7ae3a25e809e8fbab3ef1c370dba80b7b8ef440a025edfbda23314ce20990b3e89589fe6bee427b2beebabd67a9e1def603e53ca5078bf32bdc4e6c
-EBUILD radare2-4.2.1.ebuild 1159 BLAKE2B 979869367436022a049bff280f0c2fb72d61ec24546c2aaac9ff588b5677d1feae9f0a60559f7b488ac2c2c0d955e7de4d399b27a9f275918c08118bee020213 SHA512 014d8eb9417ac50fa56161bd1fc48b375126d5090ac2165b940a246756ec58a1bc84f3f5be70756194a602077091543a642e17b141f91dadc72cc8068f723e55
+DIST radare2-4.3.1.tar.gz 8113591 BLAKE2B 289f6e4e3cb163017454918e7e5e31186cf41435f66a91ca5decf2819a06543908eeb3224041997eeba37e5bb7150874f431f301cf5f6aaa903601735e99d945 SHA512 06009dd2c75cfb2fcadd21041861f9569ff4b0b9438d1d5a1cf49ac8690ef041e18feb2445e6772acd0e217110328660e9de47db54d55c64f64764cb06988db8
+EBUILD radare2-4.3.1.ebuild 1159 BLAKE2B 979869367436022a049bff280f0c2fb72d61ec24546c2aaac9ff588b5677d1feae9f0a60559f7b488ac2c2c0d955e7de4d399b27a9f275918c08118bee020213 SHA512 014d8eb9417ac50fa56161bd1fc48b375126d5090ac2165b940a246756ec58a1bc84f3f5be70756194a602077091543a642e17b141f91dadc72cc8068f723e55
 EBUILD radare2-9999.ebuild 1159 BLAKE2B 60bd15815bc419615783ddd99a7a606c38cacc1c1727a32c1ab6c327172af4922dd1a67c226ad91877fe6a288b4a3240665e8832faa26aed06e18f6ed3577c84 SHA512 656e5f0b705f533d34ebbae4e43943c55d1b6fc8cb7abb808a1be8576719687993ef64aca6c134bd84fe611037d61bc985cfe5bc8c3074e7a93536d4f4721eab
 MISC metadata.xml 361 BLAKE2B f92dfa8905623cd3a34f0b61766ae071d09801460b8b2a13bf4c3bb0a4715446b61b79309101b032511851f9d7a15973bca97ce9d1ed667266e2d6a3485933a2 SHA512 fb01d7b5abd1966cf270227640d1e4197a09930afb6f03e18bf4f79ba74e73fd86782b99efbb710b697315c25b63e575ec6120fb1cedaa19d4562831f41f81a4
diff --git a/dev-util/radare2/radare2-4.2.1.ebuild b/dev-util/radare2/radare2-4.3.1.ebuild
index c3c2387a8dcf..c3c2387a8dcf 100644
--- a/dev-util/radare2/radare2-4.2.1.ebuild
+++ b/dev-util/radare2/radare2-4.3.1.ebuild
diff --git a/dev-util/ragel/Manifest b/dev-util/ragel/Manifest
index b585d7e4110c..1645761532b8 100644
--- a/dev-util/ragel/Manifest
+++ b/dev-util/ragel/Manifest
@@ -8,10 +8,10 @@ DIST ragel-6.8.tar.gz 1211146 BLAKE2B 41d3feecb461cede104182d918e1f052256daa292e
 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.9.tar.gz 850078 BLAKE2B 0e7d458e9f78fc7e0fb2e9a0c6fdd3f3789a9104f4441bc878ac64d077dee716e27d3a54c3898fcf1e4ba56b8d46d956a36b92258750f2541fd96f951038d852 SHA512 87de7d41af4a08f09d422a0e58820f9b5b1218acc4733c58690feea4f872790813b5f2d7505ce147a2a6e1bcd341926c35fed7c6b55f543bdf864b119868bcde
-EBUILD ragel-6.10.ebuild 931 BLAKE2B 8d0f2b3997160bef7b0589f119ea5209380e18940f61f661f8ce24bd1c7563509a944152b856d6149c4a0b92dde6995ae8e07e291938a33cace5db42f17b005f SHA512 ba3bbf20905a553cd26839b958a29988645ca98443144f4977f8c7ce3dbf0f0f1742fdae0bcf3f43c896e6247eaa1717135d0dd89f9d4c8f5e8be5dfde49a754
-EBUILD ragel-6.7-r1.ebuild 1128 BLAKE2B 2a75d399b0b34e0d978a0bdba36a169d53a56e975d5fb1ee8c629a0e97d19eb07eb485b00d7ab202632fa7f1c0f6f4764538387488448bc7175e99f5aebf058c SHA512 4ae65586fff963492c9718212f7028d040ea9adb7521747fa35839e34ddada82c791700e5c912c711acd7b006337b02c5aa13be2bfc97166edd77b38aef5b1f2
-EBUILD ragel-6.8.ebuild 1072 BLAKE2B 879c499b08c93ae6c01d42b1801b2f6b1d7f2bb608ddc099a8731a702c47216605a783b9bd95f108e155c1b341e8e60907ca11c88735be4e51f95ffd94392c28 SHA512 8ee237bb58d6eaeafd7b71c3f807d2399deb739e95b90e5cddca6ad33c76deb3fd7f0f276abf03ec51058e4fae4a0b77e2150e70642ea5538d83eab458eb7382
-EBUILD ragel-6.9.ebuild 986 BLAKE2B 40271635fabfc45f7fb1020b8636f6461ce4d09954090ca388bf8d70b7b7d2fc7b7897874bf0f18cd323ce1ba451ad63e937f019f65ab57022a198ae46878ebb SHA512 8855488a58b252768ff9eb61fbd757ba33f8dc6b02ba4631d7affeac45880a3d0382ba196246fba592f811363230c6c899859f2c9c77191edb36912e87c3443a
+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.ebuild 622 BLAKE2B 4eb1438c8fd1c8e1a3f3f2a95589b719e7b1e07d0411ee0d68bbb0eb5d433471becffdc718593beed535a6f360a3bc63f5fafb058fe6d8c50a6163552ad9da99 SHA512 9f98a2fc800727b126d5db3914ebaf699b4a1095f334906d5809edd9f08b0b5c1d90699a145d303fc06a31d95e600d85aee4a7b5ebb98fd8cfd117f20ee10d2b
diff --git a/dev-util/ragel/ragel-6.10.ebuild b/dev-util/ragel/ragel-6.10.ebuild
index 4520177d2dff..2feb94382daa 100644
--- a/dev-util/ragel/ragel-6.10.ebuild
+++ b/dev-util/ragel/ragel-6.10.ebuild
@@ -11,7 +11,7 @@ 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 ~sh sparc x86 ~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 ~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=""
diff --git a/dev-util/ragel/ragel-6.7-r1.ebuild b/dev-util/ragel/ragel-6.7-r1.ebuild
index eb7a9d4f6577..df62badfb791 100644
--- a/dev-util/ragel/ragel-6.7-r1.ebuild
+++ b/dev-util/ragel/ragel-6.7-r1.ebuild
@@ -11,7 +11,7 @@ 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 sh sparc x86 ~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 ~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=""
diff --git a/dev-util/ragel/ragel-6.8.ebuild b/dev-util/ragel/ragel-6.8.ebuild
index 4b0b866fe275..027b1b512201 100644
--- a/dev-util/ragel/ragel-6.8.ebuild
+++ b/dev-util/ragel/ragel-6.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ 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 ~sh ~sparc ~x86 ~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 ~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=""
diff --git a/dev-util/ragel/ragel-6.9.ebuild b/dev-util/ragel/ragel-6.9.ebuild
index 2cb2eff5e6ac..21b79373ef5f 100644
--- a/dev-util/ragel/ragel-6.9.ebuild
+++ b/dev-util/ragel/ragel-6.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ 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 ~sh ~sparc ~x86 ~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 ~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=""
diff --git a/dev-util/re2c/Manifest b/dev-util/re2c/Manifest
index 39e1903a6151..47707d11d93a 100644
--- a/dev-util/re2c/Manifest
+++ b/dev-util/re2c/Manifest
@@ -1,7 +1,3 @@
-DIST re2c-1.1.1.tar.gz 5907416 BLAKE2B da2544573de0dbca94db8a8e2112de5549ffbbad91bdba187e95c9d8dd36537e099dbc2871b54d62630d91928cdaf384ab069e5e1624f8ff749c2e2743cff766 SHA512 a6fe73611103588043748340976f0e6d07169a6546cb80627c0ccd2ceac83f362dbbf371530361d893537fd95deb19503b2c73c41ed40efe7787210d6c757397
-DIST re2c-1.2.1.tar.xz 2059304 BLAKE2B b05c41112654cd4c7f15ad70229cde02efc4b04ffc63f964ab69e376964a8a952f2c617859b056998127ca9adfd72f7a16e673dd3134ab8244b14b84e023d510 SHA512 c90f45ae435968e950d2340b540269a042201f1f53d7ea067b6d3d9feec063f66559ba970d404d82bfa7b75b9a074328caaa62304d4d876af7c12740d100ef58
 DIST re2c-1.3.tar.xz 1239280 BLAKE2B ae2a8fc323408dd31d39c352bd622d89d19178b7993618ea043bbfd32509fb7573d2b5b50663e100d24fc275fa479982cb1f66ed49638edca61f551fb653176d SHA512 c7084ab2399fb6b96cef74c1393715d90830f43b82b96af46feb71ef008c0215381c3dbea0b003ff810d869db6021e28001b9d588ad55c616642244b2da09c0e
-EBUILD re2c-1.1.1.ebuild 764 BLAKE2B bd849f64e9f00198bd3ab3ac6dba88721f70f5535909324444ad32d99ee4752a1759671c3ebbcd796cb736beb0e451f550989ccd2825829eb3603c3a20cadcbe SHA512 02b449402fa9a12305150184db102ad7829c65887c5d9f99efa6667c520490273e2f6b8a54388a6577ba391eeaef73cf2061e4c0e4b36e1ea574b8ae0c7ec866
-EBUILD re2c-1.2.1.ebuild 724 BLAKE2B fb7f8df52e886a9b13062ec02728b4446d209c5cf8730861fb2cfa13b03e10231997e72c19684097c57e57063f10080d32603fbf2da79716e6653116ed17c47b SHA512 ad17c13302bf7ed3bf1c8bd27cc56e3c3f4a86f29089b3a7db9eee17cb05c3220596e77d435004683746c9424f441f4454a88f6ac93870e7c51a2cb06e380f3d
-EBUILD re2c-1.3.ebuild 725 BLAKE2B d7262421d66b8a952ee32480cfdafc87d16721f7e954adafffb0a8800386a0a6d32896a2e454d679ba87e2efdecf38231757940f2eceb9b81a4ede3ab418993f SHA512 b76d364701dcf9f82d2ef65b92c6377db45b3ccb21a9f2785389f5c7d2ee291323f3f8171c37455f8a1b93a8d33685331a326a483fef31c1c51f57dea28748f5
+EBUILD re2c-1.3.ebuild 721 BLAKE2B a49a44e123efbbd05d63cb17a17ded1e683aba03e07e6068baff354a84cc16aa1af298af8b85465be3e4d8eb39218b81bb147573924f1351e797066e3c2fabba SHA512 cb4c0b2af7fab1a2e2341b34241546b203128519df58eebec594ada3e3152689d0662e2c2de77561f40a60ec0de579bd89e90e6598a801e74811ed670084da08
 MISC metadata.xml 423 BLAKE2B 69ad12e8bd8cd2356e36736ab276efa0aadc2755f784fa4e7fe23ae4d4e7a27a06c8fcd4ee727f87847a7fdaf136d12e811a20345183d261d2b649724818f9f3 SHA512 997590e1de3136f7f87181746d9dccfd8c34a12e570d15a29a8abd4b4163bfa98405d928e932255c962d4af79e9913de563453891155590bff309d764c2b5bd9
diff --git a/dev-util/re2c/re2c-1.1.1.ebuild b/dev-util/re2c/re2c-1.1.1.ebuild
deleted file mode 100644
index 7f4d7f39b976..000000000000
--- a/dev-util/re2c/re2c-1.1.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils
-
-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.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-src_prepare() {
-	default
-	export ac_cv_path_BISON="no"
-}
-
-src_install() {
-	default
-
-	docompress -x /usr/share/doc/${PF}/{examples,paper}
-	dodoc -r README CHANGELOG examples
-	docinto paper
-	dodoc doc/loplas.ps doc/tdfa/tdfa.pdf
-}
diff --git a/dev-util/re2c/re2c-1.2.1.ebuild b/dev-util/re2c/re2c-1.2.1.ebuild
deleted file mode 100644
index d4f33d7ceb90..000000000000
--- a/dev-util/re2c/re2c-1.2.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 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 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="debug"
-
-src_configure() {
-	econf \
-		ac_cv_path_BISON="no" \
-		$(use_enable debug)
-}
-
-src_install() {
-	default
-
-	docompress -x /usr/share/doc/${PF}/examples
-	dodoc -r README.md CHANGELOG examples
-}
diff --git a/dev-util/re2c/re2c-1.3.ebuild b/dev-util/re2c/re2c-1.3.ebuild
index 81b22ca16642..0e346b08ac31 100644
--- a/dev-util/re2c/re2c-1.3.ebuild
+++ b/dev-util/re2c/re2c-1.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/skvadrik/re2c/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="debug"
 
 src_configure() {
diff --git a/dev-util/redo/Manifest b/dev-util/redo/Manifest
index 8bf61463945f..051f63c47d0f 100644
--- a/dev-util/redo/Manifest
+++ b/dev-util/redo/Manifest
@@ -1,4 +1,6 @@
 DIST redo-0.42.tar.gz 194344 BLAKE2B ce17ba2bc8b6a074bfc5cae58cc99c1c41b2e8bab93a10f29d1178cb2071bd68ef5528529c320ee55063a4e3bce83705b486bc92992a9c0c18b65e7fec76fde5 SHA512 41b8417136f98d12edf3c62f027f2459ae3fb92f6c5464553d79c3a52344de57220a5c64b565118da0a99c1544eaa153a468ffcdcfbf7193c76c896bcd40e900
+DIST redo-0.42a.tar.gz 195053 BLAKE2B 3e84e961eeb66396d5d5aa8a3f05f10d4000089d12c36bd8e061c163e050b9bc125cd8dcc5987c9f3b25e2b8803ff7c34d48a173ab91fc4a3e9fd63c114adc8a SHA512 8473bd8168c8e70b59a573560f8f725c8538061ee15eabeb63e467a363fa6869aa8088e8ce324726da4e2f7115e2ddf72cbb657703e9090f4f93c05f42bb67cb
 EBUILD redo-0.42-r1.ebuild 1064 BLAKE2B 76ac6a5c76fe9b73695bea9b523fbccee16de07cf77eecff673dd1d770449c6acea9b8e62bf7e3ce34fe0a0adf6b13dac8dd2bf9fcc9da647dba28ab263849ac SHA512 8f03fa82a0b69cf564e29632f5faa223f469414ad6ae1ede6e35f80e4ca700d72b17712e8a232d4700d1602b94a3ff03c69672d1455c0af0d3b04251d02d7454
-EBUILD redo-99999.ebuild 1056 BLAKE2B b40c139b4c3bc20d687392e83bd089acbab56ffc82219a26621b9594b45fd21d38bd747366f390d955852c92b20d2949b5f355142cf0777322866e92729da521 SHA512 1057760528dd118e5ac10d26c7b3fb10e9bba98163b37d256b361ed3c975b4c5475d331813612ff171cad124b8e402e9707bb26018afd6211aed04c4f7a6b236
+EBUILD redo-0.42a.ebuild 1213 BLAKE2B c6d164192bb11fc89a85285e7ebfbd6b665be255ae93e66866fded161077350b6f2dd69c84ae8779bf4f1bb991d654b92bd7bc99753a1f9849a1c8723aa6e67b SHA512 a455891117bdd88c6bfca6952ffb13ebc27d7fe5a52d437356b1540a57e9dec0b54ae7fbdb50f86c305a280e10c9b2dc714011bf8780583dbf4d3c72f1dcae5a
+EBUILD redo-99999.ebuild 1165 BLAKE2B 39a1599939c4273cd1fa0c7541c55c02667932f7c68787abd10be5379ced05c860ffb9f2e2d2b298321b61c98e2e7aac7bb4144ddcc1c6f6e43aaa8076aac8f2 SHA512 a13fb769e4ddc7ad348e5063b9042c638ee6b37fcc0a48e91c3452923bac0ec4f5db744c096a454fc8f71b3fcdf5aed6067d307a2727eb98b58f7d0f6c297356
 MISC metadata.xml 351 BLAKE2B 4093a6abf023ec3d67b11cc94ed6ae14d735ae51748f05ed328f64c44885ba68b72927b4601503ce4d20747f34bdeff17adfa9514c6259c9590609cdcee85128 SHA512 38a2902d3f8370fe111c11b4622250c5c76b2f3d03eca795b0d2ceaec0679fec274b98cf2df726559469844c18de00ac84eed6b391992d1b5aec88ff51ec96b9
diff --git a/dev-util/redo/redo-0.42a.ebuild b/dev-util/redo/redo-0.42a.ebuild
new file mode 100644
index 000000000000..47a81ecf2022
--- /dev/null
+++ b/dev-util/redo/redo-0.42a.ebuild
@@ -0,0 +1,57 @@
+# Copyright 2018-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="sqlite"
+inherit multilib multiprocessing python-utils-r1 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_configure() {
+	echo ${PYTHON} > redo/whichpython || die
+}
+
+src_compile() {
+	./do -j$(makeopts_jobs) build || die
+}
+
+src_test() {
+	local ARCH= CFLAGS= CXXFLAGS= LDFLAGS=
+	./do -j$(makeopts_jobs) test || die
+}
+
+src_install() {
+	DESTDIR="${D}" \
+	DOCDIR="${D}/usr/share/doc/${PF}" \
+	LIBDIR="${D}/$(python_get_sitedir)/${PN}" \
+	./do -j$(makeopts_jobs) \
+		install || die
+
+	python_fix_shebang "${D}"
+
+	sed -i \
+		-e 's|/lib/|/'"$(get_libdir)"'/|g' \
+		"${D}"/usr/bin/* || die
+
+	python_optimize
+}
diff --git a/dev-util/redo/redo-99999.ebuild b/dev-util/redo/redo-99999.ebuild
index 6e92129f9b4a..eb551f91c49d 100644
--- a/dev-util/redo/redo-99999.ebuild
+++ b/dev-util/redo/redo-99999.ebuild
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE="sqlite"
-inherit git-r3 multilib multiprocessing python-single-r1
+inherit git-r3 multilib multiprocessing python-utils-r1 python-single-r1
 
 DESCRIPTION="Smaller, easier, more powerful, and more reliable than make"
 HOMEPAGE="https://github.com/apenwarr/redo"
@@ -13,7 +13,7 @@ EGIT_REPO_URI="https://github.com/apenwarr/redo"
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS=""
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 BDEPEND="
 	$(python_gen_cond_dep '
@@ -26,6 +26,10 @@ RDEPEND="
 	${BDEPEND}
 "
 
+src_configure() {
+	echo ${PYTHON} > redo/whichpython || die
+}
+
 src_compile() {
 	./do -j$(makeopts_jobs) build || die
 }
@@ -38,7 +42,7 @@ src_test() {
 src_install() {
 	DESTDIR="${D}" \
 	DOCDIR="${D}/usr/share/doc/${PF}" \
-	LIBDIR="${D}/usr/$(get_libdir)/${PN}" \
+	LIBDIR="${D}/$(python_get_sitedir)/${PN}" \
 	./do -j$(makeopts_jobs) \
 		install || die
 
@@ -47,4 +51,6 @@ src_install() {
 	sed -i \
 		-e 's|/lib/|/'"$(get_libdir)"'/|g' \
 		"${D}"/usr/bin/* || die
+
+	python_optimize
 }
diff --git a/dev-util/rocm-cmake/Manifest b/dev-util/rocm-cmake/Manifest
index bcec5918cf18..11581b022cf1 100644
--- a/dev-util/rocm-cmake/Manifest
+++ b/dev-util/rocm-cmake/Manifest
@@ -4,11 +4,13 @@ DIST rocm-cmake-2.7.0.tar.gz 13352 BLAKE2B 1dd37f9beed98d2120a42505ef7463de672db
 DIST rocm-cmake-2.8.0.tar.gz 13677 BLAKE2B 24fdb6685190e06be0afe9184b048d1be36f66d0fd5033244d481fdc41db6333cde2d4b5e23808add0115018f23e80cf78e09e01f8aacf1f34eca2e9cf64e0b5 SHA512 61fa614acfdd5d18da617f73f6373e3c39ece22674fc9697e2f2d9595317fed179298672f98e178ddcfd73e7cad908189f32b7265a98f773750616abdd11a74c
 DIST rocm-cmake-2.9.0.tar.gz 14185 BLAKE2B 7eaa8535eae99749d0a46b84daa4ee5d00fd7e992a63d97fb578319a3dc309a61b1b239af4b58ee5c668c0c45e944138c85ab2a5aa3da1f83b129ca6a874c6d6 SHA512 ba619d428e7f5bbd2970eb84df1421e0734f33a259d5c98a62a8ea4859eac5fdaba0d0d36fb504618e605c0c6d62213d696e265054814926b9156822e3cd1f24
 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
 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
 EBUILD rocm-cmake-2.8.0.ebuild 729 BLAKE2B 555a1c7970659c3f01aab1f0dfa1006ed501f2b43cab52aa0a664aed61a248f9d4b7d574b0897329fc83f2da0a0df9962a981781fd0b4e7f865fd457365124fe SHA512 19a51baf03e628c04712bd1b8b83dc30ab0a0c9fd7e332140e9a6f2123f50b8e2482047608fdfc96f24bf227211eccd50ab23144b22e1f60dd0eaae91c902be9
 EBUILD rocm-cmake-2.9.0.ebuild 729 BLAKE2B 555a1c7970659c3f01aab1f0dfa1006ed501f2b43cab52aa0a664aed61a248f9d4b7d574b0897329fc83f2da0a0df9962a981781fd0b4e7f865fd457365124fe SHA512 19a51baf03e628c04712bd1b8b83dc30ab0a0c9fd7e332140e9a6f2123f50b8e2482047608fdfc96f24bf227211eccd50ab23144b22e1f60dd0eaae91c902be9
 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-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.3.0.ebuild b/dev-util/rocm-cmake/rocm-cmake-3.3.0.ebuild
new file mode 100644
index 000000000000..5922137e202d
--- /dev/null
+++ b/dev-util/rocm-cmake/rocm-cmake-3.3.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/roc-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/rocm-cmake-roc-${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 c4d46b3cf38e..a7cea0a766b6 100644
--- a/dev-util/rocminfo/Manifest
+++ b/dev-util/rocminfo/Manifest
@@ -7,6 +7,7 @@ DIST rocminfo-2.8.0.tar.gz 14786 BLAKE2B ec439fb771980d6b4777e9c3b11e23055eee7b8
 DIST rocminfo-2.9.0.tar.gz 14791 BLAKE2B 5438862e461b9c2f53560138f4b7437876048edff6ff31715e9af2be535167042b170c492c59c41862a55a742a53047e2e9f0478fa73c8cf948c0fc1ff388594 SHA512 90c5c1de3ea6e917b338a5498d9e071dd491a97bd7b927dc1ddca568df08b52b6b8518a1105dfab7a262b78d1cb89117813084dfce6b73d7aae40abd357f81d1
 DIST rocminfo-3.0.0.tar.gz 14786 BLAKE2B 4fab1258ff9b43620c79c811678071c38db5afedd9fb5a95227d73e7d2d4104dfbaa72855c845a663b8dabb9ea8f17962baa5ca65613fc40c2d3c3e1c1b7d08b SHA512 94f7c3773b18a8d3bce773b624164d0a4b928b2411ef83307e46634e09259eb8f431f576f0673186f1f44b54c72004818aa10858520b8d86fe283f2f5ed3f5f1
 DIST rocminfo-3.1.0.tar.gz 15113 BLAKE2B 5155819afff87a87a40d5e57c194573a29b85d654bfaf446a17a893490143546e8c706020baae4f1d23a28e53894b20f457dcabf8615730e42e4a18b2caefe12 SHA512 d0be50bab99c4df1ce74e3bf98db68249c681a5eeb6839e4ee6aa91a208ed829d1288ce3cc82f564a22ca8b6f62b65f3c40c3784e21e1fd4953c81315d044dfc
+DIST rocminfo-3.3.0.tar.gz 15120 BLAKE2B 4ac93144dc76d5b8839d3d1cca51d92fdd88ee66ec141afccd84fa3ef2fcf4b140dc78d43f8cbb57eba678e00c247c8189b80c1e0b69662226b505dca57f6be1 SHA512 f2f273882a83632f0d9e7817a722b252cb2c1c7cf5d86cc8980ea680c073f6aa666c4150fff498e8bc48396e3e23f544d05485ee1672bc34223ca8ec64226854
 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
@@ -14,5 +15,6 @@ EBUILD rocminfo-2.8.0.ebuild 792 BLAKE2B 87746c08f5fe212bb81d84c5d34108b6e277415
 EBUILD rocminfo-2.9.0.ebuild 792 BLAKE2B 87746c08f5fe212bb81d84c5d34108b6e277415c7fb0e257cb5ab45ebe3524e2269bac4abf6a80099ea8898558285fe5512a735a9c1cfc8a4766783337442e24 SHA512 f0d45221962b8be509c72ef7b08f408c3bb58366314dee421e6dab4a3e738854a3ba7597b37a1f8f994e6019d0a1b43d2ac6fd22b8af86bfc4825cafc9021ca5
 EBUILD rocminfo-3.0.0.ebuild 792 BLAKE2B 87746c08f5fe212bb81d84c5d34108b6e277415c7fb0e257cb5ab45ebe3524e2269bac4abf6a80099ea8898558285fe5512a735a9c1cfc8a4766783337442e24 SHA512 f0d45221962b8be509c72ef7b08f408c3bb58366314dee421e6dab4a3e738854a3ba7597b37a1f8f994e6019d0a1b43d2ac6fd22b8af86bfc4825cafc9021ca5
 EBUILD rocminfo-3.1.0.ebuild 792 BLAKE2B 87746c08f5fe212bb81d84c5d34108b6e277415c7fb0e257cb5ab45ebe3524e2269bac4abf6a80099ea8898558285fe5512a735a9c1cfc8a4766783337442e24 SHA512 f0d45221962b8be509c72ef7b08f408c3bb58366314dee421e6dab4a3e738854a3ba7597b37a1f8f994e6019d0a1b43d2ac6fd22b8af86bfc4825cafc9021ca5
-EBUILD rocminfo-9999.ebuild 792 BLAKE2B 87746c08f5fe212bb81d84c5d34108b6e277415c7fb0e257cb5ab45ebe3524e2269bac4abf6a80099ea8898558285fe5512a735a9c1cfc8a4766783337442e24 SHA512 f0d45221962b8be509c72ef7b08f408c3bb58366314dee421e6dab4a3e738854a3ba7597b37a1f8f994e6019d0a1b43d2ac6fd22b8af86bfc4825cafc9021ca5
+EBUILD rocminfo-3.3.0.ebuild 794 BLAKE2B 8ba7a2ebd5a75e507089f0deeb49b1085175641bc0c53c0609d386f39a1d6f3d38a608703f59f798f2fc24ae453619d8154427e7bf4c02b5852b260b0d01c067 SHA512 32a8fdda420e1440df3a2b297d6030ac69c892e5be970d61647942be7f2be3c620c9fec5bfa179ec54c3af1eb1e19d51e2de82d2eeb5d2b62c57c945844ed2ac
+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.3.0.ebuild b/dev-util/rocminfo/rocminfo-3.3.0.ebuild
new file mode 100644
index 000000000000..cac515f5ca2b
--- /dev/null
+++ b/dev-util/rocminfo/rocminfo-3.3.0.ebuild
@@ -0,0 +1,32 @@
+# 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"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DROCM_DIR="${ESYSROOT}/usr"
+		-DROCR_INC_DIR="${ESYSROOT}/usr/include"
+		-DROCR_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
+	)
+	cmake_src_configure
+}
diff --git a/dev-util/rocminfo/rocminfo-9999.ebuild b/dev-util/rocminfo/rocminfo-9999.ebuild
index 99b4e1f557d2..cac515f5ca2b 100644
--- a/dev-util/rocminfo/rocminfo-9999.ebuild
+++ b/dev-util/rocminfo/rocminfo-9999.ebuild
@@ -9,9 +9,9 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/rocminfo/"
 	inherit git-r3
 else
-	SRC_URI="https://github.com/RadeonOpenCompute/rocminfo/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/RadeonOpenCompute/rocminfo/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64"
-	S="${WORKDIR}/rocminfo-roc-${PV}"
+	S="${WORKDIR}/rocminfo-rocm-${PV}"
 fi
 
 DESCRIPTION="ROCm Application for Reporting System Info"
diff --git a/dev-util/rpmdevtools/Manifest b/dev-util/rpmdevtools/Manifest
index b853fae09010..7f455773dc36 100644
--- a/dev-util/rpmdevtools/Manifest
+++ b/dev-util/rpmdevtools/Manifest
@@ -1,4 +1,3 @@
 DIST rpmdevtools-8.10.tar.xz 94976 BLAKE2B 290044a511f77111487cef40b6b9bd706f0bf6b2b65681a931839f1fd00aa490c106492de35643c8a7218762e4e92c9bd44a42d8976472c15748d9ad94f0d5c0 SHA512 49f310d5cf1e709e8001ffcf2b17afa7f7a89ef9c8f805d694149a914c40626a08afe93b16d9ed41df1717d0bc97713c06a3b0e63f13fa53d978c6204bb05d57
-EBUILD rpmdevtools-8.10-r1.ebuild 773 BLAKE2B 257165ab05e7975b379ad63d5a6123f57b15c433a57bcc17d3bedd03c2602db4e08b5153c3fbbc0cc0cab7606940e1d59af76f82d1132c903608ea5269c1171e SHA512 533f076112813def380f6082bfeefc0da8bbaf5dd1e1171ca45d70e9d66144c34cc6a53cea2904d0139a1abe19abcaf2789de00680b62acb1956a36969406904
-EBUILD rpmdevtools-8.10-r2.ebuild 774 BLAKE2B 1c2b4b4e4be4c713bf0712c532e3c1ab33763129873b97f8e9e614ffc6f135fe63f92a0ccfc88a66c9b6206163665fb4fc86f6a3243c112bd7a23297ca847bb9 SHA512 3d9a79161685d7d023a2c50f5d06b402402b9139f642fea63f5dbceefaa74979d86c61fc805da07418cf8c2d3cba6c5d6ab700bc0221a4c87c81617d719d5811
+EBUILD rpmdevtools-8.10-r2.ebuild 773 BLAKE2B 49b979f9ace3472ac47c6512a706632cd2584d52bd2e509dfa3fc6409912a5ac07dc6e8af206acc888e03a74230ff68a5b8f4b9f2d1481e2b85ad78b96a1817f SHA512 4b17b0c67857de9e0545046293dd4ea1f902b530f72330d10c8cb8ffae64f8c49602de5623dc946ccad3381befc0ec50faf2086dbc388da3f6559c444d274852
 MISC metadata.xml 221 BLAKE2B 6d597a7a853603bd878e86c6552cb68211e81f627cdb673ae99dc6c6133f50f617101e43f4b4631b45b5969ee6ec42849b156a62594f939d00c112ce51d769e1 SHA512 e50d6cad26239ebf4260f0cf4bdf4e29ef2038e999039adf94f49b184b5993f02bb0d4cdb3de6c7b5cda99890db42dcd2b65c5342256be50dc19e6aab2406353
diff --git a/dev-util/rpmdevtools/rpmdevtools-8.10-r1.ebuild b/dev-util/rpmdevtools/rpmdevtools-8.10-r1.ebuild
deleted file mode 100644
index eb1fb39a1655..000000000000
--- a/dev-util/rpmdevtools/rpmdevtools-8.10-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit python-single-r1
-
-DESCRIPTION="Collection of rpm packaging related utilities"
-HOMEPAGE="https://pagure.io/rpmdevtools"
-SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="emacs"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	app-arch/rpm[python,${PYTHON_SINGLE_USEDEP}]
-	dev-lang/perl:*
-"
-RDEPEND="${COMMON_DEPEND}
-	net-misc/curl
-	emacs? ( app-emacs/rpm-spec-mode )
-"
-DEPEND="${COMMON_DEPEND}
-	sys-apps/help2man
-"
-
-src_prepare() {
-	default
-	python_fix_shebang rpmdev-{rmdevelrpms.py,checksig,sort,vercmp,bumpspec}
-}
diff --git a/dev-util/rpmdevtools/rpmdevtools-8.10-r2.ebuild b/dev-util/rpmdevtools/rpmdevtools-8.10-r2.ebuild
index b2ec0bd71ef2..ef6f0d811454 100644
--- a/dev-util/rpmdevtools/rpmdevtools-8.10-r2.ebuild
+++ b/dev-util/rpmdevtools/rpmdevtools-8.10-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="emacs"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-util/rr/Manifest b/dev-util/rr/Manifest
index deb93f86e30a..7524a121ba03 100644
--- a/dev-util/rr/Manifest
+++ b/dev-util/rr/Manifest
@@ -1,8 +1,3 @@
-AUX rr-5.2.0-c++14.patch 791 BLAKE2B 6e13ead39239a2ec2cfd0a7c9537b7780ede7fdacdca5d34302b269ae67e73abca6dda22c6dff4c918040d46ec6745ba7eb45602a6464bd5a454a0cfa3633786 SHA512 9aec12ef80b8c83de56e8186e43db3bda1c10028255eccf8aac4db5f3cc817092a8d59b578145bdb87eb01fc761d5d3c1734daec337b7342a892b3017a51035d
-AUX rr-5.2.0-tgkill-glibc-2.30.patch 1076 BLAKE2B 52fbe716a4830197800d63eac91188abc45fb55936c1580d965ec0864b06a230bd9e2f13036387cc17ec583bd87c580ae29ea53f9250ac0eb5439c8af629ee30 SHA512 f6d21968118499d4fc1f2d6437904d225a767f36738e859218606c13fe641b74a6eb778170e1a99fa89d5cbb915bcef4294d2c4f71f4d1a8a3b76bf261d079a2
-AUX rr-5.2.0-ucontext_t.patch 1936 BLAKE2B 11f032058be13960f090a851c09e4612d6a2574d6e54c583d1c7741468810c10b38d4e2a5b24496f8c1a6505bcbc47a6f8fa326ae7853f623d71cbe2b6f1fad2 SHA512 4ee8c1f40926e591e98b268461cc0e5eedcc3d5493bed2ebeedbffcf8745fa7899ed076e7e75cd4e4bfdb413e673795a8ed76f0ef00c68170e992d3b07294c95
-DIST mozilla-rr-5.2.0.tar.gz 1168734 BLAKE2B 2f15c4ec4a271f930334577e98b14e37d2a0eb7cd3443e7110d3562ac4ef30c310e6448a588f4e31f2943a6d4ff0af006cbbafc50722543436fcae3bdc8e453f SHA512 4465985f67e9812b62b91ac7942105a9f976faf0c0d7c352a99a638fe6bdfde024f939b3daa922d431c7fc87118ae4d9d039b00345760fb547c349e8737dc168
 DIST mozilla-rr-5.3.0.tar.gz 1343557 BLAKE2B 80ed2feb52fd34b424193902c02408443e5ae943a34d3fe8e75c4c813042c6dd7f39571924ce94aca558ea5f1630f9bda28bea9d5f7e2d429d772a85d3e3e7ad SHA512 6ae37a3ced0c001208fb981abc18f02b912a2851564955dd8da364cb30d9580ea6c91bedbef6495da5d082954d4f261eeaea81df1e9895b4adf948e9998f4c2b
-EBUILD rr-5.2.0-r1.ebuild 1488 BLAKE2B 98a6509563a39415d158f7a2108984648a3c0f3fad8224c15c767c4cbffe71e834f0314bcf39cf4a1a177444edfd735592f6c8ccffbd46d382eac6087d97018e SHA512 bd3c71399d4f1bcb7007129862978c773afb459f41f69f51b661441ac8a6ef950737ae1e269dc9c555026245bf8967b944dee557c1abae9866c4a9d468f33268
 EBUILD rr-5.3.0-r1.ebuild 1368 BLAKE2B 1f9ef787e458c599e0d13efa9b7325dd91d2a84013832f59da1e58d907ebdbeeb0858c29ddfb42ff57213aa100f028e06170b7e6fb28ffe78683c77419382f07 SHA512 797cae8fc2432e41b24ee03db7bfa0466dbf41e19682c08a827da698ae4f784687b9f243e3fe86ce9ca76892b8f421bb5ba0a34cc1d43ce9e2cf8edaf3aeafd5
 MISC metadata.xml 555 BLAKE2B 3618975613ac5286f849880de14d61b1cb74b0e64d539250c700ff0c955667acbcc11125381c31ba39b839da4b38c5d648fea27ebea4f7f28ca492e0554e3a27 SHA512 33487b0389d097115365ef82c85accedf17d798e312e9528fae27519f242c343fa280d32bff05c6f1a1620d6481df1db57fc4c1e2fa7ce36dbe56f998f03870a
diff --git a/dev-util/rr/files/rr-5.2.0-c++14.patch b/dev-util/rr/files/rr-5.2.0-c++14.patch
deleted file mode 100644
index 8458de5f1e9f..000000000000
--- a/dev-util/rr/files/rr-5.2.0-c++14.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0d711f9..756a62e 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -42,7 +42,7 @@ set(FLAGS_COMMON "-msse2 -D__MMX__ -D__SSE__ -D__SSE2__ -D__USE_LARGEFILE64 -pth
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${FLAGS_COMMON} -Wstrict-prototypes -std=gnu11")
- # Define __STDC_LIMIT_MACROS so |#include <stdint.h>| works as expected.
- # Define __STDC_FORMAT_MACROS so |#include <inttypes.h>| works as expected.
--set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${FLAGS_COMMON} -D__STDC_LIMIT_MACROS -D__STDC_FORMAT_MACROS -std=c++11")
-+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${FLAGS_COMMON} -D__STDC_LIMIT_MACROS -D__STDC_FORMAT_MACROS -std=c++14")
- set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} -g3")
- 
- set(RR_FLAGS_DEBUG "-Wall -Wextra  -O0 -DDEBUG -UNDEBUG")
diff --git a/dev-util/rr/files/rr-5.2.0-tgkill-glibc-2.30.patch b/dev-util/rr/files/rr-5.2.0-tgkill-glibc-2.30.patch
deleted file mode 100644
index 2a6e9daef2fb..000000000000
--- a/dev-util/rr/files/rr-5.2.0-tgkill-glibc-2.30.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-https://bugs.gentoo.org/699886
-
-From 7044c5c6a8e64c737ba3cdb97187ff5c406e5162 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
-Date: Thu, 23 May 2019 23:18:26 +0200
-Subject: [PATCH] Fix build in newer glibc.
-
-Seems tgkill was added recently to glibc.
-
-build/32/tgkill.c:7:12: error: static declaration of 'tgkill' follows non-static declaration
-static int tgkill(int tgid, int tid, int sig) {
-           ^
-/usr/include/bits/signal_ext.h:29:12: note: previous declaration is here
-extern int tgkill (__pid_t __tgid, __pid_t __tid, int __signal);
----
- src/test/tgkill.c | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
---- a/src/test/tgkill.c
-+++ b/src/test/tgkill.c
-@@ -4,9 +4,8 @@
- 
- static int num_signals_caught;
- 
--static int tgkill(int tgid, int tid, int sig) {
--  return syscall(SYS_tgkill, tgid, tid, sig);
--}
-+#define tgkill(tgid, tid, sig) \
-+  syscall(SYS_tgkill, (int)(tgid), (int)(tid), (int)(sig))
- 
- static void sighandler(int sig) {
-   atomic_printf("Task %d got signal %d\n", sys_gettid(), sig);
--- 
-2.24.0
-
diff --git a/dev-util/rr/files/rr-5.2.0-ucontext_t.patch b/dev-util/rr/files/rr-5.2.0-ucontext_t.patch
deleted file mode 100644
index 0015f0b150c0..000000000000
--- a/dev-util/rr/files/rr-5.2.0-ucontext_t.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 53c5bd72bae089616a3ca626b8af240481d70e6f Mon Sep 17 00:00:00 2001
-From: Robert O'Callahan <robert@ocallahan.org>
-Date: Fri, 10 Aug 2018 15:17:55 +1200
-Subject: [PATCH] Remove ucontext_t/rt_sigframe from kernel-abi
-
-These were added in 18bb097736a1b728f1e5bfec972ca10f6e763d82 to help us determine
-the sigmask effect of rt_sigreturn syscalls, but they're no longer needed
-because we query the new mask via /proc instead.
-
-Resolves #2237
----
- src/kernel_abi.h | 33 ---------------------------------
- 1 file changed, 33 deletions(-)
-
-diff --git a/src/kernel_abi.h b/src/kernel_abi.h
-index e73e49933..29d3c9242 100644
---- a/src/kernel_abi.h
-+++ b/src/kernel_abi.h
-@@ -1609,23 +1609,6 @@ struct X86Arch : public BaseArch<SupportedArch::x86, WordSize32Defs> {
-   };
-   RR_VERIFY_TYPE_ARCH(SupportedArch::x86, ::sigcontext, sigcontext);
- 
--  struct ucontext_t {
--    uint32_t uc_flags;
--    uint32_t uc_link;
--    stack_t uc_stack;
--    sigcontext uc_mcontext;
--    kernel_sigset_t uc_sigmask;
--  };
--
--  struct rt_sigframe {
--    uint32_t pretcode;
--    int sig;
--    uint32_t pinfo;
--    uint32_t puc;
--    siginfo_t info;
--    struct ucontext_t uc;
--  };
--
-   struct _fpstate_32 {
-     uint32_t cw, sw, tag, ipoff, cssel, dataoff, datasel;
-     uint16_t _st[40];
-@@ -1806,22 +1789,6 @@ struct X64Arch : public BaseArch<SupportedArch::x86_64, WordSize64Defs> {
-   RR_VERIFY_TYPE_ARCH(SupportedArch::x86_64, ::user_fpregs_struct,
-                       user_fpregs_struct);
- 
--  struct ucontext_t {
--    uint64_t ucflags;
--    ptr<struct ucontext_t> uc_link;
--    stack_t uc_stack;
--    struct sigcontext uc_mcontext;
--    sigset_t uc_sigmask;
--    user_fpregs_struct uc_fpregs;
--  };
--  RR_VERIFY_TYPE_ARCH(SupportedArch::x86_64, ::ucontext_t, ucontext_t);
--
--  struct rt_sigframe {
--    ptr<char> pretcode;
--    struct ucontext_t uc;
--    siginfo_t info;
--  };
--
-   struct user {
-     struct user_regs_struct regs;
-     int u_fpvalid;
diff --git a/dev-util/rr/rr-5.2.0-r1.ebuild b/dev-util/rr/rr-5.2.0-r1.ebuild
deleted file mode 100644
index b60628ad4eec..000000000000
--- a/dev-util/rr/rr-5.2.0-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-CMAKE_BUILD_TYPE=Release
-
-inherit cmake-utils linux-info python-single-r1
-
-DESCRIPTION="Record and Replay Framework"
-HOMEPAGE="https://rr-project.org/"
-SRC_URI="https://github.com/mozilla/${PN}/archive/${PV}.tar.gz -> mozilla-${P}.tar.gz"
-
-LICENSE="MIT BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="multilib test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="
-	sys-libs/zlib
-	dev-libs/capnproto
-	${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	sys-devel/gdb[xml]"
-# Add all the deps needed only at build/test time.
-DEPEND+="
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/pexpect[${PYTHON_MULTI_USEDEP}]
-		')
-		sys-devel/gdb[xml]
-	)"
-
-RESTRICT="test" # toolchain and kernel version dependent
-
-PATCHES=(
-	"${FILESDIR}"/${P}-ucontext_t.patch
-	"${FILESDIR}"/${P}-c++14.patch
-	"${FILESDIR}"/${P}-tgkill-glibc-2.30.patch
-)
-
-pkg_setup() {
-	if use kernel_linux; then
-		CONFIG_CHECK="SECCOMP"
-		linux-info_pkg_setup
-	fi
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	sed -i 's:-Werror::' CMakeLists.txt || die #609192
-}
-
-src_test() {
-	if has usersandbox ${FEATURES} ; then
-		ewarn "Test suite fails under FEATURES=usersandbox (bug #632394). Skipping."
-		return 0
-	fi
-
-	cmake-utils_src_test
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTS=$(usex test)
-		-Ddisable32bit=$(usex !multilib) #636786
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/dev-util/rt-tests/Manifest b/dev-util/rt-tests/Manifest
index 79e0e66753ad..9e44595f9bea 100644
--- a/dev-util/rt-tests/Manifest
+++ b/dev-util/rt-tests/Manifest
@@ -1,4 +1,4 @@
-AUX rt-tests-1.6-man-compression.patch 3486 BLAKE2B 1b24591958525563ffb1ae600c00360a834628783e304c4dd342a6fa694d610555f265ffe1b6c1023480e28d76804a9a8c002e923596b860f24aa64dee0cbe74 SHA512 5cab8485836530f30de5ebaffa57eca3eed5aad530775cfcde7fd24ed082c4323970ab84bf6b897f7d9145f82610131465a07d9332926e54a3b1c2cd553a0981
-DIST rt-tests-1.6.tar.xz 104864 BLAKE2B 36ada7cbe6deefae2eef80fa167892d41a9c56a6f54a23c8ace5ab97a32e23a88a488bc95f92456a7eea48c49567c4755adc43b3aa68e20c885ca1c354825a7d SHA512 1cbb9b1bc7f6ac335be269e5937209598bfb8c0a29750484e7bba8b87b416c04cd38c8d6d48dc5ed1978c1797dee4cecff0218124bd6d7f23b43a13dc7a75a29
-EBUILD rt-tests-1.6.ebuild 806 BLAKE2B 7512dc72ea09f5961bfe744b544bb75872275b6b44ebbdc0196cfcf4c704999710cf8307217ca1b43cb03e29d83c55779101179b37134831acf7b0c69c10431e SHA512 674006a37f4802f62e31cd5b84cc9430ac8a9a5c67a00e7d02746eea7d8eb62e126610f75f6a115c92d2c93964ae0869a8b29f990f29568e91857fdfbf11ffa1
-MISC metadata.xml 794 BLAKE2B 5b5173ad796e3486eee11fc1f8901e0782db20a077b03dfd5d3b254edd739713a1dc21209b57d71368ba8777a2e852d79a5b750bf1c3c6eabcad4bfb20b782eb SHA512 e9fe88a5a21243e9462733006a881fb2a9b07bc9536259562ef620b579c6cc78b98fe8da3454d62c6913bdbf4fd6bc1d6d9192d3ce7e05bc30a1610fb617a3e6
+AUX rt-tests-1.8-musl.patch 10834 BLAKE2B 54bc0e20a9bc7c251985b8e21c94b0e6261345d02a23dc510ee6a303843ea88aa13750680adb3954d63561246dfb26e6427adf2bc2012f9161357d0fae207b83 SHA512 196b0d1d19aeab83710edddcaec7064d4e4770cd514f8b8a61b23980932b793d044cfb4d69c91e61c4ee912eb24cd3a87ee8da05612c1ee02e2a5885f32bb9e5
+DIST rt-tests-1.8.tar.xz 105820 BLAKE2B 478ac14732393f718e6be818b82b24b1e53d2f293140012bc17fd1c9242bd885b4d70dca3c7f3187e9ba22334e5f83d9ad1993ab9f70079e1765b918deab4411 SHA512 41c0b18e84d1f76de22a4ab239d43ac678b8c8419b508c96204bef346734122b9a42df51fcea97b1e0675bd25ed1e262730236ec0cb189732d5810122e96aa39
+EBUILD rt-tests-1.8.ebuild 840 BLAKE2B 5d5e2ade599917bc4dd91fcaea95947704ccfafa21c704460f8ea927055f71d5b2b65bde93aa37c0eb8217b51fffc67e94e1da0cd9e0acca3295d8bf3331e04c SHA512 c68ca6095d2421222179df72c0993e48b36d18e198902aada15c545df283f81685f555de30994d004916469acb0e7caa2981748e251e21ab624e7a9810641180
+MISC metadata.xml 718 BLAKE2B e09ef2dd4bd98df6e36e684105242e579fd86dfa28fd02f6b04ea78f91dc2089485a54497edb0a9a1b3c36fe5033eb1e98b626735b82d2a765150812f724bb93 SHA512 8b7eb83545e11f2f5786f0e5fbc47ce15fbb9a364ad9fcf51a7c47e8a05e70d3d0c48c2f69b5f6abd4b839514bc2575a66a43202204340137ec3d8a9f41564e1
diff --git a/dev-util/rt-tests/files/rt-tests-1.6-man-compression.patch b/dev-util/rt-tests/files/rt-tests-1.6-man-compression.patch
deleted file mode 100644
index e44a9525060d..000000000000
--- a/dev-util/rt-tests/files/rt-tests-1.6-man-compression.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 30e9529a140fb2a5ef96e510743e201c62ded022 Mon Sep 17 00:00:00 2001
-From: Kurt Kanzenbach <kurt@kmk-computers.de>
-Date: Wed, 22 Jan 2020 18:42:25 +0100
-Subject: [PATCH] make: Don't compress man pages by default
-
-Most package systems do the compression on their own.
-
-Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
----
- Makefile | 28 ++++++++++++++--------------
- 1 file changed, 14 insertions(+), 14 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 552b3fe885cc..244d26eed7cc 100644
---- a/Makefile
-+++ b/Makefile
-@@ -180,19 +180,19 @@ install: all install_hwlatdetect
- 	cp $(TARGETS) "$(DESTDIR)$(bindir)"
- 	install src/queuelat/get_cpuinfo_mhz.sh "$(DESTDIR)$(bindir)"
- 	install src/queuelat/determine_maximum_mpps.sh "${DESTDIR}${bindir}"
--	gzip -c src/cyclictest/cyclictest.8 >"$(DESTDIR)$(mandir)/man8/cyclictest.8.gz"
--	gzip -c src/pi_tests/pi_stress.8 >"$(DESTDIR)$(mandir)/man8/pi_stress.8.gz"
--	gzip -c src/ptsematest/ptsematest.8 >"$(DESTDIR)$(mandir)/man8/ptsematest.8.gz"
--	gzip -c src/rt-migrate-test/rt-migrate-test.8 >"$(DESTDIR)$(mandir)/man8/rt-migrate-test.8.gz"
--	gzip -c src/sigwaittest/sigwaittest.8 >"$(DESTDIR)$(mandir)/man8/sigwaittest.8.gz"
--	gzip -c src/svsematest/svsematest.8 >"$(DESTDIR)$(mandir)/man8/svsematest.8.gz"
--	gzip -c src/pmqtest/pmqtest.8 >"$(DESTDIR)$(mandir)/man8/pmqtest.8.gz"
--	gzip -c src/hackbench/hackbench.8 >"$(DESTDIR)$(mandir)/man8/hackbench.8.gz"
--	gzip -c src/signaltest/signaltest.8 >"$(DESTDIR)$(mandir)/man8/signaltest.8.gz"
--	gzip -c src/pi_tests/pip_stress.8 >"$(DESTDIR)$(mandir)/man8/pip_stress.8.gz"
--	gzip -c src/queuelat/queuelat.8 >"$(DESTDIR)$(mandir)/man8/queuelat.8.gz"
--	gzip -c src/sched_deadline/deadline_test.8 >"$(DESTDIR)$(mandir)/man8/deadline_test.8.gz"
--	gzip -c src/ssdd/ssdd.8 >"$(DESTDIR)$(mandir)/man8/ssdd.8.gz"
-+	install -D -m 644 src/cyclictest/cyclictest.8 "$(DESTDIR)$(mandir)/man8/cyclictest.8"
-+	install -D -m 644 src/pi_tests/pi_stress.8 "$(DESTDIR)$(mandir)/man8/pi_stress.8"
-+	install -D -m 644 src/ptsematest/ptsematest.8 "$(DESTDIR)$(mandir)/man8/ptsematest.8"
-+	install -D -m 644 src/rt-migrate-test/rt-migrate-test.8 "$(DESTDIR)$(mandir)/man8/rt-migrate-test.8"
-+	install -D -m 644 src/sigwaittest/sigwaittest.8 "$(DESTDIR)$(mandir)/man8/sigwaittest.8"
-+	install -D -m 644 src/svsematest/svsematest.8 "$(DESTDIR)$(mandir)/man8/svsematest.8"
-+	install -D -m 644 src/pmqtest/pmqtest.8 "$(DESTDIR)$(mandir)/man8/pmqtest.8"
-+	install -D -m 644 src/hackbench/hackbench.8 "$(DESTDIR)$(mandir)/man8/hackbench.8"
-+	install -D -m 644 src/signaltest/signaltest.8 "$(DESTDIR)$(mandir)/man8/signaltest.8"
-+	install -D -m 644 src/pi_tests/pip_stress.8 "$(DESTDIR)$(mandir)/man8/pip_stress.8"
-+	install -D -m 644 src/queuelat/queuelat.8 "$(DESTDIR)$(mandir)/man8/queuelat.8"
-+	install -D -m 644 src/sched_deadline/deadline_test.8 "$(DESTDIR)$(mandir)/man8/deadline_test.8"
-+	install -D -m 644 src/ssdd/ssdd.8 "$(DESTDIR)$(mandir)/man8/ssdd.8"
- 
- .PHONY: install_hwlatdetect
- install_hwlatdetect: hwlatdetect
-@@ -201,7 +201,7 @@ install_hwlatdetect: hwlatdetect
- 		install -D -m 755 src/hwlatdetect/hwlatdetect.py $(DESTDIR)$(PYLIB)/hwlatdetect.py ; \
- 		rm -f "$(DESTDIR)$(bindir)/hwlatdetect" ; \
- 		ln -s $(PYLIB)/hwlatdetect.py "$(DESTDIR)$(bindir)/hwlatdetect" ; \
--		gzip -c src/hwlatdetect/hwlatdetect.8 >"$(DESTDIR)$(mandir)/man8/hwlatdetect.8.gz" ; \
-+		install -D -m 644 src/hwlatdetect/hwlatdetect.8 "$(DESTDIR)$(mandir)/man8/hwlatdetect.8" ; \
- 	fi
- 
- .PHONY: tarball
--- 
-2.24.1
-
diff --git a/dev-util/rt-tests/files/rt-tests-1.8-musl.patch b/dev-util/rt-tests/files/rt-tests-1.8-musl.patch
new file mode 100644
index 000000000000..48a7a297afc1
--- /dev/null
+++ b/dev-util/rt-tests/files/rt-tests-1.8-musl.patch
@@ -0,0 +1,380 @@
+From 4daa685588ee3848fc98fd9c6328b76f136ee876 Mon Sep 17 00:00:00 2001
+From: Kurt Kanzenbach <kurt@kmk-computers.de>
+Date: Wed, 1 Apr 2020 20:15:24 +0200
+Subject: [PATCH] all: Fix musl build
+
+There are a few problems:
+
+ * pi stress:  pthread_attr_setaffinity_np() is not supported
+ * cyclictest: SIGEV_THREAD_ID is not supported
+ * hackbench:  Fix include
+ * all:        Fix sched_* calls
+
+With these changes applied, the rt-tests seem to run fine.
+
+Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
+---
+ Makefile                              |  5 --
+ src/backfire/sendme.c                 |  1 +
+ src/cyclictest/cyclictest.c           | 68 ++++-----------------------
+ src/hackbench/hackbench.c             |  4 +-
+ src/include/musl.h                    | 28 +++++++++++
+ src/lib/rt-utils.c                    |  1 +
+ src/pi_tests/classic_pi.c             |  2 +
+ src/pi_tests/tst-mutexpi10.c          |  2 +
+ src/pmqtest/pmqtest.c                 |  1 +
+ src/ptsematest/ptsematest.c           |  1 +
+ src/rt-migrate-test/rt-migrate-test.c |  1 +
+ src/sched_deadline/cyclicdeadline.c   |  2 +
+ 12 files changed, 50 insertions(+), 66 deletions(-)
+ create mode 100644 src/include/musl.h
+
+diff --git a/Makefile b/Makefile
+index 05fc5eda71fa..9340f28f2c32 100644
+--- a/Makefile
++++ b/Makefile
+@@ -7,7 +7,6 @@ OBJDIR = bld
+ sources = cyclictest.c \
+ 	  hackbench.c \
+ 	  pip_stress.c \
+-	  pi_stress.c \
+ 	  pmqtest.c \
+ 	  ptsematest.c \
+ 	  rt-migrate-test.c \
+@@ -35,7 +34,6 @@ LDFLAGS ?=
+ PYLIB  ?= $(shell python3 -c 'import distutils.sysconfig;  print (distutils.sysconfig.get_python_lib())')
+ 
+ MANPAGES = src/cyclictest/cyclictest.8 \
+-	   src/pi_tests/pi_stress.8 \
+ 	   src/ptsematest/ptsematest.8 \
+ 	   src/rt-migrate-test/rt-migrate-test.8 \
+ 	   src/sigwaittest/sigwaittest.8 \
+@@ -125,9 +123,6 @@ deadline_test: $(OBJDIR)/deadline_test.o $(OBJDIR)/librttest.a
+ signaltest: $(OBJDIR)/signaltest.o $(OBJDIR)/librttest.a
+ 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS) $(RTTESTLIB)
+ 
+-pi_stress: $(OBJDIR)/pi_stress.o $(OBJDIR)/librttest.a
+-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS) $(RTTESTLIB)
+-
+ hwlatdetect:  src/hwlatdetect/hwlatdetect.py
+ 	chmod +x src/hwlatdetect/hwlatdetect.py
+ 	ln -s src/hwlatdetect/hwlatdetect.py hwlatdetect
+diff --git a/src/backfire/sendme.c b/src/backfire/sendme.c
+index c1854d9660cb..ecec5c201bef 100644
+--- a/src/backfire/sendme.c
++++ b/src/backfire/sendme.c
+@@ -31,6 +31,7 @@
+ #include <errno.h>
+ #include "rt-utils.h"
+ #include "rt-get_cpu.h"
++#include "musl.h"
+ 
+ #include <utmpx.h>
+ #include <sys/types.h>
+diff --git a/src/cyclictest/cyclictest.c b/src/cyclictest/cyclictest.c
+index c5f1fd46567a..8204e57cbbac 100644
+--- a/src/cyclictest/cyclictest.c
++++ b/src/cyclictest/cyclictest.c
+@@ -36,6 +36,7 @@
+ #include "rt_numa.h"
+ 
+ #include "rt-utils.h"
++#include "musl.h"
+ 
+ #include <bionic.h>
+ 
+@@ -628,12 +629,8 @@ static void *timerthread(void *param)
+ {
+ 	struct thread_param *par = param;
+ 	struct sched_param schedp;
+-	struct sigevent sigev;
+ 	sigset_t sigset;
+-	timer_t timer;
+ 	struct timespec now, next, interval, stop;
+-	struct itimerval itimer;
+-	struct itimerspec tspec;
+ 	struct thread_stat *stat = par->stats;
+ 	int stopped = 0;
+ 	cpu_set_t mask;
+@@ -664,14 +661,6 @@ static void *timerthread(void *param)
+ 	sigaddset(&sigset, par->signal);
+ 	sigprocmask(SIG_BLOCK, &sigset, NULL);
+ 
+-	if (par->mode == MODE_CYCLIC) {
+-		sigev.sigev_notify = SIGEV_THREAD_ID | SIGEV_SIGNAL;
+-		sigev.sigev_signo = par->signal;
+-		sigev.sigev_notify_thread_id = stat->tid;
+-		timer_create(par->clock, &sigev, &timer);
+-		tspec.it_interval = interval;
+-	}
+-
+ 	memset(&schedp, 0, sizeof(schedp));
+ 	schedp.sched_priority = par->prio;
+ 	if (setscheduler(0, par->policy, &schedp))
+@@ -726,20 +715,6 @@ static void *timerthread(void *param)
+ 		stop = now;
+ 		stop.tv_sec += duration;
+ 	}
+-	if (par->mode == MODE_CYCLIC) {
+-		if (par->timermode == TIMER_ABSTIME)
+-			tspec.it_value = next;
+-		else
+-			tspec.it_value = interval;
+-		timer_settime(timer, par->timermode, &tspec, NULL);
+-	}
+-
+-	if (par->mode == MODE_SYS_ITIMER) {
+-		itimer.it_interval.tv_sec = interval.tv_sec;
+-		itimer.it_interval.tv_usec = interval.tv_nsec / 1000;
+-		itimer.it_value = itimer.it_interval;
+-		setitimer(ITIMER_REAL, &itimer, NULL);
+-	}
+ 
+ 	stat->threadstarted++;
+ 
+@@ -747,16 +722,10 @@ static void *timerthread(void *param)
+ 
+ 		uint64_t diff;
+ 		unsigned long diff_smi = 0;
+-		int sigs, ret;
++		int ret;
+ 
+ 		/* Wait for next period */
+ 		switch (par->mode) {
+-		case MODE_CYCLIC:
+-		case MODE_SYS_ITIMER:
+-			if (sigwait(&sigset, &sigs) < 0)
+-				goto out;
+-			break;
+-
+ 		case MODE_CLOCK_NANOSLEEP:
+ 			if (par->timermode == TIMER_ABSTIME) {
+ 				ret = clock_nanosleep(par->clock, TIMER_ABSTIME,
+@@ -878,11 +847,6 @@ static void *timerthread(void *param)
+ 
+ 		next.tv_sec += interval.tv_sec;
+ 		next.tv_nsec += interval.tv_nsec;
+-		if (par->mode == MODE_CYCLIC) {
+-			int overrun_count = timer_getoverrun(timer);
+-			next.tv_sec += overrun_count * interval.tv_sec;
+-			next.tv_nsec += overrun_count * interval.tv_nsec;
+-		}
+ 		tsnorm(&next);
+ 
+ 		while (tsgreater(&now, &next)) {
+@@ -907,17 +871,6 @@ out:
+ 		pthread_mutex_unlock(&refresh_on_max_lock);
+ 	}
+ 
+-	if (par->mode == MODE_CYCLIC)
+-		timer_delete(timer);
+-
+-	if (par->mode == MODE_SYS_ITIMER) {
+-		itimer.it_value.tv_sec = 0;
+-		itimer.it_value.tv_usec = 0;
+-		itimer.it_interval.tv_sec = 0;
+-		itimer.it_interval.tv_usec = 0;
+-		setitimer(ITIMER_REAL, &itimer, NULL);
+-	}
+-
+ 	/* close msr file */
+ 	if (smi)
+ 		close(par->msr_fd);
+@@ -1417,7 +1370,8 @@ static void process_options (int argc, char *argv[], int max_cpus)
+ 		case OPT_VERBOSE: verbose = 1; break;
+ 		case 'x':
+ 		case OPT_POSIX_TIMERS:
+-			use_nanosleep = MODE_CYCLIC; break;
++			fatal("--posix_timers is not available on your libc\n");
++			break;
+ 		case '?':
+ 		case OPT_HELP:
+ 			display_help(0); break;
+@@ -1450,13 +1404,6 @@ static void process_options (int argc, char *argv[], int max_cpus)
+ 		}
+ 	}
+ 
+-	if ((use_system == MODE_SYS_OFFSET) && (use_nanosleep == MODE_CYCLIC)) {
+-		warn("The system option requires clock_nanosleep\n");
+-		warn("and is not compatible with posix_timers\n");
+-		warn("Using clock_nanosleep\n");
+-		use_nanosleep = MODE_CLOCK_NANOSLEEP;
+-	}
+-
+ 	/* if smp wasn't requested, test for numa automatically */
+ 	if (!smp) {
+ #ifdef NUMA
+@@ -2157,7 +2104,6 @@ int main(int argc, char **argv)
+ 
+ 	}
+ 
+-
+ 	mode = use_nanosleep + use_system;
+ 
+ 	sigemptyset(&sigset);
+@@ -2207,16 +2153,18 @@ int main(int argc, char **argv)
+ 			void *stack;
+ 			void *currstk;
+ 			size_t stksize;
++			int err;
+ 
+ 			/* find the memory node associated with the cpu i */
+ 			node = rt_numa_numa_node_of_cpu(cpu);
+ 
+ 			/* get the stack size set for for this thread */
+-			if (pthread_attr_getstack(&attr, &currstk, &stksize))
++			err = pthread_attr_getstack(&attr, &currstk, &stksize);
++			if (err != EINVAL)
+ 				fatal("failed to get stack size for thread %d\n", i);
+ 
+ 			/* if the stack size is zero, set a default */
+-			if (stksize == 0)
++			if (err == EINVAL || stksize == 0)
+ 				stksize = PTHREAD_STACK_MIN * 2;
+ 
+ 			/*  allocate memory for a stack on appropriate node */
+diff --git a/src/hackbench/hackbench.c b/src/hackbench/hackbench.c
+index 5a883d341f2e..9f1e4db736a7 100644
+--- a/src/hackbench/hackbench.c
++++ b/src/hackbench/hackbench.c
+@@ -24,13 +24,15 @@
+ #include <sys/socket.h>
+ #include <sys/wait.h>
+ #include <sys/time.h>
+-#include <sys/poll.h>
++#include <poll.h>
+ #include <limits.h>
+ #include <getopt.h>
+ #include <signal.h>
+ #include <setjmp.h>
+ #include <sched.h>
+ 
++#include "musl.h"
++
+ static unsigned int datasize = 100;
+ static unsigned int loops = 100;
+ static unsigned int num_groups = 10;
+diff --git a/src/include/musl.h b/src/include/musl.h
+new file mode 100644
+index 000000000000..ea5075e768c8
+--- /dev/null
++++ b/src/include/musl.h
+@@ -0,0 +1,28 @@
++/*
++ * Copyright (C) 2020 Kurt Kanzenbach <kurt@kmk-computers.de>
++ * Time-stamp: <2020-04-04 10:54:01 kurt>
++ */
++
++#ifndef _MUSL_H_
++#define _MUSL_H_
++
++#include <unistd.h>
++#include <sys/syscall.h>
++
++/*
++ * Musl someshow defines sched_* to ENOSYS which is not correct ...
++ * See commit 1e21e78bf7a5 ("add support for thread scheduling (POSIX TPS option)")
++ *
++ * Workaround: define them to syscall(...)
++ */
++
++#define sched_getparam(pid, param)		\
++	syscall(SYS_sched_getparam, pid, param)
++#define sched_setparam(pid, param)		\
++	syscall(SYS_sched_setparam, pid, param)
++#define sched_getscheduler(pid)			\
++	syscall(SYS_sched_getscheduler, pid)
++#define sched_setscheduler(pid, policy, param)			\
++	syscall(SYS_sched_setscheduler, pid, policy, param)
++
++#endif /* _MUSL_H_ */
+diff --git a/src/lib/rt-utils.c b/src/lib/rt-utils.c
+index 1998a327d036..f7adda9c5987 100644
+--- a/src/lib/rt-utils.c
++++ b/src/lib/rt-utils.c
+@@ -23,6 +23,7 @@
+ #include "rt-utils.h"
+ #include "rt-sched.h"
+ #include "error.h"
++#include "musl.h"
+ 
+ static char debugfileprefix[MAX_PATH];
+ 
+diff --git a/src/pi_tests/classic_pi.c b/src/pi_tests/classic_pi.c
+index 64af8890276f..bb088d3973b2 100644
+--- a/src/pi_tests/classic_pi.c
++++ b/src/pi_tests/classic_pi.c
+@@ -34,6 +34,8 @@
+ #include <signal.h>
+ #include <getopt.h>
+ 
++#include "musl.h"
++
+ /* test timeout */
+ #define TIMEOUT 2
+ 
+diff --git a/src/pi_tests/tst-mutexpi10.c b/src/pi_tests/tst-mutexpi10.c
+index 97a345edd26e..1028d344edff 100644
+--- a/src/pi_tests/tst-mutexpi10.c
++++ b/src/pi_tests/tst-mutexpi10.c
+@@ -35,6 +35,8 @@
+ #include <string.h>
+ #include <signal.h>
+ 
++#include "musl.h"
++
+ /* test timeout */
+ #define TIMEOUT 2
+ 
+diff --git a/src/pmqtest/pmqtest.c b/src/pmqtest/pmqtest.c
+index 3ce29252b9a2..1a57841cb7e8 100644
+--- a/src/pmqtest/pmqtest.c
++++ b/src/pmqtest/pmqtest.c
+@@ -24,6 +24,7 @@
+ #include "rt-utils.h"
+ #include "rt-get_cpu.h"
+ #include "error.h"
++#include "musl.h"
+ 
+ #include <pthread.h>
+ 
+diff --git a/src/ptsematest/ptsematest.c b/src/ptsematest/ptsematest.c
+index 485c991ec173..c000e083615f 100644
+--- a/src/ptsematest/ptsematest.c
++++ b/src/ptsematest/ptsematest.c
+@@ -22,6 +22,7 @@
+ #include "rt-utils.h"
+ #include "rt-get_cpu.h"
+ #include "error.h"
++#include "musl.h"
+ 
+ #include <pthread.h>
+ 
+diff --git a/src/rt-migrate-test/rt-migrate-test.c b/src/rt-migrate-test/rt-migrate-test.c
+index 4863238edeb4..9f1aba159dc7 100644
+--- a/src/rt-migrate-test/rt-migrate-test.c
++++ b/src/rt-migrate-test/rt-migrate-test.c
+@@ -25,6 +25,7 @@
+ #include <sched.h>
+ #include <pthread.h>
+ #include "rt-utils.h"
++#include "musl.h"
+ 
+ int nr_tasks;
+ int lfd;
+diff --git a/src/sched_deadline/cyclicdeadline.c b/src/sched_deadline/cyclicdeadline.c
+index a08e28e73c42..675a0ea1a162 100644
+--- a/src/sched_deadline/cyclicdeadline.c
++++ b/src/sched_deadline/cyclicdeadline.c
+@@ -32,6 +32,8 @@
+ #include <rt-utils.h>
+ #include <rt-sched.h>
+ 
++#include "musl.h"
++
+ #define _STR(x) #x
+ #define STR(x) _STR(x)
+ #ifndef MAXPATH
+-- 
+2.24.1
+
diff --git a/dev-util/rt-tests/metadata.xml b/dev-util/rt-tests/metadata.xml
index 23b5a048fe99..991f708b4de2 100644
--- a/dev-util/rt-tests/metadata.xml
+++ b/dev-util/rt-tests/metadata.xml
@@ -15,7 +15,4 @@
     functioning of priority-inheritance mutexes. Additionally it contains
     hackbench, a program to generate work for the scheduler.
   </longdescription>
-  <use>
-    <flag name="numa">Make test programs NUMA aware</flag>
-  </use>
 </pkgmetadata>
diff --git a/dev-util/rt-tests/rt-tests-1.6.ebuild b/dev-util/rt-tests/rt-tests-1.8.ebuild
index debc1623e79f..c6392a91f932 100644
--- a/dev-util/rt-tests/rt-tests-1.6.ebuild
+++ b/dev-util/rt-tests/rt-tests-1.8.ebuild
@@ -3,32 +3,32 @@
 
 EAPI=7
 
-PYTHON_COMPAT=(python3_{6,7,8})
+PYTHON_COMPAT=( python3_{6..8} )
 
 inherit python-single-r1
 
 DESCRIPTION="A collection of latency testing tools for the linux(-rt) kernel"
 HOMEPAGE="https://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git/about/"
-SRC_URI="https://kernel.org/pub/linux/utils/rt-tests/${P}.tar.xz"
+SRC_URI="
+	https://kernel.org/pub/linux/utils/rt-tests/${P}.tar.xz
+	https://kernel.org/pub/linux/utils/rt-tests/older/${P}.tar.xz"
 
 LICENSE="GPL-2 GPL-2+ LGPL-2.1+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="numa"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="${PYTHON_DEPS}
-	numa? ( sys-process/numactl )"
+	sys-process/numactl"
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/${P}-man-compression.patch" )
-
-src_compile() {
-	emake $(usex numa 'NUMA=1' 'NUMA=0') all
+src_prepare() {
+	default
+	use elibc_musl && eapply "${FILESDIR}/${P}-musl.patch"
 }
 
 src_install() {
-	emake prefix=/usr DESTDIR="${D}" install
+	emake prefix=/usr DESTDIR="${D}" MAN_COMPRESSION=none install
 	python_fix_shebang "${ED}"
 	python_optimize
 }
diff --git a/dev-util/scons/Manifest b/dev-util/scons/Manifest
index fa05a4c6ce97..b2112628d216 100644
--- a/dev-util/scons/Manifest
+++ b/dev-util/scons/Manifest
@@ -8,6 +8,6 @@ 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
-EBUILD scons-3.1.1.ebuild 2632 BLAKE2B 84b677283328a4d13ecab6bbf6663c0004d143b6efde959c874a12933eeec017f3c71c735eb292cf4139d92f4942da2c707c896d5047181a6c9b0686363ca72c SHA512 e18511c04fd53472ef2ffd6753cabb9bab0dd80cf8756769e0174b06deabecc1092ada411e67f085c09e638b0de9e782e69dc5369368788ff5a30693206324c9
-EBUILD scons-3.1.2.ebuild 2702 BLAKE2B 0f28e9fdad492b9fbf6df3cffe90cebebfed8d42a9beaf19c3bcf854f9fd4bca9a5724a741cc321525ffaf8fcffb82fdfbb2aff98ffa256c1ad6d18d7239c788 SHA512 c5b83dd0dee2b4ee6c0889c97fdc95ba3230d83a98bca8f668c019e10d1c0c5413d94800800dcd9400e7404ac0aa879a7b00bcb42a1bff1d3beaec8b9a27b288
+EBUILD scons-3.1.1.ebuild 2629 BLAKE2B 9b6dd42a2a625ae6110b2ead2754e0c5d1d69128c32058913d102d545c820ef9e2ca25e2cdedc69a01a777633c32fd7aa3ec598e4d8760ec349ecb1ce9b1bae7 SHA512 309b84180a14cf7233f4879832489da56dad5236f30f9c402037b9dd2737b3983fda32c233e966ce755a75c3db6392f44a385dedeee8d21c3880f9cfb364cd57
+EBUILD scons-3.1.2.ebuild 2753 BLAKE2B 5f7115fbf7d3947bd90d1d147688110e13965bbcdcfd869eb7ac7222d942bd3fefc21f90d77bc0c9bfca58afc4ff593267635d8abed69cb0ad3fcc33ee62bd36 SHA512 2e479ac016b7dbb7f7a80652121f228621e9f85780cb0a3895b0a9b610fbcd376b7482897a993abe03ebddd176a66a83dbc2d5ad4e46a7b71f83e1c9cff39165
 MISC metadata.xml 704 BLAKE2B 448bfef70e4f230008c21d8e542618a52f9761295ed33f1c7385a2a678bcb29d1028792e221441f9ba61fecb34646f5ef0f04795e28b17e8d4aeacbabf8751f2 SHA512 62e5c8c23f1c67c218ff6b33c1f941ac3c258b39a5b2d799bedceb734aa5b2e29a718f90823ab5bf199e9d1eb8236aefaddcbff99c6d03f58987fb4936b10aa6
diff --git a/dev-util/scons/scons-3.1.1.ebuild b/dev-util/scons/scons-3.1.1.ebuild
index 3bfbf5c1bd43..dc4b2fd819f3 100644
--- a/dev-util/scons/scons-3.1.1.ebuild
+++ b/dev-util/scons/scons-3.1.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/scons/scons-3.1.2.ebuild b/dev-util/scons/scons-3.1.2.ebuild
index 8db241731daf..ef2605a2b114 100644
--- a/dev-util/scons/scons-3.1.2.ebuild
+++ b/dev-util/scons/scons-3.1.2.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-DISTUTILS_USE_SETUPTOOLS=no
+# False positive due to commented code in setup.py
+DISTUTILS_USE_SETUPTOOLS=manual
 PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
 PYTHON_REQ_USE="threads(+)"
 
@@ -21,7 +22,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/sgb/Manifest b/dev-util/sgb/Manifest
index d26879486406..e38da302ac25 100644
--- a/dev-util/sgb/Manifest
+++ b/dev-util/sgb/Manifest
@@ -1,5 +1,7 @@
 AUX sgb-20030623-destdir.patch 2315 BLAKE2B e902a3c7e0d9a3863f02443ef33840a7a318b1fd278d7226fd7e7812fe1ceb190829599a9b06e588ab1b05ac13bb2d829f667ad0b0556dc0fd5dea3be1643d2f SHA512 0e821be0bdeac661c229958a9227b315810f66ae420f10b720b2fe0a09f9a20510d97f47aa6cc69a9c79904925ac842771743d694bd82ca9621f4fc8f1b46f04
 AUX sgb-20030623-parallel-make-fix.patch 947 BLAKE2B 7996934e520cfbfd30c2e281786714ac4f728875df2635eb7e7c1e63a1edfcfd6eac4fc9289ef7fdbeeb71fed4691ac49ff562eb5f07c7530e596d158efc1969 SHA512 d86c32c5f0a1ec9e09a70bc8dc0581654986ada562bd37f77c3d28e16856f72f6d42eae23e1cffc35973b2701718ea1e03bd0addee61a94901efbb5af0bcbd50
 DIST sgb-2003-06-23.tar.gz 493974 BLAKE2B b4cf4e1fd9f2aba35937865d2c2075e206eabda9f56e7f5b844be8bd4684b2a220bb1d449f0b0ed431fd2603b92aaf0cfa0a7e88015e7870638b3d69cab7288f SHA512 f486317dd85dc11761c970ab2bc0c9193f8dd3fa0d114528e1b55fd935fa9cce9266dc595b2ebe3526214ce3e6a1b3dc747382b32cbfd518ffb6179d3463e874
-EBUILD sgb-20030623-r1.ebuild 1188 BLAKE2B 78ba27a6cbaf78e4415e707add21a5abb16c6498b1db3b3b4a45878283ed07942a4558af735fea4f7da6f828189d1a6a047824ccef4ab12976c88adda86dfc6d SHA512 2245110ae052994ec575b9c9e97e052b02c3b10081b8cae2351e74b015cb2bf0a4b7998299356f464da835736288f58388c8485644cdf78a9b93b2170dc4dcf8
+DIST sgb-2009-08-10.tar.gz 496678 BLAKE2B 48c780259fee240e9739166a52972c4f3a37dc44d98a503b1df63aecec553a05888e11a01b8cf40c8a853f7416ce3118109aa6ce5db15fbfed1abbee552735ce SHA512 39afaaaeda9b1e2b0ecd56d8d0fee59754ee9340c497c9bd28aa19f039be605aef6c492969082c230840ca1619de3cb81ba3a38d4d7b6fdac6f19b658d4c01e2
+EBUILD sgb-20030623-r1.ebuild 1190 BLAKE2B 405924bf3b1a94683615274604449c72e9d7e3559641910f40a9ead0327179fa316c68d9de705eb059aca49999bff59a867a1cf8f6676bd26ebc7ff8f8723312 SHA512 4ad9db2cb156d329ded337dc9df29a8397627a2cc8fea52b1ea1fff4d127315a3cfb82b9e9432405157f0e1feac1bbf1f177872d55d36746af89a1c8145f2f72
+EBUILD sgb-20090810.ebuild 1191 BLAKE2B ac8fb483b7092f6bbcc24370e73cce6a62f6872cdec5c5bb8a7aa074b01f45a5e481fe891e201fa84383c5dcaa5a15926c2269eaca55cbf3af0bdd5051f0f90f SHA512 232f33d3b031cb78eb269370620171b56b879b6812deb31e8faf8d26f08ce486be70e735f1dd8b2b4c3d0d8914a83f0fd6a4e90bb2b288b34b06b7549d4a9d29
 MISC metadata.xml 216 BLAKE2B 20531789dc11e43feee7ec315a0c1c7249fdf73764e29cb7d6db439826e9ff72f24a5cdb8eb7f1ab99bbb41fb6e4226874a1d1fa4185de52598602bb3b0479a3 SHA512 e881b59fe49746eb25ad66c258b41aba501e4eb563129093a3898ea970a20506e7898f7c355cfcf99605234962bf2c77c1309c258b9a2b84ee4302ccb71c9dbd
diff --git a/dev-util/sgb/sgb-20030623-r1.ebuild b/dev-util/sgb/sgb-20030623-r1.ebuild
index 65303742afc9..d89599421b58 100644
--- a/dev-util/sgb/sgb-20030623-r1.ebuild
+++ b/dev-util/sgb/sgb-20030623-r1.ebuild
@@ -4,8 +4,8 @@
 EAPI=7
 
 DESCRIPTION="Stanford GraphBase"
-HOMEPAGE="ftp://labrea.stanford.edu/pub/sgb/"
-SRC_URI="ftp://labrea.stanford.edu/pub/sgb/sgb-${PV:0:4}-${PV:4:2}-${PV:6:2}.tar.gz"
+HOMEPAGE="http://ftp.cs.stanford.edu/pub/sgb/"
+SRC_URI="http://ftp.cs.stanford.edu/pub/sgb/sgb-${PV:0:4}-${PV:4:2}-${PV:6:2}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-util/sgb/sgb-20090810.ebuild b/dev-util/sgb/sgb-20090810.ebuild
new file mode 100644
index 000000000000..4f6d61def77b
--- /dev/null
+++ b/dev-util/sgb/sgb-20090810.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Stanford GraphBase"
+HOMEPAGE="http://ftp.cs.stanford.edu/pub/sgb/"
+SRC_URI="http://ftp.cs.stanford.edu/pub/sgb/sgb-${PV:0:4}-${PV:4:2}-${PV:6:2}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="virtual/tex-base"
+
+S="${WORKDIR}"
+
+PATCHES=(
+	"${FILESDIR}"/sgb-20030623-parallel-make-fix.patch
+	"${FILESDIR}"/sgb-20030623-destdir.patch
+)
+
+src_compile() {
+	local vars=(
+		CFLAGS="${CFLAGS}"
+		SGBDIR=/usr/share/${PN}
+		INCLUDEDIR=/usr/include/sgb
+		LIBDIR=/usr/$(get_libdir)
+		BINDIR=/usr/bin
+		#CWEBINPUTS=/usr/share/${PN}/cweb
+		#LDFLAGS="${LDFLAGS}"
+	)
+	# bug #299028
+	emake -j1 "${vars[@]}" lib demos tests
+}
+
+src_test() {
+	emake tests
+}
+
+src_install() {
+	local vars=(
+		SGBDIR=/usr/share/${PN}
+		INCLUDEDIR=/usr/include/sgb
+		LIBDIR=/usr/$(get_libdir)
+		BINDIR=/usr/bin
+		CFLAGS="${CFLAGS}"
+		# TODO: why are they commented out above?
+		LDFLAGS="${LDFLAGS}"
+		CWEBINPUTS=/usr/share/${PN}/cweb
+	)
+	emake DESTDIR="${D}" "${vars[@]}" install
+
+	# we don't need no makefile
+	rm "${D}"/usr/include/sgb/Makefile || die
+
+	dodoc ERRATA README
+}
diff --git a/dev-util/shadowman/Manifest b/dev-util/shadowman/Manifest
index ef7a5ffbd7d2..383ca00bba5d 100644
--- a/dev-util/shadowman/Manifest
+++ b/dev-util/shadowman/Manifest
@@ -1,4 +1,4 @@
 DIST shadowman-2.tar.gz 3349 BLAKE2B 2881c0487205c00114967be7600ef5483cc64c7ad5ed5cac60fe8bf2ca17e5b06d5df6e39148d90ff68a51d3e918ca616d0c5eedf11366df90c788a07e4c63b0 SHA512 eeb10248c7f76116352bffa671ab7c761b2f79cb943de20dba327b0d7bf1126d15021508c9e9389b9f0c37cf5049ad2c67bad93f6a03340fcfd27e03c4969110
-EBUILD shadowman-2.ebuild 671 BLAKE2B 92a020d58726922e3508a99671f3dbd337a4ab3447a78d20f1fb46093dd4dac2c49803b0d238217896ab8b54948f2f2df935f6994f824c2ebc242048e7324c49 SHA512 fbde5a1c0c1965ab9c78cacf8e3ebb7921f91028fb5fe24f30974f56fd0283d57ef58f836f380cae2069df7007c19d0e26a175477e4101eace62e80942265710
+EBUILD shadowman-2.ebuild 669 BLAKE2B 6186d0cc0928bc9bd12b42df3b176801696da570969e98a4185d013260dd9c0b8a6f46ef1c1d7a4bdd9b3e3c271d6e3c5053d1a4fa73d8ba8caa9e767d7a47b4 SHA512 565f84f4486bfbcd740786a58326e1b72a81d743a89a1ac4b8deb9ad10a7ce849bf8bf1c461ecdfd1619494ceed21d138bd5eecb7139cd632eb8c3ee03ac43d2
 EBUILD shadowman-9999.ebuild 568 BLAKE2B 199779d69123dae88d3024a00370b24a898f40ce7aca43257e0dfd3a9747f5b969133cffce9aa70ff1fa0555a18442e4170829df7d27d397ea10b96136a76524 SHA512 4325db35429e59387690b10c09e86268e79e3a4a5e968075f36155fbcd5af7e0ec0a79b6a08b6e9e74ea5cad6727be0697abebcc63ba48c7449cd54141edd794
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/dev-util/shadowman/shadowman-2.ebuild b/dev-util/shadowman/shadowman-2.ebuild
index bf8c8c7596ac..9be96213f4c9 100644
--- a/dev-util/shadowman/shadowman-2.ebuild
+++ b/dev-util/shadowman/shadowman-2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/mgorny/shadowman/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 IUSE=""
 
 RDEPEND="app-admin/eselect"
diff --git a/dev-util/shards/Manifest b/dev-util/shards/Manifest
index 1eee70e140f1..4ef3d5a79632 100644
--- a/dev-util/shards/Manifest
+++ b/dev-util/shards/Manifest
@@ -1,3 +1,3 @@
 DIST shards-0.9.0.tar.gz 41280 BLAKE2B a74ab96489c804da3017dc683295d1fc16ba30248015af9deccdcf52a09301f665d4848822419d263d2301969c484fae288eff63e281bd4841b1fd101c5d5383 SHA512 a06579f1a96cea1fb1ba97c17ae4529439fb7c54572e74b4969921b1a987a1e1be9c9eb8569db94fd4cb4adc098b3085abfd2a6f7015da7f39611a1774d30022
 EBUILD shards-0.9.0.ebuild 515 BLAKE2B a16c770f6fe242ae766feb2965e55250817447d7374073a3114a4ec793ce18191bb3c994e22b1506485779042b960ca1228185ba6b3dcd4818231c728c4320c7 SHA512 1fdd2d1bb39cf2db2c203d87246e991bf0d1c638b8684f5463f398ad080e683db5db53c001c5edee368df3d61a3d5112257c82514323b95990e6808c670aeff5
-MISC metadata.xml 429 BLAKE2B 4c4fe0bb93f3fbcbdbdac215ed36c90a1c3706409f62e4d1d5398976bdb2bb15a178c050f616b908c2cfe87ca0b3b63697620c3ad3ba95e0f836048263ccaf41 SHA512 c5ef30550acdb2b7e8d3179e42db4f0c3c7b7ab6cc5475992c21b6b8c79ac7949cccc2070c278a04c13c62fac2e63c34a39d8c607809731567927ed306905e95
+MISC metadata.xml 334 BLAKE2B 9958fd270de05b67ac94b791633635bd62770ad0ebe44630e43c26933d2059d042bc00997a8b5b8983c0e839a8adaf238359a17285e4bf8321f082077baaabbc SHA512 8010e36b15550ce7e599e30f1716b3df9d17f464f01cad097e829f3ec97624578f9bb7e24f832e14c67b4cdd5c8d25c998282e39ea0341e81baff39c1bcae658
diff --git a/dev-util/shards/metadata.xml b/dev-util/shards/metadata.xml
index 43e1575986e2..cde3551f9733 100644
--- a/dev-util/shards/metadata.xml
+++ b/dev-util/shards/metadata.xml
@@ -5,9 +5,6 @@
 		<email>slyfox@gentoo.org</email>
 		<name>Sergei Trofimovich</name>
 	</maintainer>
-	<longdescription lang="en">
-		Dependency manager for the Crystal language
-	</longdescription>
 	<upstream>
 		<remote-id type="github">ysbaddaden/shards</remote-id>
 	</upstream>
diff --git a/dev-util/shellcheck-bin/Manifest b/dev-util/shellcheck-bin/Manifest
index 813228b8e5e0..cbc4377f9562 100644
--- a/dev-util/shellcheck-bin/Manifest
+++ b/dev-util/shellcheck-bin/Manifest
@@ -1,5 +1,9 @@
 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
 MISC metadata.xml 335 BLAKE2B 27d3776fb25d4bb46b5fd43808367969f22a099cbef7a8bf439907cb426c9d7c29c5f725a8f6e234d6af94ac6e87e52b2840b50e3846e98c78c97013b37be345 SHA512 1df280418c88152249cbb8bdd30e81026c21ef5d01e8b9eaf2e6aff9478e6a1d968c3e058950db6fdd6e7f1d8a838a225e103a1de5c72cfdb9ca8d698c4c85dd
diff --git a/dev-util/shellcheck-bin/shellcheck-bin-0.7.1.ebuild b/dev-util/shellcheck-bin/shellcheck-bin-0.7.1.ebuild
new file mode 100644
index 000000000000..22c176998666
--- /dev/null
+++ b/dev-util/shellcheck-bin/shellcheck-bin-0.7.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN=${PN/-bin/}
+BASE_URI="https://github.com/koalaman/${MY_PN}/releases/download/v${PV}/${MY_PN}-v${PV}.linux"
+
+DESCRIPTION="Shell script analysis tool (binary package)"
+HOMEPAGE="https://www.shellcheck.net/"
+SRC_URI="
+	amd64? ( "${BASE_URI}".x86_64.tar.xz  )
+	arm?   ( "${BASE_URI}".armv6hf.tar.xz )
+	arm64? ( "${BASE_URI}".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/Manifest b/dev-util/shellcheck/Manifest
index 171f92e6896f..bea9d444ef77 100644
--- a/dev-util/shellcheck/Manifest
+++ b/dev-util/shellcheck/Manifest
@@ -1,3 +1,5 @@
 DIST ShellCheck-0.7.0.tar.gz 163027 BLAKE2B 2d6348f21cb9598c0133cc1548f43727d56155883db83c38483b581b3565c67d5bf9d5333b6c39569dac1f07b19b21db1d62d83e675bb4aa9735725879aaf6e2 SHA512 88a0cb2a2879f597b832979fd934ee63e0f1ca256e5f9e7c51667744d09848817fdbe3988898f49226fc52ec27d92c314a9075995c3110ee10b24468cb60c657
+DIST ShellCheck-0.7.1.tar.gz 163288 BLAKE2B efc8c56348ba924baf660ae16d84e023cdd1a5ef8b355b492844ca41aeb3242eb1e5862bea7f12c69fa43cce285a44afaf95125816f62fbe316d9bdca467b1ae SHA512 fc84bd67e30af1378a92c1e378693a2c181e9567d53f2590e76aedb9f607276b90abd2ac83818c36524bd77a480df347af5a0879a925a846f35440ab207fad8a
 EBUILD shellcheck-0.7.0.ebuild 923 BLAKE2B ab287f52a821a175dc6cc29f4c746d0d0eaab0f65d2c747809623138a40045236f7572062784c59f63e106429f318ea7c671dd2b9664aa1d7fbc6b8391be26f5 SHA512 1b32a4bb38eb891c03fe36b95e271e33c3b35f22f1ed6a82352f733b85e9dcfeaee8750a54192f01ad9917cd940c5579d4a51ce9f8bb90e4f9695fa6bf8bdf0e
+EBUILD shellcheck-0.7.1.ebuild 849 BLAKE2B 2365d8fc4a090efeae8d407a4f9bcba47446276bcbfd3e3ec8cca544766651593b5d0ef7963f2f59e520393fe5027331fc0b9dc1679e61b755b208c320610b08 SHA512 b3e2ccb90f1405940aa7a373ba92de9d0329826ba5ed7f7b85c3ff0ec57b4ac1f50a1944fd14c6c5b32666df425c72470795833adec930f83f27905c6fa0d74b
 MISC metadata.xml 354 BLAKE2B 147d2403f29d6faf487627ed1bcc9b16cc02936a1afe0f25f7bab24071b7b0009960ec950c2bcbcc3738033c5e10f5d790f0b90a7e75d3f9242b694e1bb96cc7 SHA512 033d85c60d488513cec6cbd63c406ff12882909629acd2417e4d0b1e2046ff9aebda7dcca7b95ee144deb3d876ccc422211cc31eb259f306deb35938b56183af
diff --git a/dev-util/shellcheck/shellcheck-0.7.1.ebuild b/dev-util/shellcheck/shellcheck-0.7.1.ebuild
new file mode 100644
index 000000000000..357bb0ecd576
--- /dev/null
+++ b/dev-util/shellcheck/shellcheck-0.7.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+MY_PN="ShellCheck"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Shell script analysis tool"
+HOMEPAGE="https://www.shellcheck.net/"
+SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/aeson:=[profile?]
+	>=dev-haskell/diff-0.2.0:=[profile?]
+	>=dev-haskell/mtl-2.2.1:=[profile?]
+	>=dev-haskell/parsec-3.0:=[profile?]
+	>=dev-haskell/quickcheck-2.7.4:2=[template-haskell,profile?]
+	dev-haskell/regex-tdfa:=[profile?]
+	>=dev-lang/ghc-8.0.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.24.0.0
+"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-util/shflags/Manifest b/dev-util/shflags/Manifest
index 98bffcd78223..fd43a69687ee 100644
--- a/dev-util/shflags/Manifest
+++ b/dev-util/shflags/Manifest
@@ -1,5 +1,5 @@
 DIST shflags-1.0.3.tgz 43549 BLAKE2B 2f5376dc9589eb63133857dd48fde5bd9aae48b31d1f94a97c1d9d3f505d48ee1586a2e6a6f7b44ae85be26b4e7643beee2cdc47a5f3c3ff1a69379f174d98eb SHA512 993f5b274855d5dea5d01d3a799cfd5ff6c5ff2bf153461983052a78d8a96f9b0ee44124b4c51977baa4905c86a3293778c5d7e154305ee051fcac03f6fe70cc
 DIST shflags-1.2.3.tgz 42253 BLAKE2B 4837d31762129790659b67d4025cf8627ca5db32225ac61b437a5ba6bf9f894c87976d06dd5e5039a5ad4b7a0b7b173cc7f96fc3a11dc3c2ac797de2c749a8ed SHA512 5bddebce14e516fe37b2b1631d5aec54651ee728e538dfb0fcc68d32b79d335c7b48f5ef5aab99dd730de3b8fd556a6640db9b9ae2a7753feb6aa1e0831b64af
-EBUILD shflags-1.0.3.ebuild 629 BLAKE2B 917f26c92180700c4225457043a5eb751fc679ead4e3bd12b33d8546a452c63ec9fecc5af6b91223076394a41da82954bed4f552337aafe5fe85407649f8ea22 SHA512 117f667dff783a051b65ddb5df6fff05c1fc3f0a5fa1b1df40b56e51287a2ff17eea696cba5768c6af5f5407a9a855022fc5266710e6ecbc09f38c69e4539fd8
-EBUILD shflags-1.2.3.ebuild 597 BLAKE2B cc2407aca276508f5002671fe37e923797145857afb80051494ee72314e032257a6a5ae3e738873f9e4e5235c65447eb027fb8e79879b83595e9fab2006281fd SHA512 bfd4133012e6228857f353d06024abbb288e102a7e393600e033e74fd446f0f93c56962bc110849695f06e52302c554a4913a40d46582b238700b3cd9e32dabd
+EBUILD shflags-1.0.3.ebuild 627 BLAKE2B bbe32c7ed1de43a9dcec06a4c31e00e02bf125b818850a26a7a45fe535e6a4b9ab8b8a45d2d7f4365c170a0a24e0a2460532a9cf4ca965df187d877dd7023247 SHA512 3d214bafb7f3cd0a7044c5adccf5ceb9948f09fb4902733766ef931c45112f133cbb231f2c4a1856fcf745e97020abf7c0f75bcdbbf9d3933140c00944733ea7
+EBUILD shflags-1.2.3.ebuild 590 BLAKE2B ab37d5047c85376d77709d2cb568a68d9f57ccd81872b6f936683f16e3d66e3a55638bb9f23fe68b94046b2891069a40f695bab330d8f3cedefcee4936638829 SHA512 522e0f6c15229c8dece104b25fba25bb7fde8eb55cfd00e335e4fff0a9228265b4817565eb257dffba80229f4c0b2edba87b2e84842a31c7289931c3c3d41ba3
 MISC metadata.xml 395 BLAKE2B 771aa58612fb4b5b7502bb3ce0b98eeea7449b3c56fe57b2de23cddec6c4041dea7d4f61cbf29f95bdfbd87c4b1bbb24eba62b255b7b4c7e05ff7710112e7dce SHA512 d5cec821871007bded7b69b96c3a36ff84b5756c97dc21d8e18af460e6218d176f019771843b9bb3e8cd940226c8d121057a3dcc1345bec0771ed301dac9bcc6
diff --git a/dev-util/shflags/shflags-1.0.3.ebuild b/dev-util/shflags/shflags-1.0.3.ebuild
index 5a221149248c..99a387806250 100644
--- a/dev-util/shflags/shflags-1.0.3.ebuild
+++ b/dev-util/shflags/shflags-1.0.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/kward/shflags/archive/${PV}.tar.gz -> ${P}.tgz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86"
 IUSE="examples"
 
 src_test() {
diff --git a/dev-util/shflags/shflags-1.2.3.ebuild b/dev-util/shflags/shflags-1.2.3.ebuild
index 0466a6600bd6..1a8dfb65407f 100644
--- a/dev-util/shflags/shflags-1.2.3.ebuild
+++ b/dev-util/shflags/shflags-1.2.3.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,7 +9,7 @@ SRC_URI="https://github.com/kward/shflags/archive/v${PV}.tar.gz -> ${P}.tgz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="examples"
 
 src_test() {
diff --git a/dev-util/shtool/Manifest b/dev-util/shtool/Manifest
index 3e637a378b62..de2c41240c4f 100644
--- a/dev-util/shtool/Manifest
+++ b/dev-util/shtool/Manifest
@@ -1,3 +1,3 @@
 DIST shtool-2.0.8.tar.gz 97033 BLAKE2B 05096c0cf4a20ea86a77db59b4d4e0f8431d1cc331c3dbaeac089dc7fcf89cb1ad391b731dab8d31bf010dfe9129a2710f71657600953464b59e0062eb7a7254 SHA512 f0c9292e8d980323d587b70e582574ba1cfe3c26296a01d51a2068a7886e5b1f501e8c5dc37b5d4b0f7a34217c7ad7f6f3011969d9c2d65776fe66e8287c1758
-EBUILD shtool-2.0.8-r1.ebuild 489 BLAKE2B 75e6519fad931863b02ebef7fdc9867bd7f749bf896da6082ba0dc9ee4fedf1246c53710dd407f5740ce24cb934aa80d0425afe051aa1c47a948277073c21860 SHA512 eb7f52b0354c46ee20c25c4095a37a70405b6540749c56bb089f10d6237b435e186e468b51b316fe5106d4cbcb98f7992545f2c2b625c279e13c72ac433b75b6
+EBUILD shtool-2.0.8-r1.ebuild 487 BLAKE2B ebdc9879b9d173288ff2a96670b4eedb8f3fddbc5da57ec20fb0c182aab80d2145a00a787b28814db8a5a565868640d253766b1b9e1b18fa2835fbbbfb8160f1 SHA512 68e3fc58fef27446f31e6f9315ef9035c3952e61f64ca1ecf496fdb33cb49d536a6519dba75b82a7bb868357bb8c75abd6f644dd32aa8542ece4af1fc0d0a5a2
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/shtool/shtool-2.0.8-r1.ebuild b/dev-util/shtool/shtool-2.0.8-r1.ebuild
index 40b05d376466..fc1deae5b6e4 100644
--- a/dev-util/shtool/shtool-2.0.8-r1.ebuild
+++ b/dev-util/shtool/shtool-2.0.8-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm hppa ia64 ppc s390 sh sparc x86"
+KEYWORDS="amd64 arm hppa ~ia64 ppc s390 sparc x86"
 IUSE=""
 
 DEPEND="dev-lang/perl"
diff --git a/dev-util/source-highlight/Manifest b/dev-util/source-highlight/Manifest
index c98f60ad9387..e68eb60ae373 100644
--- a/dev-util/source-highlight/Manifest
+++ b/dev-util/source-highlight/Manifest
@@ -1,7 +1,5 @@
-AUX source-highlight-3.1.8-no-black.patch 416 BLAKE2B d53c85b52a04118b613f7683e0506a0f7440c7a0d98f8b8a632ae30da3e0a62e763d51c7341ff3f78a65a02a04b9c0d25909aed847cdd864f4da46876c36e3da SHA512 c65c7f20f5185635153ee111e0b2fd7762065dd00a1773f1a519a449de2355d7255bfb9fda805ec863331ed9df309694fb978a109a479e1c92c7c8dd612945eb
 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-r1.ebuild 1459 BLAKE2B 1a8f1eacb92863f5d25667d96e803217c63a82e69bab13641efbc7568be810ba65a39cd7f3fee9864704e4f91aa9fd0eda376e0715e9963ea527d317297aad25 SHA512 c886f2e4534bd2919a1035c9730fcbbbab9a7e89653e8fc4c0c0169730679c4772c1c7eda4e01fac023b96a4219dba2a954b7d4075008cafeb025d6fb2772acb
-EBUILD source-highlight-3.1.8.ebuild 1392 BLAKE2B caf1b8fffe4c3ce40210b0fa67285d6e186418aed1f67c240b01285aaf7e5ff9232b350d09cf6cfc133d4a1cb96d2490b9112495dec3a40293d7d9e31b6c7a87 SHA512 88e722718d401fcbd8ac95803e456a07c4dac43b3d93391f71737bb27d3c756112f4d29e2465a7aa5331253a48ca169efbe45492dc1a62e755a442405335008b
-EBUILD source-highlight-3.1.9.ebuild 1410 BLAKE2B c2fc8630b265d5dfe6915aa8dfc5f150e842d4dd2f463dd1665117e64b8104f8a92cd6d049571031c4e84c0c26fefe37362bd3fd1df613336d20078c42863b85 SHA512 d2c3d7fd62de05477bb34b25738ab633dfd04c993fe3e4f2b4c8f8d62c4c134c23fae30e4b8e2571eaf0bebbe8064850e58472ed37dc6f683d9903ff8ce7b996
+EBUILD source-highlight-3.1.8.ebuild 1389 BLAKE2B 57af29c1e8206f9851eeb8c9c3bc4a38bde9e8d7584afac23de65e757c3d5f02b5e37b58488cddb9082e0c2ffdb7c074b510ace4ab1104557852a05b1d9950dd SHA512 f01ae5c89cec2611909a5fd60c0a63520d840b3c6d48ad6a358e45e96cb93528392e0ce496e70d6e13e8da1c56adca0d35053e4d9d8f241a62a19e2472ddffc2
+EBUILD source-highlight-3.1.9.ebuild 1406 BLAKE2B 11d538bd779af48b3ee317b266f5dc88a99adaa3d956a5360388d897427e0ed46e377152b63a17345c00ad09148b3bbd79adb31b8d8fee775aa8f6417fd8c5fd SHA512 0f15dece013549a5a1d179465e237de7d85e1af516fdd4d2833e2a21d1131cb7346b3f069df2edaf035640590a2529342f5f57455e773e6108b7c331a5a4943d
 MISC metadata.xml 267 BLAKE2B 5267526ad53ec7bedfe46f8cba86c810629394fa4f3c59e1b69619b0a11a9edbb746ae6abf818182da7ade72c862360f43a19209007a23da9701df26b96f77dd SHA512 715bb37d958c1e508b2ef00711ab3a4abee982efe90867fd2bcf91fa91305d5a413a4f3d13d01ea6e27eb15f5f9dcb58fa13ecfed7025cae43745792ac1a105d
diff --git a/dev-util/source-highlight/files/source-highlight-3.1.8-no-black.patch b/dev-util/source-highlight/files/source-highlight-3.1.8-no-black.patch
deleted file mode 100644
index b673c2f79221..000000000000
--- a/dev-util/source-highlight/files/source-highlight-3.1.8-no-black.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up source-highlight-3.1.8/src/esc.style.no-black source-highlight-3.1.8/src/esc.style
---- source-highlight-3.1.8/src/esc.style.no-black	2019-03-20 16:52:33.053965325 +0000
-+++ source-highlight-3.1.8/src/esc.style	2019-03-20 16:52:42.502965289 +0000
-@@ -7,7 +7,7 @@ comment cyan i ;
- number purple ;
- preproc darkblue b ;
- symbol darkred ;
--function black b;
-+function b;
- cbracket red;
- variable darkgreen ;
- 
diff --git a/dev-util/source-highlight/source-highlight-3.1.8-r1.ebuild b/dev-util/source-highlight/source-highlight-3.1.8-r1.ebuild
deleted file mode 100644
index 07810a270d15..000000000000
--- a/dev-util/source-highlight/source-highlight-3.1.8-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=7
-
-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 ~sh ~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}"
-BDEPEND=""
-
-PATCHES=(
-	"${FILESDIR}/${P}-no-black.patch"
-	)
-
-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.8.ebuild b/dev-util/source-highlight/source-highlight-3.1.8.ebuild
index e5797d752689..9d9fa220ae3e 100644
--- a/dev-util/source-highlight/source-highlight-3.1.8.ebuild
+++ b/dev-util/source-highlight/source-highlight-3.1.8.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 ~sh 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/source-highlight/source-highlight-3.1.9.ebuild b/dev-util/source-highlight/source-highlight-3.1.9.ebuild
index 516b2b2f1103..79dc0516a190 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 ~sh ~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 f93186e8c909..a3cb0c8f3298 100644
--- a/dev-util/spirv-headers/Manifest
+++ b/dev-util/spirv-headers/Manifest
@@ -1,4 +1,4 @@
 DIST spirv-headers-1.5.1.tar.gz 369998 BLAKE2B 7ad91a93d2704baeff9d8dd32c67f4a7d428bc174122a37e1a405865ca8f1d9dfbf6b1d096092f8b2e83610679ddb8d311fb7823411548976c9fef3929449df4 SHA512 6ed09d1b825ad921bb988f260a236c82e9755ca3904a2ac130cf82d876a0de087d8d5f6eba01e923fe565c93a8e3eb46346bba21c64a664598a43063e5e5108c
 EBUILD spirv-headers-1.5.1.ebuild 500 BLAKE2B 1d85e8c9679beffe2e4904517102f42cd644ebe3e59c3da617479504e81c34ce9cd727d6ba6e8a37a98332363452dff05fa75bf20c990bfa758c7f613b03521d SHA512 adce00704dfab422276017250f418417ecd9076b4cd7c56906009bebe646e708879a121e1f8b08dc3b2db904f138fd05ca7db7bc32a9c4fab7485ed7db500db0
-EBUILD spirv-headers-9999.ebuild 355 BLAKE2B 087edb2619bceba7e57db82dac834c8d04c2718e81c2fdb56a501f64b21329e66b4e73928b56f21cf705c1abe8627db4b757bee5e6da9faf7998935acf3c84d1 SHA512 b92a326f90e77d1da661f0107c9b5acec51bc14553dc8a8512c6b44345231db97765a40c0b41002952788e1691a8280b5fc898f3d0fe718375522fc182b8abb6
+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-9999.ebuild b/dev-util/spirv-headers/spirv-headers-9999.ebuild
index 7a7e30be5d45..7da32106bb4b 100644
--- a/dev-util/spirv-headers/spirv-headers-9999.ebuild
+++ b/dev-util/spirv-headers/spirv-headers-9999.ebuild
@@ -1,14 +1,22 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake-utils git-r3
+MY_PN=SPIRV-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="Machine-readable files for the SPIR-V Registry"
-HOMEPAGE="https://www.khronos.org/registry/spir-v/"
-EGIT_REPO_URI="https://github.com/KhronosGroup/SPIRV-Headers.git"
-SRC_URI=""
+HOMEPAGE="https://www.khronos.org/registry/spir-v/ https://github.com/KhronosGroup/SPIRV-Headers"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-util/spirv-llvm-translator/Manifest b/dev-util/spirv-llvm-translator/Manifest
index 07f1add00fe8..d80caa73f02f 100644
--- a/dev-util/spirv-llvm-translator/Manifest
+++ b/dev-util/spirv-llvm-translator/Manifest
@@ -1,6 +1,10 @@
 AUX spirv-llvm-translator-8.0.0.1-no_pkgconfig_files.patch 533 BLAKE2B 4d0d1b4c605681b2dbfc4c52730c9f20f8290f11a2be9c37db78e533a996c22140faafc2691c732b49b9de28a59644bd5e39a2b7d4209eb44486cdeee1338de8 SHA512 db4786a10e4380f4575d52cf861a82d0aa9f69cec7d47d574f453d159396e993527ba4e469fab75fabc36b977ee4b61abb9e3787ee2af45af8f5865b3b06e10c
 DIST spirv-llvm-translator-8.0.1.2.tar.gz 461803 BLAKE2B 58814d88bfa555f0deab8d072ecd0b54c1ee22c4f6464a9988d18dad2c99d25a5ed49e506644d01455fb92f476536148e0e0cce2eaca22b4b1c88220724f8d40 SHA512 954d4600f680d3325d4f7ea80551f814f2cee486254227609fc0354c1b112d4dea387736d601750587369a7c4f1c2a528a19f8a969df433649731efdd5ba4c23
+DIST spirv-llvm-translator-8.0.1.3.tar.gz 472853 BLAKE2B 3f00aabd46dd43840b8a16f6a9a061e00385bae6d4e608ad1d2e59f943bfca747e1ce6b2f48eee7e124bc3ac47f5895274d9cf7bb587eba7133152b9658f5e9e SHA512 c10a426d83276718b116d664fd32c8457d87e336e7c99b64d323ea9a08330d206dc94e52ce8e7395bcb8ee2ddff49184b5c7810e4848d624396d0574ce48256d
 DIST spirv-llvm-translator-9.0.0.1.tar.gz 491089 BLAKE2B ebdab77316608c4a4a48e778abc749ac347d0ee4441c8cb152b303e99cf5c16bd4f883dad519f5d4a96b6d05975a56e8d2fa5b6fa403dedc163cc3611b905d13 SHA512 ad0e9a49440f8dc0a9c973c74245640c8392c8ae85431eb5e0ca6ea98e603cb6fcbfcaa8fa3d455df2f53537c7f61915a557f12744c39a9c9f9e1c400ddd74ad
+DIST spirv-llvm-translator-9.0.1.1.tar.gz 498803 BLAKE2B dbc1a3a51671102e13ac265c5de744ec7ddbb74ff1a58971e18bfd7cbc7a0497cbb86d099681ac153d8e104577c93b66eec597b6c646d422eb701ea7c96a57c9 SHA512 a84494c49cc16148301cc468fdc20b9ef41a4532477b69468e32551d2132a9be68346369d5f4c07cbefd7f0f63b3e7ddf11e5c40088f74d8e3379a95c3cff251
 EBUILD spirv-llvm-translator-8.0.1.2-r1.ebuild 1296 BLAKE2B 90b984d769ffc6ffb5df8d36670511872a628b1106637bc8a4c10b32f25d67e7fb3f3e7f7ca4cbecadb8aea1de3243436370ea92d79bad4031e52bdb3d1a573a SHA512 a63e034215979d0e5381c236237febe34749d1d9b8fede39d32efc70c4b994f56166b166eb5f6f6b3d78abaca744d2503472a515a6e1769a99863957d63c31ba
+EBUILD spirv-llvm-translator-8.0.1.3.ebuild 1296 BLAKE2B 5781e9ac79de0decfc51a8793afd6d61a7db44dfe042bcc815abd73685c9a44d5fe90d0779c6dc8382bd9b7ae38cd45f93a2bfa8a4f1042976332cd7c9a5a017 SHA512 ed909c3a70e5e6a91c415c5694abbed36b8420fac78034d813edc1636a3f3c5cb3a5e6f95df625016dca00f6d7af87625c351fbf4368c6d57f49e165d38eb9cb
 EBUILD spirv-llvm-translator-9.0.0.1.ebuild 1291 BLAKE2B 22fd214fa80e3331da17994058a0861b5f0a3f3d12b558cba329e6e8d3cd34020bd2d5f489ea89e2916e73aca2a45446cb3c36aba203b5fa3425984a486b140f SHA512 9a7e64db4abbae7d694c17935707fa5a1a79ecd0c454e12f35dfab369bc0d5158118c010629dd4b2fc8ea418c2ed8d0342bcbb0903328b394e6d8354b6c4f30c
+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
new file mode 100644
index 000000000000..53f2d92817b2
--- /dev/null
+++ b/dev-util/spirv-llvm-translator/spirv-llvm-translator-8.0.1.3.ebuild
@@ -0,0 +1,57 @@
+# 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-llvm-translator/spirv-llvm-translator-9.0.1.1.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-9.0.1.1.ebuild
new file mode 100644
index 000000000000..4feef376c920
--- /dev/null
+++ b/dev-util/spirv-llvm-translator/spirv-llvm-translator-9.0.1.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib flag-o-matic llvm
+
+MY_PN="SPIRV-LLVM-Translator"
+MY_PV="$(ver_rs 3 -)"
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="Bi-directional translator between SPIR-V and LLVM IR"
+HOMEPAGE="https://github.com/KhronosGroup/SPIRV-LLVM-Translator"
+SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="UoI-NCSA"
+SLOT="9"
+KEYWORDS="~amd64"
+IUSE="test tools"
+
+RESTRICT="!test? ( test )"
+
+S="${WORKDIR}/${MY_P}"
+
+COMMON="sys-devel/clang:9=[${MULTILIB_USEDEP}]"
+DEPEND="${COMMON}"
+RDEPEND="${COMMON}"
+BDEPEND="test? ( dev-python/lit )"
+
+REQUIRED_USE="test? ( tools )"
+
+LLVM_MAX_SLOT=9
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-8.0.0.1-no_pkgconfig_files.patch
+)
+
+src_prepare() {
+	append-flags -fPIC
+	cmake_src_prepare
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix ${LLVM_MAX_SLOT})"
+		-DLLVM_BUILD_TOOLS=$(usex tools "ON" "OFF")
+		$(usex test "-DLLVM_INCLUDE_TESTS=ON" "")
+	)
+	cmake_src_configure
+}
+
+multilib_src_test() {
+	# Some tests fail on amd64 when ABI==x86
+	if multilib_is_native_abi; then
+		lit "${BUILD_DIR}/test" || die "Error running tests for ABI ${ABI}"
+	fi
+}
diff --git a/dev-util/spirv-tools/Manifest b/dev-util/spirv-tools/Manifest
index c7ceb897a3b6..4fc0d4c3097e 100644
--- a/dev-util/spirv-tools/Manifest
+++ b/dev-util/spirv-tools/Manifest
@@ -1,5 +1,7 @@
 AUX spirv-tools-2019.10_pre20191027-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-files.patch 711 BLAKE2B faed59dc76f9320972bdc7966c757df76a1353ccefe9f6dacbf473a8f576eb222d0b4ceaa97a641b41c6c520a6a21149956aeab88b840124caaac08b7a27d66e SHA512 b12004d2e5d6b058549c4e12abcea531e4b8113beabc2264161197b247209168affa0aae529f5ac122b3aa7ece6f4000d877bd5fa4a230f44cb6e9a08ea22661
 DIST spirv-tools-2019.10_pre20191027.tar.gz 1848978 BLAKE2B 174482c7186569878ec6f3409a68a3e11013b12798ffbbfb94c66ae6cd338a3375330908cfebf0cd3c67901bf9c2459c6e586cf95bbf4fee399504aa9958da66 SHA512 d26480b6c70acbdf63e36fb5ed11ce422b976d48ef85e2be263c3897a4d5181c31fb94c087fa7b20f84446f0059c3bb7eac872a6d1b15a599fdeb2a7924232e4
+DIST spirv-tools-2020.1.tar.gz 2053947 BLAKE2B d9e641407e871cda5680e9ddac6af5213848b03ef9d13b9fe1acffcea12e9e40b43a834f9e0ae269f43dfffdc19bfaeca502b69ff69d59b95f6810f89b6bd276 SHA512 edd434e06cba44c402900684b8fea16c394f80951ff993b3962617a21630d2d8ff9be9a5203bc8eb9b402e9cafe8c68f13099cbc1eaf66a546df08cb43668c46
 EBUILD spirv-tools-2019.10_pre20191027-r1.ebuild 1259 BLAKE2B a40c8c9229746472df5430fc1fad85e91fb91e450f0bbd3ce41b1c23eccd5e401de34ab0eb1227b0be3b63a99f9b58ed52d20e1936f817bcb889e94b2b4ac5a3 SHA512 824f6826eecc640d26b2c58adc26605a8003f695b3cae33efa130d3fdddc46a958011a4d4ef125b69ac2d0d514cb491c263a29ff9785f76a2bdab465c73e9445
-EBUILD spirv-tools-9999.ebuild 1098 BLAKE2B 3c609f34d268c8f31b10757825c002c4aa35ee97446ae8b83a603b08b29c425ae4604ab916173beb3afaca464621c75edc24013a55964b2b6c36a2e50ef447d0 SHA512 75b5ec8960a1e056757f574a3a676ac725f5fba39c74ed05e6e985f1aeeb4aacdc32bbc64bb3777cc279f76353f0876269fa4904094570e7c339f8fe8cec5200
+EBUILD spirv-tools-2020.1.ebuild 1076 BLAKE2B 9501147d40883ba2aab5a8f484281bed99dc9536ae9963b8077e3eef1aff41f9b29847b1e8de75ec93d25759093dca19942ab3fc7cdf2176bd2cd672eb4542fe SHA512 806dbf63f4a564b1d5dda351e1eea834c1d2c154f5fa95eaf6a0bb37fbb76225591e84662e4083b4f129cb4cebd27734029fc5646c17576fee01ece1f3012745
+EBUILD spirv-tools-9999.ebuild 1076 BLAKE2B 9501147d40883ba2aab5a8f484281bed99dc9536ae9963b8077e3eef1aff41f9b29847b1e8de75ec93d25759093dca19942ab3fc7cdf2176bd2cd672eb4542fe SHA512 806dbf63f4a564b1d5dda351e1eea834c1d2c154f5fa95eaf6a0bb37fbb76225591e84662e4083b4f129cb4cebd27734029fc5646c17576fee01ece1f3012745
 MISC metadata.xml 429 BLAKE2B 84129eb27ea4a745c90ed7eab09723b41b45a696375c41458c45a6163dc00cd15d208d6858ea4fd92280e3ff3bb385f340ec3684c980a97ea5fd46fdc4c24001 SHA512 13b340b0e43ba726370f3b013759adab727fc37e251ec5777d10541976843e3e575be23ee015af83dd2e98a1917f4d2511467a38afd064cef025ab4700f005a6
diff --git a/dev-util/spirv-tools/spirv-tools-2020.1.ebuild b/dev-util/spirv-tools/spirv-tools-2020.1.ebuild
new file mode 100644
index 000000000000..3c8fb137c2e3
--- /dev/null
+++ b/dev-util/spirv-tools/spirv-tools-2020.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN=SPIRV-Tools
+CMAKE_ECLASS="cmake"
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit cmake-multilib python-any-r1
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
+	inherit git-r3
+else
+	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="Provides an API and commands for processing SPIR-V modules"
+HOMEPAGE="https://github.com/KhronosGroup/SPIRV-Tools"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+# Tests fail upon finding symbols that do not match a regular expression
+# in the generated library. Easily hit with non-standard compiler flags
+RESTRICT="test"
+COMMON_DEPEND=">=dev-util/spirv-headers-1.5.1"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND=""
+BDEPEND="${PYTHON_DEPS}
+	${COMMON_DEPEND}"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		"-DSPIRV-Headers_SOURCE_DIR=/usr/"
+		"-DSPIRV_WERROR=OFF"
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-util/spirv-tools/spirv-tools-9999.ebuild b/dev-util/spirv-tools/spirv-tools-9999.ebuild
index 0d2943714b8e..3c8fb137c2e3 100644
--- a/dev-util/spirv-tools/spirv-tools-9999.ebuild
+++ b/dev-util/spirv-tools/spirv-tools-9999.ebuild
@@ -2,14 +2,23 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
 
-inherit cmake-multilib cmake-utils git-r3 python-any-r1
+MY_PN=SPIRV-Tools
+CMAKE_ECLASS="cmake"
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit cmake-multilib python-any-r1
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
+	inherit git-r3
+else
+	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="Provides an API and commands for processing SPIR-V modules"
 HOMEPAGE="https://github.com/KhronosGroup/SPIRV-Tools"
-EGIT_REPO_URI="https://github.com/KhronosGroup/SPIRV-Tools.git"
-SRC_URI=""
 
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -28,13 +37,5 @@ multilib_src_configure() {
 		"-DSPIRV_WERROR=OFF"
 	)
 
-	cmake-utils_src_configure
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
-
-	# create a header file with the commit hash of the current revision
-	# vulkan-tools needs this to build
-	echo "${EGIT_VERSION}" > "${D}/usr/include/${PN}/${PN}-commit.h" || die
+	cmake_src_configure
 }
diff --git a/dev-util/strace/Manifest b/dev-util/strace/Manifest
index 65617a645d1d..8f1f58f7153f 100644
--- a/dev-util/strace/Manifest
+++ b/dev-util/strace/Manifest
@@ -1,11 +1,12 @@
 AUX strace-5.4-fix-LTO-CFLAGS-handling.patch 843 BLAKE2B 2cd4c87e972b2bfe6d5755141a64ffbca386047ea68d37c8871bc37e7475f8eb3ce978ead5082ecb3099f599e12914f087773733a7440875a084a5b452b1f92c SHA512 9606c3334d3e01aecccafaa396b5a7440a652872c590ced3c1a88ca6ef083c176a420dfb2154396f94f65b826d6fe2f20556620f364c17d01d0069d630dc5cfe
-DIST strace-4.26.tar.xz 1444216 BLAKE2B ea8ff5f863afa29a3a40e8d89ff5c3835c64adf7c34c8957bbe3d99a02998d61714437470293d1759e87c1ceb8ed42564632ef33dd9d5303452ec7505822d1ba SHA512 cce153246802fcdb1547bc11164784066101a2e672e2a264cb742593b559e579aa4bedc749d87fdd1fc2045f4f79b54d419bb50c823074d2cca6f3c75ccf2290
+AUX strace-5.5-static.patch 5187 BLAKE2B 9015d649d644dd4e5fe6b89d7fd4b1d759b7021627384f575e6668fa24841438c49e3acd8d09f0302374fc457001df89a9f384193ddde1da105a5b95167f944a SHA512 a1adbbcc7bc87f37b1071b888f1b2c830113cfd40c341316d7e96e72e142781f41d1b8823277ea0c61079e557460e9a43d1795e7c8cc97cbca9c6aec8d08f682
 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.5.tar.xz 1628744 BLAKE2B ae2ab9b2c756858c3c23640ee19821b8720da84a5e15e4a674768d8f4b51d74b2b490cfa18a862bc3c9d129baeaf09212700bea98ac151db035d03a05afa055d SHA512 317fe6341000b452cf038433c2a9a7bcdc8ce736e97b242673ce066dd9dbd3b2c3435a014b529429fdf2ac8af5c3a72d62971b293d007b7d3efcbb684c216231
-EBUILD strace-4.26.ebuild 2289 BLAKE2B 1f36b21a81263f041d5ab21c84f59f966f0208963737fcfa0bce5456fb03def58140fbdf5d64112f64f5b09217157be0b5cc5d170f075fe11c369fecbd965440 SHA512 3db5e30a7be40e3843669440808ece54d4af0119afe4e9153838419d836e167177c8675c793689ee96c15f809151894e0dfac9fd91b44f503243dc31aeb48f46
-EBUILD strace-5.3.ebuild 2326 BLAKE2B aa1914d8379ed519685b8b779c62e52c2e260fd409163eb7c774d9858f2be592298ce7990d146851aa3fd2082d34499afad6d2d960eee473200c6bc32bfa3dcb SHA512 c25c7cf8caed9df280f1c2a29258d8c983d6e034bf4fb3e8d55c30f312f72e76b6151663b8991c4cb949eee17e809f37aacd65c56da406f4dc40cf5f534db398
-EBUILD strace-5.4.ebuild 2528 BLAKE2B ea885a47f547887f21633fa50c1834800749df4f822d22c36d2b71a17d7410ab2e3e446699af6e9eb9d436ed6580fa89019a2934f3c6e68432e5732bc850bf1f SHA512 cfed508fcfa5dff270c8d038a8dfeaf10d60ad366d7fee0854bd294b7a06d2411fa2a56965b8f4734d14d5571e391f32fadae25ba40a9e8c8c96a6a991e32b3b
-EBUILD strace-5.5.ebuild 2466 BLAKE2B 922a3bf95b7f03617a52e05074cf472b23c374a18f6a21ad5fcf605119e87532ced47313ebef81bf780a71358974e530927358d1527da01c7eb7932a6db4565e SHA512 8ccbdb58e8eb72772fd2c53a9ecabc089735b0462b2c0632387b40a42d260bc0f5e8304bd137e45c2be320a5bb8cc8b29557dcd979a3930449fcf3aa14e5f163
-EBUILD strace-9999.ebuild 2336 BLAKE2B 476de457dfad9302e5e62b76aae7ecb463074b81f265aaaca03b990241a6d8773b20418ed9aaf00476adea083c2ba7418cf4ce9a9f8ab284a5c393e8f3a6bb6d SHA512 05db005186222d939bd1692b992aa43d74f138458c05d11af5ab8840ebf785f1400e0d59b713e37421d3124306bf47a7d2cf3f783a72d91c7688d9cb6b325f2b
+DIST strace-5.6.tar.xz 1775292 BLAKE2B 6e674e4a1b70a3ebb28aa0097baa07efc7dce18039a3a7d535b4c8b3fc1b11c59ef1eb79e58bbf4b9e2b9621d0840958ba5785d22d0cdcb4c00fb5fa2a3288c1 SHA512 58c8a250e55a018206bee9468ea057c087d5d5bb523339ea3c01e0a19d8f84c95bd1398d66a6dca6ada45c6535aa44b776713a2bb080eebaa734ffb926ac5b38
+EBUILD strace-5.3.ebuild 2323 BLAKE2B 02812e696ba9c1f24bb8ea9b7cb21ce1ec6afc9bd5dedb2d70c3bc9b88c4523745333070be4d2a0c9297533a636964efd02b1d1ae33ed025251d18074081d114 SHA512 8c2b4b7e6a9119d226117f72209ec360365615670092370faa22fa605f0afd583749f008146eb59afafefaaab9f634b512c0893e0d10b896e7bd6221e51a7f58
+EBUILD strace-5.4.ebuild 2524 BLAKE2B 3a21233c29527856cbe1723407ddac3525b57efe6fa3bf379b6ba4d902d5dfe607049a5a9264f91f947ab2678cd36cebc4629eb49812658bb895583840fa5fdd SHA512 fae99e9ba572c1c6445ba03ec257759165d5c3be57d6de5269f1e886e6c9fb50361995956671772bfae26ec4d54785e9f40ac7dad25a5d4b2c33f8c3e2eb94b4
+EBUILD strace-5.5.ebuild 2331 BLAKE2B e86b36d25ebf6558d84f7ec96a499e50bb0550b6943e2e6fc3e5a71a08a3a9f8cc85b51355f6158eb03191e6cd821e3c2fee387c03ec97973944d4278e9991cf SHA512 0936fa36a65e028cccd9d42dfc614448fa381fce3682f4f26cf5f4fee83f69a6c8002e42abb62cee62a1d01fe9793f65eca313dda5d9a348a1905bb34860ef2f
+EBUILD strace-5.6.ebuild 2354 BLAKE2B 65b3aaf00c35f709158d0f3de01f7bcc0b1a8daaab9e614bb9d381d0b4ae26794cd6fe8e502e1d8f953a9271e8fe0bd460b84f8ca84266192635a37d54c3b653 SHA512 879a423a1786a2147484d817a89060960e1e4796f481902f2001b872a0942a84e7d78ad87869d35637bc9cd2b3ad61821067a32def5a8dbb196b3a638676f3c2
+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.5-static.patch b/dev-util/strace/files/strace-5.5-static.patch
new file mode 100644
index 000000000000..da57ee0f9388
--- /dev/null
+++ b/dev-util/strace/files/strace-5.5-static.patch
@@ -0,0 +1,178 @@
+--- /Makefile.am
++++ /Makefile.am
+@@ -379,7 +379,6 @@
+ if USE_LIBDW
+ strace_SOURCES += unwind-libdw.c
+ strace_CPPFLAGS += $(libdw_CPPFLAGS)
+-strace_CFLAGS += $(libdw_CFLAGS)
+ strace_LDFLAGS += $(libdw_LDFLAGS)
+ strace_LDADD += $(libdw_LIBS)
+ endif
+--- /configure.ac
++++ /configure.ac
+@@ -48,6 +48,15 @@
+ AC_DEFINE([MANPAGE_DATE], "[manpage_date]", [Date])
+ AC_SUBST([MANPAGE_DATE], [manpage_date])
+ 
++AC_ARG_ENABLE([static],
++	      [AS_HELP_STRING([--enable-static],
++			      [link strace statically])],
++	      [], [enable_static=no])
++if test "$enable_static" = "yes"; then
++	# Add -pthread since strace wants -lrt for timer_create, and -lrt uses -lpthread.
++	LDFLAGS="$LDFLAGS -pthread -static"
++fi
++
+ AC_C_BIGENDIAN
+ 
+ AC_MSG_CHECKING([for supported architecture])
+--- /m4/st_libdw.m4
++++ /m4/st_libdw.m4
+@@ -8,7 +8,6 @@
+ AC_DEFUN([st_ARG_LIBDW], [dnl
+ 
+ : ${libdw_CPPFLAGS=}
+-: ${libdw_CFLAGS=}
+ : ${libdw_LDFLAGS=}
+ : ${libdw_LIBS=}
+ 
+@@ -34,48 +33,14 @@
+ have_libdw=
+ 
+ AS_IF([test "x$with_libdw" != xno && test "x$use_unwinder" = x],
+-      [saved_CPPFLAGS="$CPPFLAGS"
+-       saved_CFLAGS="$CFLAGS"
+-       CPPFLAGS="$CPPFLAGS $libdw_CPPFLAGS"
+-       CFLAGS="$CFLAGS $libdw_CFLAGS"
+-
+-       AC_CHECK_HEADERS([elfutils/libdwfl.h],
+-			[AC_CHECK_LIB([dw], [dwfl_linux_proc_attach],
+-				      [libdw_LIBS="-ldw $libdw_LIBS"
+-				       AC_CACHE_CHECK([for elfutils version],
+-						      [st_cv_ELFUTILS_VERSION],
+-						      [[st_cv_ELFUTILS_VERSION="$(echo _ELFUTILS_VERSION |
+-										  $CPP $CPPFLAGS -P -imacros elfutils/version.h - |
+-										  grep '^[0-9]')"
+-							test -n "$st_cv_ELFUTILS_VERSION" ||
+-								st_cv_ELFUTILS_VERSION=0
+-						      ]]
+-						     )
+-				       AS_IF([test "$st_cv_ELFUTILS_VERSION" -ge 164],
+-					     [have_libdw=yes],
+-					     [AS_IF([test "x$with_libdw" = xyes],
+-						    [AC_MSG_ERROR([elfutils version >= 164 is required for stack tracing support])],
+-						    [AC_MSG_WARN([elfutils version >= 164 is required for stack tracing support])]
+-						   )
+-					     ]
+-					    )
+-				      ],
+-				      [AS_IF([test "x$with_libdw" = xyes],
+-					     [AC_MSG_FAILURE([failed to find dwfl_linux_proc_attach in libdw])],
+-					    )
+-				      ],
+-				      [$libdw_LDFLAGS $libdw_LIBS]
+-				     )
+-			],
+-			[AS_IF([test "x$with_libdw" = xyes],
+-			       [AC_MSG_FAILURE([failed to find elfutils/libdwfl.h])]
+-			      )
+-			]
+-		       )
+-
+-       CFLAGS="$saved_CFLAGS"
+-       CPPFLAGS="$saved_CPPFLAGS"
+-      ]
++      [if test "$enable_static" = "yes"; then
++           PKG_CHECK_MODULES_STATIC([LIBDW], [libdw >= 0.164])
++       else
++           PKG_CHECK_MODULES([LIBDW], [libdw >= 0.164])
++       fi
++       have_libdw=yes
++       libdw_CPPFLAGS="$LIBDW_CFLAGS"
++       libdw_LIBS="$LIBDW_LIBS"]
+ )
+ 
+ AS_IF([test "x$have_libdw" = xyes],
+@@ -84,7 +49,6 @@
+ 		 [Whether to use libdw for stack tracing]
+ 		)
+        AC_SUBST(libdw_CPPFLAGS)
+-       AC_SUBST(libdw_CFLAGS)
+        AC_SUBST(libdw_LDFLAGS)
+        AC_SUBST(libdw_LIBS)
+       ]
+--- /m4/st_libunwind.m4
++++ /m4/st_libunwind.m4
+@@ -28,64 +28,14 @@
+ libunwind_LIBS=
+ 
+ AS_IF([test "x$with_libunwind" != xno && test "x$use_unwinder" = x],
+-      [saved_CPPFLAGS="$CPPFLAGS"
+-       CPPFLAGS="$CPPFLAGS $libunwind_CPPFLAGS"
+-
+-       AC_CHECK_HEADERS([libunwind-ptrace.h],
+-	 [saved_LDFLAGS="$LDFLAGS"
+-	  LDFLAGS="$LDFLAGS $libunwind_LDFLAGS"
+-
+-	  AC_CHECK_LIB([unwind], [backtrace],
+-	    [libunwind_LIBS="-lunwind $libunwind_LIBS"
+-
+-	     AC_MSG_CHECKING([for unw_create_addr_space in libunwind-generic])
+-	     saved_LIBS="$LIBS"
+-	     LIBS="-lunwind-generic $libunwind_LIBS $LIBS"
+-
+-	     AC_LINK_IFELSE(
+-	       [AC_LANG_PROGRAM([[#include <libunwind-ptrace.h>]],
+-				[[return !unw_create_addr_space(0, 0)]])
+-	       ],
+-	       [AC_MSG_RESULT([yes])
+-		libunwind_LIBS="-lunwind-generic $libunwind_LIBS"
+-
+-		AC_CHECK_LIB([unwind-ptrace], [_UPT_create],
+-		  [libunwind_LIBS="-lunwind-ptrace $libunwind_LIBS"
+-		   use_unwinder=libunwind
+-		  ],
+-		  [if test "x$with_libunwind" != xcheck; then
+-		     AC_MSG_FAILURE([failed to find _UPT_create in libunwind-ptrace])
+-		   fi
+-		  ],
+-		  [$libunwind_LIBS]
+-		)
+-	       ],
+-	       [AC_MSG_RESULT([no])
+-		if test "x$with_libunwind" != xcheck; then
+-		  AC_MSG_FAILURE([failed to find unw_create_addr_space in libunwind-generic])
+-		fi
+-	       ]
+-	     )
+-
+-	     LIBS="$saved_LIBS"
+-	    ],
+-	    [if test "x$with_libunwind" != xcheck; then
+-	       AC_MSG_FAILURE([failed to find libunwind])
+-	     fi
+-	    ],
+-	    [$libunwind_LIBS]
+-	  )
+-
+-	  LDFLAGS="$saved_LDFLAGS"
+-	 ],
+-	 [if test "x$with_libunwind" != xcheck; then
+-	    AC_MSG_FAILURE([failed to find libunwind-ptrace.h])
+-	  fi
+-	 ]
+-       )
+-
+-       CPPFLAGS="$saved_CPPFLAGS"
+-      ]
++      [if test "$enable_static" = "yes"; then
++           PKG_CHECK_MODULES_STATIC([LIBUNWIND], [libunwind libunwind-generic libunwind-ptrace])
++       else
++           PKG_CHECK_MODULES([LIBUNWIND], [libunwind libunwind-generic libunwind-ptrace])
++       fi
++       use_unwinder="libunwind"
++       libunwind_CPPFLAGS="$LIBUNWIND_CFLAGS"
++       libunwind_LIBS="$LIBUNWIND_LIBS"]
+ )
+ 
+ if test "x$use_unwinder" = xlibunwind; then
diff --git a/dev-util/strace/strace-5.3.ebuild b/dev-util/strace/strace-5.3.ebuild
index cdfda1bdee3d..34f626556435 100644
--- a/dev-util/strace/strace-5.3.ebuild
+++ b/dev-util/strace/strace-5.3.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
@@ -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 ~sh 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"
diff --git a/dev-util/strace/strace-5.4.ebuild b/dev-util/strace/strace-5.4.ebuild
index 31a56378b3f8..49b3e03d04c6 100644
--- a/dev-util/strace/strace-5.4.ebuild
+++ b/dev-util/strace/strace-5.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
@@ -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 ~sh ~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"
diff --git a/dev-util/strace/strace-5.5.ebuild b/dev-util/strace/strace-5.5.ebuild
index c6b8e0324fbd..cf81c1cc50d4 100644
--- a/dev-util/strace/strace-5.5.ebuild
+++ b/dev-util/strace/strace-5.5.ebuild
@@ -3,14 +3,14 @@
 
 EAPI=7
 
-inherit flag-o-matic toolchain-funcs autotools
+inherit autotools flag-o-matic toolchain-funcs
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/strace/strace.git"
 	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 ~sh ~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"
@@ -22,6 +22,9 @@ IUSE="aio perl static unwind elfutils"
 
 REQUIRED_USE="?? ( unwind elfutils )"
 
+BDEPEND="
+	virtual/pkgconfig
+"
 LIB_DEPEND="
 	unwind? ( sys-libs/libunwind[static-libs(+)] )
 	elfutils? ( dev-libs/elfutils[static-libs(+)] )
@@ -37,11 +40,13 @@ RDEPEND="
 	perl? ( dev-lang/perl )
 "
 
+PATCHES=(
+	"${FILESDIR}/${PN}-5.5-static.patch"
+)
+
 src_prepare() {
 	default
 
-	# Needed for applied patch (#701516). Remove with next version.
-	# Don't forget about autotools inherit.
 	eautoreconf
 
 	if [[ ! -e configure ]] ; then
@@ -53,8 +58,6 @@ src_prepare() {
 	fi
 
 	filter-lfs-flags # configure handles this sanely
-	# Add -pthread since strace wants -lrt for timer_create, and -lrt uses -lpthread.
-	use static && append-ldflags -static -pthread
 
 	export ac_cv_header_libaio_h=$(usex aio)
 	use elibc_musl && export ac_cv_header_stdc=no
@@ -75,6 +78,7 @@ src_configure() {
 	# Don't require mpers support on non-multilib systems. #649560
 	local myeconfargs=(
 		--enable-mpers=check
+		$(use_enable static)
 		$(use_with unwind libunwind)
 		$(use_with elfutils libdw)
 	)
diff --git a/dev-util/strace/strace-4.26.ebuild b/dev-util/strace/strace-5.6.ebuild
index eba46fc94755..c08dbf18c0a5 100644
--- a/dev-util/strace/strace-4.26.ebuild
+++ b/dev-util/strace/strace-5.6.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit flag-o-matic toolchain-funcs
+inherit autotools flag-o-matic toolchain-funcs
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/strace/strace.git"
 	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 s390 sh 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"
@@ -22,6 +22,9 @@ IUSE="aio perl static unwind elfutils"
 
 REQUIRED_USE="?? ( unwind elfutils )"
 
+BDEPEND="
+	virtual/pkgconfig
+"
 LIB_DEPEND="
 	unwind? ( sys-libs/libunwind[static-libs(+)] )
 	elfutils? ( dev-libs/elfutils[static-libs(+)] )
@@ -37,20 +40,24 @@ RDEPEND="
 	perl? ( dev-lang/perl )
 "
 
+PATCHES=(
+	"${FILESDIR}/${PN}-5.5-static.patch"
+)
+
 src_prepare() {
 	default
 
+	eautoreconf
+
 	if [[ ! -e configure ]] ; then
 		# git generation
-		./xlat/gen.sh || die
-		./generate_mpers_am.sh || die
+		sed /autoreconf/d -i bootstrap || die
+		./bootstrap || die
 		eautoreconf
 		[[ ! -e CREDITS ]] && cp CREDITS{.in,}
 	fi
 
 	filter-lfs-flags # configure handles this sanely
-	# Add -pthread since strace wants -lrt for timer_create, and -lrt uses -lpthread.
-	use static && append-ldflags -static -pthread
 
 	export ac_cv_header_libaio_h=$(usex aio)
 	use elibc_musl && export ac_cv_header_stdc=no
@@ -70,7 +77,9 @@ src_configure() {
 
 	# Don't require mpers support on non-multilib systems. #649560
 	local myeconfargs=(
+		--disable-gcc-Werror
 		--enable-mpers=check
+		$(use_enable static)
 		$(use_with unwind libunwind)
 		$(use_with elfutils libdw)
 	)
@@ -78,7 +87,7 @@ src_configure() {
 }
 
 src_test() {
-	if has usersandbox $FEATURES ; then
+	if has usersandbox ${FEATURES} ; then
 		ewarn "Test suite is known to fail with FEATURES=usersandbox -- skipping ..." #643044
 		return 0
 	fi
@@ -88,6 +97,8 @@ src_test() {
 
 src_install() {
 	default
-	use perl || rm "${ED%/}"/usr/bin/strace-graph
+	if ! use perl ; then
+		rm "${ED}"/usr/bin/strace-graph || die
+	fi
 	dodoc CREDITS
 }
diff --git a/dev-util/strace/strace-9999.ebuild b/dev-util/strace/strace-9999.ebuild
index db378889c0d5..c08dbf18c0a5 100644
--- a/dev-util/strace/strace-9999.ebuild
+++ b/dev-util/strace/strace-9999.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit flag-o-matic toolchain-funcs
+inherit autotools flag-o-matic toolchain-funcs
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/strace/strace.git"
 	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 ~sh ~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"
@@ -22,6 +22,9 @@ IUSE="aio perl static unwind elfutils"
 
 REQUIRED_USE="?? ( unwind elfutils )"
 
+BDEPEND="
+	virtual/pkgconfig
+"
 LIB_DEPEND="
 	unwind? ( sys-libs/libunwind[static-libs(+)] )
 	elfutils? ( dev-libs/elfutils[static-libs(+)] )
@@ -37,9 +40,15 @@ RDEPEND="
 	perl? ( dev-lang/perl )
 "
 
+PATCHES=(
+	"${FILESDIR}/${PN}-5.5-static.patch"
+)
+
 src_prepare() {
 	default
 
+	eautoreconf
+
 	if [[ ! -e configure ]] ; then
 		# git generation
 		sed /autoreconf/d -i bootstrap || die
@@ -49,8 +58,6 @@ src_prepare() {
 	fi
 
 	filter-lfs-flags # configure handles this sanely
-	# Add -pthread since strace wants -lrt for timer_create, and -lrt uses -lpthread.
-	use static && append-ldflags -static -pthread
 
 	export ac_cv_header_libaio_h=$(usex aio)
 	use elibc_musl && export ac_cv_header_stdc=no
@@ -70,7 +77,9 @@ src_configure() {
 
 	# Don't require mpers support on non-multilib systems. #649560
 	local myeconfargs=(
+		--disable-gcc-Werror
 		--enable-mpers=check
+		$(use_enable static)
 		$(use_with unwind libunwind)
 		$(use_with elfutils libdw)
 	)
diff --git a/dev-util/sysdig-kmod/Manifest b/dev-util/sysdig-kmod/Manifest
new file mode 100644
index 000000000000..a6f9d24e83e4
--- /dev/null
+++ b/dev-util/sysdig-kmod/Manifest
@@ -0,0 +1,5 @@
+DIST sysdig-0.26.4.tar.gz 902181 BLAKE2B a7ac38be2f7a3d7e4f4fdec6a2fbf5305a8224ee27352da70f509139ebefd14616f84c7b8860f50d2546819a94deb1117034bceddd22128fcf25386b835274f2 SHA512 f56f5d0a522b861df4803bfdafcaf8db3fc9c0e751d06c321082757f6828a210cb86bab4550a3b35bf6412f930e44ab0f5cf709a30651c57dd7064a68e273a88
+DIST sysdig-0.26.6.tar.gz 923918 BLAKE2B e022eba30977f5300c80a4806926d3e755b1395f05475c1fe925b86823670e397ad29e8bd18b1beaa893cb1bf83c329960c1bf9ff6faf0a5144343e88d52a4a0 SHA512 94784f0dfe46924b81d8804d950a9563cd18f4aa8b1cacd7e27e3974ecf7215223e03bdab001f408f64eb6c72f0da5082fd922d63079119427eb493c77e15795
+EBUILD sysdig-kmod-0.26.4.ebuild 945 BLAKE2B be025ff85bfdf7de187e06439e44e1336604d282163b889c9af3846d64b278c1454f4a9f33ff5be19f2089688227b4d980b5b9e802fda4e5e08b18f5d68f62b7 SHA512 2373a4b32538b65d293832b93167f5ffbc1b6f4eed9fdcac10104c15d5eed955cd8239368fe5be929b6bf28c59cd678ef6ead0f9701ee9fb8b90f3e82b145acd
+EBUILD sysdig-kmod-0.26.6.ebuild 945 BLAKE2B be025ff85bfdf7de187e06439e44e1336604d282163b889c9af3846d64b278c1454f4a9f33ff5be19f2089688227b4d980b5b9e802fda4e5e08b18f5d68f62b7 SHA512 2373a4b32538b65d293832b93167f5ffbc1b6f4eed9fdcac10104c15d5eed955cd8239368fe5be929b6bf28c59cd678ef6ead0f9701ee9fb8b90f3e82b145acd
+MISC metadata.xml 325 BLAKE2B a4fb1518abfc94ae4f45d30f85ab3cfec6139025f302fc46725275e1a0ef9d789de1f55b07330dd7aed44cfee60c688d4ba95e3f67832f5581066ad833cf2e2a SHA512 51815b800827d94d1c554de9fde3d97b67a4f2f83847826a8aaede5c84dfab95401526ea670bd84e79ba435a1439c109ef3b27e313cb2bafc0c49639bf02ff68
diff --git a/dev-util/sysdig-kmod/metadata.xml b/dev-util/sysdig-kmod/metadata.xml
new file mode 100644
index 000000000000..0954d438ef49
--- /dev/null
+++ b/dev-util/sysdig-kmod/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">draios/sysdig</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/sysdig-kmod/sysdig-kmod-0.26.4.ebuild b/dev-util/sysdig-kmod/sysdig-kmod-0.26.4.ebuild
new file mode 100644
index 000000000000..ba7201399d5c
--- /dev/null
+++ b/dev-util/sysdig-kmod/sysdig-kmod-0.26.4.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-kmod/sysdig-kmod-0.26.6.ebuild b/dev-util/sysdig-kmod/sysdig-kmod-0.26.6.ebuild
new file mode 100644
index 000000000000..ba7201399d5c
--- /dev/null
+++ b/dev-util/sysdig-kmod/sysdig-kmod-0.26.6.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 ff3a5fa64f91..f7f1df54ae09 100644
--- a/dev-util/sysdig/Manifest
+++ b/dev-util/sysdig/Manifest
@@ -1,3 +1,6 @@
 DIST sysdig-0.26.4.tar.gz 902181 BLAKE2B a7ac38be2f7a3d7e4f4fdec6a2fbf5305a8224ee27352da70f509139ebefd14616f84c7b8860f50d2546819a94deb1117034bceddd22128fcf25386b835274f2 SHA512 f56f5d0a522b861df4803bfdafcaf8db3fc9c0e751d06c321082757f6828a210cb86bab4550a3b35bf6412f930e44ab0f5cf709a30651c57dd7064a68e273a88
+DIST sysdig-0.26.6.tar.gz 923918 BLAKE2B e022eba30977f5300c80a4806926d3e755b1395f05475c1fe925b86823670e397ad29e8bd18b1beaa893cb1bf83c329960c1bf9ff6faf0a5144343e88d52a4a0 SHA512 94784f0dfe46924b81d8804d950a9563cd18f4aa8b1cacd7e27e3974ecf7215223e03bdab001f408f64eb6c72f0da5082fd922d63079119427eb493c77e15795
+EBUILD sysdig-0.26.4-r1.ebuild 1351 BLAKE2B f1039664147482e4315038b0a61b91da1f13e988ab25c298670d0c98962a947cca5a1b63d092f62bb1d4e4daf299282575a84f29465e3d9c9bc183ecd90e9a79 SHA512 d06f10fdf0209d7842b2a7da5aea77a1fc71db662743b10618f1723ce21c95e5e82de884f7092227394460b06578691c427770dd8f1c10a4bf5ffe1c61d220d5
 EBUILD sysdig-0.26.4.ebuild 1818 BLAKE2B adf4b596e5301a650745609b547b47012c4de89954ceadc5a0d8f6399c25ca50c1c1458f323572a340d833119b00f791a9e62aa6b9b2ed70ffc8d89c59ebbf32 SHA512 6ae75c8dbe947fccf2db51e98ae1f96ec9c9b1f99d9dc8878e44c3a4cb02cb9006f3b2d0543dfd1f504ae25224b2a2099df8b15fd5fc1c9dc6ecb15f5ca09e7c
+EBUILD sysdig-0.26.6.ebuild 1446 BLAKE2B 8cacc86c38675a24c5b8d7e6402259ee6cf88035e08967bdfa43c24025be755cc326674d10189a3dbbd4331380b3b9f911375aa98507db8da708c4f93e6668f9 SHA512 2b2bec125737f8c5741b76c83844af1694c5753a2c9e10724d0e6483e2bc985162cbe85b0f724d2f49478e3b279df6e1de67235beabb7d6fb0051d077e9c775d
 MISC metadata.xml 507 BLAKE2B 4e19c0d3370019c80eda625ae812a4485139ab8a83285946ebc6ef62abad280beaefaaac29d7a57e14b5ca5448bd9d1c23a8cf6a4f783149633dd09e7ae1465c SHA512 d218731de7acfbbfa3c3043b2d942c00b7f5aff1a020b6dca2019f202be3a5390f44337e04691a0d4641e661f7581f703db5fda3d2a116c0d63fb7d9da25ed06
diff --git a/dev-util/sysdig/sysdig-0.26.4-r1.ebuild b/dev-util/sysdig/sysdig-0.26.4-r1.ebuild
new file mode 100644
index 000000000000..7ad2a9931646
--- /dev/null
+++ b/dev-util/sysdig/sysdig-0.26.4-r1.ebuild
@@ -0,0 +1,65 @@
+# 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"
+
+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"
+PDEPEND="
+	modules? ( >=dev-util/sysdig-kmod-${PV} )"
+
+src_prepare() {
+	sed -i -e 's:-ggdb::' CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		# 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/sysdig/sysdig-0.26.6.ebuild b/dev-util/sysdig/sysdig-0.26.6.ebuild
new file mode 100644
index 000000000000..55a20f694f42
--- /dev/null
+++ b/dev-util/sysdig/sysdig-0.26.6.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 cmake
+
+DESCRIPTION="A system exploration and troubleshooting tool"
+HOMEPAGE="https://sysdig.com/"
+SRC_URI="https://github.com/draios/sysdig/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl +modules test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	app-misc/jq:0=
+	dev-cpp/tbb:0=
+	dev-lang/luajit:2=
+	>=dev-libs/jsoncpp-0.6_pre:0=
+	dev-libs/libb64:0=
+	dev-libs/protobuf:0=
+	net-dns/c-ares:0=
+	net-libs/grpc:0=
+	sys-libs/ncurses:0=
+	sys-libs/zlib:0=
+	libressl? ( dev-libs/libressl:0= )
+	!libressl? ( dev-libs/openssl:0= )
+	net-misc/curl:0="
+DEPEND="${RDEPEND}
+	virtual/os-headers
+	test? ( dev-cpp/gtest )"
+PDEPEND="
+	modules? ( >=dev-util/sysdig-kmod-${PV} )"
+
+src_prepare() {
+	sed -i -e 's:-ggdb::' CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCREATE_TEST_TARGETS=$(usex test)
+
+		# done in dev-util/sysdig-kmod
+		-DBUILD_DRIVER=OFF
+		# libscap examples are not installed or really useful
+		-DBUILD_LIBSCAP_EXAMPLES=OFF
+
+		# unbundle the deps
+		-DUSE_BUNDLED_DEPS=OFF
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	# remove sources
+	rm -r "${ED}"/usr/src || die
+
+	# move bashcomp to the proper location
+	dobashcomp "${ED}"/usr/etc/bash_completion.d/sysdig || die
+	rm -r "${ED}"/usr/etc || die
+}
diff --git a/dev-util/sysprof-capture/Manifest b/dev-util/sysprof-capture/Manifest
new file mode 100644
index 000000000000..f6b4b1c52531
--- /dev/null
+++ b/dev-util/sysprof-capture/Manifest
@@ -0,0 +1,4 @@
+DIST sysprof-3.34.1.tar.xz 372612 BLAKE2B 3a50a00f29866ae8bf03cc7a57b598e40a6a37ad88ac2159087e4f2a8a6a5cef09b345dc5332fb1df9036c4e159e98f19adda45588150b059af313878b9b554c SHA512 5f2d820935291a3b578222d5daa87b0a2f74cd16d14daca19065495be61cf7359f00f12f452a5c0b4e05dfeb94e2376017c2288cad92dc0c4bb9bca51b903d19
+EBUILD sysprof-capture-3.34.1-r1.ebuild 1160 BLAKE2B 561181c13ade5d59acdc6baaeae1a2e4343ff36dc5f9de0378a408721c51e6ddfab24d9453e21a202e8efaa1d690653a0a4bbad50261577c2f6864a1ade5b51d SHA512 989fc8217a7e4899d67124768718be14b8abfc3fbd899806c32c9707890c11a918493e0a027744a6d9f0407703b93cbf9fe791d17f7b4eb7b0720c63f2c4c445
+EBUILD sysprof-capture-3.34.1.ebuild 1209 BLAKE2B ad76bbf11652385c69eb806fded3ed8adedb8f9ec582d5da8c5e84f3141339300c965bc1cde3a6b9fce99647b53fe464e57277b72dcdb631bb343a0cac7e54da SHA512 4aa74a8f178fd7b04677e999357aa554ad4dfbe2e46208f9bcbd625221851906226549923a166ece49252145b52522e443f82e0e7d26cbf7e3c7f459c45cd770
+MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/gquilt/metadata.xml b/dev-util/sysprof-capture/metadata.xml
index 621b99e9b1ec..39980802b1da 100644
--- a/dev-util/gquilt/metadata.xml
+++ b/dev-util/sysprof-capture/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="sourceforge">gquilt</remote-id>
-	</upstream>
+<maintainer type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-util/sysprof-capture/sysprof-capture-3.34.1-r1.ebuild b/dev-util/sysprof-capture/sysprof-capture-3.34.1-r1.ebuild
new file mode 100644
index 000000000000..7e76591dccd0
--- /dev/null
+++ b/dev-util/sysprof-capture/sysprof-capture-3.34.1-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GNOME_ORG_MODULE="sysprof"
+
+inherit gnome.org meson systemd
+
+DESCRIPTION="Static library for sysprof capture data generation"
+HOMEPAGE="http://sysprof.com/"
+
+LICENSE="GPL-3+ GPL-2+"
+SLOT="3"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2.61.3:2
+	!=dev-util/sysprof-3.34.1-r0"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/gdbus-codegen
+	>=sys-kernel/linux-headers-2.6.32
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+	# In 3.34.1 -Dlibsysprof=false still installs various data files related with it;
+	# some of these seem fixed by 3.36
+	sed -i -e '/subdir.*data/d' meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		-Denable_gtk=false
+		-Dlibsysprof=false
+		-Dwith_sysprofd=none
+		-Dsystemdunitdir=$(systemd_get_systemunitdir)
+		# -Ddebugdir
+		-Dhelp=false
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	# In 3.36 these shouldn't be needed with with_sysprofd=none
+	rm "${ED}"/usr/share/dbus-1/interfaces/org.gnome.Sysprof2.xml || die
+	rm "${ED}"/usr/share/dbus-1/interfaces/org.gnome.Sysprof3.Service.xml || die
+}
diff --git a/dev-util/sysprof-capture/sysprof-capture-3.34.1.ebuild b/dev-util/sysprof-capture/sysprof-capture-3.34.1.ebuild
new file mode 100644
index 000000000000..fb4cdee37666
--- /dev/null
+++ b/dev-util/sysprof-capture/sysprof-capture-3.34.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GNOME_ORG_MODULE="sysprof"
+
+inherit gnome.org meson systemd
+
+DESCRIPTION="Static library for sysprof capture data generation"
+HOMEPAGE="http://sysprof.com/"
+
+LICENSE="GPL-3+ GPL-2+"
+SLOT="3"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2.61.3:2"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/gdbus-codegen
+	>=sys-kernel/linux-headers-2.6.32
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+	# In 3.34.1 -Dlibsysprof=false still installs various data files related with it;
+	# some of these seem fixed by 3.36
+	sed -i -e '/subdir.*data/d' meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		-Denable_gtk=false
+		-Dlibsysprof=false
+		-Dwith_sysprofd=none
+		-Dsystemdunitdir=$(systemd_get_systemunitdir)
+		# -Ddebugdir
+		-Dhelp=false
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	# In 3.36 these shouldn't be needed with with_sysprofd=none
+	rm "${ED}"/usr/share/dbus-1/interfaces/org.gnome.Sysprof2.xml || die
+	rm "${ED}"/usr/share/dbus-1/interfaces/org.gnome.Sysprof3.Service.xml || die
+	rm "${ED}"/usr/share/dbus-1/interfaces/org.gnome.Sysprof3.Profiler.xml || die
+}
diff --git a/dev-util/sysprof/Manifest b/dev-util/sysprof/Manifest
index b5ef1792dff5..896e57c42c92 100644
--- a/dev-util/sysprof/Manifest
+++ b/dev-util/sysprof/Manifest
@@ -1,4 +1,7 @@
 AUX 3.30.2-elogind.patch 1055 BLAKE2B c25d6b83d75d8155ef09d1aa5cdd8dead79a1fe796028cec79166e24ae8a579af83c396c7f4e91948a56bb2215cb180657728c35d84ee8ed09134d4ee72a17cf SHA512 6ed6fcf43238378486f430bf653cc6f209f6bd42136e14f0888b8b190a63058bfcec8777a6df0f1f454b14ef91c6075d342585a8c339a11604ffc3e712057017
 DIST sysprof-3.32.0.tar.xz 296052 BLAKE2B f409c64d40bd3451037e601683f270ff93ea2a60a2c104d22edc6bad5ff3f5c974f80137776b6329dae932852fa0871f2b7b9960a282147ddef5402ad840d9ef SHA512 7b9d84ac241d376a5e545082b1224e7db96af26ae0ee297d5f0b2d45abc4676e23009dbd560085e5d4879378a8dd79eefb4449df3961fbfd09238bd2056061d0
+DIST sysprof-3.34.1.tar.xz 372612 BLAKE2B 3a50a00f29866ae8bf03cc7a57b598e40a6a37ad88ac2159087e4f2a8a6a5cef09b345dc5332fb1df9036c4e159e98f19adda45588150b059af313878b9b554c SHA512 5f2d820935291a3b578222d5daa87b0a2f74cd16d14daca19065495be61cf7359f00f12f452a5c0b4e05dfeb94e2376017c2288cad92dc0c4bb9bca51b903d19
 EBUILD sysprof-3.32.0.ebuild 2223 BLAKE2B 12c03c2a1ea0a43e3445a1ec80eb95d5f2132eae1128d003fa4e004f30797b3f9d741ced16262a61240f0483361b8d620abb33e272651b201568a39eeda07453 SHA512 26a2a6ff561ac905236cb494517b65d70e6682098e043166e8ad274adc25452e9b75ea36c8cd1651972b80b31b5a84730186007f286180f34bbad51a41cfa0a0
-MISC metadata.xml 886 BLAKE2B 31416bfe6eb56d58ae1c1953d19cc59ee0cff0c0aa7d6c28f6b95b7b4c9038ea9a8af5025e64f29612b6b919953671eb4940ff60d6baf1c79b8d33bdfae2beff SHA512 5514125c6a2dcb55a06bc81e52bb6c94a804b0dc41ce7d7c83e9ee94f06ddcd585716c12887a6428e1afe3a9268cdc4cd0596d7a036de08f0e70ae3d6366f502
+EBUILD sysprof-3.34.1-r1.ebuild 2180 BLAKE2B a7cfdf09e34a1b11b85f360d55338fe42a0753222e25b4ec6136646d9458d3b61c5e551a821dc3644147d518e7022092f24e8ead3af810144675bd0f9b4b9cf6 SHA512 bed8b1be866d6809e0c37e058091a3a3c669dfc68ea43fbcda84df59d1f1077b7861c01e5b5e4a57cc23dc1dba337556e26dbbb4398ff82b23afb46b1d633c03
+EBUILD sysprof-3.34.1.ebuild 1985 BLAKE2B f5f934464afac97c3581e0a37a3fc9caaa8ed7c1ac6f5f65dc93b71ce13a3050791f85b397670ecb1f63e748e969aa1ca701cc2869698761ab26fd10a695f31b SHA512 375c224e1d484025bd31e67e257bf60e7aa379eb4f9b750970bbcbe1a192884d56f3f8b3add88f29cda1bac5863c47f33863afe94fd3699473a468d055354e78
+MISC metadata.xml 960 BLAKE2B 0124f087a9539768f3ed80994f361428eb2edc9944536c6f4d3eb2792358d025a4c872379dbcbc38d43070fa6ef4842536deddbebe599e6ebffe7dbdc5d181ce SHA512 24378a4a329547aa1064b04574015c7c55134522ea9b3b84fccc297734c5cde55a6085e01f4365f0f8d57b8e5d85e41c1719c88af5a5c4c167799cb69278235f
diff --git a/dev-util/sysprof/metadata.xml b/dev-util/sysprof/metadata.xml
index 70135f654431..2511f1c94370 100644
--- a/dev-util/sysprof/metadata.xml
+++ b/dev-util/sysprof/metadata.xml
@@ -17,4 +17,7 @@
 	<flag name="systemd">Build the sysprofd daemon service, required to run the UI without root permissions.
 		Relies on <pkg>sys-apps/systemd</pkg> for sd-bus API.</flag>
 </use>
+<slots>
+	<subslots>sysprof and sysprof-ui API version</subslots>
+</slots>
 </pkgmetadata>
diff --git a/dev-util/sysprof/sysprof-3.34.1-r1.ebuild b/dev-util/sysprof/sysprof-3.34.1-r1.ebuild
new file mode 100644
index 000000000000..e4924b71fee3
--- /dev/null
+++ b/dev-util/sysprof/sysprof-3.34.1-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org gnome2-utils meson systemd xdg
+
+DESCRIPTION="System-wide Linux Profiler"
+HOMEPAGE="http://sysprof.com/"
+
+LICENSE="GPL-3+ GPL-2+"
+API_VERSION="3"
+SLOT="0/${API_VERSION}"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk"
+
+RDEPEND="
+	>=dev-libs/glib-2.61.3:2
+	gtk? (
+		>=x11-libs/gtk+-3.22.0:3
+		>=dev-libs/libdazzle-3.30.0
+	)
+	>=sys-auth/polkit-0.114
+	>=dev-util/sysprof-capture-3.34.1-r1:${API_VERSION}
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-libs/appstream-glib
+	dev-util/gdbus-codegen
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	>=sys-kernel/linux-headers-2.6.32
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	xdg_src_prepare
+	# These are installed by dev-util/sysprof-capture
+	sed -i -e '/install/d' src/libsysprof-capture/meson.build || die
+	sed -i -e 's/pkgconfig\.generate/subdir_done()\npkgconfig\.generate/' src/libsysprof-capture/meson.build || die
+}
+
+src_configure() {
+	# -Dwith_sysprofd=host currently unavailable from ebuild
+	local emesonargs=(
+		$(meson_use gtk enable_gtk)
+		-Dlibsysprof=true
+		-Dwith_sysprofd=bundled
+		-Dsystemdunitdir=$(systemd_get_systemunitdir)
+		# -Ddebugdir
+		-Dhelp=true
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	# installed by sysprof-capture, as mutter needs it at build time
+	rm "${ED}"/usr/share/dbus-1/interfaces/org.gnome.Sysprof3.Profiler.xml || die
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+
+	elog "On many systems, especially amd64, it is typical that with a modern"
+	elog "toolchain -fomit-frame-pointer for gcc is the default, because"
+	elog "debugging is still possible thanks to gcc4/gdb location list feature."
+	elog "However sysprof is not able to construct call trees if frame pointers"
+	elog "are not present. Therefore -fno-omit-frame-pointer CFLAGS is suggested"
+	elog "for the libraries and applications involved in the profiling. That"
+	elog "means a CPU register is used for the frame pointer instead of other"
+	elog "purposes, which means a very minimal performance loss when there is"
+	elog "register pressure."
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/dev-util/sysprof/sysprof-3.34.1.ebuild b/dev-util/sysprof/sysprof-3.34.1.ebuild
new file mode 100644
index 000000000000..069a3186fe30
--- /dev/null
+++ b/dev-util/sysprof/sysprof-3.34.1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org gnome2-utils meson systemd xdg
+
+DESCRIPTION="System-wide Linux Profiler"
+HOMEPAGE="http://sysprof.com/"
+
+LICENSE="GPL-3+ GPL-2+"
+API_VERSION="3"
+SLOT="0/${API_VERSION}"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk"
+
+RDEPEND="
+	>=dev-libs/glib-2.61.3:2
+	gtk? (
+		>=x11-libs/gtk+-3.22.0:3
+		>=dev-libs/libdazzle-3.30.0
+	)
+	>=sys-auth/polkit-0.114
+	dev-util/sysprof-capture:${API_VERSION}
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-libs/appstream-glib
+	dev-util/gdbus-codegen
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	>=sys-kernel/linux-headers-2.6.32
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	xdg_src_prepare
+	# These are installed by dev-util/sysprof-capture
+	sed -i -e '/install/d' src/libsysprof-capture/meson.build || die
+	sed -i -e 's/pkgconfig\.generate/subdir_done()\npkgconfig\.generate/' src/libsysprof-capture/meson.build || die
+}
+
+src_configure() {
+	# -Dwith_sysprofd=host currently unavailable from ebuild
+	local emesonargs=(
+		$(meson_use gtk enable_gtk)
+		-Dlibsysprof=true
+		-Dwith_sysprofd=bundled
+		-Dsystemdunitdir=$(systemd_get_systemunitdir)
+		# -Ddebugdir
+		-Dhelp=true
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+
+	elog "On many systems, especially amd64, it is typical that with a modern"
+	elog "toolchain -fomit-frame-pointer for gcc is the default, because"
+	elog "debugging is still possible thanks to gcc4/gdb location list feature."
+	elog "However sysprof is not able to construct call trees if frame pointers"
+	elog "are not present. Therefore -fno-omit-frame-pointer CFLAGS is suggested"
+	elog "for the libraries and applications involved in the profiling. That"
+	elog "means a CPU register is used for the frame pointer instead of other"
+	elog "purposes, which means a very minimal performance loss when there is"
+	elog "register pressure."
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/dev-util/systemtap/Manifest b/dev-util/systemtap/Manifest
index ffb9e9b06247..df6a33002443 100644
--- a/dev-util/systemtap/Manifest
+++ b/dev-util/systemtap/Manifest
@@ -2,7 +2,7 @@ AUX systemtap-3.1-ia64.patch 885 BLAKE2B e26c60e4549f95f0db3e128cd535f923f03dc45
 DIST systemtap-2.4.tar.gz 2664988 BLAKE2B 194ad2489482eb926188fde700f43a35301214cf062ebd4d101776f09a23cbaf502f592ce0eecb297d1ffe9bf0ecf103c29b55a8a1afa84b56b9b5a0a4dd0cfd SHA512 40c30942eb50948f11f06f9f37c76d96f5ebc8eb6d164c9af5d54845b3f43f38594ddebf5f0d42ac4704b0a2563cd23edf818c196ee1330db00011a85ae11b0c
 DIST systemtap-3.1.tar.gz 4885480 BLAKE2B 39352f7507eb924fdb79bbedcdad6c200abbb18b6a9da030adca94405880fb52ff6ddbb62b01ae7acafa03e39a1ef5f0a7c3659300518412d8eee0c57d01b433 SHA512 07b322d5745f570296e287db80f1e370da87eb65073815cf24d532827900453c1cb9ee74b5496b4f3919d176b960caad4479edc2dadf27b5c58898fb7398264d
 DIST systemtap-4.0.tar.gz 5282312 BLAKE2B 9eac1cf9c9f13255ac12642c910b5591b0f5380b2a6337dedcb3d20785c0416900b9bee05f239632f7c548812be35ae90b24f524ab6f5c0c6ef474cf5de834a1 SHA512 66b5ba1902ed974101429dce9fee849273d3dc64e862c057177d158c5f284cc93299819ee8ee49d4bd3b7ff47a3512b1c68b74cad374147ce67fa406c7518c79
-EBUILD systemtap-2.4-r1.ebuild 1980 BLAKE2B 136e2e3234a09c0abbe619711385f4b2bbe723319df23b1c52f58954b71833712579e3abdb9ecbecdc4589ea4e9aede275222756d739073202958e811f539f3a SHA512 6fe102d60b48b3880fdfc82ed73c26c1f627e83048e3513f316461c8e6462d048edefd37764e263a1e2335bb0b6bb3e54bd37d01bf57c59b68d384381ef7774c
-EBUILD systemtap-3.1-r1.ebuild 2158 BLAKE2B 1ba1dcb6d4b050d27b6b41a3c23c891c4a40dd95a0a97c0cea61673529bdf0c327de11dcbfe005cbd7745a02a72060a46d5f0209d92ca03675517ddf1da6c530 SHA512 2937126b0711bc9bbff3a43362fa06f2d9d50f64c19a3e15845aba35ac2e82ee214f97c3d355243d1c395fd7bded46ea99069cf86e548a243a70e08b928d3d48
+EBUILD systemtap-2.4-r1.ebuild 1981 BLAKE2B b1453aba34d1b350506996289c0a73d40c44693a63b3c712a8c171b2f0c6e275c2299e0bc1e8f6b3b201a2591ee3bcbdf383c186f20a2fb430b86be483eee57c SHA512 2bd1b737d6290477bcf342b106a0a7d0e7f30faecbdf0bbecca5ada7791408de14e3125c86e858ead803b8d400034921b96a85471568ab8891453a715ac08b89
+EBUILD systemtap-3.1-r1.ebuild 2159 BLAKE2B cd9b29ffa2a66dd891621c86ab59acc5e91b716772db9ce08ac03177301b932f85e41036151a62eec86987e1eaf27fbba860a9cafd93b3d558c3ae8371b21fd0 SHA512 aed426fc39006ab3758fa657b9e8613b07a0bd92f6cef4cdf393cc4f2c66fd553e55da45450b4ff3d00dabdf592008763fc6bd94373e966371b3e26c66cf7fb6
 EBUILD systemtap-4.0-r1.ebuild 2637 BLAKE2B aa7cfe0603a437e356fe9cb806db9c3de2a5cb9da705369c90d132b1eebc6c8776492c5f85ae4e9f13727757456bb41122319bfda6dabfd23dd61d0bfebdda8d SHA512 9e9763dd1be41636d9890a36fa4a1cb631fed4786ba4ea46230366a95a39d26ffade78ced9d70b7e97c45436bb109414a2f347ee4d77c0a494ea00a63fae9d82
 MISC metadata.xml 302 BLAKE2B 1118f1c8c5cb76bb140947afd86eefece0251d75fd99bf58decced339e68a700f140b30d7d7f77f8c89fdcd468e79906574ced8c9339498078e6cc9edab83922 SHA512 4db366a3c2ff95cd2cfe271cf4a50fa2d5189985620d3b9e51708f2811609e53eec2656589ff754731d018bf1c184a1bab662be8683c714a8621e9296eacd9a9
diff --git a/dev-util/systemtap/systemtap-2.4-r1.ebuild b/dev-util/systemtap/systemtap-2.4-r1.ebuild
index 8f89ac6ba81c..9fbfcdaa6e39 100644
--- a/dev-util/systemtap/systemtap-2.4-r1.ebuild
+++ b/dev-util/systemtap/systemtap-2.4-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.sourceware.org/${PN}/ftp/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ia64 ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="sqlite"
 
 RDEPEND=">=dev-libs/elfutils-0.142
diff --git a/dev-util/systemtap/systemtap-3.1-r1.ebuild b/dev-util/systemtap/systemtap-3.1-r1.ebuild
index 68d0985a32ec..84eb6c8cf3ca 100644
--- a/dev-util/systemtap/systemtap-3.1-r1.ebuild
+++ b/dev-util/systemtap/systemtap-3.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.sourceware.org/${PN}/ftp/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 s390 ~sparc x86"
 IUSE="libvirt sqlite"
 
 RDEPEND=">=dev-libs/elfutils-0.142
diff --git a/dev-util/treecc/Manifest b/dev-util/treecc/Manifest
index f4233f4c48c0..446bed7939d9 100644
--- a/dev-util/treecc/Manifest
+++ b/dev-util/treecc/Manifest
@@ -1,3 +1,3 @@
 DIST treecc-0.3.10.tar.gz 375762 BLAKE2B 1d4fb6905226d79bef021808639f011731cd665b76db07efbf0ab4285c35986c1efa99381694ab5ddbb20131a8bef0d26b677d1b3e5311f2fe8fa99b1a575efb SHA512 426add1a96913a169a0f03a6e3247a8b48c9073335cf967ef05d4d4188fbe3b8ebc837b38b9a4de94ccdb13685ace47a91b185c75a845cf2670e929802774b73
-EBUILD treecc-0.3.10-r1.ebuild 995 BLAKE2B 3b031ee89dfcc73d18522d9995736704258b15af39a9f51914ab83ff96a50d75aa256af7dff6381b9a7c8baa871603e5e4221792885be8988d266db0a17534cd SHA512 49144a6fce79492a7f135fbdcec8ed667a193972e8c4f9d67dad9eff8a794c764442488a3909b737a91cc728d16bb5158fa10f13551335570ed3b74916b949c7
+EBUILD treecc-0.3.10-r1.ebuild 996 BLAKE2B 377d87a4f61b844817152524ce63013588e0ebb34dd74cf8d785e2c4a8c27218270b9395ae86c168c9d1c3e70e12617696e1b310119683faa79cf78d3c85941d SHA512 6d5fe7205e90fe3ee6d2b25562746057de08c5d92f571179db1e1175b81f6f4318c1c7fa1a50b80b0293235613055a0708a7c3eedb68d6324201de5b142350e8
 MISC metadata.xml 251 BLAKE2B 102da490c04b5ec767aebd0f076ea9aa083ec51416f584daad83e4202bd51e7182e95b7c1c98125c2a9da29eaa6b97dd4d9825c9d72e9c89d85d209e89031f48 SHA512 9b3d8ef0e933c58ceeae768b5e07fec1aba98d2f0add71719bcdec0e571b503b102610c0c4cbc322cc15638547e2f26f149d80c1498edb10b16a874014ae20d0
diff --git a/dev-util/treecc/treecc-0.3.10-r1.ebuild b/dev-util/treecc/treecc-0.3.10-r1.ebuild
index 44f60b3a092e..b7f084dfe7cc 100644
--- a/dev-util/treecc/treecc-0.3.10-r1.ebuild
+++ b/dev-util/treecc/treecc-0.3.10-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://download.savannah.gnu.org/releases/dotgnu-pnet/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 IUSE="doc examples"
 
 DEPEND="doc? ( app-text/texi2html )"
diff --git a/dev-util/unifdef/Manifest b/dev-util/unifdef/Manifest
index abbb89b0f885..ec6ccb575b85 100644
--- a/dev-util/unifdef/Manifest
+++ b/dev-util/unifdef/Manifest
@@ -1,7 +1,7 @@
 DIST unifdef-2.10.tar.gz 73285 BLAKE2B e13b75afc9b8e514559b8a13e3069bfb1cb489d21ce4ac56134921e702666bd9b23dad36d251cb65535e5d6fe02bea0d21a5610c542d727dc5e90d7e1726e4dd SHA512 39d4551f43fa8eccaee8a9fc469b5ddc8ca8eb0e0ce46c17c3a8300f7e6960fbf0960f364a83df20059b4aa623edc7c3c16df1b7162f068332e6c066d7ffe9b3
 DIST unifdef-2.11.tar.gz 77947 BLAKE2B 2ddc1a300b329ae91f72f1a8dad86443ba36fc02c7205eacafe1ec3ef82467003bb855c32485e6ca92b61dc45d160990b8aad531ace60ba3e55967f900150af6 SHA512 948abf878852da321f15c6060dfe33a2ab38f1787b0a6096f10bb3828d0b4e50226643e9dbcb678a422868c215b5c4e981dc7da5244d38688e8e91287beb8845
 DIST unifdef-2.12.tar.gz 87091 BLAKE2B d14072f79b9d8b17a033c7068a3c6a423c2e66570aac6d232e387ffd256bc66ad3c4c1467b6f101124bf494f2c12c7b8d37c64104623b0022e435a7e5aa78d5a SHA512 9a00f69309578817af5b3a6cf45f293506e8326b520bed7c0ab2f66661e32a115b7f5aa9b0572cfbee5887044e5f0d70967904ec137172e67a1aab5abe09d3b5
-EBUILD unifdef-2.10.ebuild 552 BLAKE2B 6982ce02d587d9e66da8a46a0c7d4e2ccdf6a6240180430d846486eef6d1d42f122375577c35ddd1f881843687f31df8cd47d765b832b5bccf9fe0c347d5f875 SHA512 c8ba1f1133ef965cf92f361ca321c0b85a018b246ca16e4e978dbc842e50bcb3a93b5cf18edbb8c2cefcca45d698dba9211e8a7d5154523db02e61aed7cc22ca
-EBUILD unifdef-2.11.ebuild 576 BLAKE2B 2e9b5e695f99ae2204016461fa70eba340a58453888fed5df40913d480dc08168dcbbfb470af3fc3a27d3d1871c3c630a830a4c1961727a5f3c930c01d784dc5 SHA512 1d8b5c4848da4a3ae48d151624f7ebf3e98939740cef5387242f09464cdd815ad8297578ad9a27ae62fd8a92f1163e574ce967a5647122c00f703c0abd677ea4
-EBUILD unifdef-2.12.ebuild 573 BLAKE2B a8844b11a4212d0177710f152e767a2f3c01f0765d8b8b393db6d74d2f6cc71fd044b60a7bb45b0fb4157c35f77d77554f3523d87d4daf859dea73fecc51ef96 SHA512 09da57341e09133ade1616ce9a6727b849a35f6fd0fee0923a6ba3ea98c93f8b26c41d3f43d8400a392e18bfc665fad9c2e91300862db51b09d647f57ea8c950
+EBUILD unifdef-2.10.ebuild 550 BLAKE2B 523e6498bc830021dfc59732c78984c069456748f0687e6de71a98465e1555dd96bc30c91eb4a284ade9caf7a35b173368c897255d4d5e61ee7686ca614c6985 SHA512 be8e0502545b4bab9f7ace36d5ae16e544faec4ecd13c892cd7546a57089b834edb73a281ec7ec4b72710511f60bb0e3f0b6af5a1612ba991c96270ceb8fb0a4
+EBUILD unifdef-2.11.ebuild 569 BLAKE2B 02870cff451d8cd6409099e4c79d3021e08489f2b818aaf4f932c6beacc7db258a370001861378e700188850dac29145b045e6aae3a6f0308c1f86b4554965ac SHA512 502d0aaa6c866b8a08121f6423ab51b399c8acb50e132a56c2d6fa0ea2646631074060229a5d04591f8edf2e874cb88f6363e8c191c64b85ae1bbdf2dbb39a38
+EBUILD unifdef-2.12.ebuild 569 BLAKE2B 02870cff451d8cd6409099e4c79d3021e08489f2b818aaf4f932c6beacc7db258a370001861378e700188850dac29145b045e6aae3a6f0308c1f86b4554965ac SHA512 502d0aaa6c866b8a08121f6423ab51b399c8acb50e132a56c2d6fa0ea2646631074060229a5d04591f8edf2e874cb88f6363e8c191c64b85ae1bbdf2dbb39a38
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/dev-util/unifdef/unifdef-2.10.ebuild b/dev-util/unifdef/unifdef-2.10.ebuild
index 561606f878f2..65b04c5d0a0e 100644
--- a/dev-util/unifdef/unifdef-2.10.ebuild
+++ b/dev-util/unifdef/unifdef-2.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dotat.at/prog/unifdef/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 
 DOCS=( README )
 
diff --git a/dev-util/unifdef/unifdef-2.11.ebuild b/dev-util/unifdef/unifdef-2.11.ebuild
index 848ad49bbe59..4a75de434b41 100644
--- a/dev-util/unifdef/unifdef-2.11.ebuild
+++ b/dev-util/unifdef/unifdef-2.11.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
@@ -11,7 +11,7 @@ SRC_URI="https://dotat.at/prog/unifdef/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 DOCS=( README )
 
diff --git a/dev-util/unifdef/unifdef-2.12.ebuild b/dev-util/unifdef/unifdef-2.12.ebuild
index e10516d447e9..4a75de434b41 100644
--- a/dev-util/unifdef/unifdef-2.12.ebuild
+++ b/dev-util/unifdef/unifdef-2.12.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dotat.at/prog/unifdef/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 DOCS=( README )
 
diff --git a/dev-util/valgrind/Manifest b/dev-util/valgrind/Manifest
index b28e50d2c4d5..455b50f33180 100644
--- a/dev-util/valgrind/Manifest
+++ b/dev-util/valgrind/Manifest
@@ -10,11 +10,11 @@ DIST valgrind-3.13.0.tar.bz2 14723076 BLAKE2B cdf92087575cc851d316e2136081441f52
 DIST valgrind-3.14.0.tar.bz2 16602858 BLAKE2B 00d601593388180cc874cf2f0c78e79f705f145e45ea82996117cb91ba881e7888ef241fb7e45927f82f99666d76ed35cb5d451e9a3ef123c04a0dff233b2269 SHA512 68e548c42df31dc2b883a403e0faff7480c49b3054841870f5d2f742141ba199eca5d83c96bbf283115f0633f2bdb0860161d422f98e3ec720ec65760d250f97
 DIST valgrind-3.15.0.tar.bz2 20241437 BLAKE2B a1bd46d46b3cd9f963773d011e7c74bf5e09e59be13afe38229a3c66a89eeb416498faed67d6ec21489b630b55ac73cc212e17ba515884f8b6374849a60e3720 SHA512 5695d1355226fb63b0c80809ed43bb077b6eed4d427792d9d7ed944c38b557a84fe3c783517b921e32f161228e10e4625bea0550faa4685872bb4454450cfa7f
 EBUILD valgrind-3.12.0.ebuild 2854 BLAKE2B 07c651acb3854432137f09513f991cb549b6192a704a26ed9626816f8650acfca0179c7064e772e59058a7657b1c0407a87753ec30b2209cf47aa04d68d908ca SHA512 a65f3ccca3a33e2bbae7d2616b2fa13a6a3913e927f601f8ef52172981f72c03219ccad126a801719688cb6106dea18c56ac0e14de194e065bffa744151ab457
-EBUILD valgrind-3.13.0-r1.ebuild 3428 BLAKE2B 96f18609fe79c997b4d344ecf59be9356aafd5ed7bc4e03b028f06e3e938ee1f00440289f7918ab935ccc42fa2bea2d316bb1d96c43ef40a85374b12e0b5683c SHA512 aa0fe6e76e52d25c6b05a30c46de96aabf539f7166bd369b21b93522d52e01d9fc50c77769170021038b0ec60911cd07bf5afccca86e35ad49828e401ed4d61e
-EBUILD valgrind-3.13.0-r2.ebuild 3879 BLAKE2B 03709383d7167d639ec5f3d461b0990c1d240a5260f5f4533a7dc79ca3b789ae9cfb7f749a11be2dfb410cadf7364ffd13515c63ee3673fee3fcb4d07b8a4b25 SHA512 c2f81be414f2d5d2853350b1e1652f5cc03578962d3a8ed5a31462defe970b1a5b7f4820f02fb76e4a7494ec5377af35149c0c22c9378619e2705247f490268b
-EBUILD valgrind-3.13.0-r3.ebuild 4121 BLAKE2B 0770974a05e87ad0ffec0516521d5954196b0a5ffc62ce2aae925bbe29a2acd076cac3d5751bf92535ce59f554ae51403849b1b7fb4c6f71ade7fcbe0c333554 SHA512 1f0921aba9cdd3a192fdc3ae5a77da773c7c9e485acbb38c9ac8de6208496d44d10edc01126e8488e17231c45cf8a769d3226ab18d8436e7857497a3b07dd2f8
+EBUILD valgrind-3.13.0-r1.ebuild 3426 BLAKE2B ff4af4b3e803f621bd53ec4ac9462e601d827b00701caeabd0e018fdb17730cf702d6c1c933daf2978c614d173a089251bdeb118581924dca77c632c059bfd0c SHA512 c5efc356252ad99cebe040fafabf99195b9680246f2a3e445a43ca806c368921d4c877f6e98046b3c8216d2111ce6d95dd35bb1c00e4419f57859a4b18dd575d
+EBUILD valgrind-3.13.0-r2.ebuild 3877 BLAKE2B 107080de02982255819cd09a3e99aea2c3b9f15c293cd4f750b11ba2ec0e2391963228568c4cb4cece3c2266402bb9dbe5da45f71991077244efba0443b6da01 SHA512 d51a3784c686ec2a7149941bb0a06bb9cfb3c2d902f1852f968258757fed7e1b7cdc407e4e865511553f26d19df98b26b1b14bfd5593344f4ab9850d997b0458
+EBUILD valgrind-3.13.0-r3.ebuild 4119 BLAKE2B 8058c6bf8ab43990b75005f22762c198eadd570b243191b1b4923c6cbbf22c96ddf4e7592585eb164d3b9f3e6cefeaf85809d1b91c16f7bb4f52ccbd4c608f71 SHA512 40c9ef13f1d1a198dcc9c2767c0da2744e902eec8189c3e04a66b6bd2b2508c553e4f8d8765576549cdbf57f0fd5b9ee2ebf14923b94a0489a1e3d3f26cdb91d
 EBUILD valgrind-3.13.0.ebuild 2854 BLAKE2B 8228042c5f24ce771f07f3b44c94a26dec805e7ce03ecd545a7b7caee1c3a41f93deeed2b298a99b9560614e64b54961e4df3c8d902984b34ed0b2e005568107 SHA512 771bf52c0436aa15175df29d10e3f191e5e9511a50dd466ef6a102c7b13d677ad84adf387b7edb99b6cdce1f38f644adbdc3a40bdaacabb22168f2aa07302fcc
-EBUILD valgrind-3.14.0.ebuild 3681 BLAKE2B 4edebcceac72d0191cc6a7dfc1c47bfb3bf7afb1acc15479346cbb7f4d7afc20311393c68f623e92f6ed7efa12cafb0c33dd888aca27defb6c0e1efe5f235b04 SHA512 e9e987302ff3dc55b345cb5b497b22599eca3c1fda2de35b350189b519ab2a1fcf33e959c814b40918c11994a2421eeb27b66bea48080cc0ac015108828f89d8
-EBUILD valgrind-3.15.0.ebuild 3760 BLAKE2B 5fab0a9e51847ba058db672e57f51bb9926dd8463d5b2e992fb458d2c14877ce3eb81c6e8ac4d69c585f65beb659f421b9b5c499d7a30ff72eba67a5133b33d4 SHA512 f98145f07f64e7576341acc05d222013c5c02755511bb0cf89795c153db34265498f70a7904716a11203262c2a14a3daca49590ed007f68559c9b0d7a1beb98e
-EBUILD valgrind-9999.ebuild 3755 BLAKE2B cc2dd005abd89595057c702a3f9afef60b554b3aaff7b0ad267a4c06db1b38df4106640952eefd2413fac5097a48df2d99f2b9e41f81be4731c587b3b7267156 SHA512 b24c9ebcdd36c1fc981cfd0a9e9233239dc6acc52b9d7a0a6533798580f8516b79486cbad800b9b64a4bcdb90c949bbca1e2fc813c19c7c6ed5ac282e2fe71d8
+EBUILD valgrind-3.14.0.ebuild 3682 BLAKE2B b5c775610622d2aa48db013dfe9cfc6d8db508b825df2cc3f7759de9d0467161cb7d5eb8c18aee8532ebf04a9aebfa3663b88661bc4d3d747916997a71d1904f SHA512 8fddf0b86912858fcd60ba23e301934dbd256efbbd8f08ba9972167cd04ab512f5f759acd3dd2a7c12e45428bb25ebb3674bd60b84cc6ab1dac38f492f9a8952
+EBUILD valgrind-3.15.0.ebuild 3761 BLAKE2B 0f839a8e208e33a879331b3791668987d51bac4bc8e9cff2eb03172736a3b9a8b24a256c01065d688f3a43845e4d915e6c68c61f68c4599f3bb7298cd5e82fbe SHA512 77bd2fce8757ef1b7e9f940c24aa184551781dfe139acfca63c92fa643e018e34b746b70e4f5f55a1a5738e4988beab986d5932711cb7c97d1e48e0daf85f72c
+EBUILD valgrind-9999.ebuild 3753 BLAKE2B 546a516d9a909f44e1c8dc20ace9025826335e2910e3652e1c7592804765fd4d679f6422276399c7629e2b711236181958dfe435198b8ebd8327b6f637cd67fd SHA512 64831f5594eee66cb5ed5a1afbc44708cf0f334e05b22e46c4675f35528628f5bb6f89981de420bcae568b18dee4767150a6465f75f1451cdd128bf297dd04bd
 MISC metadata.xml 1027 BLAKE2B df13361ec401ce5e0bfa11e51378c432405bd296a874d8c71c26c9cbdf0171689e4b3134b5e05672dfc22bbcd6e2b6c74b96c47367725c209990d3e1fcc65e7b SHA512 da5bcaf596f2adaa552cc3b7296891b40be0bafec8a12695076ce8fbe660b8aabe70508eb02ab3fb66b0d9dd0c0c8615f430c1ee0ce3f3579732ea2406c8a778
diff --git a/dev-util/valgrind/valgrind-3.13.0-r1.ebuild b/dev-util/valgrind/valgrind-3.13.0-r1.ebuild
index 1abaadfd6092..5e5e2d857dc6 100644
--- a/dev-util/valgrind/valgrind-3.13.0-r1.ebuild
+++ b/dev-util/valgrind/valgrind-3.13.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -11,7 +11,7 @@ SLOT="0"
 IUSE="mpi"
 
 if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="git://sourceware.org/git/${PN}.git/"
+	EGIT_REPO_URI="https://sourceware.org/git/${PN}.git"
 	inherit git-r3
 else
 	SRC_URI="ftp://sourceware.org/pub/valgrind/${P}.tar.bz2"
diff --git a/dev-util/valgrind/valgrind-3.13.0-r2.ebuild b/dev-util/valgrind/valgrind-3.13.0-r2.ebuild
index 0ef938d860fd..a43faba96365 100644
--- a/dev-util/valgrind/valgrind-3.13.0-r2.ebuild
+++ b/dev-util/valgrind/valgrind-3.13.0-r2.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=6
@@ -11,7 +11,7 @@ SLOT="0"
 IUSE="mpi"
 
 if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="git://sourceware.org/git/${PN}.git/"
+	EGIT_REPO_URI="https://sourceware.org/git/${PN}.git"
 	inherit git-r3
 else
 	SRC_URI="ftp://sourceware.org/pub/valgrind/${P}.tar.bz2"
diff --git a/dev-util/valgrind/valgrind-3.13.0-r3.ebuild b/dev-util/valgrind/valgrind-3.13.0-r3.ebuild
index 4c963a7314dd..287d09b89caa 100644
--- a/dev-util/valgrind/valgrind-3.13.0-r3.ebuild
+++ b/dev-util/valgrind/valgrind-3.13.0-r3.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=6
@@ -11,7 +11,7 @@ SLOT="0"
 IUSE="mpi"
 
 if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="git://sourceware.org/git/${PN}.git/"
+	EGIT_REPO_URI="https://sourceware.org/git/${PN}.git"
 	inherit git-r3
 else
 	SRC_URI="ftp://sourceware.org/pub/valgrind/${P}.tar.bz2"
diff --git a/dev-util/valgrind/valgrind-3.14.0.ebuild b/dev-util/valgrind/valgrind-3.14.0.ebuild
index e7ce366d68a0..cd973a989871 100644
--- a/dev-util/valgrind/valgrind-3.14.0.ebuild
+++ b/dev-util/valgrind/valgrind-3.14.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=6
@@ -11,7 +11,7 @@ SLOT="0"
 IUSE="mpi"
 
 if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="git://sourceware.org/git/${PN}.git/"
+	EGIT_REPO_URI="https://sourceware.org/git/${PN}.git"
 	inherit git-r3
 else
 	SRC_URI="ftp://sourceware.org/pub/valgrind/${P}.tar.bz2"
diff --git a/dev-util/valgrind/valgrind-3.15.0.ebuild b/dev-util/valgrind/valgrind-3.15.0.ebuild
index 266a720e3919..ac8952f253c0 100644
--- a/dev-util/valgrind/valgrind-3.15.0.ebuild
+++ b/dev-util/valgrind/valgrind-3.15.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=6
@@ -11,7 +11,7 @@ SLOT="0"
 IUSE="mpi"
 
 if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="git://sourceware.org/git/${PN}.git/"
+	EGIT_REPO_URI="https://sourceware.org/git/${PN}.git"
 	inherit git-r3
 else
 	SRC_URI="ftp://sourceware.org/pub/valgrind/${P}.tar.bz2"
diff --git a/dev-util/valgrind/valgrind-9999.ebuild b/dev-util/valgrind/valgrind-9999.ebuild
index 41689a1904e1..aa72dd092528 100644
--- a/dev-util/valgrind/valgrind-9999.ebuild
+++ b/dev-util/valgrind/valgrind-9999.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=6
@@ -11,7 +11,7 @@ SLOT="0"
 IUSE="mpi"
 
 if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="git://sourceware.org/git/${PN}.git/"
+	EGIT_REPO_URI="https://sourceware.org/git/${PN}.git"
 	inherit git-r3
 else
 	SRC_URI="ftp://sourceware.org/pub/valgrind/${P}.tar.bz2"
diff --git a/dev-util/vint/Manifest b/dev-util/vint/Manifest
index 7c658c4da600..3885efa5e722 100644
--- a/dev-util/vint/Manifest
+++ b/dev-util/vint/Manifest
@@ -1,7 +1,7 @@
 DIST vint-0.3.18.tar.gz 95865 BLAKE2B 0f7e61b720aa0998091b9b40118b199392fbf1aeace8801d683e8249179cd3d792e15b42df6d34c567c4df1830629a80e6043e87092f37dc46a0e57c6a56cf53 SHA512 1d3e04527a8f5ffae29395010a88258c1771aff2798143eff6572400eaf96323cad04353a7fcee68d9407afde5808446f515fd3d7e8e62de4bef28edf214ebdd
 DIST vint-0.3.19.tar.gz 96755 BLAKE2B 0b03807a4286b3e030e00c112dd0e879fa39e0d2333d46ea159555de50b30098d9a8b2345da8e18b7e1e5c814f10678df2e64398a615bf381186faa0036939f5 SHA512 b9024ed1cd8a18a916798e691ba0db31985034b2420e33c094459a48254c7c8f6fe89a1a64858a67ff95b0b48e67a780cf975940646af2685d2b95640e8121f9
 DIST vint-0.3.21.tar.gz 96747 BLAKE2B 926b46493030dc0daa477ded3cb70f2b825b4eb8054c14a4b824b97e7df60d0141cf1bcf4c33893afd870f51308b7156fb6e5870f320f8c9449fdca8fe78774f SHA512 47e832d382952cb16bcc233eefa1f06ca74f95eb445d7f96d6804391b91a2c8a8e7b749b7f33f65aed9d3bdc1ff5e5332a62c3935969395f16a854f0f66e383b
-EBUILD vint-0.3.18.ebuild 1332 BLAKE2B 7c3dfd1254b5928e4d23d03db492911ce72b7cb22d78bc3754b1c3cf3e67c2c25b6b43d860a40b19601ca6c6387439474179b919ae2d0ca5ff1e20314023b97c SHA512 19a9e76f6dd1253eb3069ff296bd444e73697a3b83103e3cc8d0508c1d1e5503a46d12e99a513ce4f3c17fde32f74d7b0300078db0eb4b9258596330366de2ab
-EBUILD vint-0.3.19.ebuild 919 BLAKE2B 8d6a40a265227d2a98ec8e0e73985e8c9fbaf432a82bf50f942321fb10f5d38459fdff5138466311935cceae8c437fb85473305218aac83a6de5b7978eb9101a SHA512 ccd7f66e347c96d5b69d57a52e7865ad7f2fdea5d885cd6f40ff23ac454e7eecfefbcde57a55236b2b66bfa63052d04804ee77a5cb4683ec5b5f1b569585a444
-EBUILD vint-0.3.21.ebuild 1013 BLAKE2B f41ee65c352afba90f1a32ef65308fce86cf74d1f079dc0a89bd41580acdf61bd31ba1bf750aa099548b1f62ebe5668126fc0892e5f55733b5a396a24395f1bc SHA512 0f5feb86c302453161ab023d664e59e9e81d40eda881361f6178e906be66da8b4719d3e0a8db89cbb060f61c709afa5ff3c11c80848149b04bc0ce8c2e00bff7
+EBUILD vint-0.3.18.ebuild 1129 BLAKE2B 40110c5dfd5c868f64056509edac708186a912695b862d7acec3b14578cac5985e7dae93b427814ee99da1d4438c6cc9df6b16b4f7a7ead90099eb3e8b8a6eb8 SHA512 6a82abccf0175baa0c29fe68a961f4ed79d35a9c5418c7fcb7d9d44321b963f1c8915429734fa2bb137533583f7bf6ebba59e445de8f330a6a409d930b980041
+EBUILD vint-0.3.19.ebuild 795 BLAKE2B 44973fd78bab0d247dde6777cb92cfea10052cf799ac85671c74a61ff91bc2754c8bf53be487bcb9ba65141a0f61bb57348a4b36cf4d1ccd7306b0085f6a5686 SHA512 f59eb59490a74422811dc2f772bde92f5c9b546f80bb417a14698ad5d81cedc570a98b711822918d75495d0f10c9e4cc4f004c506eaec45e21d5b123502c3c81
+EBUILD vint-0.3.21.ebuild 889 BLAKE2B 4acf55adcabcfb5c959934be60e044fd9244abbf758fb9c3f859308f216501004496c411c3bee734319c41bd8d8fded4eb80b90a19a8018c58b515c7892e7e39 SHA512 ef5d6624a59b38fdb3a262de936c4c01ee230c99bd69fa952ef40ce895c398760dbf77ff5df818e37075b06b63434e18f702146b0b4810ba7342068ec75a301c
 MISC metadata.xml 553 BLAKE2B 2fa32b5a72b9d9fd9587db124e7786d8f4a4607084016166b36f02cae5c6b7d4ed375c462ffeb770fb0799aec8a20e7509a627219cd21109d1ab2bb4575a901f SHA512 715bf84e6bb405197f1667a8e03bc14d4e05ab6393f863bbdd56a56c8e92789fdcc4ad3ef0d3e65934e4a8f759acf50d9e6f52aaeab4a3955e6d9b9edba6f891
diff --git a/dev-util/vint/vint-0.3.18.ebuild b/dev-util/vint/vint-0.3.18.ebuild
index a8842c4b1623..6039b4556fb1 100644
--- a/dev-util/vint/vint-0.3.18.ebuild
+++ b/dev-util/vint/vint-0.3.18.ebuild
@@ -21,9 +21,6 @@ RDEPEND="
 	>=dev-python/ansicolor-0.2.4[${PYTHON_USEDEP}]
 	>=dev-python/chardet-2.3.0[${PYTHON_USEDEP}]
 	>=dev-python/pyyaml-3.11[${PYTHON_USEDEP}]
-	virtual/python-enum34[${PYTHON_USEDEP}]
-	virtual/python-pathlib[${PYTHON_USEDEP}]
-	virtual/python-typing[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}
@@ -31,7 +28,6 @@ DEPEND="${RDEPEND}
 		>=dev-python/coverage-3.7.1[${PYTHON_USEDEP}]
 		>=dev-python/pytest-2.6.4[${PYTHON_USEDEP}]
 		>=dev-python/pytest-cov-1.8.1[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]' python2_7)
 	)
 "
 
diff --git a/dev-util/vint/vint-0.3.19.ebuild b/dev-util/vint/vint-0.3.19.ebuild
index 37d2eeb1dbc6..79f99c6519db 100644
--- a/dev-util/vint/vint-0.3.19.ebuild
+++ b/dev-util/vint/vint-0.3.19.ebuild
@@ -21,9 +21,6 @@ RDEPEND="
 	>=dev-python/ansicolor-0.2.4[${PYTHON_USEDEP}]
 	>=dev-python/chardet-2.3.0[${PYTHON_USEDEP}]
 	>=dev-python/pyyaml-3.11[${PYTHON_USEDEP}]
-	virtual/python-enum34[${PYTHON_USEDEP}]
-	virtual/python-pathlib[${PYTHON_USEDEP}]
-	virtual/python-typing[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}
diff --git a/dev-util/vint/vint-0.3.21.ebuild b/dev-util/vint/vint-0.3.21.ebuild
index fa27da44ce3c..6f3784ee9362 100644
--- a/dev-util/vint/vint-0.3.21.ebuild
+++ b/dev-util/vint/vint-0.3.21.ebuild
@@ -20,9 +20,6 @@ RDEPEND="
 	>=dev-python/ansicolor-0.2.4[${PYTHON_USEDEP}]
 	>=dev-python/chardet-2.3.0[${PYTHON_USEDEP}]
 	>=dev-python/pyyaml-3.11[${PYTHON_USEDEP}]
-	virtual/python-enum34[${PYTHON_USEDEP}]
-	virtual/python-pathlib[${PYTHON_USEDEP}]
-	virtual/python-typing[${PYTHON_USEDEP}]
 "
 
 distutils_enable_tests pytest
diff --git a/dev-util/vulkan-headers/Manifest b/dev-util/vulkan-headers/Manifest
index 1da9b9246272..58d1a6a5ecca 100644
--- a/dev-util/vulkan-headers/Manifest
+++ b/dev-util/vulkan-headers/Manifest
@@ -1,4 +1,8 @@
 DIST vulkan-headers-1.1.125.tar.gz 662594 BLAKE2B 7cd18b74ff804ed02df3378485f0783332bd09bf898769c48ded20f7a6495b5208cfae3616de401e17ffcec30421b48222520dcd90b03ad83b548405fd8a656c SHA512 355df13347aaa3b32ad62185810c20d1b2f358525d9d8036f6bc7643e7505a25c087a51e05fa7b0758e4ee63221bb39d01d6e14bfb7f99a53cb2127ca5db5d67
+DIST vulkan-headers-1.2.133.tar.gz 713107 BLAKE2B a29272618d224195d38e13d40ca22ee4822e38f5c7b72d3dc02130ccc6a053e05b955993ec4842486f444d819a7f4a6af0690b5c925e6194f254cc196d024cf2 SHA512 9a8375e2634f55bc50653d530db774d39833ca0e9221f6a50667567b254e7334398cb8c0318cb1342b720f223b795933c546cab3cb433443dfbf2a9702700a4f
+DIST vulkan-headers-1.2.136.tar.gz 757563 BLAKE2B 0f793b260cf13eaff58f26b03b5a874202882e7f1de93db5e703f3f24653d4b0e3845c94a96dab8d19f8efba1c3abc9d8df5c2036f16184ca4e59c6abc94c0cc SHA512 cf3bf2cc930fc3642f867f163844267e9ccbc0587ca619b13a5349cc4b914c44f240347ce9b62afe321f769904f9599cecad37bac6a435603db70419e7a1edd2
 EBUILD vulkan-headers-1.1.125.ebuild 789 BLAKE2B 0b41fcc284ee87fc0b5ee161ed1bb7fd7c9d2c6c3827bb8358a0b51bac5f2a358368d797510410c2c46b64a9a25b898293158830dbe3ec81a9a64e4501324d48 SHA512 151e8be50ec7117f314338cc7ed397ed7b33de9dd3c1eeb7f2b07ce87273c11adb7abb4a284046e2aeb0102390a69de6f739f539579c0603d405351a2a1dbd5f
-EBUILD vulkan-headers-9999.ebuild 791 BLAKE2B 83bd4fce1b7e21c4614ef9d57096be9a4e3203bb54969bcab2f394fd2ca01f33f81c0c35c915480b5a07c355d87c24094dbe6a5eced3c6d51d322238381f044f SHA512 983f89e0dd1199e47752df699900a68a3cc972a72b589b136f8b1c5dac6bab8c8c608f51f08499f4681269f4cf6aac21bce0d050e3a68c399f9588405c899fef
+EBUILD vulkan-headers-1.2.133.ebuild 593 BLAKE2B 101dc4954cc61f0375202d2398a3bab6e99e379f9dbc3aaab01129670e0413cba3fc9d15f031a44f634ec7576f0cd6bbd52ccfdbec0de9d703f6db5a9a2eff52 SHA512 a95238b09e9d71d72588e9e90af0d99590a8d4fffb6b134cc75c5b9bfc542c40f7a438447ce06aaf4a5ea5922d9ce49763af91b49934c8f66fc5dbb1d7ea8246
+EBUILD vulkan-headers-1.2.136.ebuild 593 BLAKE2B 101dc4954cc61f0375202d2398a3bab6e99e379f9dbc3aaab01129670e0413cba3fc9d15f031a44f634ec7576f0cd6bbd52ccfdbec0de9d703f6db5a9a2eff52 SHA512 a95238b09e9d71d72588e9e90af0d99590a8d4fffb6b134cc75c5b9bfc542c40f7a438447ce06aaf4a5ea5922d9ce49763af91b49934c8f66fc5dbb1d7ea8246
+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.133.ebuild b/dev-util/vulkan-headers/vulkan-headers-1.2.133.ebuild
new file mode 100644
index 000000000000..10d614b0d1fe
--- /dev/null
+++ b/dev-util/vulkan-headers/vulkan-headers-1.2.133.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN=Vulkan-Headers
+inherit cmake
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~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.136.ebuild b/dev-util/vulkan-headers/vulkan-headers-1.2.136.ebuild
new file mode 100644
index 000000000000..10d614b0d1fe
--- /dev/null
+++ b/dev-util/vulkan-headers/vulkan-headers-1.2.136.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN=Vulkan-Headers
+inherit cmake
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~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-9999.ebuild b/dev-util/vulkan-headers/vulkan-headers-9999.ebuild
index 5a328302ddb8..10d614b0d1fe 100644
--- a/dev-util/vulkan-headers/vulkan-headers-9999.ebuild
+++ b/dev-util/vulkan-headers/vulkan-headers-9999.ebuild
@@ -3,29 +3,22 @@
 
 EAPI=7
 
-inherit cmake-utils
+MY_PN=Vulkan-Headers
+inherit cmake
 
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-Headers.git"
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
 	inherit git-r3
 else
-	if [[ -z ${SNAPSHOT_COMMIT} ]]; then
-		MY_PV=v${PV}
-		MY_P=Vulkan-Headers-${PV}
-	else
-		MY_PV=${SNAPSHOT_COMMIT}
-		MY_P=Vulkan-Headers-${SNAPSHOT_COMMIT}
-	fi
+	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~ppc64 ~x86"
-	SRC_URI="https://github.com/KhronosGroup/Vulkan-Headers/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}"/${MY_P}
+	S="${WORKDIR}"/${MY_PN}-${PV}
 fi
 
-RDEPEND="!<dev-util/vulkan-tools-1.1.124
-	 !<media-libs/vulkan-layers-1.1.125"
-
 DESCRIPTION="Vulkan Header files and API registry"
 HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Headers"
 
 LICENSE="Apache-2.0"
 SLOT="0"
+
+BDEPEND=">=dev-util/cmake-3.10.2"
diff --git a/dev-util/vulkan-tools/Manifest b/dev-util/vulkan-tools/Manifest
index 38159ee96c8d..cbd8c4437320 100644
--- a/dev-util/vulkan-tools/Manifest
+++ b/dev-util/vulkan-tools/Manifest
@@ -1,4 +1,8 @@
 DIST vulkan-tools-1.1.124.tar.gz 691639 BLAKE2B 6c40d8fd9498205bac9eedfc97486a0567f503847f5efff7d2e36563f72862b9a74e7d5b8c61e7d92822a4fbb91c24ee72614f7efb85aff68d4dbda42e09c422 SHA512 9f1f5dad1a5a847dc2fcc43382ee86f19a4c4b97c300f096b3cb33852378fcb260c33e6e920e9b70839a726bd6473ccceb8ef7504a530a3553dcb30c3ac74421
+DIST vulkan-tools-1.2.133a.tar.gz 698176 BLAKE2B 55f1b298a5daf7c656492c75999002aa54811df448f635e6d0c95cf717ae00c8d8158c39557c3c646281f1b763a848716d1a4429540a5a3a137462e355338427 SHA512 3f7a431b6889e2d62d16105b928707b9ae9d77515398284bfde8ced7b0741523f0b37c281c789d5c786c089854010edb9c7b18ed373f342ca0db7533ec9fd698
+DIST vulkan-tools-1.2.135.tar.gz 709765 BLAKE2B 3e25e8936ebad2b5488618ec3680a322e9b3b20976cbf8e61b37702482e2203bc93c6f63ad5122688e074e9f1b178c57fa32b623ca07321fd7fb08b5aec9eef3 SHA512 604f4815b837bffca132fc0cb6f155ad59c8c13d68dea70d1ca18d1595c6c834f296faac551467766b5e7fe3e3afa3e91c0bb299b365603de2719df9232dde40
 EBUILD vulkan-tools-1.1.124.ebuild 2289 BLAKE2B 9ef4efda8cfbe0b26afb75e983a91552a25d32a788f6f24f28e5a2cff0bda510be9b2895b708c047bc07dd74544ca043aa7d465dc15be13dd31fb6d443e242a9 SHA512 f877f93a5e449cc497ad3cae1a35f4289a3d3b3d81c762d9a7f68e7024548dd68d2021bcae93166ad8c4e7756d931e63612579cd55fb4d2a27fe451291134e33
-EBUILD vulkan-tools-9999.ebuild 2290 BLAKE2B 4eaaf1b8a37672216bdbbbf35f55713d2b379095607050e939b166e61240f3f569cfd170af6eb90358419c71c2cf2ec9ef947e661ead5bc7f3dc94a8e296f2ef SHA512 eb5660a4dad48b69efe4054990a7d19f05dd1d5aad4e026c0315c08d1ba520e2d1b421d983b1a1b30559fcf9def1bd4af800c161ae4c2552e79ec74e66c70fbf
+EBUILD vulkan-tools-1.2.133-r1.ebuild 1870 BLAKE2B 255a251faaad7fce7731196a7e15ec2726a821bae1392af9cf802d6bc85c7b66428f51521d0e61b7c9674cb4c67946a5056fa1efa3dbc45ccd514247a9218c04 SHA512 7f1996a305286d3827adb41ceb3d31469024f54d9318970fb7f536b17a8ec26cedc8305725c754211b29bd6040b43f1bd45e63c6772da21c6b6b157a51b1691f
+EBUILD vulkan-tools-1.2.135.ebuild 1869 BLAKE2B f47caf24e21149f31c79b2ed3d71b729d6b41ed899212c07bb40f1385e75b7db6a09d54c75a9989a10bf3da21bff2a53a57a9f42b5b28399cece42e25c1e2621 SHA512 3f8b8bf5e6490643cb051cbe7d6827f48d357e374d59a5164159be34d09397ced64a14525488d0c187fe050980c56b8eb98ceefb8a7340c2061a3835392e85bd
+EBUILD vulkan-tools-9999.ebuild 1869 BLAKE2B f47caf24e21149f31c79b2ed3d71b729d6b41ed899212c07bb40f1385e75b7db6a09d54c75a9989a10bf3da21bff2a53a57a9f42b5b28399cece42e25c1e2621 SHA512 3f8b8bf5e6490643cb051cbe7d6827f48d357e374d59a5164159be34d09397ced64a14525488d0c187fe050980c56b8eb98ceefb8a7340c2061a3835392e85bd
 MISC metadata.xml 562 BLAKE2B 0d3fae7aac348ecb5252688443f81be2cd97c5872c9b81cd11a730fc643d4e650132e318311c40b6448ce6dc22f27a4075a0d454e3dde8b05e16aeac4fd06329 SHA512 4e4b8dbb4ddefaf21606746c958b4054340897f5e8cafab65b2ee272b01c03ef642b1000fff33c8a046afb1eb82b2cd7400348b9b284ee0f1eea48e856eee854
diff --git a/dev-util/vulkan-tools/vulkan-tools-1.2.133-r1.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.2.133-r1.ebuild
new file mode 100644
index 000000000000..ff7a561dba67
--- /dev/null
+++ b/dev-util/vulkan-tools/vulkan-tools-1.2.133-r1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN=Vulkan-Tools
+CMAKE_ECLASS="cmake"
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit cmake-multilib python-any-r1
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
+	EGIT_SUBMODULES=()
+	inherit git-r3
+else
+	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}a.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.135.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.2.135.ebuild
new file mode 100644
index 000000000000..1d6d8e74d61e
--- /dev/null
+++ b/dev-util/vulkan-tools/vulkan-tools-1.2.135.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN=Vulkan-Tools
+CMAKE_ECLASS="cmake"
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit cmake-multilib python-any-r1
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
+	EGIT_SUBMODULES=()
+	inherit git-r3
+else
+	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc64"
+	S="${WORKDIR}"/${MY_PN}-${PV}
+fi
+
+DESCRIPTION="Official Vulkan Tools and Utilities for Windows, Linux, Android, and MacOS"
+HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Tools"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="cube wayland +X"
+
+# Cube demo only supports one window system at a time
+REQUIRED_USE="!cube? ( || ( X wayland ) ) cube? ( ^^ ( X wayland ) )"
+
+BDEPEND="${PYTHON_DEPS}
+	>=dev-util/cmake-3.10.2
+	cube? ( dev-util/glslang:=[${MULTILIB_USEDEP}] )
+"
+RDEPEND="
+	>=media-libs/vulkan-loader-${PV}:=[${MULTILIB_USEDEP},wayland?,X?]
+	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
+	X? (
+		x11-libs/libX11:=[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}
+	>=dev-util/vulkan-headers-${PV}
+"
+
+pkg_setup() {
+	MULTILIB_CHOST_TOOLS=(
+		/usr/bin/vulkaninfo
+	)
+
+	use cube && MULTILIB_CHOST_TOOLS+=(
+		/usr/bin/vkcube
+		/usr/bin/vkcubepp
+	)
+
+	python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=ON
+		-DBUILD_VULKANINFO=ON
+		-DBUILD_CUBE=$(usex cube)
+		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
+		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
+		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
+		-DVULKAN_HEADERS_INSTALL_DIR="${EPREFIX}/usr"
+	)
+
+	use cube && mycmakeargs+=(
+		-DGLSLANG_INSTALL_DIR="${EPREFIX}/usr"
+		-DCUBE_WSI_SELECTION=$(usex X XCB WAYLAND)
+	)
+
+	cmake_src_configure
+}
+
+multilib_src_install() {
+	cmake_src_install
+}
diff --git a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
index 70535b3958e7..1d6d8e74d61e 100644
--- a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
+++ b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
@@ -2,93 +2,80 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
 
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-Tools.git"
+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
-	EGIT_COMMIT="119e7c3bbae122f6cc5d778d068fb91e0e85d6a9"
+	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~ppc64"
-	SRC_URI="https://github.com/KhronosGroup/Vulkan-Tools/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/Vulkan-Tools-${EGIT_COMMIT}"
+	S="${WORKDIR}"/${MY_PN}-${PV}
 fi
 
-inherit python-any-r1 cmake-multilib
-
 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 +vulkaninfo +X wayland"
-COMMON_DEPEND=">=media-libs/vulkan-loader-1.1.125:=[${MULTILIB_USEDEP},wayland?,X?]
+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}]
-	)"
-
-BDEPEND="${PYTHON_DEPS}
-	cube? ( dev-util/glslang:=[${MULTILIB_USEDEP}] )"
-DEPEND=">=dev-util/vulkan-headers-1.1.125
-	${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-
-# Vulkaninfo does not support wayland
-REQUIRED_USE="|| ( X wayland )
-			vulkaninfo? ( X )"
+	)
+"
+DEPEND="${RDEPEND}
+	>=dev-util/vulkan-headers-${PV}
+"
 
 pkg_setup() {
-	MULTILIB_CHOST_TOOLS=()
-
-	if use vulkaninfo; then
-		MULTILIB_CHOST_TOOLS+=( /usr/bin/vulkaninfo )
-	fi
+	MULTILIB_CHOST_TOOLS=(
+		/usr/bin/vulkaninfo
+	)
 
-	if use cube; then
-		MULTILIB_CHOST_TOOLS+=(
-			/usr/bin/vkcube
-			/usr/bin/vkcubepp
-		)
-	fi
+	use cube && MULTILIB_CHOST_TOOLS+=(
+		/usr/bin/vkcube
+		/usr/bin/vkcubepp
+	)
 
 	python-any-r1_pkg_setup
 }
 
 multilib_src_configure() {
 	local mycmakeargs=(
-		-DCMAKE_SKIP_RPATH=True
+		-DCMAKE_SKIP_RPATH=ON
+		-DBUILD_VULKANINFO=ON
 		-DBUILD_CUBE=$(usex cube)
-		-DBUILD_VULKANINFO=$(usex vulkaninfo)
 		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
 		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
 		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
-		-DGLSLANG_INSTALL_DIR="/usr"
-		-DVULKAN_HEADERS_INSTALL_DIR="/usr"
+		-DVULKAN_HEADERS_INSTALL_DIR="${EPREFIX}/usr"
 	)
 
-	# Upstream only supports one window system at a time
-	# If X is set at all, even if wayland is set, use X
-	#
-	# If -cube and/or -vulkaninfo is set, the flags we set
-	# are ignored, so we don't need to consider that
-	if use X; then
-		mycmakeargs+=(
-			-DCUBE_WSI_SELECTION="XCB"
-		)
-	fi
-
-	if ! use X && use wayland; then
-		mycmakeargs+=(
-			-DCUBE_WSI_SELECTION="WAYLAND"
-		)
-	fi
+	use cube && mycmakeargs+=(
+		-DGLSLANG_INSTALL_DIR="${EPREFIX}/usr"
+		-DCUBE_WSI_SELECTION=$(usex X XCB WAYLAND)
+	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 multilib_src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 }
diff --git a/dev-util/waf/Manifest b/dev-util/waf/Manifest
deleted file mode 100644
index 0aa7aaa05c29..000000000000
--- a/dev-util/waf/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST waf-1.9.14.tar.bz2 631021 BLAKE2B b822cfcee033846b075baad98c69833d54563a23075704acdf6c140b08cf4c5e263465b618830ecae979eaf741f83a849f37d714c18cf355b49a62bc30214904 SHA512 5b7e556eeb3ceec83e81e9b849786d7921aa06e443aa2fb5f288e3fcef6b05b3a1a6aa4ebcdfd0bd345ea3166980cb926cbea2260a229613bdcb2def86fb5816
-EBUILD waf-1.9.14.ebuild 976 BLAKE2B 8dc614debfa8673d99e5ec5cda64a1808ad0b11f0c2e110492a2ac526f5ffe42eba697b094615378ff825268ce096800fb273da93330d711c689a4cab69a4808 SHA512 07f44cde6bd70e93dd018205b0664685af68f31c98f4b46b0d7549b66ad9fa333a23d7b6f1874b37d1d5ae528aa214b5f94ef8e6fdf6bd7865d1a4989239ff8e
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/waf/metadata.xml b/dev-util/waf/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/dev-util/waf/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/waf/waf-1.9.14.ebuild b/dev-util/waf/waf-1.9.14.ebuild
deleted file mode 100644
index eb73b405ad26..000000000000
--- a/dev-util/waf/waf-1.9.14.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-PYTHON_REQ_USE="threads(+)"
-inherit python-any-r1 toolchain-funcs
-
-DESCRIPTION="piece of software used to help building software projects"
-HOMEPAGE="https://waf.io/"
-SRC_URI="https://waf.io/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="examples"
-
-DEPEND="${PYTHON_DEPS}"
-
-DOCS="ChangeLog README.md DEVEL"
-
-src_prepare() {
-	rm -v waf || die
-
-	default
-}
-
-src_configure() {
-	${EPYTHON} ./waf-light configure
-}
-
-src_compile() {
-	${EPYTHON} ./waf-light build
-}
-
-src_install() {
-	default
-
-	#point waf binary to waflib dir and strip payload
-	sed -e "/INSTALL=/s:=.*:='${EROOT}usr':" \
-		-e "/REVISION=/s:=.*:='${PR}':" \
-		-e "s:/lib/:/$(get_libdir)/:" \
-		-e "/^#\(==>\|BZ\|<==\)/d" \
-		-i waf || die
-	dobin waf
-
-	insinto /usr/$(get_libdir)/${PN}3-${PV}-${PR}
-	doins -r waflib
-
-	if use examples ; then
-		dodoc -r demos
-	fi
-}
diff --git a/dev-util/xdelta/Manifest b/dev-util/xdelta/Manifest
index 452ccb66c7a4..b1b2e475e803 100644
--- a/dev-util/xdelta/Manifest
+++ b/dev-util/xdelta/Manifest
@@ -4,7 +4,7 @@ AUX xdelta-1.1.4-pkgconfig.patch 2551 BLAKE2B 606dd386fbfb768c931e2c08b5508f6bc3
 DIST xdelta-1.1.4.tar.gz 423529 BLAKE2B b565f82ba0504118b74127096939e5699ea312be5c6c8a345abfcf0fb01b45e759abe595b33619b2714671e2f0307d603366a1f7a6b1fb5a786378716a51df6b SHA512 eef45f7977e9a7f490b881f33ab8a948cc5eff9300ea850cc30062905c8e883c104961f075f56f7ce8e385142c35de168aef1e0b8169bda66786ea4bee33168b
 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-r2.ebuild 716 BLAKE2B 199d2bb06d274952f4e0799a8006b458127e8d37545fb93d0e9c25b0a6aff3666c1c7f2c4a2b2e5054e23d1d3085539f5ba62f060472c9a3c6fd7e65fb79ded2 SHA512 8a65ad3015e1894c826209174e1a20fd2831c12be315b02032b71c5632dec6d304fd6cf3b7fa55d42a01af27261c4320519ee04b8aa789fee909197046988b90
-EBUILD xdelta-3.0.11.ebuild 838 BLAKE2B e45116ddbc4995a4a07b6e92410e06e315d8054619440688f9d73fed1621a90c5c8693ae6c68d2f9d301e83e88e048d2c41f8f3e57a7e2b7bf3c2e0afe9d95cc SHA512 2d8c96c90c3828b302d97414c6fb75617da875a4c59ccc4d743236464de81d7875564f57eed72b004a36031ce94ee21e2f2c8e5b7daa1c2136058c03d8b1b615
+EBUILD xdelta-1.1.4-r2.ebuild 717 BLAKE2B cb71ff2580f5e8053922eef0e7049f6088e524b6deeb06fb6762ea1bc61e1815f1010c22386d8ecc43785ed829660e459da226ab4f139c0259f3c5eacfa70286 SHA512 9426f88e3d7bcdc9c9572662f2c8b29a5466f9295b649cb72b195cc6994f57dbaa86891e51a2880c983678f0b033731f5e152da5eab969f624f3aa4e520ba963
+EBUILD xdelta-3.0.11.ebuild 839 BLAKE2B d6d4f4d5c9ff3f7d1c59aeab589969a7325eaf1181e3f6576c14dff9632cb26c930e890b7ff8b5e2ccdde018bff17577de30415a020f6677b49b77256e254115 SHA512 a5b275381ef15e9907052214debb03900ede767a8b14130d9028a8376902ae21ffe7919af64544fbf20478873feedd976c67f2939ea542f8a562aa8008e3893b
 EBUILD xdelta-3.1.0.ebuild 1146 BLAKE2B 214a9cd0019516af48e204567cba7d68cd370896622ffbf2e86c518ef3ac66d2900174a6fa34034e9788dafaf8d20816120e594f157470839ef6394c5433c9c3 SHA512 1e767dc1456bb84b68866d511423d916fbf1593a68d3a34ec3c863769f37442390f4a96388848e653997ae8cd81b1e12d81926580dc7fd9ee64728ed3ed7b6ce
 MISC metadata.xml 381 BLAKE2B 1e67843f342c5d64a78b0ec5f6b20cb6c091f020be78355e83cc5ab8d53312fa97e025d9f819e73fd0c4fe936d15bf87600835bcf2d9040ba67dc740d270d2cf SHA512 2c439c35f726e18396d3a0f2e923cf2f2d0eb7a9798907fd0f039dddcc9fdbac95d6e89d113fc8a937ceb260c90901e0657ecdea2f0bf423ca9456627b2912d3
diff --git a/dev-util/xdelta/xdelta-1.1.4-r2.ebuild b/dev-util/xdelta/xdelta-1.1.4-r2.ebuild
index 02b43b8f757c..2a2f44f7aaad 100644
--- a/dev-util/xdelta/xdelta-1.1.4-r2.ebuild
+++ b/dev-util/xdelta/xdelta-1.1.4-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2
diff --git a/dev-util/xdelta/xdelta-3.0.11.ebuild b/dev-util/xdelta/xdelta-3.0.11.ebuild
index 9902a94ec3e5..23d1fb802b53 100644
--- a/dev-util/xdelta/xdelta-3.0.11.ebuild
+++ b/dev-util/xdelta/xdelta-3.0.11.ebuild
@@ -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 hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="examples lzma"
 
 RDEPEND="lzma? ( app-arch/xz-utils:= )"
diff --git a/dev-util/xesam-tools/Manifest b/dev-util/xesam-tools/Manifest
deleted file mode 100644
index fc0be915fb8f..000000000000
--- a/dev-util/xesam-tools/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST xesam-tools-0.7.0.tar.gz 73173 BLAKE2B f1d8f69d18bd72db4ca40131be8c2e9eac8752d18d8958e343e0c6dd5e49b7a6d89399aec4e4306d2f3c35fddbf4530deff4f9fd09ed0c47b2cc59694ff6baec SHA512 3428e18eb52fa205bca872c8b0b1f12f01f58a8fb43239bc2cc78fe52f9903940702dae4116d4775340b69ec949ad2198b57c0c1246fe58dd8ed8b7a6562bf71
-EBUILD xesam-tools-0.7.0-r2.ebuild 931 BLAKE2B 6b2348f992d753188d48a480edae1bb5b91dba9bf73baa37984d80eda63b6c3ddda1187370d7b97951ebaa98de2c2bab03f144db85449d480febf2b5031d996f SHA512 c90f690219d0a67c3cb38cd1d7816949a2f32e54addb992b5384ba8c1dd481e527191e6d3cb677c3d9ff4ad539e9134efd5ac634751af3d545baa806ef04ab82
-MISC metadata.xml 392 BLAKE2B 3ae2a8f256053d6fa0322ea781210ecc3e225bb0eb67e53edfca71a6dc57fb8e5bd283a1b839f25f8bc3bfaf526a88acc4f1d8c83a8cfabc5a90d0883a995a61 SHA512 10e2dafc4fdaa7f851db74280e47df4f37885d2919383d15f9d51004858d3221178052d55c6fe53fcab101389c1ed028c1d9c4e7ca72360c4620c563ae2a7cdf
diff --git a/dev-util/xesam-tools/metadata.xml b/dev-util/xesam-tools/metadata.xml
deleted file mode 100644
index 9c8fd938d1b4..000000000000
--- a/dev-util/xesam-tools/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <longdescription lang="en">
-    xesam-tools provides a set of tools and examples to help developers
-    who are working on servers or clients which implement the Xesam desktop
-    search specification
-  </longdescription>
-</pkgmetadata>
diff --git a/dev-util/xesam-tools/xesam-tools-0.7.0-r2.ebuild b/dev-util/xesam-tools/xesam-tools-0.7.0-r2.ebuild
deleted file mode 100644
index 676f69b8e2bd..000000000000
--- a/dev-util/xesam-tools/xesam-tools-0.7.0-r2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1
-
-DESCRIPTION="Development tools and examples for the Xesam desktop search API"
-HOMEPAGE="http://xesam.org/people/kamstrup/xesam-tools"
-SRC_URI="http://xesam.org/people/kamstrup/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-
-DEPEND=""
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
-		dev-python/pygobject:2[${PYTHON_MULTI_USEDEP}]
-		dev-python/pygtk[${PYTHON_MULTI_USEDEP}]
-	')"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	insinto "/usr/share/doc/${PF}"
-	doins -r samples
-
-	if use examples; then
-		insinto "/usr/share/doc/${PF}/demo"
-		doins "demo/demo.py"
-		insopts -m 0755
-		doins demo/[^d]*
-	fi
-}
diff --git a/dev-util/xfce4-dev-tools/Manifest b/dev-util/xfce4-dev-tools/Manifest
index bf8328f3d109..d5679c61c297 100644
--- a/dev-util/xfce4-dev-tools/Manifest
+++ b/dev-util/xfce4-dev-tools/Manifest
@@ -1,3 +1,3 @@
 DIST xfce4-dev-tools-4.14.0.tar.bz2 292275 BLAKE2B 18f28394ded038a7bcf0e754ebb359464358df245903a0c4441df2845e57c9059de6e6775a90c0e6c3cde4936a847ddf26ae88ff61fe7612fc2626b00f1d56a7 SHA512 e22b139ff7516ec0e510f882cc6a9e8e8b2b7bd41093c8e67e5ef11eb6c2c2848637513369d652f7238f10b5005c5483a938d3348020b48a4c1fadadd6d635f8
-EBUILD xfce4-dev-tools-4.14.0.ebuild 578 BLAKE2B 82cb81485154e3cc12615c873ab5cefe478bf1b74363ba4bb3b38a398ae7340f7c6a08a857c73cb8e8b47c268705fb29ce2271a241bb5a86892870d17f122577 SHA512 0b1f97f42fbc8beb5599da1302d9ba55d5d5ee65c02e54882ae1ff3905d4967002922a31ae377acf0b28659ee3c4a6ae04e391bd195061046afbac7299c29f33
+EBUILD xfce4-dev-tools-4.14.0.ebuild 579 BLAKE2B 366d376277ef62122256194b0d4dfdd747e30e82097009b8c41d83473497f5b285b2b75b4584d2293236a17c9efc1ef152a331a398a7f1e67b68dc904c55eb58 SHA512 68fadca9308eb50c5c2be9f50847df966457518cebe86263c21d2f4b8aa64bc5b0f7146f25c16df281924c643ce4de2f38e2fe8db8efb155dde8b3dd9771363e
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.14.0.ebuild b/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.14.0.ebuild
index dfe33eb8d892..82bfd3fc320c 100644
--- a/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.14.0.ebuild
+++ b/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.14.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.42"
diff --git a/dev-util/xxdiff/Manifest b/dev-util/xxdiff/Manifest
index 05cbc6c79b5c..2cce3fae4f07 100644
--- a/dev-util/xxdiff/Manifest
+++ b/dev-util/xxdiff/Manifest
@@ -1,5 +1,6 @@
 AUX xxdiff-4.0.1-no-throw-in-dtor.patch 667 BLAKE2B 9543b6dbd0cfffd309298a100717477303b4d8342156896bba54fc6b9de70f37209aaa4d20c990d2353ab89a7c399078741f76ccb72cb8c2c2ac9855ac6f3486 SHA512 254961c7a3baced5f9dafdb71583145de4d8fccbc49ffb13568bf7414326ee3811389f38b1ac290f67867eebf0b724f5cdd776deab8b3f850847e1783bbf085f
 AUX xxdiff-4.0.1_p20170622-cxx11.patch 361 BLAKE2B e8f55fcd8f1564449cedc14df4339e1787391b8b3b6b7594b763d4c8189d858e0a9e41e5881ce2959e643480e6eee9cff348b83ee3968ee2fd9a751cdcb6088b SHA512 ef69f4a84a1a3f57f5ff435e0e863152c949a5faf9010c56bfd3b8455caac98fed1373f8a36d199eef6632d4a9e75ea58b965b9b5cd74ac4386a05a2cb9838a0
 DIST xxdiff-4.0.1_p20170622.tar.bz2 1983188 BLAKE2B b604c68902defca4caaa342123df165ca5ed4757254e7e696e637ff347298cdfd53324de6c21f65de4e0229ad7adb02434eb59e047590d2c71fb1f7e87e508d6 SHA512 a1b4cb26331b0bcc7ccdf3090ca4f1cf821c6819a189e4148cde0ef40e4377bf2b82627571ff05c066c3796e06cadc7c5ad040af0446c8f5bf48c25547564511
+EBUILD xxdiff-4.0.1_p20170622-r1.ebuild 1094 BLAKE2B 7ccc15c2cc679f24c9e2a5b79223cc93fdafb93d6dbeb0d92ca8b8e9aa391a5cb1602e813a96b33527cc907078163106d1293bf1548b9b3242fdbce1c1f9337f SHA512 8bf4a1bb7e986b1a746677f74c80c217f61051e8112696dc3e85106773b37775f04e029a14162cef6588916a2cf18d9e53c357474553681bf1a1270f0b337865
 EBUILD xxdiff-4.0.1_p20170622.ebuild 1216 BLAKE2B 7ed2ade587ac6b9662f07bb0e598dac94ab7795fc61d5d3e3e4404d8af820640b51d6ab88037dcce83c21e538d33379285cf5aeb955790d641134f0b780a4d71 SHA512 f6f4c5b92de89f166257c70792b25f546fd09114f31fce2e926ec919830e18bd46f57bc86f0e5534ab522419fec70ea9ca0b3791c1f347ca2e8e56a098868c1e
 MISC metadata.xml 435 BLAKE2B e8dcecbe49cd65c7b3ca119b141b7ac1d971be54d9a2b5fa63d25affaa2eb06f5eac261b004e33808e1ae6c735b131b37eee9380746d192a2aacfb81e49b132f SHA512 2ed2dc743bf4787b8a10c379ec52d84b8b76305f1b80b85da3b7c44ad5e3642673e34f9159d7804bb0780ef8a31d49d121c04c885d524253ab0e8ebde04136ed
diff --git a/dev-util/xxdiff/xxdiff-4.0.1_p20170622-r1.ebuild b/dev-util/xxdiff/xxdiff-4.0.1_p20170622-r1.ebuild
new file mode 100644
index 000000000000..f7102a96610a
--- /dev/null
+++ b/dev-util/xxdiff/xxdiff-4.0.1_p20170622-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit qmake-utils
+
+DESCRIPTION="A graphical file and directories comparator and merge tool"
+HOMEPAGE="http://furius.ca/xxdiff/"
+# generated as 'hg archive xxdiff-${P}.tar'
+# from https://bitbucket.org/blais/xxdiff tree
+#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+"
+DEPEND="
+	${RDEPEND}
+	virtual/yacc
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.0.1-no-throw-in-dtor.patch
+	"${FILESDIR}"/${P}-cxx11.patch
+)
+
+src_configure() {
+	pushd src >/dev/null || die
+		# mimic src/Makefile.bootstrap
+		eqmake5
+		cat Makefile.extra >> Makefile || die
+	popd
+}
+
+src_compile() {
+	emake -C src MAKEDIR=.
+
+	HTML_DOCS+=(
+		doc/*.{png,html}
+		src/doc.html
+	)
+}
+
+src_install() {
+	dobin bin/xxdiff
+
+	dodoc CHANGES README* TODO doc/*.txt src/doc.txt
+
+	# example tools, use these to build your own ones
+	dodoc -r tools
+}
diff --git a/dev-util/yacc/Manifest b/dev-util/yacc/Manifest
index dd1091d8e2b0..dd2396e0cff3 100644
--- a/dev-util/yacc/Manifest
+++ b/dev-util/yacc/Manifest
@@ -2,5 +2,5 @@ AUX yacc-1.9.1-CVE-2008-3196.patch 1199 BLAKE2B 665c89923dd7e9860518cff582390b74
 AUX yacc-1.9.1-ia64.patch 504 BLAKE2B b9733e07639ce5bc456576237be7623cae2f488f13bbc203dd0f81e7174c4f51e23ae498d80278ff1fc7873af456844087c72096ec05d621598362c048c68357 SHA512 6525f6c3f9d0011fea00781a24fb0f2d4f80a13835746d8ea8b05a762d789d5f17984da04f32178dbdd73ab098be38fe044bf108ed2e145888cf5ebfe84bb1ec
 AUX yacc-1.9.1-mkstemp.patch 417 BLAKE2B 1413aab68d930593c707723683a1a7938b4bf9d09671cb3539785ec163aa09a0e0bbbd1fee0657e34a8ac03fb9d71a97f1d1dda1af7329f56cda79f93fcb6de2 SHA512 c36d07d4fafc363fcb0173fc17cf4e37dfe20fcfe7df7faaa11d5cc47f9b933a4f192c55f738d1cdcf7f87ddb07311bbc54aa502d8e68b8e7831bf1daba8da03
 DIST yacc-1.9.1.tar.Z 64805 BLAKE2B 3eeebea1dad52a26c8e90ae6aec99fe3643f040100af4516faed02295b203f717a41aec0231ecee97aa31b14c9c29cae6704e875a03e8b18a71255be9859dd09 SHA512 6adb51c5f07e8084a86688589f52d9eee0183fb4d77508e36621a6b0ba91a5c4195feb87db3401ec69560554f71f2f6984dec01266e41e0fd54fa72ef1780e80
-EBUILD yacc-1.9.1-r6.ebuild 1548 BLAKE2B 88173ea1aa6f46080d82bf546001dfc3d4fd0883d732a9002ddcbddfcce5bce86b459b8cb3ced60de0fd028f3f96fd7901f5a8911143ee59cd299df89370f907 SHA512 489802c5bd84e29893b3ca8d49fec000486020a4b73d297b77ba4383a217505d12fa1fbf539da64c8c01f61126622e9989f146ed94a7fb87d05d7d5b8d3d9edf
+EBUILD yacc-1.9.1-r6.ebuild 1546 BLAKE2B e67aff3e9b55d3a4bab93488ccae75d72175e535f4ad18516f075f02d9659a8fb48fc1abf3cbec599159ca1f5fb769e0a8157627b35ce33c420764aacb992165 SHA512 6d94a30e8c7ab27c74a5ab5e644b34200716f13415c40fbee6621a681e2ffb145f827bdcc7458d6e43fd940e765f4cc2c96160eda82f3d6427a56c0a310fb4a6
 MISC metadata.xml 220 BLAKE2B eabf3517ba7e5b67320254eeb2b07adf1dbe0c3432b693973bc25a3e3dc8ed160b7313f9f8ae64d994ac272487b785f33202d9640bb5a7ace9f56ceb42978a19 SHA512 1db105eebacb6c7d44fd17746981e6e24badb2e81327410aa935a7603379cfcc8f3cf27dcf4e9d870cea2f73f6a15cf052e3e785205095ea9a93d72980ff71cc
diff --git a/dev-util/yacc/yacc-1.9.1-r6.ebuild b/dev-util/yacc/yacc-1.9.1-r6.ebuild
index 896f0b021c0e..950fed79f349 100644
--- a/dev-util/yacc/yacc-1.9.1-r6.ebuild
+++ b/dev-util/yacc/yacc-1.9.1-r6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://metalab.unc.edu/pub/Linux/devel/compiler-tools/${P}.tar.Z"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 
 PATCHES=(
 	# mkstemp patch from byacc ebuild.
diff --git a/dev-util/ydiff/Manifest b/dev-util/ydiff/Manifest
new file mode 100644
index 000000000000..50d8942cf9d1
--- /dev/null
+++ b/dev-util/ydiff/Manifest
@@ -0,0 +1,3 @@
+DIST ydiff-1.1.tar.gz 36357 BLAKE2B 4465c85132bb7c7d58c13dd79903610c74edec3b2b8ab8980918a1bf3a98f2b8387872a0974743503fcaad1e7ecb24c21d312a13d9aabe94780e9d623c35175a SHA512 575b3327edd3b8796f5f150fc7ebde32561e1782582e03e9b63bf9010998913fb8b00a8245d799f6cd5599e286f07f9e97e160f23606323d1a6f6059faa59bc9
+EBUILD ydiff-1.1.ebuild 654 BLAKE2B c5efed318721a50d0e477f7011aadf753e2ab307b26ceeab4feab11ef94699479c2a546324e94171c5d3eddfb728049e422760115d389af45b96aefc5196be82 SHA512 276c9f3ecf1f808d4bd76fafa13a2840e44bccfcc61fbbd7435fd8f34270c570bd4f9310edf2d25ad28ff5827cf0e0bdb0c95fc9ec46ed9657383ffb333948a4
+MISC metadata.xml 369 BLAKE2B e1679b4929852125cc2ce7ec0ede870da64132b820c16865d6fa4e572227c64d699871e07df5588ea46ae67cab3775be9908a76d2d222d75bc2f59ea9269b14a SHA512 798de8606d059795e57d1cfaf513e2587b132e512a8833d422d94e7708473379ddbcee63ec2cf8068653f7c1e02de516f7facb5e5fea59a9dca98698cc3c6d57
diff --git a/dev-util/ydiff/metadata.xml b/dev-util/ydiff/metadata.xml
new file mode 100644
index 000000000000..a42be58d1e78
--- /dev/null
+++ b/dev-util/ydiff/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>sping@gentoo.org</email>
+		<name>Sebastian Pipping</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">ydiff</remote-id>
+		<remote-id type="github">ymattw/ydiff</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/ydiff/ydiff-1.1.ebuild b/dev-util/ydiff/ydiff-1.1.ebuild
new file mode 100644
index 000000000000..d3dfb7dd60a0
--- /dev/null
+++ b/dev-util/ydiff/ydiff-1.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit distutils-r1
+
+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"
+
+DEPEND="sys-apps/less"
+RDEPEND=""
+
+DOCS=( CHANGES.rst README.rst )
+
+RESTRICT="test"
+
+python_test() {
+	${PYTHON} tests/test_ydiff.py || die "Unit tests failed."
+
+	./tests/regression.sh || die "Regression tests failed."
+}
author	V3n3RiX <venerix@redcorelinux.org>	2020-04-12 03:41:30 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-04-12 03:41:30 +0100
commit	623ee73d661e5ed8475cb264511f683407d87365 (patch)
tree	993eb27c93ec7a2d2d19550300d888fc1fed9e69 /dev-util
parent	ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (diff)