gentoo resync : 31.05.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-05-31 20:59:14 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-05-31 20:59:14 +0100
commit: e748ba9741f6540f4675c23e3e37b73e822c13a4 (patch)
tree: 23dece8beabb3a3d7c6c0273b0eb40b21c62a889 /dev-util
parent: 908778078736bd36f7a60a2d576d415cb8e000fa (diff)
139 files changed, 2273 insertions, 1393 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index e36578e745da..5356903f8917 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/android-sdk-update-manager/Manifest b/dev-util/android-sdk-update-manager/Manifest
index bc6284a28185..772fc041337a 100644
--- a/dev-util/android-sdk-update-manager/Manifest
+++ b/dev-util/android-sdk-update-manager/Manifest
@@ -1,5 +1,6 @@
 AUX 80-android.rules 284 BLAKE2B a45cd541f9812a9657312ae7c83ee36f9d6c3c53d2caa036d1649455389bd7244efa277d41c3e6eec4a0b10d9a97d5e81acd0d17aac8df3bfa3ec72bad5e8d87 SHA512 f78834e2b33afa88f59a636f9fb7804d341847568a638a68beba9ca842e78e40a52a9ad8396ae79d105d87e52f585d523e8f0d847fc7708ddc3351c031571f19
 AUX android-sdk-update-manager.desktop 346 BLAKE2B 6ff5cd618d7816ad5719ed864cc91a83042ac320c2aa1965e5ab95e7f7b6f05f56a8f5401a4ffe17fc5798a82ad02f07f87bf4e3409b0d1866b45b230b34cca4 SHA512 9f97d7d3bf0aa76686be3722b3f686c012c4d627d583275eaaaf91d43f1b355a9d4b7f42412435489b758a3161fd9fcf8c36f5d1777662af3fbcd11bdc0d7aca
 DIST android-sdk_r24.4.1-linux.tgz 326412652 BLAKE2B 4263a5e942f0ee35069f4fc075504c637381820f40485c9753f5f586f713e614c204b3e5c35968acbc665644aaab4c2e05660e00675d956422cd7d1fc6445ed2 SHA512 96fb71d78a8c2833afeba6df617edcd6cc4e37ecd0c3bec38c39e78204ed3c2bd54b138a56086bf5ccd95e372e3c36e72c1550c13df8232ec19537da93049284
-EBUILD android-sdk-update-manager-24.4.1-r1.ebuild 2957 BLAKE2B ab3561b6222fe3284f7b06ee7404fb6b4b02e4edb61735e64049bf20eb97a38e84369a02fc626fd6601b06400a60896f30846a4690290ed5151f1396d49b007b SHA512 884a16d8b25cd48b1cfbbe15e2ff3c89f16b3115fb1b91c9735e6fa8e69ed4ae4b66f30f59e0cbec85d108ce3b6d40c5638ca3f284c2b73716c112d53697e286
+EBUILD android-sdk-update-manager-24.4.1-r1.ebuild 2952 BLAKE2B f7c6a7460c704de2703a00db142c0cedaa3ad5a0e44945df4b0966de2d4ae397b9fb17df2832c8bf1e6371b3d70e26a29ec16dba66a8744d216acbf1835566e3 SHA512 9b1253c378caa60d327f5a3d8006c185cd3c7d4047f17e163e9404e01ffc759adcad535f84156f5c204ea8852c66ea47ff98960f4e614b61acd2b343838edb57
+EBUILD android-sdk-update-manager-24.4.1-r2.ebuild 2949 BLAKE2B 42d8d300ad9ae51d3c38fc57ab8f7b1c4186f5bacee14ccef273d8f78f9b5989d59d911b4473b2d2c6fdfca5e88a6a2f38549a837bdbccf4f926b4069028c678 SHA512 851d35364f911c7c568bbd7e378c805981cd31ff847b21a2d7b915f8349a7090543165772fb59bdcd7fa038a267d68eea63c0a7099ae5344ad0c1f287b9279b1
 MISC metadata.xml 174 BLAKE2B 1738b3b33ef242919964fb6a498f2215dbd528720bd193469bb20020fbedda0e9102ef85539fa9d2c3924bf2e6c0dd560671134200481054111467ba8e88fcb1 SHA512 281aa8b74dd6915f9856e5e70db000388f8b04bd5393871e67b57cec316374c6986124202dfdf4855ba57dd60f1e2cfc323a1f2cc4c6fbe0f634f67f8fb40b17
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-24.4.1-r1.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-24.4.1-r1.ebuild
index e88fec54203a..2a9d244bfb9a 100644
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-24.4.1-r1.ebuild
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-24.4.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit desktop user udev
+inherit desktop udev
 
 ANDROID_SDK_DIR="/opt/android-sdk-update-manager"
 MY_P="android-sdk_r${PV}-linux"
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-24.4.1-r2.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-24.4.1-r2.ebuild
new file mode 100644
index 000000000000..5451f113cfc7
--- /dev/null
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-24.4.1-r2.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop udev
+
+ANDROID_SDK_DIR="/opt/android-sdk-update-manager"
+MY_P="android-sdk_r${PV}-linux"
+
+DESCRIPTION="Open Handset Alliance's Android SDK"
+HOMEPAGE="https://developer.android.com"
+SRC_URI="https://dl.google.com/android/${MY_P}.tgz"
+
+LICENSE="android"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="mirror"
+
+DEPEND="acct-group/android"
+RDEPEND="
+	${DEPEND}
+	dev-java/ant-core
+	dev-java/swt:4.10[cairo]
+	>=virtual/jdk-1.8
+	sys-libs/ncurses-compat:5[abi_x86_32(-)]
+	sys-libs/zlib[abi_x86_32(-)]
+"
+
+S="${WORKDIR}/android-sdk-linux"
+
+QA_PREBUILT="*"
+
+src_prepare() {
+	default
+	rm -rf tools/lib/x86* || die
+}
+
+src_install() {
+	dodoc tools/NOTICE.txt "SDK Readme.txt"
+	rm -f tools/NOTICE.txt "SDK Readme.txt" || die
+
+	dodir "${ANDROID_SDK_DIR}/tools"
+	cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die
+
+	# Maybe this is needed for the tools directory too.
+	dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp}
+
+	fowners -R root:android "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
+	fperms -R 0775 "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
+
+	echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
+
+	SWT_PATH=
+	SWT_VERSIONS="3.7 3.6"
+	for version in $SWT_VERSIONS; do
+		# redirecting stderr to /dev/null
+		# not sure if this is best, but avoids misleading error messages
+		SWT_PATH="`dirname \`java-config -p swt-\$version 2>/dev/null\` 2>/dev/null`"
+		if [ $SWT_PATH ]; then
+			einfo "SWT_PATH=$SWT_PATH selecting version $version of SWT."
+			break
+		fi
+	done
+
+	echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
+	echo "ANDROID_HOME=\"${EPREFIX}${ANDROID_SDK_DIR}\"" >> "${T}/80${PN}" || die
+
+	doenvd "${T}/80${PN}"
+
+	echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > "${T}/80${PN}" || die
+
+	insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
+
+	udev_dorules "${FILESDIR}"/80-android.rules || die
+	domenu "${FILESDIR}"/android-sdk-update-manager.desktop
+}
+
+pkg_postinst() {
+	elog "The Android SDK now uses its own manager for the development      environment."
+	elog "Run 'android' to download the full SDK, including some of the platform tools."
+	elog "You must be in the android group to manage the development environment."
+	elog "Just run 'gpasswd -a <USER> android', then have <USER> re-login."
+	elog "See https://developer.android.com/sdk/adding-components.html for more"
+	elog "information."
+	elog "If you have problems downloading the SDK, see https://code.google.com/p/android/issues/detail?id=4406"
+	elog "You need to run env-update and source /etc/profile in any open shells"
+	elog "if you get an SWT error."
+}
diff --git a/dev-util/apitrace/Manifest b/dev-util/apitrace/Manifest
index 33b99785f1ff..c9cccb3579e8 100644
--- a/dev-util/apitrace/Manifest
+++ b/dev-util/apitrace/Manifest
@@ -1,5 +1,5 @@
 AUX apitrace-9.0-brotli-unbundle.patch 4728 BLAKE2B 66ff205968db551cdd8ebc7ba33dfcd39fd36356691722f593f7ce0fa615279c0e440077b3e29c5a643bf5be8a2406a656bfa91fb9f128c2afa922b3ad832a35 SHA512 0690f8d178fd7a5ca11b26d1e23c9c26e984214cef2e3619a22fc6cf58a7ee96fe0b046dd038c202cd6f60b9175dbdd346813c53ca85932f9a4d9dd40e9bdba1
 AUX apitrace-9.0-disable-multiarch.patch 1796 BLAKE2B c687c87b23f3711bd9ac70a345e7e2fbe7dab36f48cbf5a949d7fbeab41ac670054bcee203bf4db8df24cdabc418b7a04980fd1436962a15a8c6371e7d8d0f05 SHA512 5bb89dc98e5bbd92b707988d301ec50ea57f1562bd9a54fc2dada9b5ddafde5da66dd02d03efc377cbcf2bdc7d430f0b1353ed7a7f2d8703aabfeb9b563c1278
 DIST apitrace-9.0.tar.gz 3623693 BLAKE2B 885cfd22d1cc82e36f7f0d65b816784986a8a693d04b483c059d3cffb0328c2cbbfd043793b964cea84d7b09a0dc8dda5f464099e91df26fd5eecef4bbeb28cc SHA512 4234bc2d14378b1bd9554752d83f8ce0703b4e08c3edc85769dc988a2b3a44b8e55d2f5856954658155a11d69802849bae6350ed5031a5916c7ac7bc7287918c
-EBUILD apitrace-9.0-r2.ebuild 2252 BLAKE2B b75a3b565945459720a8174c12f7d81295d93084fe47cf21f6abb06e40b248fd53d1537dae92f3ecf4f182e3e2b55d4aab16b05fffac0c32cda77cc7ec92dc57 SHA512 70860f3ecd36abe0ad1d134633ba77e17a1599ccc637f5b8db86db488e789300139b0e6c1ac5738b946a311db6db6c2346a32650ddbde0860ab42962d043b20d
+EBUILD apitrace-9.0-r2.ebuild 2289 BLAKE2B f1c41017e0c6e91e4b7bcb0bd217d7abd5616af708d6f32e7df9e990ff5b1a60d5b1de48e3ef25d5a673d6fcdff06d361147e63a2cb3b270a2c441b6735ac447 SHA512 7f0741ce13f2ac04d1ebbf68a19af8756cf51e83eaa43653b0c0a9f6acff906d5fa4f31cc86b8fd31c820503b18afc7bc68a8a225707773eb198abe6164cf1b4
 MISC metadata.xml 249 BLAKE2B eb5bf02945b5d031a07adba28359ab63035d1ce8601c8dc1d9c6aea54de6a55899672c4606b472a308e61a4b8a45d2f752d4472d7b45bb368fccec9c4c3fc739 SHA512 7230e2d97a0540aed68eb2d1f8383c4e5df9b0c09a628db997fea6224615f76744537e5476a7c1984934d27b9ee05d53b0294d00234b2d16cbc722f822a27f21
diff --git a/dev-util/apitrace/apitrace-9.0-r2.ebuild b/dev-util/apitrace/apitrace-9.0-r2.ebuild
index 4834bd7b743b..cc8535b0a0a3 100644
--- a/dev-util/apitrace/apitrace-9.0-r2.ebuild
+++ b/dev-util/apitrace/apitrace-9.0-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 CMAKE_ECLASS=cmake
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..10} )
 inherit cmake-multilib python-single-r1
 
 DESCRIPTION="Tool for tracing, analyzing, and debugging graphics APIs"
@@ -61,6 +61,7 @@ src_configure() {
 			-DENABLE_GUI=$(multilib_native_usex qt5)
 			-DENABLE_STATIC_SNAPPY=OFF
 			-DENABLE_WAFFLE=ON
+			-DPYTHON_EXECUTABLE="${PYTHON}"
 		)
 		cmake_src_configure
 	}
diff --git a/dev-util/bitcoin-tx/Manifest b/dev-util/bitcoin-tx/Manifest
index 6788168f3074..222965710ba5 100644
--- a/dev-util/bitcoin-tx/Manifest
+++ b/dev-util/bitcoin-tx/Manifest
@@ -3,5 +3,5 @@ DIST bitcoin-0.21.0.knots20210130.patches.tar.xz 505040 BLAKE2B c8999de4158b8781
 DIST bitcoin-v0.20.1.tar.gz 6986090 BLAKE2B ef0e6c424bcb7ffe9a2461e60499cebdfcd13faa794d534b4c508a61fa218dd58e64c9088584ea658736deeadc0306fbdf08daa3c395dac3d8f096a08ba42262 SHA512 73a103d4192eb12abed5aa84e9c7999d57e4da37f32e54107ab9f4297a29af64c0c56930674559073bed360f794d87ba5eb9e1ce4d1bd03402d56937490fa16e
 DIST bitcoin-v0.21.0.tar.gz 7533957 BLAKE2B 01247cbb9fca2381a8c08ab1c88c479c640963caef22e4207aab46b05813dbf2a5286ac9e98132fb34db0e9ac6c18c79e45a89de166f5c6d480d8ac6e14ecca2 SHA512 c58187996932b0151432a65885b7e8a7b216fb1ab0576fb7d4b5e9620d957594b05e181153e2e0e50bcd5ce764861ec11019ffbb1095d3e704f441e61ac6a04f
 EBUILD bitcoin-tx-0.20.1.ebuild 2436 BLAKE2B f8bfc55eadddefe07189dde452ffb72139a7ce54d8fc859bd781dbba02118453c85abe5f47c5d517cbf266b046ec88e2baaf390eedff237612c0859e60aa9502 SHA512 5f2c1b325870bb62756b42541064ee4004cd514ef56505b1fae5d8bd2ed50201e9c774473443349227cfafa53254a131961877e48b7d6351c44adb7b660d2700
-EBUILD bitcoin-tx-0.21.0.ebuild 2446 BLAKE2B c04f503e39e10d324786aeecd92a6d1a45475a54dd0b5b43bf0b9d72d754676904e0add0836cfafc0306262ff4315ab9012bcbc371091a1635019069f17c7e23 SHA512 f82ae432c1f1ec94e166cf2618e6c1da82f2aff3f1ccc82ab5b2553769e4fa6759a517733a4b7bf07401f0b19966ca7e3e4462833aa8a97663da69a3edc22914
+EBUILD bitcoin-tx-0.21.0.ebuild 2444 BLAKE2B 46b9ad6010bbd0a830661b8e97042c054aba009e38a339009256189b598ad1a4273811ec718656a27bc6b7b0edc08878a9030713f1d545f03b1fc326b75419e8 SHA512 cd9e34f5a9075ad4fda89fc63e662030719dbc685c48122fdb073dfedf8f6c96c7bcb5b70c1fa069db56138336e6d22892afa99bea89b004919f5dc3e91575d4
 MISC metadata.xml 650 BLAKE2B fbe3b54c16dd1c935666dc6adb0994d84d7cc49a3c1da88bad93dd9c953586c43f4eb7a3d3e3ef6832e6785c0c7a503e976f43ee334af0821f2e079ea570bf83 SHA512 20f249e2987a45a939bbbb0bebc26c15423c35737368fb9ef5f9f939e2a8ad6daa24c5f11edc922e90a38735b7bbfbad3f69fcc8b407e2b0f2a8f35d3ab83b1a
diff --git a/dev-util/bitcoin-tx/bitcoin-tx-0.21.0.ebuild b/dev-util/bitcoin-tx/bitcoin-tx-0.21.0.ebuild
index 626c25324b4f..c3c4cbd9bd52 100644
--- a/dev-util/bitcoin-tx/bitcoin-tx-0.21.0.ebuild
+++ b/dev-util/bitcoin-tx/bitcoin-tx-0.21.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="knots"
 
 DEPEND="
diff --git a/dev-util/bless/Manifest b/dev-util/bless/Manifest
deleted file mode 100644
index 8452bf382c72..000000000000
--- a/dev-util/bless/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX bless-0.6.2-range-disambiguation.patch 6964 BLAKE2B 65708f4fdae5b9b2d9afcd2fb326bdc414decf265557071314b1f539fe6742364b58acd69dce32d50db0173f00d13aa6e4808baae6e16217d62ccec9a45f1189 SHA512 03a0507db3ef4384344c6ee9f04c59879a48315adf219ba32afb10c9dee7d33a8a5543e4751e5b09bd61fd9955d22e35ff841b6f3ad68f9c827be7f803806751
-DIST bless-0.6.2.tar.gz 514695 BLAKE2B 2c9681e03992d42b20d0073e9107e5bd83d6f1699235b49fb6cf14fb5f9bc87e682e96b4f8bab2b45a3211515a8990e72b80922a62198c7ad603aeb5f3d3c406 SHA512 3fef715ed138323af50437ef8cda3d9f53987498042f1b4df2d9ce23f00dade68147cbdf28b85aed8b9c594fb5c43839c9dedbc14a994ad609fd4cedd89bfcf5
-DIST bless-0.6.3.tar.gz 532687 BLAKE2B ce710ba1883fff9f0f77ca08c02573a3de756e9a2b6cdfad9dffd8d00c1d89648fc68218dd322f9e1ab6e0b42d205148c4a1d99546ba42b58689fe58511b7ed8 SHA512 22841b6f1b923ebfc7952ad9233cffb30df4ecb22a655f6461ff3cc97066a8c68ffc6bbd88e4fd83c345226928ed08c557f2f322942766da61bcd2b2c7f7d3cb
-EBUILD bless-0.6.2-r1.ebuild 1154 BLAKE2B 7eaa666aac4660ac2ca6fb5d36557bd7a5fea0abff6256d06086e65e2e013b847d37138ae45677a6d014d590572699ea466fd70d091257e4388026a828d9aba4 SHA512 70510946131504f9fb49d8809310d91e6353f9326f084ff0a537fcd366e237d9aa0a74ed171b4db0d0a29039c371f04a9879bd6e01dcc5b0002e2c1fa03932e0
-EBUILD bless-0.6.3.ebuild 856 BLAKE2B d110c545dfed604a8fe7c6a79e3ad591c12db08c55ca3da3bcddd162ea84a601be5908ade0a4e14891c32f52ab048f5d25ae7e6029ecd9bc495e23e519d32744 SHA512 3f0e2551047324ad143347add4a7f467b111bad1fd08d582b81189e9d911c7fb1e81a38928022d3ef74ee062b25e3415089853e622fb573e16329f40e10416e9
-MISC metadata.xml 242 BLAKE2B 896ec48a498764d193d9e3c54bfc07d07a6f95675e772ff73730bbdfb8cce43d2d1d99fbd0ee96a6c0ad3eab13e6a82bff55ce3a1e5a6883204fe8c5d5932f0f SHA512 c305f98db61dfe31ddc48084c932b6c45eee7a8cd664ebeade704135fb1da0978ace942a2a4d92d418ad4bdd22acd0685864cf0f4297660fc325cd3842e283e9
diff --git a/dev-util/bless/bless-0.6.2-r1.ebuild b/dev-util/bless/bless-0.6.2-r1.ebuild
deleted file mode 100644
index 92feecfe9620..000000000000
--- a/dev-util/bless/bless-0.6.2-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools gnome2 mono-env
-
-DESCRIPTION="GTK# Hex Editor"
-HOMEPAGE="https://github.com/afrantzis/Bless/"
-SRC_URI="https://github.com/afrantzis/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-# EGIT_REPO_URI="https://github.com/afrantzis/bless/"
-# EGIT_COMMIT="v${PV}"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-RDEPEND="
-	>=dev-lang/mono-1.1.14
-	>=dev-dotnet/gtk-sharp-2.12.21:2
-"
-DEPEND="${RDEPEND}
-	app-text/rarian
-	>=sys-devel/gettext-0.15
-	virtual/pkgconfig
-"
-
-# See bug 278162
-# Waiting on nunit ebuild entering the tree
-RESTRICT="test"
-PATCHES=("${FILESDIR}/bless-0.6.2-range-disambiguation.patch")
-
-pkg_setup() {
-	mono-env_pkg_setup
-}
-
-src_prepare() {
-	eautoreconf
-	# The autoreconf expects INSTALL to have been copied over by autoconf
-	touch "${S}/INSTALL"
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--enable-unix-specific \
-		$(use_enable debug)
-}
-
-src_install() {
-	default
-
-	mv "${D}/usr/share/doc/${PN}" "${D}/usr/share/doc/${P}" || die "Unable to make documentation version-specific."
-}
diff --git a/dev-util/bless/bless-0.6.3.ebuild b/dev-util/bless/bless-0.6.3.ebuild
deleted file mode 100644
index 1d4264121f8b..000000000000
--- a/dev-util/bless/bless-0.6.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit meson gnome2
-
-DESCRIPTION="GTK# Hex Editor"
-HOMEPAGE="https://github.com/afrantzis/Bless/"
-SRC_URI="https://github.com/afrantzis/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-# EGIT_REPO_URI="https://github.com/afrantzis/bless/"
-# EGIT_COMMIT="v${PV}"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug test"
-
-RDEPEND="
-	>=dev-util/meson-0.46
-	>=dev-lang/mono-1.1.14
-	>=dev-dotnet/gtk-sharp-2.12.21:2
-"
-DEPEND="${RDEPEND}
-	app-text/rarian
-	>=sys-devel/gettext-0.15
-	virtual/pkgconfig
-"
-
-# See bug 278162
-# Waiting on nunit ebuild entering the tree
-RESTRICT="test"
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use test tests)
-	)
-
-	meson_src_configure
-}
-
-src_compile() {
-	meson_src_compile
-}
-
-src_install() {
-	meson_src_install
-}
diff --git a/dev-util/bless/files/bless-0.6.2-range-disambiguation.patch b/dev-util/bless/files/bless-0.6.2-range-disambiguation.patch
deleted file mode 100644
index 788a57866cba..000000000000
--- a/dev-util/bless/files/bless-0.6.2-range-disambiguation.patch
+++ /dev/null
@@ -1,202 +0,0 @@
-From 84801988f908e51d9843c3e0ee8f2cd05c0a2d97 Mon Sep 17 00:00:00 2001
-From: davidcim <david@cimaware.com>
-Date: Thu, 3 Oct 2019 12:38:25 +0200
-Subject: [PATCH] Fix building error CS0104: 'Range' is an ambiguous reference
-
----
- src/buffers/ByteBuffer.cs        |  2 +-
- src/gui/DataBookFinder.cs        |  4 ++--
- src/gui/areas/AreaGroup.cs       | 20 ++++++++++----------
- src/tools/find/FindOperations.cs |  6 +++---
- src/tools/find/IFindStrategy.cs  | 10 +++++-----
- src/tools/find/IFinder.cs        |  4 ++--
- 6 files changed, 23 insertions(+), 23 deletions(-)
-
-diff --git a/src/buffers/ByteBuffer.cs b/src/buffers/ByteBuffer.cs
-index b9d9a24..72c1b42 100644
---- a/src/buffers/ByteBuffer.cs
-+++ b/src/buffers/ByteBuffer.cs
-@@ -671,7 +671,7 @@ public byte[] RangeToByteArray(IRange range)
- 	/// Returns as a SegmentCollection the data contained in 
- 	/// the specified range in the buffer.  
- 	///</summary>
--	public SegmentCollection RangeToSegmentCollection(Range range)
-+	public SegmentCollection RangeToSegmentCollection(Util.Range range)
- 	{
- 		if (range.Size == 0)
- 			return null;
-diff --git a/src/gui/DataBookFinder.cs b/src/gui/DataBookFinder.cs
-index 50b5034..3248d3a 100644
---- a/src/gui/DataBookFinder.cs
-+++ b/src/gui/DataBookFinder.cs
-@@ -234,7 +234,7 @@ void FindAsyncCallback(IAsyncResult ar)
- 	{
- 		GenericFindOperation state = (GenericFindOperation)ar.AsyncState;
- 		ThreadedAsyncOperation.OperationResult result = state.Result;
--		Range match = state.Match;
-+		Util.Range match = state.Match;
- 
- 		DataView dv = null;
- 
-@@ -381,7 +381,7 @@ void ReplaceAllAsyncCallback(IAsyncResult ar)
- 	{
- 		ReplaceAllOperation state = (ReplaceAllOperation)ar.AsyncState;
- 		ThreadedAsyncOperation.OperationResult result = state.Result;
--		Range firstMatch = state.FirstMatch;
-+		Util.Range firstMatch = state.FirstMatch;
- 
- 		DataView dv = null;
- 
-diff --git a/src/gui/areas/AreaGroup.cs b/src/gui/areas/AreaGroup.cs
-index 58ee147..4a27190 100644
---- a/src/gui/areas/AreaGroup.cs
-+++ b/src/gui/areas/AreaGroup.cs
-@@ -198,7 +198,7 @@ enum Changes { Offset = 1, Cursor = 2, Highlights = 4}
- 		set { drawingArea = value; }
- 	}
- 	
--	public Range Selection {
-+	public Util.Range Selection {
- 		get { return selection; }
- 		set { 
- 			if (selection == value)
-@@ -251,7 +251,7 @@ public AreaGroup()
- 	/// Get the range of bytes and the number of rows that 
- 	/// are displayed in the current view.
- 	/// </summary>
--	public Range GetViewRange(out int nrows)
-+	public Util.Range GetViewRange(out int nrows)
- 	{
- 		// find out number of rows, bytes in current view
- 		
-@@ -271,9 +271,9 @@ public Range GetViewRange(out int nrows)
- 		
- 		// make sure we get an empty clipping Range when bleft==0
- 		if (bleft > 0)
--			return new Range(offset, offset + bleft - 1);
-+			return new Util.Range(offset, offset + bleft - 1);
- 		else
--			return new Range();
-+			return new Util.Range();
- 	}
- 	
- 	/// <summary>
-@@ -381,7 +381,7 @@ private void ClearHighlights()
- 	private void SetupBufferCache()
- 	{
- 		int nrows;
--		Range view = GetViewRange(out nrows);
-+		Util.Range view = GetViewRange(out nrows);
- 		if (view.Size != bufferCache.Length)
- 			bufferCache = new byte[view.Size];
- 		
-@@ -444,7 +444,7 @@ private void RenderExtra()
- 		}
- 	}
- 	/// <summary>
--	/// Renders a <see cref="Range"/> of data using a specified <see cref="Drawer.HighlightType"/>
-+	/// Renders a <see cref="Util.Range"/> of data using a specified <see cref="Drawer.HighlightType"/>
- 	/// </summary>
- 	private void RenderHighlight(AtomicHighlight h)
- 	{
-@@ -474,12 +474,12 @@ private AtomicHighlight[] SplitAtomicPrioritized(AtomicHighlight q, Highlight r)
- 		
- 		if (q.Type > r.Type) {
- 			ha = new AtomicHighlight[3]{new AtomicHighlight(r), new AtomicHighlight(q), new AtomicHighlight(r)};
--			Range.SplitAtomic(ha, r, q);
-+			Util.Range.SplitAtomic(ha, r, q);
- 			ha[1].AddContainer(r);
- 		}
- 		else {
- 			ha = new AtomicHighlight[3]{new AtomicHighlight(q), new AtomicHighlight(r), new AtomicHighlight(q)};
--			Range.SplitAtomic(ha, q, r);
-+			Util.Range.SplitAtomic(ha, q, r);
- 			foreach (Highlight h in q.Containers)
- 				ha[1].AddContainer(h);
- 		}
-@@ -533,7 +533,7 @@ private IntervalTree<AtomicHighlight> BreakDownHighlights(Highlight s, IList<Hig
- 	private IntervalTree<AtomicHighlight> GetAtomicHighlights()
- 	{
- 		int nrows;
--		Range clip = GetViewRange(out nrows);
-+		Util.Range clip = GetViewRange(out nrows);
- 		Highlight view = new Highlight(clip, Drawer.HighlightType.Normal);
- 		
- 		// get all highlights in current view
-@@ -618,7 +618,7 @@ private void RenderCursor(IntervalTree<AtomicHighlight> atomicHighlights)
- 		// if we don't find an overlap this means that either
- 		// 1. the prev cursor position is not visible on the screen
- 		// 2. the prev cursor position is at or beyond the end of the file
--		IList<AtomicHighlight> overlaps = atomicHighlights.SearchOverlap(new Range(prevCursorOffset, prevCursorOffset));
-+		IList<AtomicHighlight> overlaps = atomicHighlights.SearchOverlap(new Util.Range(prevCursorOffset, prevCursorOffset));
- 		
- 		AtomicHighlight h = null;
- 		
-diff --git a/src/tools/find/FindOperations.cs b/src/tools/find/FindOperations.cs
-index 0351efd..e5984f9 100644
---- a/src/tools/find/FindOperations.cs
-+++ b/src/tools/find/FindOperations.cs
-@@ -146,8 +146,8 @@ public class ReplaceAllOperation: GenericFindOperation
- 
- 	protected override void DoOperation()
- 	{
--		Range m;
--		match = new Range();
-+		Util.Range m;
-+		match = new Util.Range();
- 		firstMatch = null;
- 
- 		numReplaced = 0;
-@@ -159,7 +159,7 @@ protected override void DoOperation()
- 
- 		while ((m = strategy.FindNext()) != null) {
- 			if (firstMatch == null) {
--				firstMatch = new Range(m);
-+				firstMatch = new Util.Range(m);
- 			}
- 
- 			match.Start = m.Start;
-diff --git a/src/tools/find/IFindStrategy.cs b/src/tools/find/IFindStrategy.cs
-index bdf7a87..bc2b21b 100644
---- a/src/tools/find/IFindStrategy.cs
-+++ b/src/tools/find/IFindStrategy.cs
-@@ -31,13 +31,13 @@ public interface IFindStrategy
- 			ByteBuffer Buffer {	get; set; }
- 				long Position { get; set; }
- 
--						Range FindNext();
--	Range FindPrevious();
-+						Util.Range FindNext();
-+	Util.Range FindPrevious();
- 
--	Range FindNext(long limit);
--	Range FindPrevious(long limit);
-+	Util.Range FindNext(long limit);
-+	Util.Range FindPrevious(long limit);
- 
- 	bool Cancelled { get; set; }
- 		}
- 
--} // end namespace
-\ No newline at end of file
-+} // end namespace
-diff --git a/src/tools/find/IFinder.cs b/src/tools/find/IFinder.cs
-index 594de22..a29a8fd 100644
---- a/src/tools/find/IFinder.cs
-+++ b/src/tools/find/IFinder.cs
-@@ -30,7 +30,7 @@ namespace Bless.Tools.Find {
- public interface IFinder
- {
- 	IFindStrategy Strategy { get; set; }
--			Range LastFound { get; set; }
-+			Util.Range LastFound { get; set; }
- 
- 
- 					event FirstFindHandler FirstFind;
-@@ -41,4 +41,4 @@ public interface IFinder
- 	IAsyncResult ReplaceAll(byte[] ba, AsyncCallback ac);
- }
- 
--} // end namespace
-\ No newline at end of file
-+} // end namespace
diff --git a/dev-util/bless/metadata.xml b/dev-util/bless/metadata.xml
deleted file mode 100644
index fb8810c0659e..000000000000
--- a/dev-util/bless/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>ikelos@gentoo.org</email>
-		<name>Mike Auty</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-util/boost-build/Manifest b/dev-util/boost-build/Manifest
index 838ae55657d6..58dd7c6f0c19 100644
--- a/dev-util/boost-build/Manifest
+++ b/dev-util/boost-build/Manifest
@@ -4,10 +4,11 @@ AUX boost-build-1.71.0-fix-test.patch 363 BLAKE2B b64a87e69df3d4832e5704014a92b4
 AUX boost-build-1.71.0-respect-c_ld-flags.patch 367 BLAKE2B fee2e2f2db024a1421ad7f7d59a17908d6d74bd95c568c27adf9853725d8d92b7460d1c520c2a591f4a8d41213e2bd822044aef490b7b50590a6dac63630dc39 SHA512 148171cd6b1946e4dd0c2cfe734ff9a7e7adb4789868a363bd6f0855fad882f69e34aa079c0e1521864db5f5b7dfa449cfed74236b5f6743ed520ed477e48d1c
 AUX boost-build-1.73.0-add-none-feature-options.patch 475 BLAKE2B 5211dbc9188056bea09c4d9d5073cb772ff876b6ed7a05c18db34b2b86b85301d092c6dfd5698aec9ad93a828aeef8283d005136cfb4eb10ab2001f50f41b51a SHA512 0ba75a1e46a58dcc6a332ef8cc8a688f1219619cf84b681233e044da1fda754b7f8dc5ecc903776674729275d7a39a571803022cd66b99e9e335e6ba5bbc5501
 AUX boost-build-1.74.0-no-implicit-march-flags.patch 16904 BLAKE2B cd37f24ca075760dd220926b081ab898f0f61e9de22e1dbc119afd5d746f3a7d215065332c96af9f64299e9374d994655d196430ad7deac592a42e7d165b0bdf SHA512 d07b55530d26c63b7453d265e27ba6a1e902f67f2b74e581a0286f563e0b2afa833bbdeb625be1a0beec255ead811eecb10d3a6f45c27cb929dc224430c60a8c
+AUX boost-build-1.76.0-python-numpy.patch 791 BLAKE2B 48751f726120b69511e7bbf0f4ff1454218d67de7f61b68127d70da2631f09a76448e5c660bf8d64288a4098331ac3ac4e626f068afeb8cf46cea9f45ae46dbf SHA512 3358c08450c998d665e5fe3599bb7f900acada856f602ab9a592aa1845ea6244a70c56f135fbd45f8c62dcc7fd083b4b026c222d39afdb82b95a532f09308fcc
 AUX boost-build-1.76.0-respect-user-flags.patch 456 BLAKE2B 02a383d7a969220da3a40bfe822a807c67734a286f65c3d1dbda18c263593cc6940f5ed260bea1d1ccc20c0726b04859ce2d97c151d10b067206f79d417af237 SHA512 06df6dbf1bc48f224a77ccef202f0cde61c594e6be23418196fbc274bb8e1b6e16a8f2ef9fd45d112cb57af8987df23282e0b1bd4bf4ca6603127b573f54810b
 AUX site-config.jam 688 BLAKE2B e43a7ad1a94d113a7f890e8b634770f5c60556101d428d83f655bbbe72c46b587485886a9941d05a2ae4319fc325f1e0ecfb9b660158b81c5e9fd02e0b1c0530 SHA512 b65bf1be3133f9f66d3139b00f195a288591bb20a13ba35041507c2c33d7d2da6047c3b02dc27bc4eb21798b91e1262a60e294b7fd4af90808b9de0f5af517df
 DIST boost_1_75_0.tar.bz2 121849575 BLAKE2B ce7ecd8bcee518ce54f7e5302f202acbea60cedd6ae9248708c0bb5bbc2713607b2e1967a9e6f77cc20a4c008c1ee4db651def55937efc80407487a7a44fa8d6 SHA512 d86f060245e98dca5c7f3f831c98ea9ccbfa8310f20830dd913d9d4c939fbe7cb94accd35f1128e7c4faf6c27adb6f4bb54e5477a6bde983dfc7aa33c4eed03a
 DIST boost_1_76_0.tar.bz2 110073117 BLAKE2B 45445e6a9725cb99131e0b831b2fac0840d083692c13887b41adeac5cb8b3732026db3641d6be20591a676b78a87fcf363eb9b1508f87ed26039bba6a1ced533 SHA512 5d68bed98c57e03b4cb2420d9b856e5f0669561a6142a4b0c9c8a58dc5b6b28e16ccbb16ac559c3a3198c45769a246bf996b96cb7b6a019dd15f05c2270e9429
 EBUILD boost-build-1.75.0.ebuild 2058 BLAKE2B 42e8c169a139c01463c809b4b1d3bdb1293a28f0c375751e2fa6cbfd432aefddbe798d5f62bc795ef0a656e13a11a5623cf68533fe8bf0a402c12c26181179ae SHA512 d3640a4dd60f81acff16e6125b23956ab0bc4530f25cb51a5af6d7c7986776533dc3876620774b0802de927bc8ee3e35eae7eeddacd30a67257a9ff641cba47f
-EBUILD boost-build-1.76.0-r1.ebuild 2121 BLAKE2B 4a5af1641fee7021799b994613f5dd5d50e0dffd0ec82b48945b7647df79ac5ec3b413f0e4cac75a1b4385eece0c1ac9625e7b59c976903f468015443d9323d9 SHA512 42ddb1f014552aec09a19723e779bb3388b97b5c13e5a68138dc28cc8e86d862177ba1f166d7d3d67455a946b20ec912c1a1e67a9c862adadada7cc4f2c228f4
+EBUILD boost-build-1.76.0-r2.ebuild 2167 BLAKE2B 8a2b79f7e3bfc2378b4a7e4208c0f5a25c6fd348a0199be7d98414b05706c60c3899a586d91cefeb47566d5ec3567e1c5f3bce1d27c60854a018097ef9f74620 SHA512 51abd473cd35b56c7a152d963b81e37f764008015ea15b60b23d3564f78c9521e694bea7145a2b9af5411a54c93d46c2a63c52347ff264cfa46bf57e3c455348
 MISC metadata.xml 329 BLAKE2B f492b1ba64c3f7bce1d3fb304bcff93357cc069dfd06b69c25cf26f4423ebea51ac4614a8d865635568f0e9db424a6904fc1edd5fa729243838e16e9887f4202 SHA512 57baf2d8e0a4c240d99f68ce122086a147d42145687b712609fdcd73b77fe3fdfecc1b078edb6a9c922213482fcc17c2fccb6762ec69890fbc9a912c4cb34827
diff --git a/dev-util/boost-build/boost-build-1.76.0-r1.ebuild b/dev-util/boost-build/boost-build-1.76.0-r2.ebuild
index 2a800a247142..4d5d365bdbfc 100644
--- a/dev-util/boost-build/boost-build-1.76.0-r1.ebuild
+++ b/dev-util/boost-build/boost-build-1.76.0-r2.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 ~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"
 
@@ -24,6 +24,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.73.0-add-none-feature-options.patch
 	"${FILESDIR}"/${PN}-1.76.0-respect-user-flags.patch
 	"${FILESDIR}"/${PN}-1.74.0-no-implicit-march-flags.patch
+	"${FILESDIR}"/${PN}-1.76.0-python-numpy.patch
 )
 
 src_unpack() {
diff --git a/dev-util/boost-build/files/boost-build-1.76.0-python-numpy.patch b/dev-util/boost-build/files/boost-build-1.76.0-python-numpy.patch
new file mode 100644
index 000000000000..ed04d5426341
--- /dev/null
+++ b/dev-util/boost-build/files/boost-build-1.76.0-python-numpy.patch
@@ -0,0 +1,24 @@
+From 61adb508853be1fa2c01a0c3a0c55fbd16cb9a52 Mon Sep 17 00:00:00 2001
+From: Peter Dimov <pdimov@gmail.com>
+Date: Mon, 24 May 2021 22:11:23 +0300
+Subject: [PATCH] Declare the /python//numpy target to hold the include path
+ (fixes #725)
+
+---
+ tools/python.jam | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/tools/python.jam b/tools/python.jam
+index 00706932d2..0dfc750a22 100644
+--- a/tools/python.jam
++++ b/tools/python.jam
+@@ -1052,6 +1052,9 @@ local rule configure ( version ? : cmd-or-prefix ? : includes * : libraries ? :
+             ;
+     }
+ 
++    # Declare the numpy target, which contains the NumPy include directory
++
++    alias numpy : : $(target-requirements) : : <include>$(.numpy-include) ;
+ }
+ 
+ # Conditional rule specification that will prevent building of a target
diff --git a/dev-util/byacc/Manifest b/dev-util/byacc/Manifest
index 7ff77f409681..0c5b912ab652 100644
--- a/dev-util/byacc/Manifest
+++ b/dev-util/byacc/Manifest
@@ -1,5 +1,7 @@
 DIST byacc-20210109.tgz 873282 BLAKE2B 3f856bfba00b692ecc5fd297582ff594873914552d522be5de78bc74c0c52a7e0b7fbcdd31e209e7269d9e00e2449cf7162ac5cd0a1f2060e051f8fca2171460 SHA512 95eafe81948fee1839fed8fff71d65c23d85de02af51672c118b2eed7c680f0dd300cec54cf366a248307c480844edc66a027575b29e20ef2f71f3c243ad5202
 DIST byacc-20210328.tgz 874281 BLAKE2B acd0fb0ebd99987ad5e823391e5186cedc64a9a7b5a1088ba42ac2c1a80d98d86f47c7626af5294853026a2e6bd4aeeca7b39b1a39527c170f118e33c021eba7 SHA512 fdcf98976524c1f37710cf9551a357ebc24ece94dd2bd10501d4fafb914a7ab4847926b99647e387f22a3d3206e6a4bfc14a4c41115702382fcc1d6f688f9dae
+DIST byacc-20210520.tgz 878173 BLAKE2B feecf3708eb6269c046043bff7f3ca40f4d4240e1849283e970dcf1c2f665e8c43f46ca4913a332987b7c9883fea68947953c28bf3f8fc983ffe6b7a4d804c17 SHA512 0b119efbe8748f9b5959926c36ac006174d99deb7a9c84ce97b7b80a01d197dd4d1004788dfed87bc492410a354b06f01b848b8da20ce0f64466c527c091bf48
 EBUILD byacc-20210109.ebuild 597 BLAKE2B d2369392975f705756da06a683bf456d3bc80737db5c54b4dc21ef1d52fae6fa8dd3128f1c8c25538c94f7beb22b8143186590c829a0dd81536c9c7edc5e1892 SHA512 8892e8d83199332d811e4ddb2e5abf92cbbcd4fe57815628650007f1e188ff851346badd284e8e5b334ffc6b2f506450e3db806c428cbb400829482a917afafa
 EBUILD byacc-20210328.ebuild 604 BLAKE2B 6f4b3612b5638cd6962ecb8eca298c0f92740750f45db9d53e45f9988d0d5c3e52b4031a02557adf4e7b1fe40e643e0f33206fc8397d9acb3076950ad11554ae SHA512 1062db25ea711b5ec17f4320a0e6826847bce4cc22c5416b298d66b82fc5dcc002bdf0ae125614bcfb77c153d13fcd7dcf72f67db32692fcd2af25c16186cfde
+EBUILD byacc-20210520.ebuild 604 BLAKE2B 6f4b3612b5638cd6962ecb8eca298c0f92740750f45db9d53e45f9988d0d5c3e52b4031a02557adf4e7b1fe40e643e0f33206fc8397d9acb3076950ad11554ae SHA512 1062db25ea711b5ec17f4320a0e6826847bce4cc22c5416b298d66b82fc5dcc002bdf0ae125614bcfb77c153d13fcd7dcf72f67db32692fcd2af25c16186cfde
 MISC metadata.xml 355 BLAKE2B 10160435379a759071cde21a0195dbeaac5783119695a9d9b092090158c429d01280d2442d351e5dd8a6368ff11566f153e02abc07d81c19ace1838f1943a09a SHA512 b0b39011f45894df952d34cd75ee087fd42a77aeb5a0e60e4201fb404781d77c4a5a82d2492712ad0ac2a2daad029a19c1284f7fc8f624c2ed47fd0b55d680dd
diff --git a/dev-util/byacc/byacc-20210520.ebuild b/dev-util/byacc/byacc-20210520.ebuild
new file mode 100644
index 000000000000..556684fdc8ae
--- /dev/null
+++ b/dev-util/byacc/byacc-20210520.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="the best variant of the Yacc parser generator"
+HOMEPAGE="https://invisible-island.net/byacc/byacc.html"
+SRC_URI="https://invisible-mirror.net/archives/byacc/${P}.tgz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+DOCS=( ACKNOWLEDGEMENTS AUTHORS CHANGES NEW_FEATURES NOTES README )
+
+src_configure() {
+	econf --program-prefix=b
+}
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index d2c765f9a9c2..d7f6297d4961 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -11,6 +11,7 @@ AUX cmake-3.17.0_rc1-FindBLAS.patch 1087 BLAKE2B 5e549db39f0e8c5f821a70121551cce
 AUX cmake-3.17.0_rc1-FindLAPACK.patch 1973 BLAKE2B d4f10694b55fcea047f364f3dd383ba12fb5c3ce4369bd527c286e23260b551a915fa5257f0351bce00a4332c987c047c246812f2a713b0d1db312c7d03edee4 SHA512 20baafcda95ba219ae4e186a8878aa75e2e27f766ab3afaa14ce316cd2c2bc85debfc6be4ed1b6c17c3c1532b3a6868d0b4ee7cc47145cb788838f023b624303
 AUX cmake-3.18.0-filter_distcc_warning.patch 842 BLAKE2B 8c9b02a251d118f2ac31fe417e10750e3f4b911891723b0edacea83bf2b6220f121e02c299655cd49ae5a019af8a747218f81d6ece6cda41aeb57d24f9385277 SHA512 91b795225313270449d6da12baa818382da4f6937795303c5cc894f3f38f03cb88d8fb3b774fb0b8ab9cf5cd344ebeda3d83f48ef8474093a8a0268d8f342828
 AUX cmake-3.19.1-darwin-gcc.patch 433 BLAKE2B 72fb716af3d24d2723a06f0c2351d16af215cb64effa46bf404d8e00106ec80297b34b3d7f787b191e3fc08e1d35c515b6d2d527213285de91cb1f4b81272cb2 SHA512 a732f6f22e4eaab747cf80eaebb4fe5624aec893fc2bbb782f86d8377d3eda365568f091dd2505e18798fa8147f13adda0fa5cb0687c5c427a65bdc7cb957ff0
+AUX cmake-3.20.2-boost-1.76.patch 1921 BLAKE2B 5590aaf1083792806767bd7ada6d7a97c6c5fd6a4bb17d211589dae1a32d238d7ac98df983eb6a24a7a3277253a9d93e8eda1a237d2d7e1113dc4a7b74df258d SHA512 0f77f0350c296cf98e9f14425e3c822360dcbeda8c4ead5d5e3c2c75d3110fed4bf7df81f1cdd56f18c70a17d6f302771b1a67890599938de62a6716b7ba1eb7
 AUX cmake-3.20.2-sphinx-4.patch 937 BLAKE2B 433693ccca65d8f389bac738217efaa79e8ee2dc6d498df7aea63b6f26aa198ba8923f4c172907b0e6a5a384c2498671e97fcd5850cb1822858d571225eb16a1 SHA512 22215383e98d90cda79396ba9cafbfaba10c43138228d033a89544c5190e4e415fecf541115169f9c062afe6b95ad42b2678f0afefe3af16aff8a8c711558a49
 AUX cmake-3.4.0_rc1-darwin-bundle.patch 1043 BLAKE2B 99fc8061352b6a503f472e11045f9a99c2b980f08e9c1406722eacdd438617dccc394f53bdcaa4d93c4aa499b4615185c3ec99ccad8be3504972001498b02c48 SHA512 8c6297bf824d5a911e14004ac4c4e62d1a1528e44199d8860ca885bb1b8dd3d66a73c3db32664b830c3c635bdb498abbd5196be92ed2571cb22828d7186ff9f9
 AUX cmake-3.5.2-FindQt4.patch 1585 BLAKE2B 8cfda84c419515be57f65be7b4b22d7937b656eb7f58d61c7d9e30db9dac36e934f2a529b4ea20d69c5f8a653c727bae34374ebcb7f5017fd70df41abd538164 SHA512 bab8960bfea3c29416bdc8f39c7dee59b89bd7951752401f24eeb9161ac7bc2c6dd200cb62c6b9f964d763b5d257a94d8b04dc7090d6fa947a04f2d0c2e8c479
@@ -20,8 +21,10 @@ DIST cmake-3.13.5.tar.gz 8618821 BLAKE2B 765678bc92821207c53bfb4ac995a791b938f20
 DIST cmake-3.18.5.tar.gz 8975784 BLAKE2B 62ea68b602e7e352c22ba6122aa010fb78fb5c4e484aa51bc336e750280d5fc03ffa439bd8005d2c43176f5a5db4ebfd419beca65cc59c5b8cd5666e38394fb8 SHA512 c15e0937a9c0ce0b6164c3d02a147e679ea57e1119cff4189a15de71429a7facb3c04eb8db467471876b5da5dbd4a25acb228efa7101fe78efd205f0d2c96343
 DIST cmake-3.19.7.tar.gz 9271358 BLAKE2B 379b89c0d6bcfe81a397257cb3f95e4b4a8987566258f6d5b312e8ffd455fd07f09ed570c47111f9a519d76f43014b680e8242cddef13810ba87f9b9ec7e2e2f SHA512 6af1fe3ea41906324d4c29f5f982281d92145d086f4a47fa2220b93483bc65d59b1e23f5b51d82305c630690be7c552827bb795560674b03620763e0917bf14a
 DIST cmake-3.20.2.tar.gz 9438694 BLAKE2B b1e1c091047d5ccae77d64ffda8201cfa7661f09fac2aceadfede8be09257cebdc8c2536f10ced82c700fd87174979344489fa6ab1b460e3ddfc41325ca6f19b SHA512 675a92f84b437169aee86dbfa59715671b9195ddeffc6fea83c7803a70abe3116106ad0a627b9e4bef326bfb2a10fdf624ad341fd9d3d08e3d8a69c271cd2b32
+DIST cmake-3.20.3.tar.gz 9440009 BLAKE2B 25098305b2fb9d719ffd3a25936207d98901651a6d9c6fe0757d4da3619274021025d7ce9f78b3813826c8b52347f12321db905083839d3882a2ba85a294561c SHA512 ed2b8b04c759c4f7c5c363be33bf08e6677c710c1f937050a378ab5539136b919531e1c927b117b3d8d68d4bb613de8d92a3d4d50f3ab3bc98355febca779a1b
 EBUILD cmake-3.13.5.ebuild 6239 BLAKE2B 5e3b289af5d341e73fbdfe6162330e9e39dac40276991f08df670fcff6e40438995b608704e535545c4538cedb7ed789c2cc2ae0b38a1fd0f3a2e9627c95a494 SHA512 e75ea6defa00993410ed865329b450f38f9ad418c59bfe345880bae25d2f19e4463a407d744527d3f5c6c59fe8cf732cad5ac6274901cfcf3809d29573be7ad1
 EBUILD cmake-3.18.5.ebuild 6070 BLAKE2B 24ab19a092db23bbcbf3d8f1a87e21cc8f17575e8eff885efa81c3fb0161204f8f821bda04ac819fbad5f73936db8b2bff38b688252a9bcab30a7df002adfc71 SHA512 59b479102626d771fbf66f1dccc011e33ca5e3d77bc37f291c6e28fbdf998b7b5853da56875345807714b85a1e95c7b41fe2f5e98f6486191b1c80d6962697c8
 EBUILD cmake-3.19.7.ebuild 6990 BLAKE2B f382eff3d258673c34e7642ec088f708281a6a65bed568b2094344fbd966eca22128dd93e382a88da16132291bd0f7c644362eaee0b34545c4d3df8ef512c832 SHA512 27af2c67d4a06e0cc3f0d86f003738a8def88a274dc3eda6da32de0b5f015a8e13f315ae93efbcec07cd9b95fc9f046786336f2a1b9ac9f5478610a440cb9964
-EBUILD cmake-3.20.2.ebuild 7090 BLAKE2B 0786af9257074a701d588aaf47fefe6890e476e6790833e284da3e607c7cf6be7133ef318321982880d0b2d73b5e9a211030bc719f01100edd4633e0dad49932 SHA512 8d4bfe0d835382ace232048e57fa0c38b613c72f55ecbaa30336172c21c81d69281011bba4befb51e9287ecc7868f646184115b3c7d382232c84457250686c2a
+EBUILD cmake-3.20.2-r1.ebuild 7140 BLAKE2B 7f72a4516fd9f0456698b7f444dc148c3e0b2f6c9c06a63fd9be92873012032c241fcadcb7e4ae1abcf50fb478d136ec095547ab8aeabe3c2d0cae0d46a439ae SHA512 004c1f323dc8a1dec2f9b5c237c636adee77c5dd4aeed8b515ae06fdd9dc61df5ceb8f307b72e2040a99ffd9d7946658ce1fcefb9fcf4b81394256eba757afc9
+EBUILD cmake-3.20.3.ebuild 7042 BLAKE2B b60e9f4a8bcb96c74db8e221b28f49d7a641cbce8ca954af4f2ea93e118c68b6d6028bdab91ea7907cd87238f7d2f85862866f607fa738674315a0d51e069b70 SHA512 b95e61889cf487d3f7977b740a5857f2c4130ae8c843e2b74f38ebede2bcd3f9d9a1fa7311058c65d075eddea128e3390eb55b5f9068a57142c357290413b74f
 MISC metadata.xml 460 BLAKE2B f1a7e1709a6b9975ffbc377c8b4d1ea8a01f52ccc139693c8e427150b7559ecc867b3e55fb4bc95fe342a2335fe5e13c69f4bd74ffbbf302c83872c65963e73e SHA512 fc562cd5f336101d16ca30a5b3e9b99a6e51ec9d7aa503f20ce278f44d5810286fcd6b46b18073cd88ba88ee5ab4f8a0bfccaa567df09ebb722a68ab721aa340
diff --git a/dev-util/cmake/cmake-3.20.2-r1.ebuild b/dev-util/cmake/cmake-3.20.2-r1.ebuild
new file mode 100644
index 000000000000..627ca4f7a027
--- /dev/null
+++ b/dev-util/cmake/cmake-3.20.2-r1.ebuild
@@ -0,0 +1,234 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="emake" # TODO RunCMake.LinkWhatYouUse fails consistently w/ ninja
+CMAKE_REMOVE_MODULES_LIST=( none )
+inherit bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing \
+	toolchain-funcs virtualx xdg-utils
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="Cross platform Make"
+HOMEPAGE="https://cmake.org/"
+SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
+
+LICENSE="CMake"
+SLOT="0"
+[[ "${PV}" = *_rc* ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc emacs ncurses qt5 test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=app-arch/libarchive-3.3.3:=
+	app-crypt/rhash
+	>=dev-libs/expat-2.0.1
+	>=dev-libs/jsoncpp-1.9.2-r2:0=
+	>=dev-libs/libuv-1.10.0:=
+	>=net-misc/curl-7.21.5[ssl]
+	sys-libs/zlib
+	virtual/pkgconfig
+	emacs? ( >=app-editors/emacs-23.1:* )
+	ncurses? ( sys-libs/ncurses:0= )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	doc? (
+		dev-python/requests
+		dev-python/sphinx
+	)
+	test? ( app-arch/libarchive[zstd] )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+SITEFILE="50${PN}-gentoo.el"
+
+PATCHES=(
+	# prefix
+	"${FILESDIR}"/${PN}-3.16.0_rc4-darwin-bundle.patch
+	"${FILESDIR}"/${PN}-3.14.0_rc3-prefix-dirs.patch
+	"${FILESDIR}"/${PN}-3.19.1-darwin-gcc.patch
+
+	# handle gentoo packaging in find modules
+	"${FILESDIR}"/${PN}-3.17.0_rc1-FindBLAS.patch
+	# Next patch needs to be reworked
+	#"${FILESDIR}"/${PN}-3.17.0_rc1-FindLAPACK.patch
+	"${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
+
+	# respect python eclasses
+	"${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
+	"${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
+
+	"${FILESDIR}"/${PN}-3.18.0-filter_distcc_warning.patch # bug 691544
+
+	# upstream fixes (can usually be removed with a version bump)
+	"${FILESDIR}"/${P}-sphinx-4.patch # bug 789375
+	"${FILESDIR}"/${P}-boost-1.76.patch # bug 791712
+)
+
+cmake_src_bootstrap() {
+	# disable running of cmake in bootstrap command
+	sed -i \
+		-e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
+		bootstrap || die "sed failed"
+
+	# execinfo.h on Solaris isn't quite what it is on Darwin
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		sed -i -e 's/execinfo\.h/blablabla.h/' \
+			Source/kwsys/CMakeLists.txt || die
+	fi
+
+	# bootstrap script isn't exactly /bin/sh compatible
+	tc-env_build ${CONFIG_SHELL:-sh} ./bootstrap \
+		--prefix="${T}/cmakestrap/" \
+		--parallel=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") \
+		|| die "Bootstrap failed"
+}
+
+cmake_src_test() {
+	# fix OutDir and SelectLibraryConfigurations tests
+	# these are altered thanks to our eclass
+	sed -i -e 's:^#_cmake_modify_IGNORE ::g' \
+		"${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
+		|| die
+
+	pushd "${BUILD_DIR}" > /dev/null
+
+	local ctestargs
+	[[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
+
+	# Excluded tests:
+	#    BootstrapTest: we actually bootstrap it every time so why test it.
+	#    BundleUtilities: bundle creation broken
+	#    CMakeOnly.AllFindModules: pthread issues
+	#    CTest.updatecvs: fails to commit as root
+	#    Fortran: requires fortran
+	#    RunCMake.CompilerLauncher: also requires fortran
+	#    RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
+	#        debugedit binary is not in the expected location
+	#    RunCMake.CPack_DEB: breaks if app-arch/dpkg is installed because
+	#        it can't find a deb package that owns libc
+	#    RunCMake.{IncompatibleQt,ObsoleteQtMacros}: Require Qt4
+	#    TestUpload: requires network access
+	"${BUILD_DIR}"/bin/ctest \
+		-j "$(makeopts_jobs)" \
+		--test-load "$(makeopts_loadavg)" \
+		${ctestargs} \
+		-E "(BootstrapTest|BundleUtilities|ConfigSources|CMakeOnly.AllFindModules|CPackComponentsDEB-components-depend2|CompileOptions|CTest.UpdateCVS|DependencyGraph|Fortran|RunCMake.CompilerLauncher|RunCMake.IncompatibleQt|RunCMake.ObsoleteQtMacros|RunCMake.PrecompileHeaders|RunCMake.CPack_(DEB|RPM)|TestUpload)" \
+		|| die "Tests failed"
+
+	popd > /dev/null
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# disable Xcode hooks, bug #652134
+		sed -i -e 's/cm\(\|Global\|Local\)XCode[^.]\+\.\(cxx\|h\)//' \
+			Source/CMakeLists.txt || die
+		sed -i -e '/define CMAKE_USE_XCODE/s/XCODE/NO_XCODE/' \
+			-e '/cmGlobalXCodeGenerator.h/d' \
+			Source/cmake.cxx || die
+		# disable isysroot usage with GCC, we've properly instructed
+		# where things are via GCC configuration and ldwrapper
+		sed -i -e '/cmake_gnu_set_sysroot_flag/d' \
+			Modules/Platform/Apple-GNU-*.cmake || die
+		# disable isysroot usage with clang as well
+		sed -i -e '/_SYSROOT_FLAG/d' \
+			Modules/Platform/Apple-Clang.cmake || die
+		# don't set a POSIX standard, system headers don't like that, #757426
+		sed -i -e 's/^#if !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \
+			Source/cmLoadCommandCommand.cxx \
+			Source/cmStandardLexer.h \
+			Source/cmSystemTools.cxx \
+			Source/cmTimestamp.cxx
+		sed -i -e 's/^#if !defined(_POSIX_C_SOURCE) && !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \
+			Source/cmStandardLexer.h
+	fi
+
+	# Add gcc libs to the default link paths
+	sed -i \
+		-e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
+		-e "$(usex prefix-guest "s|@GENTOO_HOST@||" "/@GENTOO_HOST@/d")" \
+		-e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
+		Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
+	if ! has_version -b \>=${CATEGORY}/${PN}-3.4.0_rc1 || ! cmake --version &>/dev/null ; then
+		CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
+		cmake_src_bootstrap
+	fi
+}
+
+src_configure() {
+	# Fix linking on Solaris
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
+
+	local mycmakeargs=(
+		-DCMAKE_USE_SYSTEM_LIBRARIES=ON
+		-DCMAKE_DOC_DIR=/share/doc/${PF}
+		-DCMAKE_MAN_DIR=/share/man
+		-DCMAKE_DATA_DIR=/share/${PN}
+		-DSPHINX_MAN=$(usex doc)
+		-DSPHINX_HTML=$(usex doc)
+		-DBUILD_CursesDialog="$(usex ncurses)"
+		-DBUILD_TESTING=$(usex test)
+	)
+	use qt5 && mycmakeargs+=( -DBUILD_QtDialog=ON )
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	use emacs && elisp-compile Auxiliary/cmake-mode.el
+}
+
+src_test() {
+	virtx cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	if use emacs; then
+		elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+
+	insinto /usr/share/vim/vimfiles/syntax
+	doins Auxiliary/vim/syntax/cmake.vim
+
+	insinto /usr/share/vim/vimfiles/indent
+	doins Auxiliary/vim/indent/cmake.vim
+
+	insinto /usr/share/vim/vimfiles/ftdetect
+	doins "${FILESDIR}/${PN}.vim"
+
+	dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+	if use qt5; then
+		xdg_icon_cache_update
+		xdg_desktop_database_update
+		xdg_mimeinfo_database_update
+	fi
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+	if use qt5; then
+		xdg_icon_cache_update
+		xdg_desktop_database_update
+		xdg_mimeinfo_database_update
+	fi
+}
diff --git a/dev-util/cmake/cmake-3.20.2.ebuild b/dev-util/cmake/cmake-3.20.3.ebuild
index 95de22ba838f..b1cc1455ac6c 100644
--- a/dev-util/cmake/cmake-3.20.2.ebuild
+++ b/dev-util/cmake/cmake-3.20.3.ebuild
@@ -70,7 +70,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-3.18.0-filter_distcc_warning.patch # bug 691544
 
 	# upstream fixes (can usually be removed with a version bump)
-	"${FILESDIR}"/${P}-sphinx-4.patch # bug 789375
 )
 
 cmake_src_bootstrap() {
diff --git a/dev-util/cmake/files/cmake-3.20.2-boost-1.76.patch b/dev-util/cmake/files/cmake-3.20.2-boost-1.76.patch
new file mode 100644
index 000000000000..898f8a75d7e0
--- /dev/null
+++ b/dev-util/cmake/files/cmake-3.20.2-boost-1.76.patch
@@ -0,0 +1,46 @@
+From 79be37b94e7353ec056e6343ba293ce1b60627d4 Mon Sep 17 00:00:00 2001
+From: Brad King <brad.king@kitware.com>
+Date: Fri, 7 May 2021 08:51:40 -0400
+Subject: [PATCH] FindBoost: Add support for Boost 1.76
+
+Update the list of known versions.
+
+Run the command
+
+    cmake -DBOOST_DIR=/path/to/boost_1_76_0 \
+      -P Utilities/Scripts/BoostScanDeps.cmake
+
+to extract dependencies from the 1.76.0 source tree.
+They are the same as 1.75's dependencies, so just update
+the version check for warning about newer versions.
+
+Fixes: #22167
+---
+ Modules/FindBoost.cmake | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
+index f8887ad2be..d31f925cb6 100644
+--- a/Modules/FindBoost.cmake
++++ b/Modules/FindBoost.cmake
+@@ -1350,7 +1350,7 @@ function(_Boost_COMPONENT_DEPENDENCIES component _ret)
+       set(_Boost_TIMER_DEPENDENCIES chrono)
+       set(_Boost_WAVE_DEPENDENCIES filesystem serialization thread chrono date_time atomic)
+       set(_Boost_WSERIALIZATION_DEPENDENCIES serialization)
+-      if(Boost_VERSION_STRING VERSION_GREATER_EQUAL 1.76.0 AND NOT Boost_NO_WARN_NEW_VERSIONS)
++      if(Boost_VERSION_STRING VERSION_GREATER_EQUAL 1.77.0 AND NOT Boost_NO_WARN_NEW_VERSIONS)
+         message(WARNING "New Boost version may have incorrect or missing dependencies and imported targets")
+       endif()
+     endif()
+@@ -1622,7 +1622,7 @@ else()
+   # _Boost_COMPONENT_HEADERS.  See the instructions at the top of
+   # _Boost_COMPONENT_DEPENDENCIES.
+   set(_Boost_KNOWN_VERSIONS ${Boost_ADDITIONAL_VERSIONS}
+-    "1.75.0" "1.75" "1.74.0" "1.74"
++    "1.76.0" "1.76" "1.75.0" "1.75" "1.74.0" "1.74"
+     "1.73.0" "1.73" "1.72.0" "1.72" "1.71.0" "1.71" "1.70.0" "1.70" "1.69.0" "1.69"
+     "1.68.0" "1.68" "1.67.0" "1.67" "1.66.0" "1.66" "1.65.1" "1.65.0" "1.65"
+     "1.64.0" "1.64" "1.63.0" "1.63" "1.62.0" "1.62" "1.61.0" "1.61" "1.60.0" "1.60"
+-- 
+GitLab
+
diff --git a/dev-util/colm/Manifest b/dev-util/colm/Manifest
index 4027ecf0df7a..ef5b10b57524 100644
--- a/dev-util/colm/Manifest
+++ b/dev-util/colm/Manifest
@@ -1,7 +1,8 @@
+AUX colm-0.14.7-drop-julia-check.patch 1369 BLAKE2B 9d2e841fd19051e0617df64fb9940b5552e7b0a1c7d3525606e022b1f483628847955c2c85e7ac6d3fbedb85e46b38573b054b9883ca31a327180fcae261bf06 SHA512 962174b04c0f694c655e5e5c526ffe82619abbe12457d3a396dd639f023e36a8750d166c0b09b7531cb03abd0a8619587201d66ce46e69d2d4e7420f883771ca
 DIST colm-0.13.0.7.tar.gz 746841 BLAKE2B 7f816bafc0d1a7ea826b6cc2f5bd5fa2bffcd0eca88d5eaab757201481804dc5fa6c80fa19a550ebd9ee50a00a621690c4eed1788e0d0d3dd600db95ed8240d3 SHA512 d15cc6afeeacc4f34171261e75a7daa285529b98940272566ca6d6661d0778b18930ca72e0bce8d0a56c36c3482adfe4375c32ec66d6e77ee32544bddf35024d
 DIST colm-0.14.6.tar.gz 3110298 BLAKE2B 430c508ff9db27821baca12a458024cb2caecf2879ac3780fa6ebbc37bed30d3faf68515f21c9b31bd5f1504ab03b5ea63a24812f7117515c63261b8d1683e27 SHA512 a783817f9d348a79e93cac54c042e8366a73df287c14221b9e4a7b963385c1e32eb54d6918d0822b271dc2a0420abce84a3e1a3c9ada84968d1c20178d0310ad
 DIST colm-0.14.7.tar.gz 3110831 BLAKE2B c8be14001e8dc3340f5c55fbf8140b86237ec9462699e417f618cf44c759307eda0ede9f7a9ef897f5b8bc51d1fdf8b7360872a30b4cf07ba8191e405940030c SHA512 a5702cb8202599c75f4f4c1975d02e398f1394826f01b86039bd53a34f3ca250a7250d043a430ce6a383e6ca854fe4c72305891ab98c5f3d0ce54192423b7627
 EBUILD colm-0.13.0.7.ebuild 536 BLAKE2B 63e79a820fc90b689337ae2d4bf23c008414f40e2a731322be6585c154bcda1c54ef7445d3df7ef398f92979c6a77bdb144c9e6714bced9799be80b9115baef3 SHA512 a5a414ceb658cf09730b8a2bfb3c5cc99506f998034ee9131c3ee2b7ee29b362a5053f1ff55991336d31685cd65b8f1c2f76f71456ccf51a198596f07782208d
 EBUILD colm-0.14.6.ebuild 1227 BLAKE2B f359b302ce4345f5d86a20b2ce22298aee8ca519f7348db7201aeff9753346ae5df1e7d8f9388593a426e986ca81c11d58562d889994eb4f4728c5d6b11b8ac3 SHA512 894b7733416e4d7293ab7cf294845d87d92548f5d897865c383b19aa7de65abcdfcfd6dd44e5050cd79ebb22a817f47d2bc0f0b77a848b0debdd31d6e717cc07
-EBUILD colm-0.14.7.ebuild 1229 BLAKE2B f3405bb7efe914bc779d0d3e27207e61732f28c78c13c32244d639f426b99298040b666d1b15a47be55f52bcd41a091477e06dcbf05f720ea85c149b86e98d6d SHA512 827feac0837e6890aed3ac83ab362f94c0ac4fc626bdf8ad9e8dd3713c466511772dc25c354d2b7aa23d2abde3e01cb30710875057896b808d3513ccd128ea5f
+EBUILD colm-0.14.7.ebuild 1290 BLAKE2B b57f17bdb8d9640ef7982b963ce8134417b9304bc1d7a78bab29399302b3cb8add5710a4ba3cd820ce10134a451a2db3087cb2dd8ec28363e406946cb8287fe4 SHA512 c9cb61a20ad63618a30807d6e4e610fa9056f36d6a73c5f43c2e342b3b83802b402617d5579496e902d229bddebde1c42f8be70eaf9c977b25772226db7007aa
 MISC metadata.xml 332 BLAKE2B e0956073a0eac90ffbe6c682e223262351704d19f4ab914435d5751b88386b8197c72c5a77e6eefa410b009b8da4a479d9eede17a26f7faa5f4baf94ae6773b2 SHA512 cc81ab9d4d382d80a02de1073fb5f9a0f793cc3df7b5a11bbba63d5a9727c282e88365c265256d0452f5627a2fcd41551e02ab395cab1be9734765d651b223f6
diff --git a/dev-util/colm/colm-0.14.7.ebuild b/dev-util/colm/colm-0.14.7.ebuild
index a22badfbe4df..33fee87525e5 100644
--- a/dev-util/colm/colm-0.14.7.ebuild
+++ b/dev-util/colm/colm-0.14.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.colm.net/files/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="doc"
 
 BDEPEND="
@@ -23,6 +23,10 @@ BDEPEND="
 # libfsm moved from ragel -> colm, bug #766108
 RDEPEND="!<dev-util/ragel-7.0.3"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.14.7-drop-julia-check.patch
+)
+
 src_prepare() {
 	default
 
diff --git a/dev-util/colm/files/colm-0.14.7-drop-julia-check.patch b/dev-util/colm/files/colm-0.14.7-drop-julia-check.patch
new file mode 100644
index 000000000000..fc027927d298
--- /dev/null
+++ b/dev-util/colm/files/colm-0.14.7-drop-julia-check.patch
@@ -0,0 +1,45 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -284,41 +284,7 @@ AC_PATH_PROG([OCAML_BIN], [ocaml])
+ AC_PATH_PROG([RUST_BIN], [rustc])
+ AC_PATH_PROG([JULIA_BIN], [julia])
+ 
+-dnl
+-dnl Julia requires a large virtual address space. On systems where this is
+-dnl limited by ulimit, julia will fail to run.
+-dnl
+-
+-if test "x$JULIA_BIN" != x; then
+-	echo 'println( "can run julia programs" );' > conftest.jl
+-	AC_MSG_CHECKING([checking if julia is able to run programs ... ])
+-	if sh -c "$JULIA_BIN conftest.jl" >>config.log 2>&1; then
+-		AC_MSG_RESULT([yes])
+-	else
+-		AC_MSG_RESULT([no])
+-		JULIA_BIN=""
+-	fi
+-	rm -f conftest.jl
+-fi
+-
+-dnl We can run julia, now make sure we have 1.0
+-if test "x$JULIA_BIN" != x; then
+-	AC_MSG_CHECKING([checking if julia is version 1.0 or later ... ])
+-
+-	dnl We assume the form "julia version X.X.X"
+-	dnl   1. everything before the version number.
+-	dnl   2. Remove trailing version.
+-	dnl   3. Verify it is plain number greater than 1.
+-	dnl Any failure comes out as empty string. Note the sed command is wrapped
+-	dnl in [] so autotools do not interpret anything in it.
+-	JULIA1="`$JULIA_BIN -v | sed ['s/[A-Za-z ]\+//g; s/\.[0-9\.]*//; /^[1-9][0-9]*/!d;']`"
+-	if test "x$JULIA1" != x; then
+-		AC_MSG_RESULT([yes]) 
+-	else
+-		AC_MSG_RESULT([no]) 
+-		JULIA_BIN=""
+-	fi
+-fi
++JULIA_BIN=""
+ 
+ AC_PATH_PROG([GNUSTEP_CONFIG], [gnustep-config])
+ 
diff --git a/dev-util/conf2struct/Manifest b/dev-util/conf2struct/Manifest
index 172bc4908d4c..942967a8d225 100644
--- a/dev-util/conf2struct/Manifest
+++ b/dev-util/conf2struct/Manifest
@@ -1,6 +1,6 @@
 DIST conf2struct-1.0.tar.gz 57393 BLAKE2B 7de4be755ec764d96a321c68ca68b3156889e24f6894ba78b1c88cbeff84525331f1105040d61b1121ca01ece8d50a5aee2268eb73cde3ebbc8b62f679e2451b SHA512 31e8f350af740e79d97f4698dfec9b5e8a31a8a1cee30da0af753db26eda5b61379e9156e1cb492aef5068a4987d5e8202215323b83328e99705ae3ad3c09b81
 DIST conf2struct-1.3.tar.gz 58599 BLAKE2B 19cd7beb2663342d1d0e282c2ce45557f97110edec02eb1a9e29f92aceedd5837175a0898655ae403f8992d2754dc5094dc5c3c85014b109b066703956c9ec6c SHA512 eae91f85e44905fdc4274c0cc090a0748ded15824b87cdc3d026ec849d1cb13d14fb9b1bfb57d76da4687173d106065263499c1705db24f53ad4e95ba1d96b3c
 EBUILD conf2struct-1.0-r1.ebuild 759 BLAKE2B 25ddf1e30aa9a7cda344b1bbf6eabf6e96a8012478a71978b829688c5799a16b4eba40a568cde01188becdbf251e3d94541adf98a8c03500a859101edba99583 SHA512 b2f283e6de060e0e102a3b3fc8926be6d2743afe10a0b10f0159bf5ca17284968e05cba5d2ab00b5265b4a8a9635a75c4e020171f86793f3706201d67d141d59
-EBUILD conf2struct-1.3-r1.ebuild 759 BLAKE2B 25ddf1e30aa9a7cda344b1bbf6eabf6e96a8012478a71978b829688c5799a16b4eba40a568cde01188becdbf251e3d94541adf98a8c03500a859101edba99583 SHA512 b2f283e6de060e0e102a3b3fc8926be6d2743afe10a0b10f0159bf5ca17284968e05cba5d2ab00b5265b4a8a9635a75c4e020171f86793f3706201d67d141d59
+EBUILD conf2struct-1.3-r1.ebuild 765 BLAKE2B 8bc05f490f095a450f279dcab6fe15abaa86618490a2db2523f7fc91bc4bd5ece72d4293e1f6203a557573e6e2e978ef7a16d78db5c39e8019ea2c303eacf52c SHA512 1f0ef9f81c836e11aaae9d4d19778962b768f367d602761b487d1042408267fbdeceee793694b7ee738f0182e28c2d5d8b42d4f086dd5661aac4f985f86646cb
 EBUILD conf2struct-9999.ebuild 759 BLAKE2B 25ddf1e30aa9a7cda344b1bbf6eabf6e96a8012478a71978b829688c5799a16b4eba40a568cde01188becdbf251e3d94541adf98a8c03500a859101edba99583 SHA512 b2f283e6de060e0e102a3b3fc8926be6d2743afe10a0b10f0159bf5ca17284968e05cba5d2ab00b5265b4a8a9635a75c4e020171f86793f3706201d67d141d59
 MISC metadata.xml 334 BLAKE2B 8a441ec6c49f135a517821de0933e09c01861a135a0a16cad200acb2a695cb04bdc5d4d6ab076b95d7f547a8771984ee3cfca0c074ad1c41db3df5cee2876f60 SHA512 db25be9a745a1ebef49e8e477e24d715453cfe0bb698dc8e42ccf3ef8d8aac3cc9693e3f2873f28b3096016741bbf3c32841f025a06bcee61e9138ac2f6ee8b7
diff --git a/dev-util/conf2struct/conf2struct-1.3-r1.ebuild b/dev-util/conf2struct/conf2struct-1.3-r1.ebuild
index c39a24cd4004..a235bcf015e5 100644
--- a/dev-util/conf2struct/conf2struct-1.3-r1.ebuild
+++ b/dev-util/conf2struct/conf2struct-1.3-r1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/yrutschle/conf2struct.git"
 	inherit git-r3
 else
-	KEYWORDS="~amd64 ~s390 ~x86"
+	KEYWORDS="~amd64 -mips ~s390 ~x86"
 	SRC_URI="https://github.com/yrutschle/conf2struct/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
diff --git a/dev-util/cppcheck/Manifest b/dev-util/cppcheck/Manifest
index d5a3baadeaf8..a0b7d28455de 100644
--- a/dev-util/cppcheck/Manifest
+++ b/dev-util/cppcheck/Manifest
@@ -1,7 +1,10 @@
 AUX cppcheck-1.88-ldflags.patch 967 BLAKE2B c88cf4c199e686b6befe353c25d1507969c3c48d9f30e6a0e6bf18389f28acf4c6b62a0f6a6521da453090140ed77dd86102811b296918dde238e928ff0c8cac SHA512 62f8bd8ed415bafd57cd204d51d29de73832e2510f329e57e51d19605d4df1681cbf2c1813b88681cb3b203d093ef0ec0edf44c45b7bbdb610bde7406e400035
 AUX cppcheck-1.88-tinyxml2.patch 4689 BLAKE2B a4ad83cfa7e9edf7c52493ae78c72f730dea604be12ef8ae885c82b65fcbd5dc1a3b36c154da0c2c691a0f445b44a256f48de74f00daba7d544fd14d8237ee77 SHA512 2d8a90d2698607abfedcbeda806ad6e0589fd637c2b5b755cab2f6ba99f144ff11dce05162fa6a2b4b753f7814a3fc1cc83510bbbd5ed8811b6353ed30c27d5f
+AUX cppcheck-2.4.1-limits.patch 317 BLAKE2B a85978e5c6f5cdadcb8603719075f6982a739a4e8549f7cec1b64113889329a5bc75c321317797d8aceb6f12165c774bebcc5bd64724cbe07e78240eaecb1345 SHA512 dd56acfc19031cb380c8d0b04989f0a8aae5c9c47b9c22c3212cd0fa633455b87982ec9317fe05adf210f34c04e4edbbea0e64a751339d3dd3522705328cadcd
 DIST cppcheck-1.88.tar.gz 2364053 BLAKE2B b688974ff83019422cc5b2ec575d9838bdff4ada17d71fb3d436f07eea50429490c222659163b845667d98c0ec186b3288464827894e379fd017dd0c3fea645f SHA512 fa4ede0665546341af0ba3dae09a00b6efae09ec7838c616c580be01ff6902594d61168a059539779be0c78e1708d2bd9c8e7987dd0bb67dc8fa332a10d1de6a
 DIST cppcheck-2.2.tar.gz 3561406 BLAKE2B e436de4bec5412a18f013c8557a966c28c14edcd07fbb80eb53a897848d15f32afc180798ea1a074742f896b15d4020755c104b87dc8f82252121b58a92b92dc SHA512 d766187a69d6aa839e072e3c0ed44009621ca8492504257288ca2f49774f705a1ebcf2957f0801ac6eab2ffbdd845e9237f1213f85c6d0fcdbf16b1e7c690327
+DIST cppcheck-2.4.1.tar.gz 3761646 BLAKE2B 4c791088621f989e2529c92de38a73676fc3394e8cac72822596f7a75594283d0983693d693aa903a3ffb80bc0e1e20e71b55db5682d4d01c135ed77b2fc2e3c SHA512 8fb1ed5faa0071fc69405b7eb5b41e9f94b77d097158ea0d4f5e4da8a5087b9d1ab7bf37f8dc73d00096d3d2494aeb431af8029f0d4f1e2085f5b9b72bdc2d09
 EBUILD cppcheck-1.88.ebuild 2343 BLAKE2B e669f6356fd39c2f736c1a5f9131b9757592db79a6bbe231d053ec5dade9fd692b6fd084b086e219f99a400309632a2c35281866c1b92bd029b926fde510f07c SHA512 c4c390e5dc1f6d1c484b1d016973fa7bf114b165b451413d95b85b46e3af878060da6b1932709157963c67d2666392818111761159845681c165bbef203204e3
-EBUILD cppcheck-2.2.ebuild 1705 BLAKE2B e8e600dcb615870e42ecbe01924a8d7e98bee0f022cb9a01e5e6d6e81630a871cfa4dc5530b649a1da7990ddc0ac2f85d24a678bad0fa09e85f5da7967880d19 SHA512 bb71babdeb6688859a6928eba84bc7f0f8b40a5ef55c525738fc15db1c288d4806b77a9814959c4b411c466a8a4b5bdb205e2d3f3b05a9cc665dcd997a0023de
+EBUILD cppcheck-2.2.ebuild 1703 BLAKE2B 1e1f847145c2aadc055b883831e85c841c2ba0a298914c577f5a742770593bca36326f7a18f63c12fb293e7aaf4e19bfa10778d9b32314bacb37c62ade437e65 SHA512 db26782ed3215d110a9419763aba386e742ccb74b791aad5136a8e147570b93db3713badba01a04dec434d957816f938e3c912a8aba5752a2d24ce2ec3bdce7f
+EBUILD cppcheck-2.4.1.ebuild 1767 BLAKE2B d00753321c8fdd0ca9be2ecbc97b0a1cf802395fd084b1c5eda17b27193f26e241d2398aa32988e809e4e8c8cb00d09bfbff2c157b7aa96b92fe85aceab4114d SHA512 d981a44eccdbb90891f7d7b409f46b2b2e586e196dc6d88aa8038e497691a7d6c9fa2bbc611e7dc25c6c6d4b26cc876df3f71dcb96977a2436677f6991198081
 MISC metadata.xml 490 BLAKE2B 63b66d1ab0e87f0dd53dfaec62c4d17c1e806ddf2208df30b1a5fcc0f198ca343afa5a39ab55d92a3b4ac3b0143c24ec5c161afe23982c3c5eaca2050621c776 SHA512 1db095c4b258ccea938d6e4648aca9c3a165a123a703311de95f1743f641c5860cd1dd0369e6539efadd270b9f82f25694f504c34129cf55c74b323ffb3ac3c5
diff --git a/dev-util/cppcheck/cppcheck-2.2.ebuild b/dev-util/cppcheck/cppcheck-2.2.ebuild
index ddda0e4b2158..4014a57d6c95 100644
--- a/dev-util/cppcheck/cppcheck-2.2.ebuild
+++ b/dev-util/cppcheck/cppcheck-2.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/danmar/cppcheck/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc64 sparc ~x86"
 IUSE="htmlreport pcre qt5 +z3"
 
 RDEPEND="
diff --git a/dev-util/cppcheck/cppcheck-2.4.1.ebuild b/dev-util/cppcheck/cppcheck-2.4.1.ebuild
new file mode 100644
index 000000000000..8ee6ca9778e5
--- /dev/null
+++ b/dev-util/cppcheck/cppcheck-2.4.1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{3_7,3_8,3_9} )
+inherit distutils-r1 toolchain-funcs cmake
+
+DESCRIPTION="Static analyzer of C/C++ code"
+HOMEPAGE="https://github.com/danmar/cppcheck"
+SRC_URI="https://github.com/danmar/cppcheck/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86"
+IUSE="htmlreport pcre qt5 +z3"
+
+RDEPEND="
+	htmlreport? ( dev-python/pygments[${PYTHON_USEDEP}] )
+	pcre? ( dev-libs/libpcre )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qthelp
+		dev-qt/qtprintsupport:5
+	)
+"
+DEPEND="${RDEPEND}
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	virtual/pkgconfig
+	z3? ( sci-mathematics/z3 )
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.4.1-limits.patch
+)
+
+src_prepare() {
+	cmake_src_prepare
+}
+
+src_configure() {
+
+	local mycmakeargs=(
+		-DHAVE_RULES="$(usex pcre)"
+		-DBUILD_GUI="$(usex qt5)"
+		-DUSE_Z3="$(usex z3)"
+		-DFILESDIR="${EROOT}/usr/share/${PN}/"
+		-DENABLE_OSS_FUZZ=OFF
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use htmlreport ; then
+		pushd htmlreport || die
+		distutils-r1_src_compile
+		popd || die
+	fi
+}
+
+src_install() {
+	# it's not autotools-based, so "${ED}" here, not "${D}", bug 531760
+	emake install DESTDIR="${ED}" \
+		FILESDIR="${EROOT}/usr/share/${PN}/"
+
+	insinto "/usr/share/${PN}/cfg"
+	doins cfg/*.cfg
+	if use qt5 ; then
+		dobin "${WORKDIR}/${P}_build/bin/${PN}-gui"
+		dodoc gui/{projectfile.txt,gui.${PN}}
+	fi
+	if use htmlreport ; then
+		pushd htmlreport || die
+		distutils-r1_src_install
+		popd || die
+		find "${D}" -name "*.egg-info" -delete
+	else
+		rm "${ED}/usr/bin/cppcheck-htmlreport" || die
+	fi
+
+	dodoc -r tools/triage
+}
diff --git a/dev-util/cppcheck/files/cppcheck-2.4.1-limits.patch b/dev-util/cppcheck/files/cppcheck-2.4.1-limits.patch
new file mode 100644
index 000000000000..8b8db9cb8a42
--- /dev/null
+++ b/dev-util/cppcheck/files/cppcheck-2.4.1-limits.patch
@@ -0,0 +1,12 @@
+diff --git a/lib/symboldatabase.cpp b/lib/symboldatabase.cpp
+index d59789236..3604d517f 100644
+--- a/lib/symboldatabase.cpp
++++ b/lib/symboldatabase.cpp
+@@ -35,6 +35,7 @@
+ #include <cassert>
+ #include <climits>
+ #include <cstring>
++#include <limits>
+ #include <iomanip>
+ #include <iostream>
+ #include <unordered_map>
diff --git a/dev-util/cppunit/Manifest b/dev-util/cppunit/Manifest
index 865551cf1b24..b95a0828dba2 100644
--- a/dev-util/cppunit/Manifest
+++ b/dev-util/cppunit/Manifest
@@ -1,6 +1,6 @@
 DIST cppunit-1.14.0.tar.gz 959716 BLAKE2B 581e3b73d6d152c249005ddf267100443e6c9cba12c52c43e9d6f81096b9cd13c3686fa2f73ebaf28c31193e41dbfd5d919dfb0143b190881345da65a5b7f86d SHA512 4ea1da423c6f7ab37e4144689f593396829ce74d43872d6b10709c1ad5fbda4ee945842f7e9803592520ef81ac713e95a3fe130295bf048cd32a605d1959882e
 DIST cppunit-1.15.1.tar.gz 814363 BLAKE2B a1d1d1ee9b6ef408843a6e989a37653944ad85069b4896f18d0f01410acebf7342f70e8c031e58f7ad0e686a85869d521906816e0f0b1762d238efb606cb7310 SHA512 0feb47faec451357bb4c4e287efa17bb60fd3ad966d5350e9f25b414aaab79e94921024b0c0497672f8d3eeb22a599213d2d71d9e1d28b243b3e37f3a9a43691
 EBUILD cppunit-1.14.0.ebuild 1693 BLAKE2B 83a201e91d37b031e7fc0763a31df8da568aff53d1f2e6c7d678d44582c6ffacab63d998bbcabb5fd9edff7bf005b40387bfba3f97573f53c6e9d99051133144 SHA512 aac5f7f4f969a4a7511f9f338c0948a8b454f9f6691d34f3ae0f5d90ab6ba0c29257be0e206ca6740323c41b5a5c3deea56e360ab3af1f195127a7001eb37322
-EBUILD cppunit-1.15.1-r2.ebuild 1652 BLAKE2B 82a939c4578baf0a72e67226ffe7b61caf2dcfb4707e39b0f6710bffc9ed8afe3f0102a385ad6d194bc0a7f2ad219fa39dc973e3fd2be65a1f614ff9c8c01494 SHA512 01bcb4ef8d23a3ccc9f711255b23437027578cf9493824542ee687c5f579e0457c0861e1c28d1b3cc88781ef4bf16550a7a6ab06465aed8898db7ab640c1bd90
+EBUILD cppunit-1.15.1-r2.ebuild 1659 BLAKE2B 267535123db135043b5a74bae59ccee1428625ca3040527fd607f97e709350d8f58f947cef55b9604a9e47a312df2cafa8e903b6a6915db261995cda4f9dbeb6 SHA512 662b8bd560d7040ae6a0752be6cdbbc6849ab116498baed1d913217e232dc4197f8d28117835b06c687716a5c142d3b4a8cfcff1759156648c0621e8752bb70d
 EBUILD cppunit-9999.ebuild 1654 BLAKE2B 8357d827f94727e3074f5933a97f64b129710fa77033848fe72dd1e8589d545f381989515805861bd53e988fcd227e8a7cc61adb54b965bce1ea8c8aa991e533 SHA512 63b847b7125ae2e2540879ae4e685b337320260883e27b49f3837c83381ca38450fdfb31d70bc05093ad4aaf7939b25a46ab5db25ec599475d4684973ef5c04f
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/cppunit/cppunit-1.15.1-r2.ebuild b/dev-util/cppunit/cppunit-1.15.1-r2.ebuild
index 5e3684f870d7..5cf785d62c45 100644
--- a/dev-util/cppunit/cppunit-1.15.1-r2.ebuild
+++ b/dev-util/cppunit/cppunit-1.15.1-r2.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" == *9999 ]] ; then
 	EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/cppunit.git"
 else
 	SRC_URI="https://dev-www.libreoffice.org/src/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 LICENSE="LGPL-2.1"
 SLOT="0/1.15"
diff --git a/dev-util/cram/Manifest b/dev-util/cram/Manifest
index 5cbb3ffe861a..8e1bac4754f6 100644
--- a/dev-util/cram/Manifest
+++ b/dev-util/cram/Manifest
@@ -1,3 +1,3 @@
 DIST cram-0.7.tar.gz 33527 BLAKE2B 4c89f98a550bef0c7d92e4b15c466690c1be7d829257b6469340d5c40415466b755989ce1b4ad4ce479587c91d64467dfb42f468c5817e9a09163c111da11e58 SHA512 9fa57e504abac8fd15bf5ff4a74405cb7acd10fd4c797adee87052a4f1c4e975bbc0f4219afd9485358b2c2939b48b3ffe538ae2abc6eea71e0ba8b458d50103
-EBUILD cram-0.7-r1.ebuild 553 BLAKE2B cc05f6f2e2c4c5c936f8b6df59db07ff889bd329f984c6557724b771e15c7d7b9d4fb1b34367108a64194024f3675d1886cc860d061e71f30be7d2a5fb724f2a SHA512 6b454be58135cb8a1b846f64e177bcb2113b19013a28a52d904b43eaceb21e2dff5cf31a5b707624a615b9dadd694bee2714a5205c8bf5d8bf8ee13f04488281
+EBUILD cram-0.7-r1.ebuild 554 BLAKE2B 652f40c2f0195faa2cb30e0e56490ca694729a17e0e1d29596c3abeab03ec28f1e3c3c56ba82d8ad0bec69369e764443690420203eedcecc5c49e93c0d2f790b SHA512 bf4a36e750073cbbdf3830750c8156efbf09b520fc21562c410d486865b53b57fab55400fc77c06773732d5979cb55045eedde6bac218c4a54b40d79c3df5a96
 MISC metadata.xml 598 BLAKE2B 3de84be62941f1e475f58c77c6c3290a3247c930d36bad6b181ec2e78ea81b3faf2b1fa4ad4ce9d9975c99b623bb6eec03ee0ccf5c74ff5444f80058e099c0c5 SHA512 f3982923cfa384b00fb9b0aa8fe0bb9cbcfae40f43b248432f22af4a2cfbf29dbf327ebb26267991b47a9b1327e057ab9202061ee21e9a543a1cac9f5c82d342
diff --git a/dev-util/cram/cram-0.7-r1.ebuild b/dev-util/cram/cram-0.7-r1.ebuild
index 61fac674f223..5b94073cd0a4 100644
--- a/dev-util/cram/cram-0.7-r1.ebuild
+++ b/dev-util/cram/cram-0.7-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-util/cutter/Manifest b/dev-util/cutter/Manifest
index 02cc58c4d1d5..49c99b90fc08 100644
--- a/dev-util/cutter/Manifest
+++ b/dev-util/cutter/Manifest
@@ -1,9 +1,7 @@
 AUX cutter-1.10.3-python3-config.patch 1240 BLAKE2B 8b08b4a86f20196f42931ad8a36de42aea662b634c08911e762253303c3efa90fcf6f42582b23e273b5ed0761ef403b15b3270fe3d56506def9d398af2a7335e SHA512 44ee6b1b75b8a0349144ed9094fd5efc42f22415019583392910dfe0aca263d83192558e70b87945ff8c35f2eca988a4b5f45ab9f3f1bf1ad6f793d0510a4c77
 DIST cutter-1.12.0.tar.gz 2323732 BLAKE2B fb40444b60c19f88dafb9447731b91031ad764359121b835ae03477bf52f17d12d1a0b651059072b6ffb7bf811d4493b3746ab9c48d8f09257b5338130edecbd SHA512 3d8dd9cb6f9e69f41e295795f3d1b7256c071abafd04bdecd619817b8fd04396770f69df753701ffb376a358f0df9bd38dff6a344df4e5ca92163275ad670531
-DIST cutter-2.0.1.tar.gz 2695412 BLAKE2B 19d0e45a060d12dbf58cbcd0a7a9fa42b0a57b66016c4390b79daeb1dfe3efca0962068f665dbe30a6b9f0a04fc72603973c18315b4c4396845e4860744223b6 SHA512 600f005fcc8fbc54a5be1cb256d66387e8e37c579836d66b3caaf1130dbe945f21bd579313c9ecf2cba2b258efa85e2d437a957a694c7e7ca515341b25086528
 DIST cutter-2.0.2.tar.gz 2696029 BLAKE2B 9bc101137a1e479e137d9638ffa6892fa1fd7b3393462a305d0c92bd02b0486b1d2d071770be135de9493b23fa563421ac1d25bc890d9b2ed21d302601afb333 SHA512 17ec58fddbbceb4ab06b367f2f795ac0a2d8876c454159f20b7b1c6448bda330445ff922c2dd125ca42b77c729f5c65bafbf1c98eecc29c0bc1081c78f052141
 DIST cutter-translations-974298653ba71b958e1b6c83f6011f5fefff6236.tar.gz 595073 BLAKE2B 4445c4c16c47a05c74816d88a68fda97037c45caf7508fc1162f4978a0b3cb194653e879b77f6fc5be2f264a929ac11c4fc2aee68ceed6a23447094d0b249cdd SHA512 11450631602e7bd81132650b3edd028d56b2f6343a9561fe8bf3281427d8d22b0296651414756236b8544f719c8d4fc11be44a843532c8c32fe21dd7a82066d2
-EBUILD cutter-1.12.0.ebuild 1003 BLAKE2B cb2e19913b2a9d1280a1267635b20b574f4c6ed9880e44cc959bfa7cbbdaa4195c4d82ab488d60821bd92c8ff2128ab5e8977c39af92075b97b0e4a96427f829 SHA512 7091a4834bf3b6c2b6b2a3d44c2f2929c460ac1cc9313955bc714ff543c85a4d4cb69076d3a473fccaa1e76d498d01b14e6d7ca628014c5b25985f53847e2a3d
-EBUILD cutter-2.0.1.ebuild 1595 BLAKE2B 1b16fc0730d870d502d5a2e71f974ad9c78a1c927a7ca508bbf30cc2334a05226949e51d1b1b4d082afc7ee83e9653cd2ae43d45df7482007d21e183aa5419a3 SHA512 5971e8fb912970a9e6683430f60710f96b97aa9db2eff023272cc3ff33a2d596ca42911c4023aa080ba7a143e08518353f15fcf6af2b01a069be9802a0773850
-EBUILD cutter-2.0.2.ebuild 1595 BLAKE2B 1b16fc0730d870d502d5a2e71f974ad9c78a1c927a7ca508bbf30cc2334a05226949e51d1b1b4d082afc7ee83e9653cd2ae43d45df7482007d21e183aa5419a3 SHA512 5971e8fb912970a9e6683430f60710f96b97aa9db2eff023272cc3ff33a2d596ca42911c4023aa080ba7a143e08518353f15fcf6af2b01a069be9802a0773850
+EBUILD cutter-1.12.0.ebuild 1006 BLAKE2B 6c5afd922aa85627b555f9d6328d6a24f572e847a7363e7a7e0828ae2405b228cc5af9849cb6096ced0216e7e16705e063c651eb9fab7cf221c371f9887bf81a SHA512 69ef42f5d52a5dc2fb112163142b7d7b209c73027a53b7c6d28545be52940c5d7a7619b5379e16137eada0ffe78ef8bf986d34d1d15db2e550f8e24ac3c0f05c
+EBUILD cutter-2.0.2.ebuild 1598 BLAKE2B b26ed5d1c12aed59ca3632bbdacd95cefae09d1a6105bd56ad1d3d5bd19be3f95b35727b08ab6d5860b2dff98e2df8d1277d761fd656ec804d44796c5fda6c8b SHA512 3d2fbe30c9b7ed34f5d82d8502a58e392352b6a2dfc40ef12a57b438e54ef16b9e107d5a1febcdbaf5acfb5c37231ead88b94f130f07dbc5b94b2eb8f90124f3
 MISC metadata.xml 328 BLAKE2B 597e3a2352bd67dfaa1ab7604e6dafef7605a789b077c4540603af21d19d6eb0b2439cebcd11788cb7165c7c62e9300699cc72700d6383da1debb1c50910fb52 SHA512 cd78fe37ddd92ef4ecfd2099fd3c20b3014c691de405013b8647a9d81c17e84f8b784a4ac46ed7e21ee5246d5878817c60b27899ed48eefdb7c09f21084f11a0
diff --git a/dev-util/cutter/cutter-1.12.0.ebuild b/dev-util/cutter/cutter-1.12.0.ebuild
index 9d335195066e..10a06648756a 100644
--- a/dev-util/cutter/cutter-1.12.0.ebuild
+++ b/dev-util/cutter/cutter-1.12.0.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_{7,8,9,10} )
 
 inherit qmake-utils xdg-utils python-single-r1
 
diff --git a/dev-util/cutter/cutter-2.0.1.ebuild b/dev-util/cutter/cutter-2.0.1.ebuild
deleted file mode 100644
index c5eb669d8b49..000000000000
--- a/dev-util/cutter/cutter-2.0.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-TRANS_COMMIT="974298653ba71b958e1b6c83f6011f5fefff6236"
-
-inherit cmake toolchain-funcs xdg-utils python-single-r1
-
-DESCRIPTION="A Qt and C++ GUI for rizin reverse engineering framework"
-HOMEPAGE="https://cutter.re https://github.com/rizinorg/cutter/"
-SRC_URI="https://github.com/rizinorg/cutter/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/rizinorg/cutter-translations/archive/${TRANS_COMMIT}.tar.gz -> cutter-translations-${TRANS_COMMIT}.tar.gz"
-
-LICENSE="CC-BY-SA-3.0 GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="graphviz"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-util/rizin
-	graphviz? ( media-gfx/graphviz )"
-DEPEND="${COMMON_DEPEND}
-	dev-qt/linguist-tools:5"
-RDEPEND="${COMMON_DEPEND}"
-
-src_prepare() {
-	rmdir "${S}/src/translations" || die
-	mv "${WORKDIR}/cutter-translations-${TRANS_COMMIT}" \
-	   "${S}/src/translations" || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_CXX_COMPILER="$(tc-getCXX)"
-		-DCMAKE_C_COMPILER="$(tc-getCC)"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
-		-DCUTTER_ENABLE_GRAPHVIZ="$(usex graphviz)"
-		-DCUTTER_ENABLE_KSYNTAXHIGHLIGHTING=OFF
-		-DCUTTER_ENABLE_PYTHON=ON
-		-DCUTTER_USE_ADDITIONAL_RIZIN_PATHS=OFF
-		-DCUTTER_USE_BUNDLED_RIZIN=OFF
-	)
-
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/dev-util/cutter/cutter-2.0.2.ebuild b/dev-util/cutter/cutter-2.0.2.ebuild
index c5eb669d8b49..68cbba5c987b 100644
--- a/dev-util/cutter/cutter-2.0.2.ebuild
+++ b/dev-util/cutter/cutter-2.0.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9,10} )
 TRANS_COMMIT="974298653ba71b958e1b6c83f6011f5fefff6236"
 
 inherit cmake toolchain-funcs xdg-utils python-single-r1
diff --git a/dev-util/d-feet/Manifest b/dev-util/d-feet/Manifest
index 0c7c9e1d551d..d84c5ad30405 100644
--- a/dev-util/d-feet/Manifest
+++ b/dev-util/d-feet/Manifest
@@ -1,5 +1,3 @@
-DIST d-feet-0.3.14.tar.xz 177064 BLAKE2B be1150cead543dab3daf1c8beae4047d3c32e60dbf9a73a50ef95fe62cbafbf6af9ab174c7f9128212b0d33aa111545b598c6aab6d359625c94f0029ca5f1a20 SHA512 1ea3bd2251693884592d375f1459681043b5185c341299dc28cbc8e4e05f3ff3a423c051b650806f6b930d8b89e0d751983ada7ad9a74b380f74f3205125b1b4
 DIST d-feet-0.3.16.tar.xz 237888 BLAKE2B b4773b781c53feb11889b49746e714a42a15a85daeb16dcd5235609fb6105c0b1a3ebeeb4a08830de9067f1c193702b31fcbfc67190eb2f901907b96acfcadbc SHA512 ff4db968cbd679e2065c614d538187fe3c56118b44638771ec9f7472bdba4a798dc682565f520a8680a8001ea39ce88555b07cda172e60f88eb6bdf1e00b5a6d
-EBUILD d-feet-0.3.14-r1.ebuild 1099 BLAKE2B 63d29b6eed4e7408d907adb67de690e6d671603a01fb4398729c1bdfad7264a3ba89d0fd8d921e2231320a8cb7b7c42ed274e4075df541d6d788ffb439e4f451 SHA512 2c0a8d75d8254d9e42b0d3723584af4a96215e44713f9a2b206d157be859b9324efe52437ed66d101e2e4f1d958601b5374ee69edbf193a46bf83596f6cc3529
-EBUILD d-feet-0.3.16.ebuild 1025 BLAKE2B 6d9bcb7b555421c523000d4d0448b9564fd30b2930f7880ca8fd1f53dd5e5121df46eaf52b3aeabf9b88eaea4969faf6d7b9ad22b7a5890b5addd9fa62d8e88f SHA512 b092bd7e545a19e34b82c7eeab4eee6b94a6ddb3a37e56f347b25f6d1aca6661911c8933c3ca0bf7e0600d180c28ecf343b836bee3cd68039c441642a418d20d
+EBUILD d-feet-0.3.16.ebuild 1023 BLAKE2B e94d2c4922ca6a81f8174e697263e74c854562d6a7f15e8e7a4a6255f0de8dcc57834d5fef15a993bbebdad7c6edb1feecaf015ee8a6c9656d730f828bd42d5b SHA512 5fa0a5fa27438b853e24bf059054c9851791d74a9d9c099a035e42c754b3775c8cbbe73b76db7b79240d7092f1fd7d8294647c20e1d9386c543b6d6eb128e17b
 MISC metadata.xml 251 BLAKE2B c20c56e3f057e8bba258876f96b8ef08720698ee3aea60b765a79b1ff134df44036e6a230e071bdac6e5350a3b494975859db42c9693cbf165627bfecc566efd SHA512 0f975a0edfae95b6d15e292492de323063860e21caa4cc1e0ad70509bc3d3ead872daa50c66817efc9a8820e565ab9126d11f20d5daddf5f86b2e96100a4b9b1
diff --git a/dev-util/d-feet/d-feet-0.3.14-r1.ebuild b/dev-util/d-feet/d-feet-0.3.14-r1.ebuild
deleted file mode 100644
index 5c9616f90d45..000000000000
--- a/dev-util/d-feet/d-feet-0.3.14-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit gnome2 python-single-r1 virtualx
-
-DESCRIPTION="D-Feet is a powerful D-Bus debugger"
-HOMEPAGE="https://wiki.gnome.org/Apps/DFeet"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="test +X"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	>=x11-libs/gtk+-3.9.4:3[introspection]
-	>=dev-libs/gobject-introspection-0.9.6:=
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	>=dev-libs/glib-2.34:2
-	$(python_gen_cond_dep '
-		>=dev-python/pygobject-3.3.91:3[${PYTHON_MULTI_USEDEP}]
-	')
-	>=sys-apps/dbus-1
-	X? ( x11-libs/libwnck:3[introspection] )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	dev-util/itstool
-	>=dev-util/intltool-0.40.0
-	test? ( dev-python/pycodestyle )
-" # eautoreconf needs yelp-tools
-
-src_configure() {
-	# Tests are only python pep8 whitespace checking and intltool checks - checking python whitespate style is not useful for us
-	gnome2_src_configure \
-		$(use_enable test tests)
-}
-
-src_test() {
-	virtx default
-}
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 ba12cd342830..2e12dec01e63 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 x86"
 
 IUSE="test +X"
 RESTRICT="!test? ( test )"
diff --git a/dev-util/devhelp/Manifest b/dev-util/devhelp/Manifest
index c71c4089f952..17afcee18db0 100644
--- a/dev-util/devhelp/Manifest
+++ b/dev-util/devhelp/Manifest
@@ -1,8 +1,6 @@
 AUX 3.30.1-optional-gedit.patch 1259 BLAKE2B ccca312359fcf0105a3ae934e0b51582f597eb84b34ceb82967d5939c735537b261148202f6fb277ad102a1337794b2416dd158d7432a4d13159721c2bdf3abb SHA512 e7a0a659711063d0ac37814bed3c8e43cb1d7bddd313fa87b7cba2a1d2eaae45ad6fb430f247c190f0f4f15813135c572779f44dfad8bf223aead214f4e8566d
 AUX 3.30.1-optional-introspection.patch 1266 BLAKE2B 95bc2dece601e561c95d420e3bb564b318c7498ac67e30ae9f40909bd781445c4c8c2e1e1dbee2932c530d24f19357c49a7ba59caeffb767aec66b1feef6605e SHA512 959319c7e36f1dbe1dbfa858f53a91b6f6f1c4e469a7a3b237bd8ec96a7636fb719084f5bf9c0146b253eaf7f9512db4a077ec1e40065a827597131515d889e6
 AUX 40.0-optional-introspection.patch 1163 BLAKE2B ce50a6bbb920610be1daa723383e1fd464aed84f3d01911e1f85b50adf1f44680518a15e896b351271a3c3ac5500c2fbe148392fe90191f0ed37162faacded88 SHA512 6f874452379b76ee0ef1b402a7bd706e3543cf10b9033e5c5c0d1e153ce8d845e75056d10b1f451fc4ffe2073a7157ab492416d9c76eed44e38d00d919ddbd57
-DIST devhelp-3.38.1.tar.xz 313948 BLAKE2B bd070c98e92a8968ffbac7e634c19730e7c63ee18d180a5d9dda7d831b28deea49a7aa50b17ca9a8b5a411276ac055074cb76ef8cde5017ca395d49bf4aecdf6 SHA512 bcdd61cd822ae3fbe2c9542c09d058760fc1fa0bbbd55b1fc0853b4fdbf1c3856d4fed8f2263f94f41096cbdc0a76394773d43a9072d8aa89274fa61a3c2a430
 DIST devhelp-40.0.tar.xz 318076 BLAKE2B 05345f422e0ec906855c139306020165277daefea2c85229092be57c98f96459c33ab0fdf847a7135fa1b329c76edea71f7da0342c6673a828efe26298d26bdf SHA512 b8dd5fbb12558845f7f5794dad56ef0ffc1dbd60d5a6a28029dc8acea241e8deb1b68cd0abe9d620a512931a1c5f6db12fc594cd4597758c8d4904fb64e6ade7
-EBUILD devhelp-3.38.1.ebuild 1788 BLAKE2B 6697d9d94789714dca28907e7a306a68ee66eb04c905c48467f28adb743aabaf467b01fff04eee4b0f4a96011826ab73cdae0e545828a420b9a51cffff833a17 SHA512 6da00c8e9ebddae74d8e4b33e22f6c46c59f7f26b1203ae9bbef4abf28bf3369e3beb1d88ae0c2deec834f73d7ea50de55c8fee0bca8d2c837bf6d4f44ef308c
-EBUILD devhelp-40.0.ebuild 1789 BLAKE2B 96e4d2d314b65f91f468529d5211ddd574cd3678ecaa2c5f37cb51046114dc3187cd3a69ab945afb4dc9a3b7f826a250ee602f171b88e7c62eb354eeeda82f8c SHA512 fba1969812aab88bcf9fb0ef4dfa83f1eacc0dd93a5a0312c843701c83aad46b3fdac8c93c572f47ce6d9a4b2178bbf905fc659687066bcc4e9461c614030ace
+EBUILD devhelp-40.0.ebuild 1787 BLAKE2B 623ca0412768d8c04bc8637bf95e5b4e6d708fedf1f3b7d58ae4dcbf6e0c1b05065ef86be30405df3655648c0db9078815dc9a39611f330b64dfabd6beab23bf SHA512 af0d7acdb175458102553ab2006c505d36d5bb11657b3bec012eb36c55e45534958dedb775792fa0b954bf0cdab2f469e9aa024c57d157d18dc2e3c1e28c1340
 MISC metadata.xml 337 BLAKE2B b031370d8a469a93790b021e5d5f1bbd368ad0c13b144e4fb593d0abbe04d2408f6a7083ae1a1580ef5fdeaf26c59bcbcfcc0d5731f2fd42bde769cf1fb1ece2 SHA512 76931a5e5bff4c6f32aa55e27ff6ef6e320f79c21f1e3c3b3af4733dc0c141a7b782dfa38227fca4d6d50b763dcc3fd191581862ada051951b3185c596ca6753
diff --git a/dev-util/devhelp/devhelp-3.38.1.ebuild b/dev-util/devhelp/devhelp-3.38.1.ebuild
deleted file mode 100644
index b24e807cb834..000000000000
--- a/dev-util/devhelp/devhelp-3.38.1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit gnome.org gnome2-utils meson python-single-r1 xdg
-
-DESCRIPTION="An API documentation browser for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Devhelp"
-
-LICENSE="GPL-3+ CC-BY-SA-4.0"
-SLOT="0/3-6" # subslot = 3-(libdevhelp-3 soname version)
-KEYWORDS="amd64 ~arm ~ppc64 ~sparc x86"
-IUSE="gedit gtk-doc +introspection"
-REQUIRED_USE="gedit? ( ${PYTHON_REQUIRED_USE} )"
-
-DEPEND="
-	>=dev-libs/glib-2.64:2
-	>=x11-libs/gtk+-3.22:3[introspection?]
-	>=net-libs/webkit-gtk-2.24:4[introspection?]
-	>=gui-libs/amtk-5.0:5
-	gnome-base/gsettings-desktop-schemas
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-RDEPEND="${DEPEND}
-	gedit? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			app-editors/gedit[introspection(+),python,${PYTHON_SINGLE_USEDEP}]
-			dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-		')
-	)
-"
-# libxml2 required for glib-compile-resources
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-libs/libxml2:2
-	dev-util/glib-utils
-	dev-util/itstool
-	gtk-doc? (
-		>=dev-util/gtk-doc-1.25
-		app-text/docbook-xml-dtd:4.3 )
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/3.30.1-optional-introspection.patch
-	"${FILESDIR}"/3.30.1-optional-gedit.patch
-)
-
-pkg_setup() {
-	use gedit && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dflatpak_build=false
-		$(meson_use gedit gedit_plugin)
-		$(meson_use gtk-doc gtk_doc)
-		$(meson_use introspection)
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	use gedit && python_optimize "${ED}"/usr/$(get_libdir)/gedit/plugins
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/dev-util/devhelp/devhelp-40.0.ebuild b/dev-util/devhelp/devhelp-40.0.ebuild
index 8814cb624063..ecba9547e03a 100644
--- a/dev-util/devhelp/devhelp-40.0.ebuild
+++ b/dev-util/devhelp/devhelp-40.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Devhelp"
 
 LICENSE="GPL-3+ CC-BY-SA-4.0"
 SLOT="0/3-6" # subslot = 3-(libdevhelp-3 soname version)
-KEYWORDS="~amd64 ~arm ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~ppc64 ~sparc x86"
 IUSE="+gedit gtk-doc +introspection"
 REQUIRED_USE="gedit? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/dev-util/dialog/Manifest b/dev-util/dialog/Manifest
index 511f52669641..1db95b54dd90 100644
--- a/dev-util/dialog/Manifest
+++ b/dev-util/dialog/Manifest
@@ -1,7 +1,5 @@
 DIST dialog-1.3-20200327.tar.gz 547962 BLAKE2B b335d8b57d9a9f3a7e303aa3b2c64736007b66618a79c79368d9dba20a8123813cdeb7d0643bf7c6d147314963ff469b6e41d2378fe9181081fa543f0aca50f2 SHA512 c8c7ccd86fa189a2b6739320f59f127512e53f908ed257280099f8c45754da98d2095835d0c14090cd071af0ed6e8ff95f9938f5ca8027b0b7001c7fd746fe59
-DIST dialog-1.3-20210324.tgz 561235 BLAKE2B fbeae52e207def0b9ebcd9669f9321a711be82d0b6e163a94adaa21192a8fefa67255cd8b0a0121559728f4e5108ea8a90992a64d39fd0fa0f32e201de11f5a9 SHA512 6850485de5ffb4b5b702be792381b1e2c3e3e74143474b9d96f418ff755e17bd8075f1efab950cf0ca84fffb61c2373526d3607f2f1805b4056aac0ea6831069
 DIST dialog-1.3-20210509.tgz 562432 BLAKE2B f3a36d01f85516eb7297643158d02585bb62d4e54e90784218f0f9a825d7011093ed9c784bbdfd9c466b96b054ad44c23f97115599018befd449398678c78c64 SHA512 338ea8ee1bbbc44f0d8f511c5c87b246ea242a287346dd27e490d4854fdc00e9b4241d2ef372f131ef7152ebc2429d54c6bc1eeec0f89a6476e0a05f2683c64c
 EBUILD dialog-1.3.20200327.ebuild 1180 BLAKE2B e78b39cdfe37a0e49cd2db3299e5688802e692cb264842d7414b9fb1318117bca20e144137ff452feba85bb8c649e53691cfb010ad852efb1d8e49b56f356d2f SHA512 ec810cb43d692cec37720782c8c664923b0326581c1292f118e6bf061d7425b2e4a2bb4223d21315a3e5c9d6d30d9537949f4464d6445474343d47d655c4f190
-EBUILD dialog-1.3.20210324.ebuild 1272 BLAKE2B 15700bce1573818c48ce2f33a32d117809a01e69e1e5cdd46edded1fe7c347a1ef40a71ccdef62d956fd1f42a5afa32ed6e2a713903607484c43c69286a4a612 SHA512 916c943d818ddd637d4287abff0b7499955232bc9f8b6db8eb498ada22ff80c3f7b67edc6c4d7fc2166f9e78a7d7abcda706ab13e284f053feba6eda9537b80b
 EBUILD dialog-1.3.20210509.ebuild 1313 BLAKE2B 1da46bfe37b8d0c8521c5f7e9c8ca9029229a9b44c6f1127e305e33684aad557232e2cd79c385a6b2af55a073feb0718afca621119be3283943b5641fcf155da SHA512 53ccade7ec7c6bd674e323f5b2c573ce3687e72681a3542141bb9c63188f3f4800e8849a2b2bdfc9e89a600f8deb8bd0d056cb9903984223edf5cda3f39e274b
 MISC metadata.xml 460 BLAKE2B 2a2b2180cab325004ef2543c1e4cde0d98ce338beaad156c6b114f0ef49b3d726ad8f85974a681b596e8c68dd2433aae64ce38d8b47e0d52441bc1581bc35149 SHA512 f1c8215f8865105bba71efe5516742f694988b4421a3ea3ec07569f5e40cb50caddfe478c2bd5bae1b0579316fb7fc3ae361d19c3b33c6572e31239d927b3fc6
diff --git a/dev-util/dialog/dialog-1.3.20210324.ebuild b/dev-util/dialog/dialog-1.3.20210324.ebuild
deleted file mode 100644
index c60965071491..000000000000
--- a/dev-util/dialog/dialog-1.3.20210324.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P=${PN}-$(ver_rs 2 -)
-
-DESCRIPTION="Tool to display dialog boxes from a shell"
-HOMEPAGE="https://invisible-island.net/dialog/"
-SRC_URI="https://invisible-mirror.net/archives/dialog/${MY_P}.tgz"
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="GPL-2"
-SLOT="0/15"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="examples minimal nls static-libs unicode"
-
-RDEPEND=">=sys-libs/ncurses-5.2-r5:=[unicode?]"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-BDEPEND="!minimal? ( sys-devel/libtool )"
-
-src_prepare() {
-	default
-
-	sed -i -e '/LIB_CREATE=/s:${CC}:& ${LDFLAGS}:g' configure || die
-	sed -i '/$(LIBTOOL_COMPILE)/s:$: $(LIBTOOL_OPTS):' makefile.in || die
-}
-
-src_configure() {
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		export ac_cv_prog_LIBTOOL=glibtool
-	fi
-
-	econf \
-		--disable-rpath-hack \
-		$(use_enable nls) \
-		$(use_with !minimal libtool) \
-		--with-libtool-opts=$(usex static-libs '' '-shared') \
-		--with-ncurses$(usex unicode w '')
-}
-
-src_install() {
-	use minimal && default || emake DESTDIR="${D}" install-full
-
-	use examples && dodoc -r samples
-
-	dodoc CHANGES README
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest
index 0624597371f0..3e517e66fbbb 100644
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@@ -1,5 +1,5 @@
-DIST diffoscope-174.tar.gz 1590794 BLAKE2B 8ff40a301571f33953aafb431081a34e1c84fc8b222869fa0a7967f842e950727467af38dfb733257637a946b313bdc72a176b23ea1a36f977bdc8484e1d01e7 SHA512 8bc51c902ca24e08aacb96e3f225837f1de926746feddfbea7cd6bb947710c29ce3f32a98e032fb417d7938a86ec9de2bf15f556e7887571480facd6ce63acd3
 DIST diffoscope-175.tar.gz 1590841 BLAKE2B 86d6c910c60d1d472a7131cde8b5b506901ee0a838e96105194d1a8da167203a204c81076ccb06a47401338a90a0f7f49dabd13aa9ef100e88759336051e6b2a SHA512 950e5539a2d2242619426cbc3790a50f30119df2bbe36e5a03c63a9e01c741a0c529b0bd25439723064758c4c32cfcc621f67f7e0e0867071bdc47a7844ab097
-EBUILD diffoscope-174.ebuild 2196 BLAKE2B 34de6fd45de22af7b90709f728078fa57fd92f58e6fe2f8223ff2a6e57ea91e9fefd016ca3013328f1fc9e54d1f3d76ab3eba668aa7ede530ebf7bc43a6f0579 SHA512 80fffa1ea26a25bf7d1e55b558d40eda4c8289743d5681a0c95ff5bee867e34d83a0f6efb78ad92dfa322a3f35abcd774ad4e09ff277f01700698fa6c57dd2b9
+DIST diffoscope-176.tar.gz 1590912 BLAKE2B aac3ac90e4dfc23aa137cf69c6323419bdf29e9b9212b0aec9cd77c2325cb97c2f2e9a752dbe1171e7d6bf36999d45a9eff52e43735ede496575b05b5bbf7b87 SHA512 3e91dd69eb485f8b5005af91f7cffa7c05c08cfdc786af4fb6cbca4a79332b3e59c3faf98e34729ce2f231ca44161f002d93ea50b7c2ab2fa2ebde182c37b829
 EBUILD diffoscope-175.ebuild 2196 BLAKE2B 34de6fd45de22af7b90709f728078fa57fd92f58e6fe2f8223ff2a6e57ea91e9fefd016ca3013328f1fc9e54d1f3d76ab3eba668aa7ede530ebf7bc43a6f0579 SHA512 80fffa1ea26a25bf7d1e55b558d40eda4c8289743d5681a0c95ff5bee867e34d83a0f6efb78ad92dfa322a3f35abcd774ad4e09ff277f01700698fa6c57dd2b9
+EBUILD diffoscope-176.ebuild 2196 BLAKE2B 34de6fd45de22af7b90709f728078fa57fd92f58e6fe2f8223ff2a6e57ea91e9fefd016ca3013328f1fc9e54d1f3d76ab3eba668aa7ede530ebf7bc43a6f0579 SHA512 80fffa1ea26a25bf7d1e55b558d40eda4c8289743d5681a0c95ff5bee867e34d83a0f6efb78ad92dfa322a3f35abcd774ad4e09ff277f01700698fa6c57dd2b9
 MISC metadata.xml 2137 BLAKE2B 70393ec4166e001aaeeb4c10958693ff090b04e7e5bf7eb760746dc4920e0554724f61e1a073f008660789438bec33378796ebc117c1cedcac5116b0b1d32142 SHA512 a1f5648c7593f16db4df87b750360034647704b1809ed52d585d49b5769ee8e190ff853941d2739da7c5f514ef02442b3b3ebf55fb21541e7bc551c720a305d0
diff --git a/dev-util/diffoscope/diffoscope-174.ebuild b/dev-util/diffoscope/diffoscope-176.ebuild
index a189ed464d44..a189ed464d44 100644
--- a/dev-util/diffoscope/diffoscope-174.ebuild
+++ b/dev-util/diffoscope/diffoscope-176.ebuild
diff --git a/dev-util/flawfinder/Manifest b/dev-util/flawfinder/Manifest
index 393cd944912c..b6c993fc13ab 100644
--- a/dev-util/flawfinder/Manifest
+++ b/dev-util/flawfinder/Manifest
@@ -1,5 +1,5 @@
 DIST flawfinder-2.0.11.tar.gz 256777 BLAKE2B e2aa109a0cc435da7a8ba5f40b5dc6474e27ec340785c0070fce4a648fb5a186f6f0f5ab4e53c8e06c91fb1cb15179ecdb605a7f7477968e4d5595fc46cbd7c8 SHA512 4236da49914fa6317eb2fae1b3fd7ba08aa96a34bc5245bfd15b6532049193cbd0367bb3620e32252ce71cdd1128bec4b20c0e88b02c55d0ede1bb5bb091ddeb
 DIST flawfinder-2.0.15.tar.gz 253677 BLAKE2B 5c4a0e21e0a7f144382c6ca25f713aef9bdb413d4bb5a73f66632ef365f55c75e755ab59cf92fb54dc2d043c8b88be8c28d5f5fca36df6795dabc00313b839f2 SHA512 12b637bae789ee86710c7d6ee203b811e78414ad5d173730bfffe3ea783a76ce999878c57ddaa8019744cac6bf94967663fd9fd80769d7a24b0a79d23c0b0d9d
 EBUILD flawfinder-2.0.11.ebuild 782 BLAKE2B 73c59c1af865aa768a8b9c8202de9b17f67ba7a53a4ed5dac79db2b5165f45cf790d7d54d1499a995396447fa5c786a26211d5541040ee7de4e6d6a60509673c SHA512 7dea1626824336d141020c1b4ab286863a19ae6231ab49e56357ed9057c433c5723ac9853fa2ff69665cc506848600f4d0ca049a19fba90bb537e2f1bbfdf330
-EBUILD flawfinder-2.0.15.ebuild 780 BLAKE2B 4815dd5da5cbfe39f4e479bcbdad2855dab70eaad93650a71871c763d3cfdeaab520286119f9d430c613be15ae4e8a4e426735cc19effcf2c28a9dc1df2a9111 SHA512 8bc086a66519fc7550859162f21d8f4bef32fac2802abab8adabc78144b59768ecc6db122a2c67d924119abafa02d8085228afdcfa9a2e5c0e53144d65e3d0cd
+EBUILD flawfinder-2.0.15.ebuild 781 BLAKE2B 6d468c360c1b0cdb57a6c39806de80a2ac0b626e19d92c293532b57bd9d354642c37ea70b84742554b14f218d9fa2de2636ab9837cc82cab7b6078012f082c09 SHA512 69dcd37e29618c83c4bbad6f0a931a52216d9bcbe8f94f24deaad6ba8adad8e8c03b696c37da8a6a3ecc4ee003188969b1b911a54b9b67beba5de6a6646439cc
 MISC metadata.xml 483 BLAKE2B 28c5e9484510661e7b29519fe4311bea3cee9d5197a749c38b71b7a06363201e77b3bb34fe984175befd900ad7e8342d2694769e14d61e92b14bdbd095bb83d4 SHA512 b3cf7b35c84c7a35f140a2385c25e6a186b21c9f11f871af4295ce11de6123a71215efdcd0c4c665a8911de509b58bab5ba13c35f7e4af2909698fbf08213a7a
diff --git a/dev-util/flawfinder/flawfinder-2.0.15.ebuild b/dev-util/flawfinder/flawfinder-2.0.15.ebuild
index 445563b0e667..9305ed78d86a 100644
--- a/dev-util/flawfinder/flawfinder-2.0.15.ebuild
+++ b/dev-util/flawfinder/flawfinder-2.0.15.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit distutils-r1
 
diff --git a/dev-util/gcovr/Manifest b/dev-util/gcovr/Manifest
index a0f6cb9cd471..be469028d76f 100644
--- a/dev-util/gcovr/Manifest
+++ b/dev-util/gcovr/Manifest
@@ -1,3 +1,3 @@
 DIST gcovr-4.2.tar.gz 222847 BLAKE2B 44864c89b58b526c5afc293168c8af2c9082a99e92f2315485f10430fa5ff959046d189c018e0fa121ff4e9fc3685c13b737c112856c841966052d5fd6c9169a SHA512 bf9e22a58b8390eca391dc8f6ba58c4ca0765e66f18ac6f8d8f80609411df2bab74a846eb179a1aded81b7774fa8a8121bb2d586556aeaf43fd729205b0d0c72
-EBUILD gcovr-4.2.ebuild 940 BLAKE2B dfbac7c255b7c790b72fdc725a13478f63ad225c2e6cd313f3b05911ace59d146b66cbd8ba2affb55bc432f2fdab2776ca4985a7f45dfe709d4d437eb31b9340 SHA512 a0aaac27c38fd5166b294c06a0bb62be520cd755127dc21e8e9f5c5523151c6ddf165a2bcc83e1bb4b2e0008ebe198637fae7125aebee1ebdf7514d5c202ed80
+EBUILD gcovr-4.2.ebuild 960 BLAKE2B 4864811a5f83e87c1b5acd1c7148d8dad1e48986ccc20aafa3ee1ec61adebb2e3869ac0593dbb41d4a812caba33dcc09134f60406efdfed79e23c88f7062ebbb SHA512 29b855c81c3c3f27aeef82a5e20b47f58803dfcbc96437d9a9632ca61fe6f3e5e176543d67aeef250732fdd3bed809c554d0a8b7f5c6b0e8cacf957fcbc9a593
 MISC metadata.xml 404 BLAKE2B 0c1ac87d95e969877abd8993c95d6b723d0faaf645093cc01c3c88dbadce84a218a12d4f799a1e95535d67fcdc5725b02d95cc8b53408af04a1c81382bf223c8 SHA512 472f35c3e963a0eb02f8ede9f996bad20a6b67f364c5b2f40b37b90d552dbc1414af5c01862cd4ed7586a6e02cc10a408134cca6eb994f0b897f2fdef3a2054a
diff --git a/dev-util/gcovr/gcovr-4.2.ebuild b/dev-util/gcovr/gcovr-4.2.ebuild
index 580ac995f399..fc1fc53cd521 100644
--- a/dev-util/gcovr/gcovr-4.2.ebuild
+++ b/dev-util/gcovr/gcovr-4.2.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} )
+PYTHON_COMPAT=( python3_{7..9} )
 DISTUTILS_IN_SOURCE_BUILD=1
 
 inherit distutils-r1
@@ -15,21 +15,16 @@ SRC_URI="https://github.com/gcovr/gcovr/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="test"
 
 RDEPEND="
 	dev-python/jinja[${PYTHON_USEDEP}]
 	dev-python/lxml[${PYTHON_USEDEP}]
 "
-BDEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/PyUtilib[${PYTHON_USEDEP}]
-	)
+BDEPEND="
+	test? ( dev-python/PyUtilib[${PYTHON_USEDEP}] )
 "
 
 # tests fail on gcc newer than 5.8
-# https://github.com/gcovr/gcovr/issues/206
 RESTRICT="test"
 
 distutils_enable_tests pytest
@@ -40,5 +35,11 @@ python_test() {
 	local -x PATH="${TEST_DIR}/scripts:${PATH}" \
 		PYTHONPATH="${TEST_DIR}/lib"
 
-	pytest -vv gcovr || die "Tests fail with ${EPYTHON}"
+	local deselect=(
+		# those tests fail on gcc newer than 5.8
+		# https://github.com/gcovr/gcovr/issues/206
+		gcovr/tests/test_gcovr.py
+	)
+
+	epytest gcovr ${deselect[@]/#/--deselect }
 }
diff --git a/dev-util/gdbus-codegen/Manifest b/dev-util/gdbus-codegen/Manifest
index 8e6da873feec..646f2490c69e 100644
--- a/dev-util/gdbus-codegen/Manifest
+++ b/dev-util/gdbus-codegen/Manifest
@@ -1,11 +1,13 @@
 AUX gdbus-codegen-2.56.1-sitedir.patch 1898 BLAKE2B 2d3530f2c0e249254d170a7c0f1965cc9953af8b29a96bf7658a74595e740a4dc9b2dad804f16a855b2afa2f9a72eb02aabe42e1a94b166ecb43e0213125eeb1 SHA512 3983f2021da8045bb25a0f2e761a651d67d5b5f41e5d26ad3e5950f5e74587a6226ae5d1c21e6c7561b16d8cd6f17ca2a693369fc5b2cbb5d4d686a52b29942b
 AUX setup.py-2.32.4 192 BLAKE2B 574320d89095d1452a3eee4404b5ebb19fbed32febf2a15422d276bc8dfb6790c41b7214aad3f88ee4927b58de639146cbf633f735df693bd437ea19eae79435 SHA512 45e823f507db103543f024ad557d35f7c09fb51db8a78b978c762ca77d941cdecc5837d2b248fc2c5da6a93b56fe8ded359efd98fb0a74fdf9533783d8eebcfa
 DIST glib-2.66.7.tar.xz 4844892 BLAKE2B 2d128e8c933a8c5bd27734e96e50244f27c29199823e2185e8cfa5b4bbc0ca23f761c9de275c9941672eb945e302178b3cb4b5bd577f375ad953a97dddc70e34 SHA512 f6e6cc0fe2ab4a31a623bf9a1e63f833783e044e7ed55b66a84fc0cbf1410eec233fe0e226abb20aac0e40167a9624bf5e65197f9eed879da1293af44408d530
+DIST glib-2.66.8.tar.xz 4845548 BLAKE2B 8def5a2970f1df4782c93a1736d9ebd83ff1faebbfadd508e6ac58aa1d28a88a0fc7f504cc8006c2623bb656ce15d2dcb9e9188042daccd55adc8df0319599ea SHA512 d9d1bee82409bdceb14ab6008508f1abbb6eedfc22a35b1635d381594ee43c4ee9a1569d46bebe5b0b6d9fe7c629079f75660c6fa8f3b85a1dbca304bc6a6205
 DIST glib-2.68.0.tar.xz 4938804 BLAKE2B abbb06e9be3198ea79a42862bc0b71a40e87de6e4d49634458a6dd883d19c23d9e1a314b7820ea8eae230b24dccc909fd53b0e73587738e2341ff6f116e40cbe SHA512 dce0660476d67d7736c00861f4c3c267723f39032f582d1b2c17660a4939eeccd97e975da61b5be49e6f54612c6d5ce592aa7bdeacf4ecc75f3b38358da94a1d
 DIST glib-2.68.1.tar.xz 4940260 BLAKE2B fcf3a2fa2420ea3df13025d7a7e136862fa4cb6aa4f64a1af9fef7187d075db70deddad13ebde56b9032940437dbb311e9658bf112fd3cae8d8313d252ad2d87 SHA512 f705cda6f1b4b0acc5fe8d21b60994ca0ec6de39c6722f4f01cbe0ece30eacb7271d3cb29067e638e0204a3cefa2df1e535f273b72330455e185b544cebc2ab0
 DIST glib-2.68.2.tar.xz 4944192 BLAKE2B d35489dcfe9d57d8bd6ecf4f893b7c8e93a5b8108765791071fc811598d1f41287e03d95f20591d50d51a78db34f11833cc7970b1bf29299385357a14977ba0b SHA512 74d481552629cab67d22f8a440a7263a4e4b83adb6f3b772d368e255c17321b206aafd3af4653e5efbb2c3c14ca67d35f453728cbc5cd68728275d0b56789019
 EBUILD gdbus-codegen-2.66.7.ebuild 2191 BLAKE2B dc3dbf7ffb3cdf9a0bb7473a425abac8057bb7363e9e2bb76676e041a0feeef563ac24fd42fd0d949de89094bb17c176aa4e6f07c40bbad85ec1b1b82027be65 SHA512 15d0e33bab22e8533a77b2a078d1d54e6022ac6c188ab812273077f93230db777a8b6cf6d0ed5fd2ee8d57da291fb2e1cdec7f63c45d193903949ad909144b34
+EBUILD gdbus-codegen-2.66.8.ebuild 2196 BLAKE2B ed9777f0512004a0f95f123d1a7c24f2c506f8f1631a5673f6a56d3007b10d481a0ab37170ac81c596e14a838e3a207b7b79bf0eedb3ee028c7c0dedd5d3001c SHA512 79ea0d9ccc03eaf8864b34b9520b16e93669ca7faf2cbd904b1bc4f8384643e39c5a90df1be2c3132f0f85b348ebc2019dab2685de294ed7ba07134be2c6669b
 EBUILD gdbus-codegen-2.68.0.ebuild 2199 BLAKE2B 425de5185936d4dd0db3a77109fdb5a019044d7d0a7343978bb40031f56b6641511632a42bfa521c6bb732fdc6c1f8829e8a884f8572b8a0cd706209ae20768a SHA512 9f5748bc80d1849f4e7adb5b1995c43ae15c413af5f371fc25f2a33559536fb35d0e927e0e93d6fa3409fd2814cc3353d943fe54eb7fd541c909d46ee276d7f6
 EBUILD gdbus-codegen-2.68.1.ebuild 2199 BLAKE2B 425de5185936d4dd0db3a77109fdb5a019044d7d0a7343978bb40031f56b6641511632a42bfa521c6bb732fdc6c1f8829e8a884f8572b8a0cd706209ae20768a SHA512 9f5748bc80d1849f4e7adb5b1995c43ae15c413af5f371fc25f2a33559536fb35d0e927e0e93d6fa3409fd2814cc3353d943fe54eb7fd541c909d46ee276d7f6
-EBUILD gdbus-codegen-2.68.2.ebuild 2190 BLAKE2B 76ed4b80e4192e59b7f720c08c3dd989b80f44164f0700b3cb95433e99a1079082496479a975d19d10a3753999ebdc891c67f1f4e89e9a0b1f0175d1f2480db1 SHA512 6b1e79b3c796a6481841635cf0f287717949f0262bf031c0417a68b0b93fb603139b29bf3105f2a5d5c83b4a390f4a98311eb2a325299cb95c991c1fd2fc7b12
+EBUILD gdbus-codegen-2.68.2.ebuild 2182 BLAKE2B 741ec8a0d0b2d882043adab8f0e1226c6aff3414ab29b8b4ec8e321fcba5cbdd242e02e8a20d6538c3b7fca3672b2f5aa6d44f09debbce61d6442a377e78cfa4 SHA512 4e5ae6e7b0afadf83abee18973a71e0c0801f8cfded55df24baeda5bc182222f77935eb4a44cd881d6271c14f6972be097e9567c956a152ef15bef967922093b
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.66.8.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.66.8.ebuild
new file mode 100644
index 000000000000..62fe5ab69a2b
--- /dev/null
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.66.8.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GNOME_ORG_MODULE="glib"
+PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_REQ_USE="xml"
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit gnome.org distutils-r1
+
+DESCRIPTION="GDBus code and documentation generator"
+HOMEPAGE="https://www.gtk.org/"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-libs/libxslt
+	app-text/docbook-xsl-stylesheets
+"
+
+S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen"
+
+python_prepare_all() {
+	PATCHES=(
+		"${FILESDIR}/${PN}-2.56.1-sitedir.patch"
+	)
+	distutils-r1_python_prepare_all
+
+	local MAJOR_VERSION=$(ver_cut 1)
+	local MINOR_VERSION=$(ver_cut 2)
+	sed -e 's:@PYTHON@:python:' gdbus-codegen.in > gdbus-codegen || die
+	sed -e "s:@VERSION@:${PV}:" \
+		-e "s:@MAJOR_VERSION@:${MAJOR_VERSION}:" \
+		-e "s:@MINOR_VERSION@:${MINOR_VERSION}:" config.py.in > config.py || die
+	cp "${FILESDIR}/setup.py-2.32.4" setup.py || die "cp failed"
+	sed -e "s/@PV@/${PV}/" -i setup.py || die "sed setup.py failed"
+}
+
+do_xsltproc_command() {
+	# Taken from meson.build for manual manpage building - keep in sync (also copied to dev-util/glib-utils)
+	xsltproc \
+		--nonet \
+		--stringparam man.output.quietly 1 \
+		--stringparam funcsynopsis.style ansi \
+		--stringparam man.th.extra1.suppress 1 \
+		--stringparam man.authors.section.enabled 0 \
+		--stringparam man.copyright.section.enabled 0 \
+		-o "${2}" \
+		http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \
+		"${1}" || die "manpage generation failed"
+}
+
+src_compile() {
+	distutils-r1_src_compile
+	do_xsltproc_command "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.xml" "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1"
+}
+
+src_test() {
+	einfo "Skipping tests. This package is tested by dev-libs/glib"
+	einfo "when merged with FEATURES=test"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all # no-op, but prevents QA warning
+	doman "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1"
+}
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.68.2.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.68.2.ebuild
index f79468dd48ce..bab5d3bdf855 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.68.2.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.68.2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://www.gtk.org/"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="${PYTHON_DEPS}"
 DEPEND="${RDEPEND}"
diff --git a/dev-util/gi-docgen/Manifest b/dev-util/gi-docgen/Manifest
index 8af46df81889..65ec3bde6203 100644
--- a/dev-util/gi-docgen/Manifest
+++ b/dev-util/gi-docgen/Manifest
@@ -1,3 +1,3 @@
-DIST gi-docgen-2021.5.tar.gz 1251568 BLAKE2B 6dfd34ba97881562e5474874e3d51214b9536356d02c341ac2e7b135c49c5948114e0c78b2d53678ca09006238ec5ead50a1c0a50328ea5392960cd8c434c8e9 SHA512 30b91c2edf4be92eb4164ba64433948d2ae1c2857e54ac07a71aa1393d2ab61b77371c03504b521049f1841093ef3384788eaffab4208ef4e6fda8f254736ec6
-EBUILD gi-docgen-2021.5.ebuild 897 BLAKE2B de3244d845ccb205f35489ebfc5c01c0472a45409fc246680cd8cb7dbb04c05610e6204ef1a154d9cfccaef26d7f520dba62a97c1dfba8d02ffd038905a203b0 SHA512 4e995dd7fb29d2aab789ec7ed14bc69728af83608768cfc1d7f283776dbb9a95691f755789b7fa7be25a31957f5341d65135520fe04fa1baec1abe6361fd812f
+DIST gi-docgen-2021.6.tar.gz 1253449 BLAKE2B 8eb115c8554d122c0caf11a9d56ed423e4764ff3665cebe0f5d5c7eecc2df2c39885e213254bc2f7ca252ea8aa2fc57795497e43d348ce892515bb7c9a2fbb34 SHA512 cf319d30e82aa3dc84af106aeb2aafb9623225445773e7017080d2530fe03975160a233a0d60429eb2b420c17e329712b7f2321615ec4d63a5723b162606eccb
+EBUILD gi-docgen-2021.6.ebuild 890 BLAKE2B 44286c6f21f25b7cc2cb7c62aa3da4ad68e8753205444dc198052643b094ed9e1125e1e421d397dca9bfde4f0b627b4c711453d693632f9d5ff5dd00e132a5f8 SHA512 1d9da4e0a661cfd2a86b489392c96caf05155044d10cda5af0f3e93477dfc76209e17b59789531325084fd33b5e13c9636116878b1456927b4da5a7dbb3b1209
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/gi-docgen/gi-docgen-2021.5.ebuild b/dev-util/gi-docgen/gi-docgen-2021.6.ebuild
index 003594b9de71..05b15ce4b452 100644
--- a/dev-util/gi-docgen/gi-docgen-2021.5.ebuild
+++ b/dev-util/gi-docgen/gi-docgen-2021.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( Apache-2.0 GPL-3+ ) CC0-1.0 OFL-1.1 MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
diff --git a/dev-util/git-delta/Manifest b/dev-util/git-delta/Manifest
index 8d2b9b324f05..584e4c9e89eb 100644
--- a/dev-util/git-delta/Manifest
+++ b/dev-util/git-delta/Manifest
@@ -17,7 +17,6 @@ DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
 DIST chrono-0.4.19.crate 155663 BLAKE2B c92c273fb6475bbb2546dfb75eaa23321bc8f9a5fa8a7c652f527649b96ff8718fa932f52b500b02a4acae7837df5bdb14f69cb821d4962be2790dbd1d023a54 SHA512 a119349bfc2243a249f1d18b1ae548a04b30fecb75913a56f26d1ff8c0eb53097a2674d9141e2094018191cbbc1620843fbddaf52999824e077c1157f0907980
 DIST clap-2.33.3.crate 201925 BLAKE2B bec9c866481c5b3fddeb314f68af9bce38fc421e42816182de3209e8ea3447b72cf033e6251eea27fe974eff8085b7d98cdd2911b5cc0ec6b4bf4c750deb8a25 SHA512 3eb0fd648e2e3f9e5ff69a5e6cf0d867304fe18523accd036f28a86de368e4774088a6936c108ccc045092c539fe7f7494ea96420ebf6b4bec16880cea84bedf
-DIST console-0.14.0.crate 22587 BLAKE2B 3e91af20994c45b503fa4187ca537fad18efb0b552e09a3cc8e97f84ae0b51309dc1bff91bb54d06412f4779bb218652d649936216bb24fba473b988f1191ad2 SHA512 d453e82559629f0a7516760c18ce28ad347b4016e02d0c4f1aa725b93000cabc41749ce0bbb43cc98d6f9b0b92bf6726a8a265369d86f54a41a0a3f4ff8dd4b1
 DIST console-0.14.1.crate 22844 BLAKE2B 2e7a1480fc10ba92d4d5c601b87a0dac840b71c6c44679acf0a90667f37a40528ff2155130aa72be2ade1fdef4e6512dfb404b0eff181d77fbafb00c25dd6c5c SHA512 2c85d1938faca5163dd7eede2a8a07569e536c92fd0fbc7f6e6ed91c60fa7f947f0ae101817ed943b0668c4d98ddfd3149033c83614786b5d841b19a8b011c91
 DIST crc32fast-1.2.1.crate 38172 BLAKE2B 80801a345f4c5ed8a5fd335bbf672eac1733a1c2b333dc8a8e0254338148ce7b34402201a8d2d7434dd1b057f33d99d3a8f02610ea50b54115d80bb8da28b2b0 SHA512 4c04236bb15a5c63b712c62652777917e947823abb20a0d0b372c850ec1c8695faa414e8de73904f1f1a296d7b00a6206cde8da404cf4cdaa2e8408e64b62b5e
 DIST dirs-next-2.0.0.crate 11689 BLAKE2B f5022bc51dd50bad4ad0fd05b159a4117aca47afbea66dc42c8306ca58f3a550165afbcf9f5f721ef5ad8d357eaff305c6f6e42789354a910d5f1d05d3b7b7c6 SHA512 6ccb732da8ccf7bf35952c22a3b0caa8238319feb0a6cd3b0957e6be12548a2ce507c69cb6d3cbd2adfb37e13e6521c6229da5999edb0e47a292a41c3ea1a766
@@ -29,11 +28,10 @@ DIST flate2-1.0.19.crate 73768 BLAKE2B 1cdce9db71ace32d45b90774cc0804f4f663d1193
 DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334
 DIST form_urlencoded-1.0.0.crate 8412 BLAKE2B d65250a1d56cee26befb8733733ab67ffba9b9826755194158f336a22e792d38320292548ec73cedf18a56a806707334eb75833e54bb811c56a2ccfee05aa731 SHA512 193b8630b2790931c1ade898187637b2efdfed60b2c98a2dec6658380433fb7711fc2d8196834c19eecddd219ca7383e4a4946bef25c664bf4dc010388b60605
 DIST getrandom-0.1.16.crate 25077 BLAKE2B 0cbe96c27e78100c181a064e5fe524efa9a7a267fe60f8336d2ae0125883acd5d575ff17d1d56607255d9b2c30cb9d962026fdea1a5c3c29a5e0760d27c3136a SHA512 c5450c522c07c7a38b326f9a9062bac7d089630219d577ea4b55abad4e0c31d17b7cde385fc43912dfa100b42334e7a52422c55fda8b738caae428c6f9addb53
-DIST git-delta-0.5.1.tar.gz 1054097 BLAKE2B f08cac42102b3c1b84c967d7380056cfe3937ffba849ece57cf5639cc2c6330f33bc53d9f77847f2a3de856164d86df55cbc7ae03fc5171fff937318c94c640e SHA512 437c30c45d8d8076375efd99f0b65e202cf1741605d6d94b097ec335c94725a13326f90efaac4c07679fa9d418dac212246dda51bfa2fe90e902b49223efb4e5
-DIST git-delta-0.6.0.tar.gz 1055845 BLAKE2B 1d686808c745ec224592b6156ba2263d5b16341058cb01505399dfd45f362e4c7107925949d36dde7a5df16e41de2aa023dfe673d4270b2a62f17010cce9ccab SHA512 b5085d90e1fd0bf05113b289e9fa79eb2419206de0432622f58b3041d536a263e4a6fb484a11dfed24763a5990dbf46989b7b881d0beac0bad00000b89ffec0d
 DIST git-delta-0.7.1.tar.gz 1064009 BLAKE2B 3932d4adb5f696b92bf9d8987d90b2521401211944f9a8c0e5587e5dbcdf9ba93406547dee42885ca248687209c56d59e0f079f9e583f9b70104c09a306516a3 SHA512 cac2fdb9460ee49e8855a99ba2d9625205f050ef6be286c5ab55950aa256243ee5f367b8c2a333759a6a0399c89edb33ec97014296403a9ca4ab9b3d9704530d
-DIST git2-0.13.15.crate 180011 BLAKE2B c395900bbe65628ad8b0a51c99ddbc5b5d0b76240c0c030a1df08f18f0220515ac9e613a8d6eb7e71a64d303be843242c9dfe96c62ee8cf6a43b2369cccc15bc SHA512 c08ada81843f512cb855f5951c0fc97d4bb64af98f834bba30255b1ea70e4a7848ff018944a6c4a7d36fc480e631be4c40a5259e493258a6bdc1c233775cecb9
+DIST git-delta-0.8.0.tar.gz 1067767 BLAKE2B eea8d5c7dfe7d00179bdc1cd8af0bdd3f9bfe7d5787c107fb353b0d4c9e5986156296f2990dcf42c75961eb6a06d62bfaafc6ef9a21beb6e4288fb7547028993 SHA512 4d9fddc91fdaddd9509f04f214053024f4d1cfee1f03c83eeff2a759d933ca40f3dc9d1269f09394f15c5c1987bedb878f6e7515bc96a8102cd4c076fa24e924
 DIST git2-0.13.17.crate 181726 BLAKE2B be159d2f3602a65b133d6bdb3d949a48b34029b7a491961469d7a5a6dd8d471b0460ea53e802f69a216ed6111d0329e8a8ee29024af3753a185258f1268b5ead SHA512 5d95ff8d5c62df55b9995f2319dc350dfc9c44b90bb594f6b90df4985f8ebed50211e380885826251aa4e86eef1cfac99f648fba5f91cd4b725b0d05b3800fc9
+DIST git2-0.13.18.crate 189821 BLAKE2B 7ee264af12e64131d33be2161ea4be98ef3d334dbcfd88182a0aa26b7f78449571b22e43832337a24719ff5f548ca1531710f05b7c5b6dfbf8eeff2538ada3b4 SHA512 7cb932b92d81e52cb3561fa782ec1b03ef73e1ec3595ef933a0d79afa65f781ffc2f3c83766089fc06129b097d17e23d2d764fb47562f683a8d08a686377dc9f
 DIST hashbrown-0.8.2.crate 75830 BLAKE2B 9b08d98fd06e0cdf1dda7a86b8e2c6b1463d28eaf108c38c7c8fce1364ff1d752b044a46d0081b2348c6eecf0bf3e935e85a2d88c67b144e86734bf85a8e13ef SHA512 a6c5e5ae29d3068d54799efbf79b40ae95c2ab64807fe61ad44a49cd90c72b44f1e72340f5d6e2af1f9bb2684675dd86fb74eda03cfbf3a49d3dcf5080867a02
 DIST heck-0.3.2.crate 54718 BLAKE2B 6514f604361932e0a8e1a86786d3ec7218d95f8b3b3bcfc9e21c5fddc58ebe28bc0781e2ad24de4dd4296da85e97c742d8473370c99a593e7e5fc7df00fc9b4c SHA512 cbc72c3473ab14fe445491b1d9586d50de9a462af344638b871f7309fa805069a1405bcb1e0859b561f48583fc71045f38d03b92332d35131c67e140ccd241ad
 DIST hermit-abi-0.1.17.crate 10065 BLAKE2B 79aeac5f72873a29b53368fb01ed4288224692cc7c55221633775641ade40693bf3fb44db22cbe4422a74d1d6330450110f21b586426b6fb8ef93f116476c644 SHA512 1ed4688f2cc1f1d5ba2f7637e2a9dc230712ce8907e1fa3d95ae374cd4b67a325138a98f2a524cb03f99625775057aa0370f480a73ab20485f0456e2f108baf2
@@ -45,8 +43,8 @@ DIST jobserver-0.1.21.crate 21228 BLAKE2B ab1a6496d609e19235f022e920495e70857111
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
 DIST lazycell-1.3.0.crate 12502 BLAKE2B dca2d3f46823a52dcf87b7d6103fc4f1f83bc5247ce361946ac2d9df239fb43ce4b418104503698dff0242480cd014996e77da4ae0a88f3cedbce4eb9d3c9ef8 SHA512 f9d627afc28b61e9687a3f72260eb013401fd64057647641ff2e763770d7380ab1d2d8cbb4a3c8818d53d504c618a3b46aaf701f72f4d7b25d226042824c2f8d
 DIST libc-0.2.81.crate 513105 BLAKE2B 789a79faf2d5079f5c4248446fa7c07b11af647bbcc32521e7989928788bea7dc2f65204f396b4fe0c7b3a6cf5248882d7775b97c028a3af1ba35e8ecdb489f8 SHA512 8e121e0dcbd8218e02c2c6536ef6398cd002a92406d433c39bf84576e9b881c5b8a66fee826da6a6189f44b825f3a9d959075eeb0501d7f604bf9cc1a8b8d437
-DIST libgit2-sys-0.12.17+1.1.0.crate 1434697 BLAKE2B 864f59851b8d3aab35f520a5a5f726fbe3f97d36046e47fde7b237d01b9e40a03da0d0e08f241b08b4f53eba417795acfb80440e2870a5f473ba3e5f50409300 SHA512 a7232df268f091309c3405ff17833661ec5952404d7fe63a68c8ae98bf134ac49acfd4ec5bc3402382b07bcce529fb7140938fb150828a7d670bf164a73693eb
 DIST libgit2-sys-0.12.18+1.1.0.crate 1434936 BLAKE2B f283177caa941757388042ca4578394e160ea8e5776f6b4d842f778218286ccf65ce2febbfc780606d7624660224b11a470849b4d61302dbc11b3ba5e8d1b49f SHA512 3d9be57074e15bb0dbed151804d401d4688a77f1d46eee171e39b00815a983c103b614509ea0bcbe3c1355fc6c47738fe9da7ef6b8ee2d040fc30062db701233
+DIST libgit2-sys-0.12.19+1.1.0.crate 1434327 BLAKE2B 3e21b7848bed79222b3b7b23a3acc356649e356c9316c02f2c621b501899587f292ca5e20cbc78f21d34ea896bb04bb451ff0ee74020ed32d7d26b904be628c1 SHA512 c12c16ea06c409b6b9b837050192de8b8fded5d5be3eba1ce51789d0d3fb2dea5ca081d4a7079f3d20a2a3363e9ff9740598d267d3b6090f3b73c7df076f9eef
 DIST libz-sys-1.1.2.crate 1339299 BLAKE2B c055fdcdeaff5d44cc95f6cef190094317644e4881f356e46b0c0347221ffb867afcd29ecd4d995bf397f714b705ce84cf34ab87010770e00b3aed1956fa46a0 SHA512 2342c738230ac570c61b466920e2ceafc0194381643540f094f6541917639a4f5b11d46d575bb03c7623ce109d376bafc3076a9d172233313e38cb6f49ed16db
 DIST line-wrap-0.1.1.crate 10010 BLAKE2B 8f64561931efdb39ef256b90ad12573df76449afadc11f38b5431c1fff73da3ef1dcf9ad8ba0c30cd1ef1b0a8d894a7b34327e4a5eccfea08051ae5abedb483e SHA512 31976e14355317bab470e6716542d3cfd59083a1808bb199dc2eddd51d05fab122ab054783d0996c1feb53bdb316e6fa24b34cae9ed8e8cdb2702bc43fd805eb
 DIST linked-hash-map-0.5.3.crate 16130 BLAKE2B 20ca73044271533d2da6bb6ca863a192b61231760fddb82ac373a34fe63d92efe5b841fa401b9aa509cc1e05b86cf672eae3f26ab5c07c7b0c25e764e128344e SHA512 90ec22fcd830ccfdefd1f7c480c5cebd5e95c822e0c28fff9ccf00bfbdda080c17a722697fdc991ee04a4a32e974309440a91284bc13c9ee70284e4e247d33b1
@@ -58,6 +56,7 @@ DIST num-integer-0.1.44.crate 22216 BLAKE2B e1c08427e006cde6f2084adadb6086e87e6d
 DIST num-traits-0.2.14.crate 45476 BLAKE2B ae310d9d5640acc3e45e1e5d1d2f519539795922c0058ee940c94c94b6654b39358b7c18dd23a276f2c1b16a30dd4de4cbc8575bcda6a5c11e70665d670e6439 SHA512 c3028eca9f7b718de0db3a36cf3e462bdba43562d52c9b809ed4cc0aa6af403aea542d6d4da743cd1dd541397815a3c5a84cef4d6e40122994e4be6a62319b2e
 DIST onig-6.1.1.crate 30790 BLAKE2B ee5b49def2318cdc1fa7123484eef48551faba5be52659403e7c037e84a9d2c786afdadd44812b1a478762ae582fe24f46425f9d70f1adecc870020bdcb58b29 SHA512 4d754f05a3612486f6730f850956a041f1fb8ff723fd512acd0a8a0a4a2c8be2b98cd6f7b6a882947d3b368bdb5822241e55a87eef331de80c375433d326a864
 DIST onig_sys-69.6.0.crate 620817 BLAKE2B 294bc78ba0aa31743ec12c1cd2c29c3566fc960f64788681cfc3b333e942efc367c1721efdad06bba218a48b3eb1893b28daac163f76cb28a3f872e940ccdf02 SHA512 79903461da8cdacf3f50c7f4d7a1babb200a883a3fa6515119a6d2a82c15eb64b7f758932a2a8c46f89acd052d8f2ab84cf87bf16a3ec9c570667232f54418f5
+DIST pathdiff-0.2.0.crate 6189 BLAKE2B b04f2769452686f94651251f017ed03c264b4fbd471a1ea1c529d48d0a2899a491aaa7f757dc6e5338e4536fcb0641bac46a7c6bc99280bdea7f6b91c7231bfb SHA512 9527aa96b6f873014c216c6326e0d235f764951d244f5cf36e2eaa0b8182b25e7766a46967b5b0b936163c6ec4796a15e72540dd3faca8abfdcbeba651c21f71
 DIST percent-encoding-2.1.0.crate 9748 BLAKE2B f3ff35ac683724b15e40c85e0fb8ececb07b61beeea82b7020f02d27df05a8a3535f157b3cd688533e414d6541de7de8640ef4756706d8061af0fec94ba04ab3 SHA512 98af4dfa7c6a3cf0d5aa929c436f9eb1ba1b576a944513f1284e6df2ad06be7cab9eba145d888d50af88f8c970bacc702b323041bec6d4fa1dc34095186c628a
 DIST pkg-config-0.3.19.crate 15451 BLAKE2B dc23b5ef12719b4b3d2fc5c93c087399ba954a5e127be91b26619466d5d7422e71684d02905304dca65273d69b66338d94c0642e3810a14df845ef507ddc0bfb SHA512 42bc13c4e39c8f71690db527d815884acdfd2ccf5fbfea700c6ed60257e852cdcb1c443e7774409e51da53612b0ff0aa165554b99fd0cba973f94a8df52982d9
 DIST plist-1.0.1.crate 39980 BLAKE2B 59c5e604e3e381e7d9a76fe7b694ff1779842bc8908fa187b176f361735c8fc8bfbb208ba3ae6ae5871ae2b8fa63e7266379b344eaccda17fc84b2c2ac545e4a SHA512 67c9b478ff89b3461a44c72e0718047fe8378909c3c371de36d875b54e867b7c41f56ccf6215688d7a511fa291620eddea1e1fcd7bfe357276d3d08ec9a84376
@@ -67,10 +66,8 @@ DIST proc-macro2-1.0.24.crate 37716 BLAKE2B e2bdbc7cc9ea254529e322f6a2eb44002b49
 DIST quote-1.0.8.crate 24997 BLAKE2B 53f8d9e363e2697b580f4bfa39257a6ea1d1899f6cd73f96233cb476de1aecd0c4bca9a8856d128af81ae0f428be71c19b0d2e4816d856bff20030c4cc9258b5 SHA512 448d06465d93d384bf31b0249fd143a92edc4b9be8bb3a8c1a86366241be6469c3874dac98acb3810d5177b106d7307c7d9e879f91cce2e278a319ef1935577f
 DIST redox_syscall-0.1.57.crate 17087 BLAKE2B 88e3ffcfd752e757f8fadfd4edca367f9185f09e609c329bb36f179183cf103dc182aae701c14afb717d2b4c3d72ba307b49fc671cc97aa7c9d03df1a7a1835f SHA512 c6e187087060084b7173ed0d9d0e982e4259d4f76522112268c02ff20751382e3bc8e119da6153170f5c54bd5b9cb028910f2f85c1c842099205dccd44659184
 DIST redox_users-0.3.5.crate 12644 BLAKE2B 093141c98164163dc66378f2ccb48a5f478c5b40b69ad4ecb89fe8967e4a309974088ea5f7a2b184b625fc03348f2e75b0809d3683696e9b74d5c4a5ac6a4e8d SHA512 d90f1816205a4f2eca59397f6866e5cd965af652940f56930f8bfbe2b50eda75cf78b09200bb69416a35cbeead3cbd4de354805568be2feef1ae4d691b9a6a3c
-DIST regex-1.4.2.crate 236931 BLAKE2B f316b777df1c97aef2994745e1fbd9ca676b0da6bf4ffad4e54aa11014d39aed343884ede3648b5fd676dcec5e4840e9d84f4a4faaeefaf5a2d772e2c5b9ebf6 SHA512 a9bc8061b7563b8494b21f35bf3c2af5f58dcc1b0df4e25ab8d3f99ba66527d5163e2c04b229b688fcb7934961f718fab72f22d66fef53562c5d96a2fb3887de
-DIST regex-1.4.3.crate 237273 BLAKE2B e13e1b5106123a728b6b02a81c3223d17620fc0c1e9e72f3472a0c7844aedf0f178be3d3f70bb15c054554c925e270bdf112e41f855f1bdf9183f42913ae21b2 SHA512 bc0dbde01a79e7863997194b894c0e76e01ed209d56225bd611dcbccbbe997abd48bdc4640cbf349c5f16d96ec613f5b31740e81fc7da82082a4ed48fa06deac
 DIST regex-1.4.5.crate 241716 BLAKE2B 6e818193ae1bc8edb2415d82946227ac24b5ef9fc99097d4bff1574a5b1accfd33ea04e38be4f3321c0a498888b2feb99c5ae4611974c79cf4a44d5d38c7fc3d SHA512 9ddcbc7a69df47ef1321c45b681ac2e08c693a7ab0de9b877dbb6eb6a5b07788bfb8444f3e644460bb2a7ad9a768567e0366aa34df2b9453036385dbfd39b85a
-DIST regex-syntax-0.6.21.crate 293572 BLAKE2B 49c499ba1c03447fe7c90f27147dc5d96daf815e330a4073fe293d3be594fab1d798d35a5e49f6af43c71befd47528927246c4ebb24b6a6a141135484bbecd31 SHA512 56507f4432804ea30820984f6cff03c3514988bc3e406b3ba3a89c36c9c5d75951e4acd000ba85b95bb83d253898ce7d7d282ed930e811e12bb644c4a5ec84fa
+DIST regex-1.4.6.crate 242248 BLAKE2B 4e54699a290fe8952f718709292c726167fa5064407dba2f9e8ed7ba98aee9333bb1ee807c104916b33cbb27eacc6e36b673a23ad0e5af8aefc189b4a5993ea0 SHA512 e789ee66bc37d44efbf9e9c210c3ddc371d9483d6f96d7367b861ee0e0abb5c8abf6ebcad9d3c3fb97f772a5ca91184ca6d36a1a78dd51b43f3279e4048c299c
 DIST regex-syntax-0.6.22.crate 293187 BLAKE2B 6dfa3502133e4f654ea3533c6e9eda7674b0628f8b0bc44f8b3cccd740a5cfa8016acb5f4f3be4a54d18a46bb1f950ab75a39ace69b5606667a371f714206b8b SHA512 f83a72e46da02800ee545d6ea3c5eaab48706a9c63a03bb73363f597173ed205b3e7c86bd80d909478787e68f49fe07aa52c29a83c381e3c4863e5d856bbfb6e
 DIST ryu-1.0.5.crate 49570 BLAKE2B 3bfba4a5f290a429de7ac3b86823b2a973f40eb6f48c15329173d95964d31ada36f2618be4b36774a03f97f2ce61364900c6a3ad5465a294e2df311a1f4104ed SHA512 d1708ffa3112a684edf2956b6730ead040401d38f1457cde074eaaa59c249007dc8b925629e7f6df89f7ea757e9d0826649d685cc8ede0a04d50296048bf476c
 DIST safemem-0.3.3.crate 7778 BLAKE2B 6ebc0e234054919687e8a369bc30ca6b007d0e4f8147157ba1a90c290b7f0b490e5c21a6d4406671e26ac073f9e4e06a2bc9b1f21eb152b05c4022a3a4ef3793 SHA512 2e4852ca91160f9f1e764b75145d794726a5f6c162cc99ecbf9cae20474a06cb3a0dfc245b895c51342240f6875423010b33e36d038b8b419a37e4820a9caf72
@@ -86,7 +83,6 @@ DIST syn-1.0.57.crate 229228 BLAKE2B c1f4e6a38ce706f86d8f075409fb341ed9a46aeb8d0
 DIST syntect-4.5.0.crate 752883 BLAKE2B 9c9ff2cc63ea421c0b8928a0578b278883d0a86be7f7c256820120a858f8c02b1d292e2474e5f2b63486e45cf5387e1a8ba4db2a5c9e7a2b0cf4eb687b42ffad SHA512 17653ae9baa4da049c899820f6033b3e7d71b96ab70b9c12e57a1ab305d155b12acec470167be2a0a37ea9c89ec4d19850f72d456e6857a7cf4dee65fc288273
 DIST terminal_size-0.1.15.crate 8795 BLAKE2B 2e7590a524bd8e439d385f925c3d5a3aadea20bb24b7fb5c52dedc4dccdd67f986b304208dc6d9cecf0e4b2c449dd980613b4e381603cad74fd9038420b289e2 SHA512 cf1612f46c8502e079b87a240ddecdc02be8481cb7b78115ba1550a9a732103bc19de11f46160dbc5af06f8576d3dc780ed0b199b7f24c92fc0734e0d07e484e
 DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
-DIST thread_local-1.0.1.crate 12609 BLAKE2B 34206b5232262cda9cc0fb970e20f154d43ff1c4477a5ad5ff9200e6d874a6c7b2bcd99a2dae75a984b54574281e049ad35307ace0dd188f44c9a95fa93139cf SHA512 f2bfca4eee32a8fc88a01ff5bf24518c12142228d95916d13aae35ed6addd0b7da2235359f15220049ef197555344ac31a8833775e7a5bd49144db9c54b3165b
 DIST tinyvec-1.1.0.crate 39037 BLAKE2B 8033a336c2c346df70d5c6161233043a7e196a2994b62c15aa022b7053f7aee686092fc7e2db551cd1a09ee5e4a038e777120c5c33c891bb47b71c78cac60e92 SHA512 29830cec393506651b20d045c584e3df5ce5f13fdf70e866d4d6b7e97fe4f6b07ccf2a2c64ced5b092d5d963af74f826930d96d817db90bc0e4ad112a399926e
 DIST tinyvec_macros-0.1.0.crate 1817 BLAKE2B a3d1966bf57c11afcd026269135a6189f149f905bb70b47537c0a7bcaef0bfc6c89bdcbdb0f6cb8e5255632855134631c683fc90606a254ec8ba818fd5ef0794 SHA512 d6afc83a3c70cde916a6ff599e2772588e4bbfa7a5b1c7e5c8aa0f4a8a5c9426182497a644e4a88194ece986d38fa64b6c8eda9eb1630441c8e65a8741a45873
 DIST unicode-bidi-0.3.4.crate 32228 BLAKE2B 853a85b29d1ac2025b7a28af64ead9387e3b4b1e790ad719d4374e349c1853ddbb5959a2890d9d6c94a5c28e4523fc3324deb6b1ed1aeb5e917f21b0e2516f6c SHA512 170ce083fa82bed13ecc62d85cb882fdd6491ae721e1633d3c1a5d3cee69422153afcf6695765c0e8fc7035440d0370d34afac9e978cb27f7506c07cba300e1e
@@ -100,7 +96,6 @@ DIST vcpkg-0.2.11.crate 12600 BLAKE2B 1c44c8df531a75f686c0497e70a72aa0c1b554c02e
 DIST vec_map-0.8.2.crate 14466 BLAKE2B 8f109fbff19604b82ea2aa61c952e2ce9b5597ccc8e1ef4e847648e2de08dece8c4debe92889edeccb8d393645fd0b62436b49d236ded7ad181c4a51239a9539 SHA512 4f1ef59bc2c437e79f1f84fe021bce5aa8ccd581f500f3d5776913d5f17d45b03ccee64f5bd03d47656318cfc9344a1f4311079d471fa409a8e4e94c143973f9
 DIST version_check-0.9.2.crate 11979 BLAKE2B 6568f8d4652fb470162bb2251be2260a6bf83e107a4f957ed91117938d5da48c42bedfb5e6622bcd6c37950805666b78984577bd8dae687dbb39e452078bd97c SHA512 b88a9d545ef103fe6d0eebe7ddcf328fc21fcb02c60828b347cfc35afd957669e652a94d880ef992450c167df3505838bc649e0d83896542fa13a149875acf26
 DIST vte-0.10.0.crate 24923 BLAKE2B f5a19e93ccf3eb29cd3cec5964309247cc7de951f92d6ef255e429fa05cd82ffc312c094cf9c6d17c9cbdf125f195bb6706d2b0fccf145b970abce2c2154a8c4 SHA512 39cc8addb09a1f3e50c7548a1be00f020e972f6f9aea3f7a091f3ab645948b7b1c96aec5332cb4f0c9bdb20fec0ae2ca2e82c63bba7680aaeed468a48097254f
-DIST vte-0.9.0.crate 24930 BLAKE2B 91b3c85493037d35563337e43ab64e14503e997b029bd2cc68e56a4e95cd25f1e65b9bbd24cde567e170f5744d55fa965f1b7abba407486cb44f84a21d0bedbf SHA512 ac7c947a01ec404132133740efbaba0bb7fe441fb97373c144dfe4f19a6e5d300657768c2a93fbc7be78247efffcf90257ac2373d5f1a283abd98a968f88b5c7
 DIST vte_generate_state_changes-0.1.1.crate 2422 BLAKE2B 6e8fb4ce0ca0fd6b9a4dcccdfb02445babbc13d47de5fae9bbb81e8c67ada8a40e8dc5e57c120c36876293b111ccc71e1069ea3fdabade6f9ba5ea2d44ff4632 SHA512 ba09352e037cbd279cbf5641c9783a24f76e54f1f09e13f0ab1ca99c9646c1e3c958e8e302d7cc88431073bad2e2d5619410f2f93f96f1db25f0f0ded0236f7e
 DIST walkdir-2.3.1.crate 23413 BLAKE2B fc9601f4a28cec383297dbd87d422e56db1e989e4273900750f05d1f4a92e114a5b1a5a54368e290c5f4b47159ed51f52d85ce66f003cd2f52ffc737ead20f8b SHA512 ba807ff0d098aabdcd37e23204632beea1dbb7a6adfd16cb1009cae9e7b6957cfeab705cc454bf8f2b62a08743214ab995e43bf46fc510012c938f9e2a434951
 DIST wasi-0.9.0+wasi-snapshot-preview1.crate 31521 BLAKE2B 716bdd2ec46d0bc9911c5e5e29fc783840559931b2563d8619675fc11da9527ddbe653a0f1ce0b782ee0c5f7a3131aba2b0867d415f003aa9c2389357569e7dc SHA512 dbe641f796ee3a5daafcaafc911ecc6dff170340f477c2df7a61fb4858a85aefc2637c9e61973ecce66a987aa8e08a736273a4aad3ef47eaf61ed4268dbf9c47
@@ -111,7 +106,6 @@ DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e
 DIST xdg-2.2.0.crate 13387 BLAKE2B f1a5909b6a4544eaf28d1d051e05a6b9b09043060e14e394410778ed175e9f27246afadf3851dec21020c5e2ca81ef4db44a34e58d9229972b2475ff5f40d6c9 SHA512 16342b8396b4a329801a0ce3b9db82c4c767d09339f895d9f000c64b7160df11019b320cda632f99d8d5b9f65c97894b09091ee4e2ccafac0cd671481fa5c61e
 DIST xml-rs-0.8.3.crate 52547 BLAKE2B cffdece0269b9c04c763481af3a3a25df53d7593552c0956a0efa30669aae497e7c4865c92bcf267f4d7684d0ab957fab3d62b76a241fbfd6497eae25bd9154f SHA512 e44048aa2a010c6242d79c8590bceb300d7056cfd1397c4e4e4411089a3c3686b49603fc2336ea69596b6775b729f1197ab6d9d7d8f83a758e2d962c07aec033
 DIST yaml-rust-0.4.5.crate 47783 BLAKE2B 3e888c5cc7afb43eaf3aaab2b6f47b86df164a66eb54d4e166b965cc84b1e06cd17bd992a0d6ee175d9a73a76e2b44a13167246383ed054afcf3cc1710b309cb SHA512 7621dc8dfd5e7d4a7a8805b2a7e8319b63b852367655f2359d4e3e8fec6c4fad52d75c46ce1161e4c674eac0780b757ce9d34e664e304d8d2beec7afa0363ea0
-EBUILD git-delta-0.5.1.ebuild 2855 BLAKE2B aa0d906f7ed49f523f5e66d2aca96c03cf46cb258eeeeec6e0316e8d487a2cb8372a7b805994a6cea63a95c41f15f4547385398fcc70485d0b2465f16272a873 SHA512 0cadcc995d3ce32bb86203e97bc1faf58034a7e6b0768051813d3b813e8ce49d3ebe410aeb24c944fc23be4f4d49fb74c8cd663f180a311d0bf6c34ae84f77e0
-EBUILD git-delta-0.6.0.ebuild 2856 BLAKE2B 18caac4a7d3f20250d948438c59754c8dd36c4ae8587aced12dbc970563aafb8233b66870d4969a17a1890439657871ba01a670c16fb6bf0981cf724e2096de4 SHA512 daceba956a457824f994a339cb806c9f6cb772b435712d99b80e239ebe9c62526dca8dacdbf4a1b9bc53c10ad0efd6d71b7d77d981d5ecc7330cb3c7dcb2d478
 EBUILD git-delta-0.7.1.ebuild 2847 BLAKE2B 1e62f229f558f87e230a77b58b40cca91f6e2419ec4f916fe1ac8d423062248208faa77650228771ff764668220dc0fa1906ca7f9801414dbaaf3cfa7b20e1c8 SHA512 0279c92aaa7590eb53eaf91bc12f0064261724e8090ffed92d0749113f1cd7e5bc432e1cbe576ed511ab76e4e6a80715d71f2b48e0c2759885d542c2ccdcd8b2
+EBUILD git-delta-0.8.0.ebuild 2863 BLAKE2B aa01f21af771b696f86dc7387453fecafa061faa33005eda2a7cdacdadd525ed9b4f9e309b2b75abc47d2feba2729aed9fbb291b52372b1e1d1d2b14bc541c01 SHA512 e9ab38e77392de16336684770336e14254523815effb03ab37c9704a8b1171271c037a99c41abd28d2a72b2de3962bdbaf3b1559a44c909f6751a5c2b3c2f670
 MISC metadata.xml 330 BLAKE2B f09602a10d43f553a7dc36968f26f5f4a79d12aab213ea51b1b2e76eb2f5ba8b698147a9ab3db7b088ca42008045f1dd1a5447fe5d7d2ce46a61d1438c202185 SHA512 ca570caf0648315637beede9dfd9c124b7b313448f2929a86262b7fec90280bdf105b22ca112f7ddb2fe16ee4c6f242e7524041c14a692aa9155ad4ae432207b
diff --git a/dev-util/git-delta/git-delta-0.5.1.ebuild b/dev-util/git-delta/git-delta-0.5.1.ebuild
deleted file mode 100644
index 25e530b8fef2..000000000000
--- a/dev-util/git-delta/git-delta-0.5.1.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CRATES="
-adler-0.2.3
-aho-corasick-0.7.15
-ansi_colours-1.0.1
-ansi_term-0.11.0
-ansi_term-0.12.1
-arrayvec-0.5.2
-atty-0.2.14
-autocfg-1.0.1
-base64-0.13.0
-bincode-1.3.1
-bitflags-1.2.1
-box_drawing-0.1.2
-bytelines-2.2.2
-byteorder-1.3.4
-cc-1.0.66
-cfg-if-0.1.10
-cfg-if-1.0.0
-chrono-0.4.19
-clap-2.33.3
-console-0.14.0
-crc32fast-1.2.1
-dirs-next-2.0.0
-dirs-sys-next-0.1.1
-either-1.6.1
-encode_unicode-0.3.6
-error-chain-0.12.4
-flate2-1.0.19
-fnv-1.0.7
-form_urlencoded-1.0.0
-getrandom-0.1.16
-git2-0.13.15
-hashbrown-0.8.2
-heck-0.3.2
-hermit-abi-0.1.17
-idna-0.2.0
-indexmap-1.5.2
-itertools-0.10.0
-itoa-0.4.7
-jobserver-0.1.21
-lazycell-1.3.0
-lazy_static-1.4.0
-libc-0.2.81
-libgit2-sys-0.12.17+1.1.0
-libz-sys-1.1.2
-line-wrap-0.1.1
-linked-hash-map-0.5.3
-log-0.4.11
-matches-0.1.8
-memchr-2.3.4
-miniz_oxide-0.4.3
-num-integer-0.1.44
-num-traits-0.2.14
-onig-6.1.1
-onig_sys-69.6.0
-percent-encoding-2.1.0
-pkg-config-0.3.19
-plist-1.0.1
-proc-macro2-1.0.24
-proc-macro-error-1.0.4
-proc-macro-error-attr-1.0.4
-quote-1.0.8
-redox_syscall-0.1.57
-redox_users-0.3.5
-regex-1.4.2
-regex-syntax-0.6.21
-ryu-1.0.5
-safemem-0.3.3
-same-file-1.0.6
-serde-1.0.118
-serde_derive-1.0.118
-serde_json-1.0.61
-shell-words-1.0.0
-strsim-0.8.0
-structopt-0.3.21
-structopt-derive-0.4.14
-syn-1.0.57
-syntect-4.5.0
-terminal_size-0.1.15
-textwrap-0.11.0
-thread_local-1.0.1
-tinyvec-1.1.0
-tinyvec_macros-0.1.0
-unicode-bidi-0.3.4
-unicode-normalization-0.1.16
-unicode-segmentation-1.7.1
-unicode-width-0.1.8
-unicode-xid-0.2.1
-url-2.2.0
-utf8parse-0.2.0
-vcpkg-0.2.11
-vec_map-0.8.2
-version_check-0.9.2
-vte-0.9.0
-vte_generate_state_changes-0.1.1
-walkdir-2.3.1
-wasi-0.9.0+wasi-snapshot-preview1
-winapi-0.3.9
-winapi-i686-pc-windows-gnu-0.4.0
-winapi-util-0.1.5
-winapi-x86_64-pc-windows-gnu-0.4.0
-xml-rs-0.8.3
-yaml-rust-0.4.5
-"
-
-inherit bash-completion-r1 cargo
-
-DESCRIPTION="A syntax-highlighting pager for git"
-HOMEPAGE="https://github.com/dandavison/delta"
-SRC_URI="https://github.com/dandavison/delta/archive/${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" $(cargo_crate_uris ${CRATES})"
-S="${WORKDIR}/${P/git-/}"
-
-LICENSE="Apache-2.0 BSD-2 Boost-1.0 CC0-1.0 ISC LGPL-3+ MIT Unlicense ZLIB"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64"
-
-BDEPEND="virtual/pkgconfig"
-DEPEND="
-	dev-libs/libgit2:=
-	dev-libs/oniguruma:=
-"
-RDEPEND="
-	${DEPEND}
-	!app-text/delta
-"
-
-QA_FLAGS_IGNORED="/usr/bin/delta"
-
-src_configure() {
-	# Some crates will auto-build and statically link C libraries(!)
-	# Tracker bug #709568
-	export RUSTONIG_SYSTEM_LIBONIG=1
-	export LIBGIT2_SYS_USE_PKG_CONFIG=1
-	export PKG_CONFIG_ALLOW_CROSS=1
-}
-
-src_install() {
-	cargo_src_install
-
-	# No man page (yet?)
-
-	# Completions
-	newbashcomp "${S}/etc/completion/completion.bash" delta
-
-	insinto /usr/share/zsh/site-functions
-	newins "${S}/etc/completion/completion.zsh" _delta
-}
diff --git a/dev-util/git-delta/git-delta-0.6.0.ebuild b/dev-util/git-delta/git-delta-0.8.0.ebuild
index 91a920546c71..08e1eb490d61 100644
--- a/dev-util/git-delta/git-delta-0.6.0.ebuild
+++ b/dev-util/git-delta/git-delta-0.8.0.ebuild
@@ -23,7 +23,7 @@ cfg-if-0.1.10
 cfg-if-1.0.0
 chrono-0.4.19
 clap-2.33.3
-console-0.14.0
+console-0.14.1
 crc32fast-1.2.1
 dirs-next-2.0.0
 dirs-sys-next-0.1.1
@@ -34,7 +34,7 @@ flate2-1.0.19
 fnv-1.0.7
 form_urlencoded-1.0.0
 getrandom-0.1.16
-git2-0.13.17
+git2-0.13.18
 hashbrown-0.8.2
 heck-0.3.2
 hermit-abi-0.1.17
@@ -46,7 +46,7 @@ jobserver-0.1.21
 lazycell-1.3.0
 lazy_static-1.4.0
 libc-0.2.81
-libgit2-sys-0.12.18+1.1.0
+libgit2-sys-0.12.19+1.1.0
 libz-sys-1.1.2
 line-wrap-0.1.1
 linked-hash-map-0.5.3
@@ -58,6 +58,7 @@ num-integer-0.1.44
 num-traits-0.2.14
 onig-6.1.1
 onig_sys-69.6.0
+pathdiff-0.2.0
 percent-encoding-2.1.0
 pkg-config-0.3.19
 plist-1.0.1
@@ -67,7 +68,7 @@ proc-macro-error-attr-1.0.4
 quote-1.0.8
 redox_syscall-0.1.57
 redox_users-0.3.5
-regex-1.4.3
+regex-1.4.6
 regex-syntax-0.6.22
 ryu-1.0.5
 safemem-0.3.3
@@ -83,7 +84,6 @@ syn-1.0.57
 syntect-4.5.0
 terminal_size-0.1.15
 textwrap-0.11.0
-thread_local-1.0.1
 tinyvec-1.1.0
 tinyvec_macros-0.1.0
 unicode-bidi-0.3.4
@@ -104,6 +104,7 @@ winapi-0.3.9
 winapi-i686-pc-windows-gnu-0.4.0
 winapi-util-0.1.5
 winapi-x86_64-pc-windows-gnu-0.4.0
+xdg-2.2.0
 xml-rs-0.8.3
 yaml-rust-0.4.5
 "
@@ -118,7 +119,7 @@ S="${WORKDIR}/${P/git-/}"
 
 LICENSE="Apache-2.0 BSD-2 Boost-1.0 CC0-1.0 ISC LGPL-3+ MIT Unlicense ZLIB"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
 
 BDEPEND="virtual/pkgconfig"
 DEPEND="
diff --git a/dev-util/github-cli/Manifest b/dev-util/github-cli/Manifest
index 36ac9ef2cb6b..545e3859be8b 100644
--- a/dev-util/github-cli/Manifest
+++ b/dev-util/github-cli/Manifest
@@ -18,6 +18,7 @@ DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.mod 374 BLAKE2B 4fef9f7da9f23
 DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.zip 393806 BLAKE2B 76acd4273e7b2b77b81e4363cee62f498846a6072b26c0229917ae984802134cb41da5ec081e5e71e0c97180dfb49306e624174ce86ee6eea59b22fb1584c45d SHA512 9583b5d95556ab6e798d3d0d8c3eed51d45a6fd32b6dea207a089a33a1e50ca5e468e975d386fe00b704d568971d2f3b7fd3937b0494c4ae920dbee84d36a120
 DIST dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod 36 BLAKE2B b430ef9388b0dfe932b201495a00275a6036338c99160d7362556be1e25924584b0802061d193533f23b1f76719dfd6a9484572babd25f1af0e53fd9bf07ac00 SHA512 196affe091247f94ceda4b56629bd62d4ee2b397f2c0f56c9534c02e43531b46705ad33543b58c1a4fc7a48e25e5923db087fe0485a93966a4086581c0d1d3e1
 DIST dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.zip 33828 BLAKE2B e46dda9bfc9513a2d03150e0f90c57b4028a60daa7a975a61a7e0deb82f83779b679d176527da6d2f763f174d6635c7aca9d0d1e0775d38a157f69e33fd1343d SHA512 4206fa50ea8f056656804388954562efcc78a14ed8f249801c601ccd399f70ea101e5299e07bd9b86e6e137a3cd2103209ef186193a1129e108b224ee5497432
+DIST github-cli-1.10.3.tar.gz 503359 BLAKE2B d55fc857cdb4d56d4f17ffdda30a41198125f28dd5575f61fbb98aa16b6e4bdbc1245ddfc0fff227f1c58cda7bb7df8d25e4ac20511a7b7e3b4bdde0153ff51b SHA512 0613471348f9598847b6fc573181cecc0a6c60a8c81c82723b3bb7d5ddc97ac4c1369199f68c09bcecd36f2e09ba1e133cf7444f193ef81f7aa1f4bdbb2694a9
 DIST github-cli-1.4.0.tar.gz 386950 BLAKE2B 68126e45886e1bc38ac6c3a541e52f69299a6e12f1b6c5baafa6d5c3fbf5be8c30854b5c85294de6b50dd6bfe9e12262758a4751aad1aa4f310206ac10d4cf2f SHA512 cac1675bef1bcf749c87cb1d196fe687e32b304d73e16d4fc21dc4f429d18d4c04aa00be713a6b76e1261df565ecb589b8cf2ad322e4f7d49ea102369c5bf644
 DIST github-cli-1.5.0.tar.gz 396453 BLAKE2B 728939040d263bea4a623571d03589628f69bf3887b0bd79da14d36da8fa515c1d646c00b2aff154685369d0e1a4ea5b16ed788f4989addff28af233568f3208 SHA512 a75bf4ea913310f097dc158a1b8ce73453402af0647d918007afe7fa05cb5dbf1bdff1f4dfc4b4b0a301d68ed447428088e956fbcbc755ea9396ffb6cb77152c
 DIST github-cli-1.7.0.tar.gz 435572 BLAKE2B 303b9e7ddd23a538952d0f2f9fa7f18f4523ef5ff9c1779d5d1988a709f4b26991934b0481b1ac3adb6ae70e1ba5601171fbe91fe1038e40f527c0359d974524 SHA512 27d50b698dcf137a192a80e3bf8ca9c5b393f566acc7d504f4285c236d6e1ef6e9195afcb3025f5c0442b2c538f18db6c2d86e5ce7074af59db384e91b01bb39
@@ -27,6 +28,8 @@ DIST github.com%2F!alec!aivazis%2Fsurvey%2Fv2%2F@v%2Fv2.2.3.mod 719 BLAKE2B d95a
 DIST github.com%2F!alec!aivazis%2Fsurvey%2Fv2%2F@v%2Fv2.2.3.zip 154742 BLAKE2B 1eb9644a4458d70e3d0ca66969cd4c50ee3ac3ec89a3840a0168d703fb4d716cdbdc703e07b9c60775220dfda3d48791d7410484314b7263f231155d51ec0d1b SHA512 765d4137f91984faf60380e9a67726cc679c26dcf421445b932aa18db9f2b29ef9c58d69c3cdbb97c3f1703fb880152d53c6eeafb639392a35218afc6491d8aa
 DIST github.com%2F!alec!aivazis%2Fsurvey%2Fv2%2F@v%2Fv2.2.7.mod 707 BLAKE2B 3f7da997d7cb7e3ed2426497741ee7b4517adb66588f268b095f9abe4ab12842a5e14df940a1b89d1e5514c0c377a0a71e5460ab22073a1639c6dbed892fe8fc SHA512 6f0c6aa88ce38abfa9bce0992b75b8ef5a2f58c743bc96ef49b8a97d7e04ad7071c0f63f65c3ff82e5014df91d383f5ab84a2c0ac8e54739048de9aede5443c5
 DIST github.com%2F!alec!aivazis%2Fsurvey%2Fv2%2F@v%2Fv2.2.7.zip 155695 BLAKE2B e9e29d2b6d215b75a9de1d33b80d827bf7403f940fd106651a0b00e87672d9f1f4a8c084139a2da9a92998cb3327c978c228bdd781f2dc8c45ba7f0a6b7ab4fb SHA512 8152f6fe278a329ab4518c77143b36e1bdd6f3f48ea0853e2e5a07b545728502776d61ad877e1819fb7641bcd57021d6343b979276a836a9b12d4f45b492ab48
+DIST github.com%2F!alec!aivazis%2Fsurvey%2Fv2%2F@v%2Fv2.2.9.mod 707 BLAKE2B 3f7da997d7cb7e3ed2426497741ee7b4517adb66588f268b095f9abe4ab12842a5e14df940a1b89d1e5514c0c377a0a71e5460ab22073a1639c6dbed892fe8fc SHA512 6f0c6aa88ce38abfa9bce0992b75b8ef5a2f58c743bc96ef49b8a97d7e04ad7071c0f63f65c3ff82e5014df91d383f5ab84a2c0ac8e54739048de9aede5443c5
+DIST github.com%2F!alec!aivazis%2Fsurvey%2Fv2%2F@v%2Fv2.2.9.zip 156501 BLAKE2B eb960b4af9b7599e976210b98af846f9144994afde0ab30f156b41ae52171c6d15837831bf25f83645522ac1dedab8a754cbba3234bb865174a830d41b9aba1c SHA512 89198b8b284f000c872b3b265e1b90617e2fbf1f2d4c3c33b0def7f8dabd308fdcad07860bd8f9752388211f2efc04bb76d71562f5d330334813d8a9636eaae3
 DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod 34 BLAKE2B ce54a247aef91043830bdf0603c8452ba38eceb1495af6e7a74c9119234a0dc5cd080cb25258c28f5e270acf91189a5ed33e361cbf17de2be5e37dadbda1d90d SHA512 320941bc3b7fb8bc595e6135cbc513a7583d129f0cd92508055291e141191066303cf75148e25198c21f6c6c539a790ea3210f3ecf5de6a2a03b70c753091146
 DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.zip 56132 BLAKE2B 5edcfe991d7fc40094d637bae8d8d6f1f897ab3d3786ade2bb80287738103264520681ced8d30d2037253206c32d3f867f4d024a571cb9aad030ebc451e198eb SHA512 43ed64ae515738487e9b75a2290d0b2bc25e83c021a9f29b21487c37adbf34e74e1e7d3d5ec0dfe678c8396356f95c3993a5f5610d1791ff62056cd182a4272f
 DIST github.com%2F!burnt!sushi%2Fxgb%2F@v%2Fv0.0.0-20160522181843-27f122750802.mod 33 BLAKE2B d234bf9be3dd919cb1f8d33750a24dca68c90fea110fd0ff62f0dba86d2ebbfc66d55fea62745b6383c5607bc91cfd78c9d2cf12df251397e85995c04707caa2 SHA512 dbfa64ac31b25fdbff12110c6f9815abfde65f281e40852e7165499a2cefb6656c74fe0b82f0f018304daa02b83b421e9c15654efabad39787c69c1b2996a79d
@@ -41,6 +44,8 @@ DIST github.com%2Falecthomas%2Fassert%2F@v%2Fv0.0.0-20170929043011-405dbfeb8e38.
 DIST github.com%2Falecthomas%2Fassert%2F@v%2Fv0.0.0-20170929043011-405dbfeb8e38.zip 73310 BLAKE2B b0aaa346be477c14bd504f98219659c8a82ba08afdd94f1a5ffbb44cfcb6cc9b014c1ee35aec6071d4733134931e6d2a569940e9f1f06a5e69b00f56d82579e9 SHA512 adf9a3b8bda92edd028f497ca10648900a7aac4dae9372469b511afc74e79f8b990e448f375ab2a8df651a491bab5413196c06db531adc10358865f74de6f26b
 DIST github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.7.3.mod 687 BLAKE2B b987855d98e0e6181e8f28c12976081b5e0699cffc79b0721c811eaf6962e6edc5a01135519f787eac6d38e742517aa4d6e061ac4e5ba986e5c5e0cbd2a19177 SHA512 bf5c7b4933d685d90882099aa8c5bc33f8ec58e5a35138180b58771185306b6119cfaab319a43ade929b4560be9746f9155c8d55d1755df12b177613982c7617
 DIST github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.7.3.zip 780356 BLAKE2B f1e5a30ad9e46d9f59c5fa3ef7732bc5071f5012ff3205d23b67a52b0c90eda2b8ecf370de54d3cab98d0f4695122f478cd70bee8751d68c3bbfd627418a0583 SHA512 74f74db02dd92d45ae77cbc64ffce73b87066cdeebc23a4f5cd509660accb72d72be398fd0571871e651191e62eef30da7e104ba4a4e88db323a0609cfaa48e2
+DIST github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.8.2.mod 687 BLAKE2B b987855d98e0e6181e8f28c12976081b5e0699cffc79b0721c811eaf6962e6edc5a01135519f787eac6d38e742517aa4d6e061ac4e5ba986e5c5e0cbd2a19177 SHA512 bf5c7b4933d685d90882099aa8c5bc33f8ec58e5a35138180b58771185306b6119cfaab319a43ade929b4560be9746f9155c8d55d1755df12b177613982c7617
+DIST github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.8.2.zip 816641 BLAKE2B 5ca6160412d4760ff0d7cbe7a5805bf2af26402dedeb3ee46cff993db6c7d88dff20d21e69f4959798515531bb7cc21ec3383963cd310efabb97a7b8bdcc79cc SHA512 431e8a1e183f2bd140fdfcca245fa4fe7c7ab096f17ae3b91f66e0198bc3d58b6242d68cc784d307333b6746d72ea58d6f46ec2611913f8babac92f83ece755e
 DIST github.com%2Falecthomas%2Fcolour%2F@v%2Fv0.0.0-20160524082231-60882d9e2721.mod 36 BLAKE2B 60ece6720c6735e5b01efc335fef7d7f1186087068e573d5fa073b811053ea60b761350f9c371dada8cdeb5b285911c4ff87495b800f9c19ffeb69739f4b143b SHA512 971e35af5346054a0930f5543dc936c5f32ca801433d3ca26461ae7c1583b4f814376e8880f4d5329c46c36a3bde5ee4290b825bf19fd70c6bf2fbbab03f8ff1
 DIST github.com%2Falecthomas%2Fcolour%2F@v%2Fv0.0.0-20160524082231-60882d9e2721.zip 4919 BLAKE2B a939fbc897831f04ef6995f3d6220d56b8b3a8e3ae4486b605b9601aeb5bf764249cdd619248ba55b650e15e208a720fe1571df99a850a0b742755ab36f86c0f SHA512 7947f0ed3b2b42b8454af3cfb0fb27ec38af8234936d7cfe29017d1168b80873dbb6ac1345719fc5c405df9c814bd732a4ecf6f985da880f4ad83cf2f25b7834
 DIST github.com%2Falecthomas%2Fkong%2F@v%2Fv0.2.4.mod 219 BLAKE2B 188d73a4d4cf4bcb52cea7b32d8d8898086532d50e8ed0e92825e2b34ae1e035111dbc27b995b9a12d70e6be509d99bc693a0af8e3734641dc23cd1da39cf984 SHA512 165cb7ab17309c66d509af018c8a521bd90f9a58fec8fa9437e5b32aa2105ef1be19a1a0a1b13a51300e308c5e63c6cb74897ad938bd6f8b3bfb2d372347d02f
@@ -57,6 +62,8 @@ DIST github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.m
 DIST github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.zip 37264 BLAKE2B 13a34ae8ce6866da183bb7f9f5dcdb702ffe846a3c5e789e99f6e112a1e64b1dbbe8777727e5678b4bdcac75ec32ddc52ff303b95b5ee3fd22423eaab44809c2 SHA512 e1b8ad2c09c16599c6e5053f871df9f66698c7a632276c1e68c80c9737216751939b7b7024449ed63da0a292688b4d7a441d64512aa4bd8684e418f4e5da4446
 DIST github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod 33 BLAKE2B f9ad41153ccea8eeb725d791dd7f44f2c5d8c997d85a091c0091ebc2ae38601928fcf13cfc0e326ab459538d16a3147f762c6b1d9b2abccbaebeb35691b0e5dc SHA512 98f0f51365ecedecd1abe944a765160f99ccde69abe92a44d4f0e30f72a664b828cddb085886d8460ea7faabd0cbe7abdbde905ac758be0a3752c9a8f3600b6f
 DIST github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.zip 7271 BLAKE2B 4590233953ed1577a41ef4425403585d5cf9d0bf770bc00d38de4601015911eb56f695145beb53739ba7a64ae0113686fae54842a61504005f5f1a519e98ff53 SHA512 6936a577297949e1a146e3efdbe88e9c81205ccac46974f092846bcfbd533a2c8f0f161bc74da60d7a0d8aa6c5d2b1591fa294320c3e97854626407f0f838423
+DIST github.com%2Faymerick%2Fdouceur%2F@v%2Fv0.2.0.mod 35 BLAKE2B 8cc71eac9734cee73e50438a522491b5006f8e07f20cc9dd3822ed4b66e5b2dc96babade8274a36e314b277b6ccdfbdc8342ea5229d8d5e98b2f96d745d7dde6 SHA512 80c21cdfe66bae15ce9897835444be7ec372deb5085d92fa87a9b487b2b21c74f1587eb019bec697692a989502b3914c0d7701b1888bff38d4c50a1e8c04a6b0
+DIST github.com%2Faymerick%2Fdouceur%2F@v%2Fv0.2.0.zip 25606 BLAKE2B 6a42b957358db7ec48968126f4e617cbdc4699c08649b46e8f7edf00432bae93847752d60bbf01aaa0fba10fea0185dab347f3b80dde9c60eb10c94556100284 SHA512 061d63c3daedeccbabfd82740276428f283e7e0c2d94d335d20c22e48839f51f35bfdeb87cd5884b28bb08ed9296fc564ec0c312fa693be5aca36d31959bc740
 DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod 31 BLAKE2B f69b0989e51b0b649f81b044169fe4309f130eba5bcc6ff33aa9666b1b754aa0e524b8c7a627a91000ccc4f93bf93cdee3e97bd3b2184b050878bc3f413f0c72 SHA512 f21fd002853e4435421f8396e6be016f65be1537815c60d23940caf26e3f14dd6f2caac802cb64cd586b1b1f1220b2727de347b3d1816b8e741f68d87ebcf03f
 DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod 40 BLAKE2B ce42c81a7dcb03d21a99d6240ce12f8455297722513497b1a75f2c848b5fb7ef70b577c2406638442f16beedd68806de890a5c299cf1c008c439df23df2f5bb1 SHA512 ec4424da8e1e3849408da7bfe83d37e21ac75edb889de8ef63be897d59678679b018f4606be78500952e7eee73a6252ee6e477b1a1612e2d036dbf72c17b9c9b
 DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.zip 14678 BLAKE2B 3f95d78aa356a314f8da501f8085a880201766e184abb6c222c45e09c0c3b5e1e1eb7b89cc8ed46b77b09be8860fdf3e28525d9a451964ad64a96c6ee848a41d SHA512 be60a4c8059a9cb07ceb12e079b1224b6f871ecb1d7953906ab303cfe86d00cb979e203299f00fe828b2f6d2a3f5d55814c50809e9b872ab6d96db73f3771498
@@ -70,6 +77,8 @@ DIST github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod 146 BLAKE2B 5efa8dad622ae25
 DIST github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.zip 12221 BLAKE2B ea2f826b4582ec60f51c65783408df0e065d2a752d1cba17aaf277e0c2b48779a3bf3579982dcc26e5566c899c3f933e4c711d2f1e01c98c13e73d46fa08baad SHA512 09432cff34f69e9b0cc6f0d5bb9af376efccb85ab4396c14a4e0c072272f3172a93c240c5ae0aa89eab91799d1bed1a0e7e00ba83682843f46344c9e2fc2d4b6
 DIST github.com%2Fcharmbracelet%2Fglamour%2F@v%2Fv0.2.1-0.20200724174618-1246d13c1684.mod 284 BLAKE2B c24bea0833ca93fe4e43e639f601cf7c2123aa21320193a59abed6a8dbc18530e1d2a9e90eb8a27d6b836978d5f79066b2b6ee328f3cd24508bae3f03a47d021 SHA512 55e98df741d1b7d2376e26b8c23f322e5425fa346d98f571d4f5c22cbfd63b6ca88c8caeb2f538b355a4cb8eab39984d1cd0029ab7570184ba80eb2958e8382c
 DIST github.com%2Fcharmbracelet%2Fglamour%2F@v%2Fv0.2.1-0.20200724174618-1246d13c1684.zip 553508 BLAKE2B 0e613623ae7238b16c77b0245577bbc65ee903fcd36f2a970f0e62955e2aea4b7ee36fc3b20bf892f95ed02417ad1a7288b09776bb4f8cdbde800dc364883d6c SHA512 31dd378d0006e449b88ac2ecef5e47198c10f86204e4ee0e1128c211ab31da3d4c62dddb594b5c34cf446e9aa7228c9ead3cc83895e5157d8067d728fdfbfb12
+DIST github.com%2Fcharmbracelet%2Fglamour%2F@v%2Fv0.3.0.mod 323 BLAKE2B 8fc88afb991d035f29bdbf50b4117d52e94cb705b236b61719074a6e326c1b806d671215593c4ccadfd2a8c6ab80c73de93019da4cbbb06dbb85febae8abfc76 SHA512 1f79eff7002815ad52b921c2842d0ed8efff32c58b480383bc3c915aa57051c6a33d537357921816f0e00717314d871aa11799579a2178b527cb5826ea6892af
+DIST github.com%2Fcharmbracelet%2Fglamour%2F@v%2Fv0.3.0.zip 569291 BLAKE2B 0d07a1a3631783d0e4b33eacd0c66f39afac95812cbfd178f810ff480abe31610a20dba77a78c74b46eb0a9f1db167ac1e6290101b777c6722285d8998922efd SHA512 55ee69d81016807faea888b06b2adff604a8a9589f563dc0a5dc76e22b0f399ea389db4e7f75ad5fc28163f24ef756cfacf7eec675351e1e88e323d2f15f372e
 DIST github.com%2Fcli%2Fbrowser%2F@v%2Fv1.0.0.mod 79 BLAKE2B 88ac27f2b8a39d11a8ba8be021428e51a3b79e5b61332e0cca0e6eae5703fdd4c8ec05ed2b581c3b91857eba4691eeef56ab69771ccda4f6f91512f64edfe031 SHA512 7837a60a0d2374201f1d3157daa3ff78e82f8c42f2d8794096d4ed67bfd9c4000ba2eae465b8c4b2e52f5f9c653ff22a3e4f2f0a8fdd06346ee85e395d32b50c
 DIST github.com%2Fcli%2Fbrowser%2F@v%2Fv1.0.0.zip 6846 BLAKE2B e7f0ef97ee4e1cdd0c1b2ce01dee8deebdf3569079e0d576e4d47004a2c3ac5b9bd5833e801a2863b3cc57ba86873ff13bce0bfc3f9fc9ff86ca0a3128949b30 SHA512 c37691f53b0e2633d81c9969542c86c0e7da45133ea85e5ea8b87a12ffe418f5d05f65a9c023b6a6ac31f9fb36dfaae053fd1ee0779475a9d0fc3f6fccc937de
 DIST github.com%2Fcli%2Fbrowser%2F@v%2Fv1.1.0.mod 100 BLAKE2B feb343e43f045f00f59414c508caa8abdc08c16f1cde5849b14d30dcef040be23c6a3cdd44382ef4d8cd1ce18afab85ddeda3b4e047734d840bb8a28866a530d SHA512 d1f6f537dc58156af462534ff5beefd7ee8e536b76c2a03954c0c1e466a8b00220aeb43d016c57b70be8f3cd478779c66753b281074708aa6f0e7eb10cfea363
@@ -164,6 +173,8 @@ DIST github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod 79 BLAKE2B 21f44263
 DIST github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.zip 16077 BLAKE2B f05e4ad34d0ca2cf07ed10f5b4510f277fb4fe621523c213016171a42be56edc1b33185a93226b0d04ae6f629358603030083c7b5ba03a36fadf8349b0ebaa9f SHA512 240fccffe9eef7f5900b7e3add1fc95b45efbca63d6c09086ed4a0d4c50d470fddeb01672da067222c107b794c204f8da63c366782c52e7b7de6514c310bcb7d
 DIST github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod 36 BLAKE2B d7cd8f31950392cb5de7f4223ff9fe3257568dd0a1c1b81c8b97934ba92379753dc936c81c39e5b553e4101bc7c035ce81c8d669d85ed1d1eee41a74218f3d88 SHA512 35151946ce44fde9d3bde1d0626749ac4bc68cc448736c3b0f056f40a9ae30aef591db614b271df3eba3a96dbc94052ea5bf7ff68749ec980088d60361934771
 DIST github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.zip 257755 BLAKE2B 13d505a73dd179828fd3dbcbc1dfb90f6bdf8a888bb7ab160713a566472adf63d45491fa29928853d76725c2ffa5ada33e802cf857376c83cd8085a31acb48b5 SHA512 5bb0e61c8622e09cecc099c80cd97cdefbc497d4ad0e88984b2936e7731991e972883eb639be1cc3f56249a97b4f14c6820cda6b1c08e4a2323aaca22b840dea
+DIST github.com%2Fgorilla%2Fcss%2F@v%2Fv1.0.0.mod 30 BLAKE2B e27d9246b156c5cf849385a59b9dbe9d6bc6d712557c5bb3810a2dd1fe5ac88c52ebb7c486036e38b987be500dcca7a387ca9f8536f97cc9c04eb9f5e2fc7d42 SHA512 f7ecf8988730573235428b747924111e239440b84c151d35d731de6d35a919cfce586eb67b129c8dda454fb6c6a5a7ff0125fb403d755f98be1a4df513100650
+DIST github.com%2Fgorilla%2Fcss%2F@v%2Fv1.0.0.zip 7905 BLAKE2B 5ead324407f52c14271faad5dd09afb00cdeb35c03135825d0915c4561961998b8470f7449b2226003e2fd19ad2dadf72ea23a6d928a9ea9153cb3e9fe94e342 SHA512 290c2111f44395900ba766b82dbcb3126168669ef04b8c5d912612cfde021ab7c29c133a7093883e2487b3bf6f10816b8c55883d6c3a2ba2136b152302a35d3b
 DIST github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.2.mod 45 BLAKE2B 5f187c997ed74f2aab1da57c9a828be383e41f47905531da8babc1360612ba5d4cc0fc6cc48106647ffa450f334c7cc5f455bea7f6e6b9734f3e55734cf623c6 SHA512 81ef224435efb5cbd429dd4339e8410234855f4a268302a61d34e76c388e89ea22c97ae90d71a6ef910ca00d3178e40d3587eaf484112966050fbd1f1f4843ab
 DIST github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.2.zip 79096 BLAKE2B dfe472a48935e77689778e60ac3379abac11b1fd632c35033f4ba19afc601175a26e38bcdcaecdc56250d1b90aaa2f7f499010040eccc49e477dc904202de4b7 SHA512 4506c31c8d95fadde5570686eff451f177ff4bcc80469a5bdba92b65afcfb2597d05f14ca724e8dd40b43b867ab9eef1f62d98d7afed6bf93cd33b689d646c3c
 DIST github.com%2Fgraph-gophers%2Fgraphql-go%2F@v%2Fv0.0.0-20200622220639-c1d9693c95a6.mod 106 BLAKE2B 1a65e75a7724f3ab30867040585056b7f0697393e038fdde69d8b6f6173f6cd0302e3a4e65f42405878680707c40bb3163e422a5da49edfc78ef47ee1c503ad3 SHA512 470fc9dd28cd76702e86a4a6e1df812506dfb9bc0e0cdbed8be2bd6859344a575b9ada6f9d7f53eadc44300f1e4e50e47c65dc4171f50ddd2ebfaad3146f780f
@@ -257,6 +268,8 @@ DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod 64 BLAKE2B 475c51201a379df2cc4ff8c
 DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip 12591 BLAKE2B 944b0b9a802757e78e3dfb11d6c4d79e0e0d90489d49262b7079e6ea4728328457f8773b392c8a618aacb5fdec78948a16cc852eff71ca6f4fb9eb422c03890b SHA512 3f0d00b0545769ad882e25a9a6f30b96ce4b72a8a46bb3c064907c94e2dda4e499eb32354c149f89752f9bc5d1ee5cb2ee5cafa46e2f65ea329fb432d0c0029f
 DIST github.com%2Flucasb-eyer%2Fgo-colorful%2F@v%2Fv1.0.3.mod 51 BLAKE2B be532e33c9a0e83b9d0b760b21d97ac83850299adb329f754f31e4b46dc7fb7a7157d2a41cdc258924ef8ee5c111a95ac3b0037d749cc936e1988a46612522cd SHA512 270b19446ac9a396f5ce7a000873928a44edb1457f86d294971dae08be37cd64ddb8edc0293e100ee60d56c504851aa69ab11db0b4cfd46649c5f79459e40011
 DIST github.com%2Flucasb-eyer%2Fgo-colorful%2F@v%2Fv1.0.3.zip 442291 BLAKE2B 02ee4982a588e0fd1575206340bd97663147459664a2942edf151c4aec2bd20da83984c68c76e1c505c1ef930b77f934a8210f6c0ca106a0c0c91ff63733b92d SHA512 8e275955eb9e5034c155c6e469e2a3117bee30fbe42e8ae394f496b83f473a1568847707707716dd5a3c57dd0e0a4bb4f4cc9af04940218ce24420493e923f14
+DIST github.com%2Flucasb-eyer%2Fgo-colorful%2F@v%2Fv1.2.0.mod 51 BLAKE2B be532e33c9a0e83b9d0b760b21d97ac83850299adb329f754f31e4b46dc7fb7a7157d2a41cdc258924ef8ee5c111a95ac3b0037d749cc936e1988a46612522cd SHA512 270b19446ac9a396f5ce7a000873928a44edb1457f86d294971dae08be37cd64ddb8edc0293e100ee60d56c504851aa69ab11db0b4cfd46649c5f79459e40011
+DIST github.com%2Flucasb-eyer%2Fgo-colorful%2F@v%2Fv1.2.0.zip 958042 BLAKE2B 62ba67a66c0b5e159d7b12c8e32aec36f6f442411951024fe0b95fddce22c0e00d1f855f987aa39eddcb59165da582d0ee17fbf410630b6bad8424c17b85c431 SHA512 89b52255dd45791100b58a693036c772d27b26011754caa15df2badc4a93038b70060c7358aa12e01494e2f24e94533cd4ea7f7cb78686e61540383d1680ba2f
 DIST github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.1.mod 40 BLAKE2B b8e71ef21c42894c31d75cce0e7423b21e716de0539a8a7ff462e0d5c05c77795238598630208055ad808af2db8c56a997e7e114ef391c07d380b996ce533544 SHA512 8a724e5cfce28512549e7b06ec42c9e02625adfb3398fd45af07f8c512782002a262e8567669929626814758f9d12041c318bd4258f88d110a851630537bd5d1
 DIST github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.1.zip 39235 BLAKE2B 29ca5b93a76a4547abfb2c237f832e7545f8b6f74c842644ed3d9f8f56ce6d388eda0c62162d9338dddb827dd09962e1d28ab551461f07fc0801899d6035b8af SHA512 b5d30c117750cd3fc87121787792c3575d53404b66e8095d1d6913488b0271c8372b0e17001ea320b5512987ad68e78479664a40c25f07e9f783fd54f7d562c7
 DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod 37 BLAKE2B 6bd675a05c0bb6f9dc12d09203d13de115801888cf8c02cb5d609f72d214b7e7ebf13a72ddfa2eb9172e9c2ba1f3e5a040f089a86ce9fe873d49288d5f7dc5a7 SHA512 3cc3ae26618b96a0fc076b18bab6f8f0f6a1064d6a9913c1015a9867fd3571d17f5d2867d72cec008e9bc7005883a596edb21424084f82ad5b572443de90f976
@@ -270,6 +283,8 @@ DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod 104 BLAKE2B a8f54d5566d54
 DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip 8902 BLAKE2B 7257687403b9f8f066147fdd4ee1bec7e4b02cfd3fddda8349a89d9b9ea5b93d9bef61280ed48d68adac4dfed7e382ee96886aa0d65d85406fb93dc6fe0c53b1 SHA512 79ba14a04838c509500e6098553e8aadcd7105445387160a8aa1a6d7b0e70f0e807c99036c31faf51920544da2156195174c8530e317a72728719cb0a9a66098
 DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod 34 BLAKE2B 55253c2475bc0169df729915bc92689eaad2908ff7b9dd81b8a553bd75d5f866c308a85fd69d664d31b0d2d373d8d52ee1701677cbebb07e361612ab8cf17f2a SHA512 00c272b4652db259c46875641b29489ecada2602e38beede8c8bd529d73b6e123bff58f8e0f8cadd2d680a6a5485aadffa448e9445548abbd2fb424b059a31e1
 DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod 95 BLAKE2B bb0de423d1270e7ec38c7ee345c788b23e2083b05e4f745832327358c4c054ef8d2f3f48d9bb7bc669ddc67796ca0abae164c1d40b2def5f38749d8ee4bd6f32 SHA512 923114bfd285393d06f681ba57db69f042f57d8cd7817a1611c7719121c812de8023a049024165e10112bda31a7f99d3bfe0d4c4f419557ba8909a2d005be405
+DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.10.mod 84 BLAKE2B 9eb09ef8bbaf550ee520bdc9e35c7c221f85842959082d661425c15073001853e3b9bcf1ca1b552626f418de752f0a5542bbd76dd7f1d23ef131f4a169606e30 SHA512 939623ea34e482faf1cb055cd861471367cd69257abb28bd348efb4572ac95428330947ca0a1cac2820cc2cf7bbc6cada12623ff873d9ebc8c4af490d8237fbe
+DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.10.zip 20348 BLAKE2B 74a4be12412897c2b8a361023107469ba1ed86109b0c216d010621bfe5700fbaaf4622ad5ab4b2fc13fc0c6ce9c2e2f9d47cdcad2c3efa95c47baa879bf3f816 SHA512 4cad5f43527cfdac732d5a71f083ded5080cbb01cb16245616408bcd41c99dd89002813a83a69d2c2e8a3aa46434495b855d592046108713739b3e29ee0ca8fd
 DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.7.mod 45 BLAKE2B a7d3b1ffaf20b96cc98161ea6756d62d8380e7557859606dc7975b3de91a2d4142932d5008caf40b41d8ff2ac1ff33f672dbfac351f3e518922a036d7c116a93 SHA512 0cfd4101dd8ed90f80b7f4ce2928cd322b93855764abae65d66c5ff9888a7c8aec6ee6581c7f05d1c80db5c78003ee2afc8537fda8a3855e2349bfb8267aba61
 DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.7.zip 19130 BLAKE2B 85321c6a52022df0bdd9672de52cb5b7c1a652432047d94c088a71d612a81fa71d0cf9fa611c713f8f57c4e540ee0212223e987eae040e95014bea07e135171e SHA512 9ea745a6ca03c046d7b77707616fa756c01f58862286fa9805e99e3a0090be2fbdafd763f432f3c9ca927518db73ee0ef74e0b95248e515f50c2c2c1d9b14065
 DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.mod 45 BLAKE2B a7d3b1ffaf20b96cc98161ea6756d62d8380e7557859606dc7975b3de91a2d4142932d5008caf40b41d8ff2ac1ff33f672dbfac351f3e518922a036d7c116a93 SHA512 0cfd4101dd8ed90f80b7f4ce2928cd322b93855764abae65d66c5ff9888a7c8aec6ee6581c7f05d1c80db5c78003ee2afc8537fda8a3855e2349bfb8267aba61
@@ -282,6 +297,8 @@ DIST github.com%2Fmgutz%2Fansi%2F@v%2Fv0.0.0-20200706080929-d51e80ef957d.mod 29
 DIST github.com%2Fmgutz%2Fansi%2F@v%2Fv0.0.0-20200706080929-d51e80ef957d.zip 7713 BLAKE2B 00c6ba491b5508ba3e1e6954be790e00da0c7ccecbd3d95abd1f791d2de4b40297b2f4bb9f9dce68dafcaae451f9674c358fdfafa82b94e441bc559dfb894437 SHA512 7d5646b8fbf81e808791fede4a64c2b5d9ff8353253fb6a0914c992ffd205ac6023e55c43fea317fcbdfa1260a74adce4ee240cd27f94988c8596eb5e9e092a4
 DIST github.com%2Fmicrocosm-cc%2Fbluemonday%2F@v%2Fv1.0.2.mod 111 BLAKE2B cd42dc1330b96fae45e713c29f29646a37b6ad3470419a4bcb43c20c06a5b4fc1f3e198b5b2f99ea6da0d3eb241a2e5becd89fdcde6f015a773cc0170686dc40 SHA512 3f63e75a3eaf94a9dd340bf3fd5f615ea713ab08725e9d90435ef4a7df218f1793069a73c0295a667edc008cabe6ed8cb9e3db71035f0a3b801e73e89fb38697
 DIST github.com%2Fmicrocosm-cc%2Fbluemonday%2F@v%2Fv1.0.2.zip 155023 BLAKE2B a7deb9eb724afb25ca7e806b916ff452a8077833ad962901e4d48ee6d7c907e4e2f05b6d7216905e412be864e9f7634c7ec648ce98b8da1e2e448a5087c0681b SHA512 49e76ccc9a2932cb6e7c32f98ebcbd851554d5e5c70d8302563178a39713b81e735aaf6c1cd20cdeb66b655734da11fa0994bda94fa1032845da96bdb899f958
+DIST github.com%2Fmicrocosm-cc%2Fbluemonday%2F@v%2Fv1.0.6.mod 196 BLAKE2B a5cc72f8e29a052a1b754f3d52a4cfeba02a40e67300ad4fc31a8360bd06dc2242e8ac9035204ba4c28890a1a5838078ba8e8d78825ef9c5441604589846ca27 SHA512 716843212eb91cdd4980f041a55d30f4223d03a210d6d4ca8d8cd6007f4f5a1cea4d1f9d26bd879cfe3d20e3679877704301664820e13d05d33243b714714f47
+DIST github.com%2Fmicrocosm-cc%2Fbluemonday%2F@v%2Fv1.0.6.zip 179402 BLAKE2B d0c77bf302b2e7411272045fab6d8c67b897b9a5620dc0da2f9aafeb446e6444cfa69f99a500290d8831dc59cac39c4c8e8fa62a9153fa790d55c3206b80970a SHA512 01a104b023c791033cba3b4780baa717a37e440684a5e261b324e1500607573092077c314ffd6e376be1ffeca1399a72d55579976d9958ef1751d780c583f405
 DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.mod 28 BLAKE2B 7846fb7a9c146e4b4cd0db250d3a84bca13c7c3b8292ba71215a041006c8ea39a36b88dac7749a9bba96dc463b499633591f6f19d43369067b0f4f46594b8ddc SHA512 4ce4d3df63fbdbfe3505816e81dc7e806554d79cfe0254ce8e0228bc16eafc014c98475c24f4a6e0c6efb6fa16e891e2e47c43c9ea10ce20a95dc69f686f6361
 DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.zip 205179 BLAKE2B fb8268a263b729fdeebf985c355c67aa1f3d2d9cfa21dc8268852df9788a2b27b06586be0d715e0d65211272b41117810e2441594bb1f74013cfcfd794baed18 SHA512 21644fd845a9e20e7b142e5671cc53cc39a0de3461b8374b6fb1719b44d464014041458e547e1621a765c3156742b0d5f2c6bd168f4ea49e9819af0d9f25ac79
 DIST github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod 416 BLAKE2B 845f9f6d79c8b18d4a070255eb93aac9afc50ad01593fc5c6076c59e4b5c09f34856b29ab24809a67fd10ffc5cc28908faff8358a52cc8885947c53622d6090d SHA512 7cbcae5e1749c55a0c3fa25b007035c0c44c8f982a37635735afb95c63a20ba019a51e74244c568a170b5a379ccb10cc8c9df716b6261d324755ea92c7f462f4
@@ -304,16 +321,22 @@ DIST github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod 37 BLAKE2B 3643a4250f81
 DIST github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.zip 25694 BLAKE2B 59d0a645e3fc29e94a04fbed5329cfaf2162f5779f1c13bfe96c9d979c7acd1b356587b6e30760568607ea15d2088a76bb58e4504e17abf360f2702eb6e8c3c8 SHA512 8fb62179a48e212b74f0e8af79ee1c20479b1725c089c75a12b43bf4936caaf87d42b35f2b7a7de87c60e793347bb185486beb8061e588b8085ac354a3ef8562
 DIST github.com%2Fmuesli%2Freflow%2F@v%2Fv0.1.0.mod 87 BLAKE2B cb79e46ab6a5bd617d293b588909a6b6c130c9349047eba687a75012c179f3a5efefa43939160cbb2074790d1cdfa2fa40085e9998233d305c38452478bac527 SHA512 578e4ad956f847509c7aa800374a036919c08d5cd6f26821e6ad4ca773c4ca64c38256e5f98e9127cc61ff9ecae8e12fbc02ee369f674e27eec6d2bd9523af30
 DIST github.com%2Fmuesli%2Freflow%2F@v%2Fv0.1.0.zip 21720 BLAKE2B 4d088d303d11be2734aad265a65981ac006f824d1564cc9a1517f1ad85192c042d1d00da87647d012522f477372f4816b9b15af5ab187d8a3d5a9ddeeefbd7ec SHA512 65c5012688d4e6d6730a2a50d770aab99e6664948ff2375b76b44283c7b0ebd3f35d1c2a460830e936743a1a9267b9fd1f9986ada7c8b01c459199dcc54b2d4d
+DIST github.com%2Fmuesli%2Freflow%2F@v%2Fv0.2.0.mod 87 BLAKE2B 4232e4d272111d342608db277952234efadc4a9548e8d7dcd9d06d36f34160a582360429f954114682478dd3bd03be353abca15bafecc23af0f687bc981eea77 SHA512 45fdba56ff5ad80e0b93c3c8ffcfd810d624176fff82cfcb484512d620e18f5521a50308be649d0cf1e5ff7fc9f46f3b24d73daf6c3e7829eee2af56bdbd3953
+DIST github.com%2Fmuesli%2Freflow%2F@v%2Fv0.2.0.zip 25299 BLAKE2B c282a1ac287ab7a19a984f2e6ed9e2f3647282116ec5d38284829a9339f28a335898455af5aae472d21262d70f885fdfb9ee32be42e8e832a64b75cf1bc94ecc SHA512 4cd0a9d9744766d532994a2098984adb724ba16d2f3b94448779c94c96efe33dbe0854b81b28421760eb6316bbd18aab488cba55285d8f21dde8ff8aa7949ecd
 DIST github.com%2Fmuesli%2Ftermenv%2F@v%2Fv0.6.0.mod 233 BLAKE2B 57f3b11b63eef192fad7cc8ba14b9be56ea9865b650d85d1db2e5a5a67088e03bb7948b61033d616df25454d795f33b9e6c65ad5c791a80f2db135728072774d SHA512 fc2d84b74177bfa1208cee1965ed421f6527bff59c2b0b3a10d31b41f1ce629e2537eea56f42e4e6f438607578dacace1ecd1cc4e81fa90d8530d048ae1e9a9e
 DIST github.com%2Fmuesli%2Ftermenv%2F@v%2Fv0.6.0.zip 411922 BLAKE2B 7e7334afdf133c56cad4c63d9ce3add449c688750065c3e1da5f2bb28c75f7ce8afe58642213dc4cc19bf8e64ec25b7f1baedb5a4caa28da066e9a4035f8968e SHA512 d3c0cbbe1681820cec2c117223a838c5346bb48216262152de5faca819300cfbda8def7db03d3e6c07ce0223df5177164d39f593ec43ffd52aac872f0e39e520
 DIST github.com%2Fmuesli%2Ftermenv%2F@v%2Fv0.7.4.mod 225 BLAKE2B a5466467d259693afe121c04b8096e3f979bf0d5440801898d135e97c1c52af157a9224f984739d9e73e5bfabb619ae23738c63934a67d72ba11abe81dee3d58 SHA512 505a79466a4a2d5368afbbef355e0abd7f41936f8c489e3e584430d6d59aa0a2d28679de67e0e087b34ada18c0241ae61232fb5ad797909de49c41b1cbc6852e
 DIST github.com%2Fmuesli%2Ftermenv%2F@v%2Fv0.7.4.zip 413026 BLAKE2B 9cb627ca507513e34b7736e7ecc94d3fcb9e046e1180193dc26d41aa027428dd567c0436dd2805ec4e04f50213cb4045c14b9b21d1f3f1f18bb52c94eee5a245 SHA512 240b6f2dcd9d71cb10a228ecf3ef6cfcc31656704219154c0479b6a67a6ab55c023c90c0468893009f410006d995a78771ec97d121ebdc467cc7e4571d19821b
+DIST github.com%2Fmuesli%2Ftermenv%2F@v%2Fv0.8.1.mod 226 BLAKE2B 1ae69e2c1b269f87b4d84b400eaccdbbd84ea81e9dbf7123e0e355992975bb73da86d167c4efbb4ff419beda1bc89ec17275e5a3e2cb3cb5a46b85dae7f0fefb SHA512 1b1aba22918e3424bd245e7fa0f0246138ed87509ec0a0b9f17ed732efac1e6e6f57a410cea31e7261227a9d19c4e274e36400461299019b29abde9861e93bdb
+DIST github.com%2Fmuesli%2Ftermenv%2F@v%2Fv0.8.1.zip 415278 BLAKE2B 6543eb81d9fc95a19f765c1bf0bb61851617c3752e9ca78e6327a7f93bb550aafd0ea14b046725e3e8fe1968dbf580e2b8001c921ccc645f019b9de990f11e6c SHA512 a0fa2ac403ff85ad1eacf118dcd2c6ed16ea610a35204f75a9c53bcc03d1408c4cea8e95ee5c8d70906b548562fe231d88c7972c173bbaa9071d5fb83785a5a0
 DIST github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod 39 BLAKE2B 391eaf696f1a5c764f9e156ae3f6285ae5bf8a4abf2a735fd13fd1591f3bb97737502b79df093156305503ed4b63e0d458900e61fa8717f96ee17a6d43bc2f79 SHA512 9fccb6717f5b37cff2d858cc31f7e16aed120a67498c2f0d24aa30ffac4eba2e87822b12d62f700a0c62d7561708bab2e13e35e89cf5407cfb06a0de5c70808b
 DIST github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.zip 24318 BLAKE2B ca6af09a05d68b30a5d7b0a25a5aabda5253db4ea60dae79a02dba819771740b51101ea6abf43e456a5371a1f4ce541ef7152e41a292fc0888b4aae156ee6263 SHA512 2da970823cf8360fe51c74349dcc50161299c67db7d364bf16941325a357cda0ff9a216a2423bd463e36f2a6d888848fbe671e1998892c78edc2690e28e93d38
 DIST github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.mod 29 BLAKE2B f74d75a495f683f4e9047201721611229ecddc37ed01b5d4b5d81a06220a6385f06d0f99e514bf19cc2030fbdba6de3a08fd38b750e6651a822b10bf69c45327 SHA512 b426d975637bd2b4dddc10d7c88b70f8b946201f311859f22520d53ae0a2d9911ab358460c089771f7900d7a8740bbc0c6d3814ab8f955108fc31b7b602ab5cf
 DIST github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.zip 21676 BLAKE2B e526b9b4942340554bbdd07d83f4cb9678348c600793658644deeb1c64880d420fac1a95002cfd846e7c24d5aa5b1768b5bb1f71a1aed5e44e3755fe2a7c80c0 SHA512 6e24127bb86e9a0990567541b268c9ffb3a91d9cbb379b59b5120ed7f34d6e7f5f32b9efcbbe17553466fc07c06d34017644d7f751775b734b186af1e94d9629
 DIST github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.4.mod 96 BLAKE2B f192300c52fbe1d75a3a9c89e3d808d25f13944940475b8f2654b3e3a1205721f6a9aa553ab6293f7ea4c9e8be3d695bf7fd5fb55c35e3179cef924fd1334273 SHA512 29bf0aa6ae9cc8d66b0e1bf852534dda3a3e0e16c918be357cc8f6fec14f2d2537a94cafa1ca9cd06b64363a8f0f0d3c00dabcb5137699aced8d16af767f6ce8
 DIST github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.4.zip 24551 BLAKE2B 4b7736d36b9c2b2d38decacecef3b6411e190d6504caf1376f6adbb0d4458889eb9c0aca1ff936e0223eaa26c7cc2e077671c490f998e071a6e63cb7645580c0 SHA512 bedaa028d6450dafaa54f17c444b8d2923cbce008bdf73ca442297793b1b5bf60e829cbb6175d5b24fcadb8b91470e07baa369180a61d3e9a43ccee5ba18c150
+DIST github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.5.mod 96 BLAKE2B 7014a0ac5adf29ba3e90a2ef7400121b655c47924fa0fffe686fdf4234b4e01fe92ba04e82b5153b63c8d20c8b466af03f0fd0975f5a9d6e8dc2f305e4712cef SHA512 79c65033c9ed8b95230cc1f11ae5f1684a3a0d48ca9c47bc33d46376b732be4d08a8b6d39788e388b86ec16e502e378fea4654424e81ab3fa372ff30e87bfdfb
+DIST github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.5.zip 24933 BLAKE2B 930a6651270418384adf858856eb9b603a289230f1f6ffc65d0f816f7b20a8d7e1f5dd3c6bc27eea4369670da7e5e5b512fc966b0b6d06eb6735625a53c85eff SHA512 51ac6647cf44f5ba36d9209576dff1f2f133ec8b0a13a957e4642e3034b2d2b755de8ebf34a0c77f146b3f33044cc2f71a85e512690553e3a3bf311c2f46bae8
 DIST github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.1.0.mod 45 BLAKE2B 7a7820ed255877b390c76ffd281258a8e70dbb2812b7d2d0bf63bb431e8e4f52faad48d4e6801b301ce35cd6dcd49ceac6ab94b32e35befe2e6df56e1a1e8eec SHA512 13b356ebfd062cecffa1e323aa7768d933c6915c2963eff50b1f743712d48cb24f137ba839a7df211e6e02979a4d1c9d32eec8194227edd995c3d35849edeb54
 DIST github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.1.0.zip 44929 BLAKE2B cbb592f6d60d1e5906d0bb0b89431713851582a17f092a7bdb7a508469013b99567a6d6f44807fdd79bbc6e470b01c6605d74b79dd62215111d2d4d5469a5fdc SHA512 a813adce63d0ef8b5a2d95c86099967bf5fdce2c7e71e1bc72d760e1235dfc430e650bb6dbbf1d42987586f496b1a5bfa6af8d20bd1fb1fffca786319cddfb22
 DIST github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod 35 BLAKE2B 3db6c40257f2c4b0254a26c6e414fdc87c037f6312d4bf7bbd39420d6df70f50eab84c387b54cc71fe16068e1b25e3fc63a833e11cf5b4346f842bc61328b0dc SHA512 0b378d1e15db4fc5a3d7d711b63dedefd141d607192344c8d1ab2ac755ab9c6e91b2c320378ac8a485cf94deee59e6628e7930017c6d659bead6ba89cd78a802
@@ -345,6 +368,8 @@ DIST github.com%2Fprometheus%2Ftsdb%2F@v%2Fv0.7.1.mod 1346 BLAKE2B a46e52b7acf7f
 DIST github.com%2Fprometheus%2Ftsdb%2F@v%2Fv0.7.1.zip 2440454 BLAKE2B e230d0def98fede5217a4b305b203eea723f27562cc27cf39f3226063bb7db0d3ad5d8105757bad66502ab7d83958c77b82945c3c532c3ca883ed5199e5d713d SHA512 fc26a92f68dbc1c4e8cfd7bc5948a9a6b6e3fafc002d3c94c18e58cb70f12415054c7d0c94d5c0eef549f72e83e561e3535a9c86398c18e5e27a11b14c8bdf5a
 DIST github.com%2Frivo%2Funiseg%2F@v%2Fv0.1.0.mod 39 BLAKE2B c619b92efed318039eb06878b084372e8f3f45426623a9c1f045f21bf44f86347472a28a4164f607cb9fca3c253d4c9df0dd33d1dd8baaa02230af9feb8dc7f6 SHA512 d6089badd618722b8d3584965f1a10290097f259024a444744f625fe5b439fef62c7e14f060fb8593197d003ecd6c29f0cb85700de0bdfbf2511ca66729db3bc
 DIST github.com%2Frivo%2Funiseg%2F@v%2Fv0.1.0.zip 45664 BLAKE2B 300a1f32c514f6857be8cffe884b9fc29091a709746c83567f82413b0e64d7f42ff3aa6bc34846745489f98e10045736e3571797e715fad87cec937df28d0fc9 SHA512 f9a98001ee97894e319b82f4c190f93ce7a60e109b991691f3a90cd51818596b1baefcc1c24793aa3c8c9d4505f809fbc689037b1a929e21e17fcf134134118b
+DIST github.com%2Frivo%2Funiseg%2F@v%2Fv0.2.0.mod 39 BLAKE2B c619b92efed318039eb06878b084372e8f3f45426623a9c1f045f21bf44f86347472a28a4164f607cb9fca3c253d4c9df0dd33d1dd8baaa02230af9feb8dc7f6 SHA512 d6089badd618722b8d3584965f1a10290097f259024a444744f625fe5b439fef62c7e14f060fb8593197d003ecd6c29f0cb85700de0bdfbf2511ca66729db3bc
+DIST github.com%2Frivo%2Funiseg%2F@v%2Fv0.2.0.zip 45731 BLAKE2B f4a1442027b29625c694298e10ec9c107edd8437d8749110cd56440dae791c0e6d88a68187240cbc521f79fa7bdc4307e4b3b4edad38d57d5834644342a066e0 SHA512 88f37961ebe3a1701265a2f5cb606e97fe4ddd09e36ff13ca8c026e98640af5d35cb930e4d12b6690a97e5d934705102554c6d2912ebbb5ee08976c698cce2db
 DIST github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.mod 36 BLAKE2B 6faef3be0b5f137ecc89a7875bed1f576d144f11623905c04cc44f93812b80f3e5b56f05ddb3343848e7fde7fc439f49627f4fbd10730b1e9c2c9153a2d3067c SHA512 8cedf150caf05299c5b9f8b4fcaa17e4771c613fa06bac434586048ffee22ba9501e0fa540da90a3a24f3e4f662c9517571a23a0353fbb29c881d6d6c26d5f1d
 DIST github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.zip 3684 BLAKE2B ba35916611754bc0db281769ccb0b92a8304fef4d249b40b7c19b5fd835896cd48cedabd361fe8bbbb2304521e3f8c731f75eccde79a004f6d2dec0c7d6d5daf SHA512 16d6453d372773c9cc23b851d3cb7d84d4d3c090bbc1be102980c0daba0fe3ef102ba8372b8bd99f7ba18582d33d1af152087d544ad8dbe98d7d2acc9d91c353
 DIST github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod 73 BLAKE2B 21e3545a4518c64daac1cf36e47a2c8e1fc8ab7402372f2e871052d0dd9d83fc2aa44babb2f8751180cb66dcd2af82ed202afbf5ad3a219c4562da23ae8ce185 SHA512 4fd07ae7c00bcc135cc10a0b34ab102a893ed8ea4708f9d38da52f98b09fb66144f970ffd8795476fd6625b25c9e48390a5b1c5c99bd0c8d536a94201dc96613
@@ -377,6 +402,8 @@ DIST github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.mod 175 BLAKE2B 9077c3a2c65f4025500
 DIST github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.zip 12738 BLAKE2B e7a649d1c85aa7b3aa0a80123c49d6e980d8db2bdbb7c49d5871cef8c35a4f632f4de0987ae1b41b3f9b472343e22228f7e75cc7c841d446ced4f33e859039f2 SHA512 4ee0de0cb44960bd75a18648a2c7e4428cd1df1b042e24588d3ed6adee05388e6211854db1878e6ad74dec95083e439d147975082422b8ae5f3c6c7896df4304
 DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv1.1.1.mod 265 BLAKE2B f7a8de886a358b7d2910807ee16a26c210850980541aea7d179b7880ee57af17f0aa62d0bfff1f1116d8b32c9ee05bb6ac7482313e9556494e92c60ccd03ba1e SHA512 383bafdea96d9fb12cb72123ec4c5bfe3669be7867fca80e2cf4dc7a64e5a69948272da4e74851d1464dab1430362efb9a43914985019bec4fcdf942fc21193f
 DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv1.1.1.zip 186061 BLAKE2B 795662b91cebff6b3c8dadd024f73e29ff310deeb2a48d515ebe1726b6979e38ef7912940b8e6f322dee23da9ccc298f31567fce33d4af60979bb0baf4de0d92 SHA512 e764426cfda39a67fc94424affd4073caf26aca0145f7dae44dd5b8dc9c8fb0a0ed490092e58c07ea9586e4c48d0308a7ab2efca1c7b2e510b4546fa0e39f77b
+DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv1.1.3.mod 265 BLAKE2B 22909466af108048bc272b0e67db40f6fcac375de02b29aaee7bc31153d73b2c1130faab8e27a82dba9b5930c789de1840468fe9eafaa8881cbee126b0c9df1d SHA512 17049e0eb9bab7ebe298bcc1fd3ffe0eebd40a7642c48f4e5c2447dc37a3099359d04dd929643497f25ed55a71d7ab6ad6bf0e75553afd4fc98616295745a25b
+DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv1.1.3.zip 190543 BLAKE2B 692f5c496466f8d914c1172446f3cb79b1ff9c9e08d7afe44d8af3fe1248b6c1b31fecca3fdd8343afc2b014535dc8e1d3f49a3c71f360d46933ee28002c4c40 SHA512 12bf06f87e15ee039ca148873a13f5944ac6aa6800999ccd5df5175a79fca03edf4672236e2c25ebfe1a28a0aca24d0f6965c8b040c09fb648650976baf8c305
 DIST github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod 42 BLAKE2B 1f0af0f4518708edd09c0f02aec6103960b023a6bc178181276c54cd86b653e8bd1ddd60c5d49fa75a85f1fa0d18f670a9c2ead381da7c4f2d5e611b24f51ca9 SHA512 748b5648bf8bec4d1efe13f4dc37608e7378acc2a7d954e9d3b649a4b170a1e2d1c61338f6bee8d9007ad75a5bde87487612b47a692d6f966bca56490dcb834d
 DIST github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.zip 9350 BLAKE2B 04c151cdab19dc03754e44d0f6d158e3130b6f8d5556247c13e5ff28636ea611ee41251855431d722dd57a369463a32f14d1a46ae2f68417031acd00af0358aa SHA512 6010feab0201548f0a6e9423b39d0506da0923a2022558de88eb17428346c4eb130023b4eea8640d5e52ec68aef84eab5b4aa2ca5ab761d43cf649e86089f226
 DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod 30 BLAKE2B 18c9fb79a291aaf800991a296c8d7b1933cf45bf56082301a64ce17ea64dd15fd304094fd4b0561bd99c48ada545dfe7fa8cf47a15593cd3166eb66657a5e114 SHA512 d08b4540b799cee9c5f088c4e1fe002c9fda86f1634380409eec1404598b84376d3ca26b4c1cbcf58bc19234ab56531ab11db8a00c6dd2e15a53f3b4ae757efc
@@ -402,6 +429,11 @@ DIST github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mo
 DIST github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.zip 5264 BLAKE2B f6d986c7f5fbb1960fa1b62a5722d426c3ab79d865cb179bb9bca5a213bb2008a3cf4edb59dba1a336928cb0bd05d31f7083f394cec09270e66b55cd4a045b37 SHA512 2a8e1f10d10e4479568374b9e51b1b8dbbf1077d8af413d7dcd254ba1dc1cd38ee19e75a4661a4e237d3662e51cbcf96a08bc69a2e5beaf34a2559fcfb9d653c
 DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.2.0.mod 41 BLAKE2B 44917ea3a6fc533933ccd76d1594e19246c682d96311e030eeeeaeac3c126f6cd2c2de67ca410c89738918c5ab0594f1e9b2c2202c48f462c368ad31fb5feff6 SHA512 b7d81f5cbf1b55ebebcbb86ae89899ffec6fcd730144f1719947a76080f587d298d0e37a073a8768d7768ef64fc47b1673104335203a32a557f31e42a4e5a950
 DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.2.0.zip 263448 BLAKE2B 91fc28eb885a3030886862073f55978d2d1d7bd1186d3173f107809d09b0093bb2d4af45e812a4756fb8406bf00eeb6ac0c512fd19390154e91302d75232a6cd SHA512 e67fa8a6dbd35966bd06f6e2fcd346e09417dc3d8f7f093163f2dfeba4523ae567a0cf8dbb491e0a85d1911ba0583b61fbbbeec4b5e3a01847621cd31649b507
+DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.2.1.mod 41 BLAKE2B 44917ea3a6fc533933ccd76d1594e19246c682d96311e030eeeeaeac3c126f6cd2c2de67ca410c89738918c5ab0594f1e9b2c2202c48f462c368ad31fb5feff6 SHA512 b7d81f5cbf1b55ebebcbb86ae89899ffec6fcd730144f1719947a76080f587d298d0e37a073a8768d7768ef64fc47b1673104335203a32a557f31e42a4e5a950
+DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.3.3.mod 41 BLAKE2B d7c63b68781b147d3baf10d81bce0539aaf0a046a70cd91958b59541dfb35107e01a73937b19de74504f42fe49983b46985a9635c45239e4d7a3e2cca2b85f72 SHA512 a6233a0864081261d4b9cda2d73cf37b236acada8f5fbc85b7b7978ccfbc3bd2949632f2fb67a7ba9db6eb43b41796df54460728379e0172082922820d6143a7
+DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.3.3.zip 268061 BLAKE2B 788963cde4d390568d6714da292388c8e7df7434990bcdee13f7abf1ab54bf3e833aa34f86023cc7cdeba9d7fa5052265bb14f41c07ff2247f87f3171fd26768 SHA512 1a33a47c9e1c4e2b2ad00de9a9f61f4f705f19304d8e033aace7755b3e1c38d1a79eaad18df29fd2027eb0733be17a3bd7ca582f7635874fbaf4c7b3f2c37f92
+DIST github.com%2Fyuin%2Fgoldmark-emoji%2F@v%2Fv1.0.1.mod 88 BLAKE2B 3af555b21db4aff9b17d3339a7c8ff06520efc9997a72e2974c4d4b0a728256191a66beed2c411b56b300344473c9e60432d6d36c4c6e8c43ec61b64cd0ef433 SHA512 6e07614fad3f579db64d3bfd8bb0815f6892ba9e18a890c550b2de47156966075f5070a4645db4b114004b6fc70f1caec8d5064293d587262d722ccd9fd2be32
+DIST github.com%2Fyuin%2Fgoldmark-emoji%2F@v%2Fv1.0.1.zip 33936 BLAKE2B 8ec5e93fe94c5856539edc70103a84f5cc7db8fa6513d64e04682a6c0050ece5edeccd8a009f317be04ea14beb32115765df5256e2bbde5d56c1b1e8a5368210 SHA512 61679f35d19e89801a17bc09e555fd82c54323a37438d4c7b1649487e5180b0dc28f85d91c96ddfc67ed9370c5e19cffdf07629a7e7eea2ac35ea4e19d14e7e6
 DIST go.etcd.io%2Fbbolt%2F@v%2Fv1.3.2.mod 24 BLAKE2B f23f0532ce6fece605e76cd16e5f9a1fbf40657f26b2aa6a135bf300a232ffe8eaa9161f93d2845312b10ccb6dd5c4cfea40a2256b6481787ce9ddca7555b0fc SHA512 8988baa04517a19f905b323768f98690b19ce302d54da4648bf72baa2766c8ea8362efaf1c8dd2f02a82fb9c76e72f32373fd04cf48ff133804b6b251bd48529
 DIST go.etcd.io%2Fbbolt%2F@v%2Fv1.3.2.zip 111427 BLAKE2B 62d61989ac2e7f9b83238e9dbc3027600235213fb39846ce0bb45c84431d80fc3d570d27fba6538668e5a91a8e8331e4bbb081e9106a4409a191209be122fa7a SHA512 f4c1b9f826415b753235e6f71dfb0c2e25ae4dab4acfd632a6ace744e437ae0df9d86dafc79569c6184895e5398108a098a5e5eda57589046316ebc767571cdc
 DIST go.opencensus.io%2F@v%2Fv0.21.0.mod 305 BLAKE2B 73735106ac582b2e9d5f0d739412c3396e0df8627a6adbe810ac560998e4cf2eda12e449b6e336dd6b433eaf57c885b4a927359d0bc1bd6eba9432bb0793c35d SHA512 448e90223b8d67e4d5e4b150055ac83eacf9ef48aa34036c2e59559f21443f796e721df3c0395a829bf5d10d229cdc7beb956c8f90273e50f0989e45a82aace8
@@ -464,6 +496,8 @@ DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod 172 BLAK
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200707034311-ab3426394381.mod 181 BLAKE2B 05d6754fa387bac4a6481ad34fb7b681064fc6443b3f70cba316fe2fd0896050e4a772fd8e1be655130a00bb5feaded4725ffea1c5dd6ba55ba55315aaae34d2 SHA512 54d242da2536da38e292b62a955b3961f7b0a9789fe36c5f7ae93577eeac734a6e5bac21a657cf71d488395278cd7683db538e16a9c853835277a800a9d43471
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200707034311-ab3426394381.zip 1503811 BLAKE2B c8cfe6b14a455a6ad71c42ce03235c650b7efe842131874cf99570716907e02c9fbe42df586e69332189518cbdcf6e2e417caebec84ce928e7ba959b66ab869c SHA512 bc3772a7ae7cd2b50f61ec8d07e7f7e1af9f24e0b737131da375a525be44dc993ee740ce0a11e0baaf0cbd81e819e3ecad889c0c7ece95086cb428e52b10a785
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210331212208-0fccb6fa2b5c.mod 179 BLAKE2B d4f0ad22973a6e0a06b186e217dedbea3abb1800b259c56a29da9075c36808160620b42b0a485127f713760b24b4d9d6d9a61119c5739927340436bac307f5c4 SHA512 f48731641ffad3b90daf0a8bb79fdfc607c076961dbda1c51e71eab787dca0681e5984ffce048bd655ceb56052fa64426b30b32e6ee32957c92418a16d1c9f06
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210331212208-0fccb6fa2b5c.zip 1565463 BLAKE2B f2256a89dcbdea73d4dd04631e2415fb5c9c7a5a3ac1845ad9940d0f5f19db30b6160eacae63dec5d2610940a759140accf72b8dac6e246d9315aecbd2a32822 SHA512 978ac8c3a90dc786e6b67f75f0f12514969cf8f23199f5caeb43d24dd1eb55845092d59692585f5d9430804ee7365132087fdde1804ca1a32ea0015ba59dd05e
 DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod 27 BLAKE2B 078fc99b981406f4ee3f8da94c83954e80619e76ea63cf6323f27614bbcb870bb650eb5ffaac865a374f3ed0ef0619d97e11f05924c92e395e72cb73f28630e6 SHA512 53431e560b5d6a9b50f44997ef6755f71741ccca155767dd954da41f11f53a3e8d01d7e01a2bb9de1fdd551dd2e734cb65e5641cf5de5c9a8a6a25a4894336f5
 DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.zip 81780 BLAKE2B 48e9b7ec89ad3f9cec88fe6c62ce64348a9217a134aab7306a07fd8cb28eeff91b15cf6f59ffec36df23a086195322f28e76fc16c026f33d2f419dcd3f84de04 SHA512 c7656f3c10140a5cb08620ce0647d0b2026272ec41bcd9df346dd2b5de5bd2236835ea117091646151a991f8f3aeeebd0cdfc1f784015d140162db5dc49f7325
 DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod 233 BLAKE2B 5a1feba7e2d9703a864889f35f70eb18d30f9c0179a1425b0f4cddf17b03d2d187ba36346243a97820ae45e03a136ac26aedfefa09c0c7bf6cbd246eddf36c50 SHA512 9e91ec99aeb8b639d63fde3cc38f750d0a29d4a05864595beec0de0667ef9193007d89cb899b1d5ba44f0675121b2cff1e09b86bad4331378a66e15ef2f4e26b
@@ -498,14 +532,21 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod 33 BLAKE
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.zip 1470272 BLAKE2B 9a8bbb988370bedc24428e6c78f42a9ba44dbb852ce91c3d7fc54e83678b72b9177e67c955c49dc8ef7a1e2e214475a2e55c53254469e3426ec271e90ec9e2d5 SHA512 e46ef76fe4a1628def4c6a291003b64cf11185c0214427af9c49b9ff3af99f258488d49e887206a9c8652784228d822665c5841ce87d6ff993e95ea3d0494129
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200413165638-669c56c373c4.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200413165638-669c56c373c4.zip 1471634 BLAKE2B cd90cd97113e500e5d20b6bb1c9921be7132157089936ca68d862efc531e2e3a8ede741d6c682c8f38122dc33cb65c84a8962eb1eb9cf25277502740639091d6 SHA512 c3fce15b61446dc0805383e55eefcbace75fe1e8149561692624f47ad69d20eb81e6415dc0000beec435a6caf0937b9bbbef67504016a5f77faaf72a46125085
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210113181707-4bcb84eeeb78.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210113181707-4bcb84eeeb78.zip 1543048 BLAKE2B 072e92fdb409e64a2123db40fd98b9705b87fb3cee94355874125daa6c6f65bb8b7ef3b58b8f5ad321b1a89d3cf3667475b2b7d9017e049696a33a9df2bac78c SHA512 ab2dbbde4ddcda3c66b54f574ffc90fe70be3c11d0a914a4410c764e91b0c20f4ccfd36b9af29d639808d3155e645ea5afc5a6942cf36a5e7d1a318f037cade4
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210319071255-635bc2c9138d.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210319071255-635bc2c9138d.zip 1667773 BLAKE2B 61551d3c0ba796eeaaca084f7f851e00adf26300154eba18353976436adbadfd505d8dc97c62465834706a916115880b4ef7f4428490224cec720e8e077ca6e8 SHA512 9ca4a45842a0270634e262255ddb8b9e428bad34016a933a524911c2adb695e970c805cb654a061b3775dd9921cf4fe2929a1b6c38a4f545b8dd53e328fb8280
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210330210617-4fbd30eecc44.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210330210617-4fbd30eecc44.zip 1668274 BLAKE2B 645747d7f0335ab88c1619a25ce393c5b2b41f5f44385be6b5b46fcaafd6ddce02a43d09d9895b72f33200a97fc2fbf4ba9e1278efa4d479d676d1b968ba4b94 SHA512 ae86b110902a7b6aca121458220b84077d1ee17666b5e89ecd3e7e5bfb6a1cc1ec5d062078426b108aaeb3eb5fed6b9cdcf5cf25c333aecbcc2288dff9d23a74
+DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod 95 BLAKE2B 8385688f2081360fc2694f05d128ff0c587ef131e1b5757a942d9335870200e06545318afb1a7d1f059d060f51fe94fc16a48a1d7ec31a9a83e07b3c93f34ce3 SHA512 a3401e3d20dc1aaaebbf3c296a783668003f2182ed77ec830431f97339e07eda1859fe8c3c7fdfb0125b3ed331d23208519df520f86e20c1a05c822b3d766b08
+DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210422114643-f5beecf764ed.mod 95 BLAKE2B 8385688f2081360fc2694f05d128ff0c587ef131e1b5757a942d9335870200e06545318afb1a7d1f059d060f51fe94fc16a48a1d7ec31a9a83e07b3c93f34ce3 SHA512 a3401e3d20dc1aaaebbf3c296a783668003f2182ed77ec830431f97339e07eda1859fe8c3c7fdfb0125b3ed331d23208519df520f86e20c1a05c822b3d766b08
+DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210422114643-f5beecf764ed.zip 22714 BLAKE2B 10545c76ecd42f673e027368d2c8f20e9c704e1ea777dd58dce7376b0a52a90be023d412787b95cf7a5b251814ca4dc0a97b3725a1c3fd7253232ce51fd1df83 SHA512 c127f2f4e68b3343926dbd290221c640a36c5996f4d6557b3ed8f092fb246022dbc25c24b766164b4b8546fba00d6654f35ef581b7961205d1b136a3d1efc2e0
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.zip 6349244 BLAKE2B 0aa464ac7b7d17fa7ec0627b64cd2301ed4f2819f837807db7a55725950dacb40be899b5148b07ea31b51530818edcccc6444a9800755e1d369ba8f1bce949b0 SHA512 982d78f580a7eac99a0c51e6f1fd2b2c3b91f56cd5e2b96fe960510049f7daf5915264f73f55f05675eee232a52998f9667fa84a9ccba15ed7819e4c93f583a7
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod 88 BLAKE2B f3dd520e0e4e9b57feab62ecabb9169f37f1ce49b2846b949f9266f807767d38f55e4aa8ea006229c6f81cfc1e2c9dc0d1e3c186235e416dfb90fe7e04751d07 SHA512 d9361afb453b10c9d02787568ec33ea4c97a115899c6b3d1a1246547a749244e9218475ae5ae9f741d9b355260d2d3c33852673e805fcdd5f26f3ca40f035884
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25edac5de569cb78773d7f3232d59a0a4de6d174c5c100db2b02ca42c51f3e17e0f5e781ba9b5641a512b0dc72dcfaa5f6bd7d451b SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.4.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25edac5de569cb78773d7f3232d59a0a4de6d174c5c100db2b02ca42c51f3e17e0f5e781ba9b5641a512b0dc72dcfaa5f6bd7d451b SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.4.zip 8605233 BLAKE2B 3e9c66a40249df3915ab9de2a8de2ae0b92e4f7d645f9753e66e585ebaf86992484fcb933510b3400595182e9bc667434894697953d7078bf43f617f5ea1905d SHA512 26d09376646c1e7d99581f0fe03ea109b00879dc351996f77e6442b0fd72817d056f630a56cc167014acb55532baa4be5437bf40b4a933cfe450854c618b3508
 DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
@@ -575,6 +616,7 @@ DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod 95 BLAKE2B adb3684980f1d8e6c23444e9102
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.zip 80666 BLAKE2B ff3645b71cedd41b9fef6e5d01f3d89a2db6930f406aded7889530b04689ea34b53fa2a7af352c264681ee40b1d192c86ca2f7dcc33dca825d355694527e4dbf SHA512 19f019e85b8c9a533c3cf2fd492b1813272f00cce06a56ffe43046935e49ccf6e191ce83f1d236f6355bae7126aa722016f05174687ff2faf54f121958266edf
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.4.0.mod 95 BLAKE2B 888532a43aa7569fc03a62d78507081f30342eb4be40c01252683b16cd3658dd7b30d5f8a071dffe2c05f57bbee3afbc1ee4324c471788c633a878d498ff7d57 SHA512 2790882fbfa812468b9b3443630b1f1ee67a968eb20da8e4a1bfd410e4b516a8a7e77c07414b64f17e11e2151161b85d019e172cc833a45b19e66d4c70f89f82
 DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod 95 BLAKE2B fbb87f0644ec9da5d4386358d23cdb15b0d23e8212e712f16f338455a3a0ad19fbfd63e92c955c359237ddfa8bb76d6d08280eead24d321668431891eca1e8ab SHA512 307ca9123efc577ca04828996ee9d8edbb51794ccb4b8d9f169ba689e7276aa5f6ae106a04b22b7fab853ffacfebcbf74468b64eaefd57445864c1fbc77fad9d
 DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200615113413-eeeca48fe776.mod 95 BLAKE2B fbb87f0644ec9da5d4386358d23cdb15b0d23e8212e712f16f338455a3a0ad19fbfd63e92c955c359237ddfa8bb76d6d08280eead24d321668431891eca1e8ab SHA512 307ca9123efc577ca04828996ee9d8edbb51794ccb4b8d9f169ba689e7276aa5f6ae106a04b22b7fab853ffacfebcbf74468b64eaefd57445864c1fbc77fad9d
 DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200615113413-eeeca48fe776.zip 103453 BLAKE2B 493d6289e171d84dded89f11aa89da42aefb6510e1b0a5a2e3a9223b31a6291af42c65b720246e9d632fed7e8a2868a2cd2e4f3e3f4acee99cff535aca0b6899 SHA512 7870ff82dad193b5087a735324705dc4ae3e29e96eff29ecd5b5e7ec38369aebc87151bb806dbd11b023dada74ff0c9fb4b7f0ed36d8f893f1c715909cb2b994
@@ -587,6 +629,7 @@ DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod 300 BLAKE2B 3e3f5a2be0918
 DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.zip 506912 BLAKE2B a38cb31fd8df49dae4ff187e67704b5586ba78a0dcfe5afa3b820f0ac80f7e12ba4bdb705caa97c6be85407fe97599d1244d2f56f0e9e36554ba43289d9f21d8 SHA512 3285ab90762ee6b771c95e1c842ab308f04ac366ddfa693040c49d8951bb01db33994eb69c2c9dfd6ab2b379b29cbfe31558ca6b6aafe3feea1e693b2a36d0cb
 DIST rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod 36 BLAKE2B 61110bed2b9e99e0250cf6e8b842257202c89b3462edf9368b73cab29f9dbd4dcc66c3e290a1d6329b7d62321eecc52082a8c4c0797eac743a29a8a00910a93f SHA512 db50ff677b0bdccbc1a1ad3df7c5cc76f2fcccf3ab99d08d1c2868440eb9b893fe89452f4286f7d42f2f16abf0f4acda67fe86e174dcfa730a743aafcc166774
 DIST rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.zip 450232 BLAKE2B 2d10520e06557fa00e94a1ccd80b9b937bcaf404f81f853a020eed606c7a297db037baf784518e060604319ba5454423e4995ab005be18ae1398c5ef16f24719 SHA512 0a15b90c2a4577cbc298a34f714660e9fdc488b1fb72b33d0ae296cb6f15a691091d5e6d3c801998b9c2b7236b163118577b2816316078d613f74cd803947534
+EBUILD github-cli-1.10.3.ebuild 24316 BLAKE2B 4caed036885bbedf79096bcb1a1d1a582c6a1e96d760f7fe42e3ccbd50c5b9e2369c5f8fb2c79296216b989d912bf3dfc8ed937bf9392dff4622d3fd65266968 SHA512 301daa111081291b7ab546156319854cf51b5f866246ca3aa32cf63165c6348261a084207b3be07efbd932bbdc881a42d8dc2a6b8a09f27db896aaed20d18dbc
 EBUILD github-cli-1.4.0.ebuild 23946 BLAKE2B 92bed0b0cdb4dfbaaedaaa0a1422469442e0e29c09b82693afd9f06ae170a7b52ecbad5e8e8a14bf6b26c8fe3eba9439ccacbd0991ff0eae7682e7efa6ace240 SHA512 31d547fa6b05903ca5cd486c28c59b4aab8babe5f6ddec9e6650adb8f17a9883573bce1fb457dc5770187a6b3271f9fbf0cc738b617df3416ded496627c99f8b
 EBUILD github-cli-1.5.0.ebuild 24088 BLAKE2B 915dc87d77bef29406bbf88aba29c98c197bdc9d6a9a4cedef87a2f909b9070250da3caa0bd9188f1a2cba823eb42e1dbce60f20bc9d96f94df020c87b282a6f SHA512 6844b174514097335920afaeccd08266b312202b3c9d8064ba12ee9b8956f1126f8edc73479f33c07aef1e61e718c7d91383eeed3ef323fb7bc972f981082026
 EBUILD github-cli-1.7.0.ebuild 24673 BLAKE2B 3fc5070dc9d6a2db4cdae414c35813c0e7ae9a207f55ac5bb73635dc75ac1112fb324e12a1e7db2424a9cd0fb8d200b5254588486e6b69afead2fe7b141da3b2 SHA512 18613c00fb4b2379ca6c5b7a709d287d8a868780c802d7dfe8c913fc806b7169a41a0b7f21efa3b6118a2706027618ce6f9df6df9d481e721cf0d63ef7d37239
diff --git a/dev-util/github-cli/github-cli-1.10.3.ebuild b/dev-util/github-cli/github-cli-1.10.3.ebuild
new file mode 100644
index 000000000000..3234ae6a008a
--- /dev/null
+++ b/dev-util/github-cli/github-cli-1.10.3.ebuild
@@ -0,0 +1,496 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 go-module
+
+DESCRIPTION="GitHub CLI"
+HOMEPAGE="https://github.com/cli/cli"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/cli/cli.git"
+else
+EGO_SUM=(
+	"cloud.google.com/go v0.26.0/go.mod"
+	"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/bigquery v1.0.1/go.mod"
+	"cloud.google.com/go/datastore v1.0.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/storage v1.0.0/go.mod"
+	"dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod"
+	"github.com/AlecAivazis/survey/v2 v2.2.9"
+	"github.com/AlecAivazis/survey/v2 v2.2.9/go.mod"
+	"github.com/BurntSushi/toml v0.3.1/go.mod"
+	"github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod"
+	"github.com/MakeNowJust/heredoc v1.0.0"
+	"github.com/MakeNowJust/heredoc v1.0.0/go.mod"
+	"github.com/Netflix/go-expect v0.0.0-20180615182759-c93bf25de8e8"
+	"github.com/Netflix/go-expect v0.0.0-20180615182759-c93bf25de8e8/go.mod"
+	"github.com/OneOfOne/xxhash v1.2.2/go.mod"
+	"github.com/alecthomas/assert v0.0.0-20170929043011-405dbfeb8e38"
+	"github.com/alecthomas/assert v0.0.0-20170929043011-405dbfeb8e38/go.mod"
+	"github.com/alecthomas/chroma v0.8.2"
+	"github.com/alecthomas/chroma v0.8.2/go.mod"
+	"github.com/alecthomas/colour v0.0.0-20160524082231-60882d9e2721"
+	"github.com/alecthomas/colour v0.0.0-20160524082231-60882d9e2721/go.mod"
+	"github.com/alecthomas/kong v0.2.4/go.mod"
+	"github.com/alecthomas/repr v0.0.0-20180818092828-117648cd9897"
+	"github.com/alecthomas/repr v0.0.0-20180818092828-117648cd9897/go.mod"
+	"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
+	"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
+	"github.com/armon/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/aymerick/douceur v0.2.0"
+	"github.com/aymerick/douceur v0.2.0/go.mod"
+	"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
+	"github.com/beorn7/perks v1.0.0/go.mod"
+	"github.com/bgentry/speakeasy v0.1.0/go.mod"
+	"github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod"
+	"github.com/briandowns/spinner v1.11.1"
+	"github.com/briandowns/spinner v1.11.1/go.mod"
+	"github.com/cespare/xxhash v1.1.0/go.mod"
+	"github.com/charmbracelet/glamour v0.3.0"
+	"github.com/charmbracelet/glamour v0.3.0/go.mod"
+	"github.com/cli/browser v1.0.0/go.mod"
+	"github.com/cli/browser v1.1.0"
+	"github.com/cli/browser v1.1.0/go.mod"
+	"github.com/cli/oauth v0.8.0"
+	"github.com/cli/oauth v0.8.0/go.mod"
+	"github.com/cli/safeexec v1.0.0"
+	"github.com/cli/safeexec v1.0.0/go.mod"
+	"github.com/cli/shurcooL-graphql v0.0.0-20200707151639-0f7232a2bf7e"
+	"github.com/cli/shurcooL-graphql v0.0.0-20200707151639-0f7232a2bf7e/go.mod"
+	"github.com/client9/misspell v0.3.4/go.mod"
+	"github.com/coreos/bbolt v1.3.2/go.mod"
+	"github.com/coreos/etcd v3.3.13+incompatible/go.mod"
+	"github.com/coreos/go-semver v0.3.0/go.mod"
+	"github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod"
+	"github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod"
+	"github.com/cpuguy83/go-md2man/v2 v2.0.0"
+	"github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod"
+	"github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964"
+	"github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964/go.mod"
+	"github.com/davecgh/go-spew v1.1.0/go.mod"
+	"github.com/davecgh/go-spew v1.1.1"
+	"github.com/davecgh/go-spew v1.1.1/go.mod"
+	"github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod"
+	"github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod"
+	"github.com/dlclark/regexp2 v1.2.0"
+	"github.com/dlclark/regexp2 v1.2.0/go.mod"
+	"github.com/fatih/color v1.7.0"
+	"github.com/fatih/color v1.7.0/go.mod"
+	"github.com/fsnotify/fsnotify v1.4.7/go.mod"
+	"github.com/gabriel-vasile/mimetype v1.1.2"
+	"github.com/gabriel-vasile/mimetype 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-kit/kit v0.8.0/go.mod"
+	"github.com/go-logfmt/logfmt v0.3.0/go.mod"
+	"github.com/go-logfmt/logfmt v0.4.0/go.mod"
+	"github.com/go-stack/stack v1.8.0/go.mod"
+	"github.com/gogo/protobuf v1.1.1/go.mod"
+	"github.com/gogo/protobuf v1.2.1/go.mod"
+	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
+	"github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod"
+	"github.com/golang/mock v1.1.1/go.mod"
+	"github.com/golang/mock v1.2.0/go.mod"
+	"github.com/golang/mock v1.3.1/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"
+	"github.com/golang/protobuf v1.3.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.5.2"
+	"github.com/google/go-cmp v0.5.2/go.mod"
+	"github.com/google/martian v2.1.0+incompatible/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/renameio v0.1.0/go.mod"
+	"github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510"
+	"github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/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/go.mod"
+	"github.com/gorilla/css v1.0.0"
+	"github.com/gorilla/css v1.0.0/go.mod"
+	"github.com/gorilla/websocket v1.4.2/go.mod"
+	"github.com/graph-gophers/graphql-go v0.0.0-20200622220639-c1d9693c95a6/go.mod"
+	"github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod"
+	"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod"
+	"github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod"
+	"github.com/hashicorp/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-version v1.2.1"
+	"github.com/hashicorp/go-version v1.2.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/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/henvic/httpretty v0.0.6"
+	"github.com/henvic/httpretty v0.0.6/go.mod"
+	"github.com/hinshun/vt10x v0.0.0-20180616224451-1954e6464174"
+	"github.com/hinshun/vt10x v0.0.0-20180616224451-1954e6464174/go.mod"
+	"github.com/inconshreveable/mousetrap v1.0.0"
+	"github.com/inconshreveable/mousetrap v1.0.0/go.mod"
+	"github.com/itchyny/astgen-go v0.0.0-20210113000433-0da0671862a3"
+	"github.com/itchyny/astgen-go v0.0.0-20210113000433-0da0671862a3/go.mod"
+	"github.com/itchyny/go-flags v1.5.0/go.mod"
+	"github.com/itchyny/gojq v0.12.1"
+	"github.com/itchyny/gojq v0.12.1/go.mod"
+	"github.com/itchyny/timefmt-go v0.1.1"
+	"github.com/itchyny/timefmt-go v0.1.1/go.mod"
+	"github.com/jonboulle/clockwork v0.1.0/go.mod"
+	"github.com/json-iterator/go v1.1.6/go.mod"
+	"github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod"
+	"github.com/jtolds/gls v4.20.0+incompatible/go.mod"
+	"github.com/julienschmidt/httprouter v1.2.0/go.mod"
+	"github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51"
+	"github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod"
+	"github.com/kisielk/errcheck v1.1.0/go.mod"
+	"github.com/kisielk/gotool v1.0.0/go.mod"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
+	"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
+	"github.com/kr/pretty v0.1.0"
+	"github.com/kr/pretty v0.1.0/go.mod"
+	"github.com/kr/pty v1.1.1/go.mod"
+	"github.com/kr/pty v1.1.4"
+	"github.com/kr/pty v1.1.4/go.mod"
+	"github.com/kr/text v0.1.0"
+	"github.com/kr/text v0.1.0/go.mod"
+	"github.com/lucasb-eyer/go-colorful v1.2.0"
+	"github.com/lucasb-eyer/go-colorful v1.2.0/go.mod"
+	"github.com/magiconair/properties v1.8.1/go.mod"
+	"github.com/mattn/go-colorable v0.0.9/go.mod"
+	"github.com/mattn/go-colorable v0.1.2/go.mod"
+	"github.com/mattn/go-colorable v0.1.6/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.8/go.mod"
+	"github.com/mattn/go-isatty v0.0.12"
+	"github.com/mattn/go-isatty v0.0.12/go.mod"
+	"github.com/mattn/go-runewidth v0.0.9/go.mod"
+	"github.com/mattn/go-runewidth v0.0.10"
+	"github.com/mattn/go-runewidth v0.0.10/go.mod"
+	"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
+	"github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod"
+	"github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d"
+	"github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d/go.mod"
+	"github.com/microcosm-cc/bluemonday v1.0.6"
+	"github.com/microcosm-cc/bluemonday v1.0.6/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/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod"
+	"github.com/modern-go/reflect2 v1.0.1/go.mod"
+	"github.com/muesli/reflow v0.2.0"
+	"github.com/muesli/reflow v0.2.0/go.mod"
+	"github.com/muesli/termenv v0.8.1"
+	"github.com/muesli/termenv v0.8.1/go.mod"
+	"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
+	"github.com/oklog/ulid v1.3.1/go.mod"
+	"github.com/olekukonko/tablewriter v0.0.5"
+	"github.com/olekukonko/tablewriter v0.0.5/go.mod"
+	"github.com/opentracing/opentracing-go v1.1.0/go.mod"
+	"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod"
+	"github.com/pelletier/go-toml v1.2.0/go.mod"
+	"github.com/pkg/errors v0.8.0/go.mod"
+	"github.com/pkg/errors v0.8.1/go.mod"
+	"github.com/pkg/errors v0.9.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_golang v0.9.1/go.mod"
+	"github.com/prometheus/client_golang v0.9.3/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod"
+	"github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod"
+	"github.com/prometheus/common v0.4.0/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod"
+	"github.com/prometheus/tsdb v0.7.1/go.mod"
+	"github.com/rivo/uniseg v0.1.0/go.mod"
+	"github.com/rivo/uniseg v0.2.0"
+	"github.com/rivo/uniseg v0.2.0/go.mod"
+	"github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod"
+	"github.com/rogpeppe/go-internal v1.3.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/sergi/go-diff v1.0.0"
+	"github.com/sergi/go-diff v1.0.0/go.mod"
+	"github.com/shurcooL/githubv4 v0.0.0-20200928013246-d292edc3691b"
+	"github.com/shurcooL/githubv4 v0.0.0-20200928013246-d292edc3691b/go.mod"
+	"github.com/shurcooL/sanitized_anchor_name v1.0.0"
+	"github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod"
+	"github.com/sirupsen/logrus v1.2.0/go.mod"
+	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod"
+	"github.com/smartystreets/goconvey v1.6.4/go.mod"
+	"github.com/soheilhy/cmux v0.1.4/go.mod"
+	"github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod"
+	"github.com/spf13/afero v1.1.2/go.mod"
+	"github.com/spf13/cast v1.3.0/go.mod"
+	"github.com/spf13/cobra v1.1.3"
+	"github.com/spf13/cobra v1.1.3/go.mod"
+	"github.com/spf13/jwalterweatherman v1.0.0/go.mod"
+	"github.com/spf13/pflag v1.0.3/go.mod"
+	"github.com/spf13/pflag v1.0.5"
+	"github.com/spf13/pflag v1.0.5/go.mod"
+	"github.com/spf13/viper v1.7.0/go.mod"
+	"github.com/stretchr/objx v0.1.0/go.mod"
+	"github.com/stretchr/objx v0.1.1"
+	"github.com/stretchr/objx v0.1.1/go.mod"
+	"github.com/stretchr/testify v1.2.1/go.mod"
+	"github.com/stretchr/testify v1.2.2/go.mod"
+	"github.com/stretchr/testify v1.3.0/go.mod"
+	"github.com/stretchr/testify v1.6.1"
+	"github.com/stretchr/testify v1.6.1/go.mod"
+	"github.com/subosito/gotenv v1.2.0/go.mod"
+	"github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod"
+	"github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod"
+	"github.com/yuin/goldmark v1.2.1/go.mod"
+	"github.com/yuin/goldmark v1.3.3"
+	"github.com/yuin/goldmark v1.3.3/go.mod"
+	"github.com/yuin/goldmark-emoji v1.0.1"
+	"github.com/yuin/goldmark-emoji v1.0.1/go.mod"
+	"go.etcd.io/bbolt v1.3.2/go.mod"
+	"go.opencensus.io v0.21.0/go.mod"
+	"go.opencensus.io v0.22.0/go.mod"
+	"go.uber.org/atomic v1.4.0/go.mod"
+	"go.uber.org/multierr v1.1.0/go.mod"
+	"go.uber.org/zap v1.10.0/go.mod"
+	"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
+	"golang.org/x/crypto v0.0.0-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-20190530122614-20be4c3c3ed5/go.mod"
+	"golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod"
+	"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod"
+	"golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897"
+	"golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/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/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/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/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-20181114220301-adae6a3d119a/go.mod"
+	"golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod"
+	"golang.org/x/net v0.0.0-20181220203305-927f97764cc3/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-20200707034311-ab3426394381/go.mod"
+	"golang.org/x/net v0.0.0-20210331212208-0fccb6fa2b5c"
+	"golang.org/x/net v0.0.0-20210331212208-0fccb6fa2b5c/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"
+	"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/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"
+	"golang.org/x/sync v0.0.0-20190423024810-112230192c58/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-20180905080454-ebe1bf3edb33/go.mod"
+	"golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod"
+	"golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod"
+	"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
+	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
+	"golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/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-20190530182044-ad28b68e88f1/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-20200116001909-b77594299b42/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-20200323222414-85ca7c5b95cd/go.mod"
+	"golang.org/x/sys v0.0.0-20200413165638-669c56c373c4/go.mod"
+	"golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod"
+	"golang.org/x/sys v0.0.0-20210113181707-4bcb84eeeb78/go.mod"
+	"golang.org/x/sys v0.0.0-20210319071255-635bc2c9138d/go.mod"
+	"golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44"
+	"golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod"
+	"golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod"
+	"golang.org/x/term v0.0.0-20210422114643-f5beecf764ed"
+	"golang.org/x/term v0.0.0-20210422114643-f5beecf764ed/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"
+	"golang.org/x/text v0.3.4/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/tools v0.0.0-20180221164845-07fd8470d635/go.mod"
+	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
+	"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
+	"golang.org/x/tools v0.0.0-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-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/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod"
+	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543"
+	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
+	"google.golang.org/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/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"
+	"google.golang.org/appengine v1.6.1/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/grpc v1.19.0/go.mod"
+	"google.golang.org/grpc v1.20.1/go.mod"
+	"google.golang.org/grpc v1.21.1/go.mod"
+	"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
+	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127"
+	"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.51.0/go.mod"
+	"gopkg.in/resty.v1 v1.12.0/go.mod"
+	"gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod"
+	"gopkg.in/yaml.v2 v2.2.1/go.mod"
+	"gopkg.in/yaml.v2 v2.2.4/go.mod"
+	"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.1-2019.2.3/go.mod"
+	"rsc.io/binaryregexp v0.2.0/go.mod"
+	)
+go-module_set_globals
+	SRC_URI="https://github.com/cli/cli/archive/v${PV}.tar.gz -> ${P}.tar.gz
+			${EGO_SUM_SRC_URI}"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/cli-${PV}"
+fi
+
+LICENSE="MIT Apache-2.0 BSD BSD-2 MPL-2.0"
+SLOT="0"
+
+RDEPEND=">=dev-vcs/git-1.7.3"
+
+RESTRICT+=" test "
+
+src_unpack() {
+	if [[ ${PV} == *9999 ]]; then
+		git-r3_src_unpack
+		go-module_live_vendor
+	else
+		go-module_src_unpack
+	fi
+}
+
+src_compile() {
+	[[ ${PV} == *9999 ]] || export GH_VERSION="v${PV}"
+	# Go LDFLAGS are not the same as GCC/Binutils LDFLAGS
+	unset LDFLAGS
+	# Once we set up cross compiling, this line will need to be adjusted
+	# to compile for the target.
+	# Everything else in this function happens on the host.
+	emake
+
+	einfo "Building man pages"
+	emake manpages
+
+	einfo "Building completions"
+	go run ./cmd/gh completion -s bash > gh.bash-completion || die
+	go run ./cmd/gh completion -s zsh > gh.zsh-completion || die
+}
+
+src_install() {
+	dobin bin/gh
+	dodoc README.md
+
+	doman share/man/man?/gh*.?
+
+	newbashcomp gh.bash-completion gh
+	insinto /usr/share/zsh/site-functions
+	newins gh.zsh-completion _gh
+}
diff --git a/dev-util/glib-utils/Manifest b/dev-util/glib-utils/Manifest
index 36a90e135a0f..32b16e025f92 100644
--- a/dev-util/glib-utils/Manifest
+++ b/dev-util/glib-utils/Manifest
@@ -1,9 +1,11 @@
 DIST glib-2.66.7.tar.xz 4844892 BLAKE2B 2d128e8c933a8c5bd27734e96e50244f27c29199823e2185e8cfa5b4bbc0ca23f761c9de275c9941672eb945e302178b3cb4b5bd577f375ad953a97dddc70e34 SHA512 f6e6cc0fe2ab4a31a623bf9a1e63f833783e044e7ed55b66a84fc0cbf1410eec233fe0e226abb20aac0e40167a9624bf5e65197f9eed879da1293af44408d530
+DIST glib-2.66.8.tar.xz 4845548 BLAKE2B 8def5a2970f1df4782c93a1736d9ebd83ff1faebbfadd508e6ac58aa1d28a88a0fc7f504cc8006c2623bb656ce15d2dcb9e9188042daccd55adc8df0319599ea SHA512 d9d1bee82409bdceb14ab6008508f1abbb6eedfc22a35b1635d381594ee43c4ee9a1569d46bebe5b0b6d9fe7c629079f75660c6fa8f3b85a1dbca304bc6a6205
 DIST glib-2.68.0.tar.xz 4938804 BLAKE2B abbb06e9be3198ea79a42862bc0b71a40e87de6e4d49634458a6dd883d19c23d9e1a314b7820ea8eae230b24dccc909fd53b0e73587738e2341ff6f116e40cbe SHA512 dce0660476d67d7736c00861f4c3c267723f39032f582d1b2c17660a4939eeccd97e975da61b5be49e6f54612c6d5ce592aa7bdeacf4ecc75f3b38358da94a1d
 DIST glib-2.68.1.tar.xz 4940260 BLAKE2B fcf3a2fa2420ea3df13025d7a7e136862fa4cb6aa4f64a1af9fef7187d075db70deddad13ebde56b9032940437dbb311e9658bf112fd3cae8d8313d252ad2d87 SHA512 f705cda6f1b4b0acc5fe8d21b60994ca0ec6de39c6722f4f01cbe0ece30eacb7271d3cb29067e638e0204a3cefa2df1e535f273b72330455e185b544cebc2ab0
 DIST glib-2.68.2.tar.xz 4944192 BLAKE2B d35489dcfe9d57d8bd6ecf4f893b7c8e93a5b8108765791071fc811598d1f41287e03d95f20591d50d51a78db34f11833cc7970b1bf29299385357a14977ba0b SHA512 74d481552629cab67d22f8a440a7263a4e4b83adb6f3b772d368e255c17321b206aafd3af4653e5efbb2c3c14ca67d35f453728cbc5cd68728275d0b56789019
 EBUILD glib-utils-2.66.7.ebuild 2360 BLAKE2B 3db2c371486a8e6a6d5db678b6a54d165060a11288fccb4222f6eb27c5cb631c7e764d728b9fa91f0959373198a0de7e704ac6a804a58d144632b49098f8f548 SHA512 8f9c6c8b629c541d154640695efd1c887d2d0a0e19415b18808e8a50a0dc4cbbc68592f84b02813385a88608be5fc2510f3896da9ede6e55e2980a784a857618
+EBUILD glib-utils-2.66.8.ebuild 2365 BLAKE2B 8ad4796258da73ec89f89f8d51c6a967663b27d236a74bb581acb73243abbf594a88d9cb906860d2d7f44ec380378fbf0e13209fc6c23980b49b9e3563239923 SHA512 71271446d5f5814fcd0f814ae31b6e0fe1cd5cec278e3cc123bf6cb4c57cba209b8c5c8ad639ce256e4062e420c698ddb5133ebcd2dc9411297a7c0798f74cb4
 EBUILD glib-utils-2.68.0.ebuild 2341 BLAKE2B 78a030119ec501c297e6dd634fe6c1dfee4671d0ab888d78785fcdf13b19c5aaa6f858f80462f5c3ee3843bf50aacf561b6ce801f1f396256b7ad434739eb43b SHA512 1257e090316395ba66f203a510b98ddbe4d926b52c1fc7cc9fdf0784170f628adf1b4e4f1e90727b80e7758106221ba736c201f5c8873164f5667029252432df
 EBUILD glib-utils-2.68.1.ebuild 2341 BLAKE2B 78a030119ec501c297e6dd634fe6c1dfee4671d0ab888d78785fcdf13b19c5aaa6f858f80462f5c3ee3843bf50aacf561b6ce801f1f396256b7ad434739eb43b SHA512 1257e090316395ba66f203a510b98ddbe4d926b52c1fc7cc9fdf0784170f628adf1b4e4f1e90727b80e7758106221ba736c201f5c8873164f5667029252432df
-EBUILD glib-utils-2.68.2.ebuild 2332 BLAKE2B 0f54cd1381a48b546ee77599660d40a83f605c29c43a713d7908b416f4933345a46ed186762fc05f8fbec59dffb6bdcc56c926d7e70996b3ae71b5cc1621235b SHA512 0fcf59511090213835d203d12d150070ffb6e3432f2e6a99fe32198a4a0088f9934e81f4033e13dfba3ce8e7a730417b9a4a6c56a722b6cbf9ff92654395328b
+EBUILD glib-utils-2.68.2.ebuild 2324 BLAKE2B 14053ce23924b454e18751045fecaf44fab2ddfeae9c92c94d51c4330c4e8e011481fdf36f0d3900f2df8db8fe6300df4b72fd806ddef79c0513e84dcdd18bbd SHA512 e9d496fd828a32ef852877913fbb1fc855fce580ed135e175644220429a4d49421278e7f6e4adcaf1474ed390284d287b3eb00ecbac37e6d585beaf70d6d641b
 MISC metadata.xml 332 BLAKE2B 1e3c081ae9a2c8ae53cee6c3ae133cbd5e8543a68c03d4a4f7e164437502d996ea9364789e93114687271e1f472bcf13a418cca5b74ecb95a51849f0a5f3dafa SHA512 f7680d9be4071b841f50ece99b5041dc492901d84ae05383c1ff05b6a73bab804b153a50eb70f5417137f6e2041230c5ba8eaede10f7a0bf8a899508642588c6
diff --git a/dev-util/glib-utils/glib-utils-2.66.8.ebuild b/dev-util/glib-utils/glib-utils-2.66.8.ebuild
new file mode 100644
index 000000000000..629fb5bcbe9c
--- /dev/null
+++ b/dev-util/glib-utils/glib-utils-2.66.8.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7,8,9} )
+GNOME_ORG_MODULE="glib"
+
+inherit gnome.org python-single-r1
+
+DESCRIPTION="Build utilities for GLib using projects"
+HOMEPAGE="https://www.gtk.org/"
+
+LICENSE="LGPL-2.1+"
+SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+
+RDEPEND="${PYTHON_DEPS}
+	!<dev-libs/glib-2.56.2:2
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-libs/libxslt
+	app-text/docbook-xsl-stylesheets
+"
+
+src_configure() { :; }
+
+do_xsltproc_command() {
+	# Taken from meson.build for manual manpage building - keep in sync (also copied to dev-util/gdbus-codegen)
+	xsltproc \
+		--nonet \
+		--stringparam man.output.quietly 1 \
+		--stringparam funcsynopsis.style ansi \
+		--stringparam man.th.extra1.suppress 1 \
+		--stringparam man.authors.section.enabled 0 \
+		--stringparam man.copyright.section.enabled 0 \
+		-o "${2}" \
+		http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \
+		"${1}" || die "manpage generation failed"
+}
+
+src_compile() {
+	sed -e "s:@VERSION@:${PV}:g;s:@PYTHON@:python:g" gobject/glib-genmarshal.in > gobject/glib-genmarshal || die
+	sed -e "s:@VERSION@:${PV}:g;s:@PYTHON@:python:g" gobject/glib-mkenums.in > gobject/glib-mkenums || die
+	sed -e "s:@GLIB_VERSION@:${PV}:g;s:@PYTHON@:python:g" glib/gtester-report.in > glib/gtester-report || die
+	do_xsltproc_command docs/reference/gobject/glib-genmarshal.xml docs/reference/gobject/glib-genmarshal.1
+	do_xsltproc_command docs/reference/gobject/glib-mkenums.xml docs/reference/gobject/glib-mkenums.1
+	do_xsltproc_command docs/reference/glib/gtester-report.xml docs/reference/glib/gtester-report.1
+}
+
+src_install() {
+	python_fix_shebang gobject/glib-genmarshal
+	python_fix_shebang gobject/glib-mkenums
+	python_fix_shebang glib/gtester-report
+	exeinto /usr/bin
+	doexe gobject/glib-genmarshal
+	doexe gobject/glib-mkenums
+	doexe glib/gtester-report
+	doman docs/reference/gobject/glib-genmarshal.1
+	doman docs/reference/gobject/glib-mkenums.1
+	doman docs/reference/glib/gtester-report.1
+}
diff --git a/dev-util/glib-utils/glib-utils-2.68.2.ebuild b/dev-util/glib-utils/glib-utils-2.68.2.ebuild
index 8bdd1b9a92db..b34e2c06e0e0 100644
--- a/dev-util/glib-utils/glib-utils-2.68.2.ebuild
+++ b/dev-util/glib-utils/glib-utils-2.68.2.ebuild
@@ -14,7 +14,7 @@ LICENSE="LGPL-2.1+"
 SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-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 ~x86-winnt"
+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 ~x86-winnt"
 
 RDEPEND="${PYTHON_DEPS}"
 DEPEND="${RDEPEND}"
diff --git a/dev-util/glslang/Manifest b/dev-util/glslang/Manifest
index 31401164475b..f6f835bf930d 100644
--- a/dev-util/glslang/Manifest
+++ b/dev-util/glslang/Manifest
@@ -1,6 +1,8 @@
 DIST glslang-10.11.0.0_pre20201216.tar.gz 3290064 BLAKE2B 46ce951ab6c69eb25dc2490e3eb817c5cc0e2bf2416f29842b45bb1efb83ea439d72c823c981e2f37803e203077ea01d1c84c28391fb78288c107510a47d2241 SHA512 4b9e300152dc2ec3b14657b3a745d5b26b5da49e5ff3da0d75680f84126237ec6af0f7cee5aaa74b2d4a123a386522cd7342b5f25e4c01f114da3d5d92057128
 DIST glslang-11.2.0.tar.gz 3295235 BLAKE2B 42417f3be070a57f0c71f5a0c81ffcf4938044c74fd59435fad6889b74c077032fda18e73971db41b180341c1eb6bcdc24081d5ff57fb9baf36c32fbfac9e67a SHA512 0d6cd866c4e28069dbc2c5f0ceba2acab73356751499f8fe81177357c61b2bdae92d2502c47889687d57094dd9fd59b78a06234de1d9c4989a204f9ce3c73751
+DIST glslang-11.4.0.tar.gz 3342311 BLAKE2B 880f2c5bc2afe5c28b4c9246faed5a12492e24d1f3d75a0df036457ed7767541a18757d368e2298dd7e8e4f8ca9a2a168973274ea6364453130b2928bce4d991 SHA512 e507ff5420a192133dd25b3f1d18dfa4a20c7fff9908e58bad5a7ddf8119989977c2a180575cc24b3434cab4a7cc7559a3254676f6298c0fa3b82dc9e802e1f5
 EBUILD glslang-10.11.0.0_pre20201216.ebuild 890 BLAKE2B d2ae97e1228f30154c2e0674284aeee59943c6b97c619a594106e0765353c14a58e5a03ab03a024a934ccd6b6d66091764af9ad181dc79f577a495037415ef77 SHA512 889bd334d5a13e3ad22e97de659687bdcdc575f30cb45e21a4c253e469181008a5fdb05ef6ca5a21dc03ae22ef3ebbcf88ac8d09941c1d7ce0442942d826f5a0
 EBUILD glslang-11.2.0.ebuild 855 BLAKE2B 76f4c363a7ef228854cd948e1017f92c5cda2bca6240a4e011745775981a35266e06a84d9aa77092d111b4685218027facdf7390a020f1bfb074598ce5529ea7 SHA512 c6032b4b76e3cdcb80ff17e7c6dacc1df7930fc58869a6a48df3132665f4ad6661cf3b726f70ad2b5ee660331f90daa1607285aec6dbabcaa063e3b41d963f5f
+EBUILD glslang-11.4.0.ebuild 861 BLAKE2B bffd4abe4cf2742a3b4b69c8462175a09dca24545000686ef3fd3a5620abf5aa2af5648b0bfadd90871674b3b21534eb3b8f777306c657e56da3b95edfad50ad SHA512 96086d4cade525c556c58b6c869fae8c14dc8d2096b792cc028e989ad65fa5e7a9ca66cad22d01c708abeee810575924c49748b1b27ea18b5ce6d8c686a749fd
 EBUILD glslang-9999.ebuild 758 BLAKE2B 802d3dec30280cea4dc1c5b8dc652495537f93ef3b52c7d60740d8f9d6ea1343f22b0f0f4b6bc127eb3bca925daf6b1837a1763416cb27489e6db07173aec4ca SHA512 c8db05953380d7c0709e25a9507d5f043a05da423d9e119ae09ef00e5afae939c209b078a0b6da9d6072f07d04c3c20fd9d3827f6fdd71c793ea21036d4e03a6
 MISC metadata.xml 329 BLAKE2B 6238c1e548b8044e1112033dc166f06d7690d05bbdd006670f2151f28640a2c96d9d7fe4d8e6eeb6beb1bd6248cf177315e5cff314593718d838c91a81c02832 SHA512 6242378037de440c8e216330d6f2861ed3d473a0dfe55b9df1234c0956365d3206c1951034b9b2ee31702f741483f4fa113d801c6b1fdece9aad468021202326
diff --git a/dev-util/glslang/glslang-11.4.0.ebuild b/dev-util/glslang/glslang-11.4.0.ebuild
new file mode 100644
index 000000000000..2fe500d17138
--- /dev/null
+++ b/dev-util/glslang/glslang-11.4.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS="cmake"
+PYTHON_COMPAT=( python3_{7,8,9} )
+inherit cmake-multilib python-any-r1
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/${PN}.git"
+	inherit git-r3
+else
+	SNAPSHOT_COMMIT="${PV}"
+	SRC_URI="https://github.com/KhronosGroup/${PN}/archive/${SNAPSHOT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+	S="${WORKDIR}/${PN}-${SNAPSHOT_COMMIT}"
+fi
+
+DESCRIPTION="Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator"
+HOMEPAGE="https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/ https://github.com/KhronosGroup/glslang"
+
+LICENSE="BSD"
+SLOT="0"
+
+RDEPEND="!<media-libs/shaderc-2020.1"
+BDEPEND="${PYTHON_DEPS}"
+
+# Bug 698850
+RESTRICT="test"
diff --git a/dev-util/gnome-builder/Manifest b/dev-util/gnome-builder/Manifest
index d77985d05063..62b3e923f1e0 100644
--- a/dev-util/gnome-builder/Manifest
+++ b/dev-util/gnome-builder/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-builder-3.38.2.tar.xz 12078024 BLAKE2B 9cf8a74be5a48b73c21ce247a07fcb1441482edab8fd118a2d773429f68efcd50f4a8a1ef826cf90a9f76e482f25d9a092ca1700504178051fcf903abe9eb1ae SHA512 6f9d284a9c915562fe55a863ddcc385ca9278b4ee201f4b97272f425937066d630c35c0b337bdf94ce4b12226080a9020eb5dc253ccfb25bc6cdbf8e50779569
 DIST gnome-builder-3.40.2.tar.xz 12083992 BLAKE2B 136c3e89378221116b5252a8472768888f11bd580cf9d1d524504f9000b8123ee479e19073630bb678cc7392b716e45d122b406dc7d44b13ba0ba77b435077e0 SHA512 e0d1f0f21fe0f681f87d1ad672cb5bf60df3ef16541fffd8ca62d447339371bdb5cbc10d8fc83496822d6eb35ad8078b095ff97d950d940d862d6fd7968147a4
-EBUILD gnome-builder-3.38.2.ebuild 6819 BLAKE2B da4de776fd37f346f2cd346b0e1e41825106ffdc1b2dacfff145bae47e799d83958ff019adb0ab9c9f12f1ba3e4a055e85cf7897eaa0dde1321d8a4d90aae5bb SHA512 7dd08896e752c1060fa2e82525bd096203cc56fcbf0be2de94432f74a10ceadeec4ef1eca3a8a39f6e5905e8dcfff25eaa9b4c520f4a992f5fc3453d794de83b
-EBUILD gnome-builder-3.40.2.ebuild 7006 BLAKE2B ad8748872d3e8accd07aeb11d4d2f1e67d9e54d5ef41eb810fc64a0c1611d5e918b2c2e6d52ce64e9fe09b506044dbd54133f38854776c13e7d12597b696a950 SHA512 99bf6501c32491a02ce60880e861462b5f7b1606e87e59057a473d8b9e8de820d8d02de2d08c105b35a9ef7f020cc13dc35e734b1c589f7b741954cd4ade0565
+EBUILD gnome-builder-3.40.2.ebuild 7004 BLAKE2B a7fb002294915dd0e303621d8fbbbcf122ea9d67fa48da7cca056f53fccf128f8017dd635c41b0544edd3faf8824be5c1a4d7308c1d0ff3916fc48a99b026491 SHA512 2c873efe3f77f3df3ecc5f7958c2cb80f78bb0209a00a03775c6fab858823aa48fc61214ed262286991acffd18959bf7cb083d2d8068c02d655dfea97d011f48
 MISC metadata.xml 976 BLAKE2B 088592bf7fc4c650b17862e771d3283aced4d7a5003f66938dd5830c4a8b88884fb46362e50745b09f9903347dad3233b1ba8339bdaa66c7ea9f70024071a3b8 SHA512 136ec6b271c0084e86f8b7e309f46cd89d382e96d815269f50f0dae33795084d17790daf360fb760a17a2d4885a4a5aae5f8563449160ebec49bf4c9f69438a8
diff --git a/dev-util/gnome-builder/gnome-builder-3.38.2.ebuild b/dev-util/gnome-builder/gnome-builder-3.38.2.ebuild
deleted file mode 100644
index 9c5e2da3cdf7..000000000000
--- a/dev-util/gnome-builder/gnome-builder-3.38.2.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
-DISABLE_AUTOFORMATTING=1
-FORCE_PRINT_ELOG=1
-
-inherit gnome.org gnome2-utils llvm meson python-single-r1 readme.gentoo-r1 virtualx xdg
-
-DESCRIPTION="An IDE for writing GNOME-based software"
-HOMEPAGE="https://wiki.gnome.org/Apps/Builder"
-
-# FIXME: Review licenses at some point
-LICENSE="GPL-3+ GPL-2+ LGPL-3+ LGPL-2+ MIT CC-BY-SA-3.0 CC0-1.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="clang +devhelp doc +git +glade gtk-doc spell sysprof test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# When bumping, pay attention to all the included plugins/*/meson.build (and other) build files and the requirements within.
-# `grep -rI dependency * --include='meson.build'` can give a good initial idea for external deps and their double checking.
-# The listed RDEPEND order shold roughly match that output as well, with toplevel one first then sorted by file path.
-# Most plugins have no extra requirements and default to enabled; we need to handle the ones with extra requirements. Many of
-# them have optional runtime dependencies, for which we try to at least notify the user via DOC_CONTENTS (but not all small
-# things); `grep -rI -e 'command-pattern.*=' -e 'push_arg'` can give a (spammy) idea, plus python imports in try/except.
-
-# FIXME: plugin_flatpak needs flatpak.pc >=0.8.0, ostree-1, libsoup-2.4.pc >=2.52.0 and git plugin enabled
-# Editorconfig needs old pcre, with vte migrating away, might want it optional or ported to pcre2?
-# An introspection USE flag of a dep is required if any introspection based language plugin wants to use it (grep for gi.repository). Last full check at 3.28.4
-
-# TODO: Handle llvm slots via llvm.eclass; see plugins/clang/meson.build
-# TODO: automagic libportal dep
-# TODO: automagic sysprof dep for tracing paths from toplevel meson.build
-RDEPEND="
-	>=dev-libs/libdazzle-3.37.0[introspection]
-	>=dev-libs/glib-2.65.0:2
-	>=x11-libs/gtk+-3.22.26:3[introspection]
-	>=x11-libs/gtksourceview-4.0.0:4[introspection]
-	>=dev-libs/json-glib-1.2.0
-	>=dev-libs/jsonrpc-glib-3.19.91
-	>=x11-libs/pango-1.38.0
-	>=dev-libs/libpeas-1.22.0[python,${PYTHON_SINGLE_USEDEP}]
-	>=dev-libs/template-glib-3.28.0[introspection]
-	>=x11-libs/vte-0.40.2:2.91[introspection]
-	>=net-libs/webkit-gtk-2.26:4=[introspection]
-	>=dev-libs/libxml2-2.9.0
-	git? ( dev-libs/libgit2:=[ssh,threads]
-		>=dev-libs/libgit2-glib-0.28.0.1[ssh]
-	)
-	dev-libs/libpcre:3
-	dev-libs/libpcre2
-
-	>=dev-libs/gobject-introspection-1.54.0:=
-	$(python_gen_cond_dep '
-		>=dev-python/pygobject-3.22.0:3[${PYTHON_USEDEP}]
-	')
-	${PYTHON_DEPS}
-	clang? ( sys-devel/clang:= )
-	devhelp? ( >=dev-util/devhelp-3.25.1:= )
-	glade? ( >=dev-util/glade-3.22.0:3.10= )
-	spell? ( >=app-text/gspell-1.8:0=
-		app-text/enchant:2 )
-	sysprof? ( >=dev-util/sysprof-3.37.1:0/4[gtk] )
-"
-DEPEND="${RDEPEND}"
-# TODO: runtime ctags path finding..
-
-# desktop-file-utils required for tests, but we have it in deptree for xdg update-desktop-database anyway, so be explicit and unconditional
-# appstream-glib needed for validation with appstream-util with FEATURES=test
-BDEPEND="
-	doc? ( $(python_gen_cond_dep '
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	') )
-	gtk-doc? ( dev-util/gtk-doc
-		app-text/docbook-xml-dtd:4.3 )
-	test? (
-		dev-libs/appstream-glib
-		sys-apps/dbus )
-	dev-util/desktop-file-utils
-	dev-util/glib-utils
-	>=dev-util/meson-0.49.2
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-DOC_CONTENTS='gnome-builder can use various other dependencies on runtime to provide
-extra capabilities beyond these expressed via USE flags. Some of these
-that are currently available with packages include:
-
-* dev-util/uncrustify and dev-python/autopep8 for various Code Beautifier
-  plugin out of the box functionality.
-* dev-util/ctags with exuberant-ctags selected via "eselect ctags" for
-  C, C++, Python, JavaScript, CSS, HTML and Ruby autocompletion, semantic
-  highlighting and symbol resolving support.
-* dev-python/jedi and dev-python/lxml for more accurate Python
-  autocompletion support.
-* dev-util/valgrind for integration with valgrind.
-* dev-util/meson for integration with the Meson build system.
-* dev-util/cargo for integration with the Rust Cargo build system.
-* dev-util/cmake for integration with the CMake build system.
-* net-libs/nodejs[npm] for integration with the NPM package system.
-'
-# FIXME: Package codespell and mention here
-# FIXME: Package gnome-code-assistance and mention here, or maybe USE flag and default enable because it's rather important
-# eslint for additional diagnostics in JavaScript files (what package has this? At least something via NPM..)
-# jhbuild support
-# rust support via rust-analyzer (rls plugin now disabled by default); Go via go-langserver
-# autotools stuff for autotools plugin; gtkmm/autoconf-archive for C++ template
-# gjs/gettext/mono/PHPize stuff, but most of these are probably installed for other reasons anyways, when needed inside IDE
-# stylelint for stylesheet (CSS and co) linting
-# gvls for vala language-server integration
-
-llvm_check_deps() {
-	has_version "sys-devel/clang:${LLVM_SLOT}"
-}
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	use clang && llvm_pkg_setup
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dtracing=false
-		-Dprofiling=false # not passing -pg to CFLAGS
-		-Dtcmalloc=false
-		-Dchannel=other
-
-		$(meson_use doc help)
-		$(meson_use gtk-doc docs)
-
-		-Dnetwork_tests=false
-		$(meson_use clang plugin_clang)
-		$(meson_use devhelp plugin_devhelp)
-		-Dplugin_deviced=false
-		-Dplugin_editorconfig=true # needs libpcre
-		-Dplugin_flatpak=false
-		$(meson_use git plugin_git)
-		$(meson_use glade plugin_glade)
-		-Dplugin_podman=false
-		$(meson_use spell plugin_spellcheck)
-		$(meson_use sysprof plugin_sysprof)
-		-Dplugin_update_manager=false
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	python_optimize
-	if use doc; then
-		rm "${ED}"/usr/share/doc/gnome-builder/en/.buildinfo || die
-		rm "${ED}"/usr/share/doc/gnome-builder/en/objects.inv || die
-		# custom docdir in build system, blocked by https://github.com/mesonbuild/meson/issues/825
-		mv "${ED}"/usr/share/doc/gnome-builder/en "${ED}"/usr/share/doc/${PF}/html || die
-		# _sources subdir left in on purpose, as HTML links to the rst files as "View page source". Additionally default docompress exclusion of /html/ already ensures they aren't compressed, thus linkable as-is.
-		rmdir "${ED}"/usr/share/doc/gnome-builder/ || die
-	fi
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
-
-src_test() {
-	# FIXME: can't run meson_src_test together with virtx or dbus-run-session
-	virtx dbus-run-session meson test -C "${BUILD_DIR}"
-}
diff --git a/dev-util/gnome-builder/gnome-builder-3.40.2.ebuild b/dev-util/gnome-builder/gnome-builder-3.40.2.ebuild
index 0723a1d75844..13087e7d6c33 100644
--- a/dev-util/gnome-builder/gnome-builder-3.40.2.ebuild
+++ b/dev-util/gnome-builder/gnome-builder-3.40.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Builder"
 # FIXME: Review licenses at some point
 LICENSE="GPL-3+ GPL-2+ LGPL-3+ LGPL-2+ MIT CC-BY-SA-3.0 CC0-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="clang +devhelp doc +git +glade gtk-doc spell sysprof test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-util/gnome-devel-docs/Manifest b/dev-util/gnome-devel-docs/Manifest
index 53a8a521f399..289a4217e6f4 100644
--- a/dev-util/gnome-devel-docs/Manifest
+++ b/dev-util/gnome-devel-docs/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-devel-docs-3.32.1.tar.xz 10281104 BLAKE2B 8f1c49a7829588b3c7e82b5d1c25f34506f8dc0470b4402e2f4f7be1420d6f314f9a88088afc2d5860d34e3c5029c3f129220c9a83a46621bdb2a877f83dfccc SHA512 57cd312aa43f529e4b2cc862a3cf1e3d6dd67baa145d4a3119227a18ff3a7db67aaf0d641e736d0362dda72ab274bdb701f73b8b309c3ba013b843d217d94604
 DIST gnome-devel-docs-40.0.tar.xz 10756744 BLAKE2B 565a6340191f7f3f1d8e396bd0109d9d82792829dbdfc1d155115acfe6453b239e095e3c6f763a0b94119d173e1063ecc48296760cd9a39a3f29356de4faf6cf SHA512 c7068cfe712c94b01d0387bd66f64a295096223f0ee1c49cb06d0d4d2c1651da7df1f152164e289cafae5fa53963a9b4e2afd616d1995475a8b2c437fd8c2903
-EBUILD gnome-devel-docs-3.32.1.ebuild 656 BLAKE2B 5ee7adc63c8330cf71ef5989283e44389cda94e665df91b3796d4483fbe92b8369b93d3a0df58c2f20d8c6d46e63a65310309b15003809657e29921c83c9e57e SHA512 267601add744eeb41cdb0c2819a76d4ca3941c75c4a54f214987f4188026c1d715b70bff7eb22549711a443e07db3b7afe071603bc0d3ee55d6632bd030f0e47
-EBUILD gnome-devel-docs-40.0.ebuild 640 BLAKE2B b2c1be0335dc6568b9e886682dc20aa74e07fd02cd30b325e0d83b539982a3d8226217007db2e2bc7daddf25fa1cd8889ac4efadbda67bb6725cb57dd32361c8 SHA512 27e85eaffbf603d795859f6e602551b463340858a1145b2394317747cb535c95aba1531ba4ab2137473ce03aa26541305d6ac176a6253100ebcaab63c7d515e5
+EBUILD gnome-devel-docs-40.0.ebuild 638 BLAKE2B 9e6642afa1276c9a03efad81d85d8ce8bd9d1c24dc88678783eba4f04bd5572abce1e7192bcfcca5e53bd755dba6a298d0b1f9357de73671b56b3a4f9b66a687 SHA512 ba8723fbb6ee8bef61fd7eca8ba17f83d69a520265de2b1fbdb0023964b9e01e7a9704b316bf9e9ccae981f1152fe852148436050223142b215d620c77e4ba9a
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/gnome-devel-docs/gnome-devel-docs-3.32.1.ebuild b/dev-util/gnome-devel-docs/gnome-devel-docs-3.32.1.ebuild
deleted file mode 100644
index 0fface02ba10..000000000000
--- a/dev-util/gnome-devel-docs/gnome-devel-docs-3.32.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="Documentation for developing for the GNOME desktop environment"
-HOMEPAGE="https://developer.gnome.org/"
-
-LICENSE="FDL-1.1+ CC-BY-SA-3.0 CC-BY-SA-4.0"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/docbook-xml-dtd:4.3
-	dev-libs/libxslt
-	dev-util/itstool
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-# This ebuild does not install any binaries
-RESTRICT="binchecks strip"
-
-src_configure() {
-	# Wants to build demo samples
-	gnome2_src_configure ac_cv_path_CC=""
-}
diff --git a/dev-util/gnome-devel-docs/gnome-devel-docs-40.0.ebuild b/dev-util/gnome-devel-docs/gnome-devel-docs-40.0.ebuild
index 2ff8d4654ff2..ea104314ef56 100644
--- a/dev-util/gnome-devel-docs/gnome-devel-docs-40.0.ebuild
+++ b/dev-util/gnome-devel-docs/gnome-devel-docs-40.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://developer.gnome.org/"
 
 LICENSE="FDL-1.1+ CC-BY-SA-3.0 CC-BY-SA-4.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 
 BDEPEND="
 	app-text/docbook-xml-dtd:4.1.2
diff --git a/dev-util/gtk-builder-convert/Manifest b/dev-util/gtk-builder-convert/Manifest
index ea5524800e0a..c48b6548029f 100644
--- a/dev-util/gtk-builder-convert/Manifest
+++ b/dev-util/gtk-builder-convert/Manifest
@@ -1,4 +1,4 @@
 AUX gtk-builder-convert-2.24.32-python3.patch 2165 BLAKE2B 2c70d438614cfbe09f5742fb6f0f8519831612058de36bd4173d4f8968ca6f5f546b6c212f6c54a997d43406a0bc787f9b0a5eb117c93d137861e39896a3b066 SHA512 9b52db1bff0a9cbebfac2d2d737c8a75e3ef704993e1bcc2117289b6bc05f1bf797da4763f50b9e9f2f2e93734c8cb747b301191842fee915232614347e7b26d
 DIST gtk+-2.24.32.tar.xz 12620860 BLAKE2B 03f4c0a8be98473f62bc8c86859937969c4169960a5f93d37ff6dcde00413215fa6c7125b15781bf50d67b40aa0056cb71b83fb50acb2c3467b5deb3c8d938f0 SHA512 8e8fd9ae32f1d6fb544da260f00599f0f05090d910d767b06ef086ab4f1f8373a29bb0da9767761c9b5f4cfd51b5c45d0fa5d39b0428c839ddf0a579df806696
-EBUILD gtk-builder-convert-2.24.32-r1.ebuild 1176 BLAKE2B c8e76d015327233d294c9ae7ad6f57c722e61334c6a915793ffe3f47017fd1e88a094f284a7e97cd90bcac39aee04ea297640c41e81e633d0f40293252544c84 SHA512 8a261566a49c278787330969ec9ac7f9c60dfe81d820d24391cd12e380e64b1e8d909fd50b7ec5c28360e459f6af0a918393fae50615359084c6f9ac26fd0941
+EBUILD gtk-builder-convert-2.24.32-r1.ebuild 1177 BLAKE2B 193385e720b3d39e167c55924c0fc7be8ce5dbd76d8797d1c0a673730e825675ee0764e2fa3ea95f8113e9b9ff37b77da9a236d931f131eb453e499740603523 SHA512 f953bc66ee55540f44ac45dc559fff5b985ba2ecf09e5b1f5e966cf9135af8b225098319ba94e908ce196719fb386d623a2b7abe206874d697c22749dbfeec9f
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.32-r1.ebuild b/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.32-r1.ebuild
index a00200a94aca..9aeabd056a16 100644
--- a/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.32-r1.ebuild
+++ b/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.32-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 GNOME_ORG_MODULE="gtk+"
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 PYTHON_REQ_USE="xml"
 
 inherit gnome.org python-single-r1
diff --git a/dev-util/gtk-doc-am/Manifest b/dev-util/gtk-doc-am/Manifest
index 267f945fefbf..febbbf661c95 100644
--- a/dev-util/gtk-doc-am/Manifest
+++ b/dev-util/gtk-doc-am/Manifest
@@ -1,5 +1,5 @@
 DIST gtk-doc-1.33.1.tar.xz 768896 BLAKE2B 0d6cc32611618669aac4045942497a404f4d3ed703341cce56efefba439eb8595877297b76085c6a57d3d76710257153040b8f895d6dd6381502e852e6b82e93 SHA512 18620f0164382849980938103a9243abc35ea5a2628258f00e096e16a698b598d0c7fe80a1739fc689217c59a648c728a014bc672a92346c65768ebf89675b90
 DIST gtk-doc-1.33.2.tar.xz 507852 BLAKE2B dea3030060ecec89433fe3783dfacc2f58373780c49560a48ab1a32bedfe888692183de8396c92414255e4c8f537358cbc373fd307638ab8e7dbfd9ae44de58f SHA512 f50f68ab6b4bc59f55e84b49c1481f05700171cbf79eca9ba8f3a142a30a4ba88fe096983ebb8d117a9ef8bcea40934674096683d956f5c54cae457d31f651ab
 EBUILD gtk-doc-am-1.33.1.ebuild 824 BLAKE2B a9fe5302cf2ea6a5b2277b72b495daef83067de3221e82674cbc8553ed72e45f1d9667b51d3db7f377364536b07f7eb992ce3a820f50a4135ff68e1c81ebd6e8 SHA512 eea98796da90c30189c5a4a8e04939940acb7a4b48fdafe92a2aff1b7ea04d0819b87badc4f80d3833672234deff0b103a39c35a7d99c8eba58636b5c723d4cb
-EBUILD gtk-doc-am-1.33.2.ebuild 832 BLAKE2B 2e381cbac19bb707ccdc0f85a1bbc8fab10375d34b83ac9489646fbc3d2831f1dde0823e5a64184b24148c42e0a83fb79da4d18c95125841709d164d9df83ccf SHA512 6384da06c848259619fc0d29cdd4e9d7d6d7c49e87bbd4e91a34057234256c5becc9578d16741d29b72bcaa1ad46f6dd4bb2a3647a56615c46125ce0d3763a0a
+EBUILD gtk-doc-am-1.33.2.ebuild 824 BLAKE2B a9fe5302cf2ea6a5b2277b72b495daef83067de3221e82674cbc8553ed72e45f1d9667b51d3db7f377364536b07f7eb992ce3a820f50a4135ff68e1c81ebd6e8 SHA512 eea98796da90c30189c5a4a8e04939940acb7a4b48fdafe92a2aff1b7ea04d0819b87badc4f80d3833672234deff0b103a39c35a7d99c8eba58636b5c723d4cb
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/gtk-doc-am/gtk-doc-am-1.33.2.ebuild b/dev-util/gtk-doc-am/gtk-doc-am-1.33.2.ebuild
index 718c3f4fd20b..303d509eb38a 100644
--- a/dev-util/gtk-doc-am/gtk-doc-am-1.33.2.ebuild
+++ b/dev-util/gtk-doc-am/gtk-doc-am-1.33.2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/DocumentationProject/GtkDoc"
 
 LICENSE="GPL-2 FDL-1.1"
 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 ~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"
 
 RDEPEND="!<dev-util/gtk-doc-${GNOME_ORG_PVP}"
 PDEPEND="virtual/pkgconfig"
diff --git a/dev-util/gtk-doc/Manifest b/dev-util/gtk-doc/Manifest
index 8f75ea679495..3fea2b6adbf7 100644
--- a/dev-util/gtk-doc/Manifest
+++ b/dev-util/gtk-doc/Manifest
@@ -3,5 +3,5 @@ AUX gtk-doc-1.8-emacs-keybindings.patch 582 BLAKE2B 9591f8f58dbd2c5897abf020f96a
 DIST gtk-doc-1.33.1.tar.xz 768896 BLAKE2B 0d6cc32611618669aac4045942497a404f4d3ed703341cce56efefba439eb8595877297b76085c6a57d3d76710257153040b8f895d6dd6381502e852e6b82e93 SHA512 18620f0164382849980938103a9243abc35ea5a2628258f00e096e16a698b598d0c7fe80a1739fc689217c59a648c728a014bc672a92346c65768ebf89675b90
 DIST gtk-doc-1.33.2.tar.xz 507852 BLAKE2B dea3030060ecec89433fe3783dfacc2f58373780c49560a48ab1a32bedfe888692183de8396c92414255e4c8f537358cbc373fd307638ab8e7dbfd9ae44de58f SHA512 f50f68ab6b4bc59f55e84b49c1481f05700171cbf79eca9ba8f3a142a30a4ba88fe096983ebb8d117a9ef8bcea40934674096683d956f5c54cae457d31f651ab
 EBUILD gtk-doc-1.33.1-r4.ebuild 2614 BLAKE2B 1127986051ad200315fda01178dbeaa4c2e0e34f41dbb5bd90faf34617cf025d40a84a8dc1e4c2ef2547144e1986be72581b2d9e02f2f6190453c2bc96ec6e8a SHA512 133ebb7029320a7929e99037e04a7999aed12b144a53299141ac5c810adce32cf9833d28f964ebffd871c41113af9080568df6280eb3347d414a28a81b3f2570
-EBUILD gtk-doc-1.33.2.ebuild 2622 BLAKE2B 74fafa8a699b836473dec1dee25e1e4e59b4c6bf1b0b2e6589dd0b7e8fe79565a07658a3130442f7e5cf4b2870b0ee654fd62215e89e25f419b2529fe9f53980 SHA512 36dbfd5fc7b0728b0dda700c3694b28e6addfad8e7f3172b0dd7a85f26c119e4c5759059d2f70d0aa3f37d0d94bf75a2b87489ff7d5863598c8cffddba1168d4
+EBUILD gtk-doc-1.33.2.ebuild 2614 BLAKE2B 1127986051ad200315fda01178dbeaa4c2e0e34f41dbb5bd90faf34617cf025d40a84a8dc1e4c2ef2547144e1986be72581b2d9e02f2f6190453c2bc96ec6e8a SHA512 133ebb7029320a7929e99037e04a7999aed12b144a53299141ac5c810adce32cf9833d28f964ebffd871c41113af9080568df6280eb3347d414a28a81b3f2570
 MISC metadata.xml 490 BLAKE2B 9b4d27b146f567501af858fd704d7713e8eea66caac0b5878d685814b48825f4222a6286acd3a8ec4d8e698ace318c52c74e301dc8eb3eec41bca3d83d24a130 SHA512 0d33e970b5924c264711c8a77aa966ff8f1e6cd2695d34088c0f9af825cd72603173e07e39fb6d6bd22098d76c048b3dc03dd83916b092f2c68c58f94aa95b7a
diff --git a/dev-util/gtk-doc/gtk-doc-1.33.2.ebuild b/dev-util/gtk-doc/gtk-doc-1.33.2.ebuild
index df6e92cd3086..18c12d44b238 100644
--- a/dev-util/gtk-doc/gtk-doc-1.33.2.ebuild
+++ b/dev-util/gtk-doc/gtk-doc-1.33.2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/DocumentationProject/GtkDoc"
 
 LICENSE="GPL-2 FDL-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
 
 IUSE="emacs test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-util/howdoi/Manifest b/dev-util/howdoi/Manifest
index c8e9ad45155f..d376bab01421 100644
--- a/dev-util/howdoi/Manifest
+++ b/dev-util/howdoi/Manifest
@@ -1,9 +1,5 @@
-DIST howdoi-2.0.13.tar.gz 26143 BLAKE2B 39eb23c94ec8883a88a1b6205af69668396ab4bfeccdab9994bddd3fcbe90b78d2348b4b3b9b935bdaa936edb1fce31c05aab6308195612c535d516e5aff332d SHA512 b44e506ecbaf8d10590168ab62ab4e943bfe832e8b981109647c9304d46956afb343239575e1196dbb3284c9db9831839cb9933aca0eaff037f6454434c8194b
-DIST howdoi-2.0.14.tar.gz 26675 BLAKE2B 901a39d7f9dd9f2dd5931e0c9710083280f067687a6be985188f459cf9b82e89993f352128e3dc616ea6395bf853762f1d8a7b1fd79c0e457d71af8859e9dc7f SHA512 7c913a0b3d6fda60a140520406956c6ada291ae9e9d7116a10adcb1b31a6fc6d22d221285e852d07bade33e1c075f0dc489eee39c3f4db420454d4813ab33254
 DIST howdoi-2.0.15.tar.gz 27545 BLAKE2B 204d7e3ddab07e24ccc08964c3880477743970502423887a2360079606c832b93d1e8fbcec237b77533c2e21d4a35af08b9418d5ce62f8b2ceca70ee844c21ff SHA512 e0b3faf1cde78d35a23e11070b3d73db7468bfe79ec8f71b2370681d3dea1bcf1a313594fd1e4f21aa62035460e5c31509ff683fea3e0e35e9412b173ad874bb
 DIST howdoi-2.0.7.tar.gz 25167 BLAKE2B 5923aaae6d6aaee4da7e02cd283d6e794c31d600d2834d1354e0d90194ac573d80140517ba7289bbf97b01923b6ed8c9c2ab6abe0beea0534fc41ecf24196c24 SHA512 9f8278e6ea688c40fee5227aa23375cb7dc7339d579953c73dbf7111087550ece412e26508e129f377e2326ce4635c38d96ad99f98c8c6f1131a01bbaf062275
-EBUILD howdoi-2.0.13.ebuild 695 BLAKE2B 70c88f0b23fd73d22fe788c5a02e0d48e3686b2192ac5701053af5c42d5177847fa6b7626a0db9233d332c3573b4500a68748682baf6384b688aeb2b7e3b269a SHA512 e1876358f75aa6acbf7446933a792ff6df59c5745ed25a10e6fde5d0529b19cb3c8cf1f48caa58347ca1628fde463c766972404d8687387ea4e3c6862b190adb
-EBUILD howdoi-2.0.14.ebuild 695 BLAKE2B 70c88f0b23fd73d22fe788c5a02e0d48e3686b2192ac5701053af5c42d5177847fa6b7626a0db9233d332c3573b4500a68748682baf6384b688aeb2b7e3b269a SHA512 e1876358f75aa6acbf7446933a792ff6df59c5745ed25a10e6fde5d0529b19cb3c8cf1f48caa58347ca1628fde463c766972404d8687387ea4e3c6862b190adb
-EBUILD howdoi-2.0.15.ebuild 695 BLAKE2B 70c88f0b23fd73d22fe788c5a02e0d48e3686b2192ac5701053af5c42d5177847fa6b7626a0db9233d332c3573b4500a68748682baf6384b688aeb2b7e3b269a SHA512 e1876358f75aa6acbf7446933a792ff6df59c5745ed25a10e6fde5d0529b19cb3c8cf1f48caa58347ca1628fde463c766972404d8687387ea4e3c6862b190adb
+EBUILD howdoi-2.0.15.ebuild 684 BLAKE2B 9f7cb5189659a41a8f1cc416557a676bdf309253390f801a43653bab3edfde6cd0f9b40452cca0943b9904fcf1951a0ea97ab31d984cbefd722c913f39d40bf8 SHA512 b3660bb4744592976f51a12f814d3c8c1d92581f20a5997a3cc582f8b5f053877fa59b9e64fd43a33dbeb9c662b6e8a84cf0ede02e12113f53290e5b14066036
 EBUILD howdoi-2.0.7.ebuild 693 BLAKE2B f3349a11696b95e0cfdee1a19b9589d487bbd762c2bdf034d0c41865413908b52bf0db1357ba8fe612db3ea5e14a6c63e14b090f763eab8a2ae52b07d2fed09b SHA512 99fef66aa24ea1ddc962d9637a79691b215bc86633ef16359bc2bed9b1b39f4298bf8974fa643e88fb9d42220a4fa4ee6214e0ba1e98ef55e8043b6e527db01c
 MISC metadata.xml 367 BLAKE2B cad999effcfe4ba7eb7fcce4efa22b7cc1bc501c01f28c647c8d94fd560645b96d25bc89703bd43c8f5a969606f9842e14f955bc7ace46fcff0333469843e62b SHA512 eacaf9118ec14ec50c3f22d0abf5deafb42ebbcb3bfbdb87f01c6908983b36c6c837b13f903c0cdd7be3137d9c999f66d7983157a7ec33685d08d608096f0e27
diff --git a/dev-util/howdoi/howdoi-2.0.13.ebuild b/dev-util/howdoi/howdoi-2.0.13.ebuild
deleted file mode 100644
index 8fba32c5aa56..000000000000
--- a/dev-util/howdoi/howdoi-2.0.13.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS="manual"
-PYTHON_COMPAT=( python{3_7,3_8} )
-inherit distutils-r1
-
-DESCRIPTION="A code search tool"
-HOMEPAGE="https://pypi.org/project/howdoi/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="
-	dev-python/appdirs[${PYTHON_USEDEP}]
-	dev-python/cachelib[${PYTHON_USEDEP}]
-	dev-python/keep[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	>=dev-python/pyquery-1.4.1[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.24.0[${PYTHON_USEDEP}]
-"
diff --git a/dev-util/howdoi/howdoi-2.0.14.ebuild b/dev-util/howdoi/howdoi-2.0.14.ebuild
deleted file mode 100644
index 8fba32c5aa56..000000000000
--- a/dev-util/howdoi/howdoi-2.0.14.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS="manual"
-PYTHON_COMPAT=( python{3_7,3_8} )
-inherit distutils-r1
-
-DESCRIPTION="A code search tool"
-HOMEPAGE="https://pypi.org/project/howdoi/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="
-	dev-python/appdirs[${PYTHON_USEDEP}]
-	dev-python/cachelib[${PYTHON_USEDEP}]
-	dev-python/keep[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	>=dev-python/pyquery-1.4.1[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.24.0[${PYTHON_USEDEP}]
-"
diff --git a/dev-util/howdoi/howdoi-2.0.15.ebuild b/dev-util/howdoi/howdoi-2.0.15.ebuild
index 8fba32c5aa56..5e23ac1f1240 100644
--- a/dev-util/howdoi/howdoi-2.0.15.ebuild
+++ b/dev-util/howdoi/howdoi-2.0.15.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS="manual"
-PYTHON_COMPAT=( python{3_7,3_8} )
+PYTHON_COMPAT=( python3_{7..9} )
 inherit distutils-r1
 
 DESCRIPTION="A code search tool"
@@ -13,8 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
+KEYWORDS="amd64 x86"
 
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="
diff --git a/dev-util/include-what-you-use/Manifest b/dev-util/include-what-you-use/Manifest
index 5ba385a6ab72..c94672e7c507 100644
--- a/dev-util/include-what-you-use/Manifest
+++ b/dev-util/include-what-you-use/Manifest
@@ -1,3 +1,5 @@
 DIST include-what-you-use-11.0.tar.gz 603435 BLAKE2B 7bfa37349cc4bf5d07033c28d9d3851f0ce2093f1703a0392ac633ab2761dfdfb7cd923099177747e3389d2d41330351242c6f936399acf73119c201d8776978 SHA512 db15efa9b92015322e9a188be6cf16a5c6fd71271c94fde45245676f2a8f6ffe4c7837e3b0bb5f9be6cbe78aab245129816a3b046c44c261a2b7ab5c3a9ea7b9
+DIST include-what-you-use-12.0.tar.gz 742573 BLAKE2B b8cd90db490d13f140126df8955d0968a9248480da09ca29b82fe1178c779ca75e6f29239bc6fb1556200c7d7c498f2340839e8500455ecaed9e6199fd3d55f7 SHA512 2923e18c40ddc5c03458b896d991adde03d489c6645ecc3cc4f69a508e323534afdef3233943e99533ffc21c64a10a8a5c635dc4797a61edf09d0a7a918a3cd5
 EBUILD include-what-you-use-11.0-r1.ebuild 1308 BLAKE2B bbc6ca260522f5cacd844c509c41e104eea86a97ccf65c9ff61a1a64a63b106c75cda0b9c61b12b95cd0abd63f50d32789b06ede0e8024ee9b08e9ba607f77db SHA512 29e627efe52e28b9fb1aa4dc3ef65fb49d7abf546f1d3953d1d931015568b4c65c1bcb8e7250b01d6ab32a746dc83fc87840396831b0a2179577652d0102526e
+EBUILD include-what-you-use-12.0.ebuild 1308 BLAKE2B dbafe04ed482d17721ac590a324cea24cf601de45af8af3cda3d744f58febd914b3b5cf2b48122002191e6c6bae34a1daa2ffe8bbd3d79d4fdb6d63d7f922dea SHA512 edeff418ef2284a6a60aea486926ac53c37059cb66a2a022f7d06266ef38ac76bfa8e5b94cc562013bf3df88cb0caf75b5d41bd8a0430d0d498f03e14233d08c
 MISC metadata.xml 357 BLAKE2B f14a0380bab03b4bb916602ed495cf9c29a4ca5839f71dca0d5f4f14eeb5fd0ddaa66dfcb15d94cbeec2a9021a9e5522ef7ae531b5b6f111b769462596da4216 SHA512 03c298d184adee1c8bd96855ba3856dbc6797f6f866397485cc10c3e02956f7bb04811a086e9cf50bbd6f996011d08ca2d272aa4b06f13ee62af5a585f67b492
diff --git a/dev-util/include-what-you-use/include-what-you-use-12.0.ebuild b/dev-util/include-what-you-use/include-what-you-use-12.0.ebuild
new file mode 100644
index 000000000000..ecd93d6af5f9
--- /dev/null
+++ b/dev-util/include-what-you-use/include-what-you-use-12.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit cmake flag-o-matic llvm python-single-r1
+
+# Sometimes the tag is clang_9, sometimes it's IWYU-0.13
+UPSTREAM_PV=0.16
+
+DESCRIPTION="Find unused include directives in C/C++ programs"
+HOMEPAGE="https://include-what-you-use.org/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${UPSTREAM_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+LLVM_MAX_SLOT=12
+
+RDEPEND="
+	sys-devel/clang:${LLVM_MAX_SLOT}=
+	${PYTHON_DEPS}
+"
+DEPEND="${RDEPEND}"
+
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+S=${WORKDIR}/${PN}-${UPSTREAM_PV}
+
+llvm_check_deps() {
+	has_version "sys-devel/clang:${LLVM_SLOT}"
+}
+
+pkg_setup() {
+	llvm_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	python_fix_shebang .
+}
+
+src_configure() {
+	local mycmakeargs=(
+		# Note [llvm install path]
+		# Unfortunately all binaries using clang driver
+		# have to reside at the same path depth as
+		# 'clang' binary itself. See bug #625972
+		# Thus as a hack we install it to the same directory
+		# as llvm/clang itself.
+		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix "${LLVM_MAX_SLOT}")"
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	"${EPYTHON}" run_iwyu_tests.py
+}
diff --git a/dev-util/jconfig/Manifest b/dev-util/jconfig/Manifest
deleted file mode 100644
index 7d9ee8c533a4..000000000000
--- a/dev-util/jconfig/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST jconfig-src-v2.9.tar.gz 1202738 BLAKE2B 09e5f869ee671028e5044988a9a27af4d6eddb919fa777cb2b08980e33670359b43a87669f28cf59f421af4381df468bb49f52b3829000d4dbddf60bbf6342d4 SHA512 fb3c171f8204bd41d7b0183707b6f524dbf27d8c82335cce5f9b4070b77ea1c86345692e533f1a6d64e0334e0bfc88f4cc47828aea6b4b56058197122c675b2c
-EBUILD jconfig-2.9.ebuild 830 BLAKE2B 42a4c4cda2bdf0cc3c4ad2b7a0998a596a97ede10eee54db87f4e9d16d4b2b2590d200e5f86eddc97b588ccbb47eec53519e85cd2fe5839fe61e00b6d22caf5f SHA512 8f5ceeac67c4b94994270cc1e59fe70f2e606d3daab5af98d8dff926dfe3727d6457ec926fa8025fc4704b16dc52353b7f5840fbea79e4d9ee9c85f56c029500
-MISC metadata.xml 313 BLAKE2B 35d3e65273f55e25c70550785fc394e3e5df5de19e450db23d40253c2384cf67e23ce9431b34d51d34c604b0d60c8926289ce409d80ed81352e6f10abe496e99 SHA512 a763cadd5e639466f136912e6a1abad023e53576ccbfc5b6b82b9ce5e7f7b173000d51d0991332dd52bff2fc0ee77963ce2e77b58c3f9ecf9701344ee4c5f2ae
diff --git a/dev-util/jconfig/jconfig-2.9.ebuild b/dev-util/jconfig/jconfig-2.9.ebuild
deleted file mode 100644
index c5be45f93782..000000000000
--- a/dev-util/jconfig/jconfig-2.9.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Utility that provides a simple API for the management of properties"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-src-v${PV}.tar.gz"
-HOMEPAGE="http://www.jconfig.org/"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-CDEPEND="java-virtuals/jmx"
-
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-
-DEPEND=">=virtual/jdk-1.6
-	${CDEPEND}"
-
-S="${WORKDIR}/${PN/c/C}"
-
-java_prepare() {
-	cd "${S}"
-
-	rm -v dist/*.jar || die
-	rm -v lib/*.jar || die
-
-	java-pkg_jar-from --into lib jmx
-}
-
-JAVA_ANT_ENCODING="ISO-8859-1"
-
-src_install() {
-	java-pkg_dojar dist/jconfig.jar
-
-	dodoc README
-
-	use doc && java-pkg_dojavadoc javadoc
-	use source && java-pkg_dosrc src/*
-
-}
diff --git a/dev-util/jconfig/metadata.xml b/dev-util/jconfig/metadata.xml
deleted file mode 100644
index 3e77b353bc2c..000000000000
--- a/dev-util/jconfig/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">jconfig</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/kernelshark/Manifest b/dev-util/kernelshark/Manifest
index 3a9c3adc2c27..251cb06592d2 100644
--- a/dev-util/kernelshark/Manifest
+++ b/dev-util/kernelshark/Manifest
@@ -1,8 +1,5 @@
-AUX kernelshark-1.0-build.patch 1288 BLAKE2B 4d79cb34c04186edf9a4787463eede7971177ccfa64988e931345ce66b86003482f1cdb6bb2609f3a7696a18f644204d61b85ad10988347c0db6ee23335ef873 SHA512 f257b73da9494297a44363a5126528dd03e018050464d12b414c4eb0a157da550318a430f40df17db0cf4e0b49feb904c071be42685c3cf64bf455ff9c2d0779
-AUX kernelshark-1.0-desktop-version.patch 313 BLAKE2B 64663bb60499910061328169e726f75e10f843c2dcf036f31954307ffeae863bedaca259ef8d6f1bb653f14c45ffd4a83d2687ed053263526001d8aa175ecaec SHA512 33f6c02a5c8328af71f12a452fa3e5efba1300977397a1382b1e4c04cc5e49fc6c50f95555a294b57ede4616e04bc10c7b8849010ca2a63cc8c1eb266fdb13af
 AUX kernelshark-1.2-build.patch 1619 BLAKE2B 14d7d2d949c4d738470c1f0102a72617400a3bd01718d3cd580cbac88588b268ce57b06cbe7052648e27241aa5904681a01817067785d9313eecfd4747af2027 SHA512 6f7ba465cf3c449c590b684c67302d35ef8332e4fcbe77763003c40502d26ca3078613e68232314f407f5e0185c42faad6f559efead0b337a6b065cc4503cd36
 AUX kernelshark-1.2-desktop-version.patch 196 BLAKE2B 6800b889e03902caf27a73c6358180499bf7a1051fe19af38c90aa5ea38e4230eb3a4670fcb2a8fc6b54afea371c3b3f689b06ee51f1596e14450615256c7708 SHA512 58331560d558b4fb4bbd50a24fb0cfce6b50b73cfe8481449e5d4a87836d3d2be8bd1a7f5453e8b28d87f1657b426d0453ebcefa78f97b8da44e1ed7ee8fd629
 DIST kernelshark-1.2.tar.gz 4298175 BLAKE2B 2ebe70c2b7c0691b65b0251027f1c558fc2fc5ef9bf61512d3ddd554fbb6ec349e36fca4dd0060c6b7db49eca0ec81a2f1296d635459b91883e54e77146ea3ae SHA512 059ac0ced71fa00de34c30ece433430f1e2fc36acb1b3a3f15cb84ce74d7a4f115e4ee8fbf9a256d5a731050aee02823a90a024dca4b4f6a17061652b871b935
 EBUILD kernelshark-1.2.ebuild 1256 BLAKE2B b7f5ce31272a8034fea5ecd17e259112d0b0b310e221c861529b5cef6e4a87532c6eb574938534e656171bc703eb546d1a4c60c40b0269f225acd9f7d5aa1b48 SHA512 4a85706ac373a672ed577ef0960583ba9010e2ebe801616a3829344322e1c4efd8882f15efab28aab138191196b4e0564a5d0c01dcec32232c73e04cc53e67e0
-EBUILD kernelshark-9999.ebuild 1316 BLAKE2B 1de0e7b262e6dbcfb4378be8ce0764f30d285f1e4bd7447c0e7d12627d150a19d303f0a3d3b01d1437b668a1fc4bb151fdd264ee0d70a10c7cc4c3f28035659a SHA512 2bc6432d5bbbf12928946600a192ff981cc085662c3291b61a4bdfe6f97c1e74819e3756ac1ddb486489203440b863a12774be328dcefb7bf18df5124a049bd4
 MISC metadata.xml 409 BLAKE2B a224422be52a292645aeafbd692638a1f07b1cce88debff7f3a25b9cccd02674ac1e448cb9ac329be6b8f3ff869c0aeb2d205d0930d9d5828eef88dbd295204e SHA512 2e9b3fb0033679637107c2c317fd98c0bd06ec7f8afc3fd2b7b3feef4a7188e818f3f82c6dfa704770b5c71b823e611b3d1445f22bb27ee42c2fd41c368f1708
diff --git a/dev-util/kernelshark/files/kernelshark-1.0-build.patch b/dev-util/kernelshark/files/kernelshark-1.0-build.patch
deleted file mode 100644
index 411d4235a215..000000000000
--- a/dev-util/kernelshark/files/kernelshark-1.0-build.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/CMakeLists.txt b/kernel-shark/CMakeLists.txt
-index 45c6f23..e2394d9 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -63,11 +63,11 @@ set(KS_LOGO_LABEL  KS_logo_horizontal.svg)
- 
- set(CMAKE_INSTALL_RPATH "${_INSTALL_PREFIX}/lib/${KS_APP_NAME}/")
- 
--if (CMAKE_BUILD_TYPE MATCHES Package)
-+if (NOT CMAKE_BUILD_TYPE MATCHES Package)
- 
-     set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
- 
--else (CMAKE_BUILD_TYPE MATCHES Package)
-+else (CMAKE_BUILD_TYPE MATCHES Gentoo)
- 
-     set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
- 
-diff --git a/build/FindTraceCmd.cmake b/kernel-shark/build/FindTraceCmd.cmake
-index 2da4eee..c454ce6 100644
---- a/build/FindTraceCmd.cmake
-+++ b/build/FindTraceCmd.cmake
-@@ -40,8 +40,8 @@ find_library(TRACEEVENT_LIBRARY NAMES  traceevent/libtraceevent.a
- # search was successful "find_path" will do nothing this time.
- find_program(TRACECMD_EXECUTABLE   NAMES  trace-cmd)
- find_path(TRACECMD_INCLUDE_DIR  NAMES  trace-cmd/trace-cmd.h)
--find_library(TRACECMD_LIBRARY   NAMES  trace-cmd/libtracecmd.so)
--find_library(TRACEEVENT_LIBRARY NAMES  traceevent/libtraceevent.so)
-+find_library(TRACECMD_LIBRARY   NAMES  libtracecmd.so)
-+find_library(TRACEEVENT_LIBRARY NAMES  libtraceevent.so)
- 
- IF (TRACECMD_INCLUDE_DIR AND TRACECMD_LIBRARY AND TRACECMD_EXECUTABLE)
- 
diff --git a/dev-util/kernelshark/files/kernelshark-1.0-desktop-version.patch b/dev-util/kernelshark/files/kernelshark-1.0-desktop-version.patch
deleted file mode 100644
index 2b9b444958dc..000000000000
--- a/dev-util/kernelshark/files/kernelshark-1.0-desktop-version.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/kernel-shark/build/ks.desktop.cmake b/kernel-shark/build/ks.desktop.cmake
-index 2b02c0d..34c02ea 100644
---- a/build/ks.desktop.cmake
-+++ b/build/ks.desktop.cmake
-@@ -1,5 +1,5 @@
- [Desktop Entry]
--Version=@KS_VERSION_STRING@
-+Version=1.1
- Type=Application
- Name=Kernel Shark
- GenericName=Kernel Shark
diff --git a/dev-util/kernelshark/kernelshark-9999.ebuild b/dev-util/kernelshark/kernelshark-9999.ebuild
deleted file mode 100644
index 969302e6c70a..000000000000
--- a/dev-util/kernelshark/kernelshark-9999.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic cmake-utils
-
-DESCRIPTION="Graphical reader for trace-cmd output"
-HOMEPAGE="https://kernelshark.org/"
-
-if [[ ${PV} =~ [9]{4,} ]]; then
-	EGIT_REPO_URI="https://github.com/rostedt/trace-cmd.git"
-	inherit git-r3
-	S="${WORKDIR}/${P}/kernel-shark"
-
-else
-	MY_P="${PN}-v${PV}"
-	SRC_URI="https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot/trace-cmd-${MY_P}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/trace-cmd-${MY_P}/kernel-shark"
-
-fi
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-IUSE="custom-optimization doc"
-
-DEPEND=">=dev-util/trace-cmd-2.8.3:=
-	dev-libs/json-c:=
-	>=media-libs/freeglut-3.0.0:=
-	x11-libs/libXmu:=
-	x11-libs/libXi:=
-	dev-qt/qtcore:5=
-	dev-qt/qtwidgets:5=
-	dev-qt/qtnetwork:5=
-"
-RDEPEND="${DEPEND}"
-BDEPEND=">=dev-util/cmake-2.8.11
-	doc? (
-		media-gfx/graphviz
-		app-doc/doxygen
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/kernelshark-1.0-build.patch"
-	"${FILESDIR}/kernelshark-1.0-desktop-version.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-D_INSTALL_PREFIX="${EPREFIX}/usr"
-		-DTRACECMD_INCLUDE_DIR="${EPREFIX}/usr/include/trace-cmd"
-		-D_DOXYGEN_DOC="$(usex doc)"
-	)
-	use custom-optimization || replace-flags -O? -O3
-	cmake-utils_src_configure
-}
diff --git a/dev-util/libabigail/Manifest b/dev-util/libabigail/Manifest
index b8cb5d431a58..8123ec59d1f5 100644
--- a/dev-util/libabigail/Manifest
+++ b/dev-util/libabigail/Manifest
@@ -1,5 +1,5 @@
 DIST libabigail-1.6.tar.gz 176133766 BLAKE2B 4a8fd6861f2213f45bbc5814a8a4e0941c236660ea6f84f09eedf6c08eff963c956f27967581501cd73b51057c3d36a74d53b6bf63d0be4d2c931d465d0564eb SHA512 2ba775bd836b53265dae60e66065fc2106e7f633e890cc70b6abacb8426e04ec0b7b38593c21336f5785cf5e4eb8d110fb15ce63124cddc59f660f31c7b25b3c
 DIST libabigail-1.8.2.tar.gz 258919334 BLAKE2B 6e06c888dcc3f5e0fc5d4046e69f14ba06b3a78206f89e32e4687b07aae1e1d798582285cff5ac9f43d6ba326fe11ec11552eefb5ed05813c25785e337092ba2 SHA512 fa8edaf39632e26430481f15e962a098459eac087074e85ca055293ba324ec5944c45880fcb36f1c54a64652605a439cbf9247dfea9bfd3ec502cc7292dd1c8d
 EBUILD libabigail-1.6.ebuild 1505 BLAKE2B eaf813c7f56b0d703e03ae350885ed6beb54fa7dd08bc62eb58c7b935d4d4a9857f7c8f0e130ee74334bb52c1f967e334d835922ea52569f435df5857276adbf SHA512 5b6db24c5a22f369675f0a1e308ad42b4e79940a8e632503c28f43c528051227a2cb808e050c2cc5918fc519002bedcabb3f8a745bc7c3a125596650a57b84d4
-EBUILD libabigail-1.8.2.ebuild 1505 BLAKE2B 01be3d9285ee4fc4d4c6b507f43db1c2fcd3bd1c8b57b41ef6027da7904c6cac3c8caccee93681675a6a17be521fe761a806c4ce91f2d0409051e10d4514f14e SHA512 dcf3d5792b3eda9aaa842737e8de88cb9be6cde9755c3edee35070e1176a11068c3a26461ac27e09bc13cfa6d8e633e0fc3643e6d27c3585f961799bf1ee517d
+EBUILD libabigail-1.8.2.ebuild 1507 BLAKE2B ce5cf5f1ab6829a4d7665f66bd38197ea942b1ecefeb94a71d824baa14a3e7ac7a14f39010ca6cf20f4a71cfcd7e66f88fe7a0add7c161f8ca50e3992766c014 SHA512 7eee82bb72ba18edc2852db198c7d6b95e84e998245bb98852c4b64142a31afe689c0ae43c181c63f40478edb5b46ff7d74b177d28f9237c07c83131c9c9974b
 MISC metadata.xml 244 BLAKE2B bd2c6209566a4936a38d9109a9a533aa1669dd50701ff8a96d2a65411aa692517ab70cafd98afcad7058979d62f1a7ac796c5b99a520c0f6ca1ed92cf9e0e207 SHA512 57959095dc10704e073e5517ac49ceee80e42fb1cc3f26b1b7308f872ffda810ce42e0b80ea6da57faa7a759878a9b8d2476fe351fecac1450f9c83751802787
diff --git a/dev-util/libabigail/libabigail-1.8.2.ebuild b/dev-util/libabigail/libabigail-1.8.2.ebuild
index 65225b855535..33dbef7e4574 100644
--- a/dev-util/libabigail/libabigail-1.8.2.ebuild
+++ b/dev-util/libabigail/libabigail-1.8.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit autotools python-any-r1 out-of-source
 
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index e3112f046a19..fc4a131f53e9 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -1,9 +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.0.tar.gz 134226215 BLAKE2B f9c3ba8c58571855caa4f206fd285c9b5be66672fb0814cb8bc0964a051f57f5d35013aa1e27cbda502652b37df1ec23474129109e76a42066847860db441dbe SHA512 0cff02155c5ac0d6db2b72d60d9819d5b5dd859663b45f721b1c7540239c2fceb1f57d9173f6870c49de851c242ed8e85c5c6d6577a1f8092a7c5dcd12513b26
+DIST llvmorg-12.0.1-rc1.tar.gz 134261735 BLAKE2B d29510495641c06e6d7a5ac165e6d34e0ba15d1a5b786534e186e341e3a0550cdd3d8a2b61deb3e2bf44c0b0ff8561224bf7f8cebc2ce9415639cb67ceae289e SHA512 4595a26df56eed7d5941240fe92116ad2f1c61639f0f464697c2c530a601347032fbad6802d1fa915ced8574c7b30ef05bc8c0be737784c844d3860892817e6e
 EBUILD lldb-10.0.1.ebuild 2336 BLAKE2B a9ddc5d6965882c37d0cf11e6331e77130c16ea9d60a90c8733c67b8bef0e947656a0c9e1888d483d4b497453475490b9d8bdd85f1396a8be605efec076d5db8 SHA512 7b352de97e3c2cfbf75e724f2e8a6b393bfc5d6240c4067f4f7bf3d04c52e769de6cf85743635410ea4938e587acc4fc925eb501e51733c6a80d442e0df098a0
 EBUILD lldb-11.1.0.ebuild 2343 BLAKE2B ad45919d6e378904f946147277776a8f8dab3b16c64a0ee7f92e5d11d5efc67896151c1f90cf7fd08109b2343816222b1dee706bfa3c14de3ccd1c160091b4bb SHA512 461a00a379331e6e47115c412878d8bac8c8f04f233d7245548769527809a02672e3cefbcbfa3c39e2d71db1b144693fa57ce5f3328d57cd078f49683654d488
-EBUILD lldb-12.0.0.9999.ebuild 2396 BLAKE2B 113bec8d6f4cce99e0156c39fc23deb6fc90a220aaedbfec32769174a33bb40856e5afee02dad197b40e445df71cd2829a1198a7821ef661f28ce42e28b3f5e3 SHA512 7947f7f49e61d05c1dc8b21171d1b462ff2058f2bdaa080ffd3ff65b4cf7cc74084008e8aa9235627de6d4ef156121ebb6c20c353663d379f2d9aae1661179b6
 EBUILD lldb-12.0.0.ebuild 2419 BLAKE2B 65cb87139ceb6f4d2877a8ae0759ec1ad4f09184160763107a385bfc8ae37faf545985120d96cd09818d504120bea5da3844606c518f491ec9b63bee2a0b8f90 SHA512 73fab1d4709532eab7c69759b5a486240b4c4cf5de1c9b4440b11d2bf0e308d64a7b5d6cb533f7b4de8f39414fd2f6b6fe0c88275dbab7cdd77e9ed348b367fe
+EBUILD lldb-12.0.1.9999.ebuild 2396 BLAKE2B 113bec8d6f4cce99e0156c39fc23deb6fc90a220aaedbfec32769174a33bb40856e5afee02dad197b40e445df71cd2829a1198a7821ef661f28ce42e28b3f5e3 SHA512 7947f7f49e61d05c1dc8b21171d1b462ff2058f2bdaa080ffd3ff65b4cf7cc74084008e8aa9235627de6d4ef156121ebb6c20c353663d379f2d9aae1661179b6
+EBUILD lldb-12.0.1_rc1.ebuild 2396 BLAKE2B 113bec8d6f4cce99e0156c39fc23deb6fc90a220aaedbfec32769174a33bb40856e5afee02dad197b40e445df71cd2829a1198a7821ef661f28ce42e28b3f5e3 SHA512 7947f7f49e61d05c1dc8b21171d1b462ff2058f2bdaa080ffd3ff65b4cf7cc74084008e8aa9235627de6d4ef156121ebb6c20c353663d379f2d9aae1661179b6
 EBUILD lldb-13.0.0.9999.ebuild 2396 BLAKE2B 113bec8d6f4cce99e0156c39fc23deb6fc90a220aaedbfec32769174a33bb40856e5afee02dad197b40e445df71cd2829a1198a7821ef661f28ce42e28b3f5e3 SHA512 7947f7f49e61d05c1dc8b21171d1b462ff2058f2bdaa080ffd3ff65b4cf7cc74084008e8aa9235627de6d4ef156121ebb6c20c353663d379f2d9aae1661179b6
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-util/lldb/lldb-12.0.0.9999.ebuild b/dev-util/lldb/lldb-12.0.1.9999.ebuild
index 283e64ba210c..283e64ba210c 100644
--- a/dev-util/lldb/lldb-12.0.0.9999.ebuild
+++ b/dev-util/lldb/lldb-12.0.1.9999.ebuild
diff --git a/dev-util/lldb/lldb-12.0.1_rc1.ebuild b/dev-util/lldb/lldb-12.0.1_rc1.ebuild
new file mode 100644
index 000000000000..283e64ba210c
--- /dev/null
+++ b/dev-util/lldb/lldb-12.0.1_rc1.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+inherit cmake llvm llvm.org python-single-r1 toolchain-funcs
+
+DESCRIPTION="The LLVM debugger"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE="+libedit lzma ncurses +python test"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+RESTRICT="test"
+
+RDEPEND="
+	libedit? ( dev-libs/libedit:0= )
+	lzma? ( app-arch/xz-utils:= )
+	ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
+	python? (
+		$(python_gen_cond_dep '
+			dev-python/six[${PYTHON_USEDEP}]
+		')
+		${PYTHON_DEPS}
+	)
+	~sys-devel/clang-${PV}[xml]
+	~sys-devel/llvm-${PV}
+	!<sys-devel/llvm-4.0"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-util/cmake-3.16
+	python? ( >=dev-lang/swig-3.0.11 )
+	test? (
+		$(python_gen_cond_dep "
+			~dev-python/lit-${PV}[\${PYTHON_USEDEP}]
+			dev-python/psutil[\${PYTHON_USEDEP}]
+		")
+		sys-devel/lld
+	)
+	${PYTHON_DEPS}"
+
+LLVM_COMPONENTS=( lldb )
+LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest )
+llvm.org_set_globals
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLLDB_ENABLE_CURSES=$(usex ncurses)
+		-DLLDB_ENABLE_LIBEDIT=$(usex libedit)
+		-DLLDB_ENABLE_PYTHON=$(usex python)
+		-DLLDB_ENABLE_LZMA=$(usex lzma)
+		-DLLDB_USE_SYSTEM_SIX=1
+		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
+
+		-DLLDB_INCLUDE_TESTS=$(usex test)
+
+		-DCLANG_LINK_CLANG_DYLIB=ON
+		# TODO: fix upstream to detect this properly
+		-DHAVE_LIBDL=ON
+		-DHAVE_LIBPTHREAD=ON
+
+		# normally we'd have to set LLVM_ENABLE_TERMINFO, HAVE_TERMINFO
+		# and TERMINFO_LIBS... so just force FindCurses.cmake to use
+		# ncurses with complete library set (including autodetection
+		# of -ltinfo)
+		-DCURSES_NEED_NCURSES=ON
+
+		-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-lit
+	# failures + hangs
+	#use python && cmake_build check-lldb
+}
+
+src_install() {
+	cmake_src_install
+	find "${D}" -name '*.a' -delete || die
+
+	use python && python_optimize
+}
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index 849ef846c338..ef2d7bfeaed4 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -1,6 +1,6 @@
 DIST meson-0.56.2.tar.gz 1794847 BLAKE2B 350427e2ff4b4fe688220ca6279ff3361e1b2c7c573e1e0185ea9014fda73bc68929256073fe05855e3403638257e26477868d0a5683a5b91f6a74ee55a01f0e SHA512 3b6cc5cae31d756b251ecde3483d3710bceff50cfd03ef6cf6f939d9e599998e61fcb03a2ee09d6a6f9bfa2198f43e7f20447359de3bff1055febcf03e82e514
 DIST meson-0.57.2.tar.gz 1853721 BLAKE2B 9c167a21745719589a165e7ffc31007bd6307b347027f390fd660b2f44b5a2e6d8f36e999e15fa4b28ae269ddb0bb3897e0297288c59b62cc493aad058126293 SHA512 a3b0bf3d5e1d1b7ac7c97313f43046c94aa2a6b21964958569c89764dfda08db166adb89d48cbfad735bd472114587a71089d5e8b4f0fce04c3289da21b3f40e
 EBUILD meson-0.56.2.ebuild 2338 BLAKE2B b50d254d2b52de7478c1480bfca34e9eed952e02df08e57964035a035e33c6dda033d8b50bad9301e79e537ef6a3f1ad7f666083c7e46b8584b7711227938c6d SHA512 d5abc3288b6d4261d3dffa318448d7e61e35781124ddff30527781863cd0b84f5944bf13fb0361af6c690ad627cdc5ec55f35ab50ba58c1699ac4e67add71f5c
-EBUILD meson-0.57.2.ebuild 2346 BLAKE2B 759d97034364081f55be457b9e8a31a51e30a87de26f9e7bd86dd3bc8ec8b0e99a0c6bd7f306c404b716e8b968debaf8a79c83c511832c06001e4f8a5ee0fd26 SHA512 b27c8176ddac2ab83b684190cef83d28cdd32ea7bf3fe4591a42d568766b1badc4cd7e046e8e80283d47f98f46216c53e5914dedad6e343a4f414fcbbd4a8dee
+EBUILD meson-0.57.2.ebuild 2338 BLAKE2B b50d254d2b52de7478c1480bfca34e9eed952e02df08e57964035a035e33c6dda033d8b50bad9301e79e537ef6a3f1ad7f666083c7e46b8584b7711227938c6d SHA512 d5abc3288b6d4261d3dffa318448d7e61e35781124ddff30527781863cd0b84f5944bf13fb0361af6c690ad627cdc5ec55f35ab50ba58c1699ac4e67add71f5c
 EBUILD meson-9999.ebuild 2346 BLAKE2B 759d97034364081f55be457b9e8a31a51e30a87de26f9e7bd86dd3bc8ec8b0e99a0c6bd7f306c404b716e8b968debaf8a79c83c511832c06001e4f8a5ee0fd26 SHA512 b27c8176ddac2ab83b684190cef83d28cdd32ea7bf3fe4591a42d568766b1badc4cd7e046e8e80283d47f98f46216c53e5914dedad6e343a4f414fcbbd4a8dee
 MISC metadata.xml 423 BLAKE2B d5ccfb020cc6bd4c163a6807d27528e6035ef59d0e0a7122c0a194da25126408ed5d5a1d97effb6e7e4721eaa20d15efb2bccb48db4215c3c5609cdcb58938ef SHA512 88f01def35adfd916e55aea1abf8234108338f1b692c1702e64b1fdeb6354f50965651e741b347cf792cd9ae90897ee4451060115d757af6b6235469f8d9aef0
diff --git a/dev-util/meson/meson-0.57.2.ebuild b/dev-util/meson/meson-0.57.2.ebuild
index cb12aed28c93..20afc602e2bf 100644
--- a/dev-util/meson/meson-0.57.2.ebuild
+++ b/dev-util/meson/meson-0.57.2.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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/patchutils/Manifest b/dev-util/patchutils/Manifest
index 8cca40ba811d..dd6a740c056d 100644
--- a/dev-util/patchutils/Manifest
+++ b/dev-util/patchutils/Manifest
@@ -1,3 +1,3 @@
 DIST patchutils-0.4.2.tar.xz 159504 BLAKE2B 3ffcda8497b010a88e8601005871fb691ea8cac6158276862ba8e4192c333a335965288f9b5451c2fbc0a873ef95eb4a485d265387b43b0cec31b6c18d38f88e SHA512 20970d52fd43c09dc7799297b9a9eb6f60ba29ecc750d49381a2dc52273dfe484a47696cddd541f623394fa3486734cf337297cbeab6b1b244511c7740f46897
-EBUILD patchutils-0.4.2.ebuild 483 BLAKE2B eafa077777b2ac0142e4009692ab9ea32684c1d5edd259c6e637eb5965a6257c50e80f2e11b452f66bf0bb7b9c967cc481e4f3c9612aea7b1ae12c2725d2f9f4 SHA512 0b85b46f0e79ca927fe0889c46a5a98016bded15941d5ff6e29c5dbf7605be19626b4c70774d4681b23b09be11c311d7166e7748026b2e961351e995ff287738
+EBUILD patchutils-0.4.2.ebuild 599 BLAKE2B a4ff6be6e75406430132679ebbb0f95e97d96f67948a27b62efa93c24b9e4806f818c414d60821e0fcd31da63dd6c2a9ad8da3cfe9c4f45d8dca75969ab94522 SHA512 9c141b27a7ca4274ed96395893e8e41eb6b1a96f166e36282380bfb0faa8b04cec5f5b6b00c63aafc3cd4bf79ca4b3254f5d3ea1e509623b8ce6ddae7a154160
 MISC metadata.xml 347 BLAKE2B 1bb5edebc3256dc7f672ac577cd618ca1ba6f50532326df86519e0949a693b24e0c8980e36dd2022662ad19b7bc9a2d9e9493ca63ee428c7dd310c225ad73a50 SHA512 a705f56fe025d34489a293963cdf279fbb310775b82134dcb53586ed22e31991b666f26738e14e2f387dc7f23eea2c0ba10d25a8b52140f67e1ceec27295f5e4
diff --git a/dev-util/patchutils/patchutils-0.4.2.ebuild b/dev-util/patchutils/patchutils-0.4.2.ebuild
index c1491c87fe5c..95086f63a11a 100644
--- a/dev-util/patchutils/patchutils-0.4.2.ebuild
+++ b/dev-util/patchutils/patchutils-0.4.2.ebuild
@@ -10,4 +10,11 @@ SRC_URI="http://cyberelk.net/tim/data/patchutils/stable/${P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
+IUSE="pcre"
+
+RDEPEND="pcre? ( dev-libs/libpcre2:= )"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	econf $(use_with pcre pcre2)
+}
diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest
index f90bf58ce7c1..a67aa4616fdd 100644
--- a/dev-util/perf/Manifest
+++ b/dev-util/perf/Manifest
@@ -1,7 +1,10 @@
+DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
 DIST linux-5.11.tar.xz 117619104 BLAKE2B 81300c27bd5476387a83123aaeb4163c73eb61e9245806c23660cb5e6a4fa88ffc9def027031335fa0270fc4080506cd415990014364e3a98b9d2e8c58a29524 SHA512 a567ec133018bb5ec00c60281479b466c26e02137a93a9c690e83997947df02b6fd94e76e8df748f6d70ceb58a19bacc3b1467de10b7a1fad2763db32b3f1330
 DIST linux-5.12.tar.xz 118112412 BLAKE2B 842d921b9a73d2aaade763dbd2ec67bdfe0275baa6d628b775f5c87574ad7dc86f0419afcd48c10c1235f4bffa16084243f2cf4556e6afcd391e975fe8ba530b SHA512 be03b6fee1d1ea8087b09874d27c0a602c0b04fd90ad38b975bd2c8455a07e83c29b56814aaf1389e82305fae0e4c2d1701075a7f0a7295dd28149f967ec5b3d
 DIST linux-5.8.tar.xz 114459324 BLAKE2B 7bd97f8fa4527840754434414c07283e89731dc8ebb1e95fa5bc1469a60af1122582c0d3b6e262e77882f023190068df3537bd8b65964b3caa820bb2c8e579c7 SHA512 45a53ecf351096ef6e98242cca4228b8da9b9139ecc6963695791ea6fb7a9484a4e1c19dcca7ce7cbfdfa49de0451b70973bb078f12bdae9cbaddbc3f8092556
+DIST patch-5.10.16.xz 498880 BLAKE2B 14061b505285f24938fb955ccc7f9fbd78ccc0b1026bffb17a89fdad08ea54bfee7bbb841123d9af4d0720a960a27c649c39852af7e2be8a286af926c7bce9c0 SHA512 be9cfe1ae6697956ca7476cedc212a8cbd9da2c3c72096a89afaaf73c5b6655fd04d458f96c472f680c5513c0ea3e4449c4092a958425b6040f0c7774453cd2f
+EBUILD perf-5.10.16.ebuild 6860 BLAKE2B 7535ca0e30e06f5dd246fd2b66730830f4ef29f71b09e7604ade827c4d73e652cb90adb4793c0e52d2dcd765a2e843f55905f7318ca44c2f810b5069f7c2665d SHA512 235d5ba2f366d90ff98bb9810c9eb3ddd01de4bef9fdd6405c8015f918d58826b912aa76b877cad1bd143926a27b1ce53541a231efc9b7a58e0f43ff3e1f4e19
 EBUILD perf-5.11.ebuild 7094 BLAKE2B f823eeb8a1c8eda5b8670da5f0105e1f77a01ed8430049a54d312770727039bd135f9a1dd75d2e86c02f3682f78dff9d74ecbec5e669bad06b979075e51fa41f SHA512 ede87c249fb0fcbe81d2c1abda30bb4fb4d367037d03fdb672f6bef120956e4ec2f2b14e203c3aff4c83ad9e5eec3902b9e655c63ee1f2f46f0bab2dcf97fbdc
 EBUILD perf-5.12.ebuild 7134 BLAKE2B 9d12c35d68165620057b32960a742eac23f75d8ec69cd2b9ff1565c64d8a3e2199e95a317d1de6873420183f79c43b6d56720a5de37fd2d48db23cabd3c39f00 SHA512 843cc0e335c673b59f13de50445535d1d4401c2d9c3b228c041bb59719c0eaa776c20689ea9e200093db8b162ad24c7d117374a7295f9cf7a89c3b6a96ae8b8f
 EBUILD perf-5.8.ebuild 6757 BLAKE2B 490ff9045ea6dae5b14aca9e91d322d0e6d7879f2efd4bf9a4f2e919569b752e9933ba8be586f7615e81a04be28ffb5a5ca832a7491df13cfa6e67ddaf8ad86a SHA512 da92c2600d4033fedefad6e1f73a56261f2bb3b38b3a0c0fb195347d20509b8f3797386a75f52faab5981622e85db9e38cae805fcb8a86a1d2ce6916e95f5b76
-MISC metadata.xml 1587 BLAKE2B b30c91ef8d7b3c5b660b7fa29b73aebb64ecbdfbba25dd304b1b584e512adc64102d72d3836ac417dbf53e912b7578cc31a66877a3f11288576095b5ddcb39e4 SHA512 b8298ac2976a377c40d27c4d5b48c1af439d0768ecf682a9cbcd0ffb1803d91f8a231f897a346c24da709d4fd477c8b2308919d4ab893011451df83281301750
+MISC metadata.xml 1701 BLAKE2B 6171bbe52b79f1892209789442e0adadbb657e7895630c112c1540046b1e4fa1de511bac15e4ce921214b34f14d0cb296e396e5857228666c7af8a3155ef5391 SHA512 1d51993edb452fee8430a1937f2e6581fafe19a20867dc71fbe6a7d84a35a15781fd9cf895ba708f907dbb11c98689c4a2d56f65087f7198939cda9df568c418
diff --git a/dev-util/perf/metadata.xml b/dev-util/perf/metadata.xml
index 18c5fbdc755f..f9311842cd8e 100644
--- a/dev-util/perf/metadata.xml
+++ b/dev-util/perf/metadata.xml
@@ -12,6 +12,10 @@
     <email>amadio@gentoo.org</email>
     <name>Guilherme Amadio</name>
   </maintainer>
+  <maintainer type="person">
+    <email>zlogene@gentoo.org</email>
+    <name>Mikle Kolyada</name>
+  </maintainer>
   <use>
     <flag name="babeltrace">Enable <pkg>dev-util/babeltrace</pkg> support</flag>
     <flag name="clang">Enable builtin clang and LLVM support</flag>
diff --git a/dev-util/perf/perf-5.10.16.ebuild b/dev-util/perf/perf-5.10.16.ebuild
new file mode 100644
index 000000000000..4aee115ceb6d
--- /dev/null
+++ b/dev-util/perf/perf-5.10.16.ebuild
@@ -0,0 +1,250 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+inherit bash-completion-r1 estack llvm toolchain-funcs prefix python-r1 linux-info
+
+DESCRIPTION="Userland tools for Linux Performance Counters"
+HOMEPAGE="https://perf.wiki.kernel.org/"
+
+LINUX_V="${PV:0:1}.x"
+if [[ ${PV} == *_rc* ]] ; then
+	LINUX_VER=$(ver_cut 1-2).$(($(ver_cut 3)-1))
+	PATCH_VERSION=$(ver_cut 1-3)
+	LINUX_PATCH=patch-${PV//_/-}.xz
+	SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH}
+		https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
+elif [[ ${PV} == *.*.* ]] ; then
+	# stable-release series
+	LINUX_VER=$(ver_cut 1-2)
+	LINUX_PATCH=patch-${PV}.xz
+	SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
+else
+	LINUX_VER=${PV}
+	SRC_URI=""
+fi
+
+LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
+SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="audit clang crypt debug +demangle +doc gtk java libpfm lzma numa perl python slang systemtap unwind zlib"
+# TODO babeltrace
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+BDEPEND="
+	${LINUX_PATCH+dev-util/patchutils}
+	sys-devel/bison
+	sys-devel/flex
+	doc? (
+		app-text/asciidoc
+		app-text/sgml-common
+		app-text/xmlto
+		sys-process/time
+	)"
+
+RDEPEND="audit? ( sys-process/audit )
+	crypt? ( dev-libs/openssl:0= )
+	clang? (
+		<sys-devel/clang-10:*
+		<sys-devel/llvm-10:*
+	)
+	demangle? ( sys-libs/binutils-libs:= )
+	gtk? ( x11-libs/gtk+:2 )
+	java? ( virtual/jre:* )
+	libpfm? ( dev-libs/libpfm )
+	lzma? ( app-arch/xz-utils )
+	numa? ( sys-process/numactl )
+	perl? ( dev-lang/perl:= )
+	python? ( ${PYTHON_DEPS} )
+	slang? ( sys-libs/slang )
+	systemtap? ( dev-util/systemtap )
+	unwind? ( sys-libs/libunwind )
+	zlib? ( sys-libs/zlib )
+	dev-libs/elfutils"
+
+DEPEND="${RDEPEND}
+	>=sys-kernel/linux-headers-4.19
+	java? ( virtual/jdk )
+"
+
+S_K="${WORKDIR}/linux-${LINUX_VER}"
+S="${S_K}/tools/perf"
+
+CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS"
+
+pkg_pretend() {
+	if ! use doc ; then
+		ewarn "Without the doc USE flag you won't get any documentation nor man pages."
+		ewarn "And without man pages, you won't get any --help output for perf and its"
+		ewarn "sub-tools."
+	fi
+}
+
+pkg_setup() {
+	use clang && LLVM_MAX_SLOT=9 llvm_pkg_setup
+}
+
+src_unpack() {
+	local paths=(
+		tools/arch tools/build tools/include tools/lib tools/perf tools/scripts
+		scripts include lib "arch/*/lib"
+	)
+
+	# We expect the tar implementation to support the -j option (both
+	# GNU tar and libarchive's tar support that).
+	echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
+	tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
+		"${paths[@]/#/linux-${LINUX_VER}/}" || die
+
+	if [[ -n ${LINUX_PATCH} ]] ; then
+		eshopts_push -o noglob
+		ebegin "Filtering partial source patch"
+		filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} \
+			> ${P}.patch
+		eend $? || die "filterdiff failed"
+		eshopts_pop
+	fi
+
+	local a
+	for a in ${A}; do
+		[[ ${a} == ${LINUX_SOURCES} ]] && continue
+		[[ ${a} == ${LINUX_PATCH} ]] && continue
+		unpack ${a}
+	done
+}
+
+src_prepare() {
+	default
+	if [[ -n ${LINUX_PATCH} ]] ; then
+		pushd "${S_K}" >/dev/null || die
+		eapply "${WORKDIR}"/${P}.patch
+		popd || die
+	fi
+
+	# Drop some upstream too-developer-oriented flags and fix the
+	# Makefile in general
+	sed -i \
+		-e "s:\$(sysconfdir_SQ)/bash_completion.d:$(get_bashcompdir):" \
+		"${S}"/Makefile.perf || die
+	# A few places still use -Werror w/out $(WERROR) protection.
+	sed -i -e 's:-Werror::' \
+		"${S}"/Makefile.perf "${S_K}"/tools/lib/bpf/Makefile || die
+
+	# Avoid the call to make kernelversion
+	sed -i -e '/PERF-VERSION-GEN/d' Makefile.perf || die
+	echo "#define PERF_VERSION \"${PV}\"" > PERF-VERSION-FILE
+
+	# The code likes to compile local assembly files which lack ELF markings.
+	find -name '*.S' -exec sed -i '$a.section .note.GNU-stack,"",%progbits' {} +
+
+	# Fix shebang to use python from prefix
+	if [[ -n "${EPREFIX}" ]]; then
+		hprefixify ${S_K}/scripts/bpf_helpers_doc.py
+	fi
+}
+
+puse() { usex $1 "" no; }
+perf_make() {
+	# The arch parsing is a bit funky.  The perf tools package is integrated
+	# into the kernel, so it wants an ARCH that looks like the kernel arch,
+	# but it also wants to know about the split value -- i386/x86_64 vs just
+	# x86.  We can get that by telling the func to use an older linux version.
+	# It's kind of a hack, but not that bad ...
+
+	# LIBDIR sets a search path of perf-gtk.so. Bug 515954
+
+	local arch=$(tc-arch-kernel)
+	local java_dir
+	use java && java_dir="${EPREFIX}/etc/java-config-2/current-system-vm"
+	# FIXME: NO_CORESIGHT
+	# FIXME: NO_LIBBABELTRACE
+	emake V=1 VF=1 \
+		HOSTCC="$(tc-getBUILD_CC)" HOSTLD="$(tc-getBUILD_LD)" \
+		CC="$(tc-getCC)" CXX="$(tc-getCXX)" AR="$(tc-getAR)" LD="$(tc-getLD)" NM="$(tc-getNM)" \
+		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
+		prefix="${EPREFIX}/usr" bindir_relative="bin" \
+		tipdir="share/doc/${PF}" \
+		EXTRA_CFLAGS="${CFLAGS}" \
+		ARCH="${arch}" \
+		JDIR="${java_dir}" \
+		LIBCLANGLLVM=$(usex clang 1 "") \
+		LIBPFM4=$(usex libpfm 1 "") \
+		NO_AUXTRACE="" \
+		NO_BACKTRACE="" \
+		NO_CORESIGHT=1 \
+		NO_DEMANGLE=$(puse demangle) \
+		GTK2=$(usex gtk 1 "") \
+		feature-gtk2-infobar=$(usex gtk 1 "") \
+		NO_JVMTI=$(puse java) \
+		NO_LIBAUDIT=$(puse audit) \
+		NO_LIBBABELTRACE=1 \
+		NO_LIBBIONIC=1 \
+		NO_LIBBPF= \
+		NO_LIBCRYPTO=$(puse crypt) \
+		NO_LIBDW_DWARF_UNWIND= \
+		NO_LIBELF= \
+		NO_LIBNUMA=$(puse numa) \
+		NO_LIBPERL=$(puse perl) \
+		NO_LIBPYTHON=$(puse python) \
+		NO_LIBUNWIND=$(puse unwind) \
+		NO_SDT=$(puse systemtap) \
+		NO_SLANG=$(puse slang) \
+		NO_LZMA=$(puse lzma) \
+		NO_ZLIB= \
+		WERROR=0 \
+		LIBDIR="/usr/libexec/perf-core" \
+		"$@"
+}
+
+src_compile() {
+	# test-clang.bin not build with g++
+	if use clang; then
+		pushd "${S_K}/tools/build/feature/" || die
+		make V=1 CXX=${CHOST}-clang++ test-clang.bin || die
+		popd
+	fi
+	perf_make -f Makefile.perf
+	use doc && perf_make -C Documentation
+}
+
+src_test() {
+	:
+}
+
+src_install() {
+	_install_python_ext() {
+		perf_make -f Makefile.perf install-python_ext DESTDIR="${D}"
+	}
+
+	perf_make -f Makefile.perf install DESTDIR="${D}"
+
+	if use python; then
+		python_foreach_impl _install_python_ext
+	fi
+
+	if use gtk; then
+		local libdir
+		libdir="$(get_libdir)"
+		# on some arches it ends up in lib even on 64bit, ppc64 for instance.
+		[[ -f "${ED}"/usr/lib/libperf-gtk.so ]] && libdir="lib"
+		mv "${ED}"/usr/${libdir}/libperf-gtk.so \
+			"${ED}"/usr/libexec/perf-core || die
+	fi
+
+	dodoc CREDITS
+
+	dodoc *txt Documentation/*.txt
+
+	# perf needs this decompressed to print out tips for users
+	docompress -x /usr/share/doc/${PF}/tips.txt
+
+	if use doc ; then
+		HTML_DOCS="Documentation/*.html" einstalldocs
+		doman Documentation/*.1
+	fi
+}
diff --git a/dev-util/pkgcheck/Manifest b/dev-util/pkgcheck/Manifest
index 184f0116abf8..73c8dbd3ea48 100644
--- a/dev-util/pkgcheck/Manifest
+++ b/dev-util/pkgcheck/Manifest
@@ -1,12 +1,10 @@
 AUX pkgcheck-0.9.7-py310-update.patch 7845 BLAKE2B c530448d0019af7ba7d2f3866ed4a8d12fc84a4dfd7fdf7260fe8d84fe4f9539e116c60190bff80b518abcc6c8dfeeda2a7c46c74b1d4b999a4b4fb81efdf6e7 SHA512 e976a8cab6196b738073491b407a431611fda0bfe0c6202a3b799c8608a6404b9d607c1d4b472e051ebee23f7fc1b97caad31ef7f80144bd1280ebf2562e173b
-DIST pkgcheck-0.8.2.tar.gz 455039 BLAKE2B 282c75578cd4aa7aca3f54e9625360cde4d7146cc08a6b2bcf2f594b21b6224a18e0623055e8aa866e89583b9fd6ec12749aa4bba791f06a851b1b43fe60d440 SHA512 3377060dae6e2c49d5ae6f2dbb883da4ddeab35ecd04133635f3a91f5bfb63177497b8843445914132539efc461ce0ea89bd5d07d3cba49e0854b91d7e2f74ce
-DIST pkgcheck-0.9.3.tar.gz 460029 BLAKE2B 3ef3aa6c338c5b379e4845302aaaacc5c71679309f45985e1dfa71fb1e62760c4f94ca43d34ca4ad75ecd1f738d9bcb0140568b4e4826ee6a14586c21d0c1a03 SHA512 5613f65437e6cc1c55330eef8bc354ad2f6e325a03c8353186d17a8e9dd21333a3900f91a36c1af0767ccda56f30d425ddb848e4eccf9d20ccba3f5de5098fb3
-DIST pkgcheck-0.9.5.tar.gz 459226 BLAKE2B 23f42ffb49bb89b33d01749fede01a8399c99a8e400bd451d1577c4240b929913b13738ba5bc55f3251058e26bebb619bedfb2ec1a50733a1bd8a7c62c7602df SHA512 2a404657e9b6d48d7f99d743aaee6bd4d5aee9cb48c28f89fea46cc7c680e6d3c0351660632abcf879c5ca3569b47cb22c7d6a53ba17d60fe6b545b3c96b90e7
+DIST pkgcheck-0.10.0.tar.gz 453555 BLAKE2B aeb211619f400b729a9f5e7e1ffa787c33c1c8cf592d9d25aaf3a82e5ca44711b9da6a012f0aa000e7269a40be387efb271f981b038fc29c497f2f660dead74e SHA512 2b702d269e899a4643f40397414a32f78af611cccc0d4a3d816b978bc63dc09d5e0086aebf11711c8d80703fa7e78d36eb884de6908ee548791a0d934569ded9
+DIST pkgcheck-0.10.1.tar.gz 454051 BLAKE2B ba0e91fee539d0a41c27da08c91e1c65078eaebea33b8254cbad38d49feb91a4aa490992a5d88bd96ce0570d89f9f8343d0ff0a2d7368f09d55637b2597aad6b SHA512 044067928bc1c1280a95e785def80e6ebb289e0882f9a61b18d1d75ddc22c4f7eea1da4a4621fd5a598c3e7ee75ece2adedb936086f3c3cbc92c23ab93419215
 DIST pkgcheck-0.9.7.tar.gz 453478 BLAKE2B 486bae68af1757fbdb4b109b34cea836cb6dee258d4e53b4c3818c1aa6194da86e7ee339335ac6f2a1c2fb89a547f46658fadd88706fa807a9fdce2bb82a5c65 SHA512 e8fc02997d558af1e8e89a13130076b4db59e9c2a8ea383d0dca9a57375dae1fb315619593178d67c89d30e7b16810905694c838ea4ec608eaee195fa4797569
-EBUILD pkgcheck-0.8.2-r2.ebuild 1417 BLAKE2B 0b635b4a66c79928fd2ae21de749e456686dcd77d66e7fb413c39c0b645c3252c4eab7d77f1725b038fdcdd84d25998dcb79b9ee1a0c80b6063510d49d9f15a5 SHA512 3ef8917647484400d8a46e2942e598769e01918f381117877815535ed0dc6e683640ef49dc4cec2f5182d80c2ef06184ce823f9beb6ecc9203490a907db813e1
-EBUILD pkgcheck-0.9.3-r1.ebuild 1544 BLAKE2B f8d9c073beafcbedea2058b26420130fe065a25d57524de80caa310b03570a3ad52e6109666a4e008fc87868a708c9510164304880f5e086d14a8b6a9e06ebcf SHA512 a49b1d8d5eabd1139ef081bf374fb36fb0b6e724eac57644cf72c976271878941340774d7e8aea77ece8d185315d38f8cbe359fbc4187be67296ee09b9ab4ee4
-EBUILD pkgcheck-0.9.5.ebuild 1507 BLAKE2B ed58c351d977d491d464d896a8519d88ed1799d7bfada82c2588249ff4245b5efcb65a2df38fb3a620f5573d0fc542ee7347338c8bd58fcba22118e1f0106f0b SHA512 dff66a95a5c5ec85d886f58674b6b9bc945f2664c666105b2e8e4989a2cddcd324578ca1abcbfbd56bfd98eabc99abd222662882163a5b51d3813e8b899f1279
-EBUILD pkgcheck-0.9.7-r1.ebuild 1559 BLAKE2B 3a027528217f62b4f793f616c2d1f562ffc0a991fad0640ab136245ba86e65a000fea4e0d5c6197b3dce4b2b17063d04fa7e0ebed850cefcd99f049a806d99da SHA512 a10e103e418e85453ba40e90203e8aeaad464cd90950fce4c74532496958a02ea9f7f8f2a65ba80da72ae12b1053385d93a501b6540fab507dfb0f3eb2d8f05b
-EBUILD pkgcheck-0.9.7.ebuild 1499 BLAKE2B d902ae79522cd7d08274fc82cf0954557a02ddfcef87f023ea3905ded88b44dc1e651e7cb38b89438532f6f09a3644cd0663e085852161f9cd404cba27e5aea9 SHA512 b506c1d78a8857b3e8a4b36663126b613622cad2ba8f4b15b49a0744412428eb8dd495f57f5d8eedae0c2a400dcf5b4decd72b987d44e8c47116539b240ae3c1
-EBUILD pkgcheck-9999.ebuild 1566 BLAKE2B 6bb5d7ffc6d1f63444eb574b6a230d187a177593087af1c777c52a8829b19477a7afa570fda4c45f9904d8e5ffc81061ee78eeefbcfcd77a8848eb3212fc58b1 SHA512 c1ac0651030a9d7a503e361fb99031ea3f8aac891696326048a011d299764f27a8ebff9f5e7825f83aa06e2da958191346815162044e973d0418b3a2bf5391dc
+EBUILD pkgcheck-0.10.0.ebuild 1507 BLAKE2B 70f6f537fa953ec59c3ed9b0ea017bec0fb7c569e6006b066e35a2b2b868a4e75da078c5bd60faba16a9c80f8e011a565366e611b9202628f073a27fc4e47aee SHA512 07dbe05c8d6a60d411bbd2d07e890b914c85703e024822ad7b6720818d15e6843ea05f95bfeda54b3f4c1f8db96948d25e719bf5d415082ad9c038a0403c50af
+EBUILD pkgcheck-0.10.1.ebuild 1514 BLAKE2B c0f86e1bdc8c9c74babe33395234bb6c12e6bef221c8bcf8398d406441b1455bd6d671e5db7ec1a9757cfafb733e6a70c2a6e617d60ba8e533ad63a97858f810 SHA512 3da204b82c34dd3b0d8bd73c842dcc1541cdcf1c29c5a89b29d1ea73e60506e970d2520a9d45194fc303fbf5994a391483f39cb3796afdab2cf3a7ef993f65a8
+EBUILD pkgcheck-0.9.7-r2.ebuild 1544 BLAKE2B 7bea3bcebc9b0397682d6ea9c39798a59857ea9276095548927e6fc6f09c606e60504b7a6ebba401fd00c55238489211889744b6480e559b897d7824fa33bbd7 SHA512 1de34366c44024ea677d6ae3e41a2a71819490d22a7f0813307f790ae3f3b019daa07d259ebc2ffe39121588dfc3a9183f46cbc7858d1c17e631ff2f6668bc50
+EBUILD pkgcheck-0.9.7-r3.ebuild 1604 BLAKE2B 0e6042b6fe93f617544b08d728eb1bbc4217e6e1b675c4069990c02f99937c9ba5668a68f3b5b595c688eddad5a47a96140f58daf9ca94a803eec7b933dd874b SHA512 6a3dd00c5158e8d004a002e820dc4553294c6faa2759ed672dc91f8664725bf6e7eaca8c1f7417a6d232566fe6031dac8df045307beba52137d003d8a1b76b28
+EBUILD pkgcheck-9999.ebuild 1514 BLAKE2B c0f86e1bdc8c9c74babe33395234bb6c12e6bef221c8bcf8398d406441b1455bd6d671e5db7ec1a9757cfafb733e6a70c2a6e617d60ba8e533ad63a97858f810 SHA512 3da204b82c34dd3b0d8bd73c842dcc1541cdcf1c29c5a89b29d1ea73e60506e970d2520a9d45194fc303fbf5994a391483f39cb3796afdab2cf3a7ef993f65a8
 MISC metadata.xml 328 BLAKE2B b84dba717460e84f7ee3163fd8d6a5f13eb3b15dd1bb749f6ece81f062e3530988dacefadb24c1395eb36593a7ab6d868b06c8c4ee8f620a17c85faf04283b24 SHA512 5696505214a737ad495b23bfac2a51fbbc5b1e815eb6fcbabb3c6674325f05e3f6f418de05257c08935e389e47879e8a2d1b3723ec86aeb5ad97c6110fd2ec75
diff --git a/dev-util/pkgcheck/pkgcheck-0.9.5.ebuild b/dev-util/pkgcheck/pkgcheck-0.10.0.ebuild
index 78f8b6d343cf..afa31791177f 100644
--- a/dev-util/pkgcheck/pkgcheck-0.9.5.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-0.10.0.ebuild
@@ -26,8 +26,8 @@ if [[ ${PV} == *9999 ]]; then
 		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]"
 else
 	RDEPEND="
-		>=dev-python/snakeoil-0.9.4[${PYTHON_USEDEP}]
-		>=sys-apps/pkgcore-0.11.6[${PYTHON_USEDEP}]"
+		>=dev-python/snakeoil-0.9.6[${PYTHON_USEDEP}]
+		>=sys-apps/pkgcore-0.12.0[${PYTHON_USEDEP}]"
 fi
 RDEPEND+="
 	dev-python/chardet[${PYTHON_USEDEP}]
diff --git a/dev-util/pkgcheck/pkgcheck-0.9.3-r1.ebuild b/dev-util/pkgcheck/pkgcheck-0.10.1.ebuild
index 446c03b9f7a2..1d0d90fc9dd7 100644
--- a/dev-util/pkgcheck/pkgcheck-0.9.3-r1.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-0.10.1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~x64-macos"
+	KEYWORDS="~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
 
@@ -26,9 +26,8 @@ if [[ ${PV} == *9999 ]]; then
 		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]"
 else
 	RDEPEND="
-		>=dev-python/snakeoil-0.9.4[${PYTHON_USEDEP}]
-		<sys-apps/pkgcore-0.11.6[${PYTHON_USEDEP}]
-		>=sys-apps/pkgcore-0.11.4[${PYTHON_USEDEP}]"
+		>=dev-python/snakeoil-0.9.6[${PYTHON_USEDEP}]
+		>=sys-apps/pkgcore-0.12.1[${PYTHON_USEDEP}]"
 fi
 RDEPEND+="
 	dev-python/chardet[${PYTHON_USEDEP}]
diff --git a/dev-util/pkgcheck/pkgcheck-0.8.2-r2.ebuild b/dev-util/pkgcheck/pkgcheck-0.8.2-r2.ebuild
deleted file mode 100644
index a0ec54b06b5e..000000000000
--- a/dev-util/pkgcheck/pkgcheck-0.8.2-r2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..9} )
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1 optfeature
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git"
-	inherit git-r3
-else
-	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-fi
-
-DESCRIPTION="pkgcore-based QA utility for ebuild repos"
-HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-
-LICENSE="BSD MIT"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
-	RDEPEND="
-		~dev-python/snakeoil-9999[${PYTHON_USEDEP}]
-		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]"
-else
-	RDEPEND="
-		>=dev-python/snakeoil-0.9.0[${PYTHON_USEDEP}]
-		<sys-apps/pkgcore-0.11.6[${PYTHON_USEDEP}]
-		>=sys-apps/pkgcore-0.11.1[${PYTHON_USEDEP}]"
-fi
-RDEPEND+="
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/pathspec[${PYTHON_USEDEP}]
-	<dev-python/tree-sitter-0.19.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests setup.py
-
-python_install_all() {
-	local DOCS=( NEWS.rst )
-	[[ ${PV} == *9999 ]] || doman man/*
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "Network check support" dev-python/requests
-	optfeature "Perl module version check support" dev-perl/Gentoo-PerlMod-Version
-}
diff --git a/dev-util/pkgcheck/pkgcheck-0.9.7.ebuild b/dev-util/pkgcheck/pkgcheck-0.9.7-r2.ebuild
index b73b795ae3d7..7cf93d2ab9c2 100644
--- a/dev-util/pkgcheck/pkgcheck-0.9.7.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-0.9.7-r2.ebuild
@@ -27,6 +27,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	RDEPEND="
 		>=dev-python/snakeoil-0.9.6[${PYTHON_USEDEP}]
+		<sys-apps/pkgcore-0.12.0[${PYTHON_USEDEP}]
 		>=sys-apps/pkgcore-0.11.6[${PYTHON_USEDEP}]"
 fi
 RDEPEND+="
diff --git a/dev-util/pkgcheck/pkgcheck-0.9.7-r1.ebuild b/dev-util/pkgcheck/pkgcheck-0.9.7-r3.ebuild
index 1859af4de531..70f186fd2538 100644
--- a/dev-util/pkgcheck/pkgcheck-0.9.7-r1.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-0.9.7-r3.ebuild
@@ -27,6 +27,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	RDEPEND="
 		>=dev-python/snakeoil-0.9.6[${PYTHON_USEDEP}]
+		<sys-apps/pkgcore-0.12.0[${PYTHON_USEDEP}]
 		>=sys-apps/pkgcore-0.11.6[${PYTHON_USEDEP}]"
 fi
 RDEPEND+="
diff --git a/dev-util/pkgcheck/pkgcheck-9999.ebuild b/dev-util/pkgcheck/pkgcheck-9999.ebuild
index 4f3e1d2a82c8..1d0d90fc9dd7 100644
--- a/dev-util/pkgcheck/pkgcheck-9999.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-9999.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~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
 
@@ -27,7 +27,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	RDEPEND="
 		>=dev-python/snakeoil-0.9.6[${PYTHON_USEDEP}]
-		>=sys-apps/pkgcore-0.11.6[${PYTHON_USEDEP}]"
+		>=sys-apps/pkgcore-0.12.1[${PYTHON_USEDEP}]"
 fi
 RDEPEND+="
 	dev-python/chardet[${PYTHON_USEDEP}]
@@ -42,10 +42,6 @@ BDEPEND="
 
 distutils_enable_tests setup.py
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.9.7-py310-update.patch
-)
-
 src_test() {
 	local -x PYTHONDONTWRITEBYTECODE=
 	distutils-r1_src_test
diff --git a/dev-util/pkgdev/Manifest b/dev-util/pkgdev/Manifest
index 74f65fad99da..e85f3c11d1b7 100644
--- a/dev-util/pkgdev/Manifest
+++ b/dev-util/pkgdev/Manifest
@@ -1,6 +1,8 @@
 DIST pkgdev-0.1.2.tar.gz 32579 BLAKE2B 42ecd7403dcb49b256539e12c22a6bca72884bf55139c5f0972961fbebf4f976dedd3a4fac1186cc1d5af62d339ac7dd3eb20106ff1dcc7b8c264e1c4c53c3de SHA512 c224a054612fd6caa9c66855be9bb5ed439c3ac2abf5b32c4ac516d87fa4e345fc8bc328aa74b4fec44d7fd319322bb42af48f6dfdfff941e3b819a75b9fae9b
 DIST pkgdev-0.1.3.tar.gz 35226 BLAKE2B 7e22331b39bc2b31a0492842d91b3389217ccf3e017796d239364888d691bb7f9c443b12f8a8019f3774276fb9f492a054e27b76cc447ebcfa584261b34e17dc SHA512 b64addebe81995968b4cca04de2d2a5ac63485b76744bde8d2f1b67a0207259712cf72fe76440a6c18eeb580c9de9fd594f48f08ba4870675efbc8c830751993
+DIST pkgdev-0.1.4.tar.gz 53247 BLAKE2B cc89f6637bdd0df230b47b30233415c2c2e55ea3dccd7134e22614b16c0ce8c95302c9edb5f64ca8b1928ddd2f678006d6bdf8c6241deb5d95dee6f6ec488dfb SHA512 60a23e7e3c0974677ebfcda4d709ad6dc15517d02f4190f318f61aeb0ceecc5b2bb8c663542313c3423a1102099d880a683e6623de1afe3c30bc92d59821d632
 EBUILD pkgdev-0.1.2.ebuild 1543 BLAKE2B ae64288392fcb57bb88cf1d5c11e83775f1790eaee84c8b8e417bb433fcf2d30e0daaa4f121b29e78b89cb2d627c0be5bff3e8f54b0b36178eb95f60a53f01fb SHA512 46e59fc344abee0e4051e5ebea9029442aa41ed810fa3bd0344a24f00344bd59df33328fd6e50c34b1b1f6b79493972eb5d476f5ecc9f0764c3ae08387df6f14
 EBUILD pkgdev-0.1.3.ebuild 1544 BLAKE2B 8f0059a3183279fd485470b9534883c3d82e0812d48bde533910e82d4b607e57859a4048ea60ccccd16c0737569efe59a0a191dd35846657e4bc570ad637cc26 SHA512 9a0b801eeed80915a23366e12aa3d4ca81647fa1999f72deb265448fef40e60f6b35eef0f1688ba61507ef0ecad1fe9cc7dc7e0dac420d2f4a5db5ce66d7df06
-EBUILD pkgdev-9999.ebuild 1544 BLAKE2B 246fce7c899c709848e29dac7b74cffd8d44dda6be1c7db7b30506413d303ae467bef09be70039406ed29b9847f619447ffd8d19ad1989a362c9ea1864e14b30 SHA512 08602dcf3e3934551c9b774e6e000210eee08a48dbf2c948caf03efe7d7e810bf4af8128e06e264288c3c3f9356bb947f65677f02701489dc4c2c624f015d47e
+EBUILD pkgdev-0.1.4-r1.ebuild 1559 BLAKE2B 0b3bf7f6063afa1c9c7ae29b7992bf6fccfdc1ac2206792719c3e5eb94a1d6c87b6cd54bba0b20e0cc541b8a1daf5b905ab1705bf078f3bace4e65fb5e2734ad SHA512 58b304e739e9a818c927d358584451f029b6b54670ba6de3f7ae69ad0147e870eccfee49a20e8ac0ed1e0d7e494af9ea05ca08d044925fcf7ba42efcb9f0e71b
+EBUILD pkgdev-9999.ebuild 1558 BLAKE2B 8441109b90fa8543b4d8f3beb57340b0de8baa6588844ed7f3fefb31ef560b19af5813f5a42d036da9242dad0caf5c4bd6367634a28b692fee5d2f4deebf6a18 SHA512 a63dbe4563d93a1961cd4a0edd29c32fe2acf73cc79b72e653e37d9879db06644812a6a56ac77e8590c3ea12c26fbc14833be79be908b9d2002c9a008213060c
 MISC metadata.xml 318 BLAKE2B 857b4e6e454663321e0c8f2b9083246459e751c4a1b0c7d900935274efcb63e82379e66984639e41a1adddb32cb995d4ccc99e910f76f3bf19d543d82520b1ef SHA512 40feecfb7907213bad0ee60f17e748aebbc4df381f59bfa47f3a5c9938917b032a37dce6650be4d60e695c17356290a7be984e1d235d219749b11d73d2fa2f6e
diff --git a/dev-util/pkgdev/pkgdev-0.1.4-r1.ebuild b/dev-util/pkgdev/pkgdev-0.1.4-r1.ebuild
new file mode 100644
index 000000000000..2aac0526b81f
--- /dev/null
+++ b/dev-util/pkgdev/pkgdev-0.1.4-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+DISTUTILS_IN_SOURCE_BUILD=1
+inherit distutils-r1
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/pkgcore/pkgdev.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc64 ~riscv ~x64-macos"
+fi
+
+DESCRIPTION="Collection of tools for Gentoo development"
+HOMEPAGE="https://github.com/pkgcore/pkgdev"
+
+LICENSE="BSD MIT"
+SLOT="0"
+
+if [[ ${PV} == *9999 ]] ; then
+	# https://github.com/pkgcore/pkgdev/blob/main/requirements/dev.txt
+	RDEPEND="
+		~dev-python/snakeoil-9999[${PYTHON_USEDEP}]
+		~dev-util/pkgcheck-9999[${PYTHON_USEDEP}]
+		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]
+	"
+else
+	# https://github.com/pkgcore/pkgdev/blob/main/requirements/install.txt
+	RDEPEND="
+		>=dev-python/snakeoil-0.9.6[${PYTHON_USEDEP}]
+		>=dev-util/pkgcheck-0.10.0[${PYTHON_USEDEP}]
+		>=sys-apps/pkgcore-0.12.0[${PYTHON_USEDEP}]
+	"
+fi
+
+# Uses pytest but we want to use the setup.py runner to get generated modules
+BDEPEND+="test? ( dev-python/pytest )"
+RDEPEND+="dev-vcs/git"
+
+distutils_enable_sphinx doc
+distutils_enable_tests setup.py
+
+python_install_all() {
+	# We'll generate man pages ourselves
+	# Revisit when a release is made
+	# to pregenerate them, making USE=doc
+	# for generating the real HTML docs only.
+	if use doc ; then
+		cd doc || die
+		emake man
+		doman _build/man/*
+	fi
+
+	cd .. || die
+
+	# HTML pages only
+	sphinx_compile_all
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-util/pkgdev/pkgdev-9999.ebuild b/dev-util/pkgdev/pkgdev-9999.ebuild
index b94c6c1d71d8..3344f643aa2f 100644
--- a/dev-util/pkgdev/pkgdev-9999.ebuild
+++ b/dev-util/pkgdev/pkgdev-9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x64-macos"
+	KEYWORDS="~amd64 ~ppc64 ~riscv ~x64-macos"
 fi
 
 DESCRIPTION="Collection of tools for Gentoo development"
diff --git a/dev-util/ragel/Manifest b/dev-util/ragel/Manifest
index fdaedff5827b..44b2d308b123 100644
--- a/dev-util/ragel/Manifest
+++ b/dev-util/ragel/Manifest
@@ -1,3 +1,4 @@
+AUX ragel-7.0.4-drop-julia-check.patch 1309 BLAKE2B 27855c17b9f1714aa17fe2fca7160ec1efa7b7044032c39b65e56529e2d8475885384e8b33ec2924e98cc1c340dc5e284a827665b8df63b54cbf56ca9e2574cf SHA512 9144e4118b7bcd5a86af6cff96bad861e3aaecc73efa9a29a001edd172943828629fa7f2f976cfbc2a5cef9899fb9f3025aea472f83b0d4970abc1284ddfa512
 DIST ragel-6.10.tar.gz 1232993 BLAKE2B 401e7a53b062ecd7ec98337866eb2dc0af0ac90e5d04ee304fd2a867b7b6f390985297a7ed57ce65e88b719598efbdd431bac8f53cee24199b795deb0e89da6b SHA512 6c1fe4f6fa8546ae28b92ccfbae94355ff0d3cea346b9ae8ce4cf6c2bdbeb823e0ccd355332643ea72d3befd533a8b3030ddbf82be7ffa811c2c58cbb01aaa38
 DIST ragel-7.0.0.12.tar.gz 1543127 BLAKE2B c3024c55eb5397f78159da83e318923529d3c1f10cc802564ac13c39b18c261166e27e4f315bbaa49e7eb9afa6840ca72aa62d7ae14d46f20865db64e3ab6759 SHA512 32ec90eddfd209e50995f21b9a5fcddd2b94279828227d367d990d7bfa8e4412682631d4e6ae5081871bac23d96153b96fb4494b991c70bf38df8cc0ddc8866d
 DIST ragel-7.0.3.tar.gz 1656577 BLAKE2B 3a9ce560894714a3801039fb944d3c914f2647a0b76bba4a7b790f8d569eb2e9eb807ab4d8af067560b274692be2d98c5dc28632e11c853893971585e847d48e SHA512 16bcb4b44a3ca94918d6c3e4bce468620cc691bf74cb69f0a264c41cbcffd595f897aa18e300952b60a68e680e1223532bbf9e500168d35d92a6559c190f6e78
@@ -5,5 +6,5 @@ DIST ragel-7.0.4.tar.gz 1656687 BLAKE2B d96444f6b8dc356b9effa6c5032952ffb2526833
 EBUILD ragel-6.10.ebuild 837 BLAKE2B 797418aa818b3dc163611d057c6c2d348b716945ca1632ef93e7c1183429c57bc9150a4c1ba594b751b53c0473d9066d056dbf4bbed75b962cd35c331f3b0c22 SHA512 243802350f28a11f6fa8e194e7562e672d4121b3e45632e09551569dc30594672afbde8e8ca1faa51d9c7d4aa71053ca9d389ea8994244d9399922ce3689c541
 EBUILD ragel-7.0.0.12.ebuild 772 BLAKE2B 97dc91562f31eefe83292cef36885fa5562039e16e866b3456d5f4ff603d456fdc66423f809e02e0414ba9e14b60bb89173301b060352f9f02c161344463882d SHA512 ee3579c12527cabd3bbb25be5b3968fe88d0d7f6351cbdaeae50626ed689d6f8e4bb207090c3504f54f2da28bf2e4c399f816295fa20e518d6f7f8046d9f9ac3
 EBUILD ragel-7.0.3.ebuild 1416 BLAKE2B 817cb6f863af04d4c635f86e70ae296f077d07801a5e6fed4d868fa5558cb033b00538c789644a4eda9f6b75fe12c89afa1f4a904579d81728c7d115a3453008 SHA512 c34c6e7c3faab0aad54aec9cbe1b753373590d48d4dfc6e0853815e92375209507263d6071896a5bb748089a986dba90c3c9b47af5568baedcd3ee68bfd48887
-EBUILD ragel-7.0.4.ebuild 1418 BLAKE2B a4428065f32784c8be516af00bbd6065abeb38f23c8b6f1ebe25eff95befdaaa219f1b26077a1081ae93b25a92f259a722ca0df17990c506fe00f9aa75b52d82 SHA512 6dc9789a243bc57e3ca321d905d83bdfb8fed596d949c4d4dce73393f757a69a251b395549b657803e6ee15c66abe6838a1967dc7052c8ae0684764abeb54c7c
+EBUILD ragel-7.0.4.ebuild 1478 BLAKE2B 17ad356f6a3949644e78172c0b955b971c8fc7d307bc08614629ca2c1e060aad10fb7ed2bf25ce09dd795f76b32f4d136b1401835e617e242b4a6b365b66cb8a SHA512 992555f161ee2665ef29be80f97fd75ed6cc4ceb7ef5726b522b15a7808ed5129df1623980a80d0420703136a82b8875cb4bf7bc18aebe19d414ae092fc6b689
 MISC metadata.xml 304 BLAKE2B e1fe70825ab2eaef1101ab15d8a29dfffae8b22e1a8cfdb9e97bd7243699be7bf5dff01735e9a9451f7e3207fd9659f7cad5492f1909e845c0761388b254a3fc SHA512 4c34ae1a571f693c06acd7b3611019f137e3b73796f982a0d054ce06402f8a27c44d18cf49c6e6758f010690f769a6b3a94fc46f972d38913140eb8392557f66
diff --git a/dev-util/ragel/files/ragel-7.0.4-drop-julia-check.patch b/dev-util/ragel/files/ragel-7.0.4-drop-julia-check.patch
new file mode 100644
index 000000000000..10ede37ae361
--- /dev/null
+++ b/dev-util/ragel/files/ragel-7.0.4-drop-julia-check.patch
@@ -0,0 +1,45 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -305,41 +305,7 @@ AC_PATH_PROG([OCAML_BIN], [ocaml])
+ AC_PATH_PROG([RUST_BIN], [rustc])
+ AC_PATH_PROG([JULIA_BIN], [julia])
+ 
+-dnl
+-dnl Julia requires a large virtual address space. On systems where this is
+-dnl limited by ulimit, julia will fail to run.
+-dnl
+-
+-if test "x$JULIA_BIN" != x; then
+-	echo 'println( "can run julia programs" );' > conftest.jl
+-	echo -n "checking if julia is able to run programs ... "
+-	if sh -c "$JULIA_BIN conftest.jl" >>config.log 2>&1; then
+-		echo "yes"
+-	else
+-		echo "no"
+-		JULIA_BIN=""
+-	fi
+-	rm -f conftest.jl
+-fi
+-
+-dnl We can run julia, now make sure we have 1.0
+-if test "x$JULIA_BIN" != x; then
+-	echo -n "checking if julia is version 1.0 or later ... "
+-
+-	dnl We assume the form "julia version X.X.X"
+-	dnl   1. everything before the version number.
+-	dnl   2. Remove trailing version.
+-	dnl   3. Verify it is plain number greater than 1.
+-	dnl Any failure comes out as empty string. Note the sed command is wrapped
+-	dnl in [] so autotools do not interpret anything in it.
+-	JULIA1="`$JULIA_BIN -v | sed ['s/[A-Za-z ]\+//g; s/\.[0-9\.]*//; /^[1-9][0-9]*/!d;']`"
+-	if test "x$JULIA1" != x; then
+-		echo "yes"
+-	else
+-		JULIA_BIN=""
+-		echo "no"
+-	fi
+-fi
++JULIA_BIN=""
+ 
+ AC_PATH_PROG([GNUSTEP_CONFIG], [gnustep-config])
+ 
diff --git a/dev-util/ragel/ragel-7.0.4.ebuild b/dev-util/ragel/ragel-7.0.4.ebuild
index f97334957561..38a9bda6fb70 100644
--- a/dev-util/ragel/ragel-7.0.4.ebuild
+++ b/dev-util/ragel/ragel-7.0.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.colm.net/files/ragel/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="doc"
 
 # Notes from bug #766090
@@ -32,6 +32,10 @@ BDEPEND="
 DEPEND="~dev-util/colm-0.14.7"
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-7.0.4-drop-julia-check.patch
+)
+
 src_prepare() {
 	default
 
diff --git a/dev-util/rebar-bin/Manifest b/dev-util/rebar-bin/Manifest
index 5dfad49cc00e..68025c926ad8 100644
--- a/dev-util/rebar-bin/Manifest
+++ b/dev-util/rebar-bin/Manifest
@@ -1,3 +1,3 @@
-DIST rebar-bin-3.15.1 951017 BLAKE2B b9c71729397678ace6b9988dc3bbcf3685a9c832298f66ac8b758f515c7c4f0e24b5bebaea93fa7f2f1b1fd88cebd7581c6e2c7e6efc08b5138225b1a02700d8 SHA512 3dd66d3e35b4431a9cc565a20ebdad9732df6e673b818236be5be377279b179ddf12c953268b0d6edf5f0c45253b4e5a0b192904f1c606354dbed2ae86fb2403
-EBUILD rebar-bin-3.15.1.ebuild 591 BLAKE2B 11c26c22bd66ec51a0af2ab34dff7b97c5ad16bd52b608d7a69d8e5f82e1f77e1da81d169f331157381cdfa338ee3d40e0a80fb84a063981298e9a08f8971500 SHA512 bc1cb4c796be8fb29ad2c9ed96012476b6a6b5e9d6e276c65d3289ed04bc2248ba732e1a30a98f4652f47fa1a062eed116ac81d9c8ddb09e51a93c699b72f7cd
+DIST rebar-bin-3.16.1 942316 BLAKE2B c3296d54f85c146a58ff24a9b337f7d26e2beb3287257ecca6344c082b84295d9daf042b7bcb422df7c5dd29dd681f0c81064c1ef5b7b30ed8be8328ca694bc4 SHA512 be9e4ffdf654f8038ff14cd4b53328bdbc8b26e0f1306a16220f4d5d4b13bc36ac2f302d52a799424ffc3835e41ce326a4fd8e422ececf70ab8c0f951e3e4b24
+EBUILD rebar-bin-3.16.1.ebuild 610 BLAKE2B f8b801213ff3d41987f7b54747d200ccab01f11e21be2a8fc540a5a3b6da7976f5c767d5b1752ac0328834f34c187719e501e5ab9ad841fbc34147a834c2a2a5 SHA512 6d794157feffbc22160e67569a536073711412d81c34af0f429496940e0c9c55098c92742b65bb43bdee326fd2defa730073a359801885e67328f43a69bf4bdb
 MISC metadata.xml 1186 BLAKE2B 2ab14359cd530e009f7e793334b93587adf02cf7a43ecc51cb710fe10bb59b5ccc82ccba8323b7b28f4872871048cce8d7acd468adb2d9d62ee426ed268c08da SHA512 7da7c4e15611f93e3692fa462e024ebb0f9b447a93c518ade6bb151a548a65437a285ae9bea4334ee84790ed75fcaaa2e57872f0ae117dbec66bd9f2d6da9031
diff --git a/dev-util/rebar-bin/rebar-bin-3.15.1.ebuild b/dev-util/rebar-bin/rebar-bin-3.16.1.ebuild
index a483e583b864..83bb5eb671c1 100644
--- a/dev-util/rebar-bin/rebar-bin-3.15.1.ebuild
+++ b/dev-util/rebar-bin/rebar-bin-3.16.1.ebuild
@@ -7,7 +7,7 @@ MY_PN=${P#-bin}
 MY_P=${MY_PN}-${PV}
 
 DESCRIPTION="A sophisticated build-tool for Erlang projects that follows OTP principles"
-HOMEPAGE="https://github.com/erlang/rebar3"
+HOMEPAGE="https://rebar3.org https://github.com/erlang/rebar3"
 
 SRC_URI="https://github.com/erlang/rebar3/releases/download/${PV}/rebar3 -> ${P}"
 
diff --git a/dev-util/rocm-cmake/Manifest b/dev-util/rocm-cmake/Manifest
index 8b28e0d7b56f..996a789b0e8f 100644
--- a/dev-util/rocm-cmake/Manifest
+++ b/dev-util/rocm-cmake/Manifest
@@ -3,10 +3,12 @@ DIST rocm-cmake-3.8.0.tar.gz 15823 BLAKE2B 321d31769cee254f9f9048104c7837fc6eb4a
 DIST rocm-cmake-3.9.0.tar.gz 15815 BLAKE2B 86fedeb90ee27367b5fcfe842009055ef073932823fe54c9c6b7dfc7d08e92165c6cb4befebee347645777948b8c24de0c90f2547648cadbd34d39de2da540ef SHA512 bda392023494929ae743a81afdb4b802a3f7728a101ec06dd49c2e1d1165a2306d25beda6a4ea7dfc0aeeeee3f8bad8949d5c897618a362262570d6582c789db
 DIST rocm-cmake-4.0.0.tar.gz 15815 BLAKE2B a6e6ce5f63ea6e1c14ce4c74a627d54987321e20d977e575615caa7037f2e3c734cc9f88dc5cdff7a9ee81caefab17440043bdc88a201d4fec29eb167ea709fe SHA512 1d42f7d17f783355b7d559db17020258dd686a0439c481cde04bb3750494dc2e5757dad0fed7e96c1da6ce875b03f97366efec5a75ece09fd92fbd9265a58e34
 DIST rocm-cmake-4.1.0.tar.gz 19736 BLAKE2B 1a7baec723155f0e760682296eb940ec723a0b2c9321209ca3beb81f35614830ceb9d6b6f73fcd499f6e6a3608a9d665cd478f5b2d1b6dd01cf55e6c8000135f SHA512 86ea9db05975472148f4146079246dd7179089e416bcac2f4d82d0152275c5b9372455a92328cece87b220022d2874c8300eb9f6108283ae6f643cc01baebf11
+DIST rocm-cmake-4.2.0.tar.gz 22147 BLAKE2B 14d90d187a845fd148b77cd73a628653405be42859cf981e2dcec7abf46edc5d30ab50792754fb4a75267cc2c574b68e5d6e1af2f3ca69c75c67dc40c71fce4d SHA512 7ddbdef28e4490936fa7334e1aca273fa1510332609a3d7ed79a8fa448ec032843883c46411995c3868f585f184e0c13a2e0be6d667d1f8532e07d968d810ac8
 EBUILD rocm-cmake-3.10.0.ebuild 731 BLAKE2B 463d3a82ab60695d46d43566435db7d3c8e09848a9d43b3c810a6c82628fa882deb81e94b134ec7b5661e4530dff9a9dd407043348bbcb100ad2d7318277a904 SHA512 6fdd1d769eaf846f8e582fa24316da54e6d4210a7b08094300930941d3bee8b671919a4589fb28d3ddb5df61f5ce6969b858de6a0c5fc9de7530e9351df9cd29
 EBUILD rocm-cmake-3.8.0.ebuild 731 BLAKE2B 463d3a82ab60695d46d43566435db7d3c8e09848a9d43b3c810a6c82628fa882deb81e94b134ec7b5661e4530dff9a9dd407043348bbcb100ad2d7318277a904 SHA512 6fdd1d769eaf846f8e582fa24316da54e6d4210a7b08094300930941d3bee8b671919a4589fb28d3ddb5df61f5ce6969b858de6a0c5fc9de7530e9351df9cd29
 EBUILD rocm-cmake-3.9.0.ebuild 731 BLAKE2B 463d3a82ab60695d46d43566435db7d3c8e09848a9d43b3c810a6c82628fa882deb81e94b134ec7b5661e4530dff9a9dd407043348bbcb100ad2d7318277a904 SHA512 6fdd1d769eaf846f8e582fa24316da54e6d4210a7b08094300930941d3bee8b671919a4589fb28d3ddb5df61f5ce6969b858de6a0c5fc9de7530e9351df9cd29
 EBUILD rocm-cmake-4.0.0.ebuild 731 BLAKE2B 463d3a82ab60695d46d43566435db7d3c8e09848a9d43b3c810a6c82628fa882deb81e94b134ec7b5661e4530dff9a9dd407043348bbcb100ad2d7318277a904 SHA512 6fdd1d769eaf846f8e582fa24316da54e6d4210a7b08094300930941d3bee8b671919a4589fb28d3ddb5df61f5ce6969b858de6a0c5fc9de7530e9351df9cd29
 EBUILD rocm-cmake-4.1.0.ebuild 731 BLAKE2B 756a54919e71e54702a32910f35e7e348aa44c3ac8d6c76d08bc2daaf56100f1595ae1b0afb3ebd1bc8503924ac1e06f35afde6f0373f7d796bdd625da7326eb SHA512 07ed6d913b24fa55e8a3620ced0e72e7b1e54d8f70819f65990058474c8e2c188100f395b98cf84e10fd13ef653f508a2f4eef549ef6cd65e007fdb7488d1a49
+EBUILD rocm-cmake-4.2.0.ebuild 731 BLAKE2B 756a54919e71e54702a32910f35e7e348aa44c3ac8d6c76d08bc2daaf56100f1595ae1b0afb3ebd1bc8503924ac1e06f35afde6f0373f7d796bdd625da7326eb SHA512 07ed6d913b24fa55e8a3620ced0e72e7b1e54d8f70819f65990058474c8e2c188100f395b98cf84e10fd13ef653f508a2f4eef549ef6cd65e007fdb7488d1a49
 EBUILD rocm-cmake-9999.ebuild 731 BLAKE2B 463d3a82ab60695d46d43566435db7d3c8e09848a9d43b3c810a6c82628fa882deb81e94b134ec7b5661e4530dff9a9dd407043348bbcb100ad2d7318277a904 SHA512 6fdd1d769eaf846f8e582fa24316da54e6d4210a7b08094300930941d3bee8b671919a4589fb28d3ddb5df61f5ce6969b858de6a0c5fc9de7530e9351df9cd29
 MISC metadata.xml 371 BLAKE2B 41c8b543a5928a1a337a4858ecb042011010df6e199b8c61cdbc8cb0f79e924cbd7ee8e7c2acf324d17d91176e2ef94b171f61faca35aef5469ad33326dba27c SHA512 ede90d9d5bbf97823fe93004207fd61a79dcea2651d00b5f520cb395868a17e238278cdd13113d1b2945de5ac9db9a1471c37812467dea201bf78fb662db58ab
diff --git a/dev-util/rocm-cmake/rocm-cmake-4.2.0.ebuild b/dev-util/rocm-cmake/rocm-cmake-4.2.0.ebuild
new file mode 100644
index 000000000000..e23ea832ca54
--- /dev/null
+++ b/dev-util/rocm-cmake/rocm-cmake-4.2.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/rocm-cmake/"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/RadeonOpenCompute/rocm-cmake/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/rocm-cmake-rocm-${PV}"
+fi
+
+DESCRIPTION="Radeon Open Compute CMake Modules"
+HOMEPAGE="https://github.com/RadeonOpenCompute/rocm-cmake"
+LICENSE="MIT"
+SLOT="0"
+RESTRICT="test"
+
+src_prepare() {
+	sed -e "s:set(ROCM_INSTALL_LIBDIR lib):set(ROCM_INSTALL_LIBDIR $(get_libdir)):" -i "${S}/share/rocm/cmake/ROCMInstallTargets.cmake" || die
+	cmake_src_prepare
+}
diff --git a/dev-util/schroot/Manifest b/dev-util/schroot/Manifest
index affe31a3b3a5..e6d47d5bd0d1 100644
--- a/dev-util/schroot/Manifest
+++ b/dev-util/schroot/Manifest
@@ -1,7 +1,9 @@
 AUX schroot.confd 371 BLAKE2B efb68aa9818ddf23fa88087c656f8abe8ee3c549714fa16b2be6d0cc0aa3e5dfae6dcd4eefc2e152eab60611e2369db6159a444344adcff6954fd8c1e828f698 SHA512 b86944ee7fb2622ef0bd9c9252a51724916427c6bffa1dc0623a40190e4866ffda48f8999790365f4a589ea647e3695077b6cd7ec8a1d1ab6bd026a5c7480c98
 AUX schroot.initd 706 BLAKE2B 344eb8296714d2d40b451a07fd6e498c6134122da2d115cfc4bf6e7285278ce5c97fb05be7303f8636d30b455323f32594387c87fa96ef1b5a99117b41c2e3cb SHA512 8ce31a67cb4a6064875eed2d5cf3f11ce13f322b19df6b51dc08df2de42447f09124d725d70b1c4ff906644ef52a1f1b5b295575f795a96438bad3dea52f3d15
 AUX schroot.tmpfilesd 91 BLAKE2B f731cf3cb0037ec35f8144d2667f3a12fbfcef088454d165cfcdc63d34f433eb7abc9442917c0cccaf48b66cab028db0b04edbd9d1cb2864d257213fe54fd3e6 SHA512 381d715e2a1443d0115a6fa35cc7d43205a1dfa432f40e4903d944c219b8f5f0b076fb93c90c159f1f7edd5cf8a8766653a41e168940da92bae0b186c93eff96
+DIST schroot_1.6.10-12.debian.tar.xz 83636 BLAKE2B 0289848f7e64983c06f47a70346e06d7024722c643034ac24745fe4548311b893053ec28891f39264cb0894c12236f4e8523b70cd83553d1a7179cbfc63cbfa3 SHA512 77ae2d758593de505e9381e4800eb17a9e14fb949a5bdb07b9235671ae4bd18c668aa9c35a1ba6340af93b308b5c3798afc83f14165e4b19e7cebab92b83fc52
 DIST schroot_1.6.10-7.debian.tar.xz 82524 BLAKE2B 664ee356f8de1215c761a771cc0700d25ff6c0513124f4d84d5b33a046cac6ff194b62dded1e8f966a922a013644edd3d9424b0d577a8bb2b371e23e8dd88ed5 SHA512 ee362cce46ec804cd0ad6bfe3c7dec37fdeffe56941d51aec9e9622057a4d2a94e47f7530d28862c948233c6623cfa4b4721c27f293e31a28ec0320ffe02a47a
 DIST schroot_1.6.10.orig.tar.xz 797328 BLAKE2B 1f91531f22c5b0a75e5bb74effc660efe4819acc59b007355c12a01c0a1de12674881dd0fbbcab00575a02629662fca799d48f5b967eb527812ed8c08ff9ad28 SHA512 25155989c7811ab4c7bf3cdceaa8d0ffb12f08388143891def96fcd205f1cc401dad9a74f0e9a9ef8610d50174ff8319a8368401431dc87e1a11c0241e61fcbe
-EBUILD schroot-1.6.10_p7.ebuild 2859 BLAKE2B 3ae69ae9b1b89b340bf0ca4f4f177ab61e76601ac179f3e03a0e51fd705361435c6694ef7513d85cab970234ef06ba4ac7d9972c80ba5b8ab14eeca023808204 SHA512 a55af72d539e302b712f8deccbeb53d679e6c8c0b32e280b563361348d536a87a742c60ee026754aca99e509d670f6932109d4fbe47111637f4794f7c47c9748
+EBUILD schroot-1.6.10_p12.ebuild 2957 BLAKE2B a5489b17883aaaac9fc5c3f619e5a724092768ef60415907f0b70c77c262f6a5ca1e244e4facf51beef185c879203c1de584aca8e71cd721087f6f600ed6780c SHA512 c2c8e873c26f63588ad6f45b2c8a7d480021abda6ffd29226e004506bc6b813dc2785d16403f048e80cece7ea01cd4f742bc62151a533328bc744a6faa6f71d4
+EBUILD schroot-1.6.10_p7-r1.ebuild 2936 BLAKE2B b285e3f9241e8ca1998bced999d9e8c60cfeef9a6705bc48af724fed626a2db1aebb66898d4342751b5e8935330b9d0cdfe18ffb88f638a37008703d79b2cf3b SHA512 490bf8a58156f74f14a8407fe5fbbacdec7c9596b0918e37753e4261d914c9712877db564ac5faaba080658844419589f9b563e0389522fb7b0d5e3501bc370e
 MISC metadata.xml 615 BLAKE2B 8f6cde0f4bd1d00fed8330dd097b9ce0de021621af06aee3534e9cdaf79ae9353c27d831916d4e53ecfe11f264a3a9111001aff469471d75e1c51a04d55be4d2 SHA512 3ed685c418e1f8aa15d1a50e695aa71c2c2d48888a0b888a06d830c40a617a804d3c2c5f0f0ff14cea4206aee821239b63df273ccaf7452246112c931e6a923b
diff --git a/dev-util/schroot/schroot-1.6.10_p7.ebuild b/dev-util/schroot/schroot-1.6.10_p12.ebuild
index d2a080698748..d1292d3caaaf 100644
--- a/dev-util/schroot/schroot-1.6.10_p7.ebuild
+++ b/dev-util/schroot/schroot-1.6.10_p12.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
@@ -14,7 +14,7 @@ SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${MY_P/%-*/}.orig.tar.xz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="btrfs +dchroot debug doc lvm nls pam test zfs"
 RESTRICT="!test? ( test )"
 
@@ -76,6 +76,7 @@ src_configure() {
 		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
 		-DCMAKE_INSTALL_LOCALSTATEDIR="${EPREFIX}/var"
 		-DSCHROOT_MOUNT_DIR="${EPREFIX}/run/${PN}/mount"
+		-DBoost_NO_BOOST_CMAKE=ON # https://bugs.gentoo.org/791712 and https://bugs.gentoo.org/752120
 	)
 	if ! use nls; then
 		mycmakeargs+=(-DPO4A_EXECUTABLE=NOTFOUND)
diff --git a/dev-util/schroot/schroot-1.6.10_p7-r1.ebuild b/dev-util/schroot/schroot-1.6.10_p7-r1.ebuild
new file mode 100644
index 000000000000..c4d0bb6cfa27
--- /dev/null
+++ b/dev-util/schroot/schroot-1.6.10_p7-r1.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 cmake pam tmpfiles
+
+MY_P=${PN}_${PV/_p/-}
+
+DESCRIPTION="Utility to execute commands in a chroot environment"
+HOMEPAGE="https://packages.debian.org/source/sid/schroot"
+SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${MY_P/%-*/}.orig.tar.xz
+	mirror://debian/pool/main/${PN::1}/${PN}/${MY_P}.debian.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+IUSE="btrfs +dchroot debug doc lvm nls pam test zfs"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	>=dev-libs/boost-1.42.0:=
+	>=sys-apps/util-linux-2.16
+	btrfs? ( >=sys-fs/btrfs-progs-0.19-r2 )
+	lvm? ( sys-fs/lvm2 )
+	pam? ( sys-libs/pam )
+	zfs? ( sys-fs/zfs )
+"
+
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils
+	sys-apps/groff
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+	)
+	nls? (
+		>=app-text/po4a-0.40
+		sys-devel/gettext
+	)
+	test? ( >=dev-util/cppunit-1.10.0 )
+"
+RDEPEND="${COMMON_DEPEND}
+	sys-apps/debianutils
+	dchroot? ( !sys-apps/dchroot )
+	nls? ( virtual/libintl )
+"
+
+S="${WORKDIR}/${PN}-${PV/%_p*/}"
+
+src_unpack() {
+	unpack ${MY_P/%-*/}.orig.tar.xz
+	cd "${S}"
+	unpack ${MY_P}.debian.tar.xz
+}
+
+src_prepare() {
+	sed -i -e 's/warn(/message(WARNING /' man/CMakeLists.txt || die
+	eapply "${S}"/debian/patches/*.patch
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-Dbtrfs-snapshot=$(usex btrfs)
+		-Ddchroot=$(usex dchroot)
+		-Ddchroot-dsa=$(usex dchroot)
+		-Ddebug=$(usex debug)
+		-Ddoxygen=$(usex doc)
+		-Dlvm-snapshot=$(usex lvm)
+		-Dnls=$(usex nls)
+		-Dpam=$(usex pam)
+		-Dtest=$(usex test)
+		-Dzfs-snapshot=$(usex zfs)
+		-Dbash_completion_dir="$(get_bashcompdir)"
+		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
+		-DCMAKE_INSTALL_LOCALSTATEDIR="${EPREFIX}/var"
+		-DSCHROOT_MOUNT_DIR="${EPREFIX}/run/${PN}/mount"
+		-DBoost_NO_BOOST_CMAKE=ON # https://bugs.gentoo.org/791712 and https://bugs.gentoo.org/752120
+	)
+	if ! use nls; then
+		mycmakeargs+=(-DPO4A_EXECUTABLE=NOTFOUND)
+	fi
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile all $(usev doc)
+}
+
+src_test() {
+	if [[ ${EUID} -ne 0 ]]; then
+		ewarn "Disabling tests because you are not root"
+		return 0
+	fi
+
+	cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	keepdir /var/lib/schroot/{session,unpack,union/{overlay,underlay}}
+
+	docinto contrib/setup.d
+	dodoc contrib/setup.d/05customdir contrib/setup.d/09fsck contrib/setup.d/10mount-ssh
+
+	newdoc debian/schroot.NEWS NEWS.debian
+
+	newinitd "${FILESDIR}"/schroot.initd schroot
+	newconfd "${FILESDIR}"/schroot.confd schroot
+	newtmpfiles "${FILESDIR}"/schroot.tmpfilesd schroot.conf
+
+	if use doc; then
+		docinto html/sbuild
+		dodoc "${BUILD_DIR}"/doc/sbuild/html/*
+		docinto html/schroot
+		dodoc "${BUILD_DIR}"/doc/schroot/html/*
+	fi
+
+	if use pam; then
+		rm -f "${ED}"/etc/pam.d/schroot
+		pamd_mimic_system schroot auth account session
+	fi
+}
+
+pkg_postinst() {
+	tmpfiles_process ${PN}.conf
+}
diff --git a/dev-util/spirv-headers/Manifest b/dev-util/spirv-headers/Manifest
index c627f1847b09..b2094c4d5f33 100644
--- a/dev-util/spirv-headers/Manifest
+++ b/dev-util/spirv-headers/Manifest
@@ -1,6 +1,6 @@
-DIST spirv-headers-1.5.4.1.tar.gz 395834 BLAKE2B e4852f1d694271e9928f1f9aa460c6ba33ad2d0568bd38b24ba31e8dd0390a5542192f9c6977cd3ff4a56520af83280b779fd4e7cece6adc33a5261ef2d2398d SHA512 3578a0210b954e904ac154307a0b98a2c01410adf910e549669109b1b559781959bb5771e39945c50523548a6613d064576fcba15aa3c9125255c0443d3e61a6
 DIST spirv-headers-1.5.4.2_pre20210327.tar.gz 403907 BLAKE2B 9154b2c9abed730c0d292c5adc38d2723a8748d1eaad885ebf624631128edd227521f3e7f7185daddbd9ff404741e9fcd9adcd5eafff7a6a234585c7a327beb5 SHA512 02631716e4307f2bef9e7e294a5e4f2e6f7522f2b42f34eb919c7b8280fa8e55437ff1dcf6b5cf4bcdef062f1f0ed00b3afcb1dd1051b63ad3ec0b5a311b15fa
-EBUILD spirv-headers-1.5.4.1.ebuild 520 BLAKE2B cdc4447f89db8ce4c51313de7f062404c0fbf6b7f30fe33bbaf2853f597c702a0ee406ef626d717e022fe55c2e19104aa67840136057b44231c1054da5ce8961 SHA512 20637f37df7f01a551d19ea6e1e324f4022b0f9a7652fbb69a39fba38748a7c2d13a698233233d666ad3ae5867914d2f2fb75b50ddeb6ba26e12c9ff159ff4bc
+DIST spirv-headers-1.5.4.2_pre20210526.tar.gz 406038 BLAKE2B e10042a4c09668a6eb0d2f08a873794e20d83e6f7be40d58c3a59e1d96aa6845060a9fd7e90ea4e6a940eddbabf6b725be756ea64b49ef9034b34dc6c33fa5bb SHA512 ef9b171c168963a3f25643a3ce5f6a5df3b811daaf237700f793c1d313016c148b107b0d8cfe81fa4cb72f8da87a3da58387545f7bd76d15927c4742d0dc2b68
 EBUILD spirv-headers-1.5.4.2_pre20210327.ebuild 514 BLAKE2B 3baa735fc68ed6d407a02356bedc3ee715f7f110684bf6b34356d9e176072fcbacca66d2994e6471607044a81c1eca03c6c1c77e989947f456b881ff77c14aae SHA512 811f7deb5744b644935908953bbfc82106e35a04656452cae833bf470d1ee26d3123feafa32c4a80e99f290e52b22d4efe87b9e014f5f8c67897312eabfaaf97
+EBUILD spirv-headers-1.5.4.2_pre20210526.ebuild 520 BLAKE2B 9b9e27cef5d3d407be980f4813ee8802269ce5ed8daf87e9993d5c0816d95f5a9f3ac40dcaadda13c12dc011bc86eba520405dc4f32e65c3f1a72309073a4fd9 SHA512 027325a6d7aee6fe5546b57cbddf49a4fc04e97e67d9f89e634a1c36f49b1da244aaf9d589abdfce37cb5f1622d5af0f100ba2c3e81178df3eefe2c5ead017cd
 EBUILD spirv-headers-9999.ebuild 600 BLAKE2B e52054009b4c2a119218fe8e7d1d7606a5355fa93c8a9e14d7e6174dc212d2c87a7d2c57106bd4d217c8fd0ab88234e5a186f700664ccbd04de8b3520afef10e SHA512 420d7be91c892302e0b052c9bf1a628d663f95051a6d38580944aafd1c43c395cb87cec8df6d2d756b8fb4a177b23671911f58c05e9e5b035a41b0b9bb399dfe
 MISC metadata.xml 430 BLAKE2B 6b143a506671795115d2b676cd50050b856f54cb93569d7c4892d620b742c9f2c0cceea268e9438b20854a73d7c7a157d78b353e17a595302c21c3d2c52b55cd SHA512 59dc2bf8f8df13626f1b48600ebfa1f9d14fad03efe8e0512f9db5b1928d98ccee16182ade4567f49764f69bb4004747d6746a1e966ef6d1feeb88bf0be766d4
diff --git a/dev-util/spirv-headers/spirv-headers-1.5.4.1.ebuild b/dev-util/spirv-headers/spirv-headers-1.5.4.2_pre20210526.ebuild
index 76999b74c836..0d082617b74f 100644
--- a/dev-util/spirv-headers/spirv-headers-1.5.4.1.ebuild
+++ b/dev-util/spirv-headers/spirv-headers-1.5.4.2_pre20210526.ebuild
@@ -3,15 +3,15 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Machine-readable files for the SPIR-V Registry"
 HOMEPAGE="https://www.khronos.org/registry/spir-v/"
-EGIT_COMMIT="f027d53ded7e230e008d37c8b47ede7cd308e19d"
+EGIT_COMMIT="2e1bc6dcd4ff49ed996dc0174d1aec37c2e9ab59"
 SRC_URI="https://github.com/KhronosGroup/SPIRV-Headers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 
 S="${WORKDIR}/SPIRV-Headers-${EGIT_COMMIT}"
diff --git a/dev-util/spirv-tools/Manifest b/dev-util/spirv-tools/Manifest
index 3056a11ef332..4352cce6e1a8 100644
--- a/dev-util/spirv-tools/Manifest
+++ b/dev-util/spirv-tools/Manifest
@@ -1,6 +1,8 @@
 DIST spirv-tools-2020.6.tar.gz 2595300 BLAKE2B bd500824866fcd0f0e05ccf3f43a168e33bc4783396d24fa6ddc58d4e46110b001cc32acde1cadcd793a997d547476f58c07475f43c3cbec5314b039926896b2 SHA512 b6d3667581101536e1f4d405e9c1c64e64a0aba174cc2f41d31e080f44d23bcfaed9642fd31f1d44a56c3df3e894526b643c572832cb96218b16d748b1ac6fe2
 DIST spirv-tools-2021.0_pre20210327.tar.gz 2591201 BLAKE2B e850bb2ccdd83bbd618ded22df8553c6e977e65ef623e881ec5b4dc15c3646a2c679dbf2a41166ddc98b75aa73a3404a870cd6fac577197c21623c97e7f07192 SHA512 56c206bf62d45a2341272612f979f9ef9bb933185e2f2852a39367dfb68f6647662d8995dfb9067e71b04cd76d2da0789346335dbabd7258406d96627f689e96
+DIST spirv-tools-2021.1.tar.gz 2613619 BLAKE2B ab5816e3407ba827f5db69cb391b0e4820661aa7367edfc5a9a41cb9fee98a7e814f765d99548cdab1a11869f79710e6243f2c97ec3ee4f6a919990dc24e63dd SHA512 74be4ecb3f6926cebdbfdc2351e3d3e0db18a8a312ce12882442d4e33737f9ccfb0ec6e1f5cd6bb5604525467605c080a8494b4aef6dd797dc805e12bc10226f
 EBUILD spirv-tools-2020.6.ebuild 1197 BLAKE2B 05ac606f25f2bfd1280ba5c19574628578046b033a9f01b2c939c7e2d1e55d0386ba71db94d988e8689cd8b20bd8f427ccb2f8259f17b7352e770d44aa337238 SHA512 bf598004767b75ee52149e7e2cb90e949c10284e3e0053bfd06de3ad69ad19cfee608f24b11eaf46345ed07d21239cc601f5e6984e82c738de6157a077d15a66
 EBUILD spirv-tools-2021.0_pre20210327.ebuild 1243 BLAKE2B 81b3d871bbb9b6cea243057ee94379cfb24ae80fe6b53586d0929d40634e8bfdca891c1f793319cfefcc11334ae8dfb2cefe5b5f0e7d5ed6cdc096d22a7bd848 SHA512 016926e221828e62db8c27539e94fc4368cb21cf5db3262f5e73f9d692c06b257b4bd9c815080cd428d8641d633fc137aab5aeec7418ecf77cfbdec0ec21516a
-EBUILD spirv-tools-9999.ebuild 1249 BLAKE2B a1b152db67b48ab095b895cd7171f9eaed714308d7f2dbd34e31a415429f51cc127bd44d31dd261e323556a5a7f7960c3be7ba3b417b8e56b5ba5e9cdc794cef SHA512 7e5d2801912a845a4d076396e2704c05d3b182be2d17c5e40b6b7f9b46cf934fd4b5c22a38c4722d1dd22d27c64b3c19a718dc7303e2e5fc566bbffad0851672
+EBUILD spirv-tools-2021.1.ebuild 1249 BLAKE2B ef5963a81caf3bd3e8215d795bc5f78722caa44121818a368f7b66ce6fb58042913a8313fa43fed62b812b55cc51e8a0c14e215ea6e6297011c7b3e59ab43579 SHA512 609fd9d0c6ccbd6350ee7052f07406b97bb948c2bb427b3b744822cd5f5271453dc32af46df4f4a04333a572eb52d626f9ac112a9ed25d5efd701e801a101c50
+EBUILD spirv-tools-9999.ebuild 1249 BLAKE2B fff6ed718fed7223911810ad47847230aa3f77c08925893e63e04cd55d4c3486b4e653d26e638a44bce7d9cdce178dff9a01e8b5d99777b245eac9b8563453b3 SHA512 0081fdbc259e420597b3efcd1985cc4e30a963bbc08e49701fb1b7218b092d2af373d510cc484a2e8a1de8e9032f91d0d49272e09f9a5645042bebd9cf278dd1
 MISC metadata.xml 428 BLAKE2B e5ec493782c93cb593d56b58a4f1d8b89dad2b0a11cc5eb2faf6b9cdb898e1097440ad446f0c920c69bd0eddfb9225bf8fce8d3749a03f8e6e5c94cdeea5173a SHA512 a5c873d573590a7c538f96d03bbe66b9a42eaabd5b96bafe8642a9cdde2a27bd067e5e46802ceb76e83160af0e4dd052ecc0b6e8c3b6fda3ee15a2eedf1d8b08
diff --git a/dev-util/spirv-tools/spirv-tools-2021.1.ebuild b/dev-util/spirv-tools/spirv-tools-2021.1.ebuild
new file mode 100644
index 000000000000..9fb9e28bebd0
--- /dev/null
+++ b/dev-util/spirv-tools/spirv-tools-2021.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN=SPIRV-Tools
+CMAKE_ECLASS="cmake"
+PYTHON_COMPAT=( python3_{7,8,9} )
+inherit cmake-multilib python-any-r1
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
+	inherit git-r3
+else
+	EGIT_COMMIT="c2d5375fa7cc87c93f692e7200d5d974283d4391"
+	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+	S="${WORKDIR}"/${MY_PN}-${EGIT_COMMIT}
+fi
+
+DESCRIPTION="Provides an API and commands for processing SPIR-V modules"
+HOMEPAGE="https://github.com/KhronosGroup/SPIRV-Tools"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+# Tests fail upon finding symbols that do not match a regular expression
+# in the generated library. Easily hit with non-standard compiler flags
+RESTRICT="test"
+COMMON_DEPEND=">=dev-util/spirv-headers-1.5.4.2_pre20210526"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND=""
+BDEPEND="${PYTHON_DEPS}
+	${COMMON_DEPEND}"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		"-DSPIRV-Headers_SOURCE_DIR=/usr/"
+		"-DSPIRV_WERROR=OFF"
+		"-DSPIRV_TOOLS_BUILD_STATIC=OFF"
+		"-DBUILD_SHARED_LIBS=ON"
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-util/spirv-tools/spirv-tools-9999.ebuild b/dev-util/spirv-tools/spirv-tools-9999.ebuild
index 0f8c9646f36f..fa22fe6b2b6d 100644
--- a/dev-util/spirv-tools/spirv-tools-9999.ebuild
+++ b/dev-util/spirv-tools/spirv-tools-9999.ebuild
@@ -26,7 +26,7 @@ SLOT="0"
 # Tests fail upon finding symbols that do not match a regular expression
 # in the generated library. Easily hit with non-standard compiler flags
 RESTRICT="test"
-COMMON_DEPEND=">=dev-util/spirv-headers-1.5.4.2_pre20210327"
+COMMON_DEPEND=">=dev-util/spirv-headers-1.5.4.2_pre20210526"
 DEPEND="${COMMON_DEPEND}"
 RDEPEND=""
 BDEPEND="${PYTHON_DEPS}
diff --git a/dev-util/uftrace/Manifest b/dev-util/uftrace/Manifest
index 4feaabc1e235..9c830c414d9d 100644
--- a/dev-util/uftrace/Manifest
+++ b/dev-util/uftrace/Manifest
@@ -1,4 +1,3 @@
-DIST uftrace-0.9.4.tar.gz 1068091 BLAKE2B cbf9ead0e2c0e8d59be379e65617cfa310fd4134cfbbc8091c489913f108e8a7a0b81e33d46032f3717a5bb8127cbeeeb246e3be0c37da03981dac4bacc07119 SHA512 f73ad4461051b9c61668161e077897d118ac556d234ff204e32bf14ecdc2c0df148da30ea5d5054641e79ea20b29261d6f637908f5047f5669207ef244865358
-EBUILD uftrace-0.9.4-r100.ebuild 1137 BLAKE2B 78c1fe9945a099d538963d188ebf91f83018620659567b713a0c0b169ed7aa9c5687ae126d534b0d060f95c4f8897413baebff50acceea6b31f45060136bf815 SHA512 2a111b38989d73bfb15af823ad98417946200a71fa6851e22828d7fbc5ce4ff30157bb4908c41f993290e9b9e4a7558816bdc02eba45bb6737cc53e9a1ee7a7b
-EBUILD uftrace-0.9.4.ebuild 906 BLAKE2B 1dac005c9729ba654a2fb47bb9f62ea3133980bc13b15082a0f456ac11916e405eb68a0b82f2fb4aee8fb08195cc02036dd3a642be920e1d7815b26faef9c709 SHA512 6d2efb66d03e8f0aa828167d7803da3582e43e87c885ce5ed70d59b150d41b3db2206dc50358603f9ab98b418e6ef299d4d6b3161760ae24264f57723ed9ce31
+DIST uftrace-0.10.tar.gz 1111530 BLAKE2B 29388523e1009276ba4609d85e5979e823d028ff647239aa02ec2cac5ae21c7812c7699d47c09c0b9289a0debb39a2f502615547c8e658a821d5078e3b12c6fe SHA512 788234e4156974a70f06d02527e56e5fac821e8b66363dc5fc55d68797c374043c0b66b18b4ab1488b9647e08969e8dc94a64d6bb1a38ccad4cf98eaecc6e919
+EBUILD uftrace-0.10.ebuild 1240 BLAKE2B ba99f53ac6b6b7e05f827a7d19efc507c31a0adbb9a3891083e823bedf4f5c19be48423dc4f35a41870f736239264736562842f5b681d1df8f2f18e56171d1af SHA512 cda749f52dadbe3a501dabae3b9a9a777183312b8c014b20700dfd73afcf9d82cf2191f22ce41aa8f18e611d1bb0e9a9a6119e737f840809128aa7a00aa9def8
 MISC metadata.xml 438 BLAKE2B a270f82a149c32758b8d0054b5f1204add5dabd8812ce01e6c9ed9e0a71aa38bfef9def386f8a2c6f67cae59c63e58fbff8b3f00a3cea5a334ee41434f3c6fa1 SHA512 774d0ec195987c0b98467e03a18c1eb4e2880d5c5d63e3864b5aee84981e0539197d74530a64068399dac7c0eb28e7570a0b8242e0ecf049f79d995eab884a8d
diff --git a/dev-util/uftrace/uftrace-0.9.4-r100.ebuild b/dev-util/uftrace/uftrace-0.10.ebuild
index 87ccea5aec88..92c30228011d 100644
--- a/dev-util/uftrace/uftrace-0.9.4-r100.ebuild
+++ b/dev-util/uftrace/uftrace-0.10.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 LUA_COMPAT=( luajit )
 
-inherit bash-completion-r1 lua-single
+inherit bash-completion-r1 lua-single toolchain-funcs
 
 DESCRIPTION="Function (graph) tracer for user-space"
 HOMEPAGE="https://github.com/namhyung/uftrace"
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/namhyung/uftrace/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
 IUSE="bash-completion capstone lua"
 
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
@@ -35,6 +35,7 @@ src_prepare() {
 
 src_configure() {
 	local myconf=(
+		--libdir="${EPREFIX}"/usr/$(get_libdir)/uftrace
 		$(use_with capstone)
 		--without-libpython
 	)
@@ -47,7 +48,7 @@ src_configure() {
 			--without-libluajit
 		)
 	fi
-	econf "${myconf[@]}"
+	CC=$(tc-getCC) LD=$(tc-getLD) econf "${myconf[@]}"
 }
 
 src_compile() {
diff --git a/dev-util/uftrace/uftrace-0.9.4.ebuild b/dev-util/uftrace/uftrace-0.9.4.ebuild
deleted file mode 100644
index 51506dbff692..000000000000
--- a/dev-util/uftrace/uftrace-0.9.4.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1
-
-DESCRIPTION="Function (graph) tracer for user-space"
-HOMEPAGE="https://github.com/namhyung/uftrace"
-SRC_URI="https://github.com/namhyung/uftrace/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="bash-completion capstone luajit"
-
-RESTRICT="test"
-
-RDEPEND="
-	sys-libs/ncurses:=
-	virtual/libelf:=
-	capstone? ( dev-libs/capstone:0= )
-	luajit? ( dev-lang/luajit )
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	sed -i -e "s/ARCH/MYARCH/g" -e "/ldconfig/d" -e "/bash.completion/d" Makefile || die
-}
-
-src_configure() {
-	econf \
-		$(use_with capstone) \
-		$(use_with luajit libluajit) \
-		--without-libpython
-}
-
-src_install() {
-	default
-	dodoc doc/*.{md,gif,png}
-	use bash-completion && newbashcomp misc/bash-completion.sh uftrace
-}
diff --git a/dev-util/vulkan-headers/Manifest b/dev-util/vulkan-headers/Manifest
index cea3f0e59266..7dc309d2d98f 100644
--- a/dev-util/vulkan-headers/Manifest
+++ b/dev-util/vulkan-headers/Manifest
@@ -1,6 +1,8 @@
 DIST vulkan-headers-1.2.162.tar.gz 852973 BLAKE2B 3907c247f115f4dee2fc8697f157aeb30a3ef91a774132591771c0b327090abf7c0caad2082edb86c787883c167ce1ffe75c199d9b94fc642aae30526f5311cd SHA512 7b33f6ef32f1ef34d3b37ad38b077a3a2ebcef62612371afa1b6f4910815bbab8418a837c49b3872b57d2e5012c15623521121f5d62836e46d6f20773841d7b0
 DIST vulkan-headers-1.2.170.tar.gz 890902 BLAKE2B a38fa355e1716940f2bd34b4ac7e90ef95bf85da13b19e6408b488051441c20f9618e044d72ca06e1906851bb54b3087e894d6aeeb786a8dd028885f08d485ba SHA512 458e69f34776eb032ef9024744b34083c2a5e3dd074d511a3076d6be61a03dbe1383e6588979e700099a13a6411a72eaba97df9f0968b0b98e85049bc62a1c73
+DIST vulkan-headers-1.2.179.tar.gz 1048047 BLAKE2B 7ffdbc12e9bd3f1f37598620c03989a7e70d98af8c42c660ab52478857fbe32a215ca1fba2b43ff25fe1c61f4c09d439ab353d6ba2a4044894219eee4e9cc981 SHA512 c82ae0de40c19db97c385fe3012beb6018f57d96f8bfa5829c77416730fdbffdb03aaaa96710a3a52d3b3e03d86a5089383f504a86d7cb3fa7ee61077dad3ee7
 EBUILD vulkan-headers-1.2.162.ebuild 611 BLAKE2B a0dc00cde81752730cd13704bd71f06943f2a523306bb250ec4043c2cbbb7fccf9a9ab4e90ca7bb6811852f9b866940a7722e623dea0d36abff1d7001d8ffe40 SHA512 e08e859280da3384fc8248b255333b8e781e4a6d57c3cf8952b37f905bc78b5ca8df25bae6d79f39ca52bf21f1e11786bd2b60d0d70cb7a6b93eb66cb49e0b7c
 EBUILD vulkan-headers-1.2.170.ebuild 611 BLAKE2B a0dc00cde81752730cd13704bd71f06943f2a523306bb250ec4043c2cbbb7fccf9a9ab4e90ca7bb6811852f9b866940a7722e623dea0d36abff1d7001d8ffe40 SHA512 e08e859280da3384fc8248b255333b8e781e4a6d57c3cf8952b37f905bc78b5ca8df25bae6d79f39ca52bf21f1e11786bd2b60d0d70cb7a6b93eb66cb49e0b7c
+EBUILD vulkan-headers-1.2.179.ebuild 617 BLAKE2B de17fc55658dff792497262a77db71dbc9a360c6a35497522a7681452bf52398f90435bf6738477f09fa4cc1fcf96c3785ed6b222d9d7a5bb4ff257778dc63eb SHA512 9396dd22eee89217748990fcd336163561244de835947edc5ab6028b63ab16666c9ce28fb737563d572891de036bf3b435b68f6a89191bd2f97b12575af1b80e
 EBUILD vulkan-headers-9999.ebuild 593 BLAKE2B 101dc4954cc61f0375202d2398a3bab6e99e379f9dbc3aaab01129670e0413cba3fc9d15f031a44f634ec7576f0cd6bbd52ccfdbec0de9d703f6db5a9a2eff52 SHA512 a95238b09e9d71d72588e9e90af0d99590a8d4fffb6b134cc75c5b9bfc542c40f7a438447ce06aaf4a5ea5922d9ce49763af91b49934c8f66fc5dbb1d7ea8246
 MISC metadata.xml 431 BLAKE2B 69dedef8b74edc3fa3b45eb8af40784b585f84007d205c4db52c3d05abccb20e7c078708f3bcedcc8dac268eced84c03b0bf92cd836ee7a9f2dda01b1c87a65d SHA512 88631011f2fc130495c8a9feeb24691389bfac96a8db4b1bc4b5503e354f0fa882a516ba1af7bcf72d7604c8974ab72a2189c8cd7feddefaaaada54cb405898d
diff --git a/dev-util/vulkan-headers/vulkan-headers-1.2.179.ebuild b/dev-util/vulkan-headers/vulkan-headers-1.2.179.ebuild
new file mode 100644
index 000000000000..9eea670b13dc
--- /dev/null
+++ b/dev-util/vulkan-headers/vulkan-headers-1.2.179.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN=Vulkan-Headers
+inherit cmake
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+	S="${WORKDIR}"/${MY_PN}-${PV}
+fi
+
+DESCRIPTION="Vulkan Header files and API registry"
+HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Headers"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+BDEPEND=">=dev-util/cmake-3.10.2"
diff --git a/dev-util/vulkan-tools/Manifest b/dev-util/vulkan-tools/Manifest
index 2eea7cb830c9..52d2eb59112e 100644
--- a/dev-util/vulkan-tools/Manifest
+++ b/dev-util/vulkan-tools/Manifest
@@ -1,6 +1,8 @@
 DIST vulkan-tools-1.2.162.tar.gz 724232 BLAKE2B 16eb2dde35883fb2c7c263a72a615818ff8e1557ac9d74553ec3784d96a827e6900efa4e42218cb9081f7501d9b1a53eac82c360c2d20922043308515ab48983 SHA512 7827f6775dfb26820a2a2cbc60e7da8c7e7bdcb57b65523fbc6b2e989ae6869b04a57ae458c72715722c67d842660574697834c92f9b909dd5673da1945ac6dc
 DIST vulkan-tools-1.2.170.tar.gz 835063 BLAKE2B 5b7b9c9ea07b3a25d2b989a0981417b4a1c4f97d03fc9f1ab765ac2ade3bd33e99657813a3cb6b3290559539cd9dca3d6992cacf848c0ea9eee536eeef99553f SHA512 0cc361c1a7cecf74dab25e6a4bead7870a0cf363b07a6e5fbd6fa245027fb8e4f2b651affda095fadad90e114507c4f80370c2fcb4e6b9cbc013eac8a67d2d6b
+DIST vulkan-tools-1.2.179.tar.gz 843725 BLAKE2B 0304f7672b5405404dca9b9800dd0927f3af0f17580f021bc30e651ecda5b5e6194971a6a95e30cce956d094cc8fbab580f0f0ecd8fa4c81a9bc15ced5ad92ac SHA512 227b5023c21720c94fb5583f0f6635cf2b9d8067cae02dc6f22f39a106bc0b3e569b2730a1dc4fd469fe0a5e5653167fdc56fe37852a1acfc38df953b4524dcc
 EBUILD vulkan-tools-1.2.162.ebuild 1881 BLAKE2B 4c9129b5619a374830b27c7d425f2c119e1613a667c9d901101cdf0a59ae5c9c70d340e5fdf885b1b84901df01f152b03a4e687d1674d9d8ad65620fdb30a386 SHA512 ec5501ccda226135f0b33c818c6c5fe1fd33325d3bb01586775a55d6236e1d5aec3bac9c87cc309f88a648df0754bfaae310cfd92e4a818c4bd8024d3c46e3b1
 EBUILD vulkan-tools-1.2.170.ebuild 1881 BLAKE2B 4c9129b5619a374830b27c7d425f2c119e1613a667c9d901101cdf0a59ae5c9c70d340e5fdf885b1b84901df01f152b03a4e687d1674d9d8ad65620fdb30a386 SHA512 ec5501ccda226135f0b33c818c6c5fe1fd33325d3bb01586775a55d6236e1d5aec3bac9c87cc309f88a648df0754bfaae310cfd92e4a818c4bd8024d3c46e3b1
+EBUILD vulkan-tools-1.2.179.ebuild 1881 BLAKE2B 252abfa8852cd7bc645b42ce55f0504729a3de0e3a1a39b2b816d35a0c990f979b00d852cee77223a37424f053db992d4d2a41ab325c3bf52f6da1ec05673d16 SHA512 4f64a3978ddc6a8f0984bcecb0aaa79eb410c11fe6741c80f5c712a8defbac80374ef4f183021f478de659094842ea93d6ccb3c4ce77978cdcbce601221284ea
 EBUILD vulkan-tools-9999.ebuild 1886 BLAKE2B 2afef23e4399f9547e7fd691ec1050473993ca0decefa62e56a1d5499663bc5071aaa680d0a743a4776993997c0adc5bc92587ad24dc0cce3ffa6c325a86b35c SHA512 1769b436f7e1a8d4c4c22a7f99d1c2884db790b0f15dcdd8dc4e7cb144796654c48cfa6a75ff413653a5a2bf974c142c7a1dc0e81804fd7968e8d7a78bf5fb39
 MISC metadata.xml 499 BLAKE2B 9ede9725de281e0877f865e41ce68be15d5c04fd95023d3ab1180f4987c506a8f12ad23412ecf5795f6f8e6f36e576bc65f7cef786ced70296f5a4a8584ac4f1 SHA512 eb5dbcfbb58449c5a6ae7580f0c8a25c06f85fd6ac32fe1354fffe550214465921dace3c05264c11517d7dbeeffa444eb468d63f4781c6383f4be8a4202ecefd
diff --git a/dev-util/vulkan-tools/vulkan-tools-1.2.179.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.2.179.ebuild
new file mode 100644
index 000000000000..14d7bb81d120
--- /dev/null
+++ b/dev-util/vulkan-tools/vulkan-tools-1.2.179.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN=Vulkan-Tools
+CMAKE_ECLASS="cmake"
+PYTHON_COMPAT=( python3_{7,8,9} )
+inherit cmake-multilib python-any-r1
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
+	EGIT_SUBMODULES=()
+	inherit git-r3
+else
+	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+	S="${WORKDIR}"/${MY_PN}-${PV}
+fi
+
+DESCRIPTION="Official Vulkan Tools and Utilities for Windows, Linux, Android, and MacOS"
+HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Tools"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="cube wayland +X"
+
+# Cube demo only supports one window system at a time
+REQUIRED_USE="!cube? ( || ( X wayland ) ) cube? ( ^^ ( X wayland ) )"
+
+BDEPEND="${PYTHON_DEPS}
+	>=dev-util/cmake-3.10.2
+	cube? ( dev-util/glslang:=[${MULTILIB_USEDEP}] )
+"
+RDEPEND="
+	>=media-libs/vulkan-loader-${PV}:=[${MULTILIB_USEDEP},wayland?,X?]
+	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
+	X? (
+		x11-libs/libX11:=[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}
+	>=dev-util/vulkan-headers-${PV}
+"
+
+pkg_setup() {
+	MULTILIB_CHOST_TOOLS=(
+		/usr/bin/vulkaninfo
+	)
+
+	use cube && MULTILIB_CHOST_TOOLS+=(
+		/usr/bin/vkcube
+		/usr/bin/vkcubepp
+	)
+
+	python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=ON
+		-DBUILD_VULKANINFO=ON
+		-DBUILD_CUBE=$(usex cube)
+		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
+		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
+		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
+		-DVULKAN_HEADERS_INSTALL_DIR="${EPREFIX}/usr"
+	)
+
+	use cube && mycmakeargs+=(
+		-DGLSLANG_INSTALL_DIR="${EPREFIX}/usr"
+		-DCUBE_WSI_SELECTION=$(usex X XCB WAYLAND)
+	)
+
+	cmake_src_configure
+}
+
+multilib_src_install() {
+	cmake_src_install
+}
diff --git a/dev-util/xfce4-dev-tools/Manifest b/dev-util/xfce4-dev-tools/Manifest
index 4e671148bba9..88bf0b10649c 100644
--- a/dev-util/xfce4-dev-tools/Manifest
+++ b/dev-util/xfce4-dev-tools/Manifest
@@ -3,5 +3,5 @@ DIST xfce4-dev-tools-4.15.1.tar.bz2 340738 BLAKE2B 73c08f27011ce0d2144eaa1672209
 DIST xfce4-dev-tools-4.16.0.tar.bz2 340107 BLAKE2B 93919e1b705858770f5c98cab080ba86785d524dc7371f09fba065f2bdf549d9a3ada66cdef3e1bbd344fb62cecb70661a1b6ce8c8bb51ada0be9459604d4d4f SHA512 54d9b45535c174ab0d13a3061ba2ff247c788a1190a6622b0adb4242d12e1fe42715256a18168d42fd5e425bbc7e9e81de30aa507da04f3e8d9b6f1ae5a5a7a7
 EBUILD xfce4-dev-tools-4.14.0.ebuild 578 BLAKE2B ee9471d511f0f61bebc4458fafd29ec7c246ede52b393404d055058f8453149fb13a0c5e83504aa15465ac4549ec67a8bc693d59f44cb268e61ab313de3b0aac SHA512 de4981b2dd476a6582654f5bc09b3e6008d0f96b310737e0797c66bf3e469783a7dbef58445ff20d5e9d8ea02539d334e6c5047f78ecbb82290deab39a9aa83a
 EBUILD xfce4-dev-tools-4.15.1.ebuild 584 BLAKE2B 6b2f6fcd2f8ed91d4a09138a3ea90c1ecb1e5cf8236dc7e16bbf4889d0aabb9a08d822b7cca7b0888ee586837e41a5c055d71836cb2255ac82c99af875a58cf7 SHA512 35e950fba2c4de9b286afa8d9af5560c8c1ec72c8df70ab2fafc67015005bee23f5e7b59e79e8d631e668cb1ceb423106c4a1fddfdbd39e8e7741e6fb9fe1c9e
-EBUILD xfce4-dev-tools-4.16.0.ebuild 591 BLAKE2B 9b208fb824ef7271d880596777dfd65314bd92d1f6a9fe36c814bb913949c9d3f13df175dc16777dc2b9967061e1a19123e3e3e19f6437e7601d7bfc63ed4494 SHA512 c77ec296c274c6ae29d7bc30d92baf159e4e70ef04daed2f4fb987ea904eee83de7e9b1ebc8c2e3a89ed0877c346cddc68ef90ade654880218cc69ddda22200b
+EBUILD xfce4-dev-tools-4.16.0.ebuild 598 BLAKE2B 13b4bfa02960605265c996d8d2e1976c4e5dd645026ce5fe4c7812f12b5f63891d481b22b0e06cbbbc9290fb1178a85afd3e124d31a033c92827e63e4b3e1d56 SHA512 9a17075362771d9af7d4aafba81d9e5a2f61c8be4c595c46feedb96fe8b5f7bf185d310352bcd24fd6024b66e2f76f921c3d58c20e30041bfaf89089d2e91d0f
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.16.0.ebuild b/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.16.0.ebuild
index fc1acf35196a..f62529279ef5 100644
--- a/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.16.0.ebuild
+++ b/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.16.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
 IUSE=""
 
 RDEPEND="
author	V3n3RiX <venerix@redcorelinux.org>	2021-05-31 20:59:14 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-05-31 20:59:14 +0100
commit	e748ba9741f6540f4675c23e3e37b73e822c13a4 (patch)
tree	23dece8beabb3a3d7c6c0273b0eb40b21c62a889 /dev-util
parent	908778078736bd36f7a60a2d576d415cb8e000fa (diff)