gentoo resync : 01.10.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-10-01 20:54:53 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-10-01 20:54:53 +0100
commit: 391b5b359a346aff490103da7dddc85047f83830 (patch)
tree: 29eea460a0bd7e1ff21d43b9d6df9af4d8a175e1 /dev-util
parent: c719fdcee603a5a706a45d10cb598762d56a727d (diff)
74 files changed, 1381 insertions, 1000 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index d60a68276c53..2be0392d49da 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 362fc9b83a2c..996948986e7d 100644
--- a/dev-util/android-studio/Manifest
+++ b/dev-util/android-studio/Manifest
@@ -1,12 +1,3 @@
-AUX 0001-use-java-home-before-bundled.patch 927 BLAKE2B 4a04243d6c6e3712bffca951225ac8d6019fbacb4d48472cc9e8915eb0e10fd569f6421f5daf541a82e96f494203336a9fa62f2afd14b654add82819d6971b22 SHA512 ab21686432190e47bdd8ad0cb4cb9cd0a6d9e89b7c376b589024fe04eebfc2c0f0d59d8c186921726f6960b896798ee69b147663f56f21501680938b03331832
-DIST android-studio-ide-193.6626763-linux.tar.gz 907569312 BLAKE2B 602170eea29e632dd5720ef364510a20056a4d98c61e77d5436a2f624a60e0cfa4e0533174613a74f359d8fdeb4e87489caeb5c34b292fcdc35843a76440a9a3 SHA512 7fba99efccdf3bbbfcbc94625aba3789b1bad0e830b2ac890bd681b9089e6789e87b2dbdc80c6ef3d8db2b2438678a8bb58aefb3c311f61f619042ab1ec9dfac
-DIST android-studio-ide-201.6858069-linux.tar.gz 926181537 BLAKE2B ed815f5565ef97ca3f4e1c6cbae3548c70ba94a94a7ae522102044ada31468f241db68ef3d1a1ce6acef60a1bc2e6cd7eba1375a1cebbf01c73063a3d85eb9b2 SHA512 b473e9573e21c666042befa17fde8fc9cb0d6ffd41513d64b74779815079d8971c66afcd1dda5663b503324d14851c4f24a454e5da97e2473550323c09919825
-DIST android-studio-ide-201.6953283-linux.tar.gz 926213072 BLAKE2B bdcca29e75348230c37a141423faf27eae75f299ded1abb3aad12605cb5be144c222d15b998ff16203a035311a6a26d8ae4ee28f337098c78377c5df4e7fcf08 SHA512 554d53596280aa96349ed0b3808599cf315c4f1a439ff57cd2368c6a68b57afac620b86d742c2f2ff72d718a62e33f4353202b3bc3671c0fe934cd8d79f74c0c
-DIST android-studio-ide-201.7042882-linux.tar.gz 925365363 BLAKE2B 337db94154a44ad95545b1f6ca48d9f95773663607ed2de415ae04ae80ed10670e9906b0bcac539d539455964a41c2af117557c4ec0af58b14fcbd175aa44197 SHA512 c7829df5296172613c8bc01d699c7581d27f7604e182143bc8ba4c8503771b4e290d16c4dd3498f1d5701eb8d54adc7a61b2a0967454d99f5ec2a10d697e5b56
-DIST android-studio-ide-201.7199119-linux.tar.gz 925388022 BLAKE2B 64f33e97a0428e332fe6bd9800d3710055a4f2657000cc0d799d6ee05b070fcfca80a8718ec0a5ae5affc05def401e68920d1dd6146c967ff011361dcc4d57c5 SHA512 5757280749f35f149cd776ad7c67e03853a531ca0fc633f2138c18052c09fb9abec6d330bc104f4ab6dd4970cf1dc23e797e14d2b0067ed75208227aadba4403
-EBUILD android-studio-4.0.1.0.193.6626763.ebuild 3658 BLAKE2B a4d9f2469abf8064e298949f81f91295aeea992dea500b1e721b68c0ac5ea0371446a088e7ae144704feaeb00ad78ee4b718f6a3eb21b83c2cbb6be1dc5db0a2 SHA512 333a6979fa5d1e863cde3a92172b129b7d16874bb4905228743fc35de421802d855ae2bcc85bfa3b7a1cfebefa508208051ab63d54096eed0f458382e91d9407
-EBUILD android-studio-4.1.0.19.201.6858069.ebuild 3658 BLAKE2B a4d9f2469abf8064e298949f81f91295aeea992dea500b1e721b68c0ac5ea0371446a088e7ae144704feaeb00ad78ee4b718f6a3eb21b83c2cbb6be1dc5db0a2 SHA512 333a6979fa5d1e863cde3a92172b129b7d16874bb4905228743fc35de421802d855ae2bcc85bfa3b7a1cfebefa508208051ab63d54096eed0f458382e91d9407
-EBUILD android-studio-4.1.1.0.201.6953283.ebuild 3658 BLAKE2B 854e2d4d191d541451993ff07948bdb0faa5a9599004f513df9c97e84a0d689009681a8882fd667e7153ca11c375186448eacf7ff38eff0d714fff758bf11abc SHA512 fdaa7cea293619b80b9e0deed2a77a6b33c7d29c51af2aff03bf25d350177964d871c8bbe22802ad9c7e49e4a4e2fd3abdd049b2a879e6b84e571f62e3ab0545
-EBUILD android-studio-4.1.2.0.201.7042882.ebuild 3658 BLAKE2B 854e2d4d191d541451993ff07948bdb0faa5a9599004f513df9c97e84a0d689009681a8882fd667e7153ca11c375186448eacf7ff38eff0d714fff758bf11abc SHA512 fdaa7cea293619b80b9e0deed2a77a6b33c7d29c51af2aff03bf25d350177964d871c8bbe22802ad9c7e49e4a4e2fd3abdd049b2a879e6b84e571f62e3ab0545
-EBUILD android-studio-4.1.3.0.201.7199119.ebuild 3658 BLAKE2B 854e2d4d191d541451993ff07948bdb0faa5a9599004f513df9c97e84a0d689009681a8882fd667e7153ca11c375186448eacf7ff38eff0d714fff758bf11abc SHA512 fdaa7cea293619b80b9e0deed2a77a6b33c7d29c51af2aff03bf25d350177964d871c8bbe22802ad9c7e49e4a4e2fd3abdd049b2a879e6b84e571f62e3ab0545
-MISC metadata.xml 314 BLAKE2B a0ebedab1e44cd55d61163dbbe73673c6901513ca00caebb168800b6937a1702053fb6ee147b62c1603ef4f304b0008f80e27e95ef318540552ebebc5506bbee SHA512 a572d6084d166d0961fabe828d3566336e3a6542b0d2bd3021cee1a92ef784a9920ee3ce40c0f6b47ff255c50c51448413f4d56f8796d2e80dec942ec1caf221
+DIST android-studio-2020.3.1.24-linux.tar.gz 980631631 BLAKE2B 11968ea566b8f03810752ecc1d50068420830fee04df16f579e88bc94e4bd25e7d2c731df608dd27a983e8d0a27b3622d4c73902bde0fc134915f2a3bbf3189b SHA512 a03305b3540a0473b93e0e30ae82a1b7cc77c9aefd6abf96b352092ce5c51012a6be0d55af1b406a62b9bcf3c4b83ec980d0ca1232d22031a97b0f455060f2b4
+EBUILD android-studio-2020.3.1.24.ebuild 2736 BLAKE2B de86ed17f3554749350b471582a8ee8479d589b25c0e43b73750236cc1d531ca1d5cd423078c7095f8b7da06318dc33fd9570f99d06330def6ca9ead225fa97f SHA512 fd11c80f2d9b0e62b2394985e221eb7a9c48c56e95192c8ff91a25992c7773662d560dd3304ca51c9ba7d850462d29665d6eb9b9d5727b18a021c4e72925cd76
+MISC metadata.xml 298 BLAKE2B 8f13e01e8c5a24c9af764e8882e2d5677ebf485cad143f35720ede0d491f2c09fd009ce48433cd33f863fb618d6413eac97e07a6d3526f5c8e679d9e51995908 SHA512 2c9d3c5d14e2499fac58df1d3cb2844172833f371fe4d557791efc0848b879191bca36aa772792cea6edd8f6e3be83452a188c0db043906a46c87af0dcacd4e2
diff --git a/dev-util/android-studio/android-studio-2020.3.1.24.ebuild b/dev-util/android-studio/android-studio-2020.3.1.24.ebuild
new file mode 100644
index 000000000000..17e178391136
--- /dev/null
+++ b/dev-util/android-studio/android-studio-2020.3.1.24.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop eutils
+
+RESTRICT="strip"
+
+QA_PREBUILT="
+	opt/${PN}/bin/*
+	opt/${PN}/jre/bin/*
+	opt/${PN}/jre/lib/*
+	opt/${PN}/jre/lib/jli/*
+	opt/${PN}/jre/lib/server/*
+	opt/${PN}/lib/pty4j-native/linux/*/*
+	opt/${PN}/plugins/android-ndk/resources/lldb/android/*/*
+	opt/${PN}/plugins/android-ndk/resources/lldb/bin/*
+	opt/${PN}/plugins/android-ndk/resources/lldb/lib64/*
+	opt/${PN}/plugins/android-ndk/resources/lldb/lib/python3.8/lib-dynload/*
+	opt/${PN}/plugins/android/resources/installer/*/*
+	opt/${PN}/plugins/android/resources/layoutlib/data/linux/lib64/*
+	opt/${PN}/plugins/android/resources/perfetto/*/*
+	opt/${PN}/plugins/android/resources/simpleperf/*/*
+	opt/${PN}/plugins/android/resources/trace_processor_daemon/*
+	opt/${PN}/plugins/android/resources/transport/*/*
+	opt/${PN}/plugins/android/resources/transport/native/agent/*/*
+	opt/${PN}/plugins/android/resources/transport/*/*
+	opt/${PN}/plugins/c-plugin/bin/clang/linux/*
+	opt/${PN}/plugins/webp/lib/libwebp/linux/*
+"
+
+DESCRIPTION="Android development environment based on IntelliJ IDEA"
+HOMEPAGE="http://developer.android.com/sdk/installing/studio.html"
+SRC_URI="https://redirector.gvt1.com/edgedl/android/studio/ide-zips/${PV}/${P}-linux.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="selinux"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-android )
+	>=app-arch/bzip2-1.0.6-r4
+	>=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
+	virtual/libcrypt:=
+	!!<dev-util/android-studio-2020.3.1.24
+"
+
+S=${WORKDIR}/${PN}
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	local dir="/opt/${PN}"
+	insinto "${dir}"
+	doins -r *
+	fperms 755 "${dir}"/bin/{fsnotifier{,64},printenv.py,restart.py,format.sh,inspect.sh,studio.sh}
+	fperms -R 755 "${dir}"/bin/lldb
+	fperms -R 755 "${dir}"/plugins/{android-ndk/resources/lldb,c-plugin/bin}
+	fperms -R 755 "${dir}"/jre/bin
+	fperms 755 ${dir}/jre/lib/jexec
+	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-4.0.1.0.193.6626763.ebuild b/dev-util/android-studio/android-studio-4.0.1.0.193.6626763.ebuild
deleted file mode 100644
index e9812c3699a7..000000000000
--- a/dev-util/android-studio/android-studio-4.0.1.0.193.6626763.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit desktop eutils java-pkg-2
-
-RESTRICT="strip"
-QA_PREBUILT="
-	opt/${PN}/bin/fsnotifier*
-	opt/${PN}/bin/libdbm64.so
-	opt/${PN}/bin/lldb/*
-	opt/${PN}/custom-jdk/*
-	opt/${PN}/lib/pty4j-native/linux/*/libpty.so
-	opt/${PN}/plugins/android/lib/libwebp_jni*.so
-	opt/${PN}/plugins/android/resources/installer/*
-	opt/${PN}/plugins/android/resources/perfetto/*
-	opt/${PN}/plugins/android/resources/simpleperf/*
-	opt/${PN}/plugins/android/resources/transport/*
-"
-
-VER_CMP=( $(ver_rs 1- ' ') )
-if [[ ${#VER_CMP[@]} -eq 6 ]]; then
-	STUDIO_V=$(ver_cut 1-4)
-	BUILD_V=$(ver_cut 5-6)
-else
-	STUDIO_V=$(ver_cut 1-3)
-	BUILD_V=$(ver_cut 4-5)
-fi
-
-DESCRIPTION="Android development environment based on IntelliJ IDEA"
-HOMEPAGE="http://developer.android.com/sdk/installing/studio.html"
-SRC_URI="https://dl.google.com/dl/android/studio/ide-zips/${STUDIO_V}/${PN}-ide-${BUILD_V}-linux.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="custom-jdk selinux"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	dev-java/commons-logging:0
-	dev-java/log4j:0"
-
-RDEPEND="${DEPEND}
-	>=virtual/jdk-1.7
-	selinux? ( sec-policy/selinux-android )
-	>=app-arch/bzip2-1.0.6-r4
-	dev-java/commons-logging:0
-	dev-java/log4j:0
-	>=dev-libs/expat-2.1.0-r3
-	>=dev-libs/libffi-3.0.13-r1
-	>=media-libs/fontconfig-2.10.92
-	>=media-libs/freetype-2.5.5
-	>=media-libs/libpng-1.2.51
-	>=media-libs/mesa-10.2.8[X(+)]
-	|| ( gnome-extra/zenity kde-apps/kdialog x11-apps/xmessage x11-libs/libnotify )
-	sys-libs/ncurses-compat:5[tinfo]
-	>=sys-libs/zlib-1.2.8-r1
-	>=x11-libs/libX11-1.6.2
-	>=x11-libs/libXau-1.0.7-r1
-	>=x11-libs/libXdamage-1.1.4-r1
-	>=x11-libs/libXdmcp-1.1.1-r1
-	>=x11-libs/libXext-1.3.2
-	>=x11-libs/libXfixes-5.0.1
-	>=x11-libs/libXrender-0.9.8
-	>=x11-libs/libXxf86vm-1.1.3
-	>=x11-libs/libdrm-2.4.46
-	>=x11-libs/libxcb-1.9.1
-	>=x11-libs/libxshmfence-1.1"
-BDEPEND="dev-util/patchelf"
-S=${WORKDIR}/${PN}
-PATCHES=( "${FILESDIR}/0001-use-java-home-before-bundled.patch" )
-
-src_prepare() {
-	eapply "${PATCHES[@]}"
-	eapply_user
-
-	# This is really a bundled jdk not a jre
-	# If custom-jdk is not set bundled jre is replaced with system vm/jdk
-	if use custom-jdk; then
-		mv -f "${S}/jre" "${S}/custom-jdk" || die "Could not move bundled jdk"
-	else
-		rm -rf "${S}/jre" || die "Could not remove bundled jdk"
-	fi
-	# Replace bundled jars with system
-	# has problems with newer jdom:0 not updated to jdom:2
-	cd "${S}/lib" || die
-	local JARS="commons-logging log4j"
-	local j
-	for j in ${JARS}; do
-		rm -v ${j/:*/}*.jar || die
-		java-pkg_jar-from ${j}
-	done
-
-	cd "${S}" || die
-
-	# bug 629404
-	echo "-Djdk.util.zip.ensureTrailingSlash=false" >> bin/studio64.vmoptions || die
-	echo "-Djdk.util.zip.ensureTrailingSlash=false" >> bin/studio.vmoptions || die
-}
-
-src_compile() {
-	patchelf --set-rpath '$ORIGIN' bin/lldb/lib/readline.so || die "Failed to fix insecure RPATH"
-}
-
-src_install() {
-	local dir="/opt/${PN}"
-
-	insinto "${dir}"
-	doins -r *
-
-	# This is really a bundled jdk not a jre
-	# If custom-jdk is not set bundled jre is replaced with system vm/jdk
-	if use custom-jdk; then
-		dosym "custom-jdk" "${dir}/jre"
-	else
-		dosym "../../etc/java-config-2/current-system-vm" "${dir}/jre"
-	fi
-
-	fperms 755 "${dir}"/bin/{fsnotifier{,64},printenv.py,restart.py,format.sh,inspect.sh,studio.sh}
-	fperms -R 755 "${dir}"/bin/lldb/{android,bin}
-	if use custom-jdk; then
-		fperms -R 755 "${dir}"/jre/{bin,jre/bin}
-		fperms 755 ${dir}/jre/jre/lib/jexec
-	fi
-
-	newicon "bin/studio.png" "${PN}.png"
-	make_wrapper ${PN} ${dir}/bin/studio.sh
-	make_desktop_entry ${PN} "Android Studio" ${PN} "Development;IDE" "StartupWMClass=jetbrains-studio"
-}
diff --git a/dev-util/android-studio/android-studio-4.1.0.19.201.6858069.ebuild b/dev-util/android-studio/android-studio-4.1.0.19.201.6858069.ebuild
deleted file mode 100644
index e9812c3699a7..000000000000
--- a/dev-util/android-studio/android-studio-4.1.0.19.201.6858069.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit desktop eutils java-pkg-2
-
-RESTRICT="strip"
-QA_PREBUILT="
-	opt/${PN}/bin/fsnotifier*
-	opt/${PN}/bin/libdbm64.so
-	opt/${PN}/bin/lldb/*
-	opt/${PN}/custom-jdk/*
-	opt/${PN}/lib/pty4j-native/linux/*/libpty.so
-	opt/${PN}/plugins/android/lib/libwebp_jni*.so
-	opt/${PN}/plugins/android/resources/installer/*
-	opt/${PN}/plugins/android/resources/perfetto/*
-	opt/${PN}/plugins/android/resources/simpleperf/*
-	opt/${PN}/plugins/android/resources/transport/*
-"
-
-VER_CMP=( $(ver_rs 1- ' ') )
-if [[ ${#VER_CMP[@]} -eq 6 ]]; then
-	STUDIO_V=$(ver_cut 1-4)
-	BUILD_V=$(ver_cut 5-6)
-else
-	STUDIO_V=$(ver_cut 1-3)
-	BUILD_V=$(ver_cut 4-5)
-fi
-
-DESCRIPTION="Android development environment based on IntelliJ IDEA"
-HOMEPAGE="http://developer.android.com/sdk/installing/studio.html"
-SRC_URI="https://dl.google.com/dl/android/studio/ide-zips/${STUDIO_V}/${PN}-ide-${BUILD_V}-linux.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="custom-jdk selinux"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	dev-java/commons-logging:0
-	dev-java/log4j:0"
-
-RDEPEND="${DEPEND}
-	>=virtual/jdk-1.7
-	selinux? ( sec-policy/selinux-android )
-	>=app-arch/bzip2-1.0.6-r4
-	dev-java/commons-logging:0
-	dev-java/log4j:0
-	>=dev-libs/expat-2.1.0-r3
-	>=dev-libs/libffi-3.0.13-r1
-	>=media-libs/fontconfig-2.10.92
-	>=media-libs/freetype-2.5.5
-	>=media-libs/libpng-1.2.51
-	>=media-libs/mesa-10.2.8[X(+)]
-	|| ( gnome-extra/zenity kde-apps/kdialog x11-apps/xmessage x11-libs/libnotify )
-	sys-libs/ncurses-compat:5[tinfo]
-	>=sys-libs/zlib-1.2.8-r1
-	>=x11-libs/libX11-1.6.2
-	>=x11-libs/libXau-1.0.7-r1
-	>=x11-libs/libXdamage-1.1.4-r1
-	>=x11-libs/libXdmcp-1.1.1-r1
-	>=x11-libs/libXext-1.3.2
-	>=x11-libs/libXfixes-5.0.1
-	>=x11-libs/libXrender-0.9.8
-	>=x11-libs/libXxf86vm-1.1.3
-	>=x11-libs/libdrm-2.4.46
-	>=x11-libs/libxcb-1.9.1
-	>=x11-libs/libxshmfence-1.1"
-BDEPEND="dev-util/patchelf"
-S=${WORKDIR}/${PN}
-PATCHES=( "${FILESDIR}/0001-use-java-home-before-bundled.patch" )
-
-src_prepare() {
-	eapply "${PATCHES[@]}"
-	eapply_user
-
-	# This is really a bundled jdk not a jre
-	# If custom-jdk is not set bundled jre is replaced with system vm/jdk
-	if use custom-jdk; then
-		mv -f "${S}/jre" "${S}/custom-jdk" || die "Could not move bundled jdk"
-	else
-		rm -rf "${S}/jre" || die "Could not remove bundled jdk"
-	fi
-	# Replace bundled jars with system
-	# has problems with newer jdom:0 not updated to jdom:2
-	cd "${S}/lib" || die
-	local JARS="commons-logging log4j"
-	local j
-	for j in ${JARS}; do
-		rm -v ${j/:*/}*.jar || die
-		java-pkg_jar-from ${j}
-	done
-
-	cd "${S}" || die
-
-	# bug 629404
-	echo "-Djdk.util.zip.ensureTrailingSlash=false" >> bin/studio64.vmoptions || die
-	echo "-Djdk.util.zip.ensureTrailingSlash=false" >> bin/studio.vmoptions || die
-}
-
-src_compile() {
-	patchelf --set-rpath '$ORIGIN' bin/lldb/lib/readline.so || die "Failed to fix insecure RPATH"
-}
-
-src_install() {
-	local dir="/opt/${PN}"
-
-	insinto "${dir}"
-	doins -r *
-
-	# This is really a bundled jdk not a jre
-	# If custom-jdk is not set bundled jre is replaced with system vm/jdk
-	if use custom-jdk; then
-		dosym "custom-jdk" "${dir}/jre"
-	else
-		dosym "../../etc/java-config-2/current-system-vm" "${dir}/jre"
-	fi
-
-	fperms 755 "${dir}"/bin/{fsnotifier{,64},printenv.py,restart.py,format.sh,inspect.sh,studio.sh}
-	fperms -R 755 "${dir}"/bin/lldb/{android,bin}
-	if use custom-jdk; then
-		fperms -R 755 "${dir}"/jre/{bin,jre/bin}
-		fperms 755 ${dir}/jre/jre/lib/jexec
-	fi
-
-	newicon "bin/studio.png" "${PN}.png"
-	make_wrapper ${PN} ${dir}/bin/studio.sh
-	make_desktop_entry ${PN} "Android Studio" ${PN} "Development;IDE" "StartupWMClass=jetbrains-studio"
-}
diff --git a/dev-util/android-studio/android-studio-4.1.1.0.201.6953283.ebuild b/dev-util/android-studio/android-studio-4.1.1.0.201.6953283.ebuild
deleted file mode 100644
index c0c19c664875..000000000000
--- a/dev-util/android-studio/android-studio-4.1.1.0.201.6953283.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit desktop eutils java-pkg-2
-
-RESTRICT="strip"
-QA_PREBUILT="
-	opt/${PN}/bin/fsnotifier*
-	opt/${PN}/bin/libdbm64.so
-	opt/${PN}/bin/lldb/*
-	opt/${PN}/custom-jdk/*
-	opt/${PN}/lib/pty4j-native/linux/*/libpty.so
-	opt/${PN}/plugins/android/lib/libwebp_jni*.so
-	opt/${PN}/plugins/android/resources/installer/*
-	opt/${PN}/plugins/android/resources/perfetto/*
-	opt/${PN}/plugins/android/resources/simpleperf/*
-	opt/${PN}/plugins/android/resources/transport/*
-"
-
-VER_CMP=( $(ver_rs 1- ' ') )
-if [[ ${#VER_CMP[@]} -eq 6 ]]; then
-	STUDIO_V=$(ver_cut 1-4)
-	BUILD_V=$(ver_cut 5-6)
-else
-	STUDIO_V=$(ver_cut 1-3)
-	BUILD_V=$(ver_cut 4-5)
-fi
-
-DESCRIPTION="Android development environment based on IntelliJ IDEA"
-HOMEPAGE="http://developer.android.com/sdk/installing/studio.html"
-SRC_URI="https://dl.google.com/dl/android/studio/ide-zips/${STUDIO_V}/${PN}-ide-${BUILD_V}-linux.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="custom-jdk selinux"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	dev-java/commons-logging:0
-	dev-java/log4j:0"
-
-RDEPEND="${DEPEND}
-	>=virtual/jdk-1.7
-	selinux? ( sec-policy/selinux-android )
-	>=app-arch/bzip2-1.0.6-r4
-	dev-java/commons-logging:0
-	dev-java/log4j:0
-	>=dev-libs/expat-2.1.0-r3
-	>=dev-libs/libffi-3.0.13-r1
-	>=media-libs/fontconfig-2.10.92
-	>=media-libs/freetype-2.5.5
-	>=media-libs/libpng-1.2.51
-	>=media-libs/mesa-10.2.8[X(+)]
-	|| ( gnome-extra/zenity kde-apps/kdialog x11-apps/xmessage x11-libs/libnotify )
-	sys-libs/ncurses-compat:5[tinfo]
-	>=sys-libs/zlib-1.2.8-r1
-	>=x11-libs/libX11-1.6.2
-	>=x11-libs/libXau-1.0.7-r1
-	>=x11-libs/libXdamage-1.1.4-r1
-	>=x11-libs/libXdmcp-1.1.1-r1
-	>=x11-libs/libXext-1.3.2
-	>=x11-libs/libXfixes-5.0.1
-	>=x11-libs/libXrender-0.9.8
-	>=x11-libs/libXxf86vm-1.1.3
-	>=x11-libs/libdrm-2.4.46
-	>=x11-libs/libxcb-1.9.1
-	>=x11-libs/libxshmfence-1.1"
-BDEPEND="dev-util/patchelf"
-S=${WORKDIR}/${PN}
-PATCHES=( "${FILESDIR}/0001-use-java-home-before-bundled.patch" )
-
-src_prepare() {
-	eapply "${PATCHES[@]}"
-	eapply_user
-
-	# This is really a bundled jdk not a jre
-	# If custom-jdk is not set bundled jre is replaced with system vm/jdk
-	if use custom-jdk; then
-		mv -f "${S}/jre" "${S}/custom-jdk" || die "Could not move bundled jdk"
-	else
-		rm -rf "${S}/jre" || die "Could not remove bundled jdk"
-	fi
-	# Replace bundled jars with system
-	# has problems with newer jdom:0 not updated to jdom:2
-	cd "${S}/lib" || die
-	local JARS="commons-logging log4j"
-	local j
-	for j in ${JARS}; do
-		rm -v ${j/:*/}*.jar || die
-		java-pkg_jar-from ${j}
-	done
-
-	cd "${S}" || die
-
-	# bug 629404
-	echo "-Djdk.util.zip.ensureTrailingSlash=false" >> bin/studio64.vmoptions || die
-	echo "-Djdk.util.zip.ensureTrailingSlash=false" >> bin/studio.vmoptions || die
-}
-
-src_compile() {
-	patchelf --set-rpath '$ORIGIN' bin/lldb/lib/readline.so || die "Failed to fix insecure RPATH"
-}
-
-src_install() {
-	local dir="/opt/${PN}"
-
-	insinto "${dir}"
-	doins -r *
-
-	# This is really a bundled jdk not a jre
-	# If custom-jdk is not set bundled jre is replaced with system vm/jdk
-	if use custom-jdk; then
-		dosym "custom-jdk" "${dir}/jre"
-	else
-		dosym "../../etc/java-config-2/current-system-vm" "${dir}/jre"
-	fi
-
-	fperms 755 "${dir}"/bin/{fsnotifier{,64},printenv.py,restart.py,format.sh,inspect.sh,studio.sh}
-	fperms -R 755 "${dir}"/bin/lldb/{android,bin}
-	if use custom-jdk; then
-		fperms -R 755 "${dir}"/jre/{bin,jre/bin}
-		fperms 755 ${dir}/jre/jre/lib/jexec
-	fi
-
-	newicon "bin/studio.png" "${PN}.png"
-	make_wrapper ${PN} ${dir}/bin/studio.sh
-	make_desktop_entry ${PN} "Android Studio" ${PN} "Development;IDE" "StartupWMClass=jetbrains-studio"
-}
diff --git a/dev-util/android-studio/android-studio-4.1.2.0.201.7042882.ebuild b/dev-util/android-studio/android-studio-4.1.2.0.201.7042882.ebuild
deleted file mode 100644
index c0c19c664875..000000000000
--- a/dev-util/android-studio/android-studio-4.1.2.0.201.7042882.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit desktop eutils java-pkg-2
-
-RESTRICT="strip"
-QA_PREBUILT="
-	opt/${PN}/bin/fsnotifier*
-	opt/${PN}/bin/libdbm64.so
-	opt/${PN}/bin/lldb/*
-	opt/${PN}/custom-jdk/*
-	opt/${PN}/lib/pty4j-native/linux/*/libpty.so
-	opt/${PN}/plugins/android/lib/libwebp_jni*.so
-	opt/${PN}/plugins/android/resources/installer/*
-	opt/${PN}/plugins/android/resources/perfetto/*
-	opt/${PN}/plugins/android/resources/simpleperf/*
-	opt/${PN}/plugins/android/resources/transport/*
-"
-
-VER_CMP=( $(ver_rs 1- ' ') )
-if [[ ${#VER_CMP[@]} -eq 6 ]]; then
-	STUDIO_V=$(ver_cut 1-4)
-	BUILD_V=$(ver_cut 5-6)
-else
-	STUDIO_V=$(ver_cut 1-3)
-	BUILD_V=$(ver_cut 4-5)
-fi
-
-DESCRIPTION="Android development environment based on IntelliJ IDEA"
-HOMEPAGE="http://developer.android.com/sdk/installing/studio.html"
-SRC_URI="https://dl.google.com/dl/android/studio/ide-zips/${STUDIO_V}/${PN}-ide-${BUILD_V}-linux.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="custom-jdk selinux"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	dev-java/commons-logging:0
-	dev-java/log4j:0"
-
-RDEPEND="${DEPEND}
-	>=virtual/jdk-1.7
-	selinux? ( sec-policy/selinux-android )
-	>=app-arch/bzip2-1.0.6-r4
-	dev-java/commons-logging:0
-	dev-java/log4j:0
-	>=dev-libs/expat-2.1.0-r3
-	>=dev-libs/libffi-3.0.13-r1
-	>=media-libs/fontconfig-2.10.92
-	>=media-libs/freetype-2.5.5
-	>=media-libs/libpng-1.2.51
-	>=media-libs/mesa-10.2.8[X(+)]
-	|| ( gnome-extra/zenity kde-apps/kdialog x11-apps/xmessage x11-libs/libnotify )
-	sys-libs/ncurses-compat:5[tinfo]
-	>=sys-libs/zlib-1.2.8-r1
-	>=x11-libs/libX11-1.6.2
-	>=x11-libs/libXau-1.0.7-r1
-	>=x11-libs/libXdamage-1.1.4-r1
-	>=x11-libs/libXdmcp-1.1.1-r1
-	>=x11-libs/libXext-1.3.2
-	>=x11-libs/libXfixes-5.0.1
-	>=x11-libs/libXrender-0.9.8
-	>=x11-libs/libXxf86vm-1.1.3
-	>=x11-libs/libdrm-2.4.46
-	>=x11-libs/libxcb-1.9.1
-	>=x11-libs/libxshmfence-1.1"
-BDEPEND="dev-util/patchelf"
-S=${WORKDIR}/${PN}
-PATCHES=( "${FILESDIR}/0001-use-java-home-before-bundled.patch" )
-
-src_prepare() {
-	eapply "${PATCHES[@]}"
-	eapply_user
-
-	# This is really a bundled jdk not a jre
-	# If custom-jdk is not set bundled jre is replaced with system vm/jdk
-	if use custom-jdk; then
-		mv -f "${S}/jre" "${S}/custom-jdk" || die "Could not move bundled jdk"
-	else
-		rm -rf "${S}/jre" || die "Could not remove bundled jdk"
-	fi
-	# Replace bundled jars with system
-	# has problems with newer jdom:0 not updated to jdom:2
-	cd "${S}/lib" || die
-	local JARS="commons-logging log4j"
-	local j
-	for j in ${JARS}; do
-		rm -v ${j/:*/}*.jar || die
-		java-pkg_jar-from ${j}
-	done
-
-	cd "${S}" || die
-
-	# bug 629404
-	echo "-Djdk.util.zip.ensureTrailingSlash=false" >> bin/studio64.vmoptions || die
-	echo "-Djdk.util.zip.ensureTrailingSlash=false" >> bin/studio.vmoptions || die
-}
-
-src_compile() {
-	patchelf --set-rpath '$ORIGIN' bin/lldb/lib/readline.so || die "Failed to fix insecure RPATH"
-}
-
-src_install() {
-	local dir="/opt/${PN}"
-
-	insinto "${dir}"
-	doins -r *
-
-	# This is really a bundled jdk not a jre
-	# If custom-jdk is not set bundled jre is replaced with system vm/jdk
-	if use custom-jdk; then
-		dosym "custom-jdk" "${dir}/jre"
-	else
-		dosym "../../etc/java-config-2/current-system-vm" "${dir}/jre"
-	fi
-
-	fperms 755 "${dir}"/bin/{fsnotifier{,64},printenv.py,restart.py,format.sh,inspect.sh,studio.sh}
-	fperms -R 755 "${dir}"/bin/lldb/{android,bin}
-	if use custom-jdk; then
-		fperms -R 755 "${dir}"/jre/{bin,jre/bin}
-		fperms 755 ${dir}/jre/jre/lib/jexec
-	fi
-
-	newicon "bin/studio.png" "${PN}.png"
-	make_wrapper ${PN} ${dir}/bin/studio.sh
-	make_desktop_entry ${PN} "Android Studio" ${PN} "Development;IDE" "StartupWMClass=jetbrains-studio"
-}
diff --git a/dev-util/android-studio/android-studio-4.1.3.0.201.7199119.ebuild b/dev-util/android-studio/android-studio-4.1.3.0.201.7199119.ebuild
deleted file mode 100644
index c0c19c664875..000000000000
--- a/dev-util/android-studio/android-studio-4.1.3.0.201.7199119.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit desktop eutils java-pkg-2
-
-RESTRICT="strip"
-QA_PREBUILT="
-	opt/${PN}/bin/fsnotifier*
-	opt/${PN}/bin/libdbm64.so
-	opt/${PN}/bin/lldb/*
-	opt/${PN}/custom-jdk/*
-	opt/${PN}/lib/pty4j-native/linux/*/libpty.so
-	opt/${PN}/plugins/android/lib/libwebp_jni*.so
-	opt/${PN}/plugins/android/resources/installer/*
-	opt/${PN}/plugins/android/resources/perfetto/*
-	opt/${PN}/plugins/android/resources/simpleperf/*
-	opt/${PN}/plugins/android/resources/transport/*
-"
-
-VER_CMP=( $(ver_rs 1- ' ') )
-if [[ ${#VER_CMP[@]} -eq 6 ]]; then
-	STUDIO_V=$(ver_cut 1-4)
-	BUILD_V=$(ver_cut 5-6)
-else
-	STUDIO_V=$(ver_cut 1-3)
-	BUILD_V=$(ver_cut 4-5)
-fi
-
-DESCRIPTION="Android development environment based on IntelliJ IDEA"
-HOMEPAGE="http://developer.android.com/sdk/installing/studio.html"
-SRC_URI="https://dl.google.com/dl/android/studio/ide-zips/${STUDIO_V}/${PN}-ide-${BUILD_V}-linux.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="custom-jdk selinux"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	dev-java/commons-logging:0
-	dev-java/log4j:0"
-
-RDEPEND="${DEPEND}
-	>=virtual/jdk-1.7
-	selinux? ( sec-policy/selinux-android )
-	>=app-arch/bzip2-1.0.6-r4
-	dev-java/commons-logging:0
-	dev-java/log4j:0
-	>=dev-libs/expat-2.1.0-r3
-	>=dev-libs/libffi-3.0.13-r1
-	>=media-libs/fontconfig-2.10.92
-	>=media-libs/freetype-2.5.5
-	>=media-libs/libpng-1.2.51
-	>=media-libs/mesa-10.2.8[X(+)]
-	|| ( gnome-extra/zenity kde-apps/kdialog x11-apps/xmessage x11-libs/libnotify )
-	sys-libs/ncurses-compat:5[tinfo]
-	>=sys-libs/zlib-1.2.8-r1
-	>=x11-libs/libX11-1.6.2
-	>=x11-libs/libXau-1.0.7-r1
-	>=x11-libs/libXdamage-1.1.4-r1
-	>=x11-libs/libXdmcp-1.1.1-r1
-	>=x11-libs/libXext-1.3.2
-	>=x11-libs/libXfixes-5.0.1
-	>=x11-libs/libXrender-0.9.8
-	>=x11-libs/libXxf86vm-1.1.3
-	>=x11-libs/libdrm-2.4.46
-	>=x11-libs/libxcb-1.9.1
-	>=x11-libs/libxshmfence-1.1"
-BDEPEND="dev-util/patchelf"
-S=${WORKDIR}/${PN}
-PATCHES=( "${FILESDIR}/0001-use-java-home-before-bundled.patch" )
-
-src_prepare() {
-	eapply "${PATCHES[@]}"
-	eapply_user
-
-	# This is really a bundled jdk not a jre
-	# If custom-jdk is not set bundled jre is replaced with system vm/jdk
-	if use custom-jdk; then
-		mv -f "${S}/jre" "${S}/custom-jdk" || die "Could not move bundled jdk"
-	else
-		rm -rf "${S}/jre" || die "Could not remove bundled jdk"
-	fi
-	# Replace bundled jars with system
-	# has problems with newer jdom:0 not updated to jdom:2
-	cd "${S}/lib" || die
-	local JARS="commons-logging log4j"
-	local j
-	for j in ${JARS}; do
-		rm -v ${j/:*/}*.jar || die
-		java-pkg_jar-from ${j}
-	done
-
-	cd "${S}" || die
-
-	# bug 629404
-	echo "-Djdk.util.zip.ensureTrailingSlash=false" >> bin/studio64.vmoptions || die
-	echo "-Djdk.util.zip.ensureTrailingSlash=false" >> bin/studio.vmoptions || die
-}
-
-src_compile() {
-	patchelf --set-rpath '$ORIGIN' bin/lldb/lib/readline.so || die "Failed to fix insecure RPATH"
-}
-
-src_install() {
-	local dir="/opt/${PN}"
-
-	insinto "${dir}"
-	doins -r *
-
-	# This is really a bundled jdk not a jre
-	# If custom-jdk is not set bundled jre is replaced with system vm/jdk
-	if use custom-jdk; then
-		dosym "custom-jdk" "${dir}/jre"
-	else
-		dosym "../../etc/java-config-2/current-system-vm" "${dir}/jre"
-	fi
-
-	fperms 755 "${dir}"/bin/{fsnotifier{,64},printenv.py,restart.py,format.sh,inspect.sh,studio.sh}
-	fperms -R 755 "${dir}"/bin/lldb/{android,bin}
-	if use custom-jdk; then
-		fperms -R 755 "${dir}"/jre/{bin,jre/bin}
-		fperms 755 ${dir}/jre/jre/lib/jexec
-	fi
-
-	newicon "bin/studio.png" "${PN}.png"
-	make_wrapper ${PN} ${dir}/bin/studio.sh
-	make_desktop_entry ${PN} "Android Studio" ${PN} "Development;IDE" "StartupWMClass=jetbrains-studio"
-}
diff --git a/dev-util/android-studio/files/0001-use-java-home-before-bundled.patch b/dev-util/android-studio/files/0001-use-java-home-before-bundled.patch
deleted file mode 100644
index 6f97c7d3f925..000000000000
--- a/dev-util/android-studio/files/0001-use-java-home-before-bundled.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Use JAVA_HOME before bundled jre
-
-Must keep bundled jre symlink around in case "Use Embedded JDK" is selected
-
-https://bugs.gentoo.org/613868
-https://bugs.gentoo.org/660404
-
---- android-studio/bin/studio.sh	2018-07-20 13:43:12.339049033 +0800
-+++ android-studio/bin/studio.sh	2018-07-20 13:43:38.494932028 +0800
-@@ -73,6 +73,14 @@
-   fi
- fi
- 
-+if [ -z "$JDK" -a -n "$JDK_HOME" -a -x "$JDK_HOME/bin/java" ]; then
-+  JDK="$JDK_HOME"
-+fi
-+
-+if [ -z "$JDK" -a  -n "$JAVA_HOME" -a -x "$JAVA_HOME/bin/java" ]; then
-+  JDK="$JAVA_HOME"
-+fi
-+
- if [ -z "$JDK" -a "$OS_TYPE" = "Linux" ] ; then
-   BUNDLED_JRE="$IDE_HOME/jre64"
-   if [ ! -d "$BUNDLED_JRE" ]; then
-@@ -83,14 +91,6 @@
-   fi
- fi
- 
--if [ -z "$JDK" -a -n "$JDK_HOME" -a -x "$JDK_HOME/bin/java" ]; then
--  JDK="$JDK_HOME"
--fi
--
--if [ -z "$JDK" -a  -n "$JAVA_HOME" -a -x "$JAVA_HOME/bin/java" ]; then
--  JDK="$JAVA_HOME"
--fi
--
- if [ -z "$JDK" ]; then
-   JDK_PATH=`which java`
- 
diff --git a/dev-util/android-studio/metadata.xml b/dev-util/android-studio/metadata.xml
index 4c831eddc64c..c61e3dc74f4d 100644
--- a/dev-util/android-studio/metadata.xml
+++ b/dev-util/android-studio/metadata.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
+		<email>zx2c4@gentoo.org</email>
+	</maintainer>
+	<maintainer type="person">
 		<email>perfinion@gentoo.org</email>
 	</maintainer>
-	<use>
-		<flag name="custom-jdk">Install and use Android Studio's custom JRE.</flag>
-	</use>
 </pkgmetadata>
diff --git a/dev-util/boost-build/Manifest b/dev-util/boost-build/Manifest
index 9ebde5176a77..54f94aba20e4 100644
--- a/dev-util/boost-build/Manifest
+++ b/dev-util/boost-build/Manifest
@@ -10,5 +10,5 @@ AUX site-config.jam 688 BLAKE2B e43a7ad1a94d113a7f890e8b634770f5c60556101d428d83
 DIST boost_1_76_0.tar.bz2 110073117 BLAKE2B 45445e6a9725cb99131e0b831b2fac0840d083692c13887b41adeac5cb8b3732026db3641d6be20591a676b78a87fcf363eb9b1508f87ed26039bba6a1ced533 SHA512 5d68bed98c57e03b4cb2420d9b856e5f0669561a6142a4b0c9c8a58dc5b6b28e16ccbb16ac559c3a3198c45769a246bf996b96cb7b6a019dd15f05c2270e9429
 DIST boost_1_77_0.tar.bz2 110361537 BLAKE2B 106aeb09ec7705b595f2ca966a76c53c649eac6fac50d88c156862e0991c33c89a2f3a09edcbcb453fa44bf71cdde030b35d0a0889ad97b65f3a868cb877a532 SHA512 39b45c9b60bc5a2a4c669a4463d1272c1e093376b2fb374d7f20a84ea10a3e23bb04b335a735a83a04575731f874d9bff77e89acd947524b3fbbae1b26ae1f2f
 EBUILD boost-build-1.76.0-r2.ebuild 2155 BLAKE2B f3705ae6770e374d00d4405335662c072dd475dc0a230cb2fc376bb84374554cf11dfc07df059833630ea0131a2f3bce9f4d0aa0059fff33b0996d12d1d1d33b SHA512 b68b1bbaf0713cb0901037d731ba7001d0cab9bfec248bf0f6724211b2b50ba7a759d9f5e0bc66070f37b60c9207dd452bd63f69007ac18d5370316dc3443651
-EBUILD boost-build-1.77.0.ebuild 2116 BLAKE2B 5cad580ff99e6c9a88dcc05665e3fdf5de5cd63e2adc32f0f015d8e8248f2a32285435e586543deaa115c707073d224b0c23dbd2001139bb63aad95273ebd0f1 SHA512 56169c216bdcfbb0e3585e72d9d5ae82a7332db0688a372698f82209fdf51d4d0e260c58102109f42d2a8d271a580cb11069ce3ab5fd8f65f149ec9943ab0546
+EBUILD boost-build-1.77.0.ebuild 2122 BLAKE2B 8327046ec652c24697e0273e143ecc6639bc5cbd63100e60194a0d72e8674badd989b0453922d30d5470fd77d6e3e7b56807c9b2bf9f1cda36755c5a8e18eab1 SHA512 d9f2c4ecb318b52d44a3d7664480635526f6d27c90307c5b95e6125b7cc4e8145434154e755e6b663687d796495cd8e75fbae0a122ce350176660d449bfe4cf1
 MISC metadata.xml 320 BLAKE2B b8916adb7b84ead3feef70414578019e07de58086e6954cf2a26a77368a99bc75bf99ca18f111a67531d318863fab700083ebcd7612e7d40ece89086d9d4974c SHA512 7c2c8fa591a6c3d05b5d4808077b890d5757bbb4c12a9fe7ed7b4ebc738244266196baba07da434ac3609c0d00aed4ef9c2346524f141e679b94376f804c508b
diff --git a/dev-util/boost-build/boost-build-1.77.0.ebuild b/dev-util/boost-build/boost-build-1.77.0.ebuild
index d4117bc4ee27..9259bd5cb941 100644
--- a/dev-util/boost-build/boost-build-1.77.0.ebuild
+++ b/dev-util/boost-build/boost-build-1.77.0.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/boost_${MY_PV}/tools/build/src"
 
 LICENSE="Boost-1.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples"
 RESTRICT="test"
 
diff --git a/dev-util/bpftool/Manifest b/dev-util/bpftool/Manifest
index f1a383f10915..6b6cb546f637 100644
--- a/dev-util/bpftool/Manifest
+++ b/dev-util/bpftool/Manifest
@@ -1,4 +1,4 @@
 DIST linux-5.14.tar.xz 120669872 BLAKE2B 0047f5aaa3940dff97f4055ef544faafbbb5282128e6afe21d2f47d8dc8c395806a17016febfa050117d16f59e74b882cb8b9c5011d68f119c230d0a4d120524 SHA512 8e4f3ec3d36f774280f75dc7b004a43e09417af58f12e9c9f8348976659d4cfda7ad905f306f43fed66a27922e5c45db22e46bbfa7a0b9f365012380de3b6f64
-DIST patch-5.14.5.xz 121948 BLAKE2B 1f1c503e9d56384250f0e3bc36d698a3fbd07e45dab8b01cb8046d660d32630f3f26daead931b5adc8d7ff26af3d819325d4af2c6ec0a37cb4ead637244dfe80 SHA512 496859c954a700704f5f4aca64ed134c183638d270155e5456fcc871c917a82f41ab4d70a0f503c9f1a7c63426f99a25545f4a930753e6afeb23dbd4be92e6b2
-EBUILD bpftool-5.14.5.ebuild 2826 BLAKE2B 75caba7a4cb73dba40a6e3c08751327e97f32f618d7240b694434371ba63722626565fcf9fe6ffe0961929e1f6736bf80cda3c196c3aa6160404521ea20628fa SHA512 5c02dcd3f55e406955fbbdb4199ff89572665a1c09f443217e415e0a0b19df8865d7a75342ce3305e93254066f4f49670ad34b879aacd1d68a36fcd0db696829
+DIST patch-5.14.6.xz 262092 BLAKE2B 06c3b6c194d67e5a2c39c9b97799fb2f4e76071e058d62f29c1d2aa049980719bcc27deba445081b0e3d5fc6fc476ac722945214baf60fed672c417bd837a31c SHA512 9270e911d2a71dc9c284f95217c10fc3b3666d7e6c54ce3bb1b1d4f3c081d7ea5449e7ac645c60c18986531b4675291ba3808367f5630eb15adaee3de4e63d46
+EBUILD bpftool-5.14.6.ebuild 2826 BLAKE2B 75caba7a4cb73dba40a6e3c08751327e97f32f618d7240b694434371ba63722626565fcf9fe6ffe0961929e1f6736bf80cda3c196c3aa6160404521ea20628fa SHA512 5c02dcd3f55e406955fbbdb4199ff89572665a1c09f443217e415e0a0b19df8865d7a75342ce3305e93254066f4f49670ad34b879aacd1d68a36fcd0db696829
 MISC metadata.xml 356 BLAKE2B 4cc2dafd4a125f2144fc8537377c1857c4cf3ace56242965c41f29b5601b346b211ae8a05459b555569b4a11d2eed39345f02c3fe27ba8a8f93117969ee8b8cc SHA512 c2c0f149fbec22400163df406cdc10df537bef638251eeabc332709992e7470c323b366cfc465d6ecf14f2d84065660cccefef7a5ca45980d679b645ebf664be
diff --git a/dev-util/bpftool/bpftool-5.14.5.ebuild b/dev-util/bpftool/bpftool-5.14.6.ebuild
index e3fa3487cfe7..e3fa3487cfe7 100644
--- a/dev-util/bpftool/bpftool-5.14.5.ebuild
+++ b/dev-util/bpftool/bpftool-5.14.6.ebuild
diff --git a/dev-util/catfish/Manifest b/dev-util/catfish/Manifest
index 69ae21b96423..bab878d47f69 100644
--- a/dev-util/catfish/Manifest
+++ b/dev-util/catfish/Manifest
@@ -1,5 +1,5 @@
-DIST catfish-4.16.0.tar.bz2 261252 BLAKE2B b495814857cb551c00dff8b92d2b24df876b1ab269bcb0ba468c791b97f3e962b875c5a687010472c5d47719475c99131d5ee6df3ce642af147b199976eb3538 SHA512 926318d3b2387386a5141347cf23b7e1505f83c48dac3804dc9c51aeeede2ef71d6d70e61bd5f608145249ccb4d3d87662bdab0c0a88dc69608b2edee55ddc19
 DIST catfish-4.16.2.tar.bz2 270051 BLAKE2B 41048edc3933664af389ae7120e6f2b25f6c92632a4d00b999eef4e26e0f6eeeed70320ed740f26a0649e423e3b8316e33b8c671a282ae1a4474b3cc6bbc4824 SHA512 a1dc2839106d55e11e537478402b44d3794cdcf326c5984bd95d0d5a8bad52d91df1be22ba347d23f030d0c62fdf2b90a507e2abc30ed4b4d1804ab8dbde1dbe
-EBUILD catfish-4.16.0.ebuild 1196 BLAKE2B 3fe6f289c69468b2fe4d1d19c091e9605f85d2ec83cccc0a9cc36fc783ad934cb9ca0e4df21a3059cb75961ef71281fd1af79f8f714e91f649d5746f4916ca96 SHA512 0086aa4c90c32c2c9d94a42c80652e26f5fee614850b99c46c3e2dd6702a728fc1c52cd4b614ec3888633b922b38c948f7341fed76abe2adc80cc63a035e3bb3
-EBUILD catfish-4.16.2.ebuild 1199 BLAKE2B 8981e4dc834c3690a0cf336f9f7a3aafd95fbf74462bc9e85bc81b2abc34c0a5ac9f4db8219a8f14d3e7cbefec4cf701395a01b8539ea9353378df13b3de09a1 SHA512 60b9f1691bb3c278d68c7eb7d85e89e09c2ad9a894655661da798d6f5052ed01534b7fd4f111f091507e576f654b8d5b1b4fa28a132b068bc03ec3523c7f3b8a
+DIST catfish-4.16.3.tar.bz2 271642 BLAKE2B cebadeeb478a041ba6f815aec81b18d317ebf468bfe0699e33c4550a2f4b1b3377cbabd08d7d6504c3d94169b2be68d35ade9bd77e018ea7c099370ccf4ac124 SHA512 23ffa160b0593033a9696644fd00c48e4a6f54dc25448f975f0949aece50d8e4fbb45b9ad086a8e14072ac1dab27e0b4ecd19af0f31a5b4a775b17e18b00c7bb
+EBUILD catfish-4.16.2.ebuild 1197 BLAKE2B 085361e1637e506cdccb07c50464fbb7e2ecbbc6517c0ede48907100f3764f787b98bbc452a7f5b179f5bb30e20197c62078dd28f72e458bee5265370d550a05 SHA512 27d63ea3fba37a90fc0b0e78f7a2e8133fb6a5c74890bd26958f261f219236e4038b13a0eb14a814b874d727cfbca0efaf3e9d44ca72d02d065bf1cc1232b9a7
+EBUILD catfish-4.16.3.ebuild 1199 BLAKE2B 8981e4dc834c3690a0cf336f9f7a3aafd95fbf74462bc9e85bc81b2abc34c0a5ac9f4db8219a8f14d3e7cbefec4cf701395a01b8539ea9353378df13b3de09a1 SHA512 60b9f1691bb3c278d68c7eb7d85e89e09c2ad9a894655661da798d6f5052ed01534b7fd4f111f091507e576f654b8d5b1b4fa28a132b068bc03ec3523c7f3b8a
 MISC metadata.xml 217 BLAKE2B dbd6f28308a539b2f2d27b9b2bb6d44ce324db803a3ed7218ac091711f3cfcd5f01f505c084c0b714f19257af70483906135c68caa1964252b6a9c9fe71b4ac7 SHA512 ba66b524e0287ac4326c527d973ed2ff6a40e330f38f3f1333db2c66a7672e6b24a6212ddf430ee454ed943d89d04a12e42eb670f3dcf1567f59c6e51d5677aa
diff --git a/dev-util/catfish/catfish-4.16.2.ebuild b/dev-util/catfish/catfish-4.16.2.ebuild
index e20eafa63bda..e598039ab371 100644
--- a/dev-util/catfish/catfish-4.16.2.ebuild
+++ b/dev-util/catfish/catfish-4.16.2.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/glib-2.42
diff --git a/dev-util/catfish/catfish-4.16.0.ebuild b/dev-util/catfish/catfish-4.16.3.ebuild
index 5d3b27cfd10d..e20eafa63bda 100644
--- a/dev-util/catfish/catfish-4.16.0.ebuild
+++ b/dev-util/catfish/catfish-4.16.3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1 xdg-utils
 
@@ -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/glib-2.42
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index 0b85b85ea61d..7206063fceee 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -5,10 +5,12 @@ AUX ccache-4.3-PWD.patch 2677 BLAKE2B 4a21c496fc2e2249490246d9595935afe13244a4ba
 AUX ccache-config-3 2147 BLAKE2B 6e703e12b6a2f83b838f8b1d1e534de3366b6e2994990b30c381b0df28be9c0ae7c0f1d7325282e97ca54881171846c13945b264bd4a793785ff1a19d0941669 SHA512 05d512b001b6a2fdc947d10d810c89683144080a060c24a37422e9b587594e1ee42fa1d7607461571f196819dae92146d861e8ae116e9226e1ff97ea035b3003
 DIST ccache-4.3.tar.xz 433508 BLAKE2B 6ab48aa587b4dc86020e3b0f722003dc5c03709626e143a1d38506b6072f9963fc76e89b6d18128dfc28035bf8d24e46ea44f219db69a1b3a294416f0b023090 SHA512 ec082de95ea8b22154ce1e67e0a0fc28266cfb71f382205f7eab14e6ac1c7841027d063041131832b3227d833d99ec874e90df238f35f433de4c381566931c7f
 DIST ccache-4.4.1.tar.xz 509916 BLAKE2B 54fec9480c37c144667ae2dd969cabc1526a01312200b2b9b26ef1d5533836e2070d28e6a7fbc580f232b22dbd6f1a56a43494b8960d96c5a97d8f041e8f31ca SHA512 820c0b05d2b0209e8478c7409da0e27de8e9621c683aa0f147f9c025b8ac7bc3d06d6945d346143790168da79dfbd14b0ccfb284c7ac05c35f85b492be07d676
+DIST ccache-4.4.2.tar.xz 510260 BLAKE2B f0d8b9ac6e1972592ce5a51a392279a01f01c09e6bffc498ff0b20aa46acb6d7f949ae9f4c6006e20b15cdea9fa2fa057c78b69ef66c2e13b3ddee13367e91b1 SHA512 afcec4806b1e307ec16006ecd9e39eb69fc1376407877f024c882926725d41f2b08eccdcfb3efd8dac9e481d07f9c08c043b8cea5ea563a0f49b2f587325e4a7
 DIST ccache-4.4.tar.xz 509516 BLAKE2B 6c4519d3cd93be49dfff09f22ada798894c9f4475395443e0dcfcf768178f1520cf26bc5c2e0ea22e06cc3ebd6ddaf930a2d1b517593a10c3253f7faa3131f43 SHA512 a857d1aded9c352eabba9c0f31b43fd17ae91672dabdfc086851448867c9dff6ad6dd7ee60f8e39102d41b7d8cf7866c6bf104e0214e865de45e75a8df7626f0
 EBUILD ccache-4.3-r2.ebuild 2039 BLAKE2B 52f3830cb8451b66871732aa64aec3a8e42bc1730640337f2baed76ef9fec092f43c36749b0c9939e7e98b75ae3d7a14847d9dd8ec380f8acc8981b3de989dd0 SHA512 1e5bea0e4d4bd454d6d224975972d2dd1470061be94a6fcc6eee7bf5bdad2c07007a586b0003144308eed1fa4cbe11c07d3ca3d3f96f27b4eed7ca644c2b1c01
 EBUILD ccache-4.3-r3.ebuild 2118 BLAKE2B 78542c33b7cab6cae672873c692f78630c22660690756200b13817e40b8d9c012d14b130e3c4806c01ba352ce8ac90a4a104165804ff4df2ca55bb3f24731a48 SHA512 fe037af1fca8f0d4962e78072addb2ed8dabaa424c1c301444289052ee19baf983ab63b15eba757369807b6346bac0a27cd54e947331c450a9f731ed84d725d1
 EBUILD ccache-4.3.ebuild 1655 BLAKE2B b3cc038828f86dbd2d8060f5d13a197c399e7b99d0c0fcf4a82fbb498c212a9624fcb023f481c628a123fd1e2237689b1b094187c5fa1caa98aeca38c9c870d7 SHA512 0adb9fe19611bd373870e85d889b2bdaecb0fe6b11c40f3d48add1ecdca99c4b6beed5b151c685eaf13f0b11b0988bf870525ac23e3f78c865565f84e1aba156
 EBUILD ccache-4.4.1.ebuild 2303 BLAKE2B cc369c3130135f847b011f6fb567fbaf6fd82b52db8076dd3744c71e732dd38d81a3a1e98539fc9782d45b36d2ab8d9cad71ead8a36ab31d1299124b51ed8e56 SHA512 22df449dc9c538b312786441ce8069e100c38de3aa392872aba6c875f0fdcb45c625066f061f213cb8d778d536106e1bf660fbbcd552cdb50e1c1b7ae8a6ccce
+EBUILD ccache-4.4.2.ebuild 2303 BLAKE2B cc369c3130135f847b011f6fb567fbaf6fd82b52db8076dd3744c71e732dd38d81a3a1e98539fc9782d45b36d2ab8d9cad71ead8a36ab31d1299124b51ed8e56 SHA512 22df449dc9c538b312786441ce8069e100c38de3aa392872aba6c875f0fdcb45c625066f061f213cb8d778d536106e1bf660fbbcd552cdb50e1c1b7ae8a6ccce
 EBUILD ccache-4.4.ebuild 2204 BLAKE2B a6ae2e76ed4fe98970eeda1e36da986ccfedf80cc35b74414a7dba16853b3663908621c5b00029def4031c3324edbe44283c60ca353899d778e9d8e8e1f8d193 SHA512 5d7ccb58cea38b208092b87c954bfd029007b84cd09bc05fc79c3f6164a9ddde15321998c074436e3d2065edd104d27e32f067f811867407c743c82e34a5fb10
 MISC metadata.xml 632 BLAKE2B 54a81f78ca7731afb01f2ca1d377d9aa722a368d4177c8cd34a505c1ceaec28539718da6665ffcb5a06af544d518d7806c8db4338b0ab473d56cfff39fbac9bb SHA512 bc9037810d55b532289cad47b2249efb9cb81a9acd48466461efba65487ffade1269ff00f271a4cf1ee8625906c1b3abca6e5244224c55a527aea75cc6eb5922
diff --git a/dev-util/ccache/ccache-4.4.2.ebuild b/dev-util/ccache/ccache-4.4.2.ebuild
new file mode 100644
index 000000000000..39deaa2e861d
--- /dev/null
+++ b/dev-util/ccache/ccache-4.4.2.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake toolchain-funcs flag-o-matic
+
+DESCRIPTION="Fast compiler cache"
+HOMEPAGE="https://ccache.dev/"
+SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/ccache-${PV}.tar.xz"
+
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+# Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
+IUSE="doc redis +static-c++ test"
+RESTRICT="!test? ( test )"
+
+DEPEND="app-arch/zstd:=
+	redis? ( dev-libs/hiredis:= )"
+RDEPEND="${DEPEND}
+	dev-util/shadowman
+	sys-apps/gentoo-functions"
+# clang-specific tests use dev-libs/elfutils to compare objects for equality.
+# Let's pull in the dependency unconditionally.
+DEPEND+=" test? ( dev-libs/elfutils )"
+BDEPEND=" doc? ( dev-ruby/asciidoctor )"
+
+DOCS=( doc/{AUTHORS,MANUAL,NEWS}.adoc CONTRIBUTING.md README.md )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.5-nvcc-test.patch
+	"${FILESDIR}"/${PN}-4.0-objdump.patch
+	"${FILESDIR}"/${PN}-4.1-avoid-run-user.patch
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	sed \
+		-e "/^EPREFIX=/s:'':'${EPREFIX}':" \
+		"${FILESDIR}"/ccache-config-3 > ccache-config || die
+
+	# mainly used in tests
+	tc-export CC OBJDUMP
+
+	# Avoid dependency on libstdc++.so. Useful for cases when
+	# we would like to use ccache to build older gcc which injects
+	# into ccache locally built (possibly outdated) libstdc++
+	# See bug #761220 for examples.
+	#
+	# Ideally gcc should not use LD_PRELOAD to avoid this type of failures.
+	use static-c++ && append-ldflags -static-libstdc++
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_DOCUMENTATION=$(usex doc)
+		-DENABLE_TESTING=$(usex test)
+		-DUSE_CCACHE=OFF
+		-DZSTD_FROM_INTERNET=OFF
+		-DREDIS_STORAGE_BACKEND=$(usex redis)
+	)
+
+	use redis && mycmakeargs+=( -DHIREDIS_FROM_INTERNET_DEFAULT=OFF )
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	dobin ccache-config
+	insinto /usr/share/shadowman/tools
+	newins - ccache <<<"${EPREFIX}/usr/lib/ccache/bin"
+}
+
+pkg_prerm() {
+	if [[ -z ${REPLACED_BY_VERSION} && ${ROOT:-/} == / ]] ; then
+		eselect compiler-shadow remove ccache
+	fi
+}
+
+pkg_postinst() {
+	if [[ ${ROOT:-/} == / ]]; then
+		eselect compiler-shadow update ccache
+	fi
+}
diff --git a/dev-util/checkbashisms/Manifest b/dev-util/checkbashisms/Manifest
index eb58b008b1b5..156463980b81 100644
--- a/dev-util/checkbashisms/Manifest
+++ b/dev-util/checkbashisms/Manifest
@@ -1,5 +1,5 @@
 DIST devscripts_2.21.2.tar.xz 980516 BLAKE2B 907f2f4e258a8396ad0a28eead1e2058b8e19be205f024ea80c0fbd9621d5ca4299844fe83d66cac7f653a917705d9c36eddb9d51454a7fbb9d7e2b52bc994ff SHA512 a6765d807dc0c2ef7a3d8c59e1262bfe7542c3ca52cda3c1910af253925cb105a9d1bf272c76a86f0b3cdda9c8a4e2d29a660437f73087dd70ee8a444bbedb01
 DIST devscripts_2.21.4.tar.xz 981488 BLAKE2B 29339490586a66c6360f599a90e23452fd1e99fd01757e258e082b9550731b3e443b12fb9ce9b8fe6fb229f228a115f87a9b91b8769000afd741eb77e9e7a4a4 SHA512 99250737cabc24bbd21e20de7c787e182492e15cad4288226ed497349cbf3dd45927e1c501d73341e48dfd14ee2285c8cca8ac3b2145c2f02ce4d04ddb881e50
 EBUILD checkbashisms-2.21.2.ebuild 804 BLAKE2B 3327e778848aa5aaddb57e44ad561465133c2833db704842d1fc5e3533fcf5d15a33c065baa5dd199d3e2694b770096805f7719236eca33b35953afd6d1814a4 SHA512 bff58abba0ecc7da82e22d5a5aea758fb5a665a7cb05d0f472ef423de5273dc9ba89ba6af5ef613bcb740faa1e8a7d0d0e4debf53baa632e36fff31c736fc292
-EBUILD checkbashisms-2.21.4.ebuild 797 BLAKE2B dad0d0308e87e0b915e3aec869bb893fb725aca31fa847a7869e285f75f9e4558af24aacf6860d5bb439d76ac45aaa1c1d952af986f73592f10968a6e2528bb5 SHA512 5e5a736f8ab2e23d0e1a3237b930bb3d60bc39c9b56acba2f191334b5eebe9cb7e529b8b6ac734ca426581402437a89136ecf03858a0ac74334bd2203c902411
+EBUILD checkbashisms-2.21.4.ebuild 804 BLAKE2B d2384fb5eb37e741e7b19cf401572b6fb642a28c36a98d98e7253eebebf2efdcd4be0b33ec94cf7fecdc257794bcf4d709fde5d6ec3de1ee19a80eee7bcd09e6 SHA512 78556996ca62b0bff41fb0eaa5a508a855c48aa2008ad9e89596e7037697b196e0b21b78a174737255b14f6fc46c793a8025025178dbbdebdbdb7948b9af713b
 MISC metadata.xml 434 BLAKE2B 031cac658d94414702e897991f7e60858edca6ed7c49c6413b20523e4e1f39adaa109c9bd5b87054a2767ba1fb1deadeb4e5021dad58a5bee366e962d7d95ccd SHA512 c30bd0b32e0c851ef023de34a60207c353d8076fc84ec4be67cb23358cdd31ba9be8baa8f3dfacb526a7ac40ebde2b278d413f16595b412d0a9e9590f14bdd0d
diff --git a/dev-util/checkbashisms/checkbashisms-2.21.4.ebuild b/dev-util/checkbashisms/checkbashisms-2.21.4.ebuild
index c92bd4dea7d8..fe77ca334930 100644
--- a/dev-util/checkbashisms/checkbashisms-2.21.4.ebuild
+++ b/dev-util/checkbashisms/checkbashisms-2.21.4.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}/scripts"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 
 # Requires python packages to check tools we don't need anyway
 RESTRICT="test"
diff --git a/dev-util/ctags/Manifest b/dev-util/ctags/Manifest
index be60881671e2..cfa25175b050 100644
--- a/dev-util/ctags/Manifest
+++ b/dev-util/ctags/Manifest
@@ -1,6 +1,6 @@
 DIST ctags-20190331.tar.gz 1537104 BLAKE2B 354ddf48cdc9421e70d9d37ec7251e51f7f78564dc4f6236d12e2e18519369c39c22585830fd301b7eff4898d550b824776541198b8c4a31425711776b14fde4 SHA512 414faef7628ecaa66fcd5f172781a32194e1d58637dded1f7e55c138239ad777796bb1510bd447af3ad8243b7178e6f4859139305b0c0efe298182408f34524c
 DIST p5.9.20210321.0.tar.gz 2096441 BLAKE2B 44fcbde5953ac192f8ccb43cbb598b63a99d421feda8fe019bd2ac915fe235a769250bbb2f0f00eb353ce883a7f3556af4dbfc9871fe7fd5fa8edce5f8441af8 SHA512 62d9744bac089106cfa2a477f113ca7924831f768ee0de01577cd11d14f1cd926a246d08a53e7537d1d39c9e8aa06a58b7a10f79d8532326bf0e4af74d70c4ae
-EBUILD ctags-20190331.ebuild 1795 BLAKE2B d6f51668cc3fbbaf4b8921bf7d27d01dd7f62ea5faa424bdd6f962d9a8e0b5f9b971b08955efa5efba67894be4b0c78ea4a7be5225184fa6fe16c54979289da3 SHA512 42f0b6f7c8929e668acb8a4b79577d92fe72d641a18f90dad96be9e57a888c7387f47a0dfd1f142375ea6f109890e27bdd22d655d7d775560f826e6f3d6bd4e1
-EBUILD ctags-20210321.0.ebuild 1832 BLAKE2B a6be46af0437025d5daec0be988a0e2969b362fb9f59bb953fb33018aab20e59e79b5d870697104ea8323bf82a67926f6ff2026f6253db31312cf89e849ed403 SHA512 7ceba5b08fcfa6b2b00679d9bca52a9556bfecae442b7cb06999346754e153adaf6e245209df7daf04087daa70a55c9dc50b0cb03c02cd66f6f31c5b4c9ca067
-EBUILD ctags-99999999.ebuild 1825 BLAKE2B 2a0e097d2626d364c2344db4e72f0c7c2e717f73c3560d2aaf2012c234c3ad858d8f6ca9e543ee48c11a1324f93d6cc5e50d93ef6ae20331b7ca263446cc2a63 SHA512 8463c98b9fb2a0c6b556ab1785f7b128dde90a05dd6a1e765afd146e4d692af7ef88f7ee22294e561fb270a20408137fddb637b72cfb32c73aa1ac56f05bbdfe
+EBUILD ctags-20190331-r1.ebuild 1797 BLAKE2B c7ec6c31a22292ba12294a35749d31b8f36b9ca125a88e1f39db750d2a943c416ff2c7aa675f03d260b0d772c1d9970d5442baa49d390d761d1610af4a9a3d50 SHA512 b6aa285fa71b532584b992bd420b82e3b0bc707691964848b905bcdfba8688544cf8177644ba38a0317bd629d49f80b5bead255b74518c9790f48bac706a6373
+EBUILD ctags-20210321.0-r1.ebuild 1834 BLAKE2B 3e482f989b51faf1d6112d2f89e766531917fa570b9542a9e8185944c98c219dddc48438b80a521936340fa59c9049d13c0a66d142f236a92d0d3b945f5c9ddb SHA512 e7be1cd84e146ac88c02e0d178eab24ae40f96ff8a7464ff25b6ac27ee261a83edfe5f40ab383415612c0aeb028c7757035edd1c189f0a172f6943a22ce09558
+EBUILD ctags-99999999.ebuild 1827 BLAKE2B 80f19b0ca0d3efcb63255bc0d297c4457adf4ca62a722162c4e5c22989a0ee7332070230672172888c25b85b1bf7118c7b22e56ca476a3f436d4d5922ae6253b SHA512 c08c5bdd0908bb9f1d6ebf7ebfaaff05c502307c66e8658d69088378b2f9e26468a27f462b9747f56963d82d6d3b0895144a84222c20fd43bf059751a1b6afba
 MISC metadata.xml 584 BLAKE2B 13de5ebe8bea2b413552eb85af3d3a42c453ad8d7f808b21a5b016bbd3e7890ceabdb924e817c4d841ed2862b7f9dcecad03f7f22c7b738db1c4f88d784fc80d SHA512 c4930de987c3d846c4761d66a191ae2b2800b32234f63ebafee140920faa408cec1b22032c72da01ade807a4187f482bedad3e22058fdffc0af56aabd1deea8f
diff --git a/dev-util/ctags/ctags-20190331.ebuild b/dev-util/ctags/ctags-20190331-r1.ebuild
index cfd6b8d756ae..7eb5ec5879da 100644
--- a/dev-util/ctags/ctags-20190331.ebuild
+++ b/dev-util/ctags/ctags-20190331-r1.ebuild
@@ -17,7 +17,7 @@ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x
 IUSE="json xml yaml"
 
 CDEPEND="
-	json? ( dev-libs/jansson )
+	json? ( dev-libs/jansson:= )
 	xml? ( dev-libs/libxml2:2 )
 	yaml? ( dev-libs/libyaml )"
 
diff --git a/dev-util/ctags/ctags-20210321.0.ebuild b/dev-util/ctags/ctags-20210321.0-r1.ebuild
index 797f050afc93..471c4110d1bf 100644
--- a/dev-util/ctags/ctags-20210321.0.ebuild
+++ b/dev-util/ctags/ctags-20210321.0-r1.ebuild
@@ -21,7 +21,7 @@ SLOT="0"
 IUSE="json xml yaml"
 
 DEPEND="
-	json? ( dev-libs/jansson )
+	json? ( dev-libs/jansson:= )
 	xml? ( dev-libs/libxml2:2 )
 	yaml? ( dev-libs/libyaml )
 "
diff --git a/dev-util/ctags/ctags-99999999.ebuild b/dev-util/ctags/ctags-99999999.ebuild
index 398cfa10dcb4..1d3b06d128c0 100644
--- a/dev-util/ctags/ctags-99999999.ebuild
+++ b/dev-util/ctags/ctags-99999999.ebuild
@@ -21,7 +21,7 @@ SLOT="0"
 IUSE="json xml yaml"
 
 DEPEND="
-	json? ( dev-libs/jansson )
+	json? ( dev-libs/jansson:= )
 	xml? ( dev-libs/libxml2:2 )
 	yaml? ( dev-libs/libyaml )
 "
diff --git a/dev-util/d-feet/Manifest b/dev-util/d-feet/Manifest
index 23a0da31589d..347e23d120b6 100644
--- a/dev-util/d-feet/Manifest
+++ b/dev-util/d-feet/Manifest
@@ -1,3 +1,3 @@
 DIST d-feet-0.3.16.tar.xz 237888 BLAKE2B b4773b781c53feb11889b49746e714a42a15a85daeb16dcd5235609fb6105c0b1a3ebeeb4a08830de9067f1c193702b31fcbfc67190eb2f901907b96acfcadbc SHA512 ff4db968cbd679e2065c614d538187fe3c56118b44638771ec9f7472bdba4a798dc682565f520a8680a8001ea39ce88555b07cda172e60f88eb6bdf1e00b5a6d
-EBUILD d-feet-0.3.16.ebuild 1017 BLAKE2B 32ed5c7812f30a4cfa06a9d3b383f28f58a0138614ec0fc62dfdc0e9a3ed1ba3373ccbe01e497093a47268074181d5174fce4975ba1afee6c490388b0f8168d3 SHA512 e8b881c969a80222695341c03601a2bc81214d1e6c487cfce80d708e0afa48a269ce069c47cde5199d21184e9b2e93f672f383fe14af3331f29afaf96a112347
+EBUILD d-feet-0.3.16.ebuild 1024 BLAKE2B 9551ddfec9528d64b83614e4c58dc30322b688ba4cd56af154c2d859e5982846255978d7d832b5569216d1c5798492287e98d7dee993912eb6173f32347d85db SHA512 de91c821a0838c576d80f9476fb58e678f32c8202b442c648f50386a07283083d9fa10a7a5971091e3b54b6587a9131225e8d747e3970fd32f64206190b77ebc
 MISC metadata.xml 252 BLAKE2B 1dee28ae6c6e69a9c06e2c6f7f309e1193633c7571f0fc645546b89aa018837d3222514caf1db9ac7d43a014377d6ba04620347c78aeba5b6aa020dc51a49690 SHA512 e8d972cad532f8afa0e4d67eb837160d7d436db8c8296a69e97d40e010a12ae11651147cd8f6b5e39c445992ee16008f52ea2eb6f8c032e340040d298abf979f
diff --git a/dev-util/d-feet/d-feet-0.3.16.ebuild b/dev-util/d-feet/d-feet-0.3.16.ebuild
index 78b248d5ae38..7a9d65104598 100644
--- a/dev-util/d-feet/d-feet-0.3.16.ebuild
+++ b/dev-util/d-feet/d-feet-0.3.16.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/DFeet"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~riscv x86"
 
 IUSE="test +X"
 RESTRICT="!test? ( test )"
diff --git a/dev-util/intel-graphics-compiler/Manifest b/dev-util/intel-graphics-compiler/Manifest
index 9cdd9e9587b7..67fefbc8507c 100644
--- a/dev-util/intel-graphics-compiler/Manifest
+++ b/dev-util/intel-graphics-compiler/Manifest
@@ -8,7 +8,9 @@ AUX intel-graphics-compiler-1.0.9-no_Werror.patch 272 BLAKE2B 079fe334413dfddb76
 DIST intel-graphics-compiler-1.0.8365.tar.gz 7509633 BLAKE2B ffe18d18b409db36bd24215d841daaa36d5055d61b9021e385fe9178351b6a92383839e271a12d1e5017150b9697060fe37f803c5153d2f107813aeb2e7a74cf SHA512 6597afbab2c101d69e6a991b5b065ebbded7ccc6227c0ed82b6b0bd33fec26489c30a0a7a9558617578a767ca6d7382a6ab36144f4c64df742c6bd545ce991e9
 DIST intel-graphics-compiler-1.0.8517.tar.gz 7539946 BLAKE2B 034d2e3dcfc25186e29eebfabffbca7b8a5adab1f766c7515b4a3206c9c52eca3dd766e17320ea0c40067385fc6235d92eec13f1d12909915b86fb42a7862825 SHA512 35f09d1f6b117e78814cc235d03b1f1164f11a2d2a5d188b6658677c4b759422048764e765f7690f4789dc8b8c068714a68642c2d956ccc84b387a959f9af07f
 DIST intel-graphics-compiler-1.0.8708.tar.gz 7574517 BLAKE2B 578b29a103d3d0b7f481971a801fa11bc14430b7ecd00c99492f5d80ce713b84d00d278726a425edf5884ac15f4877c96a39a3f3f3f1c22bc972db039be28dc2 SHA512 3685c2fe0750d860facd7f378a1de4ac21127e7720d7a8889ac0ae8ab9e58dfacfc50b5bbe37d5744c9a17958b057512871125b58784a8c62ddffc2997f80ba8
+DIST intel-graphics-compiler-1.0.8744.tar.gz 7586378 BLAKE2B 0f20f99a2659f733521af35c1dd63c2b1398bf4fc5745a217b96ad62cfa53f105d4c9a34eba09651d0f0679d6957820011446f5657170f5ad07d110372b8b1f3 SHA512 dbbe6c08f32b80be305add570187df883aacefbf90b252c70b5705ecc7732f25873732a85558f0aed2ee8db5bcd1a59aec4d7ba110774922dbb19d4d3522a539
 EBUILD intel-graphics-compiler-1.0.8365-r1.ebuild 2166 BLAKE2B 61d3f255586dd52ac42e75da5e5f68183418d95483c40ce13207d227735d84e2959c556dc9518a02a47aeb9247fe6137cc7ce266412a9eb809b2bae04e42775f SHA512 c5ab29f8188144402d97405e4ae114e8851fe94a0431a73c6e8ce1b6f0e4c323b9f1b444ff7ada65a82f50ca99c4f70664daec8cdc626cf7fb3dfd370031d50a
 EBUILD intel-graphics-compiler-1.0.8517-r1.ebuild 2319 BLAKE2B cdf35fad3f98e4b53c368a09ebd73f4b770ecd5bd0223d0653313bfa1058939a7950bb5c51ab264167f1b709870f9b8d066261c3cdd1651de87fd4b9f84566b2 SHA512 61cb7c35d6327a854d371216ccc230f3b690401560e9560657037c444650273232d46c4bd2b624f4bb753ba9845b545bff4500ef3d59b880d5d1d0c4d3bfa207
 EBUILD intel-graphics-compiler-1.0.8708.ebuild 2151 BLAKE2B da55de9cac3423aebbd2351da31b893e0dc88c66db6cd55d2b7e0910436ee61e602903f793933103f6b8b1020e6d751dc2fd3ac2c701b115c8a983adbbdd1d2f SHA512 eddacd9ca77a9327b01b160c8e7d15201707e027f237f99d8fb1382d9e81764cbde555ec7a36eb822eb013f351f1367ddf775521ffada6ba412de35b8551f5e7
+EBUILD intel-graphics-compiler-1.0.8744.ebuild 2151 BLAKE2B da55de9cac3423aebbd2351da31b893e0dc88c66db6cd55d2b7e0910436ee61e602903f793933103f6b8b1020e6d751dc2fd3ac2c701b115c8a983adbbdd1d2f SHA512 eddacd9ca77a9327b01b160c8e7d15201707e027f237f99d8fb1382d9e81764cbde555ec7a36eb822eb013f351f1367ddf775521ffada6ba412de35b8551f5e7
 MISC metadata.xml 594 BLAKE2B de9f434fc853417b9d1c6199c7501c9fe702aa68b0eaa0f88d298563431de126fbdc259f0d541e85674b0205444f5d1febf0433b292a6ac40661d62af23457d8 SHA512 b939b315122a5fe3252242ccab8fbf049d9234ee67c6910969c178bcb56fc835bc954380f8c15bab23905ac852fa0fe0640f6ef2ee9d48502ae0e3379d7f7460
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.8744.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.8744.ebuild
new file mode 100644
index 000000000000..0e7e9889129e
--- /dev/null
+++ b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.8744.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_BUILD_TYPE="Release"
+LLVM_MAX_SLOT="11"
+MY_PN="igc"
+MY_P="${MY_PN}-${PV}"
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit cmake flag-o-matic llvm python-any-r1
+
+DESCRIPTION="LLVM-based OpenCL compiler for OpenCL targetting Intel Gen graphics hardware"
+HOMEPAGE="https://github.com/intel/intel-graphics-compiler"
+SRC_URI="https://github.com/intel/${PN}/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug"
+
+DEPEND="
+	dev-libs/opencl-clang:${LLVM_MAX_SLOT}=
+	sys-devel/llvm:${LLVM_MAX_SLOT}=
+"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	>=sys-devel/lld-${LLVM_MAX_SLOT}
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.0.9-no_Werror.patch"
+	"${FILESDIR}/${PN}-1.0.8173-opencl-clang_version.patch"
+	"${FILESDIR}/${PN}-1.0.8365-disable-git.patch"
+	"${FILESDIR}/${PN}-1.0.8365-cmake-project.patch"
+)
+
+pkg_setup() {
+	llvm_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_configure() {
+	# Since late March 2020 cmake.eclass does not set -DNDEBUG any more,
+	# and the way IGC uses this definition causes problems for some users.
+	# See bug #718824 for more information.
+	! use debug && append-cppflags -DNDEBUG
+
+	# Get LLVM version
+	local llvm_version="$(best_version -d sys-devel/llvm:${LLVM_MAX_SLOT})"
+
+	local mycmakeargs=(
+		# Those options are ensuring, that we are using
+		# the system LLVM with the correct slot.
+		-DCCLANG_SONAME_VERSION="${LLVM_MAX_SLOT}"
+		-DCMAKE_LIBRARY_PATH="$(get_llvm_prefix ${LLVM_MAX_SLOT})/$(get_libdir)"
+		-DIGC_OPTION__ARCHITECTURE_TARGET="Linux64"
+		-DIGC_OPTION__CLANG_MODE="Prebuilds"
+		-DIGC_OPTION__LLD_MODE="Prebuilds"
+		-DIGC_OPTION__LLDELF_H_DIR="${EPREFIX}/usr/include/lld/Common"
+		-DIGC_OPTION__LLVM_MODE="Prebuilds"
+		-DIGC_OPTION__LLVM_PREFERRED_VERSION="${llvm_version##*-}"
+
+		# VectorCompiler needs work, as at the moment upstream
+		# only supports building vc-intrinsics in place.
+		-DIGC_BUILD__VC_ENABLED="NO"
+
+		# This will suspress some CMake warnings,
+		# which cannot be fixed at the moment.
+		-Wno-dev
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-util/intel-graphics-system-controller/Manifest b/dev-util/intel-graphics-system-controller/Manifest
index beb432b578eb..bd97124374ac 100644
--- a/dev-util/intel-graphics-system-controller/Manifest
+++ b/dev-util/intel-graphics-system-controller/Manifest
@@ -1,3 +1,5 @@
 DIST intel-graphics-system-controller-0.2.3.tar.gz 124505 BLAKE2B 50bfaf5dee2fd55d92cd7e544faa8c26930f809b1f4d6dbdc332aec0ace0ced9e21817479c87c4ec12d1117209696b2146c2c6aeb1cfde4ad654d065547e8a6b SHA512 a3ecac36170b0f5c508e077c35336f5c2122d4cc2917e68237af3c92fb82b5f080deee4dded68cb36922cb9edd4d78f7b7a6ed2295649a538ab83ad30c280761
+DIST intel-graphics-system-controller-0.2.4.tar.gz 125476 BLAKE2B 82c803dc654240a364416dcca6c1104ec96eca6a0ffec058394ec2594d87bdd6854a3b0143ad6e114b5b4359b15f787679c995fa60fcbbcf5097467c15252217 SHA512 57b0aa1f5cfb6c103903be590d94f4a07c33c90180e688b62b2434baddf16637a6fb6c160c225fa08cf2d0efc80a42c6b86de48b71fb6aa08bd3f9fe2ff79fa6
 EBUILD intel-graphics-system-controller-0.2.3.ebuild 1095 BLAKE2B f81e54e15daa0a3583a41c44e012e1862f327ed59518d4fc5490e7200356861c57fc4736b7f46a5d8881ee5e34f4f9d00c611a5031b57480e40f6094017dba61 SHA512 3a5820321d723a95a86c64daa5d2d1161bfcc9daa75cbc49916d5118a6efbd089757561bbf55c873c8306c34e69b739a0cf904345ea81390b6d82777cee9ac62
+EBUILD intel-graphics-system-controller-0.2.4.ebuild 1096 BLAKE2B 368b10a3c4a1d920ea2653edcda7ec720982f82a39369b16c8f0f968ea11c634d061d9f8f89dd3d3ed2fa25902bbe5bf38fb81f61752055127d76eaea33fe475 SHA512 f2607af18461daf5db2adc1775ab0c55796cd78063cb34f65306ddd76ee5782ebb94de93de0755496dd8564a146b745291ba29949c969fcc82237e67531e08c8
 MISC metadata.xml 674 BLAKE2B a0d4f2c1989040b8cddb6ec87f0758bcd758e442b802f61a1f04da442288724ff296185e8c982247663fea70bf8a05f3cd1091033e4bf081ec3af9a03d623c2e SHA512 afcf2cfffad24226e64efc6116e01ec0750b8ba2df62871f090727e5300f98b8e166dcc7b025a29365cf83ea38575d8f63a705ebb478c83c416b8abf4ddb0fb3
diff --git a/dev-util/intel-graphics-system-controller/intel-graphics-system-controller-0.2.4.ebuild b/dev-util/intel-graphics-system-controller/intel-graphics-system-controller-0.2.4.ebuild
new file mode 100644
index 000000000000..bb2e878960cc
--- /dev/null
+++ b/dev-util/intel-graphics-system-controller/intel-graphics-system-controller-0.2.4.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN="igsc"
+MY_P="${MY_PN}-${PV}"
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit cmake python-any-r1
+
+DESCRIPTION="Intel graphics system controller firmware update library"
+HOMEPAGE="https://github.com/intel/igsc"
+SRC_URI="https://github.com/intel/${MY_PN}/archive/refs/tags/V${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+cli doc"
+
+RDEPEND="dev-libs/metee"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	doc? (
+		${PYTHON_DEPS}
+		app-doc/doxygen
+		$(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]')
+	)
+"
+
+pkg_setup() {
+	use doc && python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_CLI="$(usex cli)"
+		-DENABLE_DOCS="$(usex doc)"
+		-DENABLE_ENUM="ON"
+		-DENABLE_PERF="OFF"
+		-DENABLE_WERROR="OFF"
+
+		# If enabled, tests are automatically run during
+		# the compile phase and we cannot run them because
+		# they require permissions to access the hardware.
+		-DENABLE_TESTS="OFF"
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index 670e3ee4a2fa..872550ce3bb5 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -1,15 +1,11 @@
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81
 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
-DIST llvmorg-13.0.0-rc2.tar.gz 147267736 BLAKE2B 153bf7320f2aa911112d366ffc79f7110cb04f135c2a8b176c263f0a75eb768206d9bd462893d45504b0e58aa9e127fdcafb02300eab1666e4616aa654d457dd SHA512 a01baf3eaa02f02af42bfcf6dcf24f166351bf1c09601495617c81e41def23210573bad40a344270f40c5deb881d06863536abac2a6481930766a6a56335fb44
-DIST llvmorg-13.0.0-rc3.tar.gz 147281901 BLAKE2B 640065a2f32dc48edf084d776cb6b950fae86c2a204999e2eec67f93b57615df40adec19785099b0ef2fe11837c3304794ec3585289a5b5051a557618c63c749 SHA512 1401d5a4d6bb5c930d74b9cfbc8e792872f721aab7d7f0c819e2ba5cf47fb818d160c1f71784fba69827f3c9b7414aa91a585d2b813c1851b4799f9d62cebc46
-DIST llvmorg-13.0.0-rc4.tar.gz 147286367 BLAKE2B a43c54b8bb379b0374f99ae07066d7ba4ae2a83dfdb61390101c736f91dc44aa07a88778551aaaf903033562b2a0a863ea6b27392b700c9cddc74e2c7899cad1 SHA512 8ccaaea21ec4fe3c4b4446d3a7cae36a47ed196f407d341da45824bcefefffd3c412c0c5c27670ceaba1458bc53107273f9d3aec2de261b6b82c6d209b45b14d
+DIST llvmorg-13.0.0.tar.gz 147270176 BLAKE2B 628f316b580e1edf3a58d4825b724df759e6ed2a4116802470c04562caefc392fa325c91f388036365a2e45a9595cca6d3557fab12984fc8bcfef29c9116d822 SHA512 8004c05d32b9720fb3391783621690c1df9bd1e97e72cbff9192ed88a84b0acd303b61432145fa917b5b5e548c8cee29b24ef8547dcc8677adf4816e7a8a0eb2
 EBUILD lldb-10.0.1.ebuild 2286 BLAKE2B ac5ee6653bce26265c7bc52f5461613ed0ddde5cefe930aeef268e1115656eaf122681342e606b42786fadfbf3437c6903d87df96c236b074c530c1c78eeb90e SHA512 38d1a73a7961ce42a7a50b94b08da1a340cec3f8e7c2c1272fc959519bd18523872116418e46f5baa4451f41d76082edbf186b618e9879aab447fc79097a5756
 EBUILD lldb-11.1.0.ebuild 2305 BLAKE2B 5db45d0360ca8cbcfb1e15989d183b8583edd437bc39c1a5e15e5c969b646340dddc2b94b4e34bc843df26887421c376bb15f9ecb3321e7da05dcf23c9030855 SHA512 f63c15a9a12ee7d2bd343dae7b18cb5b0ab77477d35e051e81974c73f51d6887afab14a4dd1d593fe10a6ee5b88cb407c98019d658839b5c22565b123cfd7d90
 EBUILD lldb-12.0.1.ebuild 2378 BLAKE2B a7648bce8dae2c6a0d0ff7ae002c141ec1c7a1089425941953eaa9236001e6047a08a4a4f61508addf4adc21fdd83e4848eee5276c054cf63a6e4b891ff97341 SHA512 ebceca1d1c2ac1fca742d0f1f65e7445361bbc4c8009ebbdd75a419517369e3432eae11136e50eed10f62ff60982e6ffe914b827c38a9b3b6a375dde79fd5968
 EBUILD lldb-13.0.0.9999.ebuild 2372 BLAKE2B 2fed66564a8d599a5c0cd20accee6ecf5cb6478f3d59a7e41bd0abf4fe7578f49aee73f36b419ef47010c2108ff46c06a10dd26f3ee6d4be894e8bed732279ca SHA512 dd2a2dede438492cb9a69d8aec8551f38e3f7f86426b86148e2a8bc25590e3997e3cb08f3e4b0ca6c9af9419dc0d5b335c498ff338583c35a27dde0815448ce7
-EBUILD lldb-13.0.0_rc2.ebuild 2372 BLAKE2B 2fed66564a8d599a5c0cd20accee6ecf5cb6478f3d59a7e41bd0abf4fe7578f49aee73f36b419ef47010c2108ff46c06a10dd26f3ee6d4be894e8bed732279ca SHA512 dd2a2dede438492cb9a69d8aec8551f38e3f7f86426b86148e2a8bc25590e3997e3cb08f3e4b0ca6c9af9419dc0d5b335c498ff338583c35a27dde0815448ce7
-EBUILD lldb-13.0.0_rc3.ebuild 2372 BLAKE2B 2fed66564a8d599a5c0cd20accee6ecf5cb6478f3d59a7e41bd0abf4fe7578f49aee73f36b419ef47010c2108ff46c06a10dd26f3ee6d4be894e8bed732279ca SHA512 dd2a2dede438492cb9a69d8aec8551f38e3f7f86426b86148e2a8bc25590e3997e3cb08f3e4b0ca6c9af9419dc0d5b335c498ff338583c35a27dde0815448ce7
-EBUILD lldb-13.0.0_rc4.ebuild 2372 BLAKE2B 2fed66564a8d599a5c0cd20accee6ecf5cb6478f3d59a7e41bd0abf4fe7578f49aee73f36b419ef47010c2108ff46c06a10dd26f3ee6d4be894e8bed732279ca SHA512 dd2a2dede438492cb9a69d8aec8551f38e3f7f86426b86148e2a8bc25590e3997e3cb08f3e4b0ca6c9af9419dc0d5b335c498ff338583c35a27dde0815448ce7
+EBUILD lldb-13.0.0.ebuild 2395 BLAKE2B 3c5d12b418337d93cbdcc8b399ecf1c67c15d297d06a885bc570b7a7841b81df6d6f3f1ac025262799b7509dbcd359c6c3c10672675ab947907dcc84d13594fc SHA512 b762e499564b7cbf52f9e087d012e7d7f337b54ecbd1514a6549fd794b9b8fa713a6be9feba4d62a1836440e4599b441cac9d0c19d51a378f1172357184a442f
 EBUILD lldb-14.0.0.9999.ebuild 2372 BLAKE2B 2fed66564a8d599a5c0cd20accee6ecf5cb6478f3d59a7e41bd0abf4fe7578f49aee73f36b419ef47010c2108ff46c06a10dd26f3ee6d4be894e8bed732279ca SHA512 dd2a2dede438492cb9a69d8aec8551f38e3f7f86426b86148e2a8bc25590e3997e3cb08f3e4b0ca6c9af9419dc0d5b335c498ff338583c35a27dde0815448ce7
 MISC metadata.xml 217 BLAKE2B 23799663344acc2d532fc6fa7dd798813aef7293fcab616d6300b15a6e603b6d17ca63d5153eb8da1b976215d8e3775e8d3a67026bacc9693993d48ec1cb69a9 SHA512 e13d0436d3a3a449723277a37ae4c5a673139b6da818adf7ad7654d94d3948ed8607b1c27e83e963bf450bd2d5a650c985e27ff5a531db9813cb4ab10b985dd6
diff --git a/dev-util/lldb/lldb-13.0.0_rc4.ebuild b/dev-util/lldb/lldb-13.0.0.ebuild
index 394b6d66fc57..20f75db4f574 100644
--- a/dev-util/lldb/lldb-13.0.0_rc4.ebuild
+++ b/dev-util/lldb/lldb-13.0.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://llvm.org/"
 
 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"
diff --git a/dev-util/lldb/lldb-13.0.0_rc2.ebuild b/dev-util/lldb/lldb-13.0.0_rc2.ebuild
deleted file mode 100644
index 394b6d66fc57..000000000000
--- a/dev-util/lldb/lldb-13.0.0_rc2.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit cmake llvm llvm.org python-single-r1
-
-DESCRIPTION="The LLVM debugger"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS=""
-IUSE="+libedit lzma ncurses +python test"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-RESTRICT="test"
-
-RDEPEND="
-	libedit? ( dev-libs/libedit:0= )
-	lzma? ( app-arch/xz-utils:= )
-	ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
-	python? (
-		$(python_gen_cond_dep '
-			dev-python/six[${PYTHON_USEDEP}]
-		')
-		${PYTHON_DEPS}
-	)
-	~sys-devel/clang-${PV}[xml]
-	~sys-devel/llvm-${PV}"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	>=dev-util/cmake-3.16
-	python? ( >=dev-lang/swig-3.0.11 )
-	test? (
-		$(python_gen_cond_dep "
-			~dev-python/lit-${PV}[\${PYTHON_USEDEP}]
-			dev-python/psutil[\${PYTHON_USEDEP}]
-		")
-		sys-devel/lld
-	)
-	${PYTHON_DEPS}"
-
-LLVM_COMPONENTS=( lldb )
-LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest )
-llvm.org_set_globals
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLLDB_ENABLE_CURSES=$(usex ncurses)
-		-DLLDB_ENABLE_LIBEDIT=$(usex libedit)
-		-DLLDB_ENABLE_PYTHON=$(usex python)
-		-DLLDB_ENABLE_LZMA=$(usex lzma)
-		-DLLDB_USE_SYSTEM_SIX=1
-		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
-
-		-DLLDB_INCLUDE_TESTS=$(usex test)
-
-		-DCLANG_LINK_CLANG_DYLIB=ON
-		# TODO: fix upstream to detect this properly
-		-DHAVE_LIBDL=ON
-		-DHAVE_LIBPTHREAD=ON
-
-		# normally we'd have to set LLVM_ENABLE_TERMINFO, HAVE_TERMINFO
-		# and TERMINFO_LIBS... so just force FindCurses.cmake to use
-		# ncurses with complete library set (including autodetection
-		# of -ltinfo)
-		-DCURSES_NEED_NCURSES=ON
-
-		-DLLDB_EXTERNAL_CLANG_RESOURCE_DIR="${BROOT}/usr/lib/clang/${PV%_*}"
-
-		-DPython3_EXECUTABLE="${PYTHON}"
-	)
-	use test && mycmakeargs+=(
-		-DLLVM_BUILD_TESTS=$(usex test)
-		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
-		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-		-DLLVM_LIT_ARGS="$(get_lit_flags)"
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check-lldb-{shell,unit}
-	# failures + hangs
-	#use python && cmake_build check-lldb-api
-}
-
-src_install() {
-	cmake_src_install
-	find "${D}" -name '*.a' -delete || die
-
-	use python && python_optimize
-}
diff --git a/dev-util/lldb/lldb-13.0.0_rc3.ebuild b/dev-util/lldb/lldb-13.0.0_rc3.ebuild
deleted file mode 100644
index 394b6d66fc57..000000000000
--- a/dev-util/lldb/lldb-13.0.0_rc3.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit cmake llvm llvm.org python-single-r1
-
-DESCRIPTION="The LLVM debugger"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS=""
-IUSE="+libedit lzma ncurses +python test"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-RESTRICT="test"
-
-RDEPEND="
-	libedit? ( dev-libs/libedit:0= )
-	lzma? ( app-arch/xz-utils:= )
-	ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
-	python? (
-		$(python_gen_cond_dep '
-			dev-python/six[${PYTHON_USEDEP}]
-		')
-		${PYTHON_DEPS}
-	)
-	~sys-devel/clang-${PV}[xml]
-	~sys-devel/llvm-${PV}"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	>=dev-util/cmake-3.16
-	python? ( >=dev-lang/swig-3.0.11 )
-	test? (
-		$(python_gen_cond_dep "
-			~dev-python/lit-${PV}[\${PYTHON_USEDEP}]
-			dev-python/psutil[\${PYTHON_USEDEP}]
-		")
-		sys-devel/lld
-	)
-	${PYTHON_DEPS}"
-
-LLVM_COMPONENTS=( lldb )
-LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest )
-llvm.org_set_globals
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLLDB_ENABLE_CURSES=$(usex ncurses)
-		-DLLDB_ENABLE_LIBEDIT=$(usex libedit)
-		-DLLDB_ENABLE_PYTHON=$(usex python)
-		-DLLDB_ENABLE_LZMA=$(usex lzma)
-		-DLLDB_USE_SYSTEM_SIX=1
-		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
-
-		-DLLDB_INCLUDE_TESTS=$(usex test)
-
-		-DCLANG_LINK_CLANG_DYLIB=ON
-		# TODO: fix upstream to detect this properly
-		-DHAVE_LIBDL=ON
-		-DHAVE_LIBPTHREAD=ON
-
-		# normally we'd have to set LLVM_ENABLE_TERMINFO, HAVE_TERMINFO
-		# and TERMINFO_LIBS... so just force FindCurses.cmake to use
-		# ncurses with complete library set (including autodetection
-		# of -ltinfo)
-		-DCURSES_NEED_NCURSES=ON
-
-		-DLLDB_EXTERNAL_CLANG_RESOURCE_DIR="${BROOT}/usr/lib/clang/${PV%_*}"
-
-		-DPython3_EXECUTABLE="${PYTHON}"
-	)
-	use test && mycmakeargs+=(
-		-DLLVM_BUILD_TESTS=$(usex test)
-		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
-		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-		-DLLVM_LIT_ARGS="$(get_lit_flags)"
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check-lldb-{shell,unit}
-	# failures + hangs
-	#use python && cmake_build check-lldb-api
-}
-
-src_install() {
-	cmake_src_install
-	find "${D}" -name '*.a' -delete || die
-
-	use python && python_optimize
-}
diff --git a/dev-util/lttng-modules/Manifest b/dev-util/lttng-modules/Manifest
index 6bc63ba98513..fe03e99f6b32 100644
--- a/dev-util/lttng-modules/Manifest
+++ b/dev-util/lttng-modules/Manifest
@@ -2,10 +2,14 @@ DIST lttng-modules-2.10.12.tar.bz2 306825 BLAKE2B 9f71f3102094e905bdbfc7d1788845
 DIST lttng-modules-2.11.0.tar.bz2 315192 BLAKE2B a56d2847ab48760a1fa41545a69b5c855723c71dda488b3af9555cab6b3744db98fdb7650bca74c88a36549dfefbf40c8e75390557cce5e43ace5615bfe7430a SHA512 549f78bc192bdf4e39a912d45a6918519c5c29bdda3bee0b4f7172c6c2d83c887b669dd8e17a8a5d0c17b5dde57aa6eb5087dfac3a103ccf1e5017be2d038379
 DIST lttng-modules-2.11.8.tar.bz2 316947 BLAKE2B 61dc2abe8d61242b5157fcc93d8b6cb26684ee5c20c03f7fafa7ebfbb8498f8e8b46ce498f5666bd367a8f3115b780ba3bec8fd599eb17cdbb5475793372a90e SHA512 d83fb3e6e6786ee7bc4d9a377fdbd90331e7ab72e5dd12c21f6a61d0451b2157965e2d49dfaf2e7be7eb89d7196da0f4668bc468c97a640a524aa19cbabc7831
 DIST lttng-modules-2.12.5.tar.bz2 317002 BLAKE2B 9f42f8641dca7ce55e7445495c747ce340919458a23b4d471998fe2a28dd26bc7dfa5edbccf0b11877176091dee0c4d63fdda919c03afc8dad3fcfb7e9529c33 SHA512 81524dac513384852555a6f5619dc10286a2f7d4e3032ee9ca33705e830ee3bc3dc8c96b89a9c09dd5df2bf29944e3e566d1ac1a6cd6be83718af9836e043991
+DIST lttng-modules-2.12.6.tar.bz2 318479 BLAKE2B 7cac6dd7dcb12801a32179ced4bb141a7af87c864eb71b793e65b905e4a0ba3d3273609bd3cd80c9c1251914a39e62da0a85e18058480da0c4eb2d6eb44f851c SHA512 608112b960d47ed5f979c7f2de2886d3fbe78a0d2eaec0892bfbca92bdad423e8ba8c3960836f71045c79d9c1b9eac88757400726656e98fb0ae70035e0073aa
+DIST lttng-modules-2.13.0.tar.bz2 342499 BLAKE2B 81feb1b93972ab5605b40db4acc46ba9c9383211b3b176b14301c302b68d76b4490bc433176073b4ee9bde4c2ad66ebd6c1d4aeec359cc4dc8b0f26525ef9a5d SHA512 f2fcc8c16867fb79061a46381d27b26a8f49000475cd2f6ad8a9ebc1d8b11cab840d62e38df1aaad68908aa5a29c62c47c986eb281027b226e115dd4a25cd611
 DIST lttng-modules-2.7.1.tar.bz2 297555 BLAKE2B 910720692b8801efd0335963fe8fc504bc9cd08ad772be1418c63f5c3f8aaf8c25aa7d49e0503bd355da64a9441302f14eb0b1a58fc8e76e0c2770b1c4ecb256 SHA512 77609c7b7bc0a8315dd4c635c1be2d84cc1a946438323b362bd25cfcd97f2cf9655aefdbca8b96fceb61db7b733219251d2f9f2e1a46c7534c5d1c622c03b744
 EBUILD lttng-modules-2.10.12-r1.ebuild 1011 BLAKE2B 0f2f773116ce79394a7e49be3c8ecb88efb33cf9c5d92939285999ee32e110673d0593a6ab28e267428cad622099da2d1216f4e6665021a0f4b4a99c78e3fe74 SHA512 f3b5b55fd7cf4812744ca331d1dc958b3ccd5746da05770bc12db727df51c6296cfec9b2e3561cfa6d909eafc243cb6a5c73e1d25e6403aa00e6e8bd4f0f1d14
 EBUILD lttng-modules-2.11.0-r1.ebuild 1011 BLAKE2B 0f2f773116ce79394a7e49be3c8ecb88efb33cf9c5d92939285999ee32e110673d0593a6ab28e267428cad622099da2d1216f4e6665021a0f4b4a99c78e3fe74 SHA512 f3b5b55fd7cf4812744ca331d1dc958b3ccd5746da05770bc12db727df51c6296cfec9b2e3561cfa6d909eafc243cb6a5c73e1d25e6403aa00e6e8bd4f0f1d14
 EBUILD lttng-modules-2.11.8.ebuild 1011 BLAKE2B 9a7a494abde991d2cdb4471f866f2587878906cbf4b843e54aba32ffeb349dce623ce31786f8188f9900de18a30ab19cca46728a01f23862251a41b9fd3269a8 SHA512 7cc452a3bf21bc68c3e9156aee22f5afb563c107bb3a2ff835cebad76b023759d5b17a3b650642538aa1115e114ead0ce58cb473b8d5919116ae6b02aae34d34
 EBUILD lttng-modules-2.12.5.ebuild 1003 BLAKE2B f832e877110422709d9b00c3b0dfdecf26d76e2c1d9e3d09db14aeef0a2b5b1709b3717b0f6997d4c9500e13c898e708bf24629ee07f09af46d78c42d290b804 SHA512 5575233587c9ef25a6bce7efb18a0a561f33be5eee32dc4f6151f50ab83bf722c7c6bafff3940bc66678cf89e5166f819c1781463b00641fe131c4740169afdf
+EBUILD lttng-modules-2.12.6.ebuild 1005 BLAKE2B b6b3c2a093735bddfbf64de28ce391138e8fc6c69d0e6176a8d818b3f34a6d9a4b14c8e146b59f1c023cbf5dc66eeed33fe41c7aadb905ace3e9884fbe4d2075 SHA512 7b18dafcaead0710c05183c5211ff107effa1da1d054042a065d13478fb9936700d3eb421a070be7d92be7174a58bc6256d69b1627848aae2ca40ac74560487d
+EBUILD lttng-modules-2.13.0.ebuild 1000 BLAKE2B 3fbe3e2295527019b02b5e58dd12f72dfde095a702524f2edd7530064202d09c4f683c33584f16570b17b9793663e08a2abdf6e1dcf6d535bde088f2c1575a9a SHA512 3a624bfa2f989e2788b9e557513be7981de4d8b02d3fe0fbfb6899cdb55c63d17b90baaab638fa8b583ea30b8414678a919d2939884ecc61b3a33716c43a5573
 EBUILD lttng-modules-2.7.1-r1.ebuild 963 BLAKE2B 8fb536297fb7132eea88d65c5ad1ccd3735c8b4f029dcccabb29aff0e93d0ec5d14b8880cd9e9c51107ea5d17454241b25a4a1276b3c3d2aae3c49b69f286d0e SHA512 5f051784283f3967573f5a48dffe7037a727a3936e333e963a9c7a9c7edf5b00cdf42646c7e3ec991ee7ee05da4811e5a492e8ae8056b87a6368a01a38005546
 MISC metadata.xml 696 BLAKE2B eb719232f619166590ba6b585d512446c7ed89440090552860291c6fb9099f1c059d7a2728be6321ebeac3e549b725d6cadde1856047f064662faf93a3323124 SHA512 76e2fea1f51216138f2afa826107c520ec8a33a17e529ec9682c7c1ceca52e506acdbaa7fe48654da1561a217205a66918b16c86107b387e2c886dfa36006692
diff --git a/dev-util/lttng-modules/lttng-modules-2.12.6.ebuild b/dev-util/lttng-modules/lttng-modules-2.12.6.ebuild
new file mode 100644
index 000000000000..2936f980647d
--- /dev/null
+++ b/dev-util/lttng-modules/lttng-modules-2.12.6.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-mod
+
+MY_P="${P/_rc/-rc}"
+MY_SLOT="$(ver_cut 1-2)"
+
+DESCRIPTION="LTTng Kernel Tracer Modules"
+HOMEPAGE="https://lttng.org"
+SRC_URI="https://lttng.org/files/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0/${MY_SLOT}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+BUILD_TARGETS="default"
+
+CONFIG_CHECK="MODULES KALLSYMS HIGH_RES_TIMERS TRACEPOINTS
+	~HAVE_SYSCALL_TRACEPOINTS ~PERF_EVENTS ~EVENT_TRACING ~KPROBES KRETPROBES"
+
+MODULE_NAMES="true"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_pretend() {
+	if kernel_is lt 3 0; then
+		eerror "${PN} require Linux kernel >= 3.0"
+		die "Please update your kernel!"
+	fi
+}
+
+src_compile() {
+	BUILD_FIXES="KERNELDIR=$KERNEL_DIR" linux-mod_src_compile
+}
+
+src_install() {
+	for i in $(find "${S}" -name "*.ko" -print); do
+		local val=${i##${S}/}
+		local modules+="${val%%.ko}(misc:) "
+	done
+	MODULE_NAMES=${modules}
+
+	linux-mod_src_install
+	dodoc ChangeLog README.md TODO
+}
diff --git a/dev-util/lttng-modules/lttng-modules-2.13.0.ebuild b/dev-util/lttng-modules/lttng-modules-2.13.0.ebuild
new file mode 100644
index 000000000000..8d751c6a08ce
--- /dev/null
+++ b/dev-util/lttng-modules/lttng-modules-2.13.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-mod
+
+MY_P="${P/_rc/-rc}"
+MY_SLOT="$(ver_cut 1-2)"
+
+DESCRIPTION="LTTng Kernel Tracer Modules"
+HOMEPAGE="https://lttng.org"
+SRC_URI="https://lttng.org/files/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0/${MY_SLOT}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+BUILD_TARGETS="default"
+
+CONFIG_CHECK="MODULES KALLSYMS HIGH_RES_TIMERS TRACEPOINTS
+	~HAVE_SYSCALL_TRACEPOINTS ~PERF_EVENTS ~EVENT_TRACING ~KPROBES KRETPROBES"
+
+MODULE_NAMES="true"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_pretend() {
+	if kernel_is lt 3 0; then
+		eerror "${PN} require Linux kernel >= 3.0"
+		die "Please update your kernel!"
+	fi
+}
+
+src_compile() {
+	BUILD_FIXES="KERNELDIR=$KERNEL_DIR" linux-mod_src_compile
+}
+
+src_install() {
+	for i in $(find "${S}" -name "*.ko" -print); do
+		local val=${i##${S}/}
+		local modules+="${val%%.ko}(misc:) "
+	done
+	MODULE_NAMES=${modules}
+
+	linux-mod_src_install
+	dodoc ChangeLog README.md
+}
diff --git a/dev-util/lttng-tools/Manifest b/dev-util/lttng-tools/Manifest
index 95b9c3f713e2..20cabdd268f0 100644
--- a/dev-util/lttng-tools/Manifest
+++ b/dev-util/lttng-tools/Manifest
@@ -1,9 +1,13 @@
 DIST lttng-tools-2.11.6.tar.bz2 1484146 BLAKE2B ed2f60f87ebf6d8049814e761f9493d35858745caf144132cc71759b9b37f2127d858f2882825d5357648e3c46316399a3d9430f788f2c92dc0001f2a58cc242 SHA512 4536e8c39b66d0a0f62543ee6b729585322ee1758507719ed60f0dfc10b95362497f49faeae4dbc8fb3a44336616a54f1c2f55a23aeecfe43c4271ffcd485094
 DIST lttng-tools-2.12.0.tar.bz2 1544515 BLAKE2B 642047348ef7bfe72c5ec718b4029c628fe2e23fd0a82517a8d5bb15a8cc3b84965d21b2f528a20530fb6ca8213e320d0dd6f36de09b34a53863c46ee272a470 SHA512 87613de34141c75b7ff0eb7b4292d26eea5381a7f298130cf5e802255aa7b0e55f43268dffed71b51d1e5dcd96b92cd517e13557fe64ee121bf1b419b2935a24
 DIST lttng-tools-2.12.3.tar.bz2 1550901 BLAKE2B 0f4a5ac780e26f6ef16f4c71af7052083b4889664962712bf248cc6a7c05e8448a40b12dd9fe615e41519924e285b629e7ed535cf551581b26890a2b8fd58cad SHA512 f997e94a5d6126845b914d8b80a5e1512d49799e84c6cc82903187b988da2b0f157d65d7fe8f14d01fd3b5352aa317c5305bcd6b56f81d03a85a561a18be2a0c
+DIST lttng-tools-2.12.5.tar.bz2 1576936 BLAKE2B d5e0590ef97b899988a9c2be916fc742e025eb986fe6537528eb98ff342ad301721fa3c4142937400b1deed59e725581f693f4adae1cb85da7ee1f7287283b4f SHA512 5b7295443681f3faa0409b6385f2aea07bd07b0c01f03c9a0f21d5055d73987b9bc34116e6b0e742f7fb17b5e93fc435d578e658813f1a11261b317ceabb136f
+DIST lttng-tools-2.13.0.tar.bz2 1850423 BLAKE2B fbd5f2528d2dd262cbdbac5559b2cac1d7aa82adddf2118dde6b9f3956e582566406590d1646ccac9c9c496c8e07fd9f7fd7a5fdaa90f528745e2ddea8f0269b SHA512 bcd824b21a6e186caba7d0cfa472b173681995c4c9680ab03d2f33c21f9e003c0ae22cea14f65e9f240ed48e3a679f940b8634a72fc5120fc2a5f47b067b6f07
 DIST lttng-tools-2.7.1.tar.bz2 984351 BLAKE2B 51d61857c56c3bffcaec80d8b57c18c96c3125d56f7feaa70e3ad44d108987a663734c17cf2553b1979061ae400c1e5bd0a30de4bf3bf5af28846403a3e055c1 SHA512 b0cafa5b74182a077232dbe2b73ed4e2267a921a62163367f0e7e14463e176d4538fc6ec27b8737f55fc417734677e5d22efc65685f885fa5f892f7900ee0e2d
 EBUILD lttng-tools-2.11.6.ebuild 691 BLAKE2B 4946ca4e22bd637d7d088d7869a0f787968d6466985e6cc505c4a460416da91efab750116aea202bc085ed8d1c7046584da8bc3438eedc62c3cb558a9b82a18f SHA512 1c183280e809a350bb2a8b619e3fac9d3834df82948c964ce9c24bd5a690e2f525276896381367fa12ef4e5ca0d10fa7b2d2111745dc635737eb5e4cea497b8c
 EBUILD lttng-tools-2.12.0.ebuild 691 BLAKE2B c4fe28aedffa12cee98e2f7bbc10bff1ff66d3ddce6c4621cf230a25de43c3ea106a879a6d2384d2d05f75d3f5c253cc5f9f391abe7ef1693cb07d70fa8c249b SHA512 f3346a83dd5d2b092a17de4a0f46de72abcc1e42058121736af98636f7ebf38b8a72a197ba9076c923c3b3a7b14956615d9b8fff05560a47ef8fe17b51a0c017
 EBUILD lttng-tools-2.12.3.ebuild 689 BLAKE2B 110357264437ff12de6160bc7f4800231adc9a62701a128d5af6852749f4b3c12cb2b6edd598817fe3a483c58cbca83ee52a26229358348b6a007ad1ae54488a SHA512 02ca8f2f6dea11adfbbe849627e23df3ca814ea5f7c145e7c0ce5e0f30b2f6314fec319e7de8bc32ceaba97dcc9dd83873e006c4e1a24b2a7fafacb88371aec7
+EBUILD lttng-tools-2.12.5.ebuild 671 BLAKE2B 544cb8bdece997a6f78d8bd1d13e99b2fdc4d9029b3b156d70c2fb88fc09bd9004b3a055e44ca059cdd8fb3fc455ef44103fd86e628061d3c17ce34ab1dd4e20 SHA512 e21a2fc213c655490db1fb661a38c85b1915169ca1132f1ca9dcc44d7bff582cf2d5e81300f4d1c529144c1f85bee705dd6e6e3804d90f0b36d711ace3fd7d49
+EBUILD lttng-tools-2.13.0.ebuild 671 BLAKE2B 544cb8bdece997a6f78d8bd1d13e99b2fdc4d9029b3b156d70c2fb88fc09bd9004b3a055e44ca059cdd8fb3fc455ef44103fd86e628061d3c17ce34ab1dd4e20 SHA512 e21a2fc213c655490db1fb661a38c85b1915169ca1132f1ca9dcc44d7bff582cf2d5e81300f4d1c529144c1f85bee705dd6e6e3804d90f0b36d711ace3fd7d49
 EBUILD lttng-tools-2.7.1.ebuild 860 BLAKE2B aa76843c0a61318a58347e3bbd2bec28ff1695d818198fc20d8220b710cbac8e98cf953ad3617ca86ef75e3b5d36548b325ffdaf717d7044602973160e59c42c SHA512 71dee4c72661c7b2caf941e2ed70858372b3cbed53e6c937ed746b825da912d3a3877c9e00c838500524249c4dfa87f61936a65c22b75a8c162d8fb2bd010586
 MISC metadata.xml 494 BLAKE2B e3d5a99fabe22b2076098cb3bdf18847afd9132695734e2060d2570acd5ded08684fca3d6655f8c05fc55c85def6d0de205ebd98c069247ed7303cb042a5978b SHA512 76a37a5dfc757933f077af076fda1105874bde77ab73366ca272303e5e8d16fc324f9eb0158ee1103d2a06221dc8267bb286dee4de80eff4b09dfc340c46dc59
diff --git a/dev-util/lttng-tools/lttng-tools-2.12.5.ebuild b/dev-util/lttng-tools/lttng-tools-2.12.5.ebuild
new file mode 100644
index 000000000000..9dc516b55382
--- /dev/null
+++ b/dev-util/lttng-tools/lttng-tools-2.12.5.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="${P/_rc/-rc}"
+MY_SLOT="$(ver_cut 1-2)"
+
+DESCRIPTION="Linux Trace Toolkit - next generation"
+HOMEPAGE="https://lttng.org"
+SRC_URI="https://lttng.org/files/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0/${MY_SLOT}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+ust"
+
+DEPEND="dev-libs/userspace-rcu:=
+	dev-libs/popt
+	dev-libs/libxml2
+	ust? ( >=dev-util/lttng-ust-2.12.0:= )
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	econf $(usex ust "" --without-lttng-ust) --disable-static
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-util/lttng-tools/lttng-tools-2.13.0.ebuild b/dev-util/lttng-tools/lttng-tools-2.13.0.ebuild
new file mode 100644
index 000000000000..9dc516b55382
--- /dev/null
+++ b/dev-util/lttng-tools/lttng-tools-2.13.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="${P/_rc/-rc}"
+MY_SLOT="$(ver_cut 1-2)"
+
+DESCRIPTION="Linux Trace Toolkit - next generation"
+HOMEPAGE="https://lttng.org"
+SRC_URI="https://lttng.org/files/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0/${MY_SLOT}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+ust"
+
+DEPEND="dev-libs/userspace-rcu:=
+	dev-libs/popt
+	dev-libs/libxml2
+	ust? ( >=dev-util/lttng-ust-2.12.0:= )
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	econf $(usex ust "" --without-lttng-ust) --disable-static
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-util/lttng-ust/Manifest b/dev-util/lttng-ust/Manifest
index 2822c37af16d..823935cad4f5 100644
--- a/dev-util/lttng-ust/Manifest
+++ b/dev-util/lttng-ust/Manifest
@@ -3,10 +3,14 @@ DIST lttng-ust-2.11.0.tar.bz2 824285 BLAKE2B 161d50282a95cce47ab3811216241ade73e
 DIST lttng-ust-2.11.3.tar.bz2 846839 BLAKE2B 4ef6918588d139e1ca15f477194796d974f8442a44c7e18768582199ba1e0f467c796d2b10ea9936554e589c91b49e1a07c29b619d74b77b884b081868484ea3 SHA512 2483bb7c57f0e99b9e0d6431114c74f6e5af295a73643307716f5abb6fc20e7dec8bfe7fe3e074ca96bad72ca5f6042b6340d1a67928e885753fecfa8a136eb4
 DIST lttng-ust-2.12.0.tar.bz2 853127 BLAKE2B 6a6655a4aa33ec6318255d05d0e000c19fb66d4049873f091b8e19f3f9ea0c15731db70af77dbab1d597edcafcd745f1dae2670cd38759c9b54ea38b1135b590 SHA512 d69772170f57b9669b99cea372ca537777151a31b82002e1e5ec80da3ceb302c23f0f85d63a2c95c90a375b879e266aa5297e7d6444050dd40feb1253d863801
 DIST lttng-ust-2.12.1.tar.bz2 859667 BLAKE2B 474d03ac0d3c1102ef085230659545f3e12bc0847cebab598f2998741741cb98ac139812a296992614dd90ed9478040ee0567822eb20e960e0a6489836274394 SHA512 6d5116a88be601f96513535ef7dfda409780cbacaab0831dc76b86070da60d5eac719d7020f70a6821e1c6dbbfae05ddf5a431662ef5a714fc200c2216eeb80e
+DIST lttng-ust-2.12.2.tar.bz2 861351 BLAKE2B 0c580285721b3d7932630c8d9f4a3606ee294596eef75fcf8b3c892ebdfaa1daae4cbfad1b6ef0ef93877b1f7dd143d97fa947758ab476e4a54e746d0f1e1e7e SHA512 e8734deb27b1a4c5efb81ebaa5c100079c1b3eac6b741b4f85487d1cb921d78d9ddf76040be56081404701b3053c6acc83a5d82667e3f49fcc4fa33392462eb8
+DIST lttng-ust-2.13.0.tar.bz2 1408266 BLAKE2B 28f584f168544e28539511d3904d7ace19ce61e8490f8c021913f4e8c6b91e4f44e1816265ef54336dd724826a01425f77d3751468bf8a9b40e7f60b918eec45 SHA512 f132cbd98c6574e460c99a2ffd5ea181ac592a5f820171f45cf83bf7314ec9bad1397bf8505bad326b9bc8220bb87a42fdbbda5f1c9b89a39d5be8a3c0cb2cea
 DIST lttng-ust-2.8.1.tar.bz2 743271 BLAKE2B d6adac00525ab747306288dd71f27ce982dd93e4ff42b9938064ae1435ad1c0867acebe3030a33748dc9aa78b6200ba2c47631e4359a963772fc4685472d21ae SHA512 15c459620cb73ef5be8c7df2ef02663ef650555b973a3d1ed976ae38068b53a8c83143a611bcb53e91a3f211361c44cd2a331cb41dd53d28a69924f7ac44cc95
 EBUILD lttng-ust-2.11.0.ebuild 773 BLAKE2B 8ab82f84b6e9a444e8e24f02d3c3ff51f9dc187f8e327f709f86126e4b770987ac45f29f0bf2a24e8c56affb1f7834769bf78800424d715b1ebbb8a661911541 SHA512 cf354f8e33cb778b58b8afdbd64720eea0a13afe4362641fa59057531f31f9279b927b4359b1f8da6f466eba0d7f31ccd5eec043eab6300e369e5686ee056233
 EBUILD lttng-ust-2.11.3.ebuild 732 BLAKE2B 0fe4bbd05e5c18daf01e825f82bfcb9e4be762f845dcac1da730a0a88237c75ffa6cfbc6351af3b62be7a86cdddd998825c78f59a515e61a5e8d825fd638c81f SHA512 9301586063911e0b975e8ed003295d1f5acac7071b2ca75122bd9f8577a035fc41776f4c87bee92cb1292e2ad8161199670eb7f1689137858453a6444ce5145e
 EBUILD lttng-ust-2.12.0.ebuild 788 BLAKE2B 9b2eb907974ae73450f271e25ba5c133ba11cc0e5a517e5b106bc75a37ac4f334594301d1ecfe3327268bb4654403e75352f80d8bd1020bc70d911bac3cd2669 SHA512 d954112dc17d7a7424dad4cc1de705dfe9ba365b8d4786ddb5705d168b3f5b895e42204a7141ffde948e15e2dd3c521b3be5375c6ce04b21080d370b71ce338b
 EBUILD lttng-ust-2.12.1.ebuild 805 BLAKE2B d17d93ce40c9bc6371528c2e49b5d9628d69f3d382cb56a146cbedbd76e11de57c1a90a1cce71cd875b5240ffb1fbd28f33112a7a3ee86d9fc2656ecf2d29540 SHA512 65870e0d91137b0fb8378e4489465651b55a0ff86decedea0d826d4f7eac9cf0d7b2ebd7246704b085ab55e6f90be408229e3287ed0bb19fe6e664b65dbfd02f
+EBUILD lttng-ust-2.12.2.ebuild 807 BLAKE2B acdc598a8ece8bbfc7ea782fb10a4fb8986f59ded7428be8fbd9a11580ce0d1b5be0a046b1493d294320818d1d71c5af370c6d22ba720a1e4228859ef7fac6ee SHA512 df7e6a17c879366b5efc0c1b7a1a957ac78f07a4302a6a8c5f67d7269a94577765f6955692a28b8a36e65d5c75536d503e34a404de4dcb7faee230c2e855eda9
+EBUILD lttng-ust-2.13.0.ebuild 807 BLAKE2B acdc598a8ece8bbfc7ea782fb10a4fb8986f59ded7428be8fbd9a11580ce0d1b5be0a046b1493d294320818d1d71c5af370c6d22ba720a1e4228859ef7fac6ee SHA512 df7e6a17c879366b5efc0c1b7a1a957ac78f07a4302a6a8c5f67d7269a94577765f6955692a28b8a36e65d5c75536d503e34a404de4dcb7faee230c2e855eda9
 EBUILD lttng-ust-2.8.1.ebuild 661 BLAKE2B e08924d8e984f5fcaf64e18254c3cb84e1595299c6657081250bcc7671568d61be48289f80200697a8e9a8bc592edacb71f45c5d490edeeb962d0a1deab64ab3 SHA512 ca86ec9950371c87faa5f84d16a3ad9778c80cbd2b896657f6f4481e6e2623d5ddc53bd15b3c5837f7a5320bcf41d3a96a5dbdf231d1dcd8e07bfdc5f7e080d8
 MISC metadata.xml 701 BLAKE2B 2bd57c9e2b0d8e24eba3ae0767e22d911ff7d4e9c86035fd2c2a10f3e011e7e98fe4d17fbbf99419477652f4a56425cc242a8947fca314486d858145ca992db4 SHA512 87721cee084407a7565d2f0da06d588b5de039349769901102b6833571a53bbfd95d3986a0d7e74a3fd4d285c68c3942f776e813793f0a30d2d83f0a9243628b
diff --git a/dev-util/lttng-ust/lttng-ust-2.12.2.ebuild b/dev-util/lttng-ust/lttng-ust-2.12.2.ebuild
new file mode 100644
index 000000000000..efe9ff12201c
--- /dev/null
+++ b/dev-util/lttng-ust/lttng-ust-2.12.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+MY_P="${P/_rc/-rc}"
+MY_SLOT="$(ver_cut 1-2)"
+
+DESCRIPTION="Linux Trace Toolkit - UST library"
+HOMEPAGE="https://lttng.org"
+SRC_URI="https://lttng.org/files/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0/${MY_SLOT}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="examples numa"
+
+DEPEND="
+	dev-libs/userspace-rcu:=
+	numa? ( sys-process/numactl )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/${MY_P}
+
+src_prepare() {
+	default
+	if ! use examples; then
+		sed -i -e '/SUBDIRS/s:examples::' doc/Makefile.am || die
+	fi
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable numa)
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-util/lttng-ust/lttng-ust-2.13.0.ebuild b/dev-util/lttng-ust/lttng-ust-2.13.0.ebuild
new file mode 100644
index 000000000000..efe9ff12201c
--- /dev/null
+++ b/dev-util/lttng-ust/lttng-ust-2.13.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+MY_P="${P/_rc/-rc}"
+MY_SLOT="$(ver_cut 1-2)"
+
+DESCRIPTION="Linux Trace Toolkit - UST library"
+HOMEPAGE="https://lttng.org"
+SRC_URI="https://lttng.org/files/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0/${MY_SLOT}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="examples numa"
+
+DEPEND="
+	dev-libs/userspace-rcu:=
+	numa? ( sys-process/numactl )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/${MY_P}
+
+src_prepare() {
+	default
+	if ! use examples; then
+		sed -i -e '/SUBDIRS/s:examples::' doc/Makefile.am || die
+	fi
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable numa)
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-util/lxqt-build-tools/Manifest b/dev-util/lxqt-build-tools/Manifest
index 05ffc4558974..045c601e294d 100644
--- a/dev-util/lxqt-build-tools/Manifest
+++ b/dev-util/lxqt-build-tools/Manifest
@@ -1,5 +1,3 @@
-DIST lxqt-build-tools-0.8.0.tar.xz 25340 BLAKE2B c83524a5688cf38521406e50ad08e93b20d246c0fe779929905cd5aaff67ece6b7dae483d1d4f21657b913ab2ffc7ec821a3025ac6fe3585028146d1746f7565 SHA512 7c235df623ae8c88fa551f38bf24d0621958ce3586296a798b50bbce87084cb624298f4e5aaaa40d3244afae17b7fa373d2b8b6084377f9d7a355fc4bfcbb531
 DIST lxqt-build-tools-0.9.0.tar.xz 25296 BLAKE2B 9686a445c75a700a38150b4493f6c019ba0782e219b3482f67c6a324f35ffe252fddc614daefbd8616ee16ef8bc331c7e4302ddf2df870d1c3696a80cfb585a8 SHA512 9a464393ea6d871c5856ebf5b8fa3d31a89c6419ac084e7146aed675f2b20a139bb3eedde017d6ca03167ee6e30a37a62239ab4e8b76f5b6db244d26ab164892
-EBUILD lxqt-build-tools-0.8.0.ebuild 521 BLAKE2B 29c94964ecb76b8264a56fbc2c0aec8c0159ccdfb8485bfba914fb968f2c063183f016c0772b182722e543bf0aca4a3b8c999d12e725f4ccf4af70d52b6a03e7 SHA512 782dc789d83ae028ac55a80cc0a8d7686f1912e443a2be13204fc22151a74587ba6dd3f2caaeff8f74f42f76254d92cf72f3c66a4411a6b0763c94e7e4e7bdaa
 EBUILD lxqt-build-tools-0.9.0.ebuild 528 BLAKE2B 7b1f78a49c2125264ef5d4a539359f60dbd733e09f238e0bb26bb2c74b88d7bc84c4ac55bed02a6fb6c65071cd62ea8223c2a49f58962a24e32bfd4956b5347b SHA512 78fe92caaf494d6699279d55b144221cf9e141b15a8eddc6ca6d1f07467f8e9f8b5e3ecbec187383f639c635f137c6f2ba5ca5f725d1b3f1af8d4295a925e620
 MISC metadata.xml 323 BLAKE2B 23d737cdebbafa977534a82a3244d697f8d3b55b16715d344ec46da7c71eb68d480e3a4196944e800400c94c900f240f92ffffc092c68aceeeb95c8cdead9a87 SHA512 403f0f0d13ce990a814e653032166c8cab4d3ea8924aec77f46050760d94e26afb42cb1d793ca4eda3a04a402f3817646cc876c35b506d1bff80bc03a020f0f6
diff --git a/dev-util/lxqt-build-tools/lxqt-build-tools-0.8.0.ebuild b/dev-util/lxqt-build-tools/lxqt-build-tools-0.8.0.ebuild
deleted file mode 100644
index 1c71c8c84462..000000000000
--- a/dev-util/lxqt-build-tools/lxqt-build-tools-0.8.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="LXQt Build Tools"
-HOMEPAGE="https://lxqt.github.io/"
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
-else
-	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc64 x86"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-
-DEPEND="
-	>=dev-libs/glib-2.50.0
-	dev-qt/qtcore:5
-"
-RDEPEND="${DEPEND}"
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index 3efb8bc4a7c4..21f10c013c77 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -2,6 +2,6 @@ AUX meson-mcompile-treat-load-average-as-a-float.patch 852 BLAKE2B 669dfe4e4cff5
 DIST meson-0.58.2.tar.gz 1899464 BLAKE2B 48c4c0cec2cb1c55e51cd56e08461ad7d95211d83bb60085f32493cb8d53cfeb00234fa1ab62ba8fbf3baf726231c7e9b098a0630281fda63402a860337528e0 SHA512 31496da729ede0813d5b6cfcc891e8376108252ee8a8148d23e8a4c2a4109b9b0dbc7e9e59acd954fb7de38ceb35f05c3a916eb6d4e106656d9ea8e7536ac4b1
 DIST meson-0.59.1.tar.gz 1944678 BLAKE2B 08dee8ada7824faf93b730bd8cf86113fe85ecf57c53a7ee4be89371004e13b99e14933761398e6db5a359c5aad07a96f99c0b5be144a75c749e40d153cefa7f SHA512 c45e29869dc681675b2643c37c892e7fff365c051edce4f2ec278fc6cee25bac6818add819e4db69d2fe3c1ba9572fc55bb8f67fe791cdc9c187627c71b01963
 EBUILD meson-0.58.2-r1.ebuild 2757 BLAKE2B b64fd553319824c0c05059a41b639b4b8260196f17c4bca32cb587ff9775d11d97cf75e5634b1880105920169a950abc777946182a6c54da04d7f108cb406d1e SHA512 d43bb51ac9853a6820b40c2e683882982aea1ed8334d000459c7fa46607d56c8737651e48f313062345c68f1ceba66197e46f6d7d5bddfc08693ad242403ba54
-EBUILD meson-0.59.1-r1.ebuild 2765 BLAKE2B bcedeae1c647c0c1b9616919db71562b2c3326ab3e94a3f3fde83d2525af2ec1623c726b841f7e72784e717fce408a450d8e69f53773aa05713c8b1306394b5c SHA512 1f3c9bff2134fa8d5a79b810ba37c9970021208cb616b46dbb227b34bbeadd2884f06d76ccb2fc89a38be4fc1fcde834fe1cb97ac0923a551e0c102faeefc674
+EBUILD meson-0.59.1-r1.ebuild 2760 BLAKE2B bc631767f6dd03d16f73b376c335b4793f1ab316e0242c49fd9748c917dd0e0c3bba0dcb4188ac61f4f8bc647cc2f84be2020c188a651e6b98e59c8ba374d339 SHA512 eac95dd7dbd35ff2f20993ccd2b68f554d49cf51ed371dbfcd99f5f2b039cb72d1074163b62665dc580fe8ad917f168e802121740a3ce99c6eac5d8c69c75a44
 EBUILD meson-9999.ebuild 2686 BLAKE2B 01ac1e0754290c41a97cf65b5505a2a811efcec356322e1c315cb124f77c2afaf182b8cb0fb98a5c89244ff0e1933062afd83f0acebc760cf43b8b1f89071a0f SHA512 d2883e8cc040e67e215150bae5a52f3e7b1db566f0becdf2f411e1c10941c0b3586ab93426f5ef0cf273737ca76ffd0b288853bdf841e87106c23e08acb5752b
 MISC metadata.xml 424 BLAKE2B 9e8cee51a5a6699950f1f4fc203732032afa7b36229bd4117a2b2164761ba0375bbc2c6001a81b48b67171f4b9850e948f6da229cffb9649acc0f514a675c922 SHA512 266b94131a352512bfac11c3db7ff840a6d050eb71c814a5223c9d3bb6f1be30506c9188ef1725a2b435c0b44923aa3efcea5f3d041f0acce0141dfe37ba66c4
diff --git a/dev-util/meson/meson-0.59.1-r1.ebuild b/dev-util/meson/meson-0.59.1-r1.ebuild
index 5d637ceeeddc..a7a64972a732 100644
--- a/dev-util/meson/meson-0.59.1-r1.ebuild
+++ b/dev-util/meson/meson-0.59.1-r1.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 inherit distutils-r1 toolchain-funcs
diff --git a/dev-util/objconv/Manifest b/dev-util/objconv/Manifest
index 8bb870932962..254a4600bb0f 100644
--- a/dev-util/objconv/Manifest
+++ b/dev-util/objconv/Manifest
@@ -1,3 +1,3 @@
 DIST objconv-2.51.zip 1033450 BLAKE2B 1029e8001bee969f177e7e47e735dc132dbf640bb472ae148cd2a33af522c190066f226a55da3bb3b47902a68eecf437edc025622781bda691a10956c84561c3 SHA512 12991b98fafbb5fad709471b25bf8acd2944f862ca1f3cbae5a6f7fd53a6009dbb6e67a2fcfa180965b519a2d6010d9b2f7585748ea58d36b28d86c0981f13d8
-EBUILD objconv-2.51.ebuild 1010 BLAKE2B 6574210bd8b1add496028615fc4b168aac24bebdb61e2d3b84213acecd3a16211e46c0da7278329fb425a4bcd131932607fd731fe46cd2994d591a677ee7d56f SHA512 cd37c3e72bde6775c7635c3c91002c99d3fbb204a8d1a781258b41413f02c7f4cd0379b9a9de4d3bb3462def75bee5118a7056c91c6de5768d746263604786c2
+EBUILD objconv-2.51.ebuild 1007 BLAKE2B be24891790f9aee98328125962c2e47bd3015f6cc370ff06dacb7c5ebd6476e83c0e6b21363d5db499853e3ede8f0c40e8210e07a1cf457536b8bdcd43355480 SHA512 501206a86863498215574469b1e77e42916795ba87592a62959bd38e10d60feea1852be3310d06d08ff1da93bf47bc06728bdd96b36a940343c298c2c8f0d091
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/dev-util/objconv/objconv-2.51.ebuild b/dev-util/objconv/objconv-2.51.ebuild
index 0623cabd95c4..e167d52fa324 100644
--- a/dev-util/objconv/objconv-2.51.ebuild
+++ b/dev-util/objconv/objconv-2.51.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ DESCRIPTION="object code file converted (COFF, ELF, OMF, MACHO)"
 HOMEPAGE="https://agner.org/optimize/#objconv"
 # original URL is "http://agner.org/optimize/objconv.zip", but it's unversioned.
 # I copy those to distfiles time to time. last modified: 2018-Oct-07
-SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${P}.zip"
+SRC_URI="https://dev.gentoo.org/~sam/distfiles/${P}.zip"
 LICENSE="GPL-2"
 
 SLOT="0"
diff --git a/dev-util/opencl-headers/Manifest b/dev-util/opencl-headers/Manifest
index f842915cfff1..96a68edf695a 100644
--- a/dev-util/opencl-headers/Manifest
+++ b/dev-util/opencl-headers/Manifest
@@ -3,5 +3,5 @@ DIST opencl-headers-2021.04.29.tar.gz 59775 BLAKE2B 9e1728ce33066430711de911f4b2
 DIST opencl-headers-2021.06.30.tar.gz 59866 BLAKE2B 7bf7b7d6f69178ae14d4ba5b012d134e0d0005acd8aa6c1c09c6d34b531ccf74381af072aaf85fa41ab1d8cb783b8c3c5fc528ddef078ba8dbb91708849fb0d0 SHA512 9d3ddf3a02ff4de00686f7e8cc7eef9f75e3c0e68920e787941c2d8a3ad895ae46d7c717894527a56144febf19ccc25ed733018d3d683509b1d8cc368d99b8ba
 EBUILD opencl-headers-2020.06.16.ebuild 607 BLAKE2B 256e0ef32db80dc37bfa06a49135f081b11154dfe791752b2322058a32d074ede2b780bf6bc1354ad015de25812b05cbfe477c3bfd4d8aa38f20bca27fb40826 SHA512 3da5cc9e8e83a0ed1d96817990b16920e3172e52cd99621d10e2f59c98a89368f212533f1470267dbfae8e0eab94d54340ec3a5f62f9cb1586b251eb2f1d78ee
 EBUILD opencl-headers-2021.04.29.ebuild 502 BLAKE2B ed8d78b56b10d92d13591261fed0edc8257bc572b3dd42f136df1b5f6b91a03f5d26bbff8ba0015f01732228752693bfc3b5217c16d59647b073dd5c2a1f6f8f SHA512 f6a9733f71dc0dc3c20bc2fe0c9e4782f8c8a60ca6feb13a546836d5022b4221f33ecdecdb3902ccd34c147435e226758cf6b23a28c0d1bd4d86b8fadba2a426
-EBUILD opencl-headers-2021.06.30.ebuild 504 BLAKE2B cb9f280b89baec06757b7cf214b759a2297e88509bc40f3912c29c46a826f55dbe4202c92336e4674ac6cb1165d7f9b4b1bb0b0d4f22fd810f19dc8f8e745783 SHA512 73a6a849de1638365d0e16da9628afa2c3c1842d055b522f2caf8e7124e6e3d0f2e5bf3da6885b9c7096ede931bd03a4de1bc552e14f8bfd9a4f52be520e0bab
+EBUILD opencl-headers-2021.06.30.ebuild 502 BLAKE2B dbc937549550a6ccba57cc73ef86aea42fdc941aa5e0d24c4c0c3c94cbded49bfdc79765684330053156bcc36807043d51916c4e16ddb1e64f3e6b36d811f581 SHA512 1390696b1c4251cd94d6235897843433f4f3ef6966f6a0ea711b475f499d9933bc4a02ee96d177b28d681fa66404e984789d3cbb05524129fcf43a3a7758a886
 MISC metadata.xml 1055 BLAKE2B ac96e1bf07e353236170d3678541555b7d901984266dfd1356456db90effe430e6a042afc0b9b5a7f51d0e9cfbcef0fbf66fb46de82fdc8cc1cfa29c6cfd61d0 SHA512 6233610591851e415ab0354ca900dfdfa14fa2442e56094d547420ce710942be86c701820c3a63e2c6f070b74c0801f92bbe9ed6c7f2a5cae406f74b81acd86a
diff --git a/dev-util/opencl-headers/opencl-headers-2021.06.30.ebuild b/dev-util/opencl-headers/opencl-headers-2021.06.30.ebuild
index 46d065988f56..8ad07c4d0f42 100644
--- a/dev-util/opencl-headers/opencl-headers-2021.06.30.ebuild
+++ b/dev-util/opencl-headers/opencl-headers-2021.06.30.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/dev-util/pkgcheck/Manifest b/dev-util/pkgcheck/Manifest
index 1b84acb797ab..ce932a3dc4fc 100644
--- a/dev-util/pkgcheck/Manifest
+++ b/dev-util/pkgcheck/Manifest
@@ -2,9 +2,11 @@ DIST pkgcheck-0.10.1.tar.gz 454051 BLAKE2B ba0e91fee539d0a41c27da08c91e1c65078ea
 DIST pkgcheck-0.10.3.tar.gz 454953 BLAKE2B 5ee2c13cb1ca5b13bfcd8434700c69e6839c5dc2f25dec4060020f8477159ff071b1487a446ba7e03bf1b8d139e8c65a1cd21a777d8bfe3ce677bbfe39b8d85f SHA512 edef25fc1542c3d3fb89c0c1546ebfa736b6ad4b113b0e6bc9ede379b0a5cb9ece5dd8b79ddb2df2cfeaf7f67f290e96a8baee1f2dfcc3bcebe32d9dcf4c264e
 DIST pkgcheck-0.10.5.tar.gz 458314 BLAKE2B 143a397f5374b3f84d957953d0915b6ae7107b81f85af4e37e75289ed0edc5bdf16bdc00213860fdf0bdf53be953b80d514839c6568c3a70d2cdd61401e8dc73 SHA512 3902560099c7e5570be2b86b6e7d56427b6ef9cc893dafe5327b6773b92ca44cc787725a0d2e81d4b779ae71dc2acaeceaaff4d5de50fc99aab4c0dc0ab03bfa
 DIST pkgcheck-0.10.7.tar.gz 460625 BLAKE2B f62057dcf493ac32fddd1594beb9b38dc463015e8e93de5e51084894be43932f1842c7b5a742d4eac20538160060c538e42e14f5931c5506d443017e1980020a SHA512 ccbbd14cf3f081ff028af164aaf73a0192133f499ed107747f8eb766131c56ccbf0f128a34210e2a54ee47ee713a5151cfb1e0991e5470e5e7f74ca180bba694
+DIST pkgcheck-0.10.8.tar.gz 460288 BLAKE2B aab2abdd9eaee483d580180753fc719127b7c7d0024b834e9199101aa2d18684ec7804efc4ddf59f4a44c0cc6c2896f437d4a7a9fe4496813be4a3a8d33ce7ad SHA512 9a186e032b86e1b565d6198dc9a993a9a8ef065e43f431d6d6dd9bbd6c32fe91501612984c7e3b2092754450c992fc683270d62c29ec85beeb97674b07a9ba9a
 EBUILD pkgcheck-0.10.1-r1.ebuild 1552 BLAKE2B 3ada505dd9f21bdce2f683ac27b7ea30f8a9b4e49c6d287bc87788ac75a478f2bf02c5ade77b56f268e56d1b8790e10a3b64252ca07abaab29fabb3b300fab56 SHA512 1408c239732b315a1a267ff3bdf1f5df40248c3893eecea2baeb500df9720fd8a62aacfd18b7eb890f1e8f39e097432392a9f157c07bbfa23c60139015281f95
 EBUILD pkgcheck-0.10.3-r1.ebuild 1609 BLAKE2B fd96f50c732590d9bacc04267e3e2df094cbfa33bb6be1322aded8c7473c9af12c729086aa759ca3c8a96c0452ebe7e1c7ec97373f55169d99dde10dfb58fe52 SHA512 72043d1cf02676bba1ede0864eeb991b319c7e7c83af1447736d774de0e591f0ef97e714ed441cd4ecdf0933c652382b9031577baac0035ce66af3687f339075
 EBUILD pkgcheck-0.10.5-r1.ebuild 1618 BLAKE2B 6cc7ab548f27a7b1d9ae9ccd86367db964d50c834a6efbbd61a8931596fdd9e6d62a32a615d6e1fe25a6aa3ff3f79dd11d4709608b0f82333fb0715fb30b3213 SHA512 2631da14401dd5fe659180ca8285d24ed10419fa0b4d7fb9fc39c11f606375ca860b6f8d68690bb8ff20a7447a8e59cc3309ca916a92bb819555b54068e433ec
-EBUILD pkgcheck-0.10.7.ebuild 1572 BLAKE2B 83e9f789906d8415c86f5e63b97cf1036290c3850a1caa0efa287ec12260682a2d1f425974703452f98f5e019f1eb73a958a7db9559920eb27285c036dcff6be SHA512 b6495aec8314b391b1ed06959be442beec5dda7c71146244b08eaa33f282fc3d4181d99380c7b272f8c0792a412a88a41a145aad0ffa4931807c5072d4535b5f
-EBUILD pkgcheck-9999.ebuild 1573 BLAKE2B d03e4d1fe145c9832af499920828bffee127e467ad2a7a6c3e21230325840678f67fe1d20229aab5097105f5dcafeb6cfaf9f7b1cf41faa683ce344bf4df38ec SHA512 1eb05628c9add2ffea776c86155dfef87c28741190d1eb91bb9c894a14126efd84058646460daf6199149b5501b6e306b7b81c59a1bab628127f20c7495a1993
+EBUILD pkgcheck-0.10.7-r1.ebuild 1610 BLAKE2B cfbf430001df15083e5f03ed504d698602490e122a2aa943e864746fc8e37f53f4d0ccb4348afeb0ceda1b9d061b822904f7da6db4ce909c79a60bbab74283d9 SHA512 259e13ace6e8d05734bf5a86bbf83a2dc35e95916ecf8c725c87b00a7464425128c50b8e7d2ed46f5ccc2e9649df3dc37148602e6503704b1cdf223ae87102bf
+EBUILD pkgcheck-0.10.8.ebuild 1573 BLAKE2B f1f1ceadf0cc890dfd31ff3c06e0a5182fcf68650d7054ec8f13b5f84e82a807452daa3150da407904e06d9af8fe2910608f2b73a4d5ad0768e0c7beb9b84c8a SHA512 ab489bd05bed67046792b414efd79932a195a3df0f6194b9242330613874e595a3960d2ae0054e28eb07888b8288bdc819829e137bbb32919611db8684f66a37
+EBUILD pkgcheck-9999.ebuild 1573 BLAKE2B f1f1ceadf0cc890dfd31ff3c06e0a5182fcf68650d7054ec8f13b5f84e82a807452daa3150da407904e06d9af8fe2910608f2b73a4d5ad0768e0c7beb9b84c8a SHA512 ab489bd05bed67046792b414efd79932a195a3df0f6194b9242330613874e595a3960d2ae0054e28eb07888b8288bdc819829e137bbb32919611db8684f66a37
 MISC metadata.xml 329 BLAKE2B 30154e72c975701c69832cdb72ac9d2464ce5ac65ae107ed1a0d55269dd80664532b529a1ad5a907a948446244b9f41d13c2d19484b45d208f8757f5192bdd32 SHA512 e51404fef8bb71baba825a6700ba9c9ea3680e2892016daf38d3979d33c77c07ea88f95b00c6c821907fbbda129c35ecbcc00b0128111e18290b110cfac5e316
diff --git a/dev-util/pkgcheck/pkgcheck-0.10.7-r1.ebuild b/dev-util/pkgcheck/pkgcheck-0.10.7-r1.ebuild
new file mode 100644
index 000000000000..6052eae461f9
--- /dev/null
+++ b/dev-util/pkgcheck/pkgcheck-0.10.7-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_IN_SOURCE_BUILD=1
+inherit distutils-r1 optfeature
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git"
+	inherit git-r3
+else
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+fi
+
+DESCRIPTION="pkgcore-based QA utility for ebuild repos"
+HOMEPAGE="https://github.com/pkgcore/pkgcheck"
+
+LICENSE="BSD MIT"
+SLOT="0"
+
+if [[ ${PV} == *9999 ]]; then
+	RDEPEND="
+		~dev-python/snakeoil-9999[${PYTHON_USEDEP}]
+		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]"
+else
+	RDEPEND="
+		>=dev-python/snakeoil-0.9.6[${PYTHON_USEDEP}]
+		<sys-apps/pkgcore-0.12.8[${PYTHON_USEDEP}]
+		>=sys-apps/pkgcore-0.12.7[${PYTHON_USEDEP}]"
+fi
+RDEPEND+="
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/lazy-object-proxy[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/pathspec[${PYTHON_USEDEP}]
+	>=dev-python/tree-sitter-0.19.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)
+"
+
+distutils_enable_tests setup.py
+
+src_test() {
+	local -x PYTHONDONTWRITEBYTECODE=
+	distutils-r1_src_test
+}
+
+python_install_all() {
+	local DOCS=( NEWS.rst )
+	[[ ${PV} == *9999 ]] || doman man/*
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "Network check support" dev-python/requests
+	optfeature "Perl module version check support" dev-perl/Gentoo-PerlMod-Version
+}
diff --git a/dev-util/pkgcheck/pkgcheck-0.10.7.ebuild b/dev-util/pkgcheck/pkgcheck-0.10.8.ebuild
index dbc08627dd97..ceb25cde418e 100644
--- a/dev-util/pkgcheck/pkgcheck-0.10.7.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-0.10.8.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 fi
 
@@ -28,7 +28,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	RDEPEND="
 		>=dev-python/snakeoil-0.9.6[${PYTHON_USEDEP}]
-		>=sys-apps/pkgcore-0.12.7[${PYTHON_USEDEP}]"
+		>=sys-apps/pkgcore-0.12.8[${PYTHON_USEDEP}]"
 fi
 RDEPEND+="
 	dev-python/chardet[${PYTHON_USEDEP}]
diff --git a/dev-util/pkgcheck/pkgcheck-9999.ebuild b/dev-util/pkgcheck/pkgcheck-9999.ebuild
index e934bd067162..ceb25cde418e 100644
--- a/dev-util/pkgcheck/pkgcheck-9999.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-9999.ebuild
@@ -28,7 +28,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	RDEPEND="
 		>=dev-python/snakeoil-0.9.6[${PYTHON_USEDEP}]
-		>=sys-apps/pkgcore-0.12.7[${PYTHON_USEDEP}]"
+		>=sys-apps/pkgcore-0.12.8[${PYTHON_USEDEP}]"
 fi
 RDEPEND+="
 	dev-python/chardet[${PYTHON_USEDEP}]
diff --git a/dev-util/rr/Manifest b/dev-util/rr/Manifest
index b9b6d9343a00..2f561513a8b2 100644
--- a/dev-util/rr/Manifest
+++ b/dev-util/rr/Manifest
@@ -1,3 +1,3 @@
-DIST mozilla-rr-5.4.0.tar.gz 1434820 BLAKE2B 8454304fa2ddf85fcd385d3d4e72b8963dc0f6804bf572db31654cdf5bfc8a3afd050380fe34d280264114467e9b973866384d75d6f8b7078affd51064e9f597 SHA512 69b029a29cf3c147f033ff4c1c67c6190f5163b4f7329306e5f0ccfe78cae4b6ae262602253772e83d5a55408c5a4d121e5a9b3530779de74adc34b81e2592c8
-EBUILD rr-5.4.0.ebuild 1343 BLAKE2B 9048afde5c6633ddae144e92d5f16f8ea8b463089364bb2e4daf97c86b398fff5cfd4c4245083323de6af4f88573686294a670a571ba9d1e3ee11f6cf7d6da97 SHA512 91094025d740dcb1a357400e1edc2598de8dbd4d7aadbdff0f153b7789647d18f0d9949ec4a05c5ce34496841ac48fa91b5971a05095fc036695277a7d610680
+DIST mozilla-rr-5.5.0.tar.gz 1477110 BLAKE2B d37162ef68b20f1ce7878c338f480e6e1ba1850e37d2c6728705b3ab8791897bfc238c950fd5f318dc2ba0be0df04571888092418b227e396c2c524121ad8345 SHA512 4101de8ccf46533e5fc8e72f99bff39253a40543510d9bc9a611ed0909efcd45a050244994a9ebc878d1c6d0af548ec7e2879d1e737f6455db732f75175ab497
+EBUILD rr-5.5.0.ebuild 1343 BLAKE2B 9048afde5c6633ddae144e92d5f16f8ea8b463089364bb2e4daf97c86b398fff5cfd4c4245083323de6af4f88573686294a670a571ba9d1e3ee11f6cf7d6da97 SHA512 91094025d740dcb1a357400e1edc2598de8dbd4d7aadbdff0f153b7789647d18f0d9949ec4a05c5ce34496841ac48fa91b5971a05095fc036695277a7d610680
 MISC metadata.xml 444 BLAKE2B ffed074f3322dfc2fb772a2b5e7056c1899e9f424e41f774a9da86af028322f5e3b4e371fbb624b9448733c30778fcfcf4cd7a54f40148d9db24702d5beb5a6f SHA512 481d21665113f88c355c0097b6ba0980d62570d53eb130096ee8db32c46eaa1e5f8f9746d2f7a9bf1bded5b725d4805d875abb81e2d7cb6e7c3fc8cf472c3274
diff --git a/dev-util/rr/rr-5.4.0.ebuild b/dev-util/rr/rr-5.5.0.ebuild
index 73cc6777d148..73cc6777d148 100644
--- a/dev-util/rr/rr-5.4.0.ebuild
+++ b/dev-util/rr/rr-5.5.0.ebuild
diff --git a/dev-util/scanmem/Manifest b/dev-util/scanmem/Manifest
index 397127cabc0a..35a9506b2c09 100644
--- a/dev-util/scanmem/Manifest
+++ b/dev-util/scanmem/Manifest
@@ -1,3 +1,3 @@
 DIST scanmem-0.17.tar.gz 220489 BLAKE2B b1ae07f96fd736e9ca6a5d55ad2d6b06b7d0dc4828915e0f2adaa2d58b053d9734ccd7425fb5391289249f838773cf3f9a81dbe76bacd42f41203d27dcffed05 SHA512 6d74f3d1d3492d41cabc342cfd1189815536dcbd57857d8a92e05c5dcaebcb9b1df886aee706c56eaf3344737070ea0fe852eef164ef3fe7907f66c626d8523e
-EBUILD scanmem-0.17.ebuild 1074 BLAKE2B eeca6fc57f8360399a0b318e51ebc56a98828f9521161b6de7209b128fed265bc24b0f2b6f84cd01ff0a9fd7cb28541a70d8088cf4e92bee7053ef6aa944cc8a SHA512 d4975f2964b9ae98283b23bc41b462bdfd1fcc36d535947bf65b9a7caf54ca9aecdb23afcdf59183a7e3259d5fa21ad2e636b4d2ac03a5d8defd271ad99cf200
+EBUILD scanmem-0.17.ebuild 1079 BLAKE2B a8a0ec3eb1e5e3a1480740e27ae85aa6036d29d7b8898e16bbfa2f94f336696871c65e40c005823a6beff3e7dbc59e8f80de44f166e0f059b8bac64dfcb61fe9 SHA512 1356f396f6a9b2946fee69e1c5074defa3d8fff7dc8831b26534e813b8f10479ac56c1cf1ad6abef633f58b6dff24e8cb7597ecf9cdc130175a3eb38603698c5
 MISC metadata.xml 318 BLAKE2B 081a868e03192346a1d251caa782751d0cdc831607a57bc08b67df34737496152df6477d769da51fcfac1a2d81aa419c2e8588b27cd3f89c5dd91eb84b0f88cc SHA512 eafbe8d2c6d06413368968db5aacd89981ad7963a04b5870601c7defb9ffb515a8398ca9a8182ad10cf23d05f8fd2d7c0f681811391cd2446bd1ccc1bc9fe34d
diff --git a/dev-util/scanmem/scanmem-0.17.ebuild b/dev-util/scanmem/scanmem-0.17.ebuild
index 4ff912ced245..0f73625fc11a 100644
--- a/dev-util/scanmem/scanmem-0.17.ebuild
+++ b/dev-util/scanmem/scanmem-0.17.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 
 inherit autotools python-single-r1
 
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/scanmem/scanmem/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~riscv ~x86"
 IUSE="gui static-libs"
 
 DEPEND="sys-libs/readline:0="
diff --git a/dev-util/scons/Manifest b/dev-util/scons/Manifest
index 68d9861f6e43..3a08766be4d9 100644
--- a/dev-util/scons/Manifest
+++ b/dev-util/scons/Manifest
@@ -10,5 +10,5 @@ DIST scons-4.2.0-user.pdf 2813567 BLAKE2B 2787c9dbecaefccc5f4df2bcccc474ee69e988
 DIST scons-4.2.0.gh.tar.gz 5677165 BLAKE2B c298152db937810ab73afc304a9dc480c185ef0d6e86be5ec7f2022a7d1ed4d3df6ecc18148c3143d4e76a7ea0e50790db1224e66db68bace0759daba7f36a91 SHA512 138573f7203b52fad0527d8d88ceabe182273eff7e4b74125e0d7eda51c44408b07e2c702ee63214519392101d8bbb30013e6d34000eaeb530a816c17396de97
 DIST scons-4.2.0.tar.gz 3043008 BLAKE2B 3e69189e45b8ecc956419d3b7d4d36a78ffe219ff87a18d17c511434cf4306635c245107e7978d8f6b86f65bd2ac028fa3c76ab1212806a692d355d7d8036645 SHA512 91d77c858a888621d41432f39970547830997c8e28a851bbab7c0f181afda564abef321befaa33cbe6fd5fc4ac85fa80f2349994956edcc99c027cf7f526bbf0
 EBUILD scons-4.1.0-r1.ebuild 2764 BLAKE2B 0add0564bc259cee0d3dc5b4121577e329257d62c02c9811f1df5df680402563cdbab7fd118c585c5b4dde333d1a96c69dc4f04b4785b92b4852e40136fd0409 SHA512 cbcc1e83478eb60778e7512dd3268d064fc1e96acfc47ee598b68064acd9b44e262c2d675d5c0383d632014174036bd9b9886f8e320464d9fbcbe2572dd1f494
-EBUILD scons-4.2.0-r1.ebuild 2889 BLAKE2B 709f7adaeefaabd3bc298d661a48c116ec472d78d18052abfbb715900e152b0303ea1565cd1e8c69a3dc06364de2f2524e7a1bd742207ac507a827a37233e105 SHA512 542741fa94fa0857732d3cfdf388f22c9d86965c026460ef00754f8b7a49b6e98bfd7ec9a9288cc6fe9dfe6fbe84f56f67c87686871126f4393dca9a6ee9e11e
+EBUILD scons-4.2.0-r1.ebuild 2886 BLAKE2B 8a36d15b5512b6c0830d967f12aa1f44085cd1804bcad304f31883da4c2fdf2adf83e7a9e87995f0cb85c8511431157eab0c065bff6a7409a5d76b5b3cc7600e SHA512 2023ab17883083ca597c1c659507f714f226da1fcf755e07d2c145f41e3a9215dd241bd425144463f113797c93ed2b4fbf1ce6ae5302e0b34acce34d28f0327a
 MISC metadata.xml 705 BLAKE2B c2c0722d7a0a382c218f101c0219deac4b335d1dc0a0038f27b7e920b37e4fdad2c7524f0463182a2495c04f9679f511b8a2b92982ee7ffc3cad985cfabf1e80 SHA512 5b127afcc07795487bb4856d942e0a34402c609147256dc457f5919d75a8fbf3f0bfca0c3a5f61d78a1152ee56967d1f48eac670dc12ce292ae964d692c497dd
diff --git a/dev-util/scons/scons-4.2.0-r1.ebuild b/dev-util/scons/scons-4.2.0-r1.ebuild
index 9c816bfcc0bb..d4f1339f581a 100644
--- a/dev-util/scons/scons-4.2.0-r1.ebuild
+++ b/dev-util/scons/scons-4.2.0-r1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/uncrustify/Manifest b/dev-util/uncrustify/Manifest
index edc5e1af6c1d..4cae255e0bba 100644
--- a/dev-util/uncrustify/Manifest
+++ b/dev-util/uncrustify/Manifest
@@ -1,6 +1,6 @@
 DIST uncrustify-0.71.0.tar.gz 1704631 BLAKE2B 3dc9122647e2c173a776c4ad24c93d7b88fdd00c6c4f3070e68fd7a272218335063d8563446a3c8e72ff68e41d00a265aca76682a8cea201a33230377d7e425a SHA512 220ecbebb1c1d6abadb96c339e4ca9b264a04fa08bc83e9b0fabba5fae425efd1911d175d18b635521614ec9c33aa389fadaeec62ebf28a5d71e595900a92181
 DIST uncrustify-0.72.0.tar.gz 1530850 BLAKE2B 59b3ff4b47fee1f2a303e237d46b5fb656041e4d397aa97862cc7aebb6a5e705d036889a7b492bbe4393537ff52cf78af46bbe513e71aef19fca1388e3ffa79b SHA512 bfcbdf0d8198e1dd91f1c8283441a56669610a84d55a17cdd504571da09b26fef026fd3f753acd9950e498f574e6771a206c72b76ffdea97747b7a4fdb481862
 EBUILD uncrustify-0.71.0.ebuild 744 BLAKE2B 6d466a70bd6ea03c84f7f4dc65f54a9a97b675b80ed02c71992e56e71916bfd361b9425a55b220cf855ac4aa82ac31d7e3817d42a19896c5e5e99322d8ffe805 SHA512 c4530d02300987cf93c7b6863d38826ae967ca470ab324b9d2e3d4ee54e73ee57c4f3cda7380ac2a2fbfde1fb759e6a6c429d01f2cf6ba53d2e5971b8658508a
-EBUILD uncrustify-0.72.0.ebuild 738 BLAKE2B 142ca979491bcc2a2d0270f25c09e74ea16e15693b07fedfc45d03d81c1c7bd86d3db4c4459e4f45e0abe1b60817c83e8c3e7296769908603d9dddda5a28958f SHA512 b6fb4c58b692f7422876cd2f7d82565ba77b8accc1135d4e0b54a41a48c8e95fc7260ece72b2387325cb93f3c80b07ea71967596856bd0f40b20256a5c028989
-EBUILD uncrustify-9999.ebuild 746 BLAKE2B 796109c0f430214b76778254cc66e0291a973711562e4670d22dfdc500416812db05ebd5270363601814d8093b2bba7910dc28b6b56834744eece42db58c28c3 SHA512 a6c72f62101f760cfd496656544c8772045047fec2c17a3345c60abd77cf21a32db0fbfd9cb4c837d86f8acae4ef87f8299bb8a4bda24b1601335ae56536a068
+EBUILD uncrustify-0.72.0.ebuild 739 BLAKE2B 4e3de929909ab880480826c404e237a40102beae3068b47d7d5d7d6fb8017dadb5a34a24dd916d344f01dfd7309d55a493c8924cac80b2e7eaae320d286a0915 SHA512 c172e63fea583fa3e1ccd313379d08130b7c03eebaf012f75fe2d0eb264db60ed1addf6691e1d215716adebf693f448396006bcacb2f0cf2d23e4ea1a3b6eba2
+EBUILD uncrustify-9999.ebuild 748 BLAKE2B 8fc9c14f7784c1386a3f52c6a56e7e37c010afeb80d744ac2f368952e9ca012649bf1a57535052b601243cdaf6aa7e9918c2e3e1a5081991567440aaf681780f SHA512 c1c6665a8a3cf0726d781e8fb75b1098e4d57c8d9b2f0aa1e85345a666e26d52967e80da4f1dae8b507c01887861837f1171fa613b13286b4556657a83b07efc
 MISC metadata.xml 500 BLAKE2B bc52827b6bca6fe3529586004a180234601307881f2ffabc23bea7210093e42ca29fc4baf2a81f45793d9bcd2bfbd546622d7703b9680200159bbf8e52d76fcc SHA512 5a039d7b7a857226c80a557ceb868a625b85b3a2205437badb4c85241f4aa51c14b6aade595d52468347c998f8a5cf1bf0030ec932e54907387803b782387b38
diff --git a/dev-util/uncrustify/uncrustify-0.72.0.ebuild b/dev-util/uncrustify/uncrustify-0.72.0.ebuild
index 9e76b92aa679..e4c34c2bcb23 100644
--- a/dev-util/uncrustify/uncrustify-0.72.0.ebuild
+++ b/dev-util/uncrustify/uncrustify-0.72.0.ebuild
@@ -12,7 +12,7 @@ else
 	S=${WORKDIR}/${PN}-${P}
 fi
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit cmake python-any-r1 ${scm_eclass}
 
diff --git a/dev-util/uncrustify/uncrustify-9999.ebuild b/dev-util/uncrustify/uncrustify-9999.ebuild
index d078b64fab35..c4689a26e0a5 100644
--- a/dev-util/uncrustify/uncrustify-9999.ebuild
+++ b/dev-util/uncrustify/uncrustify-9999.ebuild
@@ -14,7 +14,7 @@ fi
 
 inherit cmake ${scm_eclass}
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit python-any-r1
 
diff --git a/dev-util/vint/Manifest b/dev-util/vint/Manifest
index 54ea16210c46..469fcb0d51a2 100644
--- a/dev-util/vint/Manifest
+++ b/dev-util/vint/Manifest
@@ -1,3 +1,4 @@
+AUX vint-0.3.21-fix-py3.8.patch 1428 BLAKE2B f45cf44b458a779a0e6ee27822fcb65c5c5594673c2d59e540c7fbd0fc3b31f3b0f17dacaf932e9a7837d93f47d6c267cd2ce1bb8487d2a0268ea6a3c7fd96fb SHA512 7421bc4dd6de228e60ae0d421912dcaaf1814c4d5216ae09198da65b4f56e90bf1c944fc3aebfe773f7a4abcdfc439481246a611613df302fc914a42cd610668
 DIST vint-0.3.21.tar.gz 96747 BLAKE2B 926b46493030dc0daa477ded3cb70f2b825b4eb8054c14a4b824b97e7df60d0141cf1bcf4c33893afd870f51308b7156fb6e5870f320f8c9449fdca8fe78774f SHA512 47e832d382952cb16bcc233eefa1f06ca74f95eb445d7f96d6804391b91a2c8a8e7b749b7f33f65aed9d3bdc1ff5e5332a62c3935969395f16a854f0f66e383b
-EBUILD vint-0.3.21.ebuild 886 BLAKE2B 50abf8d296e0470e98b46f881bd4093c54684d7d93b64d19ac03d86e4c89fbf8dab74bf7c7e87e28d90195e9688991bfcf57db39f776c9966945f94f31805cd0 SHA512 c54bd92dfbd9400728c2dffa8fffca797d5270bace822c662ec18d04030114315114aad16b5ad48b27fcfef253cca6571a47686f540e6fbda37578abe068ae20
-MISC metadata.xml 584 BLAKE2B 6ec51a7ca523def44ec9edeb96e64fc13762f233eafb8a40d1f4d06bcf815bdcee3ebfcbfa1952ad46b6bcc4670588d6644ffe7338b3d733addd1f8a369af9df SHA512 d576672a31098c2a115c7d1ebfca6aff349056696cefb7bcb14305a1bb214c843d06e1e04a32447ba31165326be92789e0ce426117dc1eb981f7edaf391472ae
+EBUILD vint-0.3.21.ebuild 646 BLAKE2B 1f1a15fcf7d74e76c276cab6b969fc3548f9e7e39cd22fac44dc589c82cf06178242ffca4d4f956d1e12a88845c48639d2f22ef6751cbfe5d03ad8e3779a55f2 SHA512 c5569269b6f078879e25078c326d36643528d2da4021927e36f19b9dc8dabf199b03291efd61b861f7049fc918da3807ab2eb37923caba73fe3f69384eb57677
+MISC metadata.xml 608 BLAKE2B 2a483186140621bc5e54219df1ca31114f4d410b308883e80c84a35a273e9aeb57968f78e608481e66d7535d137c36a192ed493c385c9b98bd9cf405554dc68e SHA512 5cece77f9c71170d519d3a11d292639c25fba403d4c8c8932c093b04d375433ae9279b23d1ef9c0c6fcb0c477b08d6559f8a3bf9521e7151c2de11b4e1ac6a0a
diff --git a/dev-util/vint/files/vint-0.3.21-fix-py3.8.patch b/dev-util/vint/files/vint-0.3.21-fix-py3.8.patch
new file mode 100644
index 000000000000..af97c51cf2c4
--- /dev/null
+++ b/dev-util/vint/files/vint-0.3.21-fix-py3.8.patch
@@ -0,0 +1,29 @@
+From f8bae710ba74dcc55a3b95995fe73139cf949b75 Mon Sep 17 00:00:00 2001
+From: Daniel Hahler <git@thequod.de>
+Date: Mon, 25 Nov 2019 06:41:39 +0100
+Subject: [PATCH] Fix SyntaxWarning with py38 (#334)
+
+> SyntaxWarning: "is not" with a literal. Did you mean "!="?
+--- a/vint/ast/plugin/scope_plugin/scope_linker.py
++++ b/vint/ast/plugin/scope_plugin/scope_linker.py
+@@ -406,14 +406,17 @@ def _handle_function_node(self, func_node):  # type: (Dict[str, Any]) -> None
+         # We can access "a:firstline" and "a:lastline" if the function is
+         # declared with an attribute "range". See :func-range
+         attr = func_node['attr']
+-        is_declared_with_range = attr['range'] is not 0
++        is_declared_with_range = attr['range'] != 0
+         if is_declared_with_range:
+             self._scope_tree_builder.handle_new_range_parameters_found()
+
+         # We can access "l:self" is declared with an attribute "dict" or
+         # the function is a member of a dict. See :help self
+-        is_declared_with_dict = attr['dict'] is not 0 \
+-            or NodeType(func_name_node['type']) in FunctionNameNodesDeclaringVariableSelf
++        is_declared_with_dict = (
++            attr["dict"] != 0
++            or NodeType(func_name_node["type"])
++            in FunctionNameNodesDeclaringVariableSelf
++        )
+         if is_declared_with_dict:
+             self._scope_tree_builder.handle_new_dict_parameter_found()
+
diff --git a/dev-util/vint/metadata.xml b/dev-util/vint/metadata.xml
index 5bcd8159db53..a3cc2f0b5eed 100644
--- a/dev-util/vint/metadata.xml
+++ b/dev-util/vint/metadata.xml
@@ -9,6 +9,7 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<changelog>https://github.com/Kuniwak/vint/releases</changelog>
 		<remote-id type="github">Kuniwak/vint</remote-id>
diff --git a/dev-util/vint/vint-0.3.21.ebuild b/dev-util/vint/vint-0.3.21.ebuild
index f07e7a81f734..44cd40dc8e15 100644
--- a/dev-util/vint/vint-0.3.21.ebuild
+++ b/dev-util/vint/vint-0.3.21.ebuild
@@ -1,11 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Lint tool for Vim script language"
@@ -22,12 +20,8 @@ RDEPEND="
 	>=dev-python/pyyaml-3.11[${PYTHON_USEDEP}]
 "
 
-distutils_enable_tests pytest
+PATCHES=(
+	"${FILESDIR}/${P}-fix-py3.8.patch"
+)
 
-python_test() {
-	# Tests fail due to python 3.8 warnings in stderr that appear when
-	# compiled byte code is disabled
-	# https://github.com/Vimjas/vint/issues/355
-	[[ "${EPYTHON}" == python3.8 ]] && return
-	pytest -vv || die "Tests fail with ${EPYTHON}"
-}
+distutils_enable_tests pytest
diff --git a/dev-util/woke/Manifest b/dev-util/woke/Manifest
index e126125b37ae..9d975de2f6b0 100644
--- a/dev-util/woke/Manifest
+++ b/dev-util/woke/Manifest
@@ -613,5 +613,7 @@ DIST rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod 36 BLAKE2B 61110bed2b9e99e0250cf6e8
 DIST rsc.io%2Fquote%2Fv3%2F@v%2Fv3.1.0.mod 55 BLAKE2B f1f0ba35f0ffd200ed37c06b2025c1fd436e3fd857bd525b9295c0cbcade7e1f037e3f566124a7ef428384d50525426f0d40468c967e39bac6057174710e2566 SHA512 e6357ddd7d09692c60e59e6cb80469ade8284052cdd3ea520ec4dbcb42c1cabe045c599e43cce94bec022bd82e87a554ecac42f8c917cf2ff44daff9c1a147d5
 DIST rsc.io%2Fsampler%2F@v%2Fv1.3.0.mod 88 BLAKE2B c2ac3c9619e396db470c9951dfc11cdacccd56ae09b3b353015ee7e5fbb023df288dbf48d81b44c309241d1ea89a2e0ee42ee1d17e536fcfa531aaee0e651ab7 SHA512 2137507eb25fbae419605e0cd6bca4cfa584110eebc276cd759a4dcb6f97e52928e5b2d9b276e76bcabcec3bbfc2c42f97fa29f54695d27fb00f9423e1638863
 DIST woke-0.14.0.tar.gz 85897 BLAKE2B 7731a8d88574f33aaa3021cbd71cbc84db7b9f2c13eddd4301c7cc1f512a2282a4e8376f98ad3c824a21afa6635b4e178a5bf2c5be203563aeff71e12a95b390 SHA512 ae6501816f0fc2cb615bb950e657d89d83b46829dd3bb2c4c594fd9870757b11bbec4fb9b5c5da386f4845b8686e3f3cee041ea53234301280c0fbeacdb5cfe2
-EBUILD woke-0.14.0.ebuild 33621 BLAKE2B c5ac50a1f7cf7fdb8d9d4185724408b7930c13b15dace5dc069dea197641c319559ed0eeca68f747550041bb6399a99e1d5c0f5ac00e30906768ad3a38a8ea98 SHA512 b3c61afec222eb0f942ae80239826bbbc8a8d634dd1c9e9ea99f3283734993a7acbe3aaf55080e651af78c302b57e43ab3482bb9682ed4fc57cae06bbdc46c2a
+DIST woke-0.15.0.tar.gz 86130 BLAKE2B 1954ea8dcfdc5ca035a78f7fa97b7a03a4c7b11e1741fc2457d529e04a27f565f9f2b6b16be45608bf60d7342afb9a0f8cd631d67d24f81e6b24be5b132099e9 SHA512 796b18887a5a82b0de2ab6dba353c12bb252650a325c1033d62bf7103356d9da744a6064fad2e0472ee6a1851f491a486b935a8d030d96711459c1ad912a75c1
+EBUILD woke-0.14.0.ebuild 33620 BLAKE2B fe619ac9b5f4927ce12a51c5f82f320c0182184c98f08db0004a9c57ba2598302a1a3660a7f85e31577a9b306fa3890fe72ca4c07a98fefea6b0e392b0dcba3d SHA512 695c39ba2a07c50c789d9c22958950f487122bccf0418f1d1750cb2720830ff79e3619f1d70294364866cac889a8fdd8b9f2d27ae4cbdcd3c55a56e2d052e2cd
+EBUILD woke-0.15.0.ebuild 33621 BLAKE2B c5ac50a1f7cf7fdb8d9d4185724408b7930c13b15dace5dc069dea197641c319559ed0eeca68f747550041bb6399a99e1d5c0f5ac00e30906768ad3a38a8ea98 SHA512 b3c61afec222eb0f942ae80239826bbbc8a8d634dd1c9e9ea99f3283734993a7acbe3aaf55080e651af78c302b57e43ab3482bb9682ed4fc57cae06bbdc46c2a
 MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/dev-util/woke/woke-0.14.0.ebuild b/dev-util/woke/woke-0.14.0.ebuild
index d4c53f4202eb..e9b1ee947c12 100644
--- a/dev-util/woke/woke-0.14.0.ebuild
+++ b/dev-util/woke/woke-0.14.0.ebuild
@@ -629,7 +629,7 @@ SRC_URI="https://github.com/get-woke/woke/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 src_compile() {
 	go build .
diff --git a/dev-util/woke/woke-0.15.0.ebuild b/dev-util/woke/woke-0.15.0.ebuild
new file mode 100644
index 000000000000..d4c53f4202eb
--- /dev/null
+++ b/dev-util/woke/woke-0.15.0.ebuild
@@ -0,0 +1,641 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+
+DESCRIPTION="check source code for non-inclusive language"
+HOMEPAGE="https://getwoke.tech/"
+
+EGO_SUM=(
+	"cloud.google.com/go v0.26.0/go.mod"
+	"cloud.google.com/go v0.34.0/go.mod"
+	"cloud.google.com/go v0.38.0/go.mod"
+	"cloud.google.com/go v0.44.1/go.mod"
+	"cloud.google.com/go v0.44.2/go.mod"
+	"cloud.google.com/go v0.45.1/go.mod"
+	"cloud.google.com/go v0.46.3/go.mod"
+	"cloud.google.com/go v0.50.0/go.mod"
+	"cloud.google.com/go v0.52.0/go.mod"
+	"cloud.google.com/go v0.53.0/go.mod"
+	"cloud.google.com/go v0.54.0/go.mod"
+	"cloud.google.com/go v0.56.0/go.mod"
+	"cloud.google.com/go v0.57.0/go.mod"
+	"cloud.google.com/go v0.62.0/go.mod"
+	"cloud.google.com/go v0.65.0/go.mod"
+	"cloud.google.com/go v0.72.0/go.mod"
+	"cloud.google.com/go v0.74.0/go.mod"
+	"cloud.google.com/go v0.78.0/go.mod"
+	"cloud.google.com/go v0.79.0/go.mod"
+	"cloud.google.com/go v0.81.0/go.mod"
+	"cloud.google.com/go/bigquery v1.0.1/go.mod"
+	"cloud.google.com/go/bigquery v1.3.0/go.mod"
+	"cloud.google.com/go/bigquery v1.4.0/go.mod"
+	"cloud.google.com/go/bigquery v1.5.0/go.mod"
+	"cloud.google.com/go/bigquery v1.7.0/go.mod"
+	"cloud.google.com/go/bigquery v1.8.0/go.mod"
+	"cloud.google.com/go/datastore v1.0.0/go.mod"
+	"cloud.google.com/go/datastore v1.1.0/go.mod"
+	"cloud.google.com/go/firestore v1.1.0/go.mod"
+	"cloud.google.com/go/pubsub v1.0.1/go.mod"
+	"cloud.google.com/go/pubsub v1.1.0/go.mod"
+	"cloud.google.com/go/pubsub v1.2.0/go.mod"
+	"cloud.google.com/go/pubsub v1.3.1/go.mod"
+	"cloud.google.com/go/storage v1.0.0/go.mod"
+	"cloud.google.com/go/storage v1.5.0/go.mod"
+	"cloud.google.com/go/storage v1.6.0/go.mod"
+	"cloud.google.com/go/storage v1.8.0/go.mod"
+	"cloud.google.com/go/storage v1.10.0/go.mod"
+	"dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod"
+	"github.com/BurntSushi/toml v0.3.1/go.mod"
+	"github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod"
+	"github.com/antihax/optional v1.0.0/go.mod"
+	"github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod"
+	"github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod"
+	"github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod"
+	"github.com/bgentry/speakeasy v0.1.0/go.mod"
+	"github.com/bketelsen/crypt v0.0.4/go.mod"
+	"github.com/caitlinelfring/go-env-default v1.0.0"
+	"github.com/caitlinelfring/go-env-default v1.0.0/go.mod"
+	"github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod"
+	"github.com/chzyer/logex v1.1.10/go.mod"
+	"github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod"
+	"github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod"
+	"github.com/client9/misspell v0.3.4/go.mod"
+	"github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod"
+	"github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod"
+	"github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod"
+	"github.com/coreos/go-semver v0.3.0/go.mod"
+	"github.com/coreos/go-systemd/v22 v22.3.2/go.mod"
+	"github.com/cpuguy83/go-md2man/v2 v2.0.0"
+	"github.com/cpuguy83/go-md2man/v2 v2.0.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/envoyproxy/go-control-plane v0.9.0/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.4/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.7/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod"
+	"github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod"
+	"github.com/fatih/color v1.7.0/go.mod"
+	"github.com/fatih/color v1.12.0"
+	"github.com/fatih/color v1.12.0/go.mod"
+	"github.com/fsnotify/fsnotify v1.4.9"
+	"github.com/fsnotify/fsnotify v1.4.9/go.mod"
+	"github.com/get-woke/fastwalk v1.0.0"
+	"github.com/get-woke/fastwalk v1.0.0/go.mod"
+	"github.com/get-woke/go-gitignore v1.1.2"
+	"github.com/get-woke/go-gitignore v1.1.2/go.mod"
+	"github.com/ghodss/yaml v1.0.0/go.mod"
+	"github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod"
+	"github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod"
+	"github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod"
+	"github.com/godbus/dbus/v5 v5.0.4/go.mod"
+	"github.com/gogo/protobuf v1.3.2/go.mod"
+	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
+	"github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod"
+	"github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod"
+	"github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod"
+	"github.com/golang/mock v1.1.1/go.mod"
+	"github.com/golang/mock v1.2.0/go.mod"
+	"github.com/golang/mock v1.3.1/go.mod"
+	"github.com/golang/mock v1.4.0/go.mod"
+	"github.com/golang/mock v1.4.1/go.mod"
+	"github.com/golang/mock v1.4.3/go.mod"
+	"github.com/golang/mock v1.4.4/go.mod"
+	"github.com/golang/mock v1.5.0/go.mod"
+	"github.com/golang/protobuf v1.2.0/go.mod"
+	"github.com/golang/protobuf v1.3.1/go.mod"
+	"github.com/golang/protobuf v1.3.2/go.mod"
+	"github.com/golang/protobuf v1.3.3/go.mod"
+	"github.com/golang/protobuf v1.3.4/go.mod"
+	"github.com/golang/protobuf v1.3.5/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.1/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.2/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod"
+	"github.com/golang/protobuf v1.4.0/go.mod"
+	"github.com/golang/protobuf v1.4.1/go.mod"
+	"github.com/golang/protobuf v1.4.2/go.mod"
+	"github.com/golang/protobuf v1.4.3/go.mod"
+	"github.com/golang/protobuf v1.5.0/go.mod"
+	"github.com/golang/protobuf v1.5.1/go.mod"
+	"github.com/golang/protobuf v1.5.2/go.mod"
+	"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
+	"github.com/google/btree v1.0.0/go.mod"
+	"github.com/google/go-cmp v0.2.0/go.mod"
+	"github.com/google/go-cmp v0.3.0/go.mod"
+	"github.com/google/go-cmp v0.3.1/go.mod"
+	"github.com/google/go-cmp v0.4.0/go.mod"
+	"github.com/google/go-cmp v0.4.1/go.mod"
+	"github.com/google/go-cmp v0.5.0/go.mod"
+	"github.com/google/go-cmp v0.5.1/go.mod"
+	"github.com/google/go-cmp v0.5.2/go.mod"
+	"github.com/google/go-cmp v0.5.3/go.mod"
+	"github.com/google/go-cmp v0.5.4/go.mod"
+	"github.com/google/go-cmp v0.5.5/go.mod"
+	"github.com/google/gofuzz v1.0.0/go.mod"
+	"github.com/google/martian v2.1.0+incompatible/go.mod"
+	"github.com/google/martian/v3 v3.0.0/go.mod"
+	"github.com/google/martian/v3 v3.1.0/go.mod"
+	"github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod"
+	"github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod"
+	"github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod"
+	"github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod"
+	"github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod"
+	"github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod"
+	"github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod"
+	"github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod"
+	"github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod"
+	"github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod"
+	"github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod"
+	"github.com/google/renameio v0.1.0/go.mod"
+	"github.com/google/uuid v1.1.2/go.mod"
+	"github.com/googleapis/gax-go/v2 v2.0.4/go.mod"
+	"github.com/googleapis/gax-go/v2 v2.0.5/go.mod"
+	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1"
+	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod"
+	"github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod"
+	"github.com/hashicorp/consul/api v1.1.0/go.mod"
+	"github.com/hashicorp/consul/sdk v0.1.1/go.mod"
+	"github.com/hashicorp/errwrap v1.0.0/go.mod"
+	"github.com/hashicorp/go-cleanhttp v0.5.1/go.mod"
+	"github.com/hashicorp/go-immutable-radix v1.0.0/go.mod"
+	"github.com/hashicorp/go-msgpack v0.5.3/go.mod"
+	"github.com/hashicorp/go-multierror v1.0.0/go.mod"
+	"github.com/hashicorp/go-rootcerts v1.0.0/go.mod"
+	"github.com/hashicorp/go-sockaddr v1.0.0/go.mod"
+	"github.com/hashicorp/go-syslog v1.0.0/go.mod"
+	"github.com/hashicorp/go-uuid v1.0.0/go.mod"
+	"github.com/hashicorp/go-uuid v1.0.1/go.mod"
+	"github.com/hashicorp/go.net v0.0.1/go.mod"
+	"github.com/hashicorp/golang-lru v0.5.0/go.mod"
+	"github.com/hashicorp/golang-lru v0.5.1/go.mod"
+	"github.com/hashicorp/hcl v1.0.0"
+	"github.com/hashicorp/hcl v1.0.0/go.mod"
+	"github.com/hashicorp/logutils v1.0.0/go.mod"
+	"github.com/hashicorp/mdns v1.0.0/go.mod"
+	"github.com/hashicorp/memberlist v0.1.3/go.mod"
+	"github.com/hashicorp/serf v0.8.2/go.mod"
+	"github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod"
+	"github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod"
+	"github.com/inconshreveable/mousetrap v1.0.0"
+	"github.com/inconshreveable/mousetrap v1.0.0/go.mod"
+	"github.com/json-iterator/go v1.1.11/go.mod"
+	"github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod"
+	"github.com/jstemmer/go-junit-report v0.9.1/go.mod"
+	"github.com/jtolds/gls v4.20.0+incompatible"
+	"github.com/jtolds/gls v4.20.0+incompatible/go.mod"
+	"github.com/kisielk/errcheck v1.5.0/go.mod"
+	"github.com/kisielk/gotool v1.0.0/go.mod"
+	"github.com/kr/fs v0.1.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.5"
+	"github.com/magiconair/properties v1.8.5/go.mod"
+	"github.com/mattn/go-colorable v0.0.9/go.mod"
+	"github.com/mattn/go-colorable v0.1.8"
+	"github.com/mattn/go-colorable v0.1.8/go.mod"
+	"github.com/mattn/go-isatty v0.0.3/go.mod"
+	"github.com/mattn/go-isatty v0.0.12"
+	"github.com/mattn/go-isatty v0.0.12/go.mod"
+	"github.com/miekg/dns v1.0.14/go.mod"
+	"github.com/mitchellh/cli v1.0.0/go.mod"
+	"github.com/mitchellh/go-homedir v1.0.0/go.mod"
+	"github.com/mitchellh/go-homedir v1.1.0"
+	"github.com/mitchellh/go-homedir v1.1.0/go.mod"
+	"github.com/mitchellh/go-testing-interface v1.0.0/go.mod"
+	"github.com/mitchellh/gox v0.4.0/go.mod"
+	"github.com/mitchellh/iochan v1.0.0/go.mod"
+	"github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod"
+	"github.com/mitchellh/mapstructure v1.1.2/go.mod"
+	"github.com/mitchellh/mapstructure v1.4.1"
+	"github.com/mitchellh/mapstructure v1.4.1/go.mod"
+	"github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod"
+	"github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod"
+	"github.com/modern-go/reflect2 v1.0.1/go.mod"
+	"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod"
+	"github.com/pelletier/go-toml v1.9.3"
+	"github.com/pelletier/go-toml v1.9.3/go.mod"
+	"github.com/pkg/errors v0.8.1/go.mod"
+	"github.com/pkg/errors v0.9.1/go.mod"
+	"github.com/pkg/sftp v1.10.1/go.mod"
+	"github.com/pmezard/go-difflib v1.0.0"
+	"github.com/pmezard/go-difflib v1.0.0/go.mod"
+	"github.com/posener/complete v1.1.1/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod"
+	"github.com/rogpeppe/fastuuid v1.2.0/go.mod"
+	"github.com/rogpeppe/go-internal v1.3.0/go.mod"
+	"github.com/rs/xid v1.2.1/go.mod"
+	"github.com/rs/zerolog v1.23.0"
+	"github.com/rs/zerolog v1.23.0/go.mod"
+	"github.com/russross/blackfriday/v2 v2.0.1"
+	"github.com/russross/blackfriday/v2 v2.0.1/go.mod"
+	"github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod"
+	"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod"
+	"github.com/shurcooL/sanitized_anchor_name v1.0.0"
+	"github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod"
+	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d"
+	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod"
+	"github.com/smartystreets/goconvey v1.6.4"
+	"github.com/smartystreets/goconvey v1.6.4/go.mod"
+	"github.com/spf13/afero v1.6.0"
+	"github.com/spf13/afero v1.6.0/go.mod"
+	"github.com/spf13/cast v1.3.1"
+	"github.com/spf13/cast v1.3.1/go.mod"
+	"github.com/spf13/cobra v1.2.1"
+	"github.com/spf13/cobra v1.2.1/go.mod"
+	"github.com/spf13/jwalterweatherman v1.1.0"
+	"github.com/spf13/jwalterweatherman v1.1.0/go.mod"
+	"github.com/spf13/pflag v1.0.5"
+	"github.com/spf13/pflag v1.0.5/go.mod"
+	"github.com/spf13/viper v1.8.1"
+	"github.com/spf13/viper v1.8.1/go.mod"
+	"github.com/stretchr/objx v0.1.0/go.mod"
+	"github.com/stretchr/testify v1.2.2/go.mod"
+	"github.com/stretchr/testify v1.3.0/go.mod"
+	"github.com/stretchr/testify v1.4.0/go.mod"
+	"github.com/stretchr/testify v1.5.1/go.mod"
+	"github.com/stretchr/testify v1.6.1/go.mod"
+	"github.com/stretchr/testify v1.7.0"
+	"github.com/stretchr/testify v1.7.0/go.mod"
+	"github.com/subosito/gotenv v1.2.0"
+	"github.com/subosito/gotenv v1.2.0/go.mod"
+	"github.com/yuin/goldmark v1.1.25/go.mod"
+	"github.com/yuin/goldmark v1.1.27/go.mod"
+	"github.com/yuin/goldmark v1.1.32/go.mod"
+	"github.com/yuin/goldmark v1.2.1/go.mod"
+	"github.com/yuin/goldmark v1.3.5/go.mod"
+	"go.etcd.io/etcd/api/v3 v3.5.0/go.mod"
+	"go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod"
+	"go.etcd.io/etcd/client/v2 v2.305.0/go.mod"
+	"go.opencensus.io v0.21.0/go.mod"
+	"go.opencensus.io v0.22.0/go.mod"
+	"go.opencensus.io v0.22.2/go.mod"
+	"go.opencensus.io v0.22.3/go.mod"
+	"go.opencensus.io v0.22.4/go.mod"
+	"go.opencensus.io v0.22.5/go.mod"
+	"go.opencensus.io v0.23.0/go.mod"
+	"go.uber.org/atomic v1.7.0/go.mod"
+	"go.uber.org/multierr v1.6.0/go.mod"
+	"go.uber.org/zap v1.17.0/go.mod"
+	"golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod"
+	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+	"golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod"
+	"golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod"
+	"golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod"
+	"golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod"
+	"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod"
+	"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
+	"golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod"
+	"golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod"
+	"golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod"
+	"golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod"
+	"golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod"
+	"golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod"
+	"golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod"
+	"golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod"
+	"golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod"
+	"golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod"
+	"golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod"
+	"golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod"
+	"golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod"
+	"golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod"
+	"golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod"
+	"golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod"
+	"golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod"
+	"golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod"
+	"golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod"
+	"golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod"
+	"golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod"
+	"golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod"
+	"golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod"
+	"golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod"
+	"golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod"
+	"golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod"
+	"golang.org/x/mod v0.1.0/go.mod"
+	"golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod"
+	"golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod"
+	"golang.org/x/mod v0.2.0/go.mod"
+	"golang.org/x/mod v0.3.0/go.mod"
+	"golang.org/x/mod v0.4.0/go.mod"
+	"golang.org/x/mod v0.4.1/go.mod"
+	"golang.org/x/mod v0.4.2/go.mod"
+	"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
+	"golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod"
+	"golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod"
+	"golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod"
+	"golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod"
+	"golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod"
+	"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
+	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
+	"golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod"
+	"golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod"
+	"golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod"
+	"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
+	"golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod"
+	"golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod"
+	"golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod"
+	"golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod"
+	"golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod"
+	"golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod"
+	"golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod"
+	"golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod"
+	"golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod"
+	"golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod"
+	"golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod"
+	"golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod"
+	"golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod"
+	"golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod"
+	"golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod"
+	"golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod"
+	"golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod"
+	"golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod"
+	"golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod"
+	"golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod"
+	"golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod"
+	"golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod"
+	"golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod"
+	"golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602/go.mod"
+	"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod"
+	"golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod"
+	"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
+	"golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod"
+	"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
+	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod"
+	"golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod"
+	"golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod"
+	"golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod"
+	"golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod"
+	"golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod"
+	"golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod"
+	"golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod"
+	"golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod"
+	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
+	"golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod"
+	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
+	"golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod"
+	"golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod"
+	"golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod"
+	"golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod"
+	"golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod"
+	"golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod"
+	"golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod"
+	"golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod"
+	"golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod"
+	"golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod"
+	"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
+	"golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod"
+	"golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod"
+	"golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod"
+	"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod"
+	"golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod"
+	"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod"
+	"golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod"
+	"golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod"
+	"golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod"
+	"golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod"
+	"golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod"
+	"golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod"
+	"golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod"
+	"golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod"
+	"golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod"
+	"golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod"
+	"golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod"
+	"golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod"
+	"golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod"
+	"golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod"
+	"golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod"
+	"golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod"
+	"golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod"
+	"golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod"
+	"golang.org/x/sys v0.0.0-20210510120138-977fb7262007"
+	"golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod"
+	"golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod"
+	"golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod"
+	"golang.org/x/text v0.3.0/go.mod"
+	"golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod"
+	"golang.org/x/text v0.3.2/go.mod"
+	"golang.org/x/text v0.3.3/go.mod"
+	"golang.org/x/text v0.3.4/go.mod"
+	"golang.org/x/text v0.3.5"
+	"golang.org/x/text v0.3.5/go.mod"
+	"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod"
+	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
+	"golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod"
+	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
+	"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
+	"golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod"
+	"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
+	"golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod"
+	"golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod"
+	"golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod"
+	"golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod"
+	"golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod"
+	"golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod"
+	"golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod"
+	"golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod"
+	"golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod"
+	"golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod"
+	"golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod"
+	"golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod"
+	"golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod"
+	"golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod"
+	"golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod"
+	"golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod"
+	"golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod"
+	"golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod"
+	"golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod"
+	"golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod"
+	"golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod"
+	"golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod"
+	"golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod"
+	"golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod"
+	"golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod"
+	"golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod"
+	"golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod"
+	"golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod"
+	"golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod"
+	"golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod"
+	"golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod"
+	"golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod"
+	"golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod"
+	"golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod"
+	"golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod"
+	"golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod"
+	"golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod"
+	"golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod"
+	"golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod"
+	"golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod"
+	"golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod"
+	"golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod"
+	"golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod"
+	"golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod"
+	"golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod"
+	"golang.org/x/tools v0.1.0/go.mod"
+	"golang.org/x/tools v0.1.2"
+	"golang.org/x/tools v0.1.2/go.mod"
+	"golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod"
+	"golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod"
+	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
+	"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod"
+	"google.golang.org/api v0.4.0/go.mod"
+	"google.golang.org/api v0.7.0/go.mod"
+	"google.golang.org/api v0.8.0/go.mod"
+	"google.golang.org/api v0.9.0/go.mod"
+	"google.golang.org/api v0.13.0/go.mod"
+	"google.golang.org/api v0.14.0/go.mod"
+	"google.golang.org/api v0.15.0/go.mod"
+	"google.golang.org/api v0.17.0/go.mod"
+	"google.golang.org/api v0.18.0/go.mod"
+	"google.golang.org/api v0.19.0/go.mod"
+	"google.golang.org/api v0.20.0/go.mod"
+	"google.golang.org/api v0.22.0/go.mod"
+	"google.golang.org/api v0.24.0/go.mod"
+	"google.golang.org/api v0.28.0/go.mod"
+	"google.golang.org/api v0.29.0/go.mod"
+	"google.golang.org/api v0.30.0/go.mod"
+	"google.golang.org/api v0.35.0/go.mod"
+	"google.golang.org/api v0.36.0/go.mod"
+	"google.golang.org/api v0.40.0/go.mod"
+	"google.golang.org/api v0.41.0/go.mod"
+	"google.golang.org/api v0.43.0/go.mod"
+	"google.golang.org/api v0.44.0/go.mod"
+	"google.golang.org/appengine v1.1.0/go.mod"
+	"google.golang.org/appengine v1.4.0/go.mod"
+	"google.golang.org/appengine v1.5.0/go.mod"
+	"google.golang.org/appengine v1.6.1/go.mod"
+	"google.golang.org/appengine v1.6.5/go.mod"
+	"google.golang.org/appengine v1.6.6/go.mod"
+	"google.golang.org/appengine v1.6.7/go.mod"
+	"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
+	"google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod"
+	"google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod"
+	"google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod"
+	"google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod"
+	"google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod"
+	"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod"
+	"google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod"
+	"google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod"
+	"google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod"
+	"google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod"
+	"google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod"
+	"google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod"
+	"google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod"
+	"google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod"
+	"google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod"
+	"google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod"
+	"google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod"
+	"google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod"
+	"google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod"
+	"google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod"
+	"google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod"
+	"google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod"
+	"google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod"
+	"google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod"
+	"google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod"
+	"google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod"
+	"google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod"
+	"google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod"
+	"google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod"
+	"google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod"
+	"google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod"
+	"google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod"
+	"google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod"
+	"google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod"
+	"google.golang.org/genproto v0.0.0-20210222152913-aa3ee6e6a81c/go.mod"
+	"google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod"
+	"google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod"
+	"google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod"
+	"google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod"
+	"google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod"
+	"google.golang.org/grpc v1.19.0/go.mod"
+	"google.golang.org/grpc v1.20.1/go.mod"
+	"google.golang.org/grpc v1.21.1/go.mod"
+	"google.golang.org/grpc v1.23.0/go.mod"
+	"google.golang.org/grpc v1.25.1/go.mod"
+	"google.golang.org/grpc v1.26.0/go.mod"
+	"google.golang.org/grpc v1.27.0/go.mod"
+	"google.golang.org/grpc v1.27.1/go.mod"
+	"google.golang.org/grpc v1.28.0/go.mod"
+	"google.golang.org/grpc v1.29.1/go.mod"
+	"google.golang.org/grpc v1.30.0/go.mod"
+	"google.golang.org/grpc v1.31.0/go.mod"
+	"google.golang.org/grpc v1.31.1/go.mod"
+	"google.golang.org/grpc v1.33.1/go.mod"
+	"google.golang.org/grpc v1.33.2/go.mod"
+	"google.golang.org/grpc v1.34.0/go.mod"
+	"google.golang.org/grpc v1.35.0/go.mod"
+	"google.golang.org/grpc v1.36.0/go.mod"
+	"google.golang.org/grpc v1.36.1/go.mod"
+	"google.golang.org/grpc v1.38.0/go.mod"
+	"google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod"
+	"google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod"
+	"google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod"
+	"google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod"
+	"google.golang.org/protobuf v1.21.0/go.mod"
+	"google.golang.org/protobuf v1.22.0/go.mod"
+	"google.golang.org/protobuf v1.23.0/go.mod"
+	"google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod"
+	"google.golang.org/protobuf v1.24.0/go.mod"
+	"google.golang.org/protobuf v1.25.0/go.mod"
+	"google.golang.org/protobuf v1.26.0-rc.1/go.mod"
+	"google.golang.org/protobuf v1.26.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/errgo.v2 v2.1.0/go.mod"
+	"gopkg.in/ini.v1 v1.62.0"
+	"gopkg.in/ini.v1 v1.62.0/go.mod"
+	"gopkg.in/yaml.v2 v2.2.2/go.mod"
+	"gopkg.in/yaml.v2 v2.2.3/go.mod"
+	"gopkg.in/yaml.v2 v2.2.8/go.mod"
+	"gopkg.in/yaml.v2 v2.4.0"
+	"gopkg.in/yaml.v2 v2.4.0/go.mod"
+	"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod"
+	"gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b"
+	"gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod"
+	"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
+	"honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod"
+	"honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod"
+	"honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod"
+	"honnef.co/go/tools v0.0.1-2019.2.3/go.mod"
+	"honnef.co/go/tools v0.0.1-2020.1.3/go.mod"
+	"honnef.co/go/tools v0.0.1-2020.1.4/go.mod"
+	"rsc.io/binaryregexp v0.2.0/go.mod"
+	"rsc.io/quote/v3 v3.1.0/go.mod"
+	"rsc.io/sampler v1.3.0/go.mod"
+	)
+go-module_set_globals
+SRC_URI="https://github.com/get-woke/woke/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+src_compile() {
+	go build .
+}
+
+src_install() {
+	dobin woke
+	dodoc README.md example.yaml
+}
diff --git a/dev-util/xxdiff/Manifest b/dev-util/xxdiff/Manifest
index d11eb43519bf..d268281214bc 100644
--- a/dev-util/xxdiff/Manifest
+++ b/dev-util/xxdiff/Manifest
@@ -1,5 +1,5 @@
 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 1092 BLAKE2B f32dccc300df7796a66093cf7dd5f36884bd97639779c78b48df702dc5701bc96ce8336e8dbd46f2c61e4f903336ee3c84c86991f2c07919bb851d50461f5b9f SHA512 5401e2786759e852bcfa6ae7cbbbee3b01fbb934279999f5ad7d6fc468325403a5c340489d4030207aa4349af960d3baa2a7de673ec4e74b4d4595c3d1e9be09
+EBUILD xxdiff-4.0.1_p20170622-r1.ebuild 1089 BLAKE2B eeb075d68e74f9a93687918c721b3a654e032be74d26e55e89c6d712b94bd250fcabdef55f02ce3e45ab26e91e255104b1069a996761e05103837dac01cea7ba SHA512 279cd9be221214447a829ae024f87b031ee454a68990c551368c77bad1892c60216638c7f1ad4e1d3297ad69b7103b30fe08c5c5ad969524e77ac9cc66a7d893
 MISC metadata.xml 324 BLAKE2B 0a0246b1a280d7901bcfcc117a375b863754fbe3a0601d96997bbeafaa8292c08a6e4b704157c6a5844e5c00497ebec421684676176d3d7a2928b47cd961db14 SHA512 308093da0e00c92364156a867ec18880f0e802330211433029a5d0ad2c1cd82ae9881a924ee1a0320c25df4cea3e1c1d951babea0e15f5c3f8d2855167038f03
diff --git a/dev-util/xxdiff/xxdiff-4.0.1_p20170622-r1.ebuild b/dev-util/xxdiff/xxdiff-4.0.1_p20170622-r1.ebuild
index 963f344ebfad..9d0e1dfeac10 100644
--- a/dev-util/xxdiff/xxdiff-4.0.1_p20170622-r1.ebuild
+++ b/dev-util/xxdiff/xxdiff-4.0.1_p20170622-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ 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"
+SRC_URI="https://dev.gentoo.org/~sam/distfiles/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
author	V3n3RiX <venerix@redcorelinux.org>	2021-10-01 20:54:53 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-10-01 20:54:53 +0100
commit	391b5b359a346aff490103da7dddc85047f83830 (patch)
tree	29eea460a0bd7e1ff21d43b9d6df9af4d8a175e1 /dev-util
parent	c719fdcee603a5a706a45d10cb598762d56a727d (diff)