gentoo resync : 12.03.2021

116 files changed, 844 insertions, 1067 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 0d40b8892ed4..5ac52c0e47a1 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/artifactory-bin/Manifest b/dev-util/artifactory-bin/Manifest
index 182d7a4e03b9..4544f8eae951 100644
--- a/dev-util/artifactory-bin/Manifest
+++ b/dev-util/artifactory-bin/Manifest
@@ -3,5 +3,5 @@ AUX confd 252 BLAKE2B 3c9999b9ee9ea39eda3f548bd0e0143d17e545de89efc7bf3a30aac163
 AUX initd-r3 5373 BLAKE2B feb7f637c644570225c589767753c27db59b10971ffe5f7886dc94c3002f3cc21bd88405fcf38ea2161f9efde0c2ea2dad67979713a1cd99fc78e790ff0bca93 SHA512 89ef20e27296318cf844130c09e17b16f63c27b3188e53400f8b1dcf170d0d6acfb5a56592eb8580b8fa1281c2fcaa7f2edc4cde43803eaf20ce345030ce3f98
 AUX server.xml 516 BLAKE2B 6ed7e14de91fc1f7a9da25c8caeae4bbc25b783d84a321e69bcc897e5ef68002fa39bece886522f1833d9d4352dfa8391ec1d8c90f0a816beefec70b6afb8a05 SHA512 2c16207cccf29a3733e9759b0eb20d62184de6f91feb8f49037501e62f77ca09aefcd7a95a1544441318ac6a3577a3c366fc12d490726268233658581a64b91c
 DIST artifactory-6.3.3.zip 98166641 BLAKE2B 33d760bc0f763ba0d8e091ce5484b3a90df4e57f291ea7a96a69bed13579c3c17af0005f95dbda847b2ab428d7dc36ddbee594d008f6e3badbb04e45c3b5dd89 SHA512 12f545d5e66b70e35d8b9967baadcfb503df7457bc48957a80b38d447cc9f024ce8f33b2463da65f5616161906bc64652fdd042446c5e8615e24ecc7f23a527b
-EBUILD artifactory-bin-6.3.3.ebuild 3333 BLAKE2B b4b2b3e09cc1f1c253895e37c1109b87b0042edf3ab8410210702ca538faff877521d6def8752c85fac81a16ad6d11d657c813c66565e584991b10976b2393f4 SHA512 66c34128ea8ba08e17dfb88adc0a5ab3520077b8cb4b7127763d68069be34fc126ba0fcda833b950a796ffba421a55a5d2ad1c035e17672e2c17a856824cb345
+EBUILD artifactory-bin-6.3.3-r1.ebuild 3391 BLAKE2B 93a74592f718a5501f801998064be4d0870ae8a7ab56334d06569d0c4fa72a8724efa95e250ea82128dcc85fb0a4429f2ad7f54c79be99467080040e343c503b SHA512 18d8443a1de98aec8f03d8c3d31f353b7a6ba17461bbe8bf99e2950ef7c0a4c8515fbcc6d1e993256891098a2bbdb01c9213ff2a51ae8bc49dfa21644eefc990
 MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
diff --git a/dev-util/artifactory-bin/artifactory-bin-6.3.3.ebuild b/dev-util/artifactory-bin/artifactory-bin-6.3.3-r1.ebuild
index b36f57e1e592..e7b28a6f0396 100644
--- a/dev-util/artifactory-bin/artifactory-bin-6.3.3.ebuild
+++ b/dev-util/artifactory-bin/artifactory-bin-6.3.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Using a binary ebuild until a source ebuild is doable.
@@ -10,7 +10,7 @@
 
 EAPI=6
 
-inherit user
+inherit systemd user
 
 MY_P="${P/-bin}"
 MY_PN="${PN/-bin}"
@@ -102,6 +102,8 @@ src_install() {
 	newconfd "${FILESDIR}/confd" ${MY_PN}
 	newinitd "${FILESDIR}/initd-r3" ${MY_PN}
 
+	systemd_dounit misc/service/artifactory.service
+
 	fowners -R artifactory:artifactory ${ARTIFACTORY_HOME}
 	fperms -R u+w ${TOMCAT_HOME}/work
 
diff --git a/dev-util/bazel/Manifest b/dev-util/bazel/Manifest
index 49266bfea0e7..1f54c4f8f83b 100644
--- a/dev-util/bazel/Manifest
+++ b/dev-util/bazel/Manifest
@@ -18,5 +18,5 @@ EBUILD bazel-1.2.0-r1.ebuild 2931 BLAKE2B ea152126f1c20d98aaeaa185b66c2894e3cd82
 EBUILD bazel-1.2.0.ebuild 2609 BLAKE2B fcbe18a014bbf3895bdb52600b84df9c644cd33f0ff7fcd9c92ecf026bd0d36a8168d9da135c51467939add01ba6c0f4b661509721a863100d2d46e87e04e279 SHA512 4d13e0dc6a26aec266de20b3fc6310713fd3c232c6e89364a5fd607f3d15f37b4bb6d9dc402a23030942c71c0df0a243799d1dc82e7d3dc841ba1af9f104d37a
 EBUILD bazel-1.2.1.ebuild 2937 BLAKE2B 5371d6b42699c1ba2a33dc9e43d85fb17f02b243da718ff2c0825ca661743f24a8fcf359d0bf3b94f3e47dfd71304226a695de81250effe8629675ea277f60e6 SHA512 8c1f625d496ae7815edce1e1920e01228203183796e72de9973fdd3d84e6be2583f0d0b85bac00163592e1532241a97c89e7218312f8b33bce686930bf30ca0d
 EBUILD bazel-2.0.0.ebuild 2609 BLAKE2B 51ea0ad4c8d1b5e7749f8a8717668a28f534595c4825a53a481973b9163128fd2b7b401528a8413b6e14364ea0823551d87e56d8af3db89efb0e606182d6fec2 SHA512 9c419f99adf78aa95199ba3cdca46f5ba8688dc201f04b47a7d3d097ba28ab062ef97c7912e2eb798a06e650bb90fac3e51d174f771f7253d9ccf7c84493e0f6
-EBUILD bazel-3.2.0.ebuild 2609 BLAKE2B 51ea0ad4c8d1b5e7749f8a8717668a28f534595c4825a53a481973b9163128fd2b7b401528a8413b6e14364ea0823551d87e56d8af3db89efb0e606182d6fec2 SHA512 9c419f99adf78aa95199ba3cdca46f5ba8688dc201f04b47a7d3d097ba28ab062ef97c7912e2eb798a06e650bb90fac3e51d174f771f7253d9ccf7c84493e0f6
-MISC metadata.xml 784 BLAKE2B 387004423ccbcb3b2e94cc7824e7a43067f5e455151ad3eaa06baded58ce05ef71203caf8d5a9d89c00046ac0545776bcc6c5a8306a9f76f8a9334b95a92b880 SHA512 188f8323fd19d294e8772391edb87b4a28827b40c42643d6af389f4b3e2d36bc3f0efe637cf572d80dd47a956bd2e51be1993aaf7d080bbfbb6ec4aac2e51ac6
+EBUILD bazel-3.2.0.ebuild 2784 BLAKE2B b394710520ac32d9bdeb16cd604f7c53e78105d1d8ed47dbe6be149462f3ae93218e6a0298e8a3cc80a1458b3c3edc12870c99dc221ea306f7e99317f2b3bf63 SHA512 64ec270f235daa79adfc01a3c1d953f958dec4d5cfb94a594703410bc073f2c392d373d1bb28af349692ae6e1196fdf67e2dd33c328d91ae5711e78e2c00bfb8
+MISC metadata.xml 844 BLAKE2B 116e8fc54c62a42b12997d7b9a0e2b77197f3730515735817e2bced51e3ac17779ca33050784b3299b4c0b7d6f03f4b924470b15c95641d81d2d2b4894d6bd3f SHA512 e835227aeee1f0fb66e8c6581544ec10dd5c030c8cb96fd6ac3f6298cd15e464c46c19b67564a3894cc97d947e263db66776934bb5a0665bdefc33199e5ecaaa
diff --git a/dev-util/bazel/bazel-3.2.0.ebuild b/dev-util/bazel/bazel-3.2.0.ebuild
index 8963929994ec..ac040b43670e 100644
--- a/dev-util/bazel/bazel-3.2.0.ebuild
+++ b/dev-util/bazel/bazel-3.2.0.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
@@ -13,7 +13,8 @@ SRC_URI="https://github.com/bazelbuild/bazel/releases/download/${PV}/${P}-dist.z
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="examples tools"
+IUSE="examples tools prefix static-libs"
+REQUIRED_USE="prefix? ( static-libs )"
 # strip corrupts the bazel binary
 # test fails with network-sandbox: An error occurred during the fetch of repository 'io_bazel_skydoc' (bug 690794)
 RESTRICT="strip test"
@@ -67,6 +68,9 @@ src_prepare() {
 
 src_compile() {
 	export EXTRA_BAZEL_ARGS="--jobs=$(makeopts_jobs) $(bazel-get-flags) --host_javabase=@local_jdk//:jdk"
+	if use static-libs; then
+		export BAZEL_LINKOPTS=-static-libs:-static-libgcc BAZEL_LINKLIBS=-l%:libstdc++.a:-lm
+	fi
 	VERBOSE=yes ./compile.sh || die
 
 	./scripts/generate_bash_completion.sh \
diff --git a/dev-util/bazel/metadata.xml b/dev-util/bazel/metadata.xml
index 7ddb1068e6a0..7eb6224be85d 100644
--- a/dev-util/bazel/metadata.xml
+++ b/dev-util/bazel/metadata.xml
@@ -19,5 +19,6 @@
 	</longdescription>
 	<use>
 		<flag name="tools">Install extra bazel tools to build from sources</flag>
+		<flag name="static-libs">Link libstdc++ statically</flag>
 	</use>
 </pkgmetadata>
diff --git a/dev-util/boost-build/Manifest b/dev-util/boost-build/Manifest
index 33bb2bb18bcd..a76df49c14a2 100644
--- a/dev-util/boost-build/Manifest
+++ b/dev-util/boost-build/Manifest
@@ -8,5 +8,5 @@ AUX site-config.jam 688 BLAKE2B e43a7ad1a94d113a7f890e8b634770f5c60556101d428d83
 DIST boost_1_74_0.tar.bz2 109600630 BLAKE2B 2982f64fccf6fdb3b4b74452e603f459242d7abb42df4162278d9b558b637786a2eb97442126967b19088d591777c64ced8f60a23e71eaa0b7545e80f800de63 SHA512 4ec9c1164ec9b95ce46ba1c073e586c94b3882dce5b7347ea14bbef0c1da230e12aa5328a501ce38cae1b1d7623daa3246325625899179b4cc309242540982a4
 DIST boost_1_75_0.tar.bz2 121849575 BLAKE2B ce7ecd8bcee518ce54f7e5302f202acbea60cedd6ae9248708c0bb5bbc2713607b2e1967a9e6f77cc20a4c008c1ee4db651def55937efc80407487a7a44fa8d6 SHA512 d86f060245e98dca5c7f3f831c98ea9ccbfa8310f20830dd913d9d4c939fbe7cb94accd35f1128e7c4faf6c27adb6f4bb54e5477a6bde983dfc7aa33c4eed03a
 EBUILD boost-build-1.74.0.ebuild 1950 BLAKE2B 203cdc780e0433226c2726fb8f3f56a324529da5763f49ef3baf024fc7dc50c7ac2ab87e16808579ecb774d67c025f8ab6450cc7e900758ba01487653be1e7cb SHA512 8cc336dbb2634d3d05cb998b79c13863481483cbc895b3df64b29f0f855a54f3a98c26dcd961142801f3c557016f68021ae0f0be92ddbd8db2c1eec0adba02dd
-EBUILD boost-build-1.75.0.ebuild 2055 BLAKE2B ace7af52c7cbc8ebfda8a3ad87e53a87efd571ec3665b11c832c99d47491dc0ddcb7a5dbce1392d4e4a43da2aed33854fa53b879f62c097fe002b9877a42dc89 SHA512 b2671495eb4c848917b9db87807cef0354af053a42d818cba7615eac5cd88840fa47ca7eb320263babf75fe6b01633912d5c78edb25d73d43130f927be0bba67
+EBUILD boost-build-1.75.0.ebuild 2048 BLAKE2B a100c9abf74b0c875df1640ab6e8337b0bd183a9e608cf507e06ded5d0710d1fa03451af9f4b90bf8d52babb96281ae9e934699889e6abfbcca38c149542165b SHA512 4faaa98a298c2f13fa673b3ebe568f8a908cad73606d596ca504957e4bc98f9e56ff1ca416a8f70cbd46eb5b16fe9f5ce61358ed1301db66cce6086cee6813c3
 MISC metadata.xml 329 BLAKE2B f492b1ba64c3f7bce1d3fb304bcff93357cc069dfd06b69c25cf26f4423ebea51ac4614a8d865635568f0e9db424a6904fc1edd5fa729243838e16e9887f4202 SHA512 57baf2d8e0a4c240d99f68ce122086a147d42145687b712609fdcd73b77fe3fdfecc1b078edb6a9c922213482fcc17c2fccb6762ec69890fbc9a912c4cb34827
diff --git a/dev-util/boost-build/boost-build-1.75.0.ebuild b/dev-util/boost-build/boost-build-1.75.0.ebuild
index 7c8a04b4304a..520a93f1a5b3 100644
--- a/dev-util/boost-build/boost-build-1.75.0.ebuild
+++ b/dev-util/boost-build/boost-build-1.75.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://dl.bintray.com/boostorg/release/${PV}/source/boost_${MY_PV}.tar
 
 LICENSE="Boost-1.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~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"
 
diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index 8947b34d9197..20671441fad0 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -4,5 +4,5 @@ DIST catalyst-3.0.17.tar.bz2 621403 BLAKE2B 210bc38d036e04282732179b37e018ac12ac
 EBUILD catalyst-3.0.14.ebuild 1912 BLAKE2B 27c3d0a80d66e313dda8a8d92a3a512c84c3aa90e0dd28662e664ad38bcd00f5106da46719d1043c94e6624b453043a1900614d3a4bf96a0798bb0b783ef2d0a SHA512 da9417964fe21622b491cff94d1bb8727a57d63e552ed6bb7acd442ffc2b939e8beb2d2a949218305e7887f06b3888387922d1c168748340dcaac46fc6159580
 EBUILD catalyst-3.0.15-r1.ebuild 1914 BLAKE2B 510bc167e8820cd7994a4b4607e05287b1f1226a071b9afa5e8c1217fc2034241a278b468e8926ea275763c94023a209dc6854ff3bd50c2a11521126113b4867 SHA512 c8612722e76c190bcf8a241af1480fa24782f1035989e1ac2f93ba8416a0dbec8bda034102ceef1117a18bcdf7fc5dcd173867ad2aacdd983a0d32aa14c49060
 EBUILD catalyst-3.0.17.ebuild 1914 BLAKE2B 510bc167e8820cd7994a4b4607e05287b1f1226a071b9afa5e8c1217fc2034241a278b468e8926ea275763c94023a209dc6854ff3bd50c2a11521126113b4867 SHA512 c8612722e76c190bcf8a241af1480fa24782f1035989e1ac2f93ba8416a0dbec8bda034102ceef1117a18bcdf7fc5dcd173867ad2aacdd983a0d32aa14c49060
-EBUILD catalyst-9999.ebuild 2324 BLAKE2B c32b5b5df4034b11e0c38c04aba755af3608500c07eccb866c9e147d52a533ccdd0b79596429be8077dff69d3fb637246b621bc676459a42a29f4af35d5df767 SHA512 11b29d6629f5c33546aa41a72b541a9efb99ef42c00bc6603f736e5ac5d70f23964678abf8103fb095ab07d695eab6ff008bf3d8c1c28c1781408a152f8a2082
+EBUILD catalyst-9999.ebuild 2329 BLAKE2B 8e2a65b323b3d92bd6ef56b8709a5a53c1b55e256220a90e2a31f0894c282ae02c31a9d84185f05b9abe25327e709176c8ce8122d230daf67f70e3d01b8cea55 SHA512 8cdc46a40ba2d98b2e13c036da72b8997d377c8c7850d51a761c774c65b6893e020d4580a4e40886556d871060b6ade72887d1f1f2b8155dcd14a773efeb2add
 MISC metadata.xml 512 BLAKE2B 27e0e3638c330c780f163608e5e62b71ed636a2e26291f97465c4506ae1b99345d081046bcab70b1bf56e36c5b9a6b8220b94da8433f2b313235c784ad6b9b5f SHA512 7d6683e83df2d311f3210af91880486ede8f7ddea57044e765f29694eb3e1b8df6f3d22c9a729c480ae9d49ebe3778cfe7a6509365f59eaae34f8438afe97afd
diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index f72a52d76d0d..49b1882354c5 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.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
@@ -12,7 +12,7 @@ else
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
-PYTHON_COMPAT=( python3_8 )
+PYTHON_COMPAT=( python3_{8..9} )
 DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1 linux-info optfeature ${SRC_ECLASS}
diff --git a/dev-util/checkbashisms/Manifest b/dev-util/checkbashisms/Manifest
index 529e4bcb8f9a..84bfd96868ef 100644
--- a/dev-util/checkbashisms/Manifest
+++ b/dev-util/checkbashisms/Manifest
@@ -1,14 +1,5 @@
-AUX checkbashisms-2.18.6-command-vV.patch 1155 BLAKE2B a9255aab4b358c09a211c06bc1f2357c9eb653a1d05b18f9be87e7bca47c251dd2ed9a841fd4d5e46fbf82632e2fed50d86f5e2de8a4edbe09a6e0c819e9dc7f SHA512 91f002981b918e35fff1ca9cb30a5b3f5a56f392d0222a3cce3ee1215bce529e58ff938c049e6823975825f8ebfc2d0da583fe1c360ad849b1a306aa09ef013f
-DIST devscripts_2.19.7.tar.xz 847488 BLAKE2B b3c76d9b0899c01f08d0432f8de0a65d1434afffd35eda33b6c7f442796c2165cdb316290d41313876cd5ef8108e0bba03d173dd52c139908672a6f3d6902588 SHA512 6e31862bc8f0d43678341f40ec527d76cdccc2e6e50c231eb7c6a1eb442f48b6c62e94126644224e9fdbef583be3166e2c7cc65ea15de4a7c20605089b708eb7
-DIST devscripts_2.20.1.tar.xz 854932 BLAKE2B b9523b2882625b66c7972db7c10f7d3f6055cb791b5697f92fc0e362c1b2a89ac26fc2a45739989ae9f9981c956d90ceefd514645649d1b7fca6d7eeaff9df7d SHA512 6e9505f491bf87df6c0ac384cbf307959fd86e3aea1aecd7e70e88bbe57757035612235bad0244dc7aeedcf964605508f7fd5db582b410dd715380a064389d1d
-DIST devscripts_2.20.2.tar.xz 854948 BLAKE2B ca36f2d8d4f3d975479134d02ee4c035f7f32e087be523560c2c06d7625047fcf78d0428d1e4addcfa38a299befdd23b88ab3fbbef2028f67f8b7c9f8851c29f SHA512 d9147604a718582a19c036a040c62612427163146048dbf9e3665545072e8132d08f51dccfd3f0a01453c0405a0326dad8f83afd10270eec5c69fa0612cb8510
-DIST devscripts_2.20.3.tar.xz 859612 BLAKE2B 074905e621234c60e26a014831a021b51f5f8fbdac4d6fa3a17aa98f994b4c171404a2326f5b00565f365469b41f1c7e5f03b6efa29f809b51bbabde209cafc2 SHA512 6d86deeecff82fc16df7d978678f5b88293164688078bf0732a7e6b844cf8845868be31c107518cf43b8dbcbadcd12a9691585f5725abd397f63ff9456fbdd8f
-DIST devscripts_2.20.4.tar.xz 860604 BLAKE2B 05c486ed024964ec03f9e5396e739389010a2c51a4d01be14b4959aa86bd09ca426bbfbfa7657c87e54aec8497fbfc90064073310fb1af916b32142ff63d3137 SHA512 49e9ae38ca3682f399a17f2108a7ee15198dc955d8c7c4c1b043456c19cb35b47b6116de9a2cfaccbdd7560e79426ca0953674e5a89ac226d21af2c1cf847e5c
 DIST devscripts_2.20.5.tar.xz 881976 BLAKE2B 3d4079d3268b3b9bfacdd0a4afcfee5390bdbf4660038306611d9c24e7b5c6453eff5f24d938c9764a17336475cd60615919adaa11dcf47495d930cd4b3b4e09 SHA512 fbd372a62758e3d2872f37bfd93d9b169d0cc745719057078378949c4d01b4fb27830ae501fe45b06b30a869e8afc853d8477419bb2f46d7fd62749f54981ec0
-EBUILD checkbashisms-2.19.7.ebuild 842 BLAKE2B be6ec30a86a521baba5ffea3003dd5e77973c71b83409d91448638c8a33de24f1e4ac5daf00dc215f124c8c3628868f735f3ee41f4d59054f899b18d3a49c8d4 SHA512 39a3a939f89146e7c1f673f7123ace5580b2f9ef31b254a3174f4ad9911a6bc46293bad1850e872f05d4ed798e16530fbbc0059b8b5279086c35a6a2d443d6a2
-EBUILD checkbashisms-2.20.1.ebuild 844 BLAKE2B 32ae094871d3c8854b76228ff850385b7ad6ef8acc540adf30daec20890014ff3ce9c28ff60a36172293b9349b765bf8a88f98e36cc064282862e5ccca5d78bd SHA512 69ae2da6c4f081fc81fe7a216f0d3f852a68ceb6ff54c2041130008bdc9cd1ba7cfe639cf4cf15f867dc024507d8a57f92a9d126bd3e7caf754f2e55564e717a
-EBUILD checkbashisms-2.20.2.ebuild 844 BLAKE2B 32ae094871d3c8854b76228ff850385b7ad6ef8acc540adf30daec20890014ff3ce9c28ff60a36172293b9349b765bf8a88f98e36cc064282862e5ccca5d78bd SHA512 69ae2da6c4f081fc81fe7a216f0d3f852a68ceb6ff54c2041130008bdc9cd1ba7cfe639cf4cf15f867dc024507d8a57f92a9d126bd3e7caf754f2e55564e717a
-EBUILD checkbashisms-2.20.3.ebuild 787 BLAKE2B 6bda04ce6fdbdbade2d28bef48d153adb73aa5f385b6cbcbe83966240cbfb2576372d0fa1ba7acd2c977376129ab8b1c9d4691c0882467f96d949fcae1842fad SHA512 67e1df0ec01650605b34329d075db5fe3489cd6f6b9907f52f17583727d86e2aa743f4fc123328207194f8259e220a4caaa6ec7dbbabec58fb4965ce4becf251
-EBUILD checkbashisms-2.20.4.ebuild 785 BLAKE2B d0a5bf4112c10c3b46ae63320bcc6a5503bf07215353d5ef5dcd86a30b5028418cbb94b48e79f3846a664ec8a65a7075193c8a2ec52d9b699557709cdc982ce1 SHA512 d112b95caa864ae6faa7d09f3f13d8f758ad6603d19abc1882926de0d132eadde4f28033b773b53289cb5246616b6bee7e53dae5a359edba7ce31d0e1cc22ee9
-EBUILD checkbashisms-2.20.5.ebuild 787 BLAKE2B 6bda04ce6fdbdbade2d28bef48d153adb73aa5f385b6cbcbe83966240cbfb2576372d0fa1ba7acd2c977376129ab8b1c9d4691c0882467f96d949fcae1842fad SHA512 67e1df0ec01650605b34329d075db5fe3489cd6f6b9907f52f17583727d86e2aa743f4fc123328207194f8259e220a4caaa6ec7dbbabec58fb4965ce4becf251
+DIST devscripts_2.21.1.tar.xz 887812 BLAKE2B 3eac4adfe1dfc85ffcc5b9f30ec29377f253596c2377bb81456c20848aae7376fce6b24c5c9b75d284ca7f46251db13e3ff89d1efc1f312229d93883b09d07df SHA512 5bcdd1cc8138e2e1aab2efd948cc104aee138b64e93059e929d8365afe1a1a92fac88586186ab53294d17104c661f2e29102bdcdd55f1b73d24be287615207ad
+EBUILD checkbashisms-2.20.5.ebuild 785 BLAKE2B d0a5bf4112c10c3b46ae63320bcc6a5503bf07215353d5ef5dcd86a30b5028418cbb94b48e79f3846a664ec8a65a7075193c8a2ec52d9b699557709cdc982ce1 SHA512 d112b95caa864ae6faa7d09f3f13d8f758ad6603d19abc1882926de0d132eadde4f28033b773b53289cb5246616b6bee7e53dae5a359edba7ce31d0e1cc22ee9
+EBUILD checkbashisms-2.21.1.ebuild 787 BLAKE2B 114c5210a05e634ac2ebffb2c8e7ab771602a1475fba145a0cfa3fe988ef043880aad9aa613ae44a72cafc62e9af03ff928865b3c546425e3a80a166dadca0e1 SHA512 495d4336148137abd41f7d46b038d79d1e563993600616c812e46e77d4b00ac3b1bbda90d0c72bd01db307c835180899bc604edc87b7ab4b59ee1538374a3a7b
 MISC metadata.xml 433 BLAKE2B b54d1290789d3ce8931f832c8c1ca7a56fbdebe85c0a81c32a929168fdf2d5a7be0dea01881e8fcc583061db1a071d1787723c9342c77a5862e228f0203c178b SHA512 945c3b95a61d4219e98ce5be3aed255cb148867409aca572714e8679bf623ee0c3396966cd80d783ace60bae7e6c01b85fad6c7f7ac9056422d732ed07f54716
diff --git a/dev-util/checkbashisms/checkbashisms-2.19.7.ebuild b/dev-util/checkbashisms/checkbashisms-2.19.7.ebuild
deleted file mode 100644
index 31676455d318..000000000000
--- a/dev-util/checkbashisms/checkbashisms-2.19.7.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="devscripts"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Perl script to check for commonly used bash features not defined by POSIX"
-HOMEPAGE="https://packages.debian.org/devscripts https://salsa.debian.org/debian/devscripts"
-SRC_URI="mirror://debian/pool/main/d/${MY_PN}/${MY_P/-/_}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-# Requires python packages to check tools we don't need anyway
-RESTRICT="test"
-
-RDEPEND="dev-lang/perl
-	virtual/perl-Getopt-Long"
-
-S="${WORKDIR}/${MY_P}/scripts"
-
-src_prepare() {
-	default
-
-	eapply -p2 "${FILESDIR}"/${PN}-2.18.6-command-vV.patch
-
-	sed "s@###VERSION###@${PV}@" -i checkbashisms.pl || die
-}
-
-src_compile() { :; }
-
-src_install() {
-	newbin ${PN}.pl ${PN}
-	doman ${PN}.1
-}
diff --git a/dev-util/checkbashisms/checkbashisms-2.20.1.ebuild b/dev-util/checkbashisms/checkbashisms-2.20.1.ebuild
deleted file mode 100644
index f81681c580e3..000000000000
--- a/dev-util/checkbashisms/checkbashisms-2.20.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="devscripts"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Perl script to check for commonly used bash features not defined by POSIX"
-HOMEPAGE="https://packages.debian.org/devscripts https://salsa.debian.org/debian/devscripts"
-SRC_URI="mirror://debian/pool/main/d/${MY_PN}/${MY_P/-/_}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# Requires python packages to check tools we don't need anyway
-RESTRICT="test"
-
-RDEPEND="dev-lang/perl
-	virtual/perl-Getopt-Long"
-
-S="${WORKDIR}/${MY_P}/scripts"
-
-src_prepare() {
-	default
-
-	eapply -p2 "${FILESDIR}"/${PN}-2.18.6-command-vV.patch
-
-	sed "s@###VERSION###@${PV}@" -i checkbashisms.pl || die
-}
-
-src_compile() { :; }
-
-src_install() {
-	newbin ${PN}.pl ${PN}
-	doman ${PN}.1
-}
diff --git a/dev-util/checkbashisms/checkbashisms-2.20.2.ebuild b/dev-util/checkbashisms/checkbashisms-2.20.2.ebuild
deleted file mode 100644
index f81681c580e3..000000000000
--- a/dev-util/checkbashisms/checkbashisms-2.20.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="devscripts"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Perl script to check for commonly used bash features not defined by POSIX"
-HOMEPAGE="https://packages.debian.org/devscripts https://salsa.debian.org/debian/devscripts"
-SRC_URI="mirror://debian/pool/main/d/${MY_PN}/${MY_P/-/_}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# Requires python packages to check tools we don't need anyway
-RESTRICT="test"
-
-RDEPEND="dev-lang/perl
-	virtual/perl-Getopt-Long"
-
-S="${WORKDIR}/${MY_P}/scripts"
-
-src_prepare() {
-	default
-
-	eapply -p2 "${FILESDIR}"/${PN}-2.18.6-command-vV.patch
-
-	sed "s@###VERSION###@${PV}@" -i checkbashisms.pl || die
-}
-
-src_compile() { :; }
-
-src_install() {
-	newbin ${PN}.pl ${PN}
-	doman ${PN}.1
-}
diff --git a/dev-util/checkbashisms/checkbashisms-2.20.3.ebuild b/dev-util/checkbashisms/checkbashisms-2.20.3.ebuild
deleted file mode 100644
index 1d567b48dc59..000000000000
--- a/dev-util/checkbashisms/checkbashisms-2.20.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="devscripts"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Perl script to check for commonly used bash features not defined by POSIX"
-HOMEPAGE="https://packages.debian.org/devscripts https://salsa.debian.org/debian/devscripts"
-SRC_URI="mirror://debian/pool/main/d/${MY_PN}/${MY_P/-/_}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# Requires python packages to check tools we don't need anyway
-RESTRICT="test"
-
-RDEPEND="dev-lang/perl
-	virtual/perl-Getopt-Long"
-
-S="${WORKDIR}/${MY_P}/scripts"
-
-src_prepare() {
-	default
-
-	sed "s@###VERSION###@${PV}@" -i checkbashisms.pl || die
-}
-
-src_compile() { :; }
-
-src_install() {
-	newbin ${PN}.pl ${PN}
-	doman ${PN}.1
-}
diff --git a/dev-util/checkbashisms/checkbashisms-2.20.5.ebuild b/dev-util/checkbashisms/checkbashisms-2.20.5.ebuild
index 1d567b48dc59..a2183decd385 100644
--- a/dev-util/checkbashisms/checkbashisms-2.20.5.ebuild
+++ b/dev-util/checkbashisms/checkbashisms-2.20.5.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
@@ -12,7 +12,7 @@ SRC_URI="mirror://debian/pool/main/d/${MY_PN}/${MY_P/-/_}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 # Requires python packages to check tools we don't need anyway
diff --git a/dev-util/checkbashisms/checkbashisms-2.20.4.ebuild b/dev-util/checkbashisms/checkbashisms-2.21.1.ebuild
index a2183decd385..f10c85c3af96 100644
--- a/dev-util/checkbashisms/checkbashisms-2.20.4.ebuild
+++ b/dev-util/checkbashisms/checkbashisms-2.21.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://debian/pool/main/d/${MY_PN}/${MY_P/-/_}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 # Requires python packages to check tools we don't need anyway
diff --git a/dev-util/checkbashisms/files/checkbashisms-2.18.6-command-vV.patch b/dev-util/checkbashisms/files/checkbashisms-2.18.6-command-vV.patch
deleted file mode 100644
index 44455e3097b0..000000000000
--- a/dev-util/checkbashisms/files/checkbashisms-2.18.6-command-vV.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-https://bugs.debian.org/733511
-
-From 9c2109e0d16473a7e80961558b112f8071aa5877 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Tue, 9 Oct 2018 14:23:27 +0200
-Subject: [PATCH] checkbashisms: allow `command` to use -v/-V
-
-POSIX permits the -v/-V options:
-http://pubs.opengroup.org/onlinepubs/9699919799/utilities/command.html
-command [-p][-v|-V] command_name
----
- scripts/checkbashisms.pl | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/scripts/checkbashisms.pl b/scripts/checkbashisms.pl
-index 3044634a..60005cd4 100755
---- a/scripts/checkbashisms.pl
-+++ b/scripts/checkbashisms.pl
-@@ -699,7 +699,7 @@ qr'(?:^|\s)(?<func>function\s)?\s*(?:[^<>\(\)\[\]\{\};|\s]*[^<>\(\)\[\]\{\};|\s\
-         $LEADIN . qr'jobs\s'   => q<jobs>,
-  #	$LEADIN . qr'jobs\s+-[^lp]\s' =>  q<'jobs' with option other than -l or -p>,
-         $LEADIN
--          . qr'command\s+-[^p]\s' => q<'command' with option other than -p>,
-+          . qr'command\s+-[^pvV]\s' => q<'command' with option other than -p/-v/-V>,
-         $LEADIN
-           . qr'setvar\s' =>
-           q<setvar 'foo' 'bar' should be eval 'foo="'"$bar"'"'>,
--- 
-2.19.1
-
diff --git a/dev-util/clazy/Manifest b/dev-util/clazy/Manifest
index 0bcd49c8fe8d..c0be6c9a09dc 100644
--- a/dev-util/clazy/Manifest
+++ b/dev-util/clazy/Manifest
@@ -1,5 +1,3 @@
-DIST clazy-1.8.tar.xz 392328 BLAKE2B 9ece9d279b2bd7e4c15ad35d9943636a107abd47cf0ed0b20db305b1684610fb84c6f9c7f606f159f0b5a48b881506796f0addf12246f2e9929a08225fcc5c74 SHA512 c43a393721a5235ddcd653f9c322e0a215f86add3b1ce42f849677c108cd21209693c6e8f225171db88032c75596722109ee01bc53db4af90fe7652f27c1eba5
 DIST clazy-1.9.tar.xz 394856 BLAKE2B 641ca46a31475cf7bd03ba921e390cb2712362dc97b960a519e05c47049927f805d3ef6f1c756b96d3483e8f4b75e2dc41a2419a462ed2e45cbd08c88c07f933 SHA512 2e8bec44a027366263de23c50d14192e310fd38fa2b369afb21413da9cb78da9882b2153daf1784c4c9076cc62e2867b5211c75ff9a1eabcb583e405f20f5912
-EBUILD clazy-1.8.ebuild 1000 BLAKE2B 3c6589a1415df7b2fcf463e5c3d396e49b17b583eb4bc756302a9f008f8167f3012634b0bffccc2822532765970409bd6123715d4c36d17614fbedcdbfca35d1 SHA512 764551bdfaef64651d399ea681dc6330aacf0ac425ecc18118f9f820dcfeaafc86c85fb11744f6ab53fee6c58975c448abfcca8c5163dfda48a01d6b11c8e270
-EBUILD clazy-1.9.ebuild 988 BLAKE2B 6e2e73e25b1c45cdb160727183090c573a510d6a265b17d7c17cc35777d9e5ce17773685f33fa3ab5d782471e9fcb602411e38c2493b3ce696ac469f7afd028a SHA512 d93541655d4a0b9850070ef05fc5cd1f0b9bacb38fca1330ae60db9ab5825d7f52bc8fd7cf76c02317ea93a8cf3ad6f7914ad2d915c0c2ff62c1ff49afca8f34
+EBUILD clazy-1.9.ebuild 985 BLAKE2B 7a16ad813d4ccd87ff16bd9d09654fd8721f9120a997eaf1d60ce6dfe021593e35dd3226cf20a1fbe7fb3956a9bde71b429f272be29cea2d2523021cee04ac3e SHA512 a28a5dcb386604a2cc23e7fbbf928ad559446bc2b7895deb80b3140dc1d12d3b45e03b98f78601fdca4474877e165255cf525c0d1dd0858c66f3909e10319f4e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-util/clazy/clazy-1.8.ebuild b/dev-util/clazy/clazy-1.8.ebuild
deleted file mode 100644
index 9cba0ac13609..000000000000
--- a/dev-util/clazy/clazy-1.8.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Compiler plugin which allows clang to understand Qt semantics"
-HOMEPAGE="https://apps.kde.org/en/clazy"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-S="${WORKDIR}"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-RDEPEND="
-	>=sys-devel/clang-5.0:=
-	>=sys-devel/llvm-5.0:=
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	cmake_src_prepare
-
-	sed -e '/install(FILES README.md COPYING-LGPL2.txt checks.json DESTINATION/d' \
-		-i CMakeLists.txt || die
-}
-
-src_configure() {
-	# this package requires both llvm and clang of the same version.
-	# clang pulls in the equivalent llvm version, but not vice versa.
-	# so, we must find llvm based on the installed clang version.
-	# bug #681568
-	local clang_version=$(best_version "sys-devel/clang")
-	export LLVM_ROOT="/usr/lib/llvm/$(ver_cut 1 ${clang_version##sys-devel/clang-})"
-	cmake_src_configure
-}
diff --git a/dev-util/clazy/clazy-1.9.ebuild b/dev-util/clazy/clazy-1.9.ebuild
index e9b6e64599a7..9062383103c4 100644
--- a/dev-util/clazy/clazy-1.9.ebuild
+++ b/dev-util/clazy/clazy-1.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index da22d3379cf4..255334b3e811 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -19,10 +19,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.5.tar.gz 9270284 BLAKE2B 4620f5f2a08e16a90350559e539a701606a0e8b4ee358ae5d1668c1f1d43674ac75a06ae335e52363fad9750bde430938faa2497108c2db6038479058412969a SHA512 de8645c7c03bd48987f6eefc19bc2856c2a939e537cf204e1c9749d5a3e21c71695080bee246e94871f82996ede9d1a8771972266434549b48df9924fbb4c6f2
 DIST cmake-3.19.6.tar.gz 9270931 BLAKE2B 5480ea3f3d159cd6471623ec73dfd73ab20ceb21744b2acc8bdbd27b8be7338e2ab8ae81366bbc3af474be49723567421450dfd6b7c51c65f36494c04fe13946 SHA512 556655c0fd17d5c70d5c1725f49ccad0d8088e6cbb3370d48d5a548d49d0e066d21c69978ed9b49d786fbb8eb79e086e719882245c9261c692b9457ba23b76f9
-DIST cmake-3.20.0-rc3.tar.gz 9429899 BLAKE2B 7cd0b377a564001c30f32d827f855950fb84f8d323e8b91621cae41c48a3a928abdb4663a499eccdb3b89980711ec569c8fbb4c3faacdd7522ec3fd4864c18a7 SHA512 0d789a5d3dac52b3966d61de9f24467e42d1617adad6a2aec0b906d250ce3d649ec30b5227993b569ec7ec6965c7e14782017f80058193ae892cabb8af344962
+DIST cmake-3.20.0-rc4.tar.gz 9427202 BLAKE2B dccf8c6815198acf44e8f6a6e0d080ec2ae6c13888c59a275ea2b010dc14ab4eca766a2a1e7cb26674ae67e7cb5a6700591845c945675dc2d87666624bef347e SHA512 967f0d56d5a7ce6cee3255852109cc9f121478a91a2ad387f26401e9024b3f36669ac9c393bfc20bbf06994668180fe12446936fdf5e7c2a095ee40972fa8f36
 EBUILD cmake-3.13.5.ebuild 6239 BLAKE2B 5e3b289af5d341e73fbdfe6162330e9e39dac40276991f08df670fcff6e40438995b608704e535545c4538cedb7ed789c2cc2ae0b38a1fd0f3a2e9627c95a494 SHA512 e75ea6defa00993410ed865329b450f38f9ad418c59bfe345880bae25d2f19e4463a407d744527d3f5c6c59fe8cf732cad5ac6274901cfcf3809d29573be7ad1
 EBUILD cmake-3.18.5.ebuild 6069 BLAKE2B 05856767d2ed7a4ba1f8c2fb38523b6e38f36da66866cf64ac2e6cc60c78aa8cd5dc8b9c3a19826e92c7c0343f9101901a401d1795a411bdbf245f3411a7e92f SHA512 f56fb725619b71f5451b5c5fa0a48e744c03ccd94213c85c965b7666b1cb14ec78eef6a4d9a21702299434a7f402077779b725d42c226b3eb5f5d3a8d2112e31
 EBUILD cmake-3.19.5.ebuild 6990 BLAKE2B f382eff3d258673c34e7642ec088f708281a6a65bed568b2094344fbd966eca22128dd93e382a88da16132291bd0f7c644362eaee0b34545c4d3df8ef512c832 SHA512 27af2c67d4a06e0cc3f0d86f003738a8def88a274dc3eda6da32de0b5f015a8e13f315ae93efbcec07cd9b95fc9f046786336f2a1b9ac9f5478610a440cb9964
 EBUILD cmake-3.19.6.ebuild 6990 BLAKE2B f382eff3d258673c34e7642ec088f708281a6a65bed568b2094344fbd966eca22128dd93e382a88da16132291bd0f7c644362eaee0b34545c4d3df8ef512c832 SHA512 27af2c67d4a06e0cc3f0d86f003738a8def88a274dc3eda6da32de0b5f015a8e13f315ae93efbcec07cd9b95fc9f046786336f2a1b9ac9f5478610a440cb9964
-EBUILD cmake-3.20.0_rc3.ebuild 6846 BLAKE2B 563f68ac5e2ef974604ae3c130b6e049f180340d54e48fef71b779bbb85cf132741f50fc6b09cadca29d6f533a40ab26da88eb99dfc98fe5fa637eaf7c42e565 SHA512 7a7177869712e7e9f1217b5992d50e2cc0d560cc3ce97ac9e5f95469bce5a6b883baca033b9a2c9e859abdf978a6ea3ee66e69cafcc1b3b609de955249a0147c
+EBUILD cmake-3.20.0_rc4.ebuild 6846 BLAKE2B 563f68ac5e2ef974604ae3c130b6e049f180340d54e48fef71b779bbb85cf132741f50fc6b09cadca29d6f533a40ab26da88eb99dfc98fe5fa637eaf7c42e565 SHA512 7a7177869712e7e9f1217b5992d50e2cc0d560cc3ce97ac9e5f95469bce5a6b883baca033b9a2c9e859abdf978a6ea3ee66e69cafcc1b3b609de955249a0147c
 MISC metadata.xml 460 BLAKE2B f1a7e1709a6b9975ffbc377c8b4d1ea8a01f52ccc139693c8e427150b7559ecc867b3e55fb4bc95fe342a2335fe5e13c69f4bd74ffbbf302c83872c65963e73e SHA512 fc562cd5f336101d16ca30a5b3e9b99a6e51ec9d7aa503f20ce278f44d5810286fcd6b46b18073cd88ba88ee5ab4f8a0bfccaa567df09ebb722a68ab721aa340
diff --git a/dev-util/cmake/cmake-3.20.0_rc3.ebuild b/dev-util/cmake/cmake-3.20.0_rc4.ebuild
index 99b8eab6c2f1..99b8eab6c2f1 100644
--- a/dev-util/cmake/cmake-3.20.0_rc3.ebuild
+++ b/dev-util/cmake/cmake-3.20.0_rc4.ebuild
diff --git a/dev-util/codeblocks/Manifest b/dev-util/codeblocks/Manifest
index 1a7aa472dc70..655fbab40c9b 100644
--- a/dev-util/codeblocks/Manifest
+++ b/dev-util/codeblocks/Manifest
@@ -11,6 +11,6 @@ DIST codeblocks_17.12.tar.xz 15725976 BLAKE2B 871427b5d8a2296e04d640c35d9129deeb
 EBUILD codeblocks-17.12-r303.ebuild 2375 BLAKE2B 5cfbe24e5b2514baa89cbac19771d7dfbd160c21bbd3c83cdedd05a8a680e7a5e2a4f20849d20aa906244cf3699f43bc6452edbf678623cc943b18fca0064b55 SHA512 62a241a4617cd8c1f5d1416807c859ae3684b34323f08147e68d21834e6b25c844b63ed1d67738b9923d5f217071d1ec91c6485f7b31115f84a5b5b9ef7e67b6
 EBUILD codeblocks-17.12-r304.ebuild 2294 BLAKE2B f6f79076b52eea3a1c1230e3fcee4220215b3c3b09f2c533e359d51cf52d6433851634a7e94a30d1b467904760bc085ef9bbb449e61a33b9a724814c6ea128ac SHA512 24f38636a6945a7fcdcecdaf5e25a72fa4a8d035d974ff90117ec39f866583ef493aaf359acee65b3b4f839fb121657cc73cfd9d3260dce8a8c2388aa832bf8c
 EBUILD codeblocks-20.03-r1.ebuild 1811 BLAKE2B 9a62643660fa3a3f365fb66cab17a0f9bed43aecf0472809bdc968c7d6950819020e1f21d1d4d377c1717c34c547814b941b19ab12f37138d17158ff4ad83b84 SHA512 adbf6c9798619695333751ce85e43affe2d74eb923728895ec58acdd268513d05db10a96718ed69af91ce1ab8318148cd717308776c307533fac02c3b740ddbf
-EBUILD codeblocks-20.03-r2.ebuild 1857 BLAKE2B 0794aa70ef9f62572b6f0ec79744abe252ee95f9e8c2f8961b7855352565af07f2016ee3f0785cc652176a40413d51eadfee37afaac9cc0fb0eaf639c554f565 SHA512 61849388191ec835109aa3160fbfb2b32bcdf12a69c121e092761368a5d711ece229ca45d3d9c944a481bd27e9bf08564033360e95a59fc9fb1a973f5b4348d6
+EBUILD codeblocks-20.03-r2.ebuild 1856 BLAKE2B 590fcee00cfd835880e41861c831f352d3b4770c093fefdbd6fe5bd1c5f2d768b0b84285bdeb214d1e4fa2435cc1857234a560b4377cb85978ae8176c9fa8a7f SHA512 ba1b0bc9ba7fb021ff8ec7bcf940e8cd5a6972f62074f3ce979321224a4af092c831fb629b2014bb62a4cb4d3578b5a07c9e6da44e72e595bea9e6e53f42b9d1
 EBUILD codeblocks-9999.ebuild 1459 BLAKE2B 3add391f132cde04b2e936cd9b014d7ee091f0ce6105356ae1716d1a2a026bbd689c3959e5925c5add922e4d22878bd921fa44688b7aeae7e589911edee482a7 SHA512 0e00e64f4d3c7045b21015970e0c30551865d34439129ddaa3c41221d1414e45e68626d9a686b5e36fe6f46df2483bcb978aaaecb49a64d38da5853cb0c70ed5
 MISC metadata.xml 675 BLAKE2B db56c15590a97e891e387377cafcb743716d9c84f6adaaf43e3885993842e5456086ef1a59a6579fd5058d5d964cf49b34b7993d56cb5a2e78611a4e9edd0618 SHA512 459846c3e46109fb82d0f37d016fea29e3f69cbf8d03ae2ed2aa0beff443e4206082d9f2e53afc6cdac6862f76037dc652f2dc544d6b9bdf15f2de09d863c735
diff --git a/dev-util/codeblocks/codeblocks-20.03-r2.ebuild b/dev-util/codeblocks/codeblocks-20.03-r2.ebuild
index 16fbd94b7720..cf1336f6f606 100644
--- a/dev-util/codeblocks/codeblocks-20.03-r2.ebuild
+++ b/dev-util/codeblocks/codeblocks-20.03-r2.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
@@ -11,7 +11,7 @@ DESCRIPTION="The open source, cross platform, free C, C++ and Fortran IDE"
 HOMEPAGE="https://codeblocks.org/"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
 https://dev.gentoo.org/~leio/distfiles/${P}-fortran.tar.xz
 https://dev.gentoo.org/~leio/distfiles/${P}-fortran-update-v1.7.tar.xz"
diff --git a/dev-util/colm/Manifest b/dev-util/colm/Manifest
index 8bc6c9f03a1d..da40617b18dd 100644
--- a/dev-util/colm/Manifest
+++ b/dev-util/colm/Manifest
@@ -3,5 +3,5 @@ DIST colm-0.14.6.tar.gz 3110298 BLAKE2B 430c508ff9db27821baca12a458024cb2caecf28
 DIST colm-0.14.7.tar.gz 3110831 BLAKE2B c8be14001e8dc3340f5c55fbf8140b86237ec9462699e417f618cf44c759307eda0ede9f7a9ef897f5b8bc51d1fdf8b7360872a30b4cf07ba8191e405940030c SHA512 a5702cb8202599c75f4f4c1975d02e398f1394826f01b86039bd53a34f3ca250a7250d043a430ce6a383e6ca854fe4c72305891ab98c5f3d0ce54192423b7627
 EBUILD colm-0.13.0.7.ebuild 535 BLAKE2B a9b324dd50e8e13801761d36b776c7fdb3003e8c078201ae371106d54476abe7373f6010a444d00cff10978c5025d42b898f7596089c933eabd96af6294135ef SHA512 81eaf1b0b0b38e3e6612e94ab88cb35570df633ec20a81f268f23312995a2477881ea8ba230a5891ebb8bb7ead324b086209db043e98083ca08526c38791d9de
 EBUILD colm-0.14.6.ebuild 1227 BLAKE2B f359b302ce4345f5d86a20b2ce22298aee8ca519f7348db7201aeff9753346ae5df1e7d8f9388593a426e986ca81c11d58562d889994eb4f4728c5d6b11b8ac3 SHA512 894b7733416e4d7293ab7cf294845d87d92548f5d897865c383b19aa7de65abcdfcfd6dd44e5050cd79ebb22a817f47d2bc0f0b77a848b0debdd31d6e717cc07
-EBUILD colm-0.14.7.ebuild 1229 BLAKE2B 634930937f2ed2c7aa86cdd024ee418bd498d3e0011a94d6c3c35c3ff14f37247e6d7a494981bba8287500c6a54dee08f531c99f3d8bc296ec43d50094c3d6fb SHA512 3d9683ce7d5ba6746258ff6c7cb8767c9964d10f98558f199d183964da69a8a23a2a401677c9cef5c786d05bf7babd604d1beacfbc51cf8b7a80588d4d31896b
+EBUILD colm-0.14.7.ebuild 1228 BLAKE2B 3ae251552005cb16e23d3b5b78ca782b87c64e092f72a1eb3a6f897fc4d2015edfebaf9e7603ce58a68d7231a54966a59cf53a4cc474423ff96d4880288a3334 SHA512 a9cfab4fcb3997dea769b414fae20c0abbdcc9cd469d82e46a6e325e004919f1b942e51d5df8c0960a73eb7c07af0a2ea49e5543520a8ad1ccecfbe829f20c38
 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 e4a3be51e8ec..444e033d235e 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="
diff --git a/dev-util/cvise/Manifest b/dev-util/cvise/Manifest
index c8ef3719bb84..49d156683e14 100644
--- a/dev-util/cvise/Manifest
+++ b/dev-util/cvise/Manifest
@@ -1,10 +1,7 @@
-AUX cvise-2.0.0-shebang.patch 1130 BLAKE2B 50f54e410f978a485aaa08cc7d9b8311211ec5b42fb372656821beba7bacd8aa7506b6e10732a0c426ce48a94440daa64bf931b23734d43b57e4a0d3d08a7281 SHA512 2c8fdc838ec802d7a1afb209dbe3e765780dd599f21cbdb7d9316e076ec06d0f0c1e78a00ea6a66fb614c8d0f7b44ca88ad624236223b47d87dddeab427621d3
-DIST cvise-1.9.0.tar.gz 249042 BLAKE2B 357d429afc43691e616dba31621d1de89fb1f85fcbc177847b3367aac993ccd2c3bec20226e910a319d5d6194b32d0be9704e4fa7b8fce49f23788d10a378012 SHA512 518c48b7b9d9af9b856bfc46d4fb8064bca3730735bdabf2b3aa981a3f743fa6988594b7cbe39da71ac01fbadb4a45e5212d7c79b510fa36d86055978829495b
-DIST cvise-2.0.0.tar.gz 249307 BLAKE2B ba1a70da71706969a35b1223ad0c0fa1a1d4caf7f70eef184adc4dbc69586be6a33bdf11d7c1b606ea4b20d4cd2bf68170aabc1764364c235fe5f67182419080 SHA512 e49ca9919ced9db67b16af4b8a7cd3c18c7d96dea5724c9ee6d60736c8f34074d68ade151be702794c93b24943d167278e1c1a6e6f67a9a1422f695f3a177e46
 DIST cvise-2.1.0.tar.gz 249215 BLAKE2B e36def48de68dfb91990fd1daced56ae5fc9a32070bae3a696e7c21980757e30ccc8ef2d4940c391a72417296968f0dad680ffe6ca3c88104f09839d86174e27 SHA512 bc239ddb207bc6bb70d1a131df7ca0c13c4a3921382613aebb319f1cb1d5f19be273e82945e4f1c9479eaeac07bbb8a9c4c7f515e0474fe6bede84afd20b560c
 DIST cvise-2.2.0.tar.gz 250169 BLAKE2B ed994a288de750b8eee603cf38641614206c0c322152f061b33600c250f24156bbcb2c660c4ae92ff46f3ad2620ba6557213475b8eab0476baa289b7270e6678 SHA512 c54908784d15cb38fe58b731f65ed719a8c073a208d48d7a756acbbaa3804f052963e0ef0f74b811ba77bd3d5e900b622491c7c62c48eb2d7aef708edbec3eb2
-EBUILD cvise-1.9.0.ebuild 1259 BLAKE2B 69650845458637a93323e97d56608486ab99b8de2e3e19f0e548769e45491be7212598ed9ba6c7d1f7f0de6f0707282387402cdad1c65ec839afc8febd9f33e4 SHA512 e7a62fc68b3e22e38b781dcf9876d74bebfbe0413168e2cb055d02c18d73a3cba92780d343123fea81c86b2783941c1c08751759ac24adc5cecf62b3d21f231d
-EBUILD cvise-2.0.0.ebuild 1326 BLAKE2B 9f2bd2eebdd840bb86da20742a5f92a5a12a5742fd1a1103cf04363ff7c6485227b0113be50cb806448e0ef35de120fd1ae550c1e5b2ba11af6561da154a6628 SHA512 dc23bb9e59a8aace4c9700d79375a2f2599fe4c48e79565857104b7bdf4e3f2242d6919dd54a437ef56bec88e1bf72255a5953a6080745dd8c7b4bc4047a6eae
-EBUILD cvise-2.1.0.ebuild 1279 BLAKE2B 55fd7d131fc002e46c0679abdfaec3d1a708717066b2547f964c915e24e7c08a0b17bb17afc71cd03caa1607ed3b5ca0b1ee18cd70eace3102f7f446db78fe04 SHA512 d34736f6eefccf39d540ce973ae2012e119a097b4a2d8c30f61051b60c0fbbce32f1d033e387c0661e6834ba3fa471d00d67eae2c669f11c080e862a7320dfe6
+DIST cvise-2.3.0.tar.gz 250283 BLAKE2B 361bcafd2ec9caf42c77abd2a5bbd145cd350d9693178a59720a2a2d1d726e85860d92725a00ce3dae7041e8b47b584bf4c3a5e8b5c0c0a8283a15f8117125f3 SHA512 6c65b1462b20974d76e54b76e15e592a76445da2b8627a29a98ae295417239171267ed163d04a11eeaae25d068b44548cdad0b642e7024c49a5a15f3c0894b1b
+EBUILD cvise-2.1.0.ebuild 1277 BLAKE2B e0968bcd0b3db5b8d00d97af4a0d6446a4d6aa39364c994c8bf69e78ff676c5c78a202d2c15776d5a26d7420d1e075694f1b652e130234ad3a4e41cd601a5fbb SHA512 054759718e920c69c1aefbd45a6168ed195d2a640f71bc5b8b02e57aabc7a94c055ff22647eed8c45e08fc1f64abeb2f71be5969301effb9d645585b4151597e
 EBUILD cvise-2.2.0.ebuild 1279 BLAKE2B 55fd7d131fc002e46c0679abdfaec3d1a708717066b2547f964c915e24e7c08a0b17bb17afc71cd03caa1607ed3b5ca0b1ee18cd70eace3102f7f446db78fe04 SHA512 d34736f6eefccf39d540ce973ae2012e119a097b4a2d8c30f61051b60c0fbbce32f1d033e387c0661e6834ba3fa471d00d67eae2c669f11c080e862a7320dfe6
+EBUILD cvise-2.3.0.ebuild 1290 BLAKE2B 986ce69cea09cee6a6abd2ab43456f0aa2d0c79265ff6a87e51090442c958a5fc680995f79f2e20493a30d161cf083dc89802da168da7f4357345ba5137fef0a SHA512 8efa2eab8a35951bdd336074df4ef671fe7526bd934e18e236ca85f161f5ca84f4e2df518485eba763228d0c1560aadfdcb9887385aba4532f8425e6599fdc36
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/dev-util/cvise/cvise-1.9.0.ebuild b/dev-util/cvise/cvise-1.9.0.ebuild
deleted file mode 100644
index ebbb86b2ec9b..000000000000
--- a/dev-util/cvise/cvise-1.9.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-: ${CMAKE_MAKEFILE_GENERATOR=ninja}
-PYTHON_COMPAT=( python3_{7..9} )
-inherit cmake llvm python-single-r1
-
-DESCRIPTION="Super-parallel Python port of the C-Reduce"
-HOMEPAGE="https://github.com/marxin/cvise/"
-SRC_URI="
-	https://github.com/marxin/cvise/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="UoI-NCSA"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-LLVM_MAX_SLOT=11
-DEPEND="
-	|| (
-		sys-devel/clang:11
-		sys-devel/clang:10
-	)
-	<=sys-devel/clang-$(( LLVM_MAX_SLOT + 1 )):="
-RDEPEND="${DEPEND}
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/pebble[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-	')
-	dev-util/unifdef
-	sys-devel/flex"
-BDEPEND="
-	${PYTHON_DEPS}
-	sys-devel/flex
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/pebble[${PYTHON_USEDEP}]
-			dev-python/pytest[${PYTHON_USEDEP}]
-		')
-	)"
-
-llvm_check_deps() {
-	has_version "sys-devel/clang:${LLVM_SLOT}"
-}
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	llvm_pkg_setup
-}
-
-src_prepare() {
-	sed -i -e 's:-n auto::' setup.cfg || die
-	cmake_src_prepare
-}
-
-src_test() {
-	cd "${BUILD_DIR}" || die
-	pytest -vv || die
-}
diff --git a/dev-util/cvise/cvise-2.1.0.ebuild b/dev-util/cvise/cvise-2.1.0.ebuild
index bca1400c8e66..ee0ad8abf53c 100644
--- a/dev-util/cvise/cvise-2.1.0.ebuild
+++ b/dev-util/cvise/cvise-2.1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
diff --git a/dev-util/cvise/cvise-2.0.0.ebuild b/dev-util/cvise/cvise-2.3.0.ebuild
index 3d8be41374a4..ec2cf4f9c5e5 100644
--- a/dev-util/cvise/cvise-2.0.0.ebuild
+++ b/dev-util/cvise/cvise-2.3.0.ebuild
@@ -19,9 +19,10 @@ IUSE="test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
-LLVM_MAX_SLOT=11
+LLVM_MAX_SLOT=12
 DEPEND="
 	|| (
+		sys-devel/clang:12
 		sys-devel/clang:11
 		sys-devel/clang:10
 	)
@@ -44,10 +45,6 @@ BDEPEND="
 		')
 	)"
 
-PATCHES=(
-	"${FILESDIR}"/${P}-shebang.patch
-)
-
 llvm_check_deps() {
 	has_version "sys-devel/clang:${LLVM_SLOT}"
 }
@@ -64,5 +61,5 @@ src_prepare() {
 
 src_test() {
 	cd "${BUILD_DIR}" || die
-	pytest -vv || die
+	epytest
 }
diff --git a/dev-util/cvise/files/cvise-2.0.0-shebang.patch b/dev-util/cvise/files/cvise-2.0.0-shebang.patch
deleted file mode 100644
index 26bfe9678ebb..000000000000
--- a/dev-util/cvise/files/cvise-2.0.0-shebang.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 492d2d759d35bec39aca137906046b76151b56d1 Mon Sep 17 00:00:00 2001
-From: Martin Liska <mliska@suse.cz>
-Date: Sun, 15 Nov 2020 12:12:04 +0100
-Subject: [PATCH] Add Leap 15 and fix shebang.
-
----
- build_and_test.sh                    |  2 +-
- cvise.py                             |  2 +-
- 4 files changed, 22 insertions(+), 2 deletions(-)
- create mode 100644 Docker/Dockerfile-opensuselp15-llvm9
-
-diff --git a/build_and_test.sh b/build_and_test.sh
-index 95c1539..b726dd4 100755
---- a/build_and_test.sh
-+++ b/build_and_test.sh
-@@ -1,4 +1,4 @@
--#!/usr/bin/bash
-+#!/bin/bash
- 
- BUILD_TYPE=$1
- 
-diff --git a/cvise.py b/cvise.py
-index 15efaf6..7f318f2 100755
---- a/cvise.py
-+++ b/cvise.py
-@@ -260,7 +260,7 @@ def get_available_pass_groups():
-     script = None
-     if args.commands:
-         with tempfile.NamedTemporaryFile(mode='w', delete=False, suffix='.sh') as script:
--            script.write('#!/usr/bin/bash\n\n')
-+            script.write('#!/bin/bash\n\n')
-             script.write(args.commands + '\n')
-         os.chmod(script.name, 0o744)
-         logging.info('Using temporary interestingness test: %s' % script.name)
diff --git a/dev-util/devhelp/Manifest b/dev-util/devhelp/Manifest
index c1610415906b..9cbf9f0ac603 100644
--- a/dev-util/devhelp/Manifest
+++ b/dev-util/devhelp/Manifest
@@ -3,5 +3,5 @@ AUX 3.30.1-optional-introspection.patch 1266 BLAKE2B 95bc2dece601e561c95d420e3bb
 DIST devhelp-3.36.2.tar.xz 302996 BLAKE2B 61131c7bedfe6803c04315138b017145e7ad7cc2939022a4cfcd0c65f4f3144db705a4a918a4ecd6a6fcea2a5dce64a891d951ccfc21dec0421991455b81ad16 SHA512 8852546b8ff337c2448a88b931803029825e34a6cf906370c683ac004866a548c9de79c934fde36ec04584f0bdc59eee4184b9ed8a480303eb78b9c9d43eb55e
 DIST devhelp-3.38.1.tar.xz 313948 BLAKE2B bd070c98e92a8968ffbac7e634c19730e7c63ee18d180a5d9dda7d831b28deea49a7aa50b17ca9a8b5a411276ac055074cb76ef8cde5017ca395d49bf4aecdf6 SHA512 bcdd61cd822ae3fbe2c9542c09d058760fc1fa0bbbd55b1fc0853b4fdbf1c3856d4fed8f2263f94f41096cbdc0a76394773d43a9072d8aa89274fa61a3c2a430
 EBUILD devhelp-3.36.2.ebuild 1787 BLAKE2B a80d4969d643e8be5a2731773bf6b2e4ba5907683d0e226d3335686715394a25b49c15459ddd6c67bb02f361d8ba525e37073ee98b16955e1ca60ae11d9544cf SHA512 706ca4954c37b7f573af6c0369f0378fa8d07a2eeadef9d70e33569b93f6c4299b72d0c209412f6fcf74eb4841e59da04986fd7476bd7eb1f4399d895f27bf43
-EBUILD devhelp-3.38.1.ebuild 1790 BLAKE2B 29cbc2fad9b270eedcd156541e5a7fcccdc5ce63cee3c167249080b71824a67aeb7f74ffdbe8148e3da82ad3bdf4541030b9c5d525c70e68eabf81bb7a47c780 SHA512 bba65ed84f3d8f16e013bf3436bfd43d06d927d9cc1fe543898ffcb34fd2395d383b3bb97f52b8479fa563b5bc5648f076e63a48993f245efdec096df5445424
+EBUILD devhelp-3.38.1.ebuild 1789 BLAKE2B 14b666235603efe3a2d6444c9b7a009c049b1dbf96544ef4b36f1d5a4c66e83dbc599dafa97dfb4c1d39cae22f3ee5d8d8a1a3b6a692a928e0f48aaf920f7465 SHA512 e20a0077fe23196cfdf96d418e83106f13a55ab2605ab150e260a6b1ac901891d0cf43481018e0a8def6ce2de00b00edc30f2140f41ff4bc6f6db6125f00889f
 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
index 6856a3102392..605c2cca3a83 100644
--- a/dev-util/devhelp/devhelp-3.38.1.ebuild
+++ b/dev-util/devhelp/devhelp-3.38.1.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/diffoscope/Manifest b/dev-util/diffoscope/Manifest
index de1f7ecd7b9e..90fdd2ca407d 100644
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@@ -1,5 +1,3 @@
-DIST diffoscope-167.tar.gz 1569356 BLAKE2B 736da75d81fadc0a93cec4fed761751a9f1c539781d0fb5c1c3b465b2af71480978cd111ea729201b7eb892f23e900a26e99d84d1404cc23a5cc0f49fcd3fd20 SHA512 e5046ffba8ca27f56c2219ac5e6d4cdd0765778fdd71b0221113d65da8724028f2a1daf48ee1676a54c5c534f5e10de5867e9a9f51c10334d23772894f1d65e7
 DIST diffoscope-168.tar.gz 1569627 BLAKE2B ad0dcfeb40b4747877a5b0366706a57fea87229d23b4c7faa43e5dd12d8d950df52f42e74df862c52875e4722f046481ceb7204e74df11ed20188522e9874d9d SHA512 55025ff1a4e7664631d15c980aef46e6db4b22501989b1d58812a18eacb0e8c87028e6bed1599842b1ac072e0797d49a9d0796419a9678956c2f779b8909b6f4
-EBUILD diffoscope-167.ebuild 2194 BLAKE2B 9dd510ff0851561703b950d555d87c92ac9c7f6cd4a29b623397352fd2a6caeecf100d81818145658a781517a4f5bf548779d78b820169f6ab5edf889c9163b9 SHA512 33432f35354fa308b9764c425e13eba5a5242f1f4c08fe544edcfc67f7c90abcadef6afe71e50e32e25fe2bfaea6bd7a34809ec777191884bd2dd4b7c8d59e17
 EBUILD diffoscope-168.ebuild 2194 BLAKE2B 9dd510ff0851561703b950d555d87c92ac9c7f6cd4a29b623397352fd2a6caeecf100d81818145658a781517a4f5bf548779d78b820169f6ab5edf889c9163b9 SHA512 33432f35354fa308b9764c425e13eba5a5242f1f4c08fe544edcfc67f7c90abcadef6afe71e50e32e25fe2bfaea6bd7a34809ec777191884bd2dd4b7c8d59e17
 MISC metadata.xml 2137 BLAKE2B 70393ec4166e001aaeeb4c10958693ff090b04e7e5bf7eb760746dc4920e0554724f61e1a073f008660789438bec33378796ebc117c1cedcac5116b0b1d32142 SHA512 a1f5648c7593f16db4df87b750360034647704b1809ed52d585d49b5769ee8e190ff853941d2739da7c5f514ef02442b3b3ebf55fb21541e7bc551c720a305d0
diff --git a/dev-util/diffoscope/diffoscope-167.ebuild b/dev-util/diffoscope/diffoscope-167.ebuild
deleted file mode 100644
index c545c9302aa1..000000000000
--- a/dev-util/diffoscope/diffoscope-167.ebuild
+++ /dev/null
@@ -1,73 +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} )
-PYTHON_REQ_USE="ncurses"
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Will try to get to the bottom of what makes files or directories different"
-HOMEPAGE="https://diffoscope.org/ https://pypi.org/project/diffoscope/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file
-find gettext gif gpg gzip haskell hdf5 hex imagemagick iso java llvm
-mono opendocument pascal pdf postscript R rpm sqlite squashfs
-ssh tar tcpdump xz zip zstd"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/python-magic[${PYTHON_USEDEP}]
-	dev-python/libarchive-c[${PYTHON_USEDEP}]
-	dev-python/distro[${PYTHON_USEDEP}]
-	acl? ( sys-apps/acl )
-	binutils? ( sys-devel/binutils )
-	bzip2? ( app-arch/bzip2 )
-	libcaca? ( media-libs/libcaca )
-	colord? ( x11-misc/colord )
-	cpio? ( app-arch/cpio )
-	diff? ( sys-apps/diffutils )
-	docx? ( app-text/docx2txt )
-	dtc? ( sys-apps/dtc )
-	e2fsprogs? ( sys-fs/e2fsprogs )
-	file? ( sys-apps/file )
-	find? ( sys-apps/findutils )
-	gettext? ( sys-devel/gettext )
-	gif? ( media-libs/giflib )
-	gpg? ( app-crypt/gnupg )
-	gzip? ( app-arch/gzip )
-	haskell? ( dev-lang/ghc )
-	hdf5? ( sci-libs/hdf5 )
-	hex? ( app-editors/vim-core )
-	imagemagick? ( media-gfx/imagemagick )
-	iso? ( app-cdr/cdrtools )
-	java? ( virtual/jdk )
-	llvm? ( sys-devel/llvm )
-	mono? ( dev-lang/mono )
-	opendocument? ( app-text/odt2txt )
-	pascal? ( dev-lang/fpc )
-	pdf? (
-		app-text/pdftk
-		app-text/poppler
-		dev-python/PyPDF2[${PYTHON_USEDEP}]
-	)
-	postscript? ( app-text/ghostscript-gpl )
-	R? ( dev-lang/R )
-	rpm? ( app-arch/rpm )
-	sqlite? ( dev-db/sqlite:3 )
-	squashfs? ( sys-fs/squashfs-tools )
-	ssh? ( net-misc/openssh )
-	tar? ( app-arch/tar )
-	tcpdump? ( net-analyzer/tcpdump )
-	xz? ( app-arch/xz-utils )
-	zip? ( app-arch/unzip )
-	zstd? ( app-arch/zstd )
-"
-# Presence if filemagic's magic.py breaks imports
-# of dev-python/python-magic: https://bugs.gentoo.org/716482
-RDEPEND+=" !dev-python/filemagic"
diff --git a/dev-util/distro-info/Manifest b/dev-util/distro-info/Manifest
index 3957e90cb563..b4b0801376b8 100644
--- a/dev-util/distro-info/Manifest
+++ b/dev-util/distro-info/Manifest
@@ -1,5 +1,5 @@
 DIST distro-info_0.22.tar.xz 29104 BLAKE2B 88eab833ea34de9e62f858e1fb9acfb94efb60114d2213b8bbb77a440c114dbac70a1707d1469113c1a98ea94d953ffa36480c132c294fd8e22b816a444b25e1 SHA512 b9d97e469b9173651c1816f39cc2315622b46f1579cbaba29c417a51417425e90a45283e83c7efee35db78621df08997f5395c8c1b0259f69e5cd91dee65793f
 DIST distro-info_1.0.tar.xz 30908 BLAKE2B 8355e54919d83d09d3eb7983a35151f0e4253c62eefeccf4d1e614cef0bb7cecf466007c7789749c145674aa30324423f9977a26695d5de537f80d5eb069f371 SHA512 2d84b5845ff4e7ce8059fe83e9d64a380d6732e0e85bc889c948068579d27a86fd31f8e6b7d8cc256f4ff4631cd0ffd480835bf290452d3bc28469f5b3be9ddb
 EBUILD distro-info-0.22.ebuild 1968 BLAKE2B 9c2e9c64077fedc8dbe4be14065189e6cb429857b6bcdf1d7f015fdefc0a3003c5e4440313099581975a2773290fbf1adcea9908e55f37f2d7e38231c3a4e6e8 SHA512 52c783c7292c7a1545673117883fea87011a9ccffa270a53f6d459dd49835e0e75c53fe5dbae5351083a878dba18d0fc6cf861ff205b7dc34e62642d02cf82da
-EBUILD distro-info-1.0.ebuild 1959 BLAKE2B 7a06b08402551735740bf65a7b6aa0cec9ba174de6445cc29a7cb3710488a9892f91b70c180893a838e2e2d59f3bada8ebb97a95e88d0df43382c2194890bbab SHA512 b8302fcdf1ca34fddbe12d2f1922bf77e7634ab7e7abdd0b36d2c8816c69ab40af07bb5671bb2a7eca59f3e964716aace5c1f4a435b53e49bd15556fd481109e
+EBUILD distro-info-1.0.ebuild 1989 BLAKE2B 7db23cf154f0d6ce2b3d25964785c22e407a2c67f83c8e360f7bbd650a65dd09e43c66f472c306834afb2559969e8ef6bac8541b0e87625a804d0a2e52d1044f SHA512 a34a1502ad6bb72330c1c410486c05184a400b5bf197dfbf72cb746c34e01687c4619825376e00a3ce2999c9bceb272a934798a5926d84052cb3b5fbeb8a1dcc
 MISC metadata.xml 367 BLAKE2B 867a3664c5bbd444d69af80af19994e07e3810349258e85c2afd0c838cb140aa3f3342ee1aa5e6862d1fd5130e7e09c1f9f30443827fe7df705f4273694c0784 SHA512 3eb0be47e7eb6bfb6d8eecee66a25183da436c38272e226e7819c8748774f3aae620eab7227414cb862734d4baf8fa060290c1b2371233141abcffd7b489c7b8
diff --git a/dev-util/distro-info/distro-info-1.0.ebuild b/dev-util/distro-info/distro-info-1.0.ebuild
index fb1bd4cbd9e6..9df6704e2ea3 100644
--- a/dev-util/distro-info/distro-info-1.0.ebuild
+++ b/dev-util/distro-info/distro-info-1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 DISTUTILS_OPTIONAL=true
 
 inherit distutils-r1
@@ -25,6 +25,7 @@ COMMON_DEPEND="dev-lang/perl:=
 DEPEND="${COMMON_DEPEND}
 	python? ( dev-python/setuptools[${PYTHON_USEDEP}] )
 	test? (
+		dev-util/distro-info-data
 		dev-util/shunit2
 		dev-python/pylint[${PYTHON_USEDEP}]
 	)"
diff --git a/dev-util/dput-ng/Manifest b/dev-util/dput-ng/Manifest
index 5dc8f7c882ae..2e4be7e995f0 100644
--- a/dev-util/dput-ng/Manifest
+++ b/dev-util/dput-ng/Manifest
@@ -1,3 +1,5 @@
 DIST dput-ng_1.28.tar.xz 85276 BLAKE2B d205d15aad1b81dcf2cc0b765c9724b21add32df39102b63502d99e5da73aa95efdf66e94f6226105ab2ae97a4bf8c43963784f3ddf2d03217ab5023a7a98f22 SHA512 cfd4a6143b33f29eb32b88972a204ab7a6c2f062299c76167434322ae5d6d2cf8654c5b4d1e96db90dbffe372a04e2a7691694ecf46787c7743dd9ac2b7b317e
+DIST dput-ng_1.32.tar.xz 86280 BLAKE2B 7e195eab4f48d77968b866185e337f2b51113f7e11cfa4929d47e79082c2fa866af2c8394c50816b650f865db9ef244775618a05a6b398090366d342a45a3db7 SHA512 596247eecb2dce080cd6f3cd1ddb1364cfa00fc3048081149e4d6dc35822aee10fa10ec25ed91154b477a909cc29dcf17cb38ccefa649f40eb70c16e0a575b2e
 EBUILD dput-ng-1.28-r1.ebuild 1879 BLAKE2B a089ff7d09249df94644d9895d1758c3522034f953f3b67c5cb0a1ad5e1fb16d6dfaed04466a386b97f18489f3ad64eecb4e94769a89a8e34eb178261e69ebc0 SHA512 90effe3d5955c3efeb248534ccfe60ca0014a2420a6ecf91b1bb4a25a2d367e241f3bfbf124a95d3b7126b1ecb629e871be5407bef3766be67c844fbb7958497
+EBUILD dput-ng-1.32.ebuild 1887 BLAKE2B 1bc7632022db9a31432a0e0aff656dd85ed98285e5bba4db7f396fc5f4932df74257bd3def1e254b2f5fdd56aba0988f9901925cd88040636d58ba3c961d2c3e SHA512 d3821e7902422740155533c50f24751427c0518f4a1af1417683ef9b470c9aa999e458333dd3d98a0bfcfa4d4266cb0367162ace06f51c60914c679dba3b29f2
 MISC metadata.xml 367 BLAKE2B 867a3664c5bbd444d69af80af19994e07e3810349258e85c2afd0c838cb140aa3f3342ee1aa5e6862d1fd5130e7e09c1f9f30443827fe7df705f4273694c0784 SHA512 3eb0be47e7eb6bfb6d8eecee66a25183da436c38272e226e7819c8748774f3aae620eab7227414cb862734d4baf8fa060290c1b2371233141abcffd7b489c7b8
diff --git a/dev-util/dput-ng/dput-ng-1.32.ebuild b/dev-util/dput-ng/dput-ng-1.32.ebuild
new file mode 100644
index 000000000000..62870638d55b
--- /dev/null
+++ b/dev-util/dput-ng/dput-ng-1.32.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7,8,9} )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Next generation Debian package upload tool"
+HOMEPAGE="https://people.debian.org/~paultag/dput-ng/"
+SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/python-debian[${PYTHON_MULTI_USEDEP}]
+		dev-python/paramiko[${PYTHON_MULTI_USEDEP}]
+		dev-util/distro-info[python,${PYTHON_MULTI_USEDEP}]
+	')
+"
+DEPEND="${RDEPEND}
+	app-text/asciidoc
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/nose[${PYTHON_MULTI_USEDEP}]
+			dev-python/python-debian[${PYTHON_MULTI_USEDEP}]
+		')
+		dev-util/debhelper
+	)"
+
+# Requires missing build-essential package
+RESTRICT="test"
+
+src_compile() {
+	distutils-r1_src_compile
+
+	mkdir man || die
+	for file in docs/man/*.man; do
+		a2x --doctype manpage --format manpage -D man \
+			"${file}" || die
+	done
+}
+
+src_install() {
+	local DPUT_BINARIES=( dcut dirt dput )
+	local DPUT_ETC=( metas profiles )
+	local DPUT_SHARE=(
+		codenames
+		commands
+		hooks
+		interfaces
+		schemas
+		uploaders
+	)
+
+	distutils-r1_src_install
+
+	for binary in ${DPUT_BINARIES[@]}; do
+		dobin bin/"${binary}"
+	done
+	python_fix_shebang "${D}"/usr/bin
+
+	insinto /etc/dput.d
+	for dir in ${DPUT_ETC[@]}; do
+		doins -r skel/"${dir}"
+	done
+
+	insinto /usr/share/"${PN}"
+	for dir in ${DPUT_SHARE[@]}; do
+		doins -r skel/"${dir}"
+	done
+
+	# doman incorrectly treats "cf" in dput.cf.5 as a lang code
+	doman -i18n="" man/*
+
+	newbashcomp debian/dcut-completion dcut
+	newbashcomp debian/dput-completion dput
+}
+
+python_test() {
+	# test_configs.py failing
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=824652
+	nosetests || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-util/dwarves/Manifest b/dev-util/dwarves/Manifest
index 05a2e46ed4fc..464bfa6d19fe 100644
--- a/dev-util/dwarves/Manifest
+++ b/dev-util/dwarves/Manifest
@@ -8,5 +8,5 @@ EBUILD dwarves-1.17.ebuild 933 BLAKE2B 8cd67a6045d31537c2165522db80a34986107df4b
 EBUILD dwarves-1.18.ebuild 918 BLAKE2B f9da513e397cf0b8f2dc68853e6ed8965c5b0f91c31ea6d272f47b4f559530c110ae14c2933f168721ec168fb1749278e9f74a1ea5b91c0e184e00b9422f922c SHA512 a8eac9a1a836459c7ae6a91ab34413127a93632afb3a4b84e4cda008d61e7eebc2d53a5e5f3d0cf42151097d7ce1f75f7d8103133a830a80b088a2a78184082a
 EBUILD dwarves-1.19-r1.ebuild 1027 BLAKE2B 152b86a3775abb0e6d2505bc7a7f651bcbd2e7d0fa38ce7cd1abda1021345496751d493982f795a8171953f11b1f76374c1d9084091314aaaac9fd21aadc0611 SHA512 ffc02657d39e3672b7a63ae77e83062270eaf2e27f46c5c49d08ced5578c70bd9f1c3ad18431299efc44bdd44db54df5fa201e22597dba91d3869f759f6d733b
 EBUILD dwarves-1.19.ebuild 930 BLAKE2B 9a82ee9483d21c5b0d89dc02de73a656a3269604a76906b10b4e0e368812fdb4650195b67c6bc46ac1dee85c58cee119cd52bea6ab3a01319287ce7e8650e940 SHA512 5e6202ea6aefae993358b0439ecf1d75659a69533e63fe486dabc40d3faa63bf05693117662c951730c60f57bfc40c2692eeaaeaffb1076fa14d38ea8bddb558
-EBUILD dwarves-1.20.ebuild 1027 BLAKE2B 152b86a3775abb0e6d2505bc7a7f651bcbd2e7d0fa38ce7cd1abda1021345496751d493982f795a8171953f11b1f76374c1d9084091314aaaac9fd21aadc0611 SHA512 ffc02657d39e3672b7a63ae77e83062270eaf2e27f46c5c49d08ced5578c70bd9f1c3ad18431299efc44bdd44db54df5fa201e22597dba91d3869f759f6d733b
+EBUILD dwarves-1.20.ebuild 1024 BLAKE2B e0a14962d98c00a5e2cb51355b2872665ffc085c4038074975860269e927a65fb0f0d05cf1f2553a10042ed50d0de5c1efc8a0ced01e4baf7a37b03ae88c8e52 SHA512 df1491907d9d5a56fc41d1277b2921d48fa8da9c8864ac52d0989888c3165e0a3ee6645fcff3d86bb948777c058b685eeeb83671107a2a57064db752f32db096
 MISC metadata.xml 671 BLAKE2B 78a2fa86c0acc136403b1477db4e2deb3bde1ceed636ced96705cdaccb7e42f76e8fbd202c3fa258c1f33b14827f95b5ce343f8f4df981be66e0ad3a8dd226b8 SHA512 0cdd2c3e4e76a9017120a409aec1f70327363ee146e5fb74684d0e08e2836f0079cb97be1c4874445b271b98c13daf04f75ee481ef21607aac8976a78437af11
diff --git a/dev-util/dwarves/dwarves-1.20.ebuild b/dev-util/dwarves/dwarves-1.20.ebuild
index 10618245f8ef..df4c7825b90a 100644
--- a/dev-util/dwarves/dwarves-1.20.ebuild
+++ b/dev-util/dwarves/dwarves-1.20.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://git.kernel.org/cgit/devel/pahole/pahole.git/"
 
 LICENSE="GPL-2" # only
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
 IUSE="debug"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-util/geany-plugins/Manifest b/dev-util/geany-plugins/Manifest
index ff6cbe345d33..99c242990e17 100644
--- a/dev-util/geany-plugins/Manifest
+++ b/dev-util/geany-plugins/Manifest
@@ -4,6 +4,6 @@ DIST geany-plugins-1.36.tar.gz 4693634 BLAKE2B a7c319a77cb92a55a0a53063ab75d9375
 DIST geany-plugins-1.37.tar.gz 4711239 BLAKE2B 7f4fd121f6f0784aecf2dcc04d208c89e502b23debcbc40889f93c1421e414c33c8634376cfe01e91c370f70818d33b373b88698f5cb0ee23dff5edee9d781cf SHA512 47f8d7170593114c773067a8132c724471cbf881582a0a739da578ca42533783d8ecbccb04e039f2990ceed440bbd2d94e4be4a28e336c7f74b8e11a15ba4ce9
 EBUILD geany-plugins-1.36-r2.ebuild 3041 BLAKE2B e25759bbd4f9a48e3fbafb3c4b90ea1e8b648ed137d226976003796df82b769da8f9752e573b6276d940235bd1c8993329b2a56a0ad34c5f2eee99e6ecb98f55 SHA512 51ae6f610441056d9572133c18e61d7f01f7c1cd6258e8e18e4828525cbe05d8e2dc5129291ae23aef52a45d7c75e70ba47a5e98a153a80c900c8913723ca516
 EBUILD geany-plugins-1.37-r100.ebuild 3055 BLAKE2B 9983e26e9c6321b54e88e8258044983df16416982b9f64fe4285900e6fdae9f8775e63fbbf1c6314038c37ffec84ca825ecc72e5899418387f23daba6050c2e5 SHA512 2191e647cb73b6fad45127943109194fe7d6042032b6d3444fe7f09814e71a579da87e471347eac4a17532db77c6f1ba41efb8bea0b64c25203d4090aa28f8d1
-EBUILD geany-plugins-1.37-r101.ebuild 2964 BLAKE2B e713ab1ecf3cb530fe79d3e5728eb3843f5e1d354e14d8ef2c6fed84f648f82e591f090e8efbf550e8f474b7969b6b803a0d81ba68c178297144f895435e4eb5 SHA512 0e242603df4651d23be53e760c708f36dac5c8411bfe6b848ec303b2cbe41947338974250dcf2ab87370510ac9c5d18654979c8407ce14b7e1088a8f6a3f873b
+EBUILD geany-plugins-1.37-r101.ebuild 2961 BLAKE2B a297d54487b57a38ac1ab4ff323bffdfafe1f983555b62e2e399fb88ea718a1f5c2f6e7ab785bf49629048df2cbf0b01c88e7158086d25832d7f01ffbaf54d26 SHA512 d038947715bd19eb7df1db3a6f731eb7fd1b18f47a6dc809ebdf38f785f25e5b3480c0902faaf2e08b1fe88abdc01ad7206b601cef3de0b3f7233ca752571794
 EBUILD geany-plugins-1.37.ebuild 2992 BLAKE2B 0c9d6f96df55650387d8077e6da25367f4077445ed77071199e8f2e21ccdf10419fd656ed7aa34177b498c9748c2bb77adbf27c956854fccafe642564997945c SHA512 48402ae37f4eb61a1b437d36235e97b95e775a8b8ee0b458454f11c4265bfae3528c5e25dc82958ef4638d08415078419b71f9b49a3305081268ec6420cc24e4
 MISC metadata.xml 1278 BLAKE2B d7069dbc82acd4fae0939c09f867e557a1b214d4ebe48add0cb483aeeec073ae362d35033c0017117e614793de109790c0c17c399327ac4e823f378948301e8f SHA512 5effdf6d8adbb1d63835c55d9a5e97a5596c59027b7c250dbdd6e0d88c7bedc6c1a4c1d8150cd00da538d40bcceb7b819c50080262737255eb2e5463904a4eb3
diff --git a/dev-util/geany-plugins/geany-plugins-1.37-r101.ebuild b/dev-util/geany-plugins/geany-plugins-1.37-r101.ebuild
index f31220c70d9d..7512e75d44a1 100644
--- a/dev-util/geany-plugins/geany-plugins-1.37-r101.ebuild
+++ b/dev-util/geany-plugins/geany-plugins-1.37-r101.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://plugins.geany.org/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~ppc ppc64 ~sparc x86"
 
 IUSE="ctags debugger enchant git gpg gtkspell lua markdown nls pretty-printer scope soup workbench"
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
diff --git a/dev-util/git-delta/Manifest b/dev-util/git-delta/Manifest
index f7740aadab33..0c9a2b381eb5 100644
--- a/dev-util/git-delta/Manifest
+++ b/dev-util/git-delta/Manifest
@@ -108,5 +108,5 @@ DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e
 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 2853 BLAKE2B add56017caabf0915ee87626c23386c0fac561c828ccd26791dfdc6a494bd11c1ba7bb1668ba1465837b03e2772cdc5f470c79e2f0cbafc50a0b1863e4d9a90b SHA512 c0a1f1c5e0e39391346ce6d881dbdfd3fc38febf6ee28a347f312e7acabe22b491ace2d9e6cc985225fd3ad4d0089663aeb7eae0403a9d1f0882e7fce93736f1
-EBUILD git-delta-0.6.0.ebuild 2855 BLAKE2B dfaee8c2e4c8dd73f48123c5297dbfb6ebd8cb551a229ebc75b6fec94731c4af50c1f737e9f52ef0f68d370c5b989bb3b1f595c4c16f3e2974f3405a92263633 SHA512 ddb9576019da8c0562d21604e8cc8113b5761b2a8fc9b943a9cd1bafc3ddce286ea3bae18fb4de8dd879d4678a0c4c2a13205f60fd68e8a3934954569fcfeb35
+EBUILD git-delta-0.6.0.ebuild 2854 BLAKE2B c83a5cd683b87e6949b1915a1610c40f1255a3ed526f50322276ea970fa3d824430e131beaf399fb394bdde2917c587627c123bd9fd565185b1fb6e63b7ab729 SHA512 2d3fe998f3a7a1b53656c09f46c6cf445422dff92c66c3e63f99680348bc5095af0ef9d0c6787aba1bc1603866b2351adbb325e17b1625c60bcf9f3f6bc5e3d0
 MISC metadata.xml 330 BLAKE2B f09602a10d43f553a7dc36968f26f5f4a79d12aab213ea51b1b2e76eb2f5ba8b698147a9ab3db7b088ca42008045f1dd1a5447fe5d7d2ce46a61d1438c202185 SHA512 ca570caf0648315637beede9dfd9c124b7b313448f2929a86262b7fec90280bdf105b22ca112f7ddb2fe16ee4c6f242e7524041c14a692aa9155ad4ae432207b
diff --git a/dev-util/git-delta/git-delta-0.6.0.ebuild b/dev-util/git-delta/git-delta-0.6.0.ebuild
index 881c6ea5955f..c014a8adb13e 100644
--- a/dev-util/git-delta/git-delta-0.6.0.ebuild
+++ b/dev-util/git-delta/git-delta-0.6.0.ebuild
@@ -118,7 +118,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/gnome-builder/Manifest b/dev-util/gnome-builder/Manifest
index b37d8a4b92c5..cfa05a5966f2 100644
--- a/dev-util/gnome-builder/Manifest
+++ b/dev-util/gnome-builder/Manifest
@@ -3,5 +3,5 @@ DIST gnome-builder-3.38.1.tar.xz 12077860 BLAKE2B 68dfbf9aeda93c695035a51c020735
 DIST gnome-builder-3.38.2.tar.xz 12078024 BLAKE2B 9cf8a74be5a48b73c21ce247a07fcb1441482edab8fd118a2d773429f68efcd50f4a8a1ef826cf90a9f76e482f25d9a092ca1700504178051fcf903abe9eb1ae SHA512 6f9d284a9c915562fe55a863ddcc385ca9278b4ee201f4b97272f425937066d630c35c0b337bdf94ce4b12226080a9020eb5dc253ccfb25bc6cdbf8e50779569
 EBUILD gnome-builder-3.36.1.ebuild 6734 BLAKE2B 6b0896c41507bd34ee64068475aee10f52dd716692fe0ec2a142b247ebbcdae8e7065c8e6cc19018075f4bd2d26e4a77ce5d2898008fb2c6e641bf387fb429be SHA512 56a968adba26e26b6844bd07a4d93b2798c2e3a63a2d3049a04e7c43d96600377e4e1c516fa5b527c09a3db09b6eb070faf08542ca4cffd42f8532052cde350d
 EBUILD gnome-builder-3.38.1.ebuild 6821 BLAKE2B 95493c6664fc6a0d3d164bcaf353808a91b2e1e92cbe1be139224227d0568f94205b8e0534b70d0e9f4939f6e163b3d505809a6b96aa5ac39d6b0d0fe40afeb4 SHA512 210aead19214bf34e2aa880c3c47c3bf391960fbe70c9d2f1949a117de099cc2b2291e2134164124ed3a0fed0fca03e1486943dbd9d333c78b10b239499a43d5
-EBUILD gnome-builder-3.38.2.ebuild 6821 BLAKE2B 7700ae42ae35b8b5557688bad9c9a9c61aad7076b68fb1ec6f81dd51a39ef54e4b0a32852693f9e2cd16c942322d02f41bbfab9ab97a2284bd07980b871a88e9 SHA512 aa10009d86d5dc3685968e707a26f82fbe6c3ec987dfd69ca3ab0bebf466a58fcab567413c58f59bb9331870ad7e26ccf5eee2187bed4f01228686e92bdfcc47
+EBUILD gnome-builder-3.38.2.ebuild 6820 BLAKE2B bca5d16b169b98ca1621dd7171a21a3ea76f7ed9f5155ed7d5528b5580bc108dac89f7f2792c5a4d6d1654d464217e35d637f56a7fcf3168bc748a1c704fd1b2 SHA512 c5f76b11933fba6cf56f3cb7de8a8aa7a182f4f5f8049dedb8fb4045d90121895186a73392c6b5e25b961233c9a4befed112ba7a272f52ef270f213cee6988c6
 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
index e7f5655f8321..acc1d8b2e659 100644
--- a/dev-util/gnome-builder/gnome-builder-3.38.2.ebuild
+++ b/dev-util/gnome-builder/gnome-builder-3.38.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/hermes/Manifest b/dev-util/hermes/Manifest
index 44652c99622a..4ebc8173e33f 100644
--- a/dev-util/hermes/Manifest
+++ b/dev-util/hermes/Manifest
@@ -1,6 +1,6 @@
 AUX 99hermes 23 BLAKE2B e0c6e227ba65cc9a4d13c0b1207c4afb1b268c7c82c34eb823912c3f065988d8282bbebe42312770517940e557b0c93610dc632597193a5d9fd78dfb9d1f066d SHA512 9ac639746a3f37910c63a305daabd1c338976e3d4232b2d769e73f869727a09b3cb48e3a1f428f55751c870529403c2ea5dd4ece9676f07f16d9e40d3d9950c5
 AUX hermes-2.8-lua-shebang.patch 531 BLAKE2B ff3f44fa1793d5506302c9266c7d0fe7126a0ece9ec364d9a2bd6861ac018bdf5ef4182c9723307f208c1c96523c9d5b9af63055f927a77787df4ded504edcc3 SHA512 9713eb09c50212e8f8c5abca911e5f13891941be4d348267f33159bd0aa5517e39b760d1ade8855751849605e67580df4de69c990c17a3eec3c45a08501e47ae
 DIST hermes-2.8_p20180315.tar.gz 60771 BLAKE2B e523f1ee01e1ed3da5daa68f5b9f9d146f0764b5d5f75e9dbb71a3b4630ce06ef538745b01f0bcc30e0f2899adf1b1427022be07321c0dbe7859e0c6db82af33 SHA512 838fe1049f8f42113f5d394791499b47af4748d5fb6beccab8e3ce71398a85562340e95c0f96039fa58e6e8de3e79f3c7e87af2f7c47dc087b729cee557dac4a
-EBUILD hermes-2.8_p20180315.ebuild 1129 BLAKE2B 5f564bce7edf5ac2a57f2453cd09155f9484ed93d9caa458f94eff526e12706d8f753662989a55854edbe67465b45b52cbb385685ee1edfb399efa01c1650d00 SHA512 30a4849c484da212a7e9e1ee40ad05d4223647dc586f11206528eb0a573f25e59a9d89ef6b1d54b14c74e5c2b0b96e7f729ae0b30b241cb2afd7f00a400f33ed
+EBUILD hermes-2.8_p20180315.ebuild 1136 BLAKE2B 92245afac3ea67f50b05c4ea6139a71aa54b187b8839b2e5514127bfeab88ccde12590cafdccb491b75f15fb76eec6e413340f4e12354fc762de74947d3b79ea SHA512 8e6eaaf7dd80e25d524ed4877474432d8a6a78fa8f882f0cf261ce6f441711751f66d1034578ca8f0c14024e3e3765f488071bbea271edcca372b6edf784fc61
 EBUILD hermes-9999.ebuild 1125 BLAKE2B beeceb45063a4ce7d569c1312846cfd7c23174fc2787a30ebad342389c87295a7183b5c3ae12b923b118d4c07bd3c961a9e438d39888b84dd3e75a9a0536c0c6 SHA512 3765a15b66af61531125c6fd85e21e3086eb134cc919c17ce49ac870a0d720806624fe34e47b6e254b0d643f774827024a2a26c2be596f69bfa7ecda492170a9
 MISC metadata.xml 356 BLAKE2B ffeb5fde219af8b22df4100049e885316a8889daf293bc92d61ba05953aa62e27dc3735fc96e579aae4d0e56498022616cc6c57250af886631d2f31bd00a57a2 SHA512 76a904528cbc4c1b333a7f97bc17d2cd3fb00a797766728cea99ca79186f4c54b2f54379c288aff943932825d2a7d5ee0a1a3b201f76f603611a87e392b0203e
diff --git a/dev-util/hermes/hermes-2.8_p20180315.ebuild b/dev-util/hermes/hermes-2.8_p20180315.ebuild
index 1f67ffbecd8b..b5b59fc2ff2e 100644
--- a/dev-util/hermes/hermes-2.8_p20180315.ebuild
+++ b/dev-util/hermes/hermes-2.8_p20180315.ebuild
@@ -15,7 +15,7 @@ else
 	COMMIT="b99622087233178368cff6cf38ec72fa01dfd8a6"
 	SRC_URI="https://github.com/TACC/Hermes/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}"/Hermes-${COMMIT}
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~sparc ~x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-util/icmake/Manifest b/dev-util/icmake/Manifest
index 25c7d111baed..817317948228 100644
--- a/dev-util/icmake/Manifest
+++ b/dev-util/icmake/Manifest
@@ -1,7 +1,6 @@
 AUX icmake-9.00.00-ar.patch 600 BLAKE2B f549bcaff7aee31d22a452df5db16695ab75d4b9202067696cfd9aab95c2b044ff8bb47b21e820646525944436b45e88b3592497d1e074d69f02675b60df223e SHA512 ef09e8a356cf8a56285282dd793230eaa0de3d959f1e9e4bb0905d402906f159625645d6e9cf080f1b94b89da7024e1a118ebea8f686713d2872ee20d2102325
 AUX icmake-9.02.02-verbose-build.patch 141 BLAKE2B 14c498f1825bd605f70f409fe0d72f6f494009e6d90e8762305556377671f4d2d11104217888b8300a9fc67e5821c440bb08d444bfec63b987ff8ad67ddc1088 SHA512 7199f34f8b48962e44306e9102d674b8970e03f99f2e2db29b9d813f2c4631f9768582be3423f528f2585106806afff0c2c7430c9125911a1eaca5e77902d546
-DIST icmake-9.02.09.tar.gz 372706 BLAKE2B dc114193fbee9cd7641e0d3c8930c09fb1a3ee705cd14a18c81099cbef90b82e08739ba20344e42ba90c0001b90b274c0e7468f02f84260588659fdea51156a1 SHA512 383ae2e74a5193524aab184e6480cf53d5d3a2296420b8d35c6f223749c74b85f5c88ea00d8ff1e754ddacf2fd7f89c9205df64447fbb292681b069f93eb6891
+AUX icmake-9.03.01-compressed-docs.patch 939 BLAKE2B ff832857fab6d78ef37a1193f9c98c5fd0b2a6de1dbd1421833aad6580e56158c8d3e190f358fa2b95fb2bbcccd3edb62521f5737dbaf3aede1dc3ca965ad4b0 SHA512 1dabb57f30b0d7d07c9a9b6cc1c2723d89e8e7538a35ff2a3c17bda167becc92ad4bceecbfafa5304728a6c687f5da10e7055dcb62df17bc134923a91bd996f1
 DIST icmake-9.03.01.tar.gz 393488 BLAKE2B 43bac6944aa816e077a55264064abcb55ff3525842ab923712997248ef198a934fa434352fef3484a8ed0f887a89d9151b8e56ef7c601435d26d1644438b2b55 SHA512 2e6228c3bffa7fa145fd3743b1220d96b5730350718b91be96600cb24317e17aa5138282fe2f603d00dadd57d7a832ecff21a570eab0c21426f94d3208a61184
-EBUILD icmake-9.02.09.ebuild 981 BLAKE2B 28118c59fde71bc8607fbe53519ddca7a88a62f3257fa4e66882821a051c6022fb44e659ac3f63c3e3d742dd527de82a3f8801ad7e3fe63085f425b337854df5 SHA512 373551e4cdfe94aac23b9bc27afc50a2eff4a8762cc2128e8a85b8322456b1c59e8dc586dca8f46c202c9b07413ad1f6aca79640a7cb65eb8594a560b6ac4ec6
-EBUILD icmake-9.03.01.ebuild 981 BLAKE2B c5a74e9e7dab180a4b36ce687be3ba7a8030a808c28a248dac7d67da7af766a36e9bc26dfcffa5b06df867c51a16730326188768ddb03f88270aa2a038ac91bf SHA512 5321a7ad64a30c60fba2d71169ba84e795d190502b5999aaab0951502f915f38900ce0d517236a2afea870a6c82735438cf2194fa8ab02128fb81c06b3255d9f
+EBUILD icmake-9.03.01.ebuild 1037 BLAKE2B b0ee8774d022d01adc6baa73af683113d7dc25f8499a9d7d8b6761e4a4985e39ec534dc504557518796e5d9209bffa5d84d473b29960679b2ef0cb93cbe6be0a SHA512 e8471fd45895dfec78623a48d41bed4a856ac84fc8597315b22d713015e8ab8d47d4e2636ac027d881c61cd17605a7273df909ff17bcad42293ac61d0ff40c57
 MISC metadata.xml 246 BLAKE2B 73f4de1e8aae25da0c39c9ed337dfcd7ddd49974f5fc9ac32722a14f541d78f9a946f42cb7d0bad28e77b84f23f07fc90d21039f802023439e6161329507d7f3 SHA512 f590d17146e0ea5b1cc9c4b318544e8af1cf4446769810bf37728008dda25d5e979c6b985e9e952e3b89ee6193aa0ab7b6549234c033f2f636d42f07babe13e4
diff --git a/dev-util/icmake/files/icmake-9.03.01-compressed-docs.patch b/dev-util/icmake/files/icmake-9.03.01-compressed-docs.patch
new file mode 100644
index 000000000000..a8bb04e3102e
--- /dev/null
+++ b/dev-util/icmake/files/icmake-9.03.01-compressed-docs.patch
@@ -0,0 +1,32 @@
+diff --git a/icm_bootstrap b/icm_bootstrap
+index 9a80252..78ece4f 100755
+--- a/icm_bootstrap
++++ b/icm_bootstrap
+@@ -45,11 +45,11 @@ cd doc
+ 
+ echo man-pages to tmp/${MANDIR}/man1 and .../man7
+ for x in *.1 ; do
+-    gzip -9cn $x > ../tmp/${MANDIR}/man1/$x.gz || exit 1
++    cp $x ../tmp/${MANDIR}/man1/$x || exit 1
+ done
+ 
+ for x in *.7 ; do
+-    gzip -9cn $x > ../tmp/${MANDIR}/man7/$x.gz  || exit 1
++    cp $x ../tmp/${MANDIR}/man7/$x || exit 1
+ done
+ 
+ echo documentation to tmp/${DOCDIR} and tmp/${DOCDOCDIR}
+@@ -58,11 +58,11 @@ echo documentation to tmp/${DOCDIR} and tmp/${DOCDOCDIR}
+ #    gzip -9cn $x > ../tmp/${DOCDOCDIR}/$x.gz  || exit 1
+ #done
+ 
+-gzip -9cn icmake.ps > ../tmp/${DOCDOCDIR}/icmake.ps.gz  || exit 1
++cp icmake.ps ../tmp/${DOCDOCDIR}/icmake.ps || exit 1
+ 
+ cd ..
+ 
+-gzip -9cn changelog > tmp/${DOCDIR}/changelog.gz || exit 1
++cp changelog tmp/${DOCDIR}/changelog || exit 1
+ 
+ try cp -r examples tmp/${DOCDOCDIR}
+ 
diff --git a/dev-util/icmake/icmake-9.02.09.ebuild b/dev-util/icmake/icmake-9.02.09.ebuild
deleted file mode 100644
index 4eea0292ebff..000000000000
--- a/dev-util/icmake/icmake-9.02.09.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="Hybrid between a make utility and a shell scripting language"
-HOMEPAGE="https://fbb-git.gitlab.io/icmake/ https://gitlab.com/fbb-git/icmake"
-SRC_URI="https://gitlab.com/fbb-git/${PN}/-/archive/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-S=${WORKDIR}/${P}/${PN}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-9.00.00-ar.patch
-	"${FILESDIR}"/${PN}-9.02.02-verbose-build.patch
-)
-
-src_prepare() {
-	default
-
-	sed -e "/^#define LIBDIR/s/lib/$(get_libdir)/" \
-		-e "/^#define DOCDIR/s/${PN}/${PF}/" \
-		-e "/^#define DOCDOCDIR/s/${PN}-doc/${PF}/" \
-		-i INSTALL.im || die
-
-	# fix build issues (bug #589896)
-	append-cflags -std=gnu99
-
-	tc-export AR CC
-}
-
-src_configure() {
-	./icm_prepare "${EROOT}" || die
-}
-
-src_compile() {
-	./icm_bootstrap "${EROOT}" || die
-}
-
-src_install() {
-	./icm_install all "${ED}" || die
-}
diff --git a/dev-util/icmake/icmake-9.03.01.ebuild b/dev-util/icmake/icmake-9.03.01.ebuild
index e6bd5c26d8b4..864297a798f1 100644
--- a/dev-util/icmake/icmake-9.03.01.ebuild
+++ b/dev-util/icmake/icmake-9.03.01.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
@@ -8,16 +8,16 @@ inherit toolchain-funcs flag-o-matic
 DESCRIPTION="Hybrid between a make utility and a shell scripting language"
 HOMEPAGE="https://fbb-git.gitlab.io/icmake/ https://gitlab.com/fbb-git/icmake"
 SRC_URI="https://gitlab.com/fbb-git/${PN}/-/archive/${PV}/${P}.tar.gz"
+S="${WORKDIR}/${P}/${PN}"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-S=${WORKDIR}/${P}/${PN}
-
 PATCHES=(
 	"${FILESDIR}"/${PN}-9.00.00-ar.patch
 	"${FILESDIR}"/${PN}-9.02.02-verbose-build.patch
+	"${FILESDIR}"/${PN}-9.03.01-compressed-docs.patch
 )
 
 src_prepare() {
@@ -35,11 +35,11 @@ src_prepare() {
 }
 
 src_configure() {
-	./icm_prepare "${EROOT}" || die
+	./icm_prepare "${EPREFIX}" || die
 }
 
 src_compile() {
-	./icm_bootstrap "${EROOT}" || die
+	./icm_bootstrap "${EPREFIX}" || die
 }
 
 src_install() {
diff --git a/dev-util/imediff2/Manifest b/dev-util/imediff2/Manifest
index 8c6af9f32335..594dae0027bc 100644
--- a/dev-util/imediff2/Manifest
+++ b/dev-util/imediff2/Manifest
@@ -1,4 +1,7 @@
 AUX 1.1.2-python-3.patch 4553 BLAKE2B bc16393f3c7071017255e8f188456e77d89a2ab2d605d6d99882aef4c65c7e5270a9348cf278a98d5ff7527423e899feffbb93b00f12a8c6e9a7b131acb86eba SHA512 fa5065572eb7fdbf38e3d7785ae92bddaeae8eadd9dbd006f5691c8647087df7529015750b66ea7618dd3306fcda80083c8dc2d2f019787137095db5b2c1a4d7
+AUX 1.1.2.1-python-3.patch 5273 BLAKE2B cb2be2f11021d61f998d228d26cfad956ec3c6d18aeafb7ece82d5f3de1e624776033746a51542b601d3ab94db2d57aece68315f772d8299f22b2010d2151905 SHA512 212cb76362c8243824d16f514a2dafc0c746467454c463e34f1840022d4a988874878e544ee944726947a287e5db27a78d2b99b790a78f4188d10ed9e2eaaea5
+DIST imediff2_1.1.2.1.orig.tar.gz 20393 BLAKE2B 560eef8600bac8ad302907563bd8520ef7881009c8a35c74427d0d5d9e8d4303446f1eb39c01fec201c798f286023765776a84b1e1aaa9e2d585a45870375f16 SHA512 ad0e22f5f2f16efb976a0d6d16c34798cc8aace4251a99cb7764df6841f93c2a6bb9dc8cbb59d8f3ae5a5ad7c161a05b9c3c7b36cc7bdf98eac3ef3b735ef6c4
 DIST imediff2_1.1.2.orig.tar.gz 17974 BLAKE2B f83b6ab652b1dd044587e75e4e7551a8132e1860b14f0d85d37f35383bd161a672860162e93554cf4db844d6a4700fa1876a30874c50fcb8442b4190a9b19185 SHA512 54d196d67107283bc3339eba30acb1c60972f256a268e86da397e0bdafa05220facc7979638a6a917b0c2dc7171edc3aa6b188295c9f40e9debf87a63731e748
 EBUILD imediff2-1.1.2-r6.ebuild 771 BLAKE2B 68df3929d880653a85a89528010aeec48043b4951b56c25d2e326e3f1ad29d2775d3e8ca213fbff5ab12f060ab58fab0d8c0ee4072c324c510d6863c8b929900 SHA512 b36d89729319f60d3f2a79c990f974da60be2b67621af2d85eb9f8f9b501620bf67f308481f1d25ff04cd09753d6629119c454c878a2f4dc4437e89030e8e4f2
+EBUILD imediff2-1.1.2.1.ebuild 796 BLAKE2B 23aed7033f68c4a254d57ac5f40fa6327f8cf6ca1033388d46bf73d9e12c198b4484eda34f226147de9e82102ebbc898864e6d46cac821f6cf1e67a1ad649694 SHA512 6adfa99837e2c7db132200ad70d989e4c01155eefb8b5756be9e93523552ab2efd4dd3dd4bc4a9d4ce50114d6aa50f5bd4c58c4959924d526d4c50d14ebe77cc
 MISC metadata.xml 270 BLAKE2B db96fa7275398e582ba29ef0506116343ffb732fb9f4885311a7ebb5db977382dddc2e9d05c57f53f87e2961dd8bf768336f7c7b8bb5e80ece44969bb1c7dbee SHA512 650922039b23e4a7727a2a4123577d872000f6fbcd303b45801ad9e00dbed3326aab1d69964d18c1f36779b91011016a8009157d04757f4a9fe777e6b01734b8
diff --git a/dev-util/imediff2/files/1.1.2.1-python-3.patch b/dev-util/imediff2/files/1.1.2.1-python-3.patch
new file mode 100644
index 000000000000..aa26ad7f9dbb
--- /dev/null
+++ b/dev-util/imediff2/files/1.1.2.1-python-3.patch
@@ -0,0 +1,157 @@
+diff -aurN a/imediff2 b/imediff2
+--- a/imediff2	2018-10-20 13:36:19.000000000 -0400
++++ b/imediff2	2021-03-03 10:03:31.121774492 -0500
+@@ -167,19 +167,19 @@
+ def read_lines( filename ):
+   global assume_empty
+   try:
+-    fp = file( filename )
++    fp = open( filename )
+     l = fp.readlines()
+     fp.close()
+     return l
+-  except IOError, (error, message):
+-    if error == errno.ENOENT and assume_empty:
++  except IOError as e:
++    if e.errno == errno.ENOENT and assume_empty:
+       return ""
+     else:
+-      sys.stderr.write(_("Could not read '%s': %s\n") % (filename, message))
++      sys.stderr.write(_("Could not read '%s': %s\n") % (filename, e.strerror))
+       sys.exit(3)
+ 
+ def strip_end_lines( txt ):
+-  return string.replace(string.replace(txt,"%c"%10,""),"%c"%13,"")
++  return txt.replace("%c"%10,"").replace("%c"%13,"")
+ 
+ def main(stdscr, lines_a, lines_b, start_mode):
+   global sel, active_chunks, x,y, lines, textpad, contw,conth
+@@ -283,7 +283,7 @@
+         active_chunks.append( [j, j+len(line_list), i] )
+ 
+       for l in line_list:
+-        lines.append( [string.expandtabs(strip_end_lines(l)),
++        lines.append( [strip_end_lines(l).expandtabs(),
+           decor, color_pair] )
+         j+=1
+ 
+@@ -332,9 +332,9 @@
+   def sel_next( dir ):
+     global sel, active_chunks
+     if dir == 'up':
+-      rng = range(sel-1, -1, -1)
++      rng = list(range(sel-1, -1, -1))
+     else:
+-      rng = range(sel+1, len(active_chunks))
++      rng = list(range(sel+1, len(active_chunks)))
+     for j in rng:
+       if active_chunks[j][1] > y and active_chunks[j][0] < y+winh:
+         sel = j
+@@ -487,7 +487,7 @@
+     elif c == ord('h') or c == ord('?') or c == curses.KEY_HELP:
+       helpw = 0
+       helph = 0
+-      for l in string.split(helptext(), "%c"%10):
++      for l in helptext().split("%c"%10):
+         helpw = max(helpw, len(l))
+         helph += 1
+       helppad = curses.newpad(helph+2, helpw+2)
+@@ -502,7 +502,7 @@
+     elif c == ord('q') or c == curses.KEY_CANCEL:
+       quitw = 0
+       quith = 0
+-      for l in string.split(quittext(), "%c"%10):
++      for l in quittext().split("%c"%10):
+         quitw = max(quitw, len(l))
+         quith += 1
+       quitpad = curses.newpad(quith+2, quitw+2)
+@@ -571,33 +571,33 @@
+ try:
+   opts, args = getopt.getopt(sys.argv[1:], "hmuo:abcNtV",
+     ["help","mono","unresolved","output=", "template", "version", "new-file"])
+-except getopt.GetoptError, e:
+-  print _("Error: ") + str(e)
+-  print usagetext()
++except getopt.GetoptError as e:
++  print((_("Error: ") + str(e)))
++  print(usagetext())
+   sys.exit(2)
+ 
+ for o, a in opts:
+   if o in ("-h", "--help"):
+-    print usagetext()
++    print((usagetext()))
+     sys.exit()
+   elif o in ("-t", "--template"):
+     try:
+       with open(config_file, 'w') as f:
+-        print >>f, "# Configuration for imediff2: (Erase this file to reset)"
+-        print >>f, "# <command_key_in_action> <command_key_in_manpage>"
+-        print >>f, "# edit only first character of each line to 'a'...'z'"
+-        print >>f, "#"
++        print(("# Configuration for imediff2: (Erase this file to reset)"), file=f)
++        print(("# <command_key_in_action> <command_key_in_manpage>"), file=f)
++        print(("# edit only first character of each line to 'a'...'z'"), file=f)
++        print(("#"), file=f)
+         for k in kcvalues:
+-          print >>f, "%s %s" % (k , k)
++          print(("%s %s" % (k , k)), file=f)
+     except:
+-      print "%s not writable, aborting" % config_file
++      print(("%s not writable, aborting" % config_file))
+     sys.exit()
+   elif o in ("-V", "--version"):
+-    print "%s %s" % (PACKAGE, VERSION)
++    print(("%s %s" % (PACKAGE, VERSION)))
+     sys.exit()
+ 
+ if len(args)<2:
+-  print usagetext()
++  print((usagetext()))
+   sys.exit(2)
+ 
+ for o, a in opts:
+@@ -692,14 +695,14 @@
+     assert( not editor is None )
+     try:
+       (of, of_name) = tempfile.mkstemp(prefix='imediff2')
+-      os.write( of, output )
++      os.write( of, output.encode() )
+       os.close(of)
+       time.sleep(0.1) # make the change visible - many editor look a lot like imediff2
+       editor_ret = os.system('%s %s' % (editor, of_name))
+       time.sleep(0.1)
+       if editor_ret == 0:
+         new_b_lines = read_lines(of_name)
+-        if string.join(new_b_lines, '') == output:
++        if ''.join(new_b_lines) == output:
+           chunk_mode = 'old'
+         elif new_b_lines != lines_a:
+           lines_b = new_b_lines
+@@ -707,8 +710,8 @@
+         else:
+           chunks = 'old'
+       os.unlink(of_name)
+-    except IOError, (error, message):
+-      sys.stderr.write(_("Could not write to '%s': %s\n") % (of_name, message));
++    except IOError as e:
++      sys.stderr.write(_("Could not write to '%s': %s\n") % (of_name, e.strerror));
+ 
+   if not launch_editor:
+     break
+@@ -719,11 +722,11 @@
+ else:
+   try:
+     if ofile is not None:
+-      of = file(ofile, 'wb')
+-      of.write( output )
++      of = open(ofile, 'wb')
++      of.write( output.encode() )
+       of.close()
+     sys.exit(0)
+-  except IOError, (error, message):
+-    sys.stderr.write(_("Could not write to '%s': %s\n") % (ofile, message));
++  except IOError as e:
++    sys.stderr.write(_("Could not write to '%s': %s\n") % (ofile, e.strerror));
+ 
+ sys.exit(3)
diff --git a/dev-util/imediff2/imediff2-1.1.2.1.ebuild b/dev-util/imediff2/imediff2-1.1.2.1.ebuild
new file mode 100644
index 000000000000..464fc4d97d24
--- /dev/null
+++ b/dev-util/imediff2/imediff2-1.1.2.1.ebuild
@@ -0,0 +1,40 @@
+# 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_REQ_USE="ncurses"
+
+inherit python-single-r1
+
+MY_P="${PN}_${PV}"
+
+DESCRIPTION="An interactive, user friendly 2-way merge tool in text mode"
+HOMEPAGE="https://elonen.iki.fi/code/imediff/"
+SRC_URI="mirror://debian/pool/main/i/${PN}/${MY_P}.orig.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${DEPEND}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+#S="${WORKDIR}/${PN}"
+
+PATCHES=( "${FILESDIR}/${PV}-python-3.patch" )
+
+src_compile() {
+	# Otherwise the docs get regenerated :)
+	:
+}
+
+src_install() {
+	python_doscript imediff2
+	dobin git-ime
+	dodoc AUTHORS README.md
+	doman imediff2.1 git-ime.1
+}
diff --git a/dev-util/jenkins-bin/Manifest b/dev-util/jenkins-bin/Manifest
index 170fcec02818..3dc916de1cf2 100644
--- a/dev-util/jenkins-bin/Manifest
+++ b/dev-util/jenkins-bin/Manifest
@@ -5,8 +5,12 @@ AUX jenkins-bin.service 499 BLAKE2B 28a90d5cf40e46880570e87acbc6d78766460faebc6e
 AUX jenkins-bin.service2 566 BLAKE2B 38511fddc783a70ae3deab70526c737a883ef090bcfb20216658b0775667022782f3ee8a6638515b46e6a4df96228fb2368521c74a0ddca2f121e9170549df8e SHA512 87b59349edcb1503e6c91440327092732f0dddb8cc35e4576c81da55e08a2ad67d462a4d871c46da4f3ed037de8b9109d766ba36ca9acf244506d129766ed5cb
 DIST jenkins-bin-2.263.3.war 67287051 BLAKE2B 376612f444d6827ad270f1121c2df3f134893eb9a501b919e2c1b506f0536b506a1158152541c46a211f55ecc62b39930024bf3457e2e550900e5aa98f368f39 SHA512 c8badbb4704ad60ede50d32b9df36ca8f78da7e4238e9277a26eaa90a16bd27106bf7e04497cf2bf2ef086befc8cfdb64db9af7f4ceccb1dc22d4e21e5898e68
 DIST jenkins-bin-2.263.4.war 67287029 BLAKE2B 0e5a510fab07fccebbfae7cf5b9accb88543e5ba7a7512d120db518afb4f80e9feeb6895c3227ff52da5286440a7cd226c172a77b10a4573df2917643a1df3a3 SHA512 4f648b372a51c01b04d2057b61d2a50b2abd5d3b282b3d790eb579ebba3381cdc3fda28bcb7bad0df4ff837f66b9074e8ade66309c38b52d1f3c22f1b8d0f63e
+DIST jenkins-bin-2.277.1.war 70886703 BLAKE2B f090aa2fd7ad7eb6e8ad46afe727c01cd0cb66408ae234c5f33abc5e45d3886d960e172e964443e88a3311a36cabc99e74385ff5744d6e1b920b6f911874a0c1 SHA512 4fe4076a3145b213c9e70e5b66ca9289e01d1c9bcd8587298e7cb40d4c3b0a6d647a1f055a1c6bac9b4a04068b33a83236a08bdbec81ccb823473b9df08478f9
 DIST jenkins-bin-2.280.war 73385503 BLAKE2B 4322a5f9d50236a7409ce30b8d6899abada57b94bda38f7e4734e44e22a7405f30cb12218789803c0adf02ba4d6738b1f9dd2210339c4f5528ec37fc8ecd1447 SHA512 91b61b12a4cf603e923882d91767a1fa43974c023ae52422dcaa79e770bcf0feedc2dfb3627898a3179c10a3f86c1bc7846ce9ad7bc834d46552889d45fb6ccb
+DIST jenkins-bin-2.283.war 71906683 BLAKE2B bd7dbf30d0c15263207a8e024750e706f58bdb26bcb41be91e454bfab3f40e74b075ab9f6c28686f42f8c2b02c8938887a0891caf71928405399bff6c02ffd92 SHA512 44009dd243df0e704562a0e9b85f1434294f17bb9410514b42f9195a1dc07e415b29de7167991a01eef52eb853b33ead77dafcae8a064db0488d3e636d739f6c
 EBUILD jenkins-bin-2.263.3-r1.ebuild 1102 BLAKE2B 560378478544d116efe5385cc2a5171f081d882a50c6b62a1ecbe48f18f271477d7ecabd478362cf30ad07561fb7ef9d623eedb2b55f249591029f2bc7da37df SHA512 a82442648b9a04c1faa77900388f81d138b4af4b21623ee67e75d6dc3d08d62b1800a9aa311b41b391c68af00e3662bd2f40bfc5236fb6830cb9f3cb2641d45d
 EBUILD jenkins-bin-2.263.4.ebuild 1102 BLAKE2B 560378478544d116efe5385cc2a5171f081d882a50c6b62a1ecbe48f18f271477d7ecabd478362cf30ad07561fb7ef9d623eedb2b55f249591029f2bc7da37df SHA512 a82442648b9a04c1faa77900388f81d138b4af4b21623ee67e75d6dc3d08d62b1800a9aa311b41b391c68af00e3662bd2f40bfc5236fb6830cb9f3cb2641d45d
+EBUILD jenkins-bin-2.277.1.ebuild 1102 BLAKE2B 560378478544d116efe5385cc2a5171f081d882a50c6b62a1ecbe48f18f271477d7ecabd478362cf30ad07561fb7ef9d623eedb2b55f249591029f2bc7da37df SHA512 a82442648b9a04c1faa77900388f81d138b4af4b21623ee67e75d6dc3d08d62b1800a9aa311b41b391c68af00e3662bd2f40bfc5236fb6830cb9f3cb2641d45d
 EBUILD jenkins-bin-2.280.ebuild 1095 BLAKE2B 1d093b0278f84e6859f84086f1535e639be595bab27450ec4149ee38f549f8e9c47197b541a6dc68d043339cd0e633bd7a689fa1a4e84a56aec0bcfb1b2c5bda SHA512 7cd242540c553714c013e65f6254a2cd67f36675b620f1d9155637ed67085714a15d0ce96de05da30950245fe85996528b3756d36b205d97a347323550a9a143
+EBUILD jenkins-bin-2.283.ebuild 1095 BLAKE2B 1d093b0278f84e6859f84086f1535e639be595bab27450ec4149ee38f549f8e9c47197b541a6dc68d043339cd0e633bd7a689fa1a4e84a56aec0bcfb1b2c5bda SHA512 7cd242540c553714c013e65f6254a2cd67f36675b620f1d9155637ed67085714a15d0ce96de05da30950245fe85996528b3756d36b205d97a347323550a9a143
 MISC metadata.xml 397 BLAKE2B b1a7fd87c8d5857ab102ec3d3bf5830c26c6988bb97caf89018b05e159f038c9c3a092b4f35788929d05042ac5cfd694bd03a8381686b9472880d0d205a451cd SHA512 4087fd799f4019f09103fb32d7f120e74d94715205bcc66858d11b9457774acaed37f3ad97ca0328f4ec28230a409dcfb0cbaceec142eb0a5fd3241ca35f8810
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.277.1.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.277.1.ebuild
new file mode 100644
index 000000000000..d60a4fb1e670
--- /dev/null
+++ b/dev-util/jenkins-bin/jenkins-bin-2.277.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd
+
+DESCRIPTION="Extensible continuous integration server"
+HOMEPAGE="https://jenkins.io/"
+LICENSE="MIT"
+SRC_URI="http://mirrors.jenkins-ci.org/war-stable/${PV}/${PN/-bin/}.war -> ${P}.war"
+SLOT="lts"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux"
+IUSE=""
+
+DEPEND="acct-group/jenkins
+	acct-user/jenkins"
+
+RDEPEND="acct-group/jenkins
+	acct-user/jenkins
+	media-fonts/dejavu
+	media-libs/freetype
+	!dev-util/jenkins-bin:0
+	>=virtual/jre-1.8.0"
+
+S="${WORKDIR}"
+
+src_install() {
+	local JENKINS_DIR=/var/lib/jenkins
+
+	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
+
+	insinto /opt/jenkins
+	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}-r1.logrotate ${PN/-bin/}
+
+	newinitd "${FILESDIR}"/${PN}.init2 jenkins
+	newconfd "${FILESDIR}"/${PN}.confd jenkins
+
+	systemd_newunit "${FILESDIR}"/${PN}.service2 jenkins.service
+
+	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
+}
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.283.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.283.ebuild
new file mode 100644
index 000000000000..960720966a1b
--- /dev/null
+++ b/dev-util/jenkins-bin/jenkins-bin-2.283.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd
+
+DESCRIPTION="Extensible continuous integration server"
+HOMEPAGE="https://jenkins.io/"
+LICENSE="MIT"
+SRC_URI="http://mirrors.jenkins-ci.org/war/${PV}/${PN/-bin/}.war -> ${P}.war"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux"
+IUSE=""
+
+DEPEND="acct-group/jenkins
+	acct-user/jenkins"
+
+RDEPEND="acct-group/jenkins
+	acct-user/jenkins
+	media-fonts/dejavu
+	media-libs/freetype
+	!dev-util/jenkins-bin:lts
+	>=virtual/jre-1.8.0"
+
+S="${WORKDIR}"
+
+src_install() {
+	local JENKINS_DIR=/var/lib/jenkins
+
+	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
+
+	insinto /opt/jenkins
+	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}-r1.logrotate ${PN/-bin/}
+
+	newinitd "${FILESDIR}"/${PN}.init2 jenkins
+	newconfd "${FILESDIR}"/${PN}.confd jenkins
+
+	systemd_newunit "${FILESDIR}"/${PN}.service2 jenkins.service
+
+	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
+}
diff --git a/dev-util/kdevelop-php/Manifest b/dev-util/kdevelop-php/Manifest
index 8e072dbc4978..a1e121de7eb2 100644
--- a/dev-util/kdevelop-php/Manifest
+++ b/dev-util/kdevelop-php/Manifest
@@ -1,5 +1,3 @@
-DIST kdev-php-5.6.1.tar.xz 1063372 BLAKE2B 4c7d3897c67629b6aafb8a2e04d080a3ab5fd3bbbd836fe09d41cbdc29a14367fc2b1dc790375e761917b81bce08b88737a1b4a03163743fad71eea1410a5d29 SHA512 45e84c7ecf293dfa48805c3a80804f468a5fb8019ea3ced6b8cc1cb9042d84774635bc58e2d61945c3e5a2e77d1bc139ecdf9ebc408157c640ccbcaa2c26f189
 DIST kdev-php-5.6.2.tar.xz 1063520 BLAKE2B b301f2da6c0936dd08f6a8ee72599e0c247c5efe18190e3c8fc7690a291d86f40f7fdffef7d036b8e5f258f749464c8aedd549feb0249d2d4fbbdefa41254307 SHA512 781ef76536b263c80be1de138b44cb3f979a1c941a868119069fa7265560d3078b9ea45be6cec30b481392a5ac69be100fe8ec3d106fffdbacf4c777045193fc
-EBUILD kdevelop-php-5.6.1.ebuild 1265 BLAKE2B d1b1b8e071a28cd998f56561c3e5a608551a2733a8351d400fef0a434685666158c91ed7f7841b0a827faf2450d1cfa8d461cc35864dcc8a5cca3f8abdcc19a2 SHA512 ff34b6d2b6ceaa3d15ff296bd88181160ec948a16b0f1f1a87a28222f245341458e5c0c325aef00b8ffe699ee0fde70c630900cabea1339cb2c9730dec43cd7e
-EBUILD kdevelop-php-5.6.2.ebuild 1263 BLAKE2B fc009b6c811c2900b1a8ef49043bce73ab4d33bfde21f5f9e62e37432fa11cfa5f15858702d8640911f83b3ab684452d2f05a316444ecb9c5c65d288b1340d75 SHA512 c35b1dd9aa80a5571a11c828581ce7e7c299857fef12ff0ee5df31c96c96f64f20589ff57e9543aa75787c8e985b3e537bb010cf707c3a268e12acd1fedd4668
+EBUILD kdevelop-php-5.6.2.ebuild 1261 BLAKE2B d2934b7b3537a9dea2f30951982fb7d4bfd5844fbd48829d1abf7e256408dafd3b89beb0a8c5a1c8d6ea22bc8879c0881f04eae9b1b700f3dee780d1dacda76e SHA512 8c9091b7fe2571ee1d423d1f55372da99e9b1abb2cc9eabbc1f44b42260c01ed684efa30ed831ff64ea2888e12559bbc39cdba151fef37e6b88ce816d92df58c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-util/kdevelop-php/kdevelop-php-5.6.1.ebuild b/dev-util/kdevelop-php/kdevelop-php-5.6.1.ebuild
deleted file mode 100644
index bdb5acce0f7b..000000000000
--- a/dev-util/kdevelop-php/kdevelop-php-5.6.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_HANDBOOK_DIR="docs"
-ECM_TEST="true"
-KDE_ORG_CATEGORY="kdevelop"
-KDE_ORG_NAME="kdev-php"
-KFMIN=5.74.0
-QTMIN=5.15.1
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="PHP plugin for KDevelop"
-HOMEPAGE="https://www.kdevelop.org/"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="5"
-IUSE=""
-
-BDEPEND="
-	test? ( dev-util/kdevelop:5[test] )
-"
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	dev-util/kdevelop-pg-qt:5
-	dev-util/kdevelop:5=
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/ktexteditor-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/threadweaver-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-# remaining tests fail for some, bug 668530
-RESTRICT+=" test"
-
-src_test() {
-	# tests hang, bug 667922
-	local myctestargs=(
-		-E "(completionbenchmark|duchain_multiplefiles)"
-	)
-	ecm_src_test
-}
diff --git a/dev-util/kdevelop-php/kdevelop-php-5.6.2.ebuild b/dev-util/kdevelop-php/kdevelop-php-5.6.2.ebuild
index 02ca653bf56c..e0cb6de71fa5 100644
--- a/dev-util/kdevelop-php/kdevelop-php-5.6.2.ebuild
+++ b/dev-util/kdevelop-php/kdevelop-php-5.6.2.ebuild
@@ -17,7 +17,7 @@ DESCRIPTION="PHP plugin for KDevelop"
 HOMEPAGE="https://kdevelop.org/"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-2 LGPL-2"
diff --git a/dev-util/kdevelop-python/Manifest b/dev-util/kdevelop-python/Manifest
index 69948e853478..635b5294622c 100644
--- a/dev-util/kdevelop-python/Manifest
+++ b/dev-util/kdevelop-python/Manifest
@@ -1,5 +1,3 @@
-DIST kdev-python-5.6.1.tar.xz 1071080 BLAKE2B f9972f6460723bc4822b00e49ab35f74eecc86cfb642fe76d98f551519f8ab690d6c5b6bbd7db778a3a62a1d11e81f8a0ea39fda91120b951b0fb80667d52b64 SHA512 bdf05ed098cfbca395c8c82650c278f33bd5878a08527f43d555e905142b3b486267d37789cbe9bf4924162fb9c3024c13e445a2f1d408626861b96c96103e12
 DIST kdev-python-5.6.2.tar.xz 1072212 BLAKE2B 06f75d55a6c4171f6f2cfd219cfb5c54308db82dead25e9b79538ff04c7a0edd05ca5135121a923e7e169317a124d64f53da52e2226d59793d9a6c3c1ddfa6d3 SHA512 c0ecf9c075fe8c18e31152b774e76596367bb5eca8bb5ec976e9ce90ce78512d9e42bc95daea0f1de18474ef4deee430674e186263736df0de67d7d26c81f6a0
-EBUILD kdevelop-python-5.6.1.ebuild 1276 BLAKE2B d83cc1ec21061a6d542d068937dbed25afb4905b431aa12b9bb58f78effada07aaf35ca0d7a30a4255291b22c28cb6c00a7310fdae279778c30b37e653af8d7a SHA512 56bd86795497d846f713346714e22eb3be3befcfa16acd949a6021fe6fd2ed54036ed396ec83ae62e4ca23e52039d1e2befc536ed5c3b00400c9d1ea29e48f2d
-EBUILD kdevelop-python-5.6.2.ebuild 1273 BLAKE2B 8e01ee9428387cae7648fc6a4ac0aa29c546d5030e885ce5b37fec5b83d97f351cf7c3930b9d49bb35f79a746481d8ea0ab89aeff84c099ade51ba2616b8abfa SHA512 cf77e6407c981ce81bf14cc553e95abf8e60234b30d8ba7735b30f2c3958e1857d3f8cc2d22b4ad5bc9b5a6cac29a7cade3587a9988d3bfb2346a070f800f566
+EBUILD kdevelop-python-5.6.2.ebuild 1271 BLAKE2B d23f3824f85ec88ca8eaf1497fe8a2c98b0cb0249d8383228a7cdb58aceb51d6d3e889854c445fb0b39d74864a50399f3c0a19db74afde94c73e6635a090806e SHA512 0de7df8c6a2e9c1db9b2e67ea0deaab68fbf586d4542f1bdecdec7ffd9e23d4105f68c0a63f6194c523876f56cdfdb1dece8b8da4f509ac3006f7deb47bb9e2d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-util/kdevelop-python/kdevelop-python-5.6.1.ebuild b/dev-util/kdevelop-python/kdevelop-python-5.6.1.ebuild
deleted file mode 100644
index 26f9313aa621..000000000000
--- a/dev-util/kdevelop-python/kdevelop-python-5.6.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-KDE_ORG_CATEGORY="kdevelop"
-KDE_ORG_NAME="kdev-python"
-PYTHON_COMPAT=( python3_{7,8,9} )
-KFMIN=5.74.0
-QTMIN=5.15.1
-inherit ecm kde.org python-single-r1
-
-DESCRIPTION="Python plugin for KDevelop"
-HOMEPAGE="https://www.kdevelop.org/"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	dev-util/kdevelop:5=
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/ktexteditor-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/threadweaver-${KFMIN}:5
-"
-RDEPEND="${DEPEND}
-	$(python_gen_cond_dep '
-		dev-python/pycodestyle[${PYTHON_MULTI_USEDEP}]
-	')
-"
-
-RESTRICT+=" test"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	ecm_pkg_setup
-}
diff --git a/dev-util/kdevelop-python/kdevelop-python-5.6.2.ebuild b/dev-util/kdevelop-python/kdevelop-python-5.6.2.ebuild
index c0457e34f51b..cab587824b4e 100644
--- a/dev-util/kdevelop-python/kdevelop-python-5.6.2.ebuild
+++ b/dev-util/kdevelop-python/kdevelop-python-5.6.2.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Python plugin for KDevelop"
 HOMEPAGE="https://kdevelop.org/"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-2" # TODO: CHECK
diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
index ab00a187c917..da1bde03bfcd 100644
--- a/dev-util/kdevelop/Manifest
+++ b/dev-util/kdevelop/Manifest
@@ -1,5 +1,3 @@
-DIST kdevelop-5.6.1.tar.xz 7130284 BLAKE2B 989218ec07d437d641033b7895b533a4f92b8c557e73bac0e3671a34335aac02936eeb3b73b95d1a7bbab6ad8b32a21f15db1d5af0485999fa2f7eb24b9e8bb6 SHA512 a03e22d57b5d556489e3e140e4cad6939170087a36afa8c755318ff6b5101806b8df82bd402e32daa715f4a72352dada1c2ce3ff4455dcac0debe6456c0bc7cd
 DIST kdevelop-5.6.2.tar.xz 7128828 BLAKE2B 605b16f1666201f49e119499007a2031c4a2b28e7eb5c3b7bbf8bcd8aa2dc069708740831dc9fe327a8c9baebeffeeda5dd6d16c24c21a2be66c7475bf194423 SHA512 d5ec09b3eda439436bee4dee88612deedf02caf949e74cb7d8405fbb40ae6f16ae1b5278da0574f41c43d186edbeec6b8c40918ef7f5fafa437e07a8c4ae92ce
-EBUILD kdevelop-5.6.1.ebuild 4068 BLAKE2B 53311b167862220919bbc0ef75d6b681a66401195366a762548920f96909e7cd0f41ef6c3363cea020d27de1e3d2d93239f7160a6d4e3ff42854897c381d62e8 SHA512 4b4f6349f4692ef37fb1c4f658129186fd75ae49291238620294c46893a1bb2537fa70cbb096943d268a3532248abc1d383ad346b8ea2f739f87db02cf4a9942
-EBUILD kdevelop-5.6.2.ebuild 4205 BLAKE2B e6afd6d47514b78a64baf3b8cdf432d5934c08d0db6c25e2e417d77c4bb4942ec1fa8cd5cea4bd91a7062abd0741db8c151f3c82c0133595f38f46d6b8039475 SHA512 f5643545956ef7716f65d0833f84ff5e7d1bb6eba722c3b2f613c43c7ca7a97c459171852936891789461dda052832d701a1729270699e27fdfcfcd2c8210890
+EBUILD kdevelop-5.6.2.ebuild 4203 BLAKE2B 2d99a87b6ab06674f156c6bf343ccf65e0452bbe61bccebfea725d90e718c21cf053df76512e0ff8e9ec6c90e0095626961eafa4d7ed4be0ecdcc066b6da0dcc SHA512 f06867453cf859b5ae9cf610ecf49afc6145217169e9f0eee281e1fe582da0b9fa60e51f4bd1c6b3dcf3f2424aa55692a9567aeb65c024dc2258f5d14ba8b3c0
 MISC metadata.xml 554 BLAKE2B 4e34566d1ec19cb7589766d89dafabfb0b50698afdcffd9c217108cb0f5940d27c367f44cf1f6be491814f3874c67e96ebf9cbf517670091e6fa36f3a8471bd9 SHA512 33f889291d1c2b4ddf7ad8fdd33d74758090e401b093d3f7691bfe6569ab068720811747380275db58b2160fd1b301126576721d0c2c61f04e917560af2c33ac
diff --git a/dev-util/kdevelop/kdevelop-5.6.1.ebuild b/dev-util/kdevelop/kdevelop-5.6.1.ebuild
deleted file mode 100644
index d1befe2159c6..000000000000
--- a/dev-util/kdevelop/kdevelop-5.6.1.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="true"
-KDE_ORG_CATEGORY="kdevelop"
-KFMIN=5.74.0
-QTMIN=5.15.1
-VIRTUALDBUS_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org optfeature
-
-DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and much more"
-HOMEPAGE="https://kdevelop.org/"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	KEYWORDS="amd64 ~arm64 x86"
-fi
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="5/56" # look at KDEVELOP_SOVERSION inside CMakeLists.txt
-IUSE="+gdbui hex +plasma +qmake reviewboard subversion"
-
-COMMON_DEPEND="
-	dev-libs/grantlee:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qthelp-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qttest-${QTMIN}:5
-	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=dev-util/astyle-3.1:=
-	kde-apps/libkomparediff2:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktexteditor-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/sonnet-${KFMIN}:5
-	>=kde-frameworks/threadweaver-${KFMIN}:5
-	>=sys-devel/clang-6.0:=
-	gdbui? ( kde-plasma/libksysguard:5= )
-	hex? ( app-editors/okteta:5 )
-	plasma? (
-		>=kde-frameworks/krunner-${KFMIN}:5
-		>=kde-frameworks/plasma-${KFMIN}:5
-	)
-	qmake? ( dev-util/kdevelop-pg-qt:5 )
-	reviewboard? ( >=kde-frameworks/purpose-${KFMIN}:5 )
-	subversion? (
-		dev-libs/apr:1
-		dev-libs/apr-util:1
-		dev-vcs/subversion
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-"
-RDEPEND="${COMMON_DEPEND}
-	>=dev-qt/qdbus-${QTMIN}:5
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	dev-util/ninja
-	kde-apps/kapptemplate:5
-	kde-apps/kio-extras:5
-	>=sys-devel/gdb-7.0[python]
-	reviewboard? ( kde-apps/ktp-accounts-kcm:5 )
-	!dev-util/kdevelop-clang-tidy
-"
-
-RESTRICT+=" test"
-# see bug 366471
-
-src_configure() {
-	local clang_version=$(best_version sys-devel/clang)
-	local llvm_root="/usr/lib/llvm/$(ver_cut 1 ${clang_version##sys-devel/clang-})"
-
-	local mycmakeargs=(
-		-DLLVM_ROOT=${llvm_root}
-		$(cmake_use_find_package gdbui KSysGuard)
-		-DBUILD_executeplasmoid=$(usex plasma)
-		$(cmake_use_find_package plasma KF5Plasma)
-		$(cmake_use_find_package hex OktetaKastenControllers)
-		$(cmake_use_find_package qmake KDevelop-PG-Qt)
-		$(cmake_use_find_package reviewboard KF5Purpose)
-		$(cmake_use_find_package subversion SubversionLibrary)
-	)
-
-	use gdbui || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KF5SysGuard=ON )
-	use reviewboard || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KDEExperimentalPurpose=ON )
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "Optional dependencies:"
-		optfeature "konsole view" kde-apps/konsole
-		optfeature "Static C++ Qt code analysis" dev-util/clazy
-		optfeature "Static C/C++ code analysis" dev-util/cppcheck
-		optfeature "Heap memory profiling" dev-util/heaptrack[qt5]
-		optfeature "Meson Project manager plugin" dev-util/meson
-	fi
-	ecm_pkg_postinst
-}
diff --git a/dev-util/kdevelop/kdevelop-5.6.2.ebuild b/dev-util/kdevelop/kdevelop-5.6.2.ebuild
index 9ca60dd1d33a..ed0df4b7fe8c 100644
--- a/dev-util/kdevelop/kdevelop-5.6.2.ebuild
+++ b/dev-util/kdevelop/kdevelop-5.6.2.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and mu
 HOMEPAGE="https://kdevelop.org/"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 fi
 
 LICENSE="GPL-2 LGPL-2"
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index 584c0c4d5dc2..4fdcae8c9cf9 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -2,16 +2,14 @@ DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3
 DIST llvmorg-11.0.0.tar.gz 122743665 BLAKE2B 3f95570240789fd68ddb747df817f5c6cdc9da40911bbe9ee3531c15ada9165e5002b1c2f778cf8735858485ea05a8754e3d3a5f4b15bdd6cb33d64a14692984 SHA512 b6d38871ccce0e086e27d35e42887618d68e57d8274735c59e3eabc42dee352412489296293f8d5169fe0044936345915ee7da61ebdc64ec10f7737f6ecd90f2
 DIST llvmorg-11.0.1.tar.gz 122790338 BLAKE2B 0130996b4a8c4d9f757136fd7fb318068c9bfdc565060dec0d4336480c4ab66c4ae3185a7fdb05f13cf9ee8fd4123b09df938881b75d6e5d3689595114b7e32a SHA512 f5e6ef0b3111aae08a89cd01adb2ff4abfa9ef779c68b9190421d0447efd25c2cc00e5aae9f4764805f5fa31434866043d1510ae7389817e28ae53a5442e2fdf
 DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81
-DIST llvmorg-12.0.0-rc1.tar.gz 134164708 BLAKE2B d4261ff7d9586b47f4cfda3d2cda4b76534f9e17fbd5cdb8861895b8eb466021962f4608bfcdeb52f8fce78850a994fd5eda0560f7211e5c8d1ac9330a738a36 SHA512 3d07d013d0705bb99f56898cc55d054d0d95aeb53b3c756cfab80b4c9097cc4935bcea89b9efde2e503a899b9fccf0dacc0073c9991c8ea352755c5ec68a757a
 DIST llvmorg-12.0.0-rc2.tar.gz 134242619 BLAKE2B bb741a311db608fc2ba7eeaab71c5c9f2a430f7fee3f0c5c4334e5c14caa19738d18c87b568de963d57d9b53e808ac412cf8554eca7fcae9ecca65aa4442e197 SHA512 d8f9b3dfeb0fe9b91eb7f49da393784333044db2653373fbb168afd3c8d50f3e3ec7a7b8f44df522d0facafbfe4cfc4d9e2906d19f1e6feb0bdc569b6c10a17d
-DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
-EBUILD lldb-10.0.1.ebuild 2335 BLAKE2B 662414b8dfc8cd767c39c86276645af44f50bb3fa6ce4b1922400bb5a6e27acd18410aeb63f026a06e7bf025ff2648ae1d5d5c60c61a4f66fe1465018acb8011 SHA512 25d70f6228848646b46080c89ed53d47a4cd4d32412f1e7d5e056ca9799001e1055093c1f81437d7d509f01be3f8ca66604094535da8d22d52353889db589555
-EBUILD lldb-11.0.0.ebuild 2383 BLAKE2B 8f9b788255186f72bc366551ef6d80b9c5d145672990206cbfe40dbe8419e2311519f261ba8130d466733dbe8174a8ec74e94d9b0a4393ccd49e1b23d5c3bb03 SHA512 d71f4ec94ddd375b037f5c48f0f906863a5d823c1f77d367236f347caf07708de5edf2e8d7324791c0b7f5f0fa1eed94e7a017025fffe3a9605786d4cf59f6a4
-EBUILD lldb-11.0.1.ebuild 2342 BLAKE2B 7ed569c1dccae78593f55d798024b9fe3fdcbcee63b9bf332ae1f3c6602d5e90408b19a9cdf87e48a5ee06757487ad505ad09d9cae1a9b6c7482eaf4511b4389 SHA512 3b9ca0ab823a712c74e80b52461fd79e320f6f51d18f530f9b5c8743fb60762520544765c53612f5753ea02de50a8ca8081ff5c78646622a393819c6c271d2c1
-EBUILD lldb-11.1.0.ebuild 2346 BLAKE2B c5d93a7cd2e140351b9307684df9dd66f987d66c55f6650d07a888e358905e354ba7ce19d2c142c47896e93b6dcaf7c9640cf336359715de62bec902966cf013 SHA512 2550bc7de00480ed4a186975e2a1f32e29644f21c63f51619e00d6b4dacbbf1cfd7957ba41a8a8555788c8070295aefdca1ae237d9990544bc87a566b3b581a7
-EBUILD lldb-12.0.0.9999.ebuild 2395 BLAKE2B 30abaf03d119e20086ce988473c097d6495c4a04d4b17cf78ed8cb4c017a5d4721cdac7baace5c4fa666683b2f6e24f7d462cfb570bb92cb50491098211be0a5 SHA512 27e26543ede484152ba194e288ba8dee4897cba401cd4adb6039a214685c496c9c7fb2dd1b3376b0621c29749bdbc5228985862beccb08eb156a31c89f3861bc
-EBUILD lldb-12.0.0_rc1.ebuild 2395 BLAKE2B 30abaf03d119e20086ce988473c097d6495c4a04d4b17cf78ed8cb4c017a5d4721cdac7baace5c4fa666683b2f6e24f7d462cfb570bb92cb50491098211be0a5 SHA512 27e26543ede484152ba194e288ba8dee4897cba401cd4adb6039a214685c496c9c7fb2dd1b3376b0621c29749bdbc5228985862beccb08eb156a31c89f3861bc
-EBUILD lldb-12.0.0_rc2.ebuild 2395 BLAKE2B 30abaf03d119e20086ce988473c097d6495c4a04d4b17cf78ed8cb4c017a5d4721cdac7baace5c4fa666683b2f6e24f7d462cfb570bb92cb50491098211be0a5 SHA512 27e26543ede484152ba194e288ba8dee4897cba401cd4adb6039a214685c496c9c7fb2dd1b3376b0621c29749bdbc5228985862beccb08eb156a31c89f3861bc
-EBUILD lldb-13.0.0.9999.ebuild 2395 BLAKE2B 30abaf03d119e20086ce988473c097d6495c4a04d4b17cf78ed8cb4c017a5d4721cdac7baace5c4fa666683b2f6e24f7d462cfb570bb92cb50491098211be0a5 SHA512 27e26543ede484152ba194e288ba8dee4897cba401cd4adb6039a214685c496c9c7fb2dd1b3376b0621c29749bdbc5228985862beccb08eb156a31c89f3861bc
-EBUILD lldb-9.0.1-r1.ebuild 2387 BLAKE2B de659a1c72e14f14b0203769c256a1df2220fb53b053c6320c7c4feba598c061082e77140d514a95631047065beb79363a3b1f03077c8f4a658e31b5bf2ae112 SHA512 b0f7d2a2d8196088e7356b04af0d1a762fdb23c9b4f4943fdfdbd58c8309d81fa41bb3993cd8c5c1cb57233779ced4d61c73dbbc980654bf25ea89f9a2026610
+DIST llvmorg-12.0.0-rc3.tar.gz 134244008 BLAKE2B ed09aa361b264387711ba1ee2e4b01c0c78ad97391df95e2542d4edc31f657cc33c8a2a45de63eb421908d5dadd9392a736610fbb04b3ecbd336d6514a649da8 SHA512 1fae53c6f255160cf4be53848b8b92c8b162ddcfbddf1bf0017faf249859040c15c862c4b52bc3ba894149139afb814e0674da88793ddebfc0756ba3aa7626ce
+EBUILD lldb-10.0.1.ebuild 2336 BLAKE2B a9ddc5d6965882c37d0cf11e6331e77130c16ea9d60a90c8733c67b8bef0e947656a0c9e1888d483d4b497453475490b9d8bdd85f1396a8be605efec076d5db8 SHA512 7b352de97e3c2cfbf75e724f2e8a6b393bfc5d6240c4067f4f7bf3d04c52e769de6cf85743635410ea4938e587acc4fc925eb501e51733c6a80d442e0df098a0
+EBUILD lldb-11.0.0.ebuild 2384 BLAKE2B 3b2d520abc4918dd63464f0e7716545e2ee9e1c4592a2acc82df183884ff544343000ab99369c3d4b28dc3349e5816b652a2574998cb6ce2daa2c567e67d0c72 SHA512 6fdd05a0e945cf43735be94eccd31928dcf9a16ff5934cc1028495d6446ad474b0e461dff7b4326475116c4762200dae21986f600d4edd8f2f066e2e3d27da0b
+EBUILD lldb-11.0.1.ebuild 2343 BLAKE2B ad45919d6e378904f946147277776a8f8dab3b16c64a0ee7f92e5d11d5efc67896151c1f90cf7fd08109b2343816222b1dee706bfa3c14de3ccd1c160091b4bb SHA512 461a00a379331e6e47115c412878d8bac8c8f04f233d7245548769527809a02672e3cefbcbfa3c39e2d71db1b144693fa57ce5f3328d57cd078f49683654d488
+EBUILD lldb-11.1.0.ebuild 2347 BLAKE2B ca289b5db493e7437ef0c973e8f500d5826659640c53371cbd934ebeb9f6afe519dab86e840fc3b1593f3e06cad5d939640a1ccf2d83662dd8771fb654c2ea18 SHA512 a92cb6f9379787b0cf52d1f6548d3fde5ff3d39bb629e5bc6a56d6755e340d1d7e883fde11122f751c2af87c71dcfc46f397c49a036342cf453ce2293252802b
+EBUILD lldb-12.0.0.9999.ebuild 2396 BLAKE2B 113bec8d6f4cce99e0156c39fc23deb6fc90a220aaedbfec32769174a33bb40856e5afee02dad197b40e445df71cd2829a1198a7821ef661f28ce42e28b3f5e3 SHA512 7947f7f49e61d05c1dc8b21171d1b462ff2058f2bdaa080ffd3ff65b4cf7cc74084008e8aa9235627de6d4ef156121ebb6c20c353663d379f2d9aae1661179b6
+EBUILD lldb-12.0.0_rc2.ebuild 2396 BLAKE2B 113bec8d6f4cce99e0156c39fc23deb6fc90a220aaedbfec32769174a33bb40856e5afee02dad197b40e445df71cd2829a1198a7821ef661f28ce42e28b3f5e3 SHA512 7947f7f49e61d05c1dc8b21171d1b462ff2058f2bdaa080ffd3ff65b4cf7cc74084008e8aa9235627de6d4ef156121ebb6c20c353663d379f2d9aae1661179b6
+EBUILD lldb-12.0.0_rc3.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-10.0.1.ebuild b/dev-util/lldb/lldb-10.0.1.ebuild
index 17ca48825a08..cfa0554e3d16 100644
--- a/dev-util/lldb/lldb-10.0.1.ebuild
+++ b/dev-util/lldb/lldb-10.0.1.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
@@ -15,7 +15,7 @@ llvm.org_set_globals
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
 KEYWORDS="amd64 arm arm64 x86"
-IUSE="libedit lzma ncurses +python test"
+IUSE="+libedit lzma ncurses +python test"
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/lldb/lldb-11.0.0.ebuild b/dev-util/lldb/lldb-11.0.0.ebuild
index 00101a06301f..85a204ae19d2 100644
--- a/dev-util/lldb/lldb-11.0.0.ebuild
+++ b/dev-util/lldb/lldb-11.0.0.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
@@ -15,7 +15,7 @@ llvm.org_set_globals
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
 KEYWORDS="amd64 arm arm64 x86"
-IUSE="libedit lzma ncurses +python test"
+IUSE="+libedit lzma ncurses +python test"
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
 RESTRICT="test"
 
diff --git a/dev-util/lldb/lldb-11.0.1.ebuild b/dev-util/lldb/lldb-11.0.1.ebuild
index 64749354423e..0286a1fce5d7 100644
--- a/dev-util/lldb/lldb-11.0.1.ebuild
+++ b/dev-util/lldb/lldb-11.0.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://llvm.org/"
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
 KEYWORDS="amd64 arm arm64 x86"
-IUSE="libedit lzma ncurses +python test"
+IUSE="+libedit lzma ncurses +python test"
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
 RESTRICT="test"
 
diff --git a/dev-util/lldb/lldb-11.1.0.ebuild b/dev-util/lldb/lldb-11.1.0.ebuild
index 1159918d63be..88ffd4918a1e 100644
--- a/dev-util/lldb/lldb-11.1.0.ebuild
+++ b/dev-util/lldb/lldb-11.1.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://llvm.org/"
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="libedit lzma ncurses +python test"
+IUSE="+libedit lzma ncurses +python test"
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
 RESTRICT="test"
 
diff --git a/dev-util/lldb/lldb-12.0.0.9999.ebuild b/dev-util/lldb/lldb-12.0.0.9999.ebuild
index c5c517112bef..283e64ba210c 100644
--- a/dev-util/lldb/lldb-12.0.0.9999.ebuild
+++ b/dev-util/lldb/lldb-12.0.0.9999.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://llvm.org/"
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
 KEYWORDS=""
-IUSE="libedit lzma ncurses +python test"
+IUSE="+libedit lzma ncurses +python test"
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
 RESTRICT="test"
 
diff --git a/dev-util/lldb/lldb-12.0.0_rc2.ebuild b/dev-util/lldb/lldb-12.0.0_rc2.ebuild
index c5c517112bef..283e64ba210c 100644
--- a/dev-util/lldb/lldb-12.0.0_rc2.ebuild
+++ b/dev-util/lldb/lldb-12.0.0_rc2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://llvm.org/"
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
 KEYWORDS=""
-IUSE="libedit lzma ncurses +python test"
+IUSE="+libedit lzma ncurses +python test"
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
 RESTRICT="test"
 
diff --git a/dev-util/lldb/lldb-12.0.0_rc1.ebuild b/dev-util/lldb/lldb-12.0.0_rc3.ebuild
index c5c517112bef..283e64ba210c 100644
--- a/dev-util/lldb/lldb-12.0.0_rc1.ebuild
+++ b/dev-util/lldb/lldb-12.0.0_rc3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://llvm.org/"
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
 KEYWORDS=""
-IUSE="libedit lzma ncurses +python test"
+IUSE="+libedit lzma ncurses +python test"
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
 RESTRICT="test"
 
diff --git a/dev-util/lldb/lldb-13.0.0.9999.ebuild b/dev-util/lldb/lldb-13.0.0.9999.ebuild
index c5c517112bef..283e64ba210c 100644
--- a/dev-util/lldb/lldb-13.0.0.9999.ebuild
+++ b/dev-util/lldb/lldb-13.0.0.9999.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://llvm.org/"
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
 KEYWORDS=""
-IUSE="libedit lzma ncurses +python test"
+IUSE="+libedit lzma ncurses +python test"
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
 RESTRICT="test"
 
diff --git a/dev-util/lldb/lldb-9.0.1-r1.ebuild b/dev-util/lldb/lldb-9.0.1-r1.ebuild
deleted file mode 100644
index 8ae86ae5c1f3..000000000000
--- a/dev-util/lldb/lldb-9.0.1-r1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_7 )
-inherit cmake-utils llvm llvm.org multiprocessing python-single-r1 \
-	toolchain-funcs
-
-DESCRIPTION="The LLVM debugger"
-HOMEPAGE="https://llvm.org/"
-LLVM_COMPONENTS=( lldb )
-LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest )
-llvm.org_set_globals
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 x86"
-IUSE="libedit ncurses +python test"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	libedit? ( dev-libs/libedit:0= )
-	ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
-	python? (
-		$(python_gen_cond_dep '
-			dev-python/six[${PYTHON_MULTI_USEDEP}]
-		')
-		${PYTHON_DEPS}
-	)
-	~sys-devel/clang-${PV}[xml]
-	~sys-devel/llvm-${PV}
-	!<sys-devel/llvm-4.0"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	python? ( >=dev-lang/swig-3.0.11 )
-	test? (
-		$(python_gen_cond_dep "
-			~dev-python/lit-${PV}[\${PYTHON_MULTI_USEDEP}]
-		")
-		sys-devel/lld )
-	${PYTHON_DEPS}"
-
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLLDB_DISABLE_CURSES=$(usex !ncurses)
-		-DLLDB_DISABLE_LIBEDIT=$(usex !libedit)
-		-DLLDB_DISABLE_PYTHON=$(usex !python)
-		-DLLDB_USE_SYSTEM_SIX=1
-		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
-
-		-DLLDB_INCLUDE_TESTS=$(usex test)
-
-		# TODO: fix upstream to detect this properly
-		-DHAVE_LIBDL=ON
-		-DHAVE_LIBPTHREAD=ON
-
-		# normally we'd have to set LLVM_ENABLE_TERMINFO, HAVE_TERMINFO
-		# and TERMINFO_LIBS... so just force FindCurses.cmake to use
-		# ncurses with complete library set (including autodetection
-		# of -ltinfo)
-		-DCURSES_NEED_NCURSES=ON
-	)
-	use test && mycmakeargs+=(
-		-DLLVM_BUILD_TESTS=$(usex test)
-		# compilers for lit tests
-		-DLLDB_TEST_C_COMPILER="$(type -P clang)"
-		-DLLDB_TEST_CXX_COMPILER="$(type -P clang++)"
-
-		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
-		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-		-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	local -x LIT_PRESERVES_TMP=1
-	cmake-utils_src_make check-lldb-lit
-	use python && cmake-utils_src_make check-lldb
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	use python && python_optimize
-}
diff --git a/dev-util/ltrace/Manifest b/dev-util/ltrace/Manifest
index ea8ec6c37f93..fb1edb054455 100644
--- a/dev-util/ltrace/Manifest
+++ b/dev-util/ltrace/Manifest
@@ -1,5 +1,6 @@
 AUX ltrace-0.7.3-CXX-for-tests.patch 255 BLAKE2B cd213eff103c4efa9a96a28a333825b32b43333b07a6e25ccbf5a216ba12a0fa1e38f5a1b4644ca19f9eec0df0cddb8fae95a92e5e44af497aacc448a2eb58c6 SHA512 02ecca05ff34739c234f9b3a2331b10f2bb62289c2698095a4276fdb76d3494e1657c7551a5933876bf5b722db3a1c62dd839db7768ebd69c897b4a109bd5cc5
 AUX ltrace-0.7.3-alpha-protos.patch 541 BLAKE2B 727e9acb2c12cfda3d5c15903bda8bff9e8f8823a03daa3031d4cb022b9735026e14d9e6d756c568a92401f546589aa94b099c27d6fa1555d365b0d00ce041a2 SHA512 32738dd0688c861961703a5e5c0e14324218f3ecdfdbcef0977522e2de1c9d77fc0fa1a3ea0d2074190293bf360cf8b5adfa16c67a002a1df38e37c70c024595
+AUX ltrace-0.7.3-disable-munmap-test.patch 629 BLAKE2B 52b8f22ea7f59642899dd39a7967c96aa32a7576afd28f332613c1fecafa224b0284fd028dd1e3e38dabe13f30abda7fef4db1a0c7dd1027d922967d3b170a94 SHA512 55d7b318b64100d6712fa7e3c89fe000d1bd1c743384cdf7d1cc7e32aba5763138bb444d5cb6df368b339c2211ad7c10eb41cefcdd4ccbd5c308d11e23c4d8ef
 AUX ltrace-0.7.3-ia64-pid_t.patch 184 BLAKE2B 4d739f7ad6474541cec166cc1262637edbf30b32ef3335ac92e834bd611472de5473801ad307b7ba56eec0657bbcceea48d7fe17517663c6389d0843e9a9d5bc SHA512 1029f86f3b3e33eebcdbafa6dc56e2ece2a33234a6b7a0b05e4bb87424829c5f512e019e6c6a962e639a9cfeac56edea3d0ac250fc31489755e68d2181ce254f
 AUX ltrace-0.7.3-ia64.patch 1538 BLAKE2B 2a407d2e19e74ddf22da1371cf72585cec5c630d00670798c6c8e9b3991d3aac641784bceeda544b49e76ae572c487bc5455de4239aa967e25318625e0307e0f SHA512 c6e7576047aa06eca67a80ecaa008854a2e312b1d38693cc802a6b6be6f671003716c6a0d3268fb3f076f3311fb27c228f55220bcb2432afd0210542020764ad
 AUX ltrace-0.7.3-musl-host.patch 313 BLAKE2B 3ff936391668b118db37aabcf197081b85ed1ac67759a275ae3d18b398fb7af96ec74475f1c50d1dfa22153c459c079fe95789826b8c4eaecb6c38575f7be8aa SHA512 4aa92f406a45aa10cf8b456fd4eb1421d74c682040c71a6819f9caea60dd275cd268a42d0c656e68d7cda70b152bc4e83bc70461c5ac0732d09b70abc77f0ed8
@@ -13,5 +14,5 @@ AUX ltrace-0.7.3-test-protos.patch 2551 BLAKE2B 48998f9db4875b8e2af6727b51fc8666
 AUX ltrace-0.7.3-tuple-tests.patch 460 BLAKE2B f8beacb8468f7842603e6abd1aeace86ad52cd9347fab1fb7ee243bfc1b536b42d91405380354476bc68c033687216561f6512e82bedca6e525407e79dcab2dd SHA512 07a1808ea6a9564c891ce0caec9cbb0e55975a171c46a6bb3358a9e16f217cd4bbd4b3c39a0e278b34e9c542199e13afdbe817bc2ba26390e879edbda71bf993
 DIST ltrace_0.7.3-4.debian.tar.gz 11373 BLAKE2B 3004bef4e0181e28606e1c50dcc2265d9869e51bf11288185da46f7a77a0aaffb41af75f84baa7d094f9f752071c9e8f53c565982a955e3250a7fc721c529b20 SHA512 67a868c95703ca9cd8407905e3be416e3a66920f41d9deb78fadb71719d7d3f1a3f67ffcb575acff4bf7e4715102f3a6b0f67c6adb74f37ee66c398c132ff04b
 DIST ltrace_0.7.3.orig.tar.bz2 482658 BLAKE2B 30d1dbb178a41043e4bbbac17a23676db202b64327c9bb4393ae7ace9f5e1a1e2a5ded56cabc7faf2ea55b22ed17126a94c121147aeefb40250710b7307a50d3 SHA512 a842b16dcb81da869afa0bddc755fdff0d57b35672505bf2c7164fd983b1938d28b126714128930994cc1230ced69d779456d0cfc16f4008c9b6d19f0852285d
-EBUILD ltrace-0.7.3_p4-r1.ebuild 1866 BLAKE2B a674f6b490f9c54a4a601747b30d56e6e9964dca417d35813ba06f1efa10dee76f663ff60d974a15410977be5071eb64a3c315f11a61fada86b21f21a8784eaa SHA512 840b9017372cc8faec0c26ab0034e818fee37480b05f0da722c7f8815b2abb998e5af01df436af7a7147d83d30047efcb36784775263622b60cdfcbb8ee38575
+EBUILD ltrace-0.7.3_p4-r1.ebuild 2059 BLAKE2B 18f68766243bb36ac07581b4b8acb2bb981d157c0b7767e897598b0b1ceae3fe52b90fb2b702d669b704259db00cee1f30a9883e3bf399fc7a1fb88e1cc9d217 SHA512 8c85708282e7e5fb1f9f3226fb1e074e63579a17addd15b7f93c3f2f5471814284c8ac2d869dd699b438aac0ad082ab7aaa6ef175d336230791c2288a3adc932
 MISC metadata.xml 357 BLAKE2B 393847ec554b92576d20a2e88b3f89b86d93ad51107161c0e5fe198415ad6f8d941418d89b438237f52c6e2cef942b449e8112f5619e219058a7f797a6b261dc SHA512 fff13f831e3d3994abc654ab5c5cb97e14cbec653d42074300cf81b22da05e5318a55ae4b28198fdc7aa8169464385939f5a889ca5ba86c45aa39dfe24772a95
diff --git a/dev-util/ltrace/files/ltrace-0.7.3-disable-munmap-test.patch b/dev-util/ltrace/files/ltrace-0.7.3-disable-munmap-test.patch
new file mode 100644
index 000000000000..fdd7412efeda
--- /dev/null
+++ b/dev-util/ltrace/files/ltrace-0.7.3-disable-munmap-test.patch
@@ -0,0 +1,15 @@
+--- a/testsuite/ltrace.main/system_calls.exp
++++ b/testsuite/ltrace.main/system_calls.exp
+@@ -29,8 +29,10 @@ if [regexp {ELF from incompatible architecture} $exec_output] {
+ }
+ 
+ 
+-set pattern "SYS_munmap"
+-ltrace_verify_output ${objdir}/${subdir}/${testfile}.ltrace $pattern 2
++## disabled in Gentoo: libc's stdio tends to call (or not to call) munmap
++## depending on heuristics of stdio buffer sizes.
++##set pattern "SYS_munmap"
++##ltrace_verify_output ${objdir}/${subdir}/${testfile}.ltrace $pattern 2
+ set pattern "SYS_write"
+ ltrace_verify_output ${objdir}/${subdir}/${testfile}.ltrace $pattern 1
+ set pattern "SYS_unlink"
diff --git a/dev-util/ltrace/ltrace-0.7.3_p4-r1.ebuild b/dev-util/ltrace/ltrace-0.7.3_p4-r1.ebuild
index 8f9f97e7fb45..beb325aa49c3 100644
--- a/dev-util/ltrace/ltrace-0.7.3_p4-r1.ebuild
+++ b/dev-util/ltrace/ltrace-0.7.3_p4-r1.ebuild
@@ -48,6 +48,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-0.7.3-tuple-tests.patch
 	"${FILESDIR}"/${PN}-0.7.3-CXX-for-tests.patch
 	"${FILESDIR}"/${PN}-0.7.3-test-glibc-2.33.patch
+	"${FILESDIR}"/${PN}-0.7.3-disable-munmap-test.patch
 )
 
 src_prepare() {
@@ -67,3 +68,9 @@ src_configure() {
 		$(use_enable debug) \
 		$(use_with unwind libunwind)
 }
+
+src_test() {
+	# sandbox redirects vfork() to fork(): bug # 774054
+	# Let's avoid sandbox entirely.
+	SANDBOX_ON=0 LD_PRELOAD= emake check
+}
diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest
index 9933fbad812f..beb59cc6078a 100644
--- a/dev-util/meld/Manifest
+++ b/dev-util/meld/Manifest
@@ -1,5 +1,5 @@
 DIST meld-3.20.2.tar.xz 593948 BLAKE2B 9f2fee48405d76f9ae2fd0b0dd4116321aa176059dd4ef217a5c4c8d0edff5859bab72bbca83b2e7d612706f017d1889d68579eaf9838d7784c9ecb74ed7d403 SHA512 9c9074cb879e3574eb9a1025eb1212771419ab0d8e92bf8a99f38e70ca583ff5c8cbeaccb87b414e6ff73a61afa08e10742991d574b810cc90e8c4a5ac82ddaa
 DIST meld-3.20.3.tar.xz 615248 BLAKE2B e60e6e9437c27cd217d39d045a5a23000b5b52e99387cfe0612c32ffb31205e467a13c8f42f478515bc8ba0d27814963649c362a7a95ac53e98f14398fd0cb3f SHA512 88052d1a59453e780a7842d2bf4d42ac5db8f5b4aa4b1ec3a931fb8d982d45fd212cfb75bb8395a2ad7b380a6e0c33d020a0562b4ffdf4afdc74d92d6d5751f0
 EBUILD meld-3.20.2-r1.ebuild 1413 BLAKE2B 65dff56545810e4f02a93381e4c6f63aa46d2a637d70fa92c4dd3a1dee8c6eb9235ddad0d6e5050b1263de9b65f6115a0b80fd78ccfd5e6617f3d87b3ce14d91 SHA512 41f9e42e6c9d9af7d276da34fa67c9e84b39352a86d788b12b84544a468168822689875758b6fd53ffc3b0a22fb1b5b603a2ec6ea0f6cd87a86269abdc5bb159
-EBUILD meld-3.20.3.ebuild 1425 BLAKE2B a650c3941ccb0a6840aca833e0355fcaf5be13dfe1291104686c2f9bb757c4060cb28fb128f33fde54ec50f241e80fb989e6f637774ed182947df94491523035 SHA512 9b2afa73f5550bb7f9efd00d0689d50229b21fe0b4fc577afe06fef735cf7313b91aa10671bb8fc1ba9fd63769f0c49ba45a339e667c85ea83d09b7d14e6a960
+EBUILD meld-3.20.3.ebuild 1424 BLAKE2B fdbd8fc82e5282a518f951e3e99d597f4bdb8448ad190eb852ffad23492d060c4bbd0a09474f50b7c9a9ba2087fa1b30219707298e1eb3ddb92b537950d9af32 SHA512 85654b5bbee1a31aacaaa08afe597fd3d7a431b7b6dd5856e4eb1a457972726d8456a931bbe053ea787a0698ccfd268a7c7f61ea4dc3609871fb33446b4d3fb2
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/meld/meld-3.20.3.ebuild b/dev-util/meld/meld-3.20.3.ebuild
index f398fdb8b2f2..e5b82f74a8e6 100644
--- a/dev-util/meld/meld-3.20.3.ebuild
+++ b/dev-util/meld/meld-3.20.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://meldmerge.org/"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="${PYTHON_DEPS}
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index c6725e73852d..b9cceb836cc6 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -1,6 +1,6 @@
 DIST meson-0.55.3.tar.gz 1740465 BLAKE2B 7d121f5d2bf487ae3c38be5ddccde6900134b9d0ea47868aac5625449e18a1a97ae0012849b795187221632cd3ac343097ef29b282753a1e8bd871c393d5c0e8 SHA512 afb0bb25b367e681131d920995124df4b06f6d144ae1a95ebec27be13e06fefbd95840e0287cd1d84bdbb8d9c115b589a833d847c60926f55e0f15749cf66bae
 DIST meson-0.56.2.tar.gz 1794847 BLAKE2B 350427e2ff4b4fe688220ca6279ff3361e1b2c7c573e1e0185ea9014fda73bc68929256073fe05855e3403638257e26477868d0a5683a5b91f6a74ee55a01f0e SHA512 3b6cc5cae31d756b251ecde3483d3710bceff50cfd03ef6cf6f939d9e599998e61fcb03a2ee09d6a6f9bfa2198f43e7f20447359de3bff1055febcf03e82e514
 EBUILD meson-0.55.3.ebuild 2264 BLAKE2B c8909e4cbe395ff0e4f4cdf6a7c33d2a8688b1f6b5126dfa41e09bb73aac586093a028dcfc734aeb1b4f9dd9d788f0f890bae857d8eb0f292e22bf1f2a5d9ba0 SHA512 4e307af8de8551f15ea84e373442146ab6f7f3c7b572e49818d7758dc1e76d995a7443cde371a97c7e4efad422ecf299606c7d56543830979cbae1a298f13265
-EBUILD meson-0.56.2.ebuild 2273 BLAKE2B 7e304553018f4d6d733dd01fb1de705be80706c2aba97f494bcb2c3dec8a0edc87161f64a115b354eac28cce450524a6172b95e1e819da3e16f92fa411179a09 SHA512 d3cddf3099fadc64ed88eb3e78f0afe931744769e8e239b2f9e8622525ff9c6edcdf8a925e0d87569016a2165825a8f9a523d4d92c10d4fcfb4567053d5990ff
-EBUILD meson-9999.ebuild 2273 BLAKE2B 7e304553018f4d6d733dd01fb1de705be80706c2aba97f494bcb2c3dec8a0edc87161f64a115b354eac28cce450524a6172b95e1e819da3e16f92fa411179a09 SHA512 d3cddf3099fadc64ed88eb3e78f0afe931744769e8e239b2f9e8622525ff9c6edcdf8a925e0d87569016a2165825a8f9a523d4d92c10d4fcfb4567053d5990ff
+EBUILD meson-0.56.2.ebuild 2339 BLAKE2B fcbaf754dd02101128f51aebc293f50e0bbf335c1078aa7c03fa773216e7fc32f9de722d5496d37f591863e5d2e11c31162bd19921133e52f3e3fa016cdbdbb8 SHA512 2a6520065467a231d7af76d1cb4859ed878727f9ff091c273688deb15552dbbe199965c1e20e7f95ab3a040d6e03214911c324819e0559bc0514ab8fe9fc8aa6
+EBUILD meson-9999.ebuild 2346 BLAKE2B 759d97034364081f55be457b9e8a31a51e30a87de26f9e7bd86dd3bc8ec8b0e99a0c6bd7f306c404b716e8b968debaf8a79c83c511832c06001e4f8a5ee0fd26 SHA512 b27c8176ddac2ab83b684190cef83d28cdd32ea7bf3fe4591a42d568766b1badc4cd7e046e8e80283d47f98f46216c53e5914dedad6e343a4f414fcbbd4a8dee
 MISC metadata.xml 423 BLAKE2B d1d1b815b9d2fabe5aaa28b469272420bc1eb0c070de7431ec0d7bc7202b00ca216e6a347e0ebda22fd079d9f0514734c0e0e345788a7e00c8f1ad594259b4a8 SHA512 5c03d82f2fd8009680d4d98c3f62c10dfddb2d66d03e8f9d9ad8e417d0359e43f77ecca067735b31b63ceb778fdcc508196e99d793990286234ff21892e4dab4
diff --git a/dev-util/meson/meson-0.56.2.ebuild b/dev-util/meson/meson-0.56.2.ebuild
index b68be6fd919f..b21b3c263ecf 100644
--- a/dev-util/meson/meson-0.56.2.ebuild
+++ b/dev-util/meson/meson-0.56.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
@@ -78,6 +78,9 @@ python_test() {
 		# test_cross_file_system_paths
 		unset XDG_DATA_HOME
 
+		# 'test cases/unit/73 summary' expects 80 columns
+		export COLUMNS=80
+
 		${EPYTHON} -u run_tests.py
 	) || die "Testing failed with ${EPYTHON}"
 }
diff --git a/dev-util/meson/meson-9999.ebuild b/dev-util/meson/meson-9999.ebuild
index b68be6fd919f..cb12aed28c93 100644
--- a/dev-util/meson/meson-9999.ebuild
+++ b/dev-util/meson/meson-9999.ebuild
@@ -78,6 +78,9 @@ python_test() {
 		# test_cross_file_system_paths
 		unset XDG_DATA_HOME
 
+		# 'test cases/unit/73 summary' expects 80 columns
+		export COLUMNS=80
+
 		${EPYTHON} -u run_tests.py
 	) || die "Testing failed with ${EPYTHON}"
 }
diff --git a/dev-util/patchutils/Manifest b/dev-util/patchutils/Manifest
index 83c42cfeceef..dcb5cbb5d5b7 100644
--- a/dev-util/patchutils/Manifest
+++ b/dev-util/patchutils/Manifest
@@ -1,6 +1,6 @@
 AUX patchutils-0.3.3-format-security.patch 715 BLAKE2B 48be5e5e0376b6520cd0baffca1cc385bf3a267c8443b4ec195d302da6b165604471b919c47104943c1ccdc01d3c9866d93d1d8730e1a8b6889f433f607fb73a SHA512 b98932e5e48dfefb2ef8550c7f212cb0bf7417b0ed42705e3ddd9164d522ebdb47a0610539769a49a19d10e6389eb9e764fc5ef7bdd03af9b29feeb76a51c8fa
-DIST patchutils-0.3.3.tar.xz 156328 BLAKE2B e7da090e1fc7f95f5c2e4c02828702b485dc92fa22a4f45d69f5d9f610fb5a5e3267794fa572cf3aa73be45a86a5c889776eeadf5cca98237d97e53cb1b9be91 SHA512 4ec085078e9ae2e878dc10fbfea5974d9772716aef5d8e130a0023ceaa26640bccfaf1022c8153923b38230b36c8d4dddf4aaa674076c733bb1277895b63a268
 DIST patchutils-0.3.4.tar.xz 166400 BLAKE2B 382be328bfd1ab848f38126ad7a41a4c953844956c181265953a7496c8de3df5d90d071a823b226ceeddd7321bd4ecae1e06c8583155b08826c97177efa9b68b SHA512 ede006122fad180b78feaf69294f1c40c0a764981fa581f1893abeeb0421f9d586fc33f79d065690a6bc6187a31f11311b086669879dde12c6e49c7c8a2aa440
-EBUILD patchutils-0.3.3.ebuild 760 BLAKE2B bb17e8079257a7563714ad8a98be78484f1a597bfeafb27fffa121a461168a7d5005b8137fba1ab24eb595e0167c74fbea92710b04b4fc11b5656d6e900dd1f2 SHA512 0696a77c8cacb731edb1b5860f7035743582024c935750f3f6e88552eab442f6e19742eed997846f59dc5524eaf0326fa78a39037eefe77640f1d93c3343fa11
-EBUILD patchutils-0.3.4.ebuild 796 BLAKE2B 16578df3e37f571861a73a5abde8b3968d235d00e0cc18d541f0ac5aa068406c0a22113a4b0261a821f04052758b2b7e86c38859274a1e38929ad0a211c56368 SHA512 78be52b5b9cb9db328f32fe5c02ce92cbafa89402b3ed98250a7e81bda08ee5a841e6d7d10cc18f6b7b120ce6f3dc2bd7a1aeb4f5e8a1b7fa05c3ac16a94eeb9
-MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25
+DIST patchutils-0.4.2.tar.xz 159504 BLAKE2B 3ffcda8497b010a88e8601005871fb691ea8cac6158276862ba8e4192c333a335965288f9b5451c2fbc0a873ef95eb4a485d265387b43b0cec31b6c18d38f88e SHA512 20970d52fd43c09dc7799297b9a9eb6f60ba29ecc750d49381a2dc52273dfe484a47696cddd541f623394fa3486734cf337297cbeab6b1b244511c7740f46897
+EBUILD patchutils-0.3.4.ebuild 594 BLAKE2B 007c9cf12734a41d5432feec5f1e66dbe65a6197e208014584dc92a2bd347787e779624f7f52100a6f6bdbe1c13dbec1ee1dfe13109d9110ea7ae01eeee8d9a4 SHA512 46ddce77aa0ab3a6d74a5645dbf00941bbae81feff6db04f7d50c8528c00b3520f9413ca3b7b04d10f9442df856a8ff30058892939268dfe33f3cb1815b46613
+EBUILD patchutils-0.4.2.ebuild 490 BLAKE2B e7e91cc7eff2bf328a476d2d4927deb7da8edb9b933ec2934aba64e18c680c9f97b15669ce474850b47617c0b507d91162361d1476d309cd96c6c7c188d8aa20 SHA512 9c9bbcc908bb041c6906a3cee0e4a696f3425c27df867fba94601a28ae01411ed279a6a5b5d4f9698c723ac5467d6cc0c1f692ceeb626e9a795b47dcaf5c63aa
+MISC metadata.xml 347 BLAKE2B 1bb5edebc3256dc7f672ac577cd618ca1ba6f50532326df86519e0949a693b24e0c8980e36dd2022662ad19b7bc9a2d9e9493ca63ee428c7dd310c225ad73a50 SHA512 a705f56fe025d34489a293963cdf279fbb310775b82134dcb53586ed22e31991b666f26738e14e2f387dc7f23eea2c0ba10d25a8b52140f67e1ceec27295f5e4
diff --git a/dev-util/patchutils/metadata.xml b/dev-util/patchutils/metadata.xml
index 3cf14bf74636..0e0093592abe 100644
--- a/dev-util/patchutils/metadata.xml
+++ b/dev-util/patchutils/metadata.xml
@@ -5,4 +5,7 @@
 		<email>shell-tools@gentoo.org</email>
 		<name>Gentoo Shell Tools Project</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">twaugh/patchutils</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-util/patchutils/patchutils-0.3.3.ebuild b/dev-util/patchutils/patchutils-0.3.3.ebuild
deleted file mode 100644
index c0af0dcaa8ee..000000000000
--- a/dev-util/patchutils/patchutils-0.3.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="A collection of tools that operate on patch files"
-HOMEPAGE="http://cyberelk.net/tim/patchutils/"
-SRC_URI="http://cyberelk.net/tim/data/patchutils/stable/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-# The testsuite makes use of gendiff(1) that comes from rpm, thus if
-# the user wants to run tests, it should install that too.
-DEPEND="test? ( app-arch/rpm )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-format-security.patch
-}
diff --git a/dev-util/patchutils/patchutils-0.3.4.ebuild b/dev-util/patchutils/patchutils-0.3.4.ebuild
index 3aa0b6a0d007..4ae2f9018696 100644
--- a/dev-util/patchutils/patchutils-0.3.4.ebuild
+++ b/dev-util/patchutils/patchutils-0.3.4.ebuild
@@ -10,12 +10,7 @@ SRC_URI="http://cyberelk.net/tim/data/patchutils/stable/${P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# testsuite makes use of gendiff(1) that comes from rpm, thus if the user wants
-# to run tests, it should install that package as well.
-DEPEND="test? ( app-arch/rpm )"
+IUSE=""
 
 PATCHES=(
 	"${FILESDIR}/${PN}-0.3.3-format-security.patch"
@@ -23,5 +18,5 @@ PATCHES=(
 
 src_test() {
 	# See bug 605952.
-	make check || die
+	emake -j1 check
 }
diff --git a/dev-util/patchutils/patchutils-0.4.2.ebuild b/dev-util/patchutils/patchutils-0.4.2.ebuild
new file mode 100644
index 000000000000..08b5bae517bd
--- /dev/null
+++ b/dev-util/patchutils/patchutils-0.4.2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+DESCRIPTION="A collection of tools that operate on patch files"
+HOMEPAGE="http://cyberelk.net/tim/patchutils/"
+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=""
diff --git a/dev-util/pkgcheck/Manifest b/dev-util/pkgcheck/Manifest
index 2d57f8a0be74..ee2c1a669065 100644
--- a/dev-util/pkgcheck/Manifest
+++ b/dev-util/pkgcheck/Manifest
@@ -3,11 +3,15 @@ DIST pkgcheck-0.7.9.tar.gz 275854 BLAKE2B 4a98d801fc4e628f6b116fa6d05a5e31bf259f
 DIST pkgcheck-0.8.1.tar.gz 455289 BLAKE2B 5e0999c4348e4707e917b511718d378bd7cbb337aaae1fdb437b5bca5f4f795a65bebdf58f11e72b2b737e019a02a9b970636130b0712751ce9bf9ae9d023018 SHA512 16af41bede87b065cae59e5232707d272ad7c66ad1bac4bf4c3e4b727671be4a30d1e7d5408c29c5b288bfae8fac98829ae96b040c706deda95e670df095d022
 DIST pkgcheck-0.8.2.tar.gz 455039 BLAKE2B 282c75578cd4aa7aca3f54e9625360cde4d7146cc08a6b2bcf2f594b21b6224a18e0623055e8aa866e89583b9fd6ec12749aa4bba791f06a851b1b43fe60d440 SHA512 3377060dae6e2c49d5ae6f2dbb883da4ddeab35ecd04133635f3a91f5bfb63177497b8843445914132539efc461ce0ea89bd5d07d3cba49e0854b91d7e2f74ce
 DIST pkgcheck-0.9.0.tar.gz 585528 BLAKE2B f9fa2d11b9510d84b5d9381ff033de14ca5ec74cf84d50f3f8847c1585c38bd02f534b09cc017e04d6f322ebd95c8396d95eca299ed1327cd25fab9e42973be3 SHA512 a6778785c23eacd80df555c77c8a77ef66b16e2a601fbd9405f85ce8520079a6f1366aeede3a1758abc8db606bc4608cb4a7e1ad421a8416bdb35b3ff3af9d6f
+DIST pkgcheck-0.9.1.tar.gz 591753 BLAKE2B e4c8840c022b77dde34ad461367eb1947f269c8a0ff12e9dee2c8e373d1926f58f9d104571bc5de233975eda73509bf39eec533de03f78cf82fa41bbd10bcc74 SHA512 9adcf2fd5b9652e834f96f8a7652c97d28c4ec5a8b8704cd4c7c4ef8463237fc15f4c46e36993d0e72de5aab068b108368378d5481cf4d5df974e4a78adf6072
+DIST pkgcheck-0.9.2.tar.gz 593674 BLAKE2B e5d02e914e90db28540ca350d91d38ece9cea1f8413ec90b877bb41896cc7b710e451658c7c6cea3f4cc2f834230a986d18429c8ac3f23d4b317b28e3af8d74f SHA512 2bbced17dcc1718576aa4ce2401fc856cfb6256fe437295c25716852645841c6a28d1c1276f3a5943ce27943ab36bd3ca3ef9bf1ace20138368371a793a80b6d
 EBUILD pkgcheck-0.7.7-r1.ebuild 1439 BLAKE2B c9f277bf416adb2b9e8371b539cfce4d04cd42080c71f292e218769c81030ca59e792f8eb198370aabd95fadd9c8470d399fb00eedb37453c87ad5e7c47bdd22 SHA512 eb03cd5371488c808186f057c20127935ae2570aaee927ea4d012fc4c0634970f5fd0d33757f611f14958de7e4a9e192a65d5ba997ff6389c8e9f2145de8ecb8
 EBUILD pkgcheck-0.7.9-r1.ebuild 1446 BLAKE2B 3a4b8bc7d6d0d515e220343eef74345ba39853f65ed39e898a68b8bf900c49610c7f5f78c1f49de08eff9254f0cdd54f57672a8177469e23bf0cc82e0effbef4 SHA512 a077e0f9e8879d89691c608e6cf0b619fc56ccb3ba92052280a55c5a5b1005d397ae72aa7638df040dbb2c15498e0df4f33f0d7e1dc3540b4e87fbdc583523e7
 EBUILD pkgcheck-0.7.9-r2.ebuild 1447 BLAKE2B ddbd3beddb0ecfd71c9120eab6d338d398b82f7dc3813698a115c74a126fb0464f6c077a7ea1b4aa35787517538c23531d58233da0d61ded74db7e2bb4b57e5e SHA512 eb46f428631af94a1095bb3f9df59ff7ec9cc6b57621f38b745e1755ae50f5b830f4c4ddc45f86b0a76afd6ef36cfef159a1f92723be3432195b08d3b1c507c1
-EBUILD pkgcheck-0.8.1.ebuild 1333 BLAKE2B ad76771e021b1a03d04d894595e3f5b25c56ff581232be0456b4aca31addf30c8e92c05716e60bcab898c5c7a536b1a9c495682d64960399da120ddb9a3459fe SHA512 24744918a0f103ac3b0d3df720c2046df5066b302eb9016bc0e6ff0834a85415e561a6f1fdc7d98f9982c66ada2e3814484072f00280b115892240d16dc04fac
-EBUILD pkgcheck-0.8.2.ebuild 1360 BLAKE2B bd3cba917865e64a260ebe527a4d1556d2171f53d4784da135e2b6112825b5eef89e8431b34a5360f46c6f1f64fb7575287b11a2b072142af9158c4b633ad4dc SHA512 1a9b33b83744080515ac2cdd5a23a47e01b96cb39d1bd7220157fa206148b8676083885440bc531823565bde18ca99eb97ee043023ada6262af1d8d92d7f2caf
-EBUILD pkgcheck-0.9.0.ebuild 1418 BLAKE2B bc7ceb13735a6d9ddc185908922500e1c3389ee399d8299ea8243194f82ea5fbda5c71b11380d64c7537576e4a2941842952a35ec53d5f14950222cb6445d65f SHA512 51f54d7bfcd9411c25f495fe7dbf58d57c9b2e46fb45f3ca93ab080606f56758eaa6ed196e12ddd82936decb0c7757a3835ec6cd1e16416b7ebb8f019b95e0a9
-EBUILD pkgcheck-9999.ebuild 1424 BLAKE2B 6fee748c5e1ff305973a1c5491496619a33533d727c3d64bbde79f4e72c5c9cf957a39b12996d3c0c18eb834cc739b1d7f0a0831dc38b0070a82f7e5b93cab09 SHA512 f112e79fc817c45761ed7d0ffabc165986c91ed1ba29a9f0db40315c0761697d329eaa831060c8cdb5d66437b5d49b4e4c98b972764e87a786f965aaaa3c634b
+EBUILD pkgcheck-0.8.1-r1.ebuild 1341 BLAKE2B 226ef3dfaa1d376e246648726efdb599b2b75211d2ae36da71533db09f76e3c41832692d813ddc3fbcb90d171d5d6df4bb598a026400d51ca23cf09600b6546e SHA512 ecce76cd05d58945652d84f4adaec6fa44ec91d8aeb1b5b910828acf98fdf15b807b4e2c77b41c1502c04b23990dcf3eda5419b37eede537ed5aa17333da33c7
+EBUILD pkgcheck-0.8.2-r1.ebuild 1365 BLAKE2B 05608be4393f1058d5d3c79831e5a01138056e55b5f67a4efeaabd07005a01b5f5f73f14b45dfee76c4982acaae5e1c28a36fa5a792dca8e16be5da96d4f9391 SHA512 12be2b9125e3f0fe5763f771c759500e84028cbab0c46aaf37d47f6ae25a63473b63f35ef3296dcfd8fe2eb4c8ab514c0d6de30c4457fb730d3e6f8ae5152763
+EBUILD pkgcheck-0.9.0-r1.ebuild 1426 BLAKE2B e62ed959fbeefe699e90ac619406d8552d28d4cede6def95d3f6826d892ac4e68155a9428affc231a69498b11ffd6944777bae5992a9911a43051f36cecd1b51 SHA512 5608eabeaae655a60240b4f4576199f74c8e94ed7aee8536be2e7e2063ea66344e20c9aa8a410ac4b44a3dd63699e33f3631e1376af1a83084c069c8716b273a
+EBUILD pkgcheck-0.9.1-r1.ebuild 1500 BLAKE2B dcf03bfbf0099db0e3b6e27a6a6e3d7ac309392548f5668b5acbc866b980b97124a72d294f9f4a253397369373c1b945c2f131d6e73f3d4d6a249eb0c7ac1bc0 SHA512 9500283e6ebed04e4923971141ccda4e4dd9762765e660360b24390a4c5cd40b8ff35a40584e008336564fcda509b88425b06f1adf3bcd8bb3c844ae8f2ebe1a
+EBUILD pkgcheck-0.9.2.ebuild 1501 BLAKE2B d0c8b037a86e3f817a6b7ea3ab01198b3a4e3bf2df869ced7835f53c5e7955e3ca7793d584401581865740c3f9ef2849d15a2dbd5f53ec1006c0d1352b97f225 SHA512 62c31e8f132d4d4dd1af78072bc03179a853f5fbb22ecdd1c6fba2b1774465c6465807b9988577020e63871955acfe0dc17601d4d595d7c5824db1f47464eca9
+EBUILD pkgcheck-9999.ebuild 1501 BLAKE2B d0c8b037a86e3f817a6b7ea3ab01198b3a4e3bf2df869ced7835f53c5e7955e3ca7793d584401581865740c3f9ef2849d15a2dbd5f53ec1006c0d1352b97f225 SHA512 62c31e8f132d4d4dd1af78072bc03179a853f5fbb22ecdd1c6fba2b1774465c6465807b9988577020e63871955acfe0dc17601d4d595d7c5824db1f47464eca9
 MISC metadata.xml 328 BLAKE2B b84dba717460e84f7ee3163fd8d6a5f13eb3b15dd1bb749f6ece81f062e3530988dacefadb24c1395eb36593a7ab6d868b06c8c4ee8f620a17c85faf04283b24 SHA512 5696505214a737ad495b23bfac2a51fbbc5b1e815eb6fcbabb3c6674325f05e3f6f418de05257c08935e389e47879e8a2d1b3723ec86aeb5ad97c6110fd2ec75
diff --git a/dev-util/pkgcheck/pkgcheck-0.8.1.ebuild b/dev-util/pkgcheck/pkgcheck-0.8.1-r1.ebuild
index a768d08fe5a5..d625f9d99b44 100644
--- a/dev-util/pkgcheck/pkgcheck-0.8.1.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-0.8.1-r1.ebuild
@@ -33,7 +33,7 @@ RDEPEND+="
 	dev-python/chardet[${PYTHON_USEDEP}]
 	dev-python/lxml[${PYTHON_USEDEP}]
 	dev-python/pathspec[${PYTHON_USEDEP}]
-	dev-python/tree-sitter[${PYTHON_USEDEP}]
+	<dev-python/tree-sitter-0.19.0[${PYTHON_USEDEP}]
 "
 BDEPEND="
 	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
diff --git a/dev-util/pkgcheck/pkgcheck-0.8.2.ebuild b/dev-util/pkgcheck/pkgcheck-0.8.2-r1.ebuild
index 53e91e5bd00f..940c596c1165 100644
--- a/dev-util/pkgcheck/pkgcheck-0.8.2.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-0.8.2-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 sparc x86 ~x64-macos"
+	KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 fi
 
@@ -33,7 +33,7 @@ RDEPEND+="
 	dev-python/chardet[${PYTHON_USEDEP}]
 	dev-python/lxml[${PYTHON_USEDEP}]
 	dev-python/pathspec[${PYTHON_USEDEP}]
-	dev-python/tree-sitter[${PYTHON_USEDEP}]
+	<dev-python/tree-sitter-0.19.0[${PYTHON_USEDEP}]
 "
 BDEPEND="
 	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
diff --git a/dev-util/pkgcheck/pkgcheck-0.9.0.ebuild b/dev-util/pkgcheck/pkgcheck-0.9.0-r1.ebuild
index b119c84b2823..01cc542dcbc7 100644
--- a/dev-util/pkgcheck/pkgcheck-0.9.0.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-0.9.0-r1.ebuild
@@ -34,7 +34,7 @@ RDEPEND+="
 	dev-python/lazy-object-proxy[${PYTHON_USEDEP}]
 	dev-python/lxml[${PYTHON_USEDEP}]
 	dev-python/pathspec[${PYTHON_USEDEP}]
-	dev-python/tree-sitter[${PYTHON_USEDEP}]
+	<dev-python/tree-sitter-0.19.0[${PYTHON_USEDEP}]
 "
 BDEPEND="
 	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
diff --git a/dev-util/pkgcheck/pkgcheck-0.9.1-r1.ebuild b/dev-util/pkgcheck/pkgcheck-0.9.1-r1.ebuild
new file mode 100644
index 000000000000..f4fc9d8e1d48
--- /dev/null
+++ b/dev-util/pkgcheck/pkgcheck-0.9.1-r1.ebuild
@@ -0,0 +1,59 @@
+# 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.3[${PYTHON_USEDEP}]
+		>=sys-apps/pkgcore-0.11.4[${PYTHON_USEDEP}]"
+fi
+RDEPEND+="
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/lazy-object-proxy[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/pathspec[${PYTHON_USEDEP}]
+	<dev-python/tree-sitter-0.19.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests setup.py
+
+src_test() {
+	local -x PYTHONDONTWRITEBYTECODE=
+	distutils-r1_src_test
+}
+
+python_install_all() {
+	local DOCS=( NEWS.rst )
+	[[ ${PV} == *9999 ]] || doman man/*
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "Network check support" dev-python/requests
+	optfeature "Perl module version check support" dev-perl/Gentoo-PerlMod-Version
+}
diff --git a/dev-util/pkgcheck/pkgcheck-0.9.2.ebuild b/dev-util/pkgcheck/pkgcheck-0.9.2.ebuild
new file mode 100644
index 000000000000..18f0ea5c49f8
--- /dev/null
+++ b/dev-util/pkgcheck/pkgcheck-0.9.2.ebuild
@@ -0,0 +1,59 @@
+# 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.3[${PYTHON_USEDEP}]
+		>=sys-apps/pkgcore-0.11.4[${PYTHON_USEDEP}]"
+fi
+RDEPEND+="
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/lazy-object-proxy[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/pathspec[${PYTHON_USEDEP}]
+	>=dev-python/tree-sitter-0.19.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests setup.py
+
+src_test() {
+	local -x PYTHONDONTWRITEBYTECODE=
+	distutils-r1_src_test
+}
+
+python_install_all() {
+	local DOCS=( NEWS.rst )
+	[[ ${PV} == *9999 ]] || doman man/*
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "Network check support" dev-python/requests
+	optfeature "Perl module version check support" dev-perl/Gentoo-PerlMod-Version
+}
diff --git a/dev-util/pkgcheck/pkgcheck-9999.ebuild b/dev-util/pkgcheck/pkgcheck-9999.ebuild
index b03c865b49e3..18f0ea5c49f8 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 ~sparc ~x86 ~x64-macos"
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 fi
 
@@ -26,15 +26,15 @@ if [[ ${PV} == *9999 ]]; then
 		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]"
 else
 	RDEPEND="
-		>=dev-python/snakeoil-0.9.0[${PYTHON_USEDEP}]
-		>=sys-apps/pkgcore-0.11.1[${PYTHON_USEDEP}]"
+		>=dev-python/snakeoil-0.9.3[${PYTHON_USEDEP}]
+		>=sys-apps/pkgcore-0.11.4[${PYTHON_USEDEP}]"
 fi
 RDEPEND+="
 	dev-python/chardet[${PYTHON_USEDEP}]
 	dev-python/lazy-object-proxy[${PYTHON_USEDEP}]
 	dev-python/lxml[${PYTHON_USEDEP}]
 	dev-python/pathspec[${PYTHON_USEDEP}]
-	dev-python/tree-sitter[${PYTHON_USEDEP}]
+	>=dev-python/tree-sitter-0.19.0[${PYTHON_USEDEP}]
 "
 BDEPEND="
 	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
@@ -42,6 +42,11 @@ BDEPEND="
 
 distutils_enable_tests setup.py
 
+src_test() {
+	local -x PYTHONDONTWRITEBYTECODE=
+	distutils-r1_src_test
+}
+
 python_install_all() {
 	local DOCS=( NEWS.rst )
 	[[ ${PV} == *9999 ]] || doman man/*
diff --git a/dev-util/pkgdev/Manifest b/dev-util/pkgdev/Manifest
index fb899bbdcc3f..4e6ba965f0e9 100644
--- a/dev-util/pkgdev/Manifest
+++ b/dev-util/pkgdev/Manifest
@@ -1,2 +1,4 @@
-EBUILD pkgdev-9999.ebuild 1250 BLAKE2B 57ff9a8e6d25ad8c7e8ebb63a213fe31656ffd19fe21d255c7384b801cb649bbf247ed9e06a6f6f6866dfda398837e4d293aafe1ddf94534e52654b60d70caf6 SHA512 d6c56880df065e97fd30331ad0881ca533695b4dc55fc3d876faa000c8d31968ecb387e6fed6b4dfc88f26ba0da85bc6887b7980e1adab44730c3c7743ee3abd
+DIST pkgdev-0.1.tar.gz 26075 BLAKE2B e7f7a83d91ef923bdd38465e7c70d6a2d0693d945273583937b4f444e26493887c5aeff9cf6a353dc02c42786d635eda7cc0fbfbc888be2b0e4eee883b5bd9c6 SHA512 1714857c3d66655226a4217ec8955662c5e37022c92183bdd8e61f91ff46f335935af8d6badf79f7c9f894a56b970ab0109f9b18ac7f3e59722d096ce2f24664
+EBUILD pkgdev-0.1.ebuild 1533 BLAKE2B b52d4e7310632fab48a5879e1990eb9d5789b9e7c19c743926756b8d4dcdaee43dd055ef6e8a400999ac933fa1450859a24d56af5980eccd8253e06c6d459776 SHA512 f8f85c891036270e560853e6a27dc13272164ddb410b4372dd6b185d20aecd5b593fe5f335dc590a04fbed48fecea999906ed665f872d153d73664d752e9cc75
+EBUILD pkgdev-9999.ebuild 1532 BLAKE2B 35f3dfc9677eb887f97cfc736e61d10d950e8cbb3e49092ad201ebd547223a68230af7bd053ab695f72a71e1eb7f356b554c8bccdad25065b0a6788c58645245 SHA512 ad2abc4203f8a06a633f1ac1b41067091d3b1467d56bd855ae52d6cc4f42cf3d22562c27ea4f7a5850833e99739d9fdcc3657d993843081ab2e879de3c0fcab7
 MISC metadata.xml 318 BLAKE2B 857b4e6e454663321e0c8f2b9083246459e751c4a1b0c7d900935274efcb63e82379e66984639e41a1adddb32cb995d4ccc99e910f76f3bf19d543d82520b1ef SHA512 40feecfb7907213bad0ee60f17e748aebbc4df381f59bfa47f3a5c9938917b032a37dce6650be4d60e695c17356290a7be984e1d235d219749b11d73d2fa2f6e
diff --git a/dev-util/pkgdev/pkgdev-0.1.ebuild b/dev-util/pkgdev/pkgdev-0.1.ebuild
new file mode 100644
index 000000000000..fdf04f9fc038
--- /dev/null
+++ b/dev-util/pkgdev/pkgdev-0.1.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
+	KEYWORDS="~amd64"
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+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.3[${PYTHON_USEDEP}]
+		>=dev-util/pkgcheck-0.9.1[${PYTHON_USEDEP}]
+		>=sys-apps/pkgcore-0.11.4[${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 6a425ed841c9..041813b0cea7 100644
--- a/dev-util/pkgdev/pkgdev-9999.ebuild
+++ b/dev-util/pkgdev/pkgdev-9999.ebuild
@@ -15,7 +15,7 @@ else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 fi
 
-DESCRIPTION="pkgcore-based git QA tool"
+DESCRIPTION="Collection of tools for Gentoo development"
 HOMEPAGE="https://github.com/pkgcore/pkgdev"
 
 LICENSE="BSD MIT"
@@ -26,15 +26,23 @@ if [[ ${PV} == *9999 ]] ; then
 	RDEPEND="
 		~dev-python/snakeoil-9999[${PYTHON_USEDEP}]
 		~dev-util/pkgcheck-9999[${PYTHON_USEDEP}]
-		dev-vcs/git
 		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]
 	"
+else
+	# https://github.com/pkgcore/pkgdev/blob/main/requirements/install.txt
+	RDEPEND="
+		>=dev-python/snakeoil-0.9.3[${PYTHON_USEDEP}]
+		>=dev-util/pkgcore-0.11.4[${PYTHON_USEDEP}]
+		>=sys-apps/pkgcore-0.9.1[${PYTHON_USEDEP}]
+	"
 fi
 
-# Releases (in future): https://github.com/pkgcore/pkgdev/blob/main/requirements/install.txt
+# 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 pytest
+distutils_enable_tests setup.py
 
 python_install_all() {
 	# We'll generate man pages ourselves
diff --git a/dev-util/ragel/Manifest b/dev-util/ragel/Manifest
index 0aa0af4150b5..a58b79dc3398 100644
--- a/dev-util/ragel/Manifest
+++ b/dev-util/ragel/Manifest
@@ -5,5 +5,5 @@ DIST ragel-7.0.4.tar.gz 1656687 BLAKE2B d96444f6b8dc356b9effa6c5032952ffb2526833
 EBUILD ragel-6.10.ebuild 836 BLAKE2B 2b3568650dc1e3d704ecc71b5be4439383d2a92cdd88fdda7173734f20fb4596bd7611e21634fc50538966995248f2a001c31202624b2c362a676551b7f57713 SHA512 15bd38b257f430bd222c1a280417854856cdbad78eac976c5e9d28fa2ce68d18d3d0db58d2f9534db7066f0c404f545a44ec6dc137c211be46c07ea7a35d8d86
 EBUILD ragel-7.0.0.12.ebuild 771 BLAKE2B fe5abe581ce0a9c8feccf4c9a86fd9cb258af68c7a3e6aeddcc4bf1f7cb3bf79a2c24951010204f5704efb8ef7d0194ad5f47f3a3dfac9275f38dcd7958d0fdd SHA512 94e28393676e525b0a8fda907c7aa22ce66586a2fa63a881a17f90280f2c2dfbd2b38ba9acb96efe0899efe81c37ed51989886464baf22ed139a4d426fb0b0ab
 EBUILD ragel-7.0.3.ebuild 1416 BLAKE2B 817cb6f863af04d4c635f86e70ae296f077d07801a5e6fed4d868fa5558cb033b00538c789644a4eda9f6b75fe12c89afa1f4a904579d81728c7d115a3453008 SHA512 c34c6e7c3faab0aad54aec9cbe1b753373590d48d4dfc6e0853815e92375209507263d6071896a5bb748089a986dba90c3c9b47af5568baedcd3ee68bfd48887
-EBUILD ragel-7.0.4.ebuild 1418 BLAKE2B edcc830673ce5bc339bbf2d7db97c81917468bdcd2a55b8550bbba918266ec963ed5ea8413beea96a196798b6f22de1130567ea97fa06c16181e7a54dac84aa8 SHA512 0b0551e7c7aa6171c0c09217c30eaef0cb072c13f2ebd275a66974f6e9e4307738dbc17a8cd0aa3370356a4cf6ac6fb9fe4b6fe58b3cf11a2a4c17e510ed6af5
+EBUILD ragel-7.0.4.ebuild 1417 BLAKE2B 1a687952d60d2752dfd1baf4a85a571ae7173dc54264a78dc7d655517cf6904f6c24ab6723f79950dc7929afd65f4331e2c27667e8f8771cb3433c2049187aec SHA512 fd033b85702f0c5bfa91d46c4f4b4a95ea96ae7fef77dde0ff6448e4314b7c205a7585bf21c7a982129ba7c585281c37223060b0c92021cc3507eba4b05adad3
 MISC metadata.xml 304 BLAKE2B e1fe70825ab2eaef1101ab15d8a29dfffae8b22e1a8cfdb9e97bd7243699be7bf5dff01735e9a9451f7e3207fd9659f7cad5492f1909e845c0761388b254a3fc SHA512 4c34ae1a571f693c06acd7b3611019f137e3b73796f982a0d054ce06402f8a27c44d18cf49c6e6758f010690f769a6b3a94fc46f972d38913140eb8392557f66
diff --git a/dev-util/ragel/ragel-7.0.4.ebuild b/dev-util/ragel/ragel-7.0.4.ebuild
index c35e01e7be69..786191b6bf63 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
diff --git a/dev-util/scons/Manifest b/dev-util/scons/Manifest
index 34efea5081cd..8d99975c1638 100644
--- a/dev-util/scons/Manifest
+++ b/dev-util/scons/Manifest
@@ -10,5 +10,5 @@ DIST scons-4.1.0-user.pdf 2691364 BLAKE2B a910a09fa936d4d6f8dc967676d5aa009aac58
 DIST scons-4.1.0.gh.tar.gz 5609204 BLAKE2B ede3d47a1ec652b9248681e26738073e9d01daab7ffeccc58f0fcadb79661e30edb9a35a511518e4a58459243acb027afd8fa5849b0f9e4bae451055f7b1a062 SHA512 f79b86bb09783767b3872cfb8efb665372714a604af2aaf3adc66eee63d3afe27bc6b2aab83813743c83f71c81c800d42842e916501787ba402ce2726dda9b44
 DIST scons-4.1.0.tar.gz 3007701 BLAKE2B 70ab64ecfd89fa2af1d78a33fcef82a5f7db9875ffe9d2c16ea75cf40e661b2874359e3a5f75d761b3d9e863f7a434560992cfb020cce3e21e389381331d90de SHA512 24fd493643545a2998b053ed0d68caf6241f05bc2437e7cbeae33d2e1c63517a61449a1a18062f8e4e5a639295a2486925296ba3e54ccfa2ecdd56fa07132de8
 EBUILD scons-4.0.1.ebuild 2862 BLAKE2B 165cf3e5bea9f7b135b6f73fb14471622444411726359bb038a5283b02f37c911ebb8b503a46065898e31c6c135f32a80efb98601b5e1bf9cdcdea381138a661 SHA512 da479aa49b8060b7493c2f66618b23f3ce5db3a61b8b19585d637e8a15d2b54d9923f0c026bba4bf2f5719d470b79df7eaba2be082824c42040670112c4b4455
-EBUILD scons-4.1.0-r1.ebuild 2764 BLAKE2B dcbb27b7566e58af4d77be30920b4225126ea0f032488afa92f7fde5f945390bdae6f9b1afa09750c06b6da582a8d8505085fe63d0871435c7c6678d93924be0 SHA512 9195ae0ea29c580f4a8e7762733517f2fbf24070b417055b6424477dbd3df49691283914d10fc968ccd296de8e98954acec1815c8fc358c70afdd3bb02ef4a6a
+EBUILD scons-4.1.0-r1.ebuild 2758 BLAKE2B 099298c9f651d4d35795336910f3e94a948e75b4a20e109538e653362f0ec6cbac567c10b7854e765646a2be5abd28cb97b7f02809e7a5fa5e9bcafdc1f87728 SHA512 bd1f5a537ec947fdb9cc69983dbe843874249c43670b7d544db092c2328b42962339d5005b2c3e6248cc2009c6a2c4bae3ef1c3788a502c265d60b7bf6e0a48f
 MISC metadata.xml 704 BLAKE2B 448bfef70e4f230008c21d8e542618a52f9761295ed33f1c7385a2a678bcb29d1028792e221441f9ba61fecb34646f5ef0f04795e28b17e8d4aeacbabf8751f2 SHA512 62e5c8c23f1c67c218ff6b33c1f941ac3c258b39a5b2d799bedceb734aa5b2e29a718f90823ab5bf199e9d1eb8236aefaddcbff99c6d03f58987fb4936b10aa6
diff --git a/dev-util/scons/scons-4.1.0-r1.ebuild b/dev-util/scons/scons-4.1.0-r1.ebuild
index 7535272500c1..8af6dd005305 100644
--- a/dev-util/scons/scons-4.1.0-r1.ebuild
+++ b/dev-util/scons/scons-4.1.0-r1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/shards/Manifest b/dev-util/shards/Manifest
index 3e0b085b3483..89325dae829a 100644
--- a/dev-util/shards/Manifest
+++ b/dev-util/shards/Manifest
@@ -1,4 +1,6 @@
 DIST crystal-molinillo-0.1.0.tar.gz 23932 BLAKE2B c9bcd707a3208f5d80e6e3030523d50f86cb5977799de8ea6035d014094e3c2fff9bb189fa98f566e72e1e7ad161e47e44c89d9b264d47f109b2e891ecb469e5 SHA512 8d74d95896cd7ff510c87e2ffba6ae5f04ceeddde574930ee609851312b65d713a315cc24f9aa3fab02f9447ccb25ef2dd2e8179640b8c5cfb3d7d6b52d1ded5
 DIST shards-0.14.0.tar.gz 61662 BLAKE2B f590b8eb876cb7a5d5bbade13b3ee78db443ef24f9abefe9ba662a7018ee0e543950e84ef388bd3cf81960883a60de4eb2409616790c0caef6d06f8fa19ff288 SHA512 214f038f3ddedca8297fe6deac1d12a632b7563c5eda796771f925abe7f197c637328eb1fd1fdd51063131e51fcc73edd6be59c9b213779b6ed5090e8a715fe6
+DIST shards-0.14.1.tar.gz 61664 BLAKE2B 35f5626096266a86561f9b8613cfdb5f628e2ce247eb511dc0896c600619dcc7660b5b2b473fa0d9cec07010a5e13b8614fa63475acffe17a79cab8503cc6485 SHA512 be51e6d5459f0537681bea9b5c7ff048c33cd67fbb9effa20e6af8ac31f8ee0534f2012ed03712b5204451e7a48b932b0c44011dd39a7b47f81c85587579fcdf
 EBUILD shards-0.14.0.ebuild 1054 BLAKE2B a0df5a35bc945b59d7200469f771309a1bd046b21ba684c6b61955fe10b84e1df6eb36ba96366164591a328e6a82b0678af26e18d7f0ff4381a0d57b140cc087 SHA512 734b4b5bff2e1c8c7a2de794a14812f2d5887db86c8461c235e83996b66b721736f8517522661bd083f0b01fc6081216ca875895a45c66fa9d2705c3331c495a
+EBUILD shards-0.14.1.ebuild 1054 BLAKE2B a0df5a35bc945b59d7200469f771309a1bd046b21ba684c6b61955fe10b84e1df6eb36ba96366164591a328e6a82b0678af26e18d7f0ff4381a0d57b140cc087 SHA512 734b4b5bff2e1c8c7a2de794a14812f2d5887db86c8461c235e83996b66b721736f8517522661bd083f0b01fc6081216ca875895a45c66fa9d2705c3331c495a
 MISC metadata.xml 334 BLAKE2B 9958fd270de05b67ac94b791633635bd62770ad0ebe44630e43c26933d2059d042bc00997a8b5b8983c0e839a8adaf238359a17285e4bf8321f082077baaabbc SHA512 8010e36b15550ce7e599e30f1716b3df9d17f464f01cad097e829f3ec97624578f9bb7e24f832e14c67b4cdd5c8d25c998282e39ea0341e81baff39c1bcae658
diff --git a/dev-util/shards/shards-0.14.1.ebuild b/dev-util/shards/shards-0.14.1.ebuild
new file mode 100644
index 000000000000..ed35979dd3c2
--- /dev/null
+++ b/dev-util/shards/shards-0.14.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multiprocessing toolchain-funcs
+
+CRYSTAL_MOLINILLO_PV=0.1.0
+CRYSTAL_MOLINILLO_P=crystal-molinillo-${CRYSTAL_MOLINILLO_PV}
+
+DESCRIPTION="Dependency manager for the Crystal language"
+HOMEPAGE="https://github.com/crystal-lang/shards"
+SRC_URI="
+	https://github.com/crystal-lang/shards/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/crystal-lang/crystal-molinillo/archive/v${CRYSTAL_MOLINILLO_PV}.tar.gz -> ${CRYSTAL_MOLINILLO_P}.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	>dev-lang/crystal-0.11.1[yaml]
+"
+RDEPEND="${DEPEND}"
+
+RESTRICT=test # missing files in tarball
+
+src_prepare() {
+	default
+
+	# bundle crystal-molinillo to bootstrap 'shards'
+	mkdir -p lib || die
+	ln -s ../../${CRYSTAL_MOLINILLO_P} lib/molinillo || die
+
+	tc-export CC
+}
+
+src_compile() {
+	emake release=1 FLAGS="--link-flags=\"${LDFLAGS}\" --verbose --threads $(makeopts_jobs)"
+}
+
+src_install() {
+	dobin bin/${PN}
+	dodoc README.md
+}
diff --git a/dev-util/systemtap/Manifest b/dev-util/systemtap/Manifest
index 31611b37b486..c330720e2675 100644
--- a/dev-util/systemtap/Manifest
+++ b/dev-util/systemtap/Manifest
@@ -4,7 +4,7 @@ AUX systemtap-4.0-configure.ac-non-posix-test.patch 10038 BLAKE2B ce0bf23977dd5e
 AUX systemtap-4.4-configure.ac-non-posix-test.patch 9435 BLAKE2B df56bc874cc14afce539ad5f52f040abfb44d96401c809aa10ca925a20a9ee158aa809c79561e27dbf33aedcb8d383bc567d45b706e6e0aea101c314cd880b7e SHA512 22dc30701e1bfea872e0fdb1937ac0f43fbe72510c8322579e98b5ad75f37b6c1289718ad1786879d16890bd27ec4f051a27261d33421a7e9f0dc79ae0fba9f1
 DIST systemtap-4.0.tar.gz 5282312 BLAKE2B 9eac1cf9c9f13255ac12642c910b5591b0f5380b2a6337dedcb3d20785c0416900b9bee05f239632f7c548812be35ae90b24f524ab6f5c0c6ef474cf5de834a1 SHA512 66b5ba1902ed974101429dce9fee849273d3dc64e862c057177d158c5f284cc93299819ee8ee49d4bd3b7ff47a3512b1c68b74cad374147ce67fa406c7518c79
 DIST systemtap-4.4.tar.gz 5532282 BLAKE2B bcb2f744ad09821ce63d78b3e86eb489013aed247952c72d3dbc4cc6fc1a2b85f948b71c622487876f43b615c147eb1624b2c146e9b4176e3c91e2b7cbef9ea0 SHA512 8fb1fe5071ec99ce3c6bcf82afdc98a3e1abc0ea937f3019b225c3a1879ada30080740b1918a84c6db06fe1893e6d1e7dc84be26c7e597d7feda1efe11354e76
-EBUILD systemtap-4.0-r1.ebuild 2787 BLAKE2B 2f38bbb96fc2920d5ce2be64f33acefc5ae51faa7a833c26ee77006a45bbb03ed2769d9c7c5253458c232120c712ce3735645db4bbf99ad195bb01e609c1b92f SHA512 c115aeb0a8741d5abd5eb3ed82849742141cf82ede67f16e7568396f263cb7199bd2d8294fc9506a9ba22a2f44dd774a4a7f5c48edbb02f6106fc2d43099a896
-EBUILD systemtap-4.0-r2.ebuild 2857 BLAKE2B a208265168e97cbcd37f1a5dcd719f4b174ef0995a89024106c0cf51f18321f88819524d588c0bff816b4c6c902fe4ddf5dc933cfa57a467fab9e89aede361af SHA512 75441525964e1a7820ea115d4cbcd681e409e385fa3e25c725afda75bbb6c29e98df0624d1e47ad58bd198a967a7e72329f43ac7aaeaebe2842488f0881b27b7
-EBUILD systemtap-4.4.ebuild 2823 BLAKE2B a045414a9fa4d7f4c3ddb9251380590d56f92de774d6ea8181bc22a66bbbe7331f3b414f5487a5efcfdc8bc203c4655c5d366235b2854026117359393f026e9a SHA512 4f94efa6e2230ff34386f0a7d02e4dab885048b52d33cf4ea3aabd558c558212a701eccbfbc11699632d7b180fe29fccbcd33667ca62403e7780017a5dc43011
+EBUILD systemtap-4.0-r1.ebuild 2829 BLAKE2B 08d2fd325a6b6111cea070e6af3a99f4928e023bfb90cb6d550bc083cc08c3973f845811ffb6196944fbb5db7d298e35bd59b2c1c29e759d3ade0defec73cf41 SHA512 ebc821c97c9a4f61f38fc289b315e84b40b1ea46b4920ba347eb43952149fd8523003cc08854beabfdbacdad08d551d4281336d5291f0794198ee61d95f219fd
+EBUILD systemtap-4.0-r2.ebuild 2899 BLAKE2B 5d0346dc179f67a1a40c18f08938830d086c6c4741329afe31cada2e9e7b06e0f21e5e4334a77f1b635a0e05606e63624676591ab47e0bb7756fdf24dd25d7c4 SHA512 12ef285fbdf9a5ab4f6fdf5a96f5c59dae3437dc52ca123e1e18bc55262de074b4d1b00fa326c32ab2be34c0a036524e2f3df0d4d422b105fd59f2507a57faef
+EBUILD systemtap-4.4.ebuild 2865 BLAKE2B ab50a603e442c631c493b4a1121a85c641c08f5d6cfd76b68ba53f8d009e6c9a2a830299d32cd4a8a4a49f21b8462183aa6da0b59a9ffc60f7129d114f781dd9 SHA512 c72407408f48eca5634f0ad9c533eeba3a0cdc7a7afd276852ab311633642a973112daf5b9e95526419183c4da82cf1c8e16008ef6af6c2e3a85e9366560f9e5
 MISC metadata.xml 302 BLAKE2B 1118f1c8c5cb76bb140947afd86eefece0251d75fd99bf58decced339e68a700f140b30d7d7f77f8c89fdcd468e79906574ced8c9339498078e6cc9edab83922 SHA512 4db366a3c2ff95cd2cfe271cf4a50fa2d5189985620d3b9e51708f2811609e53eec2656589ff754731d018bf1c184a1bab662be8683c714a8621e9296eacd9a9
diff --git a/dev-util/systemtap/systemtap-4.0-r1.ebuild b/dev-util/systemtap/systemtap-4.0-r1.ebuild
index db680ba1ea18..8756646eff70 100644
--- a/dev-util/systemtap/systemtap-4.0-r1.ebuild
+++ b/dev-util/systemtap/systemtap-4.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.sourceware.org/${PN}/ftp/releases/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 s390 sparc x86"
-IUSE="libvirt selinux sqlite +ssl zeroconf"
+IUSE="libvirt selinux sqlite +ssl test zeroconf"
 
 RDEPEND=">=dev-libs/elfutils-0.142
 	dev-libs/json-c:=
@@ -39,6 +39,7 @@ DEPEND="${RDEPEND}
 	>=sys-devel/gettext-0.18.2
 	libvirt? ( dev-libs/libxml2 )
 "
+BDEPEND="test? ( dev-util/dejagnu )"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-util/systemtap/systemtap-4.0-r2.ebuild b/dev-util/systemtap/systemtap-4.0-r2.ebuild
index 0b43bdd12a7f..dcf1f8df499f 100644
--- a/dev-util/systemtap/systemtap-4.0-r2.ebuild
+++ b/dev-util/systemtap/systemtap-4.0-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.sourceware.org/${PN}/ftp/releases/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="libvirt selinux sqlite +ssl zeroconf"
+IUSE="libvirt selinux sqlite +ssl test zeroconf"
 
 RDEPEND=">=dev-libs/elfutils-0.142
 	dev-libs/json-c:=
@@ -44,6 +44,7 @@ RDEPEND="${RDEPEND}
 	acct-group/stapsys
 	acct-group/stapusr
 "
+BDEPEND="test? ( dev-util/dejagnu )"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-util/systemtap/systemtap-4.4.ebuild b/dev-util/systemtap/systemtap-4.4.ebuild
index 690944a69d14..1e32ea4a68ac 100644
--- a/dev-util/systemtap/systemtap-4.4.ebuild
+++ b/dev-util/systemtap/systemtap-4.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.sourceware.org/${PN}/ftp/releases/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="libvirt selinux sqlite +ssl zeroconf"
+IUSE="libvirt selinux sqlite +ssl test zeroconf"
 
 RDEPEND=">=dev-libs/elfutils-0.142
 	dev-libs/json-c:=
@@ -44,6 +44,7 @@ RDEPEND="${RDEPEND}
 	acct-group/stapsys
 	acct-group/stapusr
 "
+BDEPEND="test? ( dev-util/dejagnu )"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-util/trace-cmd/Manifest b/dev-util/trace-cmd/Manifest
index c7d5f527da67..bf788caccf0f 100644
--- a/dev-util/trace-cmd/Manifest
+++ b/dev-util/trace-cmd/Manifest
@@ -6,5 +6,4 @@ DIST trace-cmd-v2.8.3.tar.gz 1996617 BLAKE2B 0ab77649af90a0a9368ff118dc94e6fd003
 DIST trace-cmd-v2.9.1.tar.gz 4298008 BLAKE2B f7aa2f12b2c90f35390857ed6f5818b74c42be36ce70835d86410f9f4931d27410123baaad007fa2795c1ba1f5bafc739db620f467ccc48021d774ee7be8a68d SHA512 186bfdd8ff1e88e9e6d3ae87b123f049892deaaa8d6a42944b6f8abee6b828946b88774029aa96daf4423a3dfc01b42835508f44f636dd02579ef9a8ef425131
 EBUILD trace-cmd-2.8.3.ebuild 2505 BLAKE2B 8e31ae8d2d0114b071539b4938cba6d75319a5b0eb06c1af01b639d800fa183eac98696c72c4a2b61d868371eed5d3c015decd1c8633e8f22309aed630afd825 SHA512 15cfd6341c528a5ce4f8f6eb1f2dd0f821ef42b96a77891380a33faa93cbf8e7d0a78aa1c5bf7d8272f7eaeddaec08abbfffb3448cac300a4f80ded8c624822b
 EBUILD trace-cmd-2.9.1.ebuild 2788 BLAKE2B 954a41724116ce1770e3725c92b417058142a67d3aa0b39a9b564f985349e724f72036956935e23d4f879d090f983cfea23c28349305ec6265d3f9f00cb11eb8 SHA512 b7ad0fd44890b52b81226c221238311935f77c840cc409734670a2215e80e4169f945b5228662e5a68af9e71e7ea6c7b4aae0b9b67da11a21d4e70daa722caf1
-EBUILD trace-cmd-9999.ebuild 2213 BLAKE2B 54e6292a59840b2cb41c3612f63b96e2a3f50b86e70568e3aa1ae4caf999aad13391c2de4d94196362d4948ba10cf731b94ff2478cf24a0aecf6b4b0107c83c5 SHA512 ad5ddf89764f68fcf3768c7c2b4b8869c08f4b643ec9082dc547baa2261b487805148821272b18d28db2e5bc15e86b37021ec5aa834d50813945f63560519d80
 MISC metadata.xml 349 BLAKE2B 1e1c9812f4cfe7bb90e2637dcf21947f2702244cabc78ac2283112af7a51064d5a4732db71aaa360e6f111f5e6e5b8492e04252e84379cd21424113d2779ea71 SHA512 0a6322fba3de56559284a0f1e4abc83791cf089a74cb369d167b30dadaa019353c8eef0e09e91ad84b130f0660c1dfa665e4252987903884029f4d08fe80c552
diff --git a/dev-util/trace-cmd/trace-cmd-9999.ebuild b/dev-util/trace-cmd/trace-cmd-9999.ebuild
deleted file mode 100644
index da93e09bdaea..000000000000
--- a/dev-util/trace-cmd/trace-cmd-9999.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_7 )
-DISTUTILS_OPTIONAL=1
-
-inherit linux-info python-r1 toolchain-funcs
-
-DESCRIPTION="User-space front-end for Ftrace"
-HOMEPAGE="https://trace-cmd.org/"
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git"
-	inherit git-r3
-else
-	SRC_URI="https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot/${PN}-v${PV}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${PN}-v${PV}"
-fi
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0/${PV}"
-IUSE="+audit doc python udis86"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="audit? ( sys-process/audit )
-	python? ( ${PYTHON_DEPS} )
-	udis86? ( dev-libs/udis86 )"
-DEPEND="${RDEPEND}
-	sys-kernel/linux-headers
-	python? (
-		virtual/pkgconfig
-		dev-lang/swig
-	)
-	doc? ( app-text/asciidoc )"
-
-CONFIG_CHECK="
-	~TRACING
-	~FTRACE
-	~BLK_DEV_IO_TRACE"
-
-pkg_setup() {
-	linux-info_pkg_setup
-}
-
-src_configure() {
-	EMAKE_FLAGS=(
-		BUILD_OUTPUT="${WORKDIR}/${P}_build"
-		"prefix=${EPREFIX}/usr"
-		"libdir=${EPREFIX}/usr/$(get_libdir)"
-		"CC=$(tc-getCC)"
-		"AR=$(tc-getAR)"
-		$(usex audit '' '' '' 'NO_AUDIT=1')
-		$(usex udis86 '' '' '' 'NO_UDIS86=1')
-		VERBOSE=1
-	)
-}
-
-src_compile() {
-	emake "${EMAKE_FLAGS[@]}" NO_PYTHON=1 \
-		trace-cmd
-
-	if use python; then
-		python_copy_sources
-		python_foreach_impl python_compile
-	fi
-
-	use doc && emake doc
-}
-
-python_compile() {
-	pushd "${BUILD_DIR}" > /dev/null || die
-
-	emake "${EMAKE_FLAGS[@]}" \
-		PYTHON_VERS="${EPYTHON}" \
-		PYTHON_PKGCONFIG_VERS="${EPYTHON//python/python-}" \
-		python_dir=$(python_get_sitedir)/${PN} \
-		python python-plugin
-
-	popd > /dev/null || die
-}
-
-src_install() {
-	emake "${EMAKE_FLAGS[@]}" NO_PYTHON=1 \
-		DESTDIR="${D}" \
-		install install_libs
-
-	use doc && emake DESTDIR="${D}" install_doc
-	use python && python_foreach_impl python_install
-}
-
-python_install() {
-	pushd "${BUILD_DIR}" > /dev/null || die
-
-	emake "${EMAKE_FLAGS[@]}" DESTDIR="${D}" \
-		PYTHON_VERS="${EPYTHON}" \
-		PYTHON_PKGCONFIG_VERS="${EPYTHON//python/python-}" \
-		python_dir=$(python_get_sitedir)/${PN} \
-		install_python
-
-	popd > /dev/null || die
-}
diff --git a/dev-util/wayland-scanner/Manifest b/dev-util/wayland-scanner/Manifest
index ef4e8ab87774..375ca0ece5d1 100644
--- a/dev-util/wayland-scanner/Manifest
+++ b/dev-util/wayland-scanner/Manifest
@@ -1,4 +1,4 @@
 DIST wayland-1.19.0.tar.xz 456380 BLAKE2B 0f70bb02e890898c4763001884527067adb686abe9a2b9325badf1730d411d269c437037afc298eec8075eb1e3845f5b81b8ed3d702908388a54e7063cbea91a SHA512 d8a86f5e23e4a88e7c84b82fdb51eb350419086afe462ecb2f4d5c3ba9290ede310cbbcffd60215219ddccf5bad4adec21a5ebfbef6577200f66ac7a1b64a5ef
-EBUILD wayland-scanner-1.19.0.ebuild 1048 BLAKE2B a18ab822990665a586d1a6a61c6b2c458efb10a18993ea07b2ef654cad4c7f3101687dd83fb96c0fe3ef6c14c2b26f6ab9850a493dc2d770b321770de055c36c SHA512 4004be25df48935c51c70c6c403cfaa079123a054b28efe8c535008e5cee8b77abe19504681b7fdba2c80a7dc9eaa7cd1e9465196e1eccf7189521ccb57ee749
+EBUILD wayland-scanner-1.19.0.ebuild 1044 BLAKE2B af22f2fd48c9e7f89a846b1b235ff03e03d976fb8d467a603a23348202284dc46e486398ef1e92755f3966ea863ba999aec179be0dbe717af3d4e3ab999cfa90 SHA512 8d86711f0488674a300fbbd2446163ce6370a6b0893b0f5c7b3fab1b74a072b19a180ec65a086f9d326359543f4e165e16fa48164a90bc5e85e7b0cd017df978
 EBUILD wayland-scanner-9999.ebuild 1048 BLAKE2B a18ab822990665a586d1a6a61c6b2c458efb10a18993ea07b2ef654cad4c7f3101687dd83fb96c0fe3ef6c14c2b26f6ab9850a493dc2d770b321770de055c36c SHA512 4004be25df48935c51c70c6c403cfaa079123a054b28efe8c535008e5cee8b77abe19504681b7fdba2c80a7dc9eaa7cd1e9465196e1eccf7189521ccb57ee749
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/dev-util/wayland-scanner/wayland-scanner-1.19.0.ebuild b/dev-util/wayland-scanner/wayland-scanner-1.19.0.ebuild
index eeb424d9d3c1..49470e8b51d4 100644
--- a/dev-util/wayland-scanner/wayland-scanner-1.19.0.ebuild
+++ b/dev-util/wayland-scanner/wayland-scanner-1.19.0.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
@@ -8,7 +8,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://wayland.freedesktop.org/releases/wayland-${PV}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 	S="${WORKDIR}/wayland-${PV}"
 fi
 inherit meson multilib-minimal