gentoo resync : 18.12.2020

94 files changed, 611 insertions, 1285 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index a1ea3d963e40..1d90ef6131ff 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/aruba/Manifest b/dev-util/aruba/Manifest
index 7885ed4e3cfa..21655fcadc31 100644
--- a/dev-util/aruba/Manifest
+++ b/dev-util/aruba/Manifest
@@ -3,7 +3,7 @@ DIST aruba-0.6.2.gem 75776 BLAKE2B 569af009cc20b644878fda25b5e7f79bd2f7c6f5fa9ef
 DIST aruba-1.0.2.tar.gz 132977 BLAKE2B 762abef412a62e91931690a0a56ee1b04868c9f446f79e1c282e15c1ded1faf609d480e7fb032b09c3230e2d233b3cb0e09a58b2950c7a138f486c34339b8a0c SHA512 ff9161a94627e1bd123c00a0c3dd8624034b10741867d60c85264322e4ae5f2226d585d361fe8f2229003c187a1dff38c4278c359f018ca28cef1fd6efd26aa0
 DIST aruba-1.0.3.tar.gz 133790 BLAKE2B 4008cfec1bc1d63113b1d8961e3bd6219f3884875350b5f2ec6676f6a6167e9bbc6b759c8cc0a29a6774877d3ab2f1c95954d83dbfe3e79669cc8968c1c533ec SHA512 ff89846b805267e2a4bff394c8285b9227d40a2cd93a7ca8fdf8cd6d38a3b2144d5e96b0bd1cef94714df630ad7a779d609e05585c671371124b400130f3b3b4
 EBUILD aruba-0.14.14.ebuild 1746 BLAKE2B 419b70985f18519c23aab2e13b006d867a19ae534fda30c9a4ab88a3df18bab5a38b74b5614c8fa00f1577acca27b90ab260c05de2da8700133d33c71edbc97f SHA512 84eb8be2f99c0e7a65a61450ed56ddf632565da6db96e1b10e5cd5dffeae24f476a765507a2e57fffa22a7d90447036967f66cd346bf03c7151c5797d6118140
-EBUILD aruba-0.6.2-r2.ebuild 965 BLAKE2B 4988dd0014e07031f1ed9e4e2dd052a4e16f4c3692e2bac9a724ccad35bddc88694f1b622b71a75af997e7f09dd1eadf3ebf89b330c64bbeab7368b19a61ae7b SHA512 2e2be6948e70a9826ab445ab002466183ede2a185b40ab95ad78d218d0df32e0fe10bc351567fdb1eacdd04a3cc2d7bd290b42fec2f5459c758eb711a8c1f4a0
+EBUILD aruba-0.6.2-r2.ebuild 966 BLAKE2B d586b50711308e6e53b8603da78203a0184a17b5a1d086e557c702d071803beb310b32c574ddf24152d0dee9eb42547891666abf1cd843afd80a09a4e2e6f5f5 SHA512 99fd9fe2d0018303246dd00f887a3ef3ff457ca9d3c62f1f96f27c5b6b3c6e2901b8c48604e22ba30a6ad04860a761f9b1ad92e465ac25e9cbfb68b86fc6650a
 EBUILD aruba-1.0.2.ebuild 1922 BLAKE2B f7d9aa054e862cf7aeef26a322a067ef8b279c8a96a472471aa0dd2a027c0e06d66908ede4730ccfeeec07c76dcc52657a497f7040d9b83104a60cee83d4f032 SHA512 e8451f0ec7ec1c9967dd0046050eb01b96ce616c55fb50ab98705595ad4b98b747df4be1c468da45163c710398d2de2b253d3b3ff58f042153f45e30664bc311
 EBUILD aruba-1.0.3-r1.ebuild 1968 BLAKE2B 1423a47057cd55850ddffa55a807832d6c88a3d6c52b40151e6722f7b06c2486c6757286f184528e34b962ad39e87ff4853f94fa3422febf8c79b67529ba7fad SHA512 145d0ea4cc31df24758d3baa19567b82fc68a2a890034d3e03fc64ade8ea262954796c96f421bf77e45de6d79cd4db99cb59a25d26e71fa79c4680e18c35c897
 EBUILD aruba-1.0.3.ebuild 1955 BLAKE2B 0b36d1b42e8a9cf1ca22a19118189f2a8bcd5291cf8e4626d2de1542fa3352a0e9c2a777394f93b7bc92888debfa32673863a52137c8077cc0b97040eeded385 SHA512 25587725ee21665a2d36bbae4eae8e836cc96f57b95b974a7dd0f0ba0e9a8a8b520451e1543d80ae335d1ad6ab00b681beb67bc294e71ad0160dcad5e732053c
diff --git a/dev-util/aruba/aruba-0.6.2-r2.ebuild b/dev-util/aruba/aruba-0.6.2-r2.ebuild
index b39e9f9ee5b7..63e3a70e5fbb 100644
--- a/dev-util/aruba/aruba-0.6.2-r2.ebuild
+++ b/dev-util/aruba/aruba-0.6.2-r2.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="Cucumber steps for driving out command line applications"
 HOMEPAGE="https://github.com/cucumber/aruba"
 LICENSE="MIT"
 
-KEYWORDS="amd64 arm arm64 hppa ppc ppc64 s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 s390 sparc x86"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index 530b8d0e9312..1079e0142059 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1,4 +1,6 @@
 DIST catalyst-3.0.14.tar.bz2 621178 BLAKE2B 3fa87125f14661bb77432267f03c0966eff8f71f4ef334ce0a14218f7557dee270840afb79b6735a149851ed44b1ea2f6cf59d8274d74e049246d89874aa484b SHA512 938a63a83458fa5a26a4b4e62d18086ed813aec5638a9dd363ba553cb7aeb337c3b8ba0768f3b5a658aa54f2f375a7fe067279c739073d2420c3ad3a42830830
-EBUILD catalyst-3.0.14.ebuild 1913 BLAKE2B 76c621805e4cbb86e2bd52537091309fea71a6abef1190b274180210dbd6c363502d478d9c27f2981143e5068264e5b0b05633b857184e053669f11e44eba913 SHA512 be473d81fb31ae9aec8aa25608c426f98c877d4115a091c7fd7561e45e2dca3805c076b6eb088dee3988dc6925f186a67f3f951b5e75f2ea5d66014290d981f3
-EBUILD catalyst-9999.ebuild 2317 BLAKE2B 9e80914d109534080b36949a85afd9a4ca28d51e58b7c96bc5bbf359a3d18093ece3263650cf540584e4ad730f50ec7da2c1a8d8447950e46489be6a8d81e69d SHA512 45b47f8c3dfe12d15bad9b57e0fd4d885387e97bd44d8779dc9bcfe492d8240099185a434a25829eb6d43627e8a8ad3005403def3e3cd99fea2bbb1fc3173412
+DIST catalyst-3.0.15.tar.bz2 621366 BLAKE2B 890381a3ed53bd28eb110a95b98fbdac83d1ee72e935919a47a5bae29f672edb1943fdf5f259572ede578c0253e55a39f25fba88109e6d9bc5af0d3e344c2db2 SHA512 ed543b995664a5786790990cb4729e84a705820d1e72eefb432c3622bb2307646a0ee753eaaafac93bda04df130e83dd6db6b59052c4bae6347b77dabd67b2d5
+EBUILD catalyst-3.0.14.ebuild 1913 BLAKE2B 2db4135e9407c87207c82b1840730eaf99564804a85724e67c8d37c458538297915ef7f032477493bace51a49fc96e185b2d2a5894ed9757951c338cf29142c2 SHA512 ddec3a42d64f74b99c676a6a2c142e105e10f50930bae2309053c854607ea6d9ba11b1589cc172cf71a6a5c83319a6fac7344b549b4811db7aa7afcf53c87771
+EBUILD catalyst-3.0.15.ebuild 1911 BLAKE2B cb5cdf33e45e54e4da861722d1397e4f5fc668a46df2f468f970806d5269422a8202d6618c74f64c2e00628a290cde75732cc46d2deb9855f39485f576522a4a SHA512 37fcd1eb807a304b1f09e90fb396b4c6c0cf42605d3888523cde5a97469d794e3eb05be44ce660688fb1afa2ce81cd539a969d55d5733445ba12c0e5fa47188f
+EBUILD catalyst-9999.ebuild 2317 BLAKE2B 1dd7412eaedad3469696b829a3bf412da30f77d3ce89de0cd7c7d3ecd95ed6f7e05ba9659d15ef146d02ca54cd3fa553cabe5e6aba19c9a1556229fd8d4f13fb SHA512 56fba8b3d3f2bd6479f2fb014b5a292d81ae599f6a07f7daa16844a3be3041f918e69a34b3a9f0b26993330895e3d48945870db39d1a0a5833d3129515581d00
 MISC metadata.xml 512 BLAKE2B 27e0e3638c330c780f163608e5e62b71ed636a2e26291f97465c4506ae1b99345d081046bcab70b1bf56e36c5b9a6b8220b94da8433f2b313235c784ad6b9b5f SHA512 7d6683e83df2d311f3210af91880486ede8f7ddea57044e765f29694eb3e1b8df6f3d22c9a729c480ae9d49ebe3778cfe7a6509365f59eaae34f8438afe97afd
diff --git a/dev-util/catalyst/catalyst-3.0.14.ebuild b/dev-util/catalyst/catalyst-3.0.14.ebuild
index 09099da1323e..5294c9749a86 100644
--- a/dev-util/catalyst/catalyst-3.0.14.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.14.ebuild
@@ -39,7 +39,7 @@ RDEPEND="
 	amd64? ( >=sys-boot/syslinux-3.72 )
 	x86? ( >=sys-boot/syslinux-3.72 )
 	ccache? ( dev-util/ccache )
-	iso? ( virtual/cdrtools )
+	iso? ( app-cdr/cdrtools )
 	kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )
 "
 PDEPEND="system-bootloader? ( >=sys-apps/memtest86+-5.01-r4
diff --git a/dev-util/catalyst/catalyst-3.0.15.ebuild b/dev-util/catalyst/catalyst-3.0.15.ebuild
new file mode 100644
index 000000000000..f1c19554ff9f
--- /dev/null
+++ b/dev-util/catalyst/catalyst-3.0.15.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == *9999* ]]; then
+	SRC_ECLASS="git-r3"
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/catalyst.git"
+	EGIT_BRANCH="master"
+else
+	SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${P}.tar.bz2"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
+fi
+
+PYTHON_COMPAT=( python3_{7,8} )
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit distutils-r1 ${SRC_ECLASS}
+
+DESCRIPTION="Release metatool used for creating releases based on Gentoo Linux"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Catalyst"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="ccache doc +iso kernel_linux system-bootloader"
+
+DEPEND="
+	app-text/asciidoc
+	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
+	>=dev-python/pydecomp-0.3[${PYTHON_USEDEP}]
+	app-arch/lbzip2
+	app-crypt/shash
+	sys-fs/dosfstools
+	!kernel_FreeBSD? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) )
+	kernel_FreeBSD? ( app-arch/libarchive[xattr] )
+	amd64? ( >=sys-boot/syslinux-3.72 )
+	x86? ( >=sys-boot/syslinux-3.72 )
+	ccache? ( dev-util/ccache )
+	iso? ( app-cdr/cdrtools )
+	kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )
+"
+PDEPEND="system-bootloader? ( >=sys-apps/memtest86+-5.01-r4
+				sys-boot/grub:2
+				amd64? ( sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64] )
+				x86? ( sys-boot/grub[grub_platforms_efi-32] )
+				sys-boot/syslinux
+				sys-boot/shim )"
+
+python_prepare_all() {
+	python_setup
+	echo VERSION="${PV}" "${PYTHON}" setup.py set_version
+	VERSION="${PV}" "${PYTHON}" setup.py set_version || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	# build the man pages and docs
+	emake
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if use doc; then
+		dodoc files/HOWTO.html files/docbook-xsl.css
+	fi
+}
diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index 27ca55eff349..22943633c710 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -44,7 +44,7 @@ RDEPEND="
 	sys-fs/squashfs-tools-ng
 
 	iso? (
-		virtual/cdrtools
+		app-cdr/cdrtools
 
 		amd64? (
 			sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64]
diff --git a/dev-util/cloc/Manifest b/dev-util/cloc/Manifest
index a5acce655ba0..063f543f271d 100644
--- a/dev-util/cloc/Manifest
+++ b/dev-util/cloc/Manifest
@@ -1,5 +1,5 @@
 DIST cloc-1.84.tar.gz 514868 BLAKE2B 53fa0f0d2c8033619f9f7202802e5fd51013c459bbeed8482a35050be69981e60f3c96879cc2853d509322933050fda52fe17be7ec393783f06a0df5e9cec785 SHA512 85f8af041b0ca858c21e28d3fb7cd9201264afa9e12bd3a14b15a8af3e6e68378dbb02a39dc12140bcbb104424cf38bfa602d2a0683e8c89fa50cbdcf7556b3a
 DIST cloc-1.86.tar.gz 536828 BLAKE2B f584da0e25ae755a1450117774ec8fdb87eb693ac77473929a52e617713391eb4bffc2f6b74bbcd5b01f6e2c0d747221e3f7c4e74dfd6131d3cde10a3a102daa SHA512 fe6101404f5884d11bf73de43bd25e533b04a70707b95e4e9482b51413aed46ddb55beaa27e3d25cd7604394a739f7cac6c1f8695cd9cab3f23adf6e27171719
 EBUILD cloc-1.84.ebuild 681 BLAKE2B 7f0b61c23a9af5fe8bd6d6359e926989191ef28f5a2fe3b045ac325c8c88d3a48d1c3d884e6aa9a35c38ac586a2eb571a9d36d72b8d6215947f1dbc63d5d26a4 SHA512 f5bcfec8a2c440f6105adfb1c9e99acf2b2b5bdfb3f8e1205b4f3c4a92cef7072f472e8337500846bdcd6d88b1c2fb239d61de1c38d6f4e91653127421e5dd6c
-EBUILD cloc-1.86.ebuild 683 BLAKE2B 125b6eb0805bd7047cd3cb74e807a7110393001879aeb9be71b221c3e9369d95e82ed83aab6d7230235e7479c83ecd9030542d9017c9ea529af7fc33350ee594 SHA512 80fffb487795b4abfca524c7a20abf284d8647fbd45c415b0c29ca512beb3edff41fe93e312989690651ba1d61358162b2de51293cb8a7961a8c6d6f4cbd8bbb
+EBUILD cloc-1.86.ebuild 690 BLAKE2B aba1ed53616bf629c70bf2aaf90a8edcec86c7f976349d37664db4064b9fcf3d622e63438d16d92174acc6c57c825d509f9d16cb854cedec06996ffea824674c SHA512 6f69d7feca2204ed07010169c5dd1f4ea3f777b255017b2389c9aa864e46eb97657309c8ff5ab9fbf62c547f2ed370bc58c5bd1f588e947da597feb97c676dc8
 MISC metadata.xml 699 BLAKE2B 424f272c2a398814052cdf40724b0daaf63985ef10194e38b2a22ad4cf67c90a9ee016d7e14dca738729d61b45d0cf7f2044f5801e6b35fe344ab152fe754d80 SHA512 7625ef4e35fda98f4a56ddc5a02f24af4b8a30db9fc1297092188078328ac8c2f188715251b41b3956c40a946b8791c5ec06e71c2edb271ffb0459add56dd7df
diff --git a/dev-util/cloc/cloc-1.86.ebuild b/dev-util/cloc/cloc-1.86.ebuild
index 61220333dbd9..d2013f01d311 100644
--- a/dev-util/cloc/cloc-1.86.ebuild
+++ b/dev-util/cloc/cloc-1.86.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/AlDanial/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 
 DEPEND="dev-lang/perl"
 RDEPEND="${DEPEND}
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 329a719fd9b9..9220bf90c80c 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -5,29 +5,23 @@ AUX cmake-3.1.0-darwin-isysroot.patch 1926 BLAKE2B 4e8dfc78db33e62a6234a91210f01
 AUX cmake-3.11.0_rc2-FindBLAS.patch 775 BLAKE2B 89249b37ca44cc9068a5fd81350637da16c3a92a662f5b30db7e7bbfb9b47c816122bcbe31cb01845bdec760d449d0babbbcd6638ad4975b39db73c7bc5ea2e2 SHA512 ab24736b64bff1f9213f3eef7acc6a78829c875e8e5ec7b0d96ad406517e5335b0e3930ef369a9d6190d25a298c6834965e4977e5062e87595169272339f7738
 AUX cmake-3.11.4-fix-boost-detection.patch 996 BLAKE2B 195ade40e279ca85ee55b1d46353f8809f68e405a6c914c34340825f7f77ec5cb78ebee3f7aa12cc6f026a802db4bc893ac8570a03b76af708ea2df7a3ecadb1 SHA512 66da91fb39286d1745af733a806f60db313ddb0a506b29509aba66259a57cf8abf65fcc871114c5a2cff91eb8c27ca346dd75fbd29f773fb2d31cfead827f250
 AUX cmake-3.13.4-prefix-dirs.patch 4239 BLAKE2B 470de3626a9f6edf65e5ec597b1de36697e6c2038ec5f435dd5a89ec69ac32227663f0eb5f86c9d5d89a1c809e1092b5e901c52dcab9f2a7d3bc8f7bdca110a7 SHA512 b1801d0f0ec8963181460a8b939a26e791295d6a45fb78135dce5684507689cb44cab7a536d5f85c26f51deda19e95b40500aba026f43920fa7eee686ad3869c
-AUX cmake-3.14.0_rc1-FindLAPACK.patch 1798 BLAKE2B f372fd920abaf85ab3106385d45e193c2c0fba1ca9fb5c14cf53bdee9a29602b7db0078676c90f65f3f3eccddfbb1f6b9964d26f90aef38cbc0c197a4b243ac5 SHA512 dcc970561f54d862f2124512bfc28ab25e66b1fa5e6a7a6138faae7f1e3a4136320ad4d4942153ac9505035b74f3e8442dddb62af6fb1486fcfec08fcf3e3743
 AUX cmake-3.14.0_rc3-prefix-dirs.patch 4688 BLAKE2B ec197f40246ff9b47f6515cec92f0ef497de2e96756cd7c12ea3fe7c71d5e2220c637210f663194c63e72924d89dbce7afe92fed01bca8947bdd76af6f5365b0 SHA512 9da6be335e5615b2e14fdcccbadd50a0e2df6e19476818358216501b657350c73fa6bdc1dcaedec1fa50e3e18e39544e2d2815d6f54dd5b4aa5860bdf35e8d52
-AUX cmake-3.15.0_rc2-FindBLAS.patch 1233 BLAKE2B 165307b41f7ebaa094e80adbab336ab10c48841a3c0b0e14b1277f847f624b421448cfc5e45a20e80f71f14ee7986ce756bc5b3d8e6b41b4a741611151d7f446 SHA512 2d46d95e69fd8eeaf8df198243269d87b83b87b6ade1d5f80d69ed78627a54ce05718596eaf43c7851fd4e010e526fa38350efeb2d92cbaf260e7789da0a2b6a
 AUX cmake-3.16.0_rc4-darwin-bundle.patch 1388 BLAKE2B bcb6c3d8e4f64ccc3e6ebf9ae906960075b3fb1f432925e07a711ac27321023033013e7a2e1d0ffc60dd464b775fa2537a49c73089861a2ce8f6316ddaa3d03e SHA512 7e0f598fe1cbb2c44b345091c102fb42ebff510ea7eeccdbe1fe0d65251127d823c37f2d37b073305679ed86fd48923566f1d62a7c9fb55df475d48891b4b861
 AUX cmake-3.17.0_rc1-FindBLAS.patch 1087 BLAKE2B 5e549db39f0e8c5f821a70121551ccea132e11dd8b468cfc7439e61763b5406860d952787d5957ea719dd48ec32ac8313d3209bed2a3423f5e40b8a2fcf04ae4 SHA512 1ea5e5e44c6a97cced30ef38424e24a3551d58c828d71d3b5994c265f099a3aa19174febfc2778eb688930432073e012557a79550d38b6b716e6b619d74a298c
 AUX cmake-3.17.0_rc1-FindLAPACK.patch 1973 BLAKE2B d4f10694b55fcea047f364f3dd383ba12fb5c3ce4369bd527c286e23260b551a915fa5257f0351bce00a4332c987c047c246812f2a713b0d1db312c7d03edee4 SHA512 20baafcda95ba219ae4e186a8878aa75e2e27f766ab3afaa14ce316cd2c2bc85debfc6be4ed1b6c17c3c1532b3a6868d0b4ee7cc47145cb788838f023b624303
 AUX cmake-3.17.4-uv-check-return.patch 1460 BLAKE2B 1cc26575dc1ad8ff9adea7ecf7f5ba0f4b2e16510c2ef3572baaf4f6bf771d6b4a1018000b78310b246e333c95e857851a40643609d997f2283486eddda8e8f3 SHA512 e79c6b34d433804f549b60a926bbbffaeba8506430225e284187905d7df5f522c29b8507bdb334cf30ce88414d326ee4476782731f36f1b1a48f64f9fa208aef
 AUX cmake-3.18.0-filter_distcc_warning.patch 842 BLAKE2B 8c9b02a251d118f2ac31fe417e10750e3f4b911891723b0edacea83bf2b6220f121e02c299655cd49ae5a019af8a747218f81d6ece6cda41aeb57d24f9385277 SHA512 91b795225313270449d6da12baa818382da4f6937795303c5cc894f3f38f03cb88d8fb3b774fb0b8ab9cf5cd344ebeda3d83f48ef8474093a8a0268d8f342828
 AUX cmake-3.19.1-darwin-gcc.patch 433 BLAKE2B 72fb716af3d24d2723a06f0c2351d16af215cb64effa46bf404d8e00106ec80297b34b3d7f787b191e3fc08e1d35c515b6d2d527213285de91cb1f4b81272cb2 SHA512 a732f6f22e4eaab747cf80eaebb4fe5624aec893fc2bbb782f86d8377d3eda365568f091dd2505e18798fa8147f13adda0fa5cb0687c5c427a65bdc7cb957ff0
-AUX cmake-3.19.1-fix-spurious-include-target.patch 7557 BLAKE2B c67a83e4729676e5f9b239e5b428a53c78c516f40cc53e6cba0b39d356eb24a6fc855c6c2749ede5f478242a556fe1e40df6f57899a06a2157474f91fcf47c95 SHA512 0a46074acf6b40affdd57a019d354603e6a102a604e41ffa402b5107d4f1b629c8cbaa121ebec35749ad45b0cd62f6a7ff2a638f15cc73e3251b6e9abf0a89ec
-AUX cmake-3.19.1-use-FPHSA-outside-find_package.patch 1451 BLAKE2B 9cdc2067a741f60174fa86239e4390087cc29aef43fe111c1ffa5a337424bc273f06f1fa8bf880c66959455462d2696c1687e20e6180a7f64c5cb8fd2a58dde9 SHA512 3cfc27166a389b04ab0bb8464c938fc9229e7b5c5dd3e0e5e36b2ce3020de00b373695cda73aa40bfc720cc9f3fc6eae11b7e88c56905cb411cbda432fe2f699
 AUX cmake-3.4.0_rc1-darwin-bundle.patch 1043 BLAKE2B 99fc8061352b6a503f472e11045f9a99c2b980f08e9c1406722eacdd438617dccc394f53bdcaa4d93c4aa499b4615185c3ec99ccad8be3504972001498b02c48 SHA512 8c6297bf824d5a911e14004ac4c4e62d1a1528e44199d8860ca885bb1b8dd3d66a73c3db32664b830c3c635bdb498abbd5196be92ed2571cb22828d7186ff9f9
 AUX cmake-3.5.2-FindQt4.patch 1585 BLAKE2B 8cfda84c419515be57f65be7b4b22d7937b656eb7f58d61c7d9e30db9dac36e934f2a529b4ea20d69c5f8a653c727bae34374ebcb7f5017fd70df41abd538164 SHA512 bab8960bfea3c29416bdc8f39c7dee59b89bd7951752401f24eeb9161ac7bc2c6dd200cb62c6b9f964d763b5d257a94d8b04dc7090d6fa947a04f2d0c2e8c479
 AUX cmake-3.9.0_rc2-FindPythonInterp.patch 1458 BLAKE2B a70945921738f00952b40a73d9ea26ecc86614aa3f12c94226aac4710dd0b9723c365b6f5def965069a54919bab13a33490facc6c5e64fad69d2e05a97d2812f SHA512 8adcb75cc035f64521e85229eb8dfa1e627326f8e189f66b707b3a0448ed3ae6acf306643026f7cbc7b924edcef73cad7a107d83162b4ca46bd6bbdc7a58af12
 AUX cmake.vim 217 BLAKE2B 5d2cf8b4101a7204fd27a9f21d82fea4d86fc4eeed54e062b543452dc574e73d1c80167c83eb482d9eec310950ac811ba35d3eeb97b51958f12f3adf575ddbe7 SHA512 2f7e9e949f8f3030a0dfcef56f4effea703ee60555c22f6a2d1dfeaf3334f33a3e88910c666f704e4ab60cde4ebb509c7d85d812a3c1627010e52fc757f15cdf
 DIST cmake-3.13.5.tar.gz 8618821 BLAKE2B 765678bc92821207c53bfb4ac995a791b938f20236c3a6fda873b8edd11cd1401b4f4c05f170b8f600f38bde5f1227c715499eee072a8de3bb29d4f5cd230226 SHA512 99e3a8f5bc147dd90b9cab11f06892d87f289aa1354ad323711fe96ebc9c32b1e887e8f9d3575a37831c4d2153a070ff9115c5e27a185d54170bad9dbbaabc26
-DIST cmake-3.16.5.tar.gz 9111262 BLAKE2B 5f996113a4979563d7b9f298b4b1a32d6f91eebaa79af42e1cbf247884e443de47e30030fd0f16c7755c4086e2bff0c0741911753ea7c889b68c393c0b98c876 SHA512 204ce83501c8068ff660c30a68641a354764135e1600a9a95b39476d072876e400961377e19bbe03a7b18412b36dcf21a693946a2a81cff5985e637e9f193671
 DIST cmake-3.17.4.tar.gz 9473549 BLAKE2B 2ce29415525b5292ae9e06d73570ed0af2173d8d15612f4d645f22d4f55cb99018663c374c4282731e09f8c6e4ffd59316d65f38aef9db5c34d874ca8992382b SHA512 6af879502e52388f3be02a4edfb006274840ad1afa8f28ffd6ec69b0310c7f718812b2272e5f77ffa422717f61407a6d482deb95941555c21c73fc5f62356a4e
 DIST cmake-3.18.5.tar.gz 8975784 BLAKE2B 62ea68b602e7e352c22ba6122aa010fb78fb5c4e484aa51bc336e750280d5fc03ffa439bd8005d2c43176f5a5db4ebfd419beca65cc59c5b8cd5666e38394fb8 SHA512 c15e0937a9c0ce0b6164c3d02a147e679ea57e1119cff4189a15de71429a7facb3c04eb8db467471876b5da5dbd4a25acb228efa7101fe78efd205f0d2c96343
-DIST cmake-3.19.1.tar.gz 9256956 BLAKE2B 00874fa3099fe55e7a8c16f5225d30c56e05aaaa69930e0f10d1829bb373f83c17cb11ba538918089bd94162dbb4cc736b2024bd0e1e7102f3d8c462bfe71c1b SHA512 1a1c9a8546c80f8602babffc7fd398cea5d9163512ef74333f87e26a97ca35358bd0e90423768cfc971ebfed185e19d775737e557e0e982403b77a2ccbcd063a
+DIST cmake-3.19.2.tar.gz 9264414 BLAKE2B f45727fd6b6e0e324f618577abbc7fb1830f05f01a9afea4f8713f5f62ede3a612a020ef97385cdd6ede4b575a3b6f63deb57123a222b71e2906a42cba3b3d7f SHA512 d811122af89d46174b8fdb2a26e8553200d9dc7eb6385ece4e4b3e7584880f73a799813d5a81e64e956fd2574b63264fa8944d862c74a076e9d61f5e6521e91a
 EBUILD cmake-3.13.5.ebuild 6250 BLAKE2B 51fd5c675042b869a8dd3f54ceaed2f3a2d9bc43aeb2894b1b8c9d995660bc81ed9b39f99bfbb376d0dd658942def7bc2c1ec3538efc36c1f43f65bc1ca5dd5b SHA512 638eece44d2cb688d92fd9fbedd189aee9b0b878b1fd054984e806d17083eda352695136bf0d800d9e2ecb7993917f2da4f1f1913e14c7686c4d7cff8c641f60
-EBUILD cmake-3.16.5.ebuild 5911 BLAKE2B f124d2d41b33a9a76749ced21fac3717eb50bba7065500986fdafc445bef3f17bf6e1faac7e863257ad5d8f571e4bdf17c9e750f5b83163401b491d85a2319f7 SHA512 4cfeb2154bd96b1f146b508ed038158a8cb58ead403011054702c4bdc1e2d99e677baa1b7ee6c33c4b317ca4992718cdc352b55724e73bf8edc758d2748e2603
-EBUILD cmake-3.17.4-r1.ebuild 6136 BLAKE2B 255ddfbb74512dbbbbf5ad397bbf6f78b9185ff2aa25e8b5ca9f12ffc57ba65a2906de692977c722c8a29f524169b72ff46ee7226ec8ba9d81f36c90357ae149 SHA512 c836b5851c424b9880967c248605cc1ba1e992946a1ba96f0622695902303bb40b1c0d6d015fb17dac7778b1fa388d277c9dfe964cfd0796b48c93fe8badd426
+EBUILD cmake-3.17.4-r1.ebuild 6135 BLAKE2B e2a5cc3192918239c62b6502374a585d8f25dfb795e492a43de513a8f89e601862c0e010cedb02441a716884abc55ff1b455739ceeb769e41c4e873233df2a11 SHA512 a0b1ed0cd63486d3f625cfce02c14bb7363199b950850bf03380d48b8126402659712dad7c0254033846b43faf4051413cc875bc882e86f658baa5eff59a2236
 EBUILD cmake-3.18.5.ebuild 6130 BLAKE2B 57a06ffa279519744afa1854fabb28f90da78d31dc26ea6e78fd1f0e0401a4ce86bb5a45297679cb92df3928a79ee8740a5288ad1e8711d908601fadfa02b028 SHA512 8337e005af90f1a0f792b6f2a7d9098767024ad221aed57237e4ced1b20f98a5d16a7633ca86e1df83043a3e3b7d58c138104b58ebd170675146af37e619744a
-EBUILD cmake-3.19.1-r1.ebuild 6757 BLAKE2B 2efce746909404d51f2f2f294bcf0c89d21938fc9721d0d0fa79977c28574078f6a57fec8e87dee8732cb6704f636b7f02770cff6b1873e4ac2babb8284d203f SHA512 a65f25b10379f0483cf7afe38bd76b7eca0c39b852c30ab80f73794ccf80a258c5377254fb0294d362a8447f4bb65628b271d225f00dbefdcffec33d420afa68
+EBUILD cmake-3.19.2.ebuild 6620 BLAKE2B 08f857fbb4188519564decfb1c63a29f1269cd878466a8b8568bcd41640d2c0bd6c9f39769c4cad4f82843aca87ae08084441f969ae52f2f0f993a04d60d9e0f SHA512 b9c0a84740cfe4dc21efe715d22335bc56f615ee34d759113664c13fc35815fd7bad59849c79c6859ccf14d7d57f1114975ea8e44ee1cde7315c87c2d04f7b94
 MISC metadata.xml 460 BLAKE2B f1a7e1709a6b9975ffbc377c8b4d1ea8a01f52ccc139693c8e427150b7559ecc867b3e55fb4bc95fe342a2335fe5e13c69f4bd74ffbbf302c83872c65963e73e SHA512 fc562cd5f336101d16ca30a5b3e9b99a6e51ec9d7aa503f20ce278f44d5810286fcd6b46b18073cd88ba88ee5ab4f8a0bfccaa567df09ebb722a68ab721aa340
diff --git a/dev-util/cmake/cmake-3.16.5.ebuild b/dev-util/cmake/cmake-3.16.5.ebuild
deleted file mode 100644
index f53ac8c1d184..000000000000
--- a/dev-util/cmake/cmake-3.16.5.ebuild
+++ /dev/null
@@ -1,220 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-CMAKE_REMOVE_MODULES_LIST=( none )
-inherit bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing \
-	toolchain-funcs virtualx xdg-utils
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Cross platform Make"
-HOMEPAGE="https://cmake.org/"
-SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
-
-LICENSE="CMake"
-SLOT="0"
-[[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc emacs ncurses qt5 test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	app-crypt/rhash
-	>=app-arch/libarchive-3.3.3:=
-	>=dev-libs/expat-2.0.1
-	>=dev-libs/jsoncpp-1.9.2-r2:0=
-	>=dev-libs/libuv-1.10.0:=
-	>=net-misc/curl-7.21.5[ssl]
-	sys-libs/zlib
-	virtual/pkgconfig
-	emacs? ( >=app-editors/emacs-23.1:* )
-	ncurses? ( sys-libs/ncurses:0= )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	doc? (
-		dev-python/requests
-		dev-python/sphinx
-	)
-"
-
-S="${WORKDIR}/${MY_P}"
-
-SITEFILE="50${PN}-gentoo.el"
-
-PATCHES=(
-	# prefix
-	"${FILESDIR}"/${PN}-3.16.0_rc4-darwin-bundle.patch
-	"${FILESDIR}"/${PN}-3.14.0_rc3-prefix-dirs.patch
-	# Next patch requires new work from prefix people
-	#"${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
-
-	# handle gentoo packaging in find modules
-	"${FILESDIR}"/${PN}-3.15.0_rc2-FindBLAS.patch
-	"${FILESDIR}"/${PN}-3.14.0_rc1-FindLAPACK.patch
-	"${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
-
-	# respect python eclasses
-	"${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
-	"${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
-
-	# upstream fixes (can usually be removed with a version bump)
-)
-
-cmake_src_bootstrap() {
-	# disable running of cmake in boostrap command
-	sed -i \
-		-e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
-		bootstrap || die "sed failed"
-
-	# execinfo.h on Solaris isn't quite what it is on Darwin
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		sed -i -e 's/execinfo\.h/blablabla.h/' \
-			Source/kwsys/CMakeLists.txt || die
-	fi
-
-	tc-export CC CXX LD
-
-	# bootstrap script isn't exactly /bin/sh compatible
-	${CONFIG_SHELL:-sh} ./bootstrap \
-		--prefix="${T}/cmakestrap/" \
-		--parallel=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") \
-		|| die "Bootstrap failed"
-}
-
-cmake_src_test() {
-	# fix OutDir and SelectLibraryConfigurations tests
-	# these are altered thanks to our eclass
-	sed -i -e 's:^#_cmake_modify_IGNORE ::g' \
-		"${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
-		|| die
-
-	pushd "${BUILD_DIR}" > /dev/null
-
-	local ctestargs
-	[[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
-
-	# Excluded tests:
-	#    BootstrapTest: we actualy bootstrap it every time so why test it.
-	#    BundleUtilities: bundle creation broken
-	#    CMakeOnly.AllFindModules: pthread issues
-	#    CTest.updatecvs: which fails to commit as root
-	#    Fortran: requires fortran
-	#    RunCMake.CompilerLauncher: also requires fortran
-	#    RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
-	#        debugedit binary is not in the expected location
-	#    RunCMake.CPack_DEB: breaks if app-arch/dpkg is installed because
-	#        it can't find a deb package that owns libc
-	#    TestUpload, which requires network access
-	"${BUILD_DIR}"/bin/ctest \
-		-j "$(makeopts_jobs)" \
-		--test-load "$(makeopts_loadavg)" \
-		${ctestargs} \
-		-E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|Fortran|RunCMake.CompilerLauncher|RunCMake.PrecompileHeaders|RunCMake.CPack_(DEB|RPM)|TestUpload)" \
-		|| die "Tests failed"
-
-	popd > /dev/null
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	# disable Xcode hooks, bug #652134
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		sed -i -e 's/__APPLE__/__DISABLED_APPLE__/' \
-			Source/cmGlobalXCodeGenerator.cxx || die
-	fi
-
-	# Add gcc libs to the default link paths
-	sed -i \
-		-e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
-		-e "$(usex prefix-guest "s|@GENTOO_HOST@||" "/@GENTOO_HOST@/d")" \
-		-e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
-		Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
-	if ! has_version \>=${CATEGORY}/${PN}-3.4.0_rc1 ; then
-		CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
-		cmake_src_bootstrap
-	fi
-}
-
-src_configure() {
-	# Fix linking on Solaris
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
-
-	local mycmakeargs=(
-		-DCMAKE_USE_SYSTEM_LIBRARIES=ON
-		-DCMAKE_DOC_DIR=/share/doc/${PF}
-		-DCMAKE_MAN_DIR=/share/man
-		-DCMAKE_DATA_DIR=/share/${PN}
-		-DSPHINX_MAN=$(usex doc)
-		-DSPHINX_HTML=$(usex doc)
-		-DBUILD_CursesDialog="$(usex ncurses)"
-		-DBUILD_TESTING=$(usex test)
-	)
-
-	if use qt5 ; then
-		mycmakeargs+=(
-			-DBUILD_QtDialog=ON
-			$(cmake_use_find_package qt5 Qt5Widgets)
-		)
-	fi
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	use emacs && elisp-compile Auxiliary/cmake-mode.el
-}
-
-src_test() {
-	virtx cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-
-	if use emacs; then
-		elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	insinto /usr/share/vim/vimfiles/syntax
-	doins Auxiliary/vim/syntax/cmake.vim
-
-	insinto /usr/share/vim/vimfiles/indent
-	doins Auxiliary/vim/indent/cmake.vim
-
-	insinto /usr/share/vim/vimfiles/ftdetect
-	doins "${FILESDIR}/${PN}.vim"
-
-	dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
-
-	rm -r "${ED}"/usr/share/cmake/{completions,editors} || die
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	if use qt5; then
-		xdg_icon_cache_update
-		xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-	fi
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-	if use qt5; then
-		xdg_icon_cache_update
-		xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-	fi
-}
diff --git a/dev-util/cmake/cmake-3.17.4-r1.ebuild b/dev-util/cmake/cmake-3.17.4-r1.ebuild
index 27718c8a18dd..1f26097bdab5 100644
--- a/dev-util/cmake/cmake-3.17.4-r1.ebuild
+++ b/dev-util/cmake/cmake-3.17.4-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
 LICENSE="CMake"
 SLOT="0"
 [[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc emacs ncurses qt5 test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/cmake/cmake-3.19.1-r1.ebuild b/dev-util/cmake/cmake-3.19.2.ebuild
index 2726694149e4..54a6d646dda4 100644
--- a/dev-util/cmake/cmake-3.19.1-r1.ebuild
+++ b/dev-util/cmake/cmake-3.19.2.ebuild
@@ -69,8 +69,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-3.18.0-filter_distcc_warning.patch # bug 691544
 
 	# upstream fixes (can usually be removed with a version bump)
-	"${FILESDIR}"/${P}-fix-spurious-include-target.patch # bug 759271
-	"${FILESDIR}"/${P}-use-FPHSA-outside-find_package.patch # bug 755743
 )
 
 cmake_src_bootstrap() {
diff --git a/dev-util/cmake/files/cmake-3.14.0_rc1-FindLAPACK.patch b/dev-util/cmake/files/cmake-3.14.0_rc1-FindLAPACK.patch
deleted file mode 100644
index ebd83f38d187..000000000000
--- a/dev-util/cmake/files/cmake-3.14.0_rc1-FindLAPACK.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 6d4d97b328f48862923bb55c1c0976b1d532dcc3 Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Sun, 10 Feb 2019 23:01:53 +0100
-Subject: [PATCH] Prefer pkgconfig in FindLAPACK
-
----
- Modules/FindLAPACK.cmake | 21 +++++++++++++++++++++
- 1 file changed, 21 insertions(+)
-
-diff --git a/Modules/FindLAPACK.cmake b/Modules/FindLAPACK.cmake
-index d6646eaacf..ef5f324670 100644
---- a/Modules/FindLAPACK.cmake
-+++ b/Modules/FindLAPACK.cmake
-@@ -7,6 +7,10 @@ FindLAPACK
- 
- Find LAPACK library
- 
-+Version modified for Gentoo Linux.
-+If a valid PkgConfig configuration is found, this overrides and cancels
-+all further checks.
-+
- This module finds an installed fortran library that implements the
- LAPACK linear-algebra interface (see http://www.netlib.org/lapack/).
- 
-@@ -181,6 +185,21 @@ endif()
- 
- endmacro()
- 
-+# first, try PkgConfig
-+find_package(PkgConfig REQUIRED)
-+pkg_check_modules(PC_LAPACK lapack)
-+if(PC_LAPACK_FOUND)
-+  foreach(PC_LIB ${PC_LAPACK_LIBRARIES})
-+    find_library(${PC_LIB}_LIBRARY NAMES ${PC_LIB} HINTS ${PC_LAPACK_LIBRARY_DIRS} )
-+    if (NOT ${PC_LIB}_LIBRARY)
-+      message(FATAL_ERROR "Something is wrong in your pkg-config file - lib ${PC_LIB} not found in ${PC_LAPACK_LIBRARY_DIRS}")
-+    endif (NOT ${PC_LIB}_LIBRARY)
-+    list(APPEND LAPACK_LIBRARIES ${${PC_LIB}_LIBRARY})
-+  endforeach(PC_LIB)
-+  find_package_handle_standard_args(LAPACK DEFAULT_MSG LAPACK_LIBRARIES)
-+  mark_as_advanced(LAPACK_LIBRARIES)
-+else(PC_LAPACK_FOUND)
-+message(STATUS "No PkgConfig configuration for LAPACK found; starting more extensive search.")
- 
- set(LAPACK_LINKER_FLAGS)
- set(LAPACK_LIBRARIES)
-@@ -428,3 +447,5 @@ endif()
- 
- cmake_pop_check_state()
- set(CMAKE_FIND_LIBRARY_SUFFIXES ${_lapack_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})
-+
-+endif(PC_LAPACK_FOUND)
--- 
-2.20.1
-
diff --git a/dev-util/cmake/files/cmake-3.15.0_rc2-FindBLAS.patch b/dev-util/cmake/files/cmake-3.15.0_rc2-FindBLAS.patch
deleted file mode 100644
index 64ab5612b868..000000000000
--- a/dev-util/cmake/files/cmake-3.15.0_rc2-FindBLAS.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 4de8287ce3b098ea579a28155d442eb589db8617 Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Sat, 22 Jun 2019 16:09:05 +0200
-Subject: [PATCH] Prefer pkgconfig in FindBLAS
-
----
- Modules/FindBLAS.cmake | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/Modules/FindBLAS.cmake b/Modules/FindBLAS.cmake
-index 77f9d0e40c..bbe155caa9 100644
---- a/Modules/FindBLAS.cmake
-+++ b/Modules/FindBLAS.cmake
-@@ -7,6 +7,10 @@ FindBLAS
- 
- Find Basic Linear Algebra Subprograms (BLAS) library
- 
-+Version modified for Gentoo Linux.
-+If a valid PkgConfig configuration is found, this overrides and cancels
-+all further checks.
-+
- This module finds an installed Fortran library that implements the
- BLAS linear-algebra interface (see http://www.netlib.org/blas/).  The
- list of libraries searched for is taken from the ``autoconf`` macro file,
-@@ -92,6 +96,9 @@ installation.
- 
- #]=======================================================================]
- 
-+# first, try PkgConfig
-+set(BLA_PREFER_PKGCONFIG On)
-+
- include(${CMAKE_CURRENT_LIST_DIR}/CheckFunctionExists.cmake)
- include(${CMAKE_CURRENT_LIST_DIR}/CheckFortranFunctionExists.cmake)
- include(${CMAKE_CURRENT_LIST_DIR}/CMakePushCheckState.cmake)
--- 
-2.22.0
-
diff --git a/dev-util/cmake/files/cmake-3.19.1-fix-spurious-include-target.patch b/dev-util/cmake/files/cmake-3.19.1-fix-spurious-include-target.patch
deleted file mode 100644
index 1b51cf013fe5..000000000000
--- a/dev-util/cmake/files/cmake-3.19.1-fix-spurious-include-target.patch
+++ /dev/null
@@ -1,198 +0,0 @@
-From 38bcb5c0a3accd2dd29fb7632c6b3bf31b990d82 Mon Sep 17 00:00:00 2001
-From: Deniz Bahadir <dbahadir@benocs.com>
-Date: Tue, 1 Dec 2020 00:25:39 +0100
-Subject: [PATCH] export: Do not fail generation for separate namelink only
- case
-
-Update the change from commit 64690f6df0 (export: Do not fail generation
-for namelink-only case, 2020-10-09, v3.19.0-rc1~7^2) to also handle
-separate namelink-only and namelink-skip calls.
-
-Fixes: #21529
----
- Source/cmExportBuildFileGenerator.cxx         |  3 +++
- Source/cmExportInstallFileGenerator.cxx       |  3 +++
- Source/cmInstallCommand.cxx                   | 19 +++++++++++--------
- Source/cmTargetExport.h                       |  2 ++
- Tests/RunCMake/export/RunCMakeTest.cmake      |  1 +
- .../export/SeparateNamelinkExport.cmake       | 16 ++++++++++++++++
- .../install/EXPORT-SeparateNamelink.cmake     | 19 +++++++++++++++++++
- Tests/RunCMake/install/RunCMakeTest.cmake     |  1 +
- 8 files changed, 56 insertions(+), 8 deletions(-)
- create mode 100644 Tests/RunCMake/export/SeparateNamelinkExport.cmake
- create mode 100644 Tests/RunCMake/install/EXPORT-SeparateNamelink.cmake
-
-diff --git a/Source/cmExportBuildFileGenerator.cxx b/Source/cmExportBuildFileGenerator.cxx
-index dd700c5edf..1a31ae4afd 100644
---- a/Source/cmExportBuildFileGenerator.cxx
-+++ b/Source/cmExportBuildFileGenerator.cxx
-@@ -288,6 +288,9 @@ void cmExportBuildFileGenerator::GetTargets(
-   if (this->ExportSet) {
-     for (std::unique_ptr<cmTargetExport> const& te :
-          this->ExportSet->GetTargetExports()) {
-+      if (te->NamelinkOnly) {
-+        continue;
-+      }
-       targets.push_back(te->TargetName);
-     }
-     return;
-diff --git a/Source/cmExportInstallFileGenerator.cxx b/Source/cmExportInstallFileGenerator.cxx
-index 987ec9ea7b..0b9b183d54 100644
---- a/Source/cmExportInstallFileGenerator.cxx
-+++ b/Source/cmExportInstallFileGenerator.cxx
-@@ -42,6 +42,9 @@ bool cmExportInstallFileGenerator::GenerateMainFile(std::ostream& os)
-     std::string sep;
-     for (std::unique_ptr<cmTargetExport> const& te :
-          this->IEGen->GetExportSet()->GetTargetExports()) {
-+      if (te->NamelinkOnly) {
-+        continue;
-+      }
-       expectedTargets += sep + this->Namespace + te->Target->GetExportName();
-       sep = " ";
-       if (this->ExportedTargets.insert(te->Target).second) {
-diff --git a/Source/cmInstallCommand.cxx b/Source/cmInstallCommand.cxx
-index b99e6a3c6c..ff08ee41ef 100644
---- a/Source/cmInstallCommand.cxx
-+++ b/Source/cmInstallCommand.cxx
-@@ -461,6 +461,13 @@ bool HandleTargetsMode(std::vector<std::string> const& args,
-     std::unique_ptr<cmInstallFilesGenerator> publicHeaderGenerator;
-     std::unique_ptr<cmInstallFilesGenerator> resourceGenerator;
- 
-+    // Avoid selecting default destinations for PUBLIC_HEADER and
-+    // PRIVATE_HEADER if any artifacts are specified.
-+    bool artifactsSpecified = false;
-+
-+    // Track whether this is a namelink-only rule.
-+    bool namelinkOnly = false;
-+
-     auto addTargetExport = [&]() {
-       // Add this install rule to an export if one was specified.
-       if (!exports.empty()) {
-@@ -475,20 +482,13 @@ bool HandleTargetsMode(std::vector<std::string> const& args,
-         te->ObjectsGenerator = objectGenerator.get();
-         te->InterfaceIncludeDirectories =
-           cmJoin(includesArgs.GetIncludeDirs(), ";");
--
-+        te->NamelinkOnly = namelinkOnly;
-         helper.Makefile->GetGlobalGenerator()
-           ->GetExportSets()[exports]
-           .AddTargetExport(std::move(te));
-       }
-     };
- 
--    // Avoid selecting default destinations for PUBLIC_HEADER and
--    // PRIVATE_HEADER if any artifacts are specified.
--    bool artifactsSpecified = false;
--
--    // Track whether this is a namelink-only rule.
--    bool namelinkOnly = false;
--
-     switch (target.GetType()) {
-       case cmStateEnums::SHARED_LIBRARY: {
-         // Shared libraries are handled differently on DLL and non-DLL
-@@ -497,6 +497,7 @@ bool HandleTargetsMode(std::vector<std::string> const& args,
-         if (target.IsDLLPlatform()) {
-           // When in namelink only mode skip all libraries on Windows.
-           if (namelinkMode == cmInstallTargetGenerator::NamelinkModeOnly) {
-+            namelinkOnly = true;
-             addTargetExport();
-             continue;
-           }
-@@ -529,6 +530,7 @@ bool HandleTargetsMode(std::vector<std::string> const& args,
-           if (target.IsFrameworkOnApple()) {
-             // When in namelink only mode skip frameworks.
-             if (namelinkMode == cmInstallTargetGenerator::NamelinkModeOnly) {
-+              namelinkOnly = true;
-               addTargetExport();
-               continue;
-             }
-@@ -574,6 +576,7 @@ bool HandleTargetsMode(std::vector<std::string> const& args,
-         if (target.IsFrameworkOnApple()) {
-           // When in namelink only mode skip frameworks.
-           if (namelinkMode == cmInstallTargetGenerator::NamelinkModeOnly) {
-+            namelinkOnly = true;
-             addTargetExport();
-             continue;
-           }
-diff --git a/Source/cmTargetExport.h b/Source/cmTargetExport.h
-index cb4d8dae44..1e38d84923 100644
---- a/Source/cmTargetExport.h
-+++ b/Source/cmTargetExport.h
-@@ -31,4 +31,6 @@ public:
-   cmInstallFilesGenerator* HeaderGenerator;
-   std::string InterfaceIncludeDirectories;
-   ///@}
-+
-+  bool NamelinkOnly = false;
- };
-diff --git a/Tests/RunCMake/export/RunCMakeTest.cmake b/Tests/RunCMake/export/RunCMakeTest.cmake
-index 95c8d5cf45..0e6020f0f4 100644
---- a/Tests/RunCMake/export/RunCMakeTest.cmake
-+++ b/Tests/RunCMake/export/RunCMakeTest.cmake
-@@ -17,3 +17,4 @@ run_cmake(DependOnNotExport)
- run_cmake(DependOnDoubleExport)
- run_cmake(UnknownExport)
- run_cmake(NamelinkOnlyExport)
-+run_cmake(SeparateNamelinkExport)
-diff --git a/Tests/RunCMake/export/SeparateNamelinkExport.cmake b/Tests/RunCMake/export/SeparateNamelinkExport.cmake
-new file mode 100644
-index 0000000000..b006aea128
---- /dev/null
-+++ b/Tests/RunCMake/export/SeparateNamelinkExport.cmake
-@@ -0,0 +1,16 @@
-+enable_language(CXX)
-+add_library(foo SHARED empty.cpp)
-+install(TARGETS foo EXPORT fooExport
-+  RUNTIME DESTINATION bin
-+  LIBRARY
-+     DESTINATION lib
-+     COMPONENT runtime
-+     NAMELINK_SKIP
-+)
-+install(TARGETS foo EXPORT fooExport
-+  LIBRARY
-+     DESTINATION lib
-+     COMPONENT development
-+     NAMELINK_ONLY
-+)
-+export(EXPORT fooExport FILE "${CMAKE_CURRENT_BINARY_DIR}/foo.cmake")
-diff --git a/Tests/RunCMake/install/EXPORT-SeparateNamelink.cmake b/Tests/RunCMake/install/EXPORT-SeparateNamelink.cmake
-new file mode 100644
-index 0000000000..5c6fa10d18
---- /dev/null
-+++ b/Tests/RunCMake/install/EXPORT-SeparateNamelink.cmake
-@@ -0,0 +1,19 @@
-+enable_language(C)
-+add_library(foo SHARED empty.c)
-+install(TARGETS foo EXPORT fooExport
-+  RUNTIME DESTINATION bin
-+  LIBRARY
-+     DESTINATION lib
-+     COMPONENT runtime
-+     NAMELINK_SKIP
-+)
-+install(TARGETS foo EXPORT fooExport
-+  LIBRARY
-+     DESTINATION lib
-+     COMPONENT development
-+     NAMELINK_ONLY
-+)
-+install(EXPORT fooExport
-+    DESTINATION "lib/cmake/"
-+    FILE "foo.cmake"
-+)
-diff --git a/Tests/RunCMake/install/RunCMakeTest.cmake b/Tests/RunCMake/install/RunCMakeTest.cmake
-index 5aab88ca80..d64d88b770 100644
---- a/Tests/RunCMake/install/RunCMakeTest.cmake
-+++ b/Tests/RunCMake/install/RunCMakeTest.cmake
-@@ -78,6 +78,7 @@ run_cmake(TARGETS-DESTINATION-bad)
- run_cmake(EXPORT-OldIFace)
- run_cmake(EXPORT-UnknownExport)
- run_cmake(EXPORT-NamelinkOnly)
-+run_cmake(EXPORT-SeparateNamelink)
- run_cmake(CMP0062-OLD)
- run_cmake(CMP0062-NEW)
- run_cmake(CMP0062-WARN)
--- 
-GitLab
-
diff --git a/dev-util/cmake/files/cmake-3.19.1-use-FPHSA-outside-find_package.patch b/dev-util/cmake/files/cmake-3.19.1-use-FPHSA-outside-find_package.patch
deleted file mode 100644
index 8cde769ce8f8..000000000000
--- a/dev-util/cmake/files/cmake-3.19.1-use-FPHSA-outside-find_package.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 14ecf9c2f6edfae4033d9311f79d79d0d07fc1cf Mon Sep 17 00:00:00 2001
-From: Marc Chevrier <marc.chevrier@gmail.com>
-Date: Wed, 25 Nov 2020 16:36:12 +0100
-Subject: [PATCH] FPHSA: ensure it can be used outside 'find_package'
-
-Fixes: #21505
----
- Modules/FindPackageHandleStandardArgs.cmake | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/Modules/FindPackageHandleStandardArgs.cmake b/Modules/FindPackageHandleStandardArgs.cmake
-index 7af017136d..7e172779e4 100644
---- a/Modules/FindPackageHandleStandardArgs.cmake
-+++ b/Modules/FindPackageHandleStandardArgs.cmake
-@@ -275,8 +275,10 @@ function(FIND_PACKAGE_CHECK_VERSION version result)
-     unset (${FPCV_RESULT_MESSAGE_VARIABLE} PARENT_SCOPE)
-   endif()
- 
--  if (CMAKE_FIND_PACKAGE_NAME)
--    set (package ${CMAKE_FIND_PACKAGE_NAME})
-+  if (_CMAKE_FPHSA_PACKAGE_NAME)
-+    set (package "${_CMAKE_FPHSA_PACKAGE_NAME}")
-+  elseif (CMAKE_FIND_PACKAGE_NAME)
-+    set (package "${CMAKE_FIND_PACKAGE_NAME}")
-   else()
-     message (FATAL_ERROR "find_package_check_version(): Cannot be used outside a 'Find Module'")
-   endif()
-@@ -436,6 +438,9 @@ function(FIND_PACKAGE_HANDLE_STANDARD_ARGS _NAME _FIRST_ARG)
-       "will be used.")
-   endif()
- 
-+  # to propagate package name to FIND_PACKAGE_CHECK_VERSION
-+  set(_CMAKE_FPHSA_PACKAGE_NAME "${_NAME}")
-+
-   # now that we collected all arguments, process them
- 
-   if("x${FPHSA_FAIL_MESSAGE}" STREQUAL "xDEFAULT_MSG")
--- 
-GitLab
-
diff --git a/dev-util/cucumber-core/Manifest b/dev-util/cucumber-core/Manifest
index 078316e25819..d543cec3fbb2 100644
--- a/dev-util/cucumber-core/Manifest
+++ b/dev-util/cucumber-core/Manifest
@@ -1,3 +1,3 @@
 DIST cucumber-core-3.2.1.tar.gz 49868 BLAKE2B e5d18797fb6821fa9c300898bc8c14d57559b790d77a191d7147a987e27893ce89076716f82fa2048632e1b033ad607c748fe29f6b8fc600abd523290c4a9f50 SHA512 ba45e804d8454a6ef306eb90f32e6cdf3ee25fdd6613e9ba8308ecfce4044f27ee3dc012ad7f9ca481e94fe5e1d9deb9e0c46ca811a8e25bb27981a78c528ddb
-EBUILD cucumber-core-3.2.1.ebuild 993 BLAKE2B dd15d4ee6ccaa3dcb77b26393a521f2cf7a00551eb6ff601d039bef038d558cfaaa5055fb45296ec8bc01cf41200f7bb4b1b14750c2a48e30185a33832154a76 SHA512 2f210781b5a18d8e16d8958d34c8b19b7402445b58f485610a394607abe8a6fec1e7e7670495d9265e08360308839dd0446b2ebd908f92508620e27e043116bc
+EBUILD cucumber-core-3.2.1.ebuild 994 BLAKE2B f69e1a839d80229c50a98b94e38d5f3dd5fcc29fe54f0bacbbbdcbfbcd36f8588920f98eba8209bfc5cce019b73979382611dfec3e21e00825dfa683051925aa SHA512 b38d439eac2783920d0ed62d95c8e75e0a3d1b386b7f36d8ac8a753cddb07bea0c094887c3a476e3de8afd130ecbc6ef6da8680bd63d1ef122621dec302dcf34
 MISC metadata.xml 304 BLAKE2B 1f2a69030fdeaccf7280372ef0e8abc7e1ab0456951e88d6f1839ba3615f8a6588bb3a96d05bffdbe343cf3a4b89fc32fdbefc83faeaf2a54e0cdca9c68e03bd SHA512 1e0e844510269d137017ff7ecbe1b98c9542f7264ec0e5b8858119f06887720645c0d968228825d91fcb69016b78d7f7c7d344482f08c3fe0dd6cc3df4f52902
diff --git a/dev-util/cucumber-core/cucumber-core-3.2.1.ebuild b/dev-util/cucumber-core/cucumber-core-3.2.1.ebuild
index 890793c28c85..14b3610ba9c6 100644
--- a/dev-util/cucumber-core/cucumber-core-3.2.1.ebuild
+++ b/dev-util/cucumber-core/cucumber-core-3.2.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/cucumber/cucumber-ruby-core/archive/v${PV}.tar.gz ->
 RUBY_S="cucumber-ruby-core-${PV}"
 LICENSE="Ruby"
 
-KEYWORDS="amd64 arm arm64 hppa ppc ppc64 s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 s390 sparc x86"
 SLOT="$(ver_cut 1-2)"
 IUSE="test"
 
diff --git a/dev-util/cucumber-expressions/Manifest b/dev-util/cucumber-expressions/Manifest
index 578c7201f41a..82b725bbe08f 100644
--- a/dev-util/cucumber-expressions/Manifest
+++ b/dev-util/cucumber-expressions/Manifest
@@ -1,3 +1,3 @@
 DIST cucumber-expressions-6.0.1.gem 18944 BLAKE2B a30127598ff26ea60477bbdad9fc621d0cb1ebb09af3f38d329a15430a207616b6421a127c302ba8470089c8ee0daeccc8f38d4f951b6edb320cff1cc16760b9 SHA512 d9c6371d499ffbe9105038396cde0786cd889def866bf56284a66be77230aac03a74f565b2c3adb966a8d2c67e631ff83eaf426e4bc4b022cd7742bb3a030137
-EBUILD cucumber-expressions-6.0.1.ebuild 495 BLAKE2B 439b415e473cb7f1969c44302c0b940d48966eb8a2389bf76c6d6809b23bff5a15220a5dd59b1831bcfc6b47c8bd055521f5894ff9d41b1e54d07226c9f03124 SHA512 28c463afd8a01f3beed373de16c9f1df6e33738cc220dd6c9bef97b366c64ddceaba9bb1d2cf3f3c8c0b65ed05db835e6713e9af7eab4e43c572df742d12d0c0
+EBUILD cucumber-expressions-6.0.1.ebuild 496 BLAKE2B a9c40e6db9963c37fd2601cdb35670b8a359b85c375835e001798b71b059c064401ed54582317036b2997afbd9ae5893739a57ee6ddaba50567f4bc4bb1d6603 SHA512 0704ca738f50055abacdadf111690e39ed0310bfc063d5bfdbe84a66ceb49a509bc224efc443e1715c821480eee4d7cd88688b2a83a067331348933638499033
 MISC metadata.xml 299 BLAKE2B 1f0765d5fb94004b9a72b4b9b4c50cb14b05e611c84016704210aa24909d554a6f817d475fb924573d2ec6ccbd389165d9689ee8ccb7212744292dfbc55a0749 SHA512 b655a45650726e475ccae46d7bc062ba32c527277160c9033382684f6a7aed520220c6a197f7abb9dfe18f8ebea051b5fdcbfd10c744031f123ac684ce3225c7
diff --git a/dev-util/cucumber-expressions/cucumber-expressions-6.0.1.ebuild b/dev-util/cucumber-expressions/cucumber-expressions-6.0.1.ebuild
index b05661e6d5d1..208fee6a9ffd 100644
--- a/dev-util/cucumber-expressions/cucumber-expressions-6.0.1.ebuild
+++ b/dev-util/cucumber-expressions/cucumber-expressions-6.0.1.ebuild
@@ -14,5 +14,5 @@ DESCRIPTION="a simpler alternative to Regular Expressions"
 HOMEPAGE="https://github.com/cucumber/cucumber-expressions-ruby#readme"
 LICENSE="MIT"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 s390 sparc x86"
 SLOT="6.0"
diff --git a/dev-util/cucumber-tag_expressions/Manifest b/dev-util/cucumber-tag_expressions/Manifest
index 56765c46ef77..1b3ba1ac2dae 100644
--- a/dev-util/cucumber-tag_expressions/Manifest
+++ b/dev-util/cucumber-tag_expressions/Manifest
@@ -1,3 +1,3 @@
 DIST cucumber-tag_expressions-1.1.1.gem 7680 BLAKE2B 31e1f23c5fc008390c9221307473022107b109d409d8385a111f4fed1911fad15660faa824bee71cd87a2e183ec41a6ac9b5f7ecf5f1c417ed51d649c76712e8 SHA512 9b46d681be78b428c7cd29ca1cae21dbd410f7ca9844ec6f94368170c133f8de662a55e4f4440045704107e5428306ab81d2a90020c64102ef42f647cd8a66a6
-EBUILD cucumber-tag_expressions-1.1.1.ebuild 463 BLAKE2B 200b34d3031a97373d9735d5c6ab2760f3d3b4c0af3100ac4bc0c6b113880e4afe2359d8baf3d06ef99b5aa498e789009aae76ab7d65da1ac1c3e5815d7b3e78 SHA512 ad91772f8a311ce52b2b505960c3a84f3e9fe2a7b7e6a55ca924df1161ef982f6a5ea5073278b8e6e720eaa1d5c420643bcaaf41bee6e8681c51bfa7a47e6ccd
+EBUILD cucumber-tag_expressions-1.1.1.ebuild 464 BLAKE2B 22e350c54ef37a7a5f125d3328297d55cb607fb14618c9267e75f872f51d3b63b16fad9b700bd6adbccfec5b627803c1f955f3f76463af4b74a1267ff1de78ff SHA512 34fe82fd2640e752e897c29ab6b26312ac800997059fc541ad519b87cc9b53a94793acd2195d4880cb0f097f172b81070efe5484954d1ae43d6633bfb1e8ed09
 MISC metadata.xml 299 BLAKE2B 1f0765d5fb94004b9a72b4b9b4c50cb14b05e611c84016704210aa24909d554a6f817d475fb924573d2ec6ccbd389165d9689ee8ccb7212744292dfbc55a0749 SHA512 b655a45650726e475ccae46d7bc062ba32c527277160c9033382684f6a7aed520220c6a197f7abb9dfe18f8ebea051b5fdcbfd10c744031f123ac684ce3225c7
diff --git a/dev-util/cucumber-tag_expressions/cucumber-tag_expressions-1.1.1.ebuild b/dev-util/cucumber-tag_expressions/cucumber-tag_expressions-1.1.1.ebuild
index c35de6ca6a17..dec93497b0fe 100644
--- a/dev-util/cucumber-tag_expressions/cucumber-tag_expressions-1.1.1.ebuild
+++ b/dev-util/cucumber-tag_expressions/cucumber-tag_expressions-1.1.1.ebuild
@@ -14,5 +14,5 @@ DESCRIPTION="Cucumber tag expressions for ruby"
 HOMEPAGE="https://docs.cucumber.io/tag-expressions/"
 LICENSE="MIT"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 s390 sparc x86"
 SLOT="1"
diff --git a/dev-util/cucumber-wire/Manifest b/dev-util/cucumber-wire/Manifest
index 682a446617b5..88f09b1ae9d7 100644
--- a/dev-util/cucumber-wire/Manifest
+++ b/dev-util/cucumber-wire/Manifest
@@ -1,3 +1,3 @@
 DIST cucumber-wire-0.0.1.gem 16384 BLAKE2B c35f478bbc8a8bccfbe1022d5b687a85c087bcadd5f494b807fa530d20b7e14f327ca2ab377c3f9abc28df60c7986576b59a246e5fb7537daadb016bb21420b7 SHA512 c6bae727814f6a2d1dfa8cfee9bc9e63e3bfa755f6bb070f907a24d52009dd29652ab21ea7719527a5423ddf4471208f91a388ec53555d7021abac7769b2109a
-EBUILD cucumber-wire-0.0.1-r1.ebuild 518 BLAKE2B 227945c512f4adc1bd033f029c2770ddd9b83fd0075ab2dcd90b8a1a0755fe94cbe2a3f75065f2a7b76278fd9d0c7ecf0575ec1d9d5af334637ec5793059220b SHA512 13d5f340fd9e66ac54cd3d471673848dde539c7f0280ba331eeb9263a18d695aff80efc9acd91c1878d17f39553ae8e2ae33cb0b13de40928bc93a42c349437f
+EBUILD cucumber-wire-0.0.1-r1.ebuild 519 BLAKE2B 783540a1d9536569b97512e797dffba011452b578fd556047dc8e3517ad5cab6b515012978394857b003f70e6ba3e563a60236cb3ff44e2d8d1b7b39169afc06 SHA512 2315ce6b88e4cede887ca1bc00b86687058069e3087234e21041e0f0867217d0547aaefe5b00e448db30f4b6da2709c3ac8960fe1071ab654850b8b295b72afe
 MISC metadata.xml 304 BLAKE2B 1f2a69030fdeaccf7280372ef0e8abc7e1ab0456951e88d6f1839ba3615f8a6588bb3a96d05bffdbe343cf3a4b89fc32fdbefc83faeaf2a54e0cdca9c68e03bd SHA512 1e0e844510269d137017ff7ecbe1b98c9542f7264ec0e5b8858119f06887720645c0d968228825d91fcb69016b78d7f7c7d344482f08c3fe0dd6cc3df4f52902
diff --git a/dev-util/cucumber-wire/cucumber-wire-0.0.1-r1.ebuild b/dev-util/cucumber-wire/cucumber-wire-0.0.1-r1.ebuild
index b57396addc44..0da795ecad21 100644
--- a/dev-util/cucumber-wire/cucumber-wire-0.0.1-r1.ebuild
+++ b/dev-util/cucumber-wire/cucumber-wire-0.0.1-r1.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Executable feature scenarios"
 HOMEPAGE="https://github.com/aslakhellesoy/cucumber/wikis"
 LICENSE="Ruby"
 
-KEYWORDS="amd64 arm arm64 hppa ppc ppc64 s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 s390 sparc x86"
 SLOT="0"
 IUSE="test"
 
diff --git a/dev-util/cucumber/Manifest b/dev-util/cucumber/Manifest
index 82905e6d253a..59e215d6af88 100644
--- a/dev-util/cucumber/Manifest
+++ b/dev-util/cucumber/Manifest
@@ -1,5 +1,5 @@
 DIST cucumber-3.1.2.tar.gz 267995 BLAKE2B a55d15d2c5746efd2e9f3518025b3b6d69e7712920b5731e1174ff429a9d6161d9aad7c0065c5ddf8b97fd87c9e658ff86b961b175db2c930bba52d1904d6b62 SHA512 abf0b562476653c393bc5a3c1f9669d91a2e312bcceb98bd20ac3771a61eeb696721cba76299d12871f7c61fdca176310e3a334b53d10c31ef3e201948c762d0
 DIST cucumber-3.2.0.tar.gz 271886 BLAKE2B 0945336e2a4d14c21d22b3af18fb140663fa0c5acd7d29540cb6755fcc50b020640ffc573f4d4ed17af2758df3df410f93cf5067b736cb8005d9a6ae7fa4d397 SHA512 927ca314c56f83e270284921131ec62aa05053d29a77b230799bd1949751f64c964c0f87525c776d7fe260506ddb632b5cc8939df841d131f6a0af8a82110441
-EBUILD cucumber-3.1.2.ebuild 2748 BLAKE2B a56582054e351d9a7b939bd51c2b5e4164de819b1f4e82b35dada50f1fe04bba9e66a579a70fe1135984ee342a7b9944d710876f1757ffdd60fa10ee7d1f54e3 SHA512 138b7f7f8246e9119c0a0076b8923b001fb451da532e77874bf2b731620b2143691f15067d178b65e2acb7746ce3b3749d08027d4a17eb1ad3e272f468e2106b
+EBUILD cucumber-3.1.2.ebuild 2749 BLAKE2B e09f536a956dddafd26ede45f9b678894fe451550ad20286a16e46fc07bc2352e94c130f5417a60082fe5f5d35d6ec41ad6533182d69ec2832dc6b3c6b271117 SHA512 3aa27ce6212327f63c2307cc9227beff2b28be774357ee6eb1b0ed1ed6d47cc5657613fdad74788d24926446a8ec8e188e01c477d4c4fd6f5217e9a145e948ea
 EBUILD cucumber-3.2.0.ebuild 2871 BLAKE2B 200b9fcb52887dd4375e8bb4e47fa9947b3aa3981849b15cd998e115ff30b960367be3cbe8336309b6ebe994a73624b9cdb52f8afffcd2eee4abd224e587dff2 SHA512 85f7771a369cb51f38f32ff58f203b52114d19bfc0f58f98561e373cec129c73bced5e365878ea7bf7fd21468b277db55f4cb917400b4347f306102c59d7e8bf
 MISC metadata.xml 304 BLAKE2B 1f2a69030fdeaccf7280372ef0e8abc7e1ab0456951e88d6f1839ba3615f8a6588bb3a96d05bffdbe343cf3a4b89fc32fdbefc83faeaf2a54e0cdca9c68e03bd SHA512 1e0e844510269d137017ff7ecbe1b98c9542f7264ec0e5b8858119f06887720645c0d968228825d91fcb69016b78d7f7c7d344482f08c3fe0dd6cc3df4f52902
diff --git a/dev-util/cucumber/cucumber-3.1.2.ebuild b/dev-util/cucumber/cucumber-3.1.2.ebuild
index 677acd29bcc3..3a08be31777e 100644
--- a/dev-util/cucumber/cucumber-3.1.2.ebuild
+++ b/dev-util/cucumber/cucumber-3.1.2.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/cucumber/cucumber-ruby/archive/v${PV}.tar.gz -> ${P}
 RUBY_S="cucumber-ruby-${PV}"
 LICENSE="Ruby"
 
-KEYWORDS="amd64 arm arm64 hppa ppc ppc64 s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 s390 sparc x86"
 SLOT="0"
 IUSE="examples test"
 
diff --git a/dev-util/cvise/Manifest b/dev-util/cvise/Manifest
index 81560936ab07..a1aaf1ccd770 100644
--- a/dev-util/cvise/Manifest
+++ b/dev-util/cvise/Manifest
@@ -1,9 +1,12 @@
+AUX cvise-2.0.0-shebang.patch 1130 BLAKE2B 50f54e410f978a485aaa08cc7d9b8311211ec5b42fb372656821beba7bacd8aa7506b6e10732a0c426ce48a94440daa64bf931b23734d43b57e4a0d3d08a7281 SHA512 2c8fdc838ec802d7a1afb209dbe3e765780dd599f21cbdb7d9316e076ec06d0f0c1e78a00ea6a66fb614c8d0f7b44ca88ad624236223b47d87dddeab427621d3
 DIST cvise-1.6.0.tar.gz 243050 BLAKE2B 64c305426dbeaf2e3f3a92a902209b35fcc76b5f5a6d2e48fcc8e24d1325badc0839e70afa1381c6d1412c22a7e9dd41ca03d6ca714fa5082958378cc8863000 SHA512 9d4ee043c34748b600b49ac4f00463b853faff2809f8b581e9b07433a8f3bef4436d0e5d5a9dbff1b2d7c3a8ab1d6d4823e78787eb3e911a683808703b2e24b6
 DIST cvise-1.7.0.tar.gz 248515 BLAKE2B b1a2ca8abc7a09c240a7ae39400e3e60ca641dd0dff4edb34f43d755619ec47bb7a0d25fd6b4461bf80a3be14a63c6e56d0e3e758827ca7c2ef90370aba5d539 SHA512 2e0115355c0ca3cdf593ad4a8d0079ea0ea193234ff4fcae8bdc7c0244cc7b8672025682821279b826fda97f80dc71455390d709836acb671c19772f13156de5
 DIST cvise-1.8.0.tar.gz 248744 BLAKE2B 5196a2bb68c0f9ca1a8219ee0dccae80aa7adac64df5bc4c7601a8ef81048875bfa3d8fb2e8c407cfa8f238739733ad4fbdf08bb14a72ec208d562bd7e69ba84 SHA512 eaef3506f0fcd54953271494ebdbd043c028cd98c4a976bc2d978112c28d27d5d307527db52c2a3f8f153b52430ba9c61ad072dcae5a6e0b9bfb8be844a50bab
 DIST cvise-1.9.0.tar.gz 249042 BLAKE2B 357d429afc43691e616dba31621d1de89fb1f85fcbc177847b3367aac993ccd2c3bec20226e910a319d5d6194b32d0be9704e4fa7b8fce49f23788d10a378012 SHA512 518c48b7b9d9af9b856bfc46d4fb8064bca3730735bdabf2b3aa981a3f743fa6988594b7cbe39da71ac01fbadb4a45e5212d7c79b510fa36d86055978829495b
+DIST cvise-2.0.0.tar.gz 249307 BLAKE2B ba1a70da71706969a35b1223ad0c0fa1a1d4caf7f70eef184adc4dbc69586be6a33bdf11d7c1b606ea4b20d4cd2bf68170aabc1764364c235fe5f67182419080 SHA512 e49ca9919ced9db67b16af4b8a7cd3c18c7d96dea5724c9ee6d60736c8f34074d68ade151be702794c93b24943d167278e1c1a6e6f67a9a1422f695f3a177e46
 EBUILD cvise-1.6.0.ebuild 1162 BLAKE2B 09b719db9f8c428bd94aeec9ccb8a03b150323a62a9d014ee82cced18733a89d2272ba049fe8446b3f008d77861281be70549d351d5cd173d7e1fddb12e3c5ed SHA512 af3c19d0f1d2ed513f0533e4861f109546a5da5c1b9dacb6b6f585dc568ca1d28a34530e04eb6acc3bb77a2b47ab84490793c78d834637771a59b8341bc7c2e2
 EBUILD cvise-1.7.0-r1.ebuild 1202 BLAKE2B e0b789b8fc805718c1fe3cb71ae4180bfc0b5af7049a8631ed64d5983a980c84310d17c534aa1f638c76fe2a1a3053a1739d7351c5fbd4f192f204c67857638d SHA512 d94a2453dbe52425d800587465d1f5eae79fbc9d33fab09bbf6479ec217ce9ef78c1afa78b40f7294b986137cd689ef72d4b1371f44735f61ecdafbcb185fd78
 EBUILD cvise-1.8.0.ebuild 1202 BLAKE2B e0b789b8fc805718c1fe3cb71ae4180bfc0b5af7049a8631ed64d5983a980c84310d17c534aa1f638c76fe2a1a3053a1739d7351c5fbd4f192f204c67857638d SHA512 d94a2453dbe52425d800587465d1f5eae79fbc9d33fab09bbf6479ec217ce9ef78c1afa78b40f7294b986137cd689ef72d4b1371f44735f61ecdafbcb185fd78
-EBUILD cvise-1.9.0.ebuild 1282 BLAKE2B 3784ed4ae498cd0df37b5134b8f068de2b51cc5067f8eb40b46f46af8668af1e2b3fa2d9350f5e89d9733e3b58c9712274807ee4bfc6d07ac8b3386aa6953e45 SHA512 2a6f63a13ba59f02534f53b7ebd0f42bde0bf078995e582b74e1399893038e130e14b1fdce7e8be9f2e267bdc9068985e7c5f7d2e934d956e6c30dfbd7621f41
+EBUILD cvise-1.9.0.ebuild 1281 BLAKE2B 9caf938cc99168552937f0fa61720d53eaad5644671bf1b877460936998c03a45a83926c517d4a70ef406a88b537285d1b4561304d04ab17cbd283dc961b852b SHA512 219fbe157eb7c25d8c2f84efd1a52de7e5bf8eadbfeb93c633d6f9101b3aa9a2fc614ddd409ee120fc9dbf2957e1291ce536ebfaa8f5411a9efea44eece8df74
+EBUILD cvise-2.0.0.ebuild 1347 BLAKE2B 8651ce715dccf7bc322a7fae16e5f7b3b1d92eff666ec1faff37ad44541f39d2d394344a60cf1ca7f67f9c05b1efac0123ebdcd76343e9752a844089ceabe0f7 SHA512 aebd0940cd504e4f89ec9ae95e98574168274bddc7c9fac3406207d0e41cec114698af955dccbee6c90b864690d840a9865b707ff2a8d7b22acbeecb696da282
 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
index 8bf58ae60526..041dd4faeb67 100644
--- a/dev-util/cvise/cvise-1.9.0.ebuild
+++ b/dev-util/cvise/cvise-1.9.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.0.0.ebuild
new file mode 100644
index 000000000000..9ef3d7393dea
--- /dev/null
+++ b/dev-util/cvise/cvise-2.0.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+: ${CMAKE_MAKEFILE_GENERATOR=ninja}
+PYTHON_COMPAT=( python3_{6..9} )
+inherit cmake llvm python-single-r1
+
+DESCRIPTION="Super-parallel Python port of the C-Reduce"
+HOMEPAGE="https://github.com/marxin/cvise/"
+SRC_URI="
+	https://github.com/marxin/cvise/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="UoI-NCSA"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+LLVM_MAX_SLOT=12
+DEPEND="
+	|| (
+		sys-devel/clang:12
+		sys-devel/clang:11
+		sys-devel/clang:10
+	)
+	<=sys-devel/clang-$(( LLVM_MAX_SLOT + 1 )):="
+RDEPEND="${DEPEND}
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/pebble[${PYTHON_USEDEP}]
+		dev-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}]
+		')
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-shebang.patch
+)
+
+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::' -e 's:--flake8::' setup.cfg || die
+	cmake_src_prepare
+}
+
+src_test() {
+	cd "${BUILD_DIR}" || die
+	pytest -vv || die
+}
diff --git a/dev-util/cvise/files/cvise-2.0.0-shebang.patch b/dev-util/cvise/files/cvise-2.0.0-shebang.patch
new file mode 100644
index 000000000000..26bfe9678ebb
--- /dev/null
+++ b/dev-util/cvise/files/cvise-2.0.0-shebang.patch
@@ -0,0 +1,34 @@
+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/debugedit/Manifest b/dev-util/debugedit/Manifest
index 239ac099ab04..02fe10d0ea0b 100644
--- a/dev-util/debugedit/Manifest
+++ b/dev-util/debugedit/Manifest
@@ -1,5 +1,7 @@
 DIST rpm-4.16.0.tar.bz2 4341683 BLAKE2B 5161e5dcc6d9a1f1d4b8e44740fb368050b808fd9e8b8276fb17b530a4642e1b9ad104b5a30c0071215aef7f823eeab10988dd41f73af1c52d575529c374b5eb SHA512 177119c3ac3d48980db55bb4ba0fdbb2a911968e5efc690bfa8cc343f850fc90531cc0dee6dd8e45d2b14f0d951ced35bd8893d24011b7f270745d281ddf4e3d
+DIST rpm-4.16.1.2.tar.bz2 4346745 BLAKE2B 17485b1e73b30586acb8e9be53bfb0bd430fa05e826755729c68367c798e8cad039f091731b6effbe9fa9b7d6c4018abd6feec94f032230cbbd6068e9080573a SHA512 066b67838312f9ad076285fe8f43527aded694f5562ead4e90df48675f2e99c1f2d68693fd20b2037e2614b978ed94c417753e2dbd055a9869b45264cd932afc
 DIST rpm-4.16.1.tar.bz2 4348973 BLAKE2B 5f415099ed5b4f3425c1cbd02476c3066ef51e8efbe09829c0c7d9732cfdeed76ab0c5eed113a1b007d35bf5d5fb1c60543b7ef23319ba0f63550d598e98dcdd SHA512 cbce8381e7a0bdaf2c7529d0ac91fda15e663db7a76b02652d53327ebcd7d5b6b6154d5e88feeda87f71727a036e7a2afcd57c7dcddef610e32957b9e430d367
 EBUILD debugedit-4.16.0.ebuild 1765 BLAKE2B 463b1295cb2cf4d8fd4914546610844495065a62d164b099b3352761b2329cb016d9fa15a1cfab3d8f348a1d9c9392eb4debac627b58af9402cc01d99244eba1 SHA512 29e6a33ff92e86ba3c7eb52eb593c97af3ca52fdf9df999984cdbe7ea2c2a3039619738b0877af42ff1b77515fac2249d603827abbe7c9bba86368f959242a29
+EBUILD debugedit-4.16.1.2.ebuild 1770 BLAKE2B 9657d25e12679c563a0dd2f6220a58844c043f28ead997e6add996cff70e78964f6f3b88afbb65e7c1a683b4d7250919ebbc822001744adcc46b4e1324300823 SHA512 86a515866fa7f33aeb896b9ee67451bdb8d2850a34fcfca719307bacc002e99039fb24e3d6c6f088da1a6e59ca6c71ae764baca4c875e076315852be9100f1b8
 EBUILD debugedit-4.16.1.ebuild 1770 BLAKE2B 9657d25e12679c563a0dd2f6220a58844c043f28ead997e6add996cff70e78964f6f3b88afbb65e7c1a683b4d7250919ebbc822001744adcc46b4e1324300823 SHA512 86a515866fa7f33aeb896b9ee67451bdb8d2850a34fcfca719307bacc002e99039fb24e3d6c6f088da1a6e59ca6c71ae764baca4c875e076315852be9100f1b8
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/dev-util/debugedit/debugedit-4.16.1.2.ebuild b/dev-util/debugedit/debugedit-4.16.1.2.ebuild
new file mode 100644
index 000000000000..d2c338794406
--- /dev/null
+++ b/dev-util/debugedit/debugedit-4.16.1.2.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic
+
+MY_P=rpm-${PV}
+DESCRIPTION="Stand-alone debugedit from RPM"
+HOMEPAGE="https://rpm.org
+	https://github.com/rpm-software-management/rpm"
+SRC_URI="http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	sys-libs/zlib:=
+	>=dev-libs/popt-1.7
+	>=dev-libs/elfutils-0.176-r1
+	dev-libs/nss
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	eapply_user
+
+	# cheat it into believing we're bundling db
+	mkdir -p db/dist || die
+	touch db/dist/configure || die
+	chmod +x db/dist/configure || die
+	echo 'install:' > db3/Makefile || die
+
+	# TODO: why do we need to do this?
+	mkdir rpm || die
+	find -name '*.h' -exec cp {} rpm/ ';' || die
+}
+
+src_configure() {
+	append-cppflags -I"${EPREFIX}/usr/include/nss" -I"${EPREFIX}/usr/include/nspr"
+	local myconf=(
+		# force linking to static librpmio
+		--disable-shared
+
+		# disable linking compression libraries
+		ac_cv_header_bzlib_h=no
+		ac_cv_header_lzma_h=no
+		--disable-zstd
+
+		# fake some libraries we don't use
+		ac_cv_header_magic_h=yes
+		ac_cv_lib_magic_magic_open=yes
+
+		# use nss as crypto provider
+		--with-crypto=nss
+
+		# disable other stuff irrelevant to debugedit
+		--disable-bdb
+		--disable-nls
+		--disable-plugins
+		--disable-python
+		--without-acl
+		--without-archive
+		--without-cap
+		--without-external-db
+		--without-hackingdocs
+		--without-lua
+		--without-selinux
+	)
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	emake -C misc
+	emake -C rpmio
+	emake debugedit
+}
+
+src_test() {
+	:
+}
+
+src_install() {
+	dobin debugedit
+}
diff --git a/dev-util/desktop-file-utils/Manifest b/dev-util/desktop-file-utils/Manifest
index ae5b26dba022..683abfb5a2c6 100644
--- a/dev-util/desktop-file-utils/Manifest
+++ b/dev-util/desktop-file-utils/Manifest
@@ -2,5 +2,5 @@ AUX 50desktop-file-utils-gentoo.el 250 BLAKE2B 6778fd6faecc6afe376598cdab5d89036
 DIST desktop-file-utils-0.24.tar.xz 137424 BLAKE2B 3cce27caa14782ef10886fdc0602c0378c1bad0d49a4b99077436a9951f13ccdb539fdc2b9d27b54430fce94fb0ee0268746b216cc5d6c1b9ba517e1af81b4ce SHA512 b19d700d4403c8757c62e49bb7650e0138a85e799f79de07b0d0099a52398a3ead90c8125ccc883df6e2a3f8f5f97696009ebb7452dc7acc25afeef20e06fde0
 DIST desktop-file-utils-0.26.tar.xz 83132 BLAKE2B fdbe5427a0278ebe4a9b1bc15a148ecdc3f54b54058b355ae4f9a962fb1c4ec309d24a075973caf8f187a1c74b013e9bed0a7c3668bf888274e77fac9e077ec8 SHA512 5b4e435f0b635d8f898ac7f5759f74a08ffbe2a56d41fee0e84ff57e73b98d08b57b4416f20b99f696dad8bcb1c20792b39acf836b0814220c0b386ea5f6b831
 EBUILD desktop-file-utils-0.24.ebuild 1287 BLAKE2B 7ac58a5fc22f86c48162d3ef0c5f5471031a36294d8e9a68c1bc6643db4bcabb51e0ad581115e18df0e97c1b119d9c0b65737c617f6cdd3dbb984c7c90e81fd5 SHA512 09ee0891f66b52b89f6f45e909c579408cb36f0e8e535636444ab82424cb1c93f89d9cebf48c141f8bd9322c362e3948a5bc6cc3d0e844d1d8d8cb758f129870
-EBUILD desktop-file-utils-0.26-r1.ebuild 1168 BLAKE2B fe43657150b74c25da3656c9ea58ff48c8a3be0b4c770727e7055ac11ad7aed0ef80f1b415a5a8898fa921a497f89e3186e92c7101e2a05c50a6084f1c426231 SHA512 dcdb9758d6b071f5666607f31d4489fb9852e45d203be14573d21e1fea44fe6306ffc616bad6cb302a8ec2dea9f0de89b24972af9533bce26186ee763230565b
+EBUILD desktop-file-utils-0.26-r1.ebuild 1167 BLAKE2B 183e1c5b0b242143a9e59ba942be5497eaa4812ea8f99b83145ab5bb1142f10a7a5ad56cae010e94aed2f3d3d58ca1e16d2f37c670d1ad4cfa71e5152df54aaa SHA512 60da0a27b78328456d10d5cb66653bd4307b88624d15f2a26a10f1ca90a8b93bb1236b7b0f6b3f08b77568bfbe7fd37b11dbdfc9505abafc368c1b614482c594
 MISC metadata.xml 224 BLAKE2B 50a08713f8b792454787823dd56f1dcc1a1970ded78fa6ddffc6fb7301e0de75018e1e7a8c7ed890b4910f2716d2588ad21c7ae88ad8013b51cab7ba401c46c9 SHA512 12da46d8052565f62c482e6bcc714d8c00cac256f85dc1602579c8d61e0b61af95da149d1a446e56b2eba918ab9d78b556f77c6fe034a2e578f57a9dbe62fc44
diff --git a/dev-util/desktop-file-utils/desktop-file-utils-0.26-r1.ebuild b/dev-util/desktop-file-utils/desktop-file-utils-0.26-r1.ebuild
index 390c5208bb58..7caea829dc2f 100644
--- a/dev-util/desktop-file-utils/desktop-file-utils-0.26-r1.ebuild
+++ b/dev-util/desktop-file-utils/desktop-file-utils-0.26-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/releases/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="emacs"
 
 RDEPEND=">=dev-libs/glib-2.12:2"
diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest
index c4a746339348..fe834e0521f8 100644
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@@ -1,5 +1,3 @@
-DIST diffoscope-162.tar.gz 1564386 BLAKE2B e5ea37ae48c65dae3c850a04152c322e1e8535ad982107689f23a4111ec04b9b7766681b7e61f69c75bece271d8875ef2d109b315ec5d55ad77658a065148ed6 SHA512 a5de428b491adfadc432322eba524dc8031a6be9709887f2f290376bb94b358cec45a4a0a31b8fb5f25377a33752044882245a22d7f2b71b17d5efe002c850f4
 DIST diffoscope-163.tar.gz 1566445 BLAKE2B 4985d3a1e63fd2d4ef7cdf9e933e3ac6d1bc6c18a703bc92a8dc573b368c5989107debd57d96cfa40fe9e48d43b8ef0a07143ee48dd982a4a71b914a8e4d64ae SHA512 fc02d864c9a4b799aec45b88646f68de4f559366462b2057094592dfd3bff94213c17ea048b98070ae9a1f2f30d0e8d58d630b643e198dd85369cadea227a7e4
-EBUILD diffoscope-162.ebuild 2161 BLAKE2B fb5e4e91fc32b56175d45b589cd3c11bdb42b5b1c33910843d489ea311d4eade3860c777a94398908fe2c94a0bf8a15b91df62b4f7ce7dfb43b76ad452bc8184 SHA512 4713e398d39141876170b6864e497321743b868eaf62f181dcb8341f95a012f72c46db35c51ff08ff375b1439efc2b411f61e36b50950aecac333af0d0df377c
-EBUILD diffoscope-163.ebuild 2161 BLAKE2B fb5e4e91fc32b56175d45b589cd3c11bdb42b5b1c33910843d489ea311d4eade3860c777a94398908fe2c94a0bf8a15b91df62b4f7ce7dfb43b76ad452bc8184 SHA512 4713e398d39141876170b6864e497321743b868eaf62f181dcb8341f95a012f72c46db35c51ff08ff375b1439efc2b411f61e36b50950aecac333af0d0df377c
-MISC metadata.xml 2137 BLAKE2B 6ff55f85ebf3f769c10c3e17a69900918abe142e491b7b8460bed8fe6a036763a743324bf1a10e7a3772761b38c9632ff1352e9c6677ef691f81acc29dc321e9 SHA512 e782e12dc91d86612768a2e0c498f54a9728691a76008ee1e6cdbc4d8719c2593344f6c37786982abb0de7b85d743d7614652a2e8c9cd9fef053c3a32e1e484c
+EBUILD diffoscope-163.ebuild 2161 BLAKE2B e34a8f2c33ccdd155d59e771071fbeacac3675e0e303fcacaf66f8ccd9a02d26c7a6429195a6835a4cb18ac684c6c1f33102b17b127dbce7429929b84d4fdd19 SHA512 9fdbd5bf6ed122e0412a206526fdb0c9d7eb5d85f3792fed23c1bd9ac71e53ebb5505aa39be5b74ea6516ab14155adfb525e931ed1449d2b501be293dfb868f5
+MISC metadata.xml 2137 BLAKE2B 70393ec4166e001aaeeb4c10958693ff090b04e7e5bf7eb760746dc4920e0554724f61e1a073f008660789438bec33378796ebc117c1cedcac5116b0b1d32142 SHA512 a1f5648c7593f16db4df87b750360034647704b1809ed52d585d49b5769ee8e190ff853941d2739da7c5f514ef02442b3b3ebf55fb21541e7bc551c720a305d0
diff --git a/dev-util/diffoscope/diffoscope-162.ebuild b/dev-util/diffoscope/diffoscope-162.ebuild
deleted file mode 100644
index 572dad5645e4..000000000000
--- a/dev-util/diffoscope/diffoscope-162.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-DESCRIPTION="Will try to get to the bottom of what makes files or directories different"
-HOMEPAGE="https://diffoscope.org/ https://pypi.org/project/diffoscope/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file
-find gettext gif gpg gzip haskell hdf5 hex imagemagick iso java llvm
-mono opendocument pascal pdf postscript R rpm sqlite squashfs
-ssh tar tcpdump xz zip zstd"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/python-magic[${PYTHON_USEDEP}]
-	dev-python/libarchive-c[${PYTHON_USEDEP}]
-	dev-python/distro[${PYTHON_USEDEP}]
-	acl? ( sys-apps/acl )
-	binutils? ( sys-devel/binutils )
-	bzip2? ( app-arch/bzip2 )
-	libcaca? ( media-libs/libcaca )
-	colord? ( x11-misc/colord )
-	cpio? ( app-arch/cpio )
-	diff? ( sys-apps/diffutils )
-	docx? ( app-text/docx2txt )
-	dtc? ( sys-apps/dtc )
-	e2fsprogs? ( sys-fs/e2fsprogs )
-	file? ( sys-apps/file )
-	find? ( sys-apps/findutils )
-	gettext? ( sys-devel/gettext )
-	gif? ( media-libs/giflib )
-	gpg? ( app-crypt/gnupg )
-	gzip? ( app-arch/gzip )
-	haskell? ( dev-lang/ghc )
-	hdf5? ( sci-libs/hdf5 )
-	hex? ( app-editors/vim-core )
-	imagemagick? ( media-gfx/imagemagick )
-	iso? ( virtual/cdrtools )
-	java? ( virtual/jdk )
-	llvm? ( sys-devel/llvm )
-	mono? ( dev-lang/mono )
-	opendocument? ( app-text/odt2txt )
-	pascal? ( dev-lang/fpc )
-	pdf? (
-		app-text/pdftk
-		app-text/poppler
-		dev-python/PyPDF2[${PYTHON_USEDEP}]
-	)
-	postscript? ( app-text/ghostscript-gpl )
-	R? ( dev-lang/R )
-	rpm? ( app-arch/rpm )
-	sqlite? ( dev-db/sqlite:3 )
-	squashfs? ( sys-fs/squashfs-tools )
-	ssh? ( net-misc/openssh )
-	tar? ( app-arch/tar )
-	tcpdump? ( net-analyzer/tcpdump )
-	xz? ( app-arch/xz-utils )
-	zip? ( app-arch/unzip )
-	zstd? ( app-arch/zstd )
-"
-# Presence if filemagic's magic.py breaks imports
-# of dev-python/python-magic: https://bugs.gentoo.org/716482
-RDEPEND+=" !dev-python/filemagic"
diff --git a/dev-util/diffoscope/diffoscope-163.ebuild b/dev-util/diffoscope/diffoscope-163.ebuild
index 572dad5645e4..5f49e7be247b 100644
--- a/dev-util/diffoscope/diffoscope-163.ebuild
+++ b/dev-util/diffoscope/diffoscope-163.ebuild
@@ -43,7 +43,7 @@ RDEPEND="dev-python/python-magic[${PYTHON_USEDEP}]
 	hdf5? ( sci-libs/hdf5 )
 	hex? ( app-editors/vim-core )
 	imagemagick? ( media-gfx/imagemagick )
-	iso? ( virtual/cdrtools )
+	iso? ( app-cdr/cdrtools )
 	java? ( virtual/jdk )
 	llvm? ( sys-devel/llvm )
 	mono? ( dev-lang/mono )
diff --git a/dev-util/diffoscope/metadata.xml b/dev-util/diffoscope/metadata.xml
index 86628d987731..484caf983568 100644
--- a/dev-util/diffoscope/metadata.xml
+++ b/dev-util/diffoscope/metadata.xml
@@ -25,7 +25,7 @@
   <flag name="haskell">Use <pkg>dev-lang/ghc</pkg></flag>
   <flag name="hdf5">Use <pkg>sci-libs/hdf5</pkg></flag>
   <flag name="hex">Use <pkg>app-editors/vim-core</pkg></flag>
-  <flag name="iso">Use <pkg>virtual/cdrtools</pkg></flag>
+  <flag name="iso">Use <pkg>app-cdr/cdrtools</pkg></flag>
   <flag name="llvm">Use <pkg>sys-devel/llvm</pkg></flag>
   <flag name="opendocument">Use <pkg>app-text/odt2txt</pkg></flag>
   <flag name="pascal">Use <pkg>dev-lang/fpc</pkg></flag>
diff --git a/dev-util/edb-debugger/Manifest b/dev-util/edb-debugger/Manifest
index f12b2c88ff0b..152528119e77 100644
--- a/dev-util/edb-debugger/Manifest
+++ b/dev-util/edb-debugger/Manifest
@@ -1,6 +1,4 @@
-AUX edb-debugger-1.2.0-gcc-11.patch 1849 BLAKE2B 5d9fa2dbd7738752bf95453442f0c1726fa395c2126bc0e4c8a2b7d9970e73c88334627938baf07d229937aac4de8ed13bf764e57d636df607262982fe1ae7a2 SHA512 e3eefa58075bb509b0d4721cd3484e4dd5ef38c180b5cc93c1ebef77a7c6f39eb0260566afbf288f65d8edc9c778e3c4fe872cfa961c9c33e8b268324aeb1736
-AUX edb-debugger-1.2.0-qt-5.15.patch 635 BLAKE2B b5f575f009bd81e5a9e7feb580e706b06e67f11dc0aba8a7c7473f2d1dd944bf6d56079e405403c8b64ee52c5e9e45d019c0219b2a90689cfab1fad41c3c70a3 SHA512 dc1a56a5b4e2d86bf4dd96bebd3e4272fe3c933fe462810028905e32be1056b7720c78443a5b7f82b266f204b10dd0fd8e3c77b68859dc1666cf73ec5047c6d6
-DIST edb-debugger-1.2.0.tgz 608773 BLAKE2B d67136b3bfb153f0e5ba0aef514756f39d63692636adcad3569e79237613004f2a4c425b4bed875408473a7caa6280b3bfc590e8eeb4beb5bafaa2326da892bc SHA512 c04b8d3972497ac170c740f2625301ee7d3ea52b81b29084628aa0091d7cd7df12a34ae707be629cde6e0dea54254bfde25e290aba1d6bad2635eff704282ea9
-EBUILD edb-debugger-1.2.0.ebuild 1220 BLAKE2B 6a0bcf405c881062268b85b047b13fc71d3b2d0f134b97dbd0544ffa54761f84d20414276295048c3cbe2618e13e41cfb0007d18c6497691bdd4f1963d873dfb SHA512 bfba99aa6125d3ce9b968ad03550c7502d6d5c6f95354a858e4aa1cfe5a35cb7eba873a317caefa5d84f7a6f00c6d2e5ea8c3e7427be70b6930f2a162b89f267
+DIST edb-debugger-1.3.0.tgz 618227 BLAKE2B 1650e727851b629d7778c8488a464b6439f2ac4e5a72c0738cfe1ee302538b0d97dcbf9587a1108a82f8f8f4a6bec273e31ad454063f70704ffb48ca8ba5b73f SHA512 9d813bb61cdc7b61b594e63834ffb3999d3e1bb0c7a435095efea9b3b6726369a06c553ba6633df160d9456758ff54d5eee8cfbee6a1304f3a01d09fe2c7a65d
+EBUILD edb-debugger-1.3.0.ebuild 1126 BLAKE2B c9b9391d5d06b797c3ad0e8eadab04ca983a7c344c179ded66357a99f13e26b7cb0b6fefc0d972f62b61f2599bc499243c35fd8ba77e443dd5da34d4b6cb4e95 SHA512 272eecf3dd7d6c386fbe5143a9c84baf429ae45f1c53312386567c44a4f48b472542d9f406844f015a16141066180c4c2636530b2ae8edc9b977362e52ffd0ea
 EBUILD edb-debugger-9999.ebuild 932 BLAKE2B 060e1be8043c1fd6f12684b197f60cd88de8f8d35c1227246de4bba18546b23f16ddcd60cdf92a54a48cda5ab1640e9e199a1429edf52bdf935ebf18f120df19 SHA512 1c09eaaecff1866de7307512ced499f0eb10f1f3defc8663111d9cfa64f6a7ef3b846365f8e9e18e14d19fde18909e1a5bbbdc60a674f1918f0476316399d929
 MISC metadata.xml 358 BLAKE2B eae911d14bc54d81aaf32eee088708b75027fe67c1dd9458ffeb1af3ecc429bbfa51805aab9a3ecbf8bfbc8e221b6411423852fc2fc61381ca381a61869521be SHA512 da7c4e88f58521bf9521b060b328498aa8e30be151671f5d81bbc15695e23b9a0bd75f7a98cee91866ccc4347d0fc18dd76259a8ac244bf5d0e9826b6cb8ca1e
diff --git a/dev-util/edb-debugger/edb-debugger-1.2.0.ebuild b/dev-util/edb-debugger/edb-debugger-1.3.0.ebuild
index 4d27f38f9869..21c906d48591 100644
--- a/dev-util/edb-debugger/edb-debugger-1.2.0.ebuild
+++ b/dev-util/edb-debugger/edb-debugger-1.3.0.ebuild
@@ -34,11 +34,6 @@ DEPEND="
 	${RDEPEND}
 "
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.2.0-qt-5.15.patch
-	"${FILESDIR}"/${PN}-1.2.0-gcc-11.patch
-)
-
 S=${WORKDIR}/${PN}
 
 src_prepare() {
diff --git a/dev-util/edb-debugger/files/edb-debugger-1.2.0-gcc-11.patch b/dev-util/edb-debugger/files/edb-debugger-1.2.0-gcc-11.patch
deleted file mode 100644
index 68d58b2b90eb..000000000000
--- a/dev-util/edb-debugger/files/edb-debugger-1.2.0-gcc-11.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-https://github.com/eteran/edb-debugger/pull/776
-
-From a46587a77c33256d56077a2d0709291b3ab12505 Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyfox@gentoo.org>
-Date: Fri, 11 Sep 2020 07:57:39 +0100
-Subject: [PATCH] x86-generic/PlatformThread.cpp: avoid non-constant offsetof
-
-On gcc-11 edb-debugger build fails as:
-
-```
-.../x86-generic/PlatformThread.cpp:332:79: error: 'n' is not a constant expression
-  332 |         return ptrace(PTRACE_POKEUSER, tid_, offsetof(struct user, u_debugreg[n]), value);
-      |                                                                               ^
-```
-
-The change workarounds by avoiding non-constant expression:
-https://gcc.gnu.org/PR95942
-
-Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
----
- .../unix/linux/arch/x86-generic/PlatformThread.cpp          | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
---- a/plugins/DebuggerCore/unix/linux/arch/x86-generic/PlatformThread.cpp
-+++ b/plugins/DebuggerCore/unix/linux/arch/x86-generic/PlatformThread.cpp
-@@ -318,7 +318,8 @@ edb::address_t PlatformThread::instructionPointer() const {
-  * @return
-  */
- unsigned long PlatformThread::getDebugRegister(std::size_t n) {
--	return ptrace(PTRACE_PEEKUSER, tid_, offsetof(struct user, u_debugreg[n]), 0);
-+	size_t drOffset = offsetof(struct user, u_debugreg[0]) + n * sizeof(user::u_debugreg[0]);
-+	return ptrace(PTRACE_PEEKUSER, tid_, drOffset, 0);
- }
- 
- /**
-@@ -328,7 +329,8 @@ unsigned long PlatformThread::getDebugRegister(std::size_t n) {
-  * @return
-  */
- long PlatformThread::setDebugRegister(std::size_t n, unsigned long value) {
--	return ptrace(PTRACE_POKEUSER, tid_, offsetof(struct user, u_debugreg[n]), value);
-+	size_t drOffset = offsetof(struct user, u_debugreg[0]) + n * sizeof(user::u_debugreg[0]);
-+	return ptrace(PTRACE_POKEUSER, tid_, drOffset, value);
- }
- 
- /**
--- 
-2.28.0
-
diff --git a/dev-util/edb-debugger/files/edb-debugger-1.2.0-qt-5.15.patch b/dev-util/edb-debugger/files/edb-debugger-1.2.0-qt-5.15.patch
deleted file mode 100644
index 795cb8fce681..000000000000
--- a/dev-util/edb-debugger/files/edb-debugger-1.2.0-qt-5.15.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-https://bugs.gentoo.org/727530
-https://github.com/eteran/edb-debugger/pull/766
-
-Fix build failure on qt-5.15. Typical build error is:
-
-src/widgets/QDisassemblyView.cpp:1503:17:
-  error: aggregate ‘QPainterPath path’ has incomplete type and cannot be defined
- 1503 |    QPainterPath path;
-      |                 ^~~~
-
---- a/src/widgets/QDisassemblyView.h
-+++ b/src/widgets/QDisassemblyView.h
-@@ -25,6 +25,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
- #include <QAbstractScrollArea>
- #include <QAbstractSlider>
- #include <QCache>
-+#include <QPainterPath>
- #include <QPixmap>
- #include <QSvgRenderer>
- 
diff --git a/dev-util/eric/Manifest b/dev-util/eric/Manifest
deleted file mode 100644
index 10a68e37dafd..000000000000
--- a/dev-util/eric/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST eric6-18.03.tar.gz 16517664 BLAKE2B f7f5292df8bc694fc4715ec1a250d948123a2eb99a590e6824d985318446babff86aeb745f5b5dbd0707e771638eaa943673e5b546676bea97e266888b844989 SHA512 e488010791b44cc7da782620baec9b97259aaefeb90d491023ec1d4582fb68acbc06d9eedba7beef9ddc706302e06e36b9ebb4e46d6f035b6c74e9f4eb9ac400
-DIST eric6-19.11.tar.gz 16241807 BLAKE2B bd8284164c6c191e91fc08bc42f594107ebab50f71a980ef331d42fbd8d9c488d5674b2f53665718a6e723a228e838d082095fc3c3b2d40c3fb350c5be9a98ee SHA512 a8305c5185687d62231926bd4c484f3786ac1c20d125a1f8fb1b6bc0d42c57ba92bf00aaffd8699f8d7594c6432896bef8db13da85513ba4f217a60223f2f533
-EBUILD eric-18.03.ebuild 1997 BLAKE2B 002de73e34f3ec7f56e23070abcd77df2cfc2d6d0425043a4ce3797527d09fe298fc36cb8bd718760d6d876b829980cb15e144aa7d34ed4b5d82b39fab8235c6 SHA512 f801ba23020200d0e5eda3b64d1ae80a070e993e421a8f12b996cfe8c065e5bc3e9cb8084ef9098c06cc93823193eacd052cee6f373c88b93872102196e8ca7e
-EBUILD eric-19.11-r1.ebuild 1488 BLAKE2B a37b87b2fe72c30cbf2a2c7a0ea196a143fa5cd5235ef2ef1e32016951676a08bfdbd9bf3927915d59d22de7c7d7641a9f39b6a79a097a69080e58a67c21e8a9 SHA512 5dd51dbb756ee8545a16846415e22636b7850b9d319d75faac2cdf33ce460eee2d28b9766bf689e1fb70a3e4fc028e35a7be4950fc9d7d5e800bba3e63778ccd
-MISC metadata.xml 325 BLAKE2B 5c4bd806e4833d3f4c294ca46b24420c71f8ef234ea732460833f39f583e0e5156d773d6fbf7fb4d45edf409d21622a9b90e0989e9d93632d7dd94b7aa7e6c3f SHA512 e3da71c04a1a2af6b72ff068eba586c14b159034f759448c669032b30a82cc618e58467cc8cec8090d22d0e864338fc62b735f73dc31fd2a33d63cb677178f9e
diff --git a/dev-util/eric/eric-18.03.ebuild b/dev-util/eric/eric-18.03.ebuild
deleted file mode 100644
index f766811e82e4..000000000000
--- a/dev-util/eric/eric-18.03.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P=${PN}6-${PV}
-PYTHON_COMPAT=( python3_6 )
-PYTHON_REQ_USE="sqlite,xml"
-inherit python-single-r1 xdg-utils
-
-DESCRIPTION="A full featured Python IDE using PyQt and QScintilla"
-HOMEPAGE="https://eric-ide.python-projects.org/"
-SRC_URI="mirror://sourceforge/eric-ide/${PN}6/stable/${PV}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="6"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		>=dev-python/sip-4.14.3[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/PyQt5-5.7.1[gui,network,printsupport,sql,svg,widgets,${PYTHON_MULTI_USEDEP}]
-		>=dev-python/qscintilla-python-2.10[qt5(+),${PYTHON_MULTI_USEDEP}]
-	')
-"
-RDEPEND="${DEPEND}
-	$(python_gen_cond_dep '
-		|| (
-			dev-python/PyQt5[help,webengine,${PYTHON_MULTI_USEDEP}]
-			dev-python/PyQt5[help,webkit,${PYTHON_MULTI_USEDEP}]
-		)
-		>=dev-python/chardet-3.0.4[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/coverage-4.1.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pygments-2.2.0[${PYTHON_MULTI_USEDEP}]
-	')
-	!dev-util/eric:4
-	!dev-util/eric:5
-"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=( changelog README.rst THANKS )
-
-src_prepare() {
-	default
-
-	# Delete internal copies of dev-python/chardet and dev-python/pygments
-	rm -fr eric/ThirdParty/{CharDet,Pygments} || die
-
-	# Delete internal copy of dev-python/coverage
-	rm -fr eric/DebugClients/Python{,3}/coverage || die
-	sed -i -e 's/from DebugClients\.Python3\?\.coverage/from coverage/' \
-		$(grep -lr 'from DebugClients\.Python3\?\.coverage' .) || die
-}
-
-src_install() {
-	"${PYTHON}" install.py \
-		-b "${EPREFIX}/usr/bin" \
-		-d "$(python_get_sitedir)" \
-		-i "${D}" \
-		-c \
-		-z \
-		|| die
-
-	python_optimize
-	einstalldocs
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-
-	if ! has_version dev-python/enchant; then
-		elog "You might want to install dev-python/pyenchant for spell checking."
-	fi
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/dev-util/eric/eric-19.11-r1.ebuild b/dev-util/eric/eric-19.11-r1.ebuild
deleted file mode 100644
index bb8cee447042..000000000000
--- a/dev-util/eric/eric-19.11-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE="sqlite,xml"
-inherit python-single-r1 xdg
-
-MY_P=${PN}6-${PV}
-
-DESCRIPTION="A full featured Python IDE using PyQt and QScintilla"
-HOMEPAGE="https://eric-ide.python-projects.org/"
-SRC_URI="mirror://sourceforge/eric-ide/${PN}6/stable/${PV}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="6"
-KEYWORDS="~amd64 ~x86"
-IUSE="spell"
-
-DEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		>=dev-python/PyQt5-5.12[gui,help,network,printsupport,sql,svg,widgets,${PYTHON_MULTI_USEDEP}]
-		dev-python/PyQtWebEngine[${PYTHON_MULTI_USEDEP}]
-		dev-python/qscintilla-python[${PYTHON_MULTI_USEDEP}]
-		dev-python/sip[${PYTHON_MULTI_USEDEP}]
-	')
-"
-RDEPEND="${DEPEND}
-	$(python_gen_cond_dep '
-		>=dev-python/chardet-3.0.4[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pygments-2.3.1[${PYTHON_MULTI_USEDEP}]
-		spell? ( dev-python/pyenchant[${PYTHON_MULTI_USEDEP}] )
-	')
-"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=( eric/docs/{changelog,README.rst,README-eric6-doc.rst,README-passive-debugging.rst,THANKS} )
-
-src_prepare() {
-	default
-
-	# Delete internal copies of dev-python/chardet and dev-python/pygments
-	rm -fr eric/eric6/ThirdParty/{CharDet,Pygments} || die
-}
-
-src_install() {
-	yes n | "${PYTHON}" install.py \
-		-b "${EPREFIX}/usr/bin" \
-		-d "$(python_get_sitedir)" \
-		-i "${D}" \
-		-c \
-		-z \
-		|| die
-
-	python_optimize
-	einstalldocs
-}
diff --git a/dev-util/eric/metadata.xml b/dev-util/eric/metadata.xml
deleted file mode 100644
index 11e69dd891df..000000000000
--- a/dev-util/eric/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>qt@gentoo.org</email>
-		<name>Gentoo Qt Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">eric-ide</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/gdbus-codegen/Manifest b/dev-util/gdbus-codegen/Manifest
index 39d967c090b8..1ed0d49fb097 100644
--- a/dev-util/gdbus-codegen/Manifest
+++ b/dev-util/gdbus-codegen/Manifest
@@ -4,8 +4,10 @@ DIST glib-2.62.6.tar.xz 4703424 BLAKE2B 0a27245be2575c574dcc730dd051a8c284f421db
 DIST glib-2.64.5.tar.xz 4778456 BLAKE2B 7fdee0e16a7ac820f4c4f7dc66d37add464d3005e89e6013302d3ef103319331811d68e9b42db072b82242c3d7badfbd085b69333e770012def89dc8aae7a2eb SHA512 a87537274619b6de88a0e68555059036ac18c748b5005c8d84728646b0db342fde0b8c5b303b9ad79f64d71ea4ed990d52a4fbd68cda3ca74aed5fe4d497e060
 DIST glib-2.66.0.tar.xz 4839236 BLAKE2B 930bf071bb4b1e744ca46cb5267d42772488030f848c7b11c5424fcef087ac27d070d20cf403ae504e573ce49faf26ce9101656391d3915ae04422d021d5561a SHA512 358e6a840b722139593eb7825c3aa70153eb26036e05d13d3286bcc6d2e962c2b4ddcb0fe5c6728b89bfffbd178101e72c576081ae714326a272a9fc34ed953e
 DIST glib-2.66.3.tar.xz 4837796 BLAKE2B 44632477b56bea5b6324deccc17e2d6b72e00dba518f9fc3ec5edad8b20df59f8bf9087e5de16b587b72c2f143d9ab650c478666132b1564da9bf333f380a4e3 SHA512 ab2670ae4eeb3b561c0e71ff9153908f450e430cd43771bfee09233a65826dc16462537ec64bdfcced867f4c8663341b6b9d17af5ba0fab8564b8f21b04a45d7
+DIST glib-2.66.4.tar.xz 4838124 BLAKE2B de2b8690c9ef9d66378b396ec0abe2bc83380654b3ca2e221678fb6dc9bf449c544a7e2b2a662739f7b400e9ce0a5a0af115ba2f06b8f5597967e518fdec4937 SHA512 b3bc3e6e5cca793139848940e5c0894f1c7e3bd3a770b213a1ea548ac54a2432aebb140ed54518712fb8af36382b3b13d5f7ffd3d87ff63cba9e2f55434f7260
 EBUILD gdbus-codegen-2.62.6.ebuild 2043 BLAKE2B a55f20184ac1bafd3aa391b2d0c79ccefd5c6dc64f7c4619ee505f16f645c479fda199e6c54cd41ac666c5e68ab9431109f642655250b3f16f28c1d8dffc6da6 SHA512 9ad9a9475d431ba44a913f2b0423fa35623105d87ec8eb583b9eb0c67aa8358681b8d7ef1f5856e6c15d873bb29d1d5397788e44ba2e6bd5fbb734c1c503717e
 EBUILD gdbus-codegen-2.64.5.ebuild 2201 BLAKE2B 24a877d49166197adb71f8c323ff4324852585e5c155c90d116eefd4ef8fdffd6599d836b8c745143c38aa92a7c84b80a8b9b0fa79042d7b81e1d39bd3d9257c SHA512 93a9475d91d276c7766a5214f29aa085b7f965b2705b1dd61d5a798766e8469c1a62065cb928eeed371d4b7afef6bd1d9c81c1d5a4835d7659083b15fa91c8e7
 EBUILD gdbus-codegen-2.66.0.ebuild 2212 BLAKE2B 07cc625a31740b5e6404a9e5bf91a8344d6e37176bb971085dbdcc83959324b8e6f8fd6ca908a962fab205fc27136aef7c37bdb7d72eee95a6636a7f56fa4596 SHA512 4bc6e71c8f2d093e3db6c8a834a809b4152a7ad7c07902b13f70f7dd8b88612520eb2a7f3a6bdeaa061a721e91e7509445e705f2d077880040d1796433bae525
 EBUILD gdbus-codegen-2.66.3.ebuild 2212 BLAKE2B 07cc625a31740b5e6404a9e5bf91a8344d6e37176bb971085dbdcc83959324b8e6f8fd6ca908a962fab205fc27136aef7c37bdb7d72eee95a6636a7f56fa4596 SHA512 4bc6e71c8f2d093e3db6c8a834a809b4152a7ad7c07902b13f70f7dd8b88612520eb2a7f3a6bdeaa061a721e91e7509445e705f2d077880040d1796433bae525
+EBUILD gdbus-codegen-2.66.4.ebuild 2212 BLAKE2B 07cc625a31740b5e6404a9e5bf91a8344d6e37176bb971085dbdcc83959324b8e6f8fd6ca908a962fab205fc27136aef7c37bdb7d72eee95a6636a7f56fa4596 SHA512 4bc6e71c8f2d093e3db6c8a834a809b4152a7ad7c07902b13f70f7dd8b88612520eb2a7f3a6bdeaa061a721e91e7509445e705f2d077880040d1796433bae525
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.66.4.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.66.4.ebuild
new file mode 100644
index 000000000000..38da7d52d767
--- /dev/null
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.66.4.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GNOME_ORG_MODULE="glib"
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_REQ_USE="xml"
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit gnome.org distutils-r1
+
+DESCRIPTION="GDBus code and documentation generator"
+HOMEPAGE="https://www.gtk.org/"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-libs/libxslt
+	app-text/docbook-xsl-stylesheets
+"
+
+S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen"
+
+python_prepare_all() {
+	PATCHES=(
+		"${FILESDIR}/${PN}-2.56.1-sitedir.patch"
+	)
+	distutils-r1_python_prepare_all
+
+	local MAJOR_VERSION=$(ver_cut 1)
+	local MINOR_VERSION=$(ver_cut 2)
+	sed -e 's:@PYTHON@:python:' gdbus-codegen.in > gdbus-codegen || die
+	sed -e "s:@VERSION@:${PV}:" \
+		-e "s:@MAJOR_VERSION@:${MAJOR_VERSION}:" \
+		-e "s:@MINOR_VERSION@:${MINOR_VERSION}:" config.py.in > config.py || die
+	cp "${FILESDIR}/setup.py-2.32.4" setup.py || die "cp failed"
+	sed -e "s/@PV@/${PV}/" -i setup.py || die "sed setup.py failed"
+}
+
+do_xsltproc_command() {
+	# Taken from meson.build for manual manpage building - keep in sync (also copied to dev-util/glib-utils)
+	xsltproc \
+		--nonet \
+		--stringparam man.output.quietly 1 \
+		--stringparam funcsynopsis.style ansi \
+		--stringparam man.th.extra1.suppress 1 \
+		--stringparam man.authors.section.enabled 0 \
+		--stringparam man.copyright.section.enabled 0 \
+		-o "${2}" \
+		http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \
+		"${1}" || die "manpage generation failed"
+}
+
+src_compile() {
+	distutils-r1_src_compile
+	do_xsltproc_command "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.xml" "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1"
+}
+
+src_test() {
+	einfo "Skipping tests. This package is tested by dev-libs/glib"
+	einfo "when merged with FEATURES=test"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all # no-op, but prevents QA warning
+	doman "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1"
+}
diff --git a/dev-util/glib-utils/Manifest b/dev-util/glib-utils/Manifest
index fe8514b61f40..c600c3ccd3a3 100644
--- a/dev-util/glib-utils/Manifest
+++ b/dev-util/glib-utils/Manifest
@@ -2,8 +2,10 @@ DIST glib-2.62.6.tar.xz 4703424 BLAKE2B 0a27245be2575c574dcc730dd051a8c284f421db
 DIST glib-2.64.5.tar.xz 4778456 BLAKE2B 7fdee0e16a7ac820f4c4f7dc66d37add464d3005e89e6013302d3ef103319331811d68e9b42db072b82242c3d7badfbd085b69333e770012def89dc8aae7a2eb SHA512 a87537274619b6de88a0e68555059036ac18c748b5005c8d84728646b0db342fde0b8c5b303b9ad79f64d71ea4ed990d52a4fbd68cda3ca74aed5fe4d497e060
 DIST glib-2.66.2.tar.xz 4836456 BLAKE2B 5484a7fe497dbe06df7ce11dbc8836c95dbb01e6e309516b82158f2915eeee36ccbe6e904cb6ae9a5a0223ccc0b52f6e64d61a418bf790538bc90388430977b2 SHA512 30278c066c6b209f45fcfdb9ffc4732236451464506b93c0fff0964ff8aac58c15be85c3793c686d4740d9d97857984bc0ab71e38d5da11c5fd860e569fb6cb9
 DIST glib-2.66.3.tar.xz 4837796 BLAKE2B 44632477b56bea5b6324deccc17e2d6b72e00dba518f9fc3ec5edad8b20df59f8bf9087e5de16b587b72c2f143d9ab650c478666132b1564da9bf333f380a4e3 SHA512 ab2670ae4eeb3b561c0e71ff9153908f450e430cd43771bfee09233a65826dc16462537ec64bdfcced867f4c8663341b6b9d17af5ba0fab8564b8f21b04a45d7
+DIST glib-2.66.4.tar.xz 4838124 BLAKE2B de2b8690c9ef9d66378b396ec0abe2bc83380654b3ca2e221678fb6dc9bf449c544a7e2b2a662739f7b400e9ce0a5a0af115ba2f06b8f5597967e518fdec4937 SHA512 b3bc3e6e5cca793139848940e5c0894f1c7e3bd3a770b213a1ea548ac54a2432aebb140ed54518712fb8af36382b3b13d5f7ffd3d87ff63cba9e2f55434f7260
 EBUILD glib-utils-2.62.6.ebuild 2390 BLAKE2B 6160cd993d8ea330b68812082a1e14c6d9c64e4adc2832bb68693e8a8eacc7598541f19e049a7601027b5fc1624485dcdc9745c7095b07d3b004a99a7f612d44 SHA512 4840e214e3283609722803ac6e52b015cce5e1f74168e318bf78bd0f0d2e7332f35063939c843ed39d03b0c9822a6aa738183bd0e0b6ea1067aae5c6b2a57a03
 EBUILD glib-utils-2.64.5.ebuild 2392 BLAKE2B 712bf35068847530523ade60b5d0943a5d8d28dcc0f4ac87d816245d924189716d2b97a73591a687092d99a7a704caea1e53b07abcdc989a70260a2655fca72c SHA512 495167c4c8b091b7f1ed5dfab873bac852d8a7056342c35ac18881ddc310f6ff8970e2625f5773ffa8c38b3a60e944452f8016d275d8296c856c5932559e777d
 EBUILD glib-utils-2.66.2.ebuild 2401 BLAKE2B 520f38ab480c4e463a1a6f141221556b6d20d0857b5c91525170bac962b268dd904f31bb42a60693dcde317ff30a18cbb12300aa027db4e333ea33445ee4e384 SHA512 42cc368b74c34714a28b9189f29cd7a891d0c5fe908f16c12683c0030d5e12724cf3cbdd7ada38d6b5512a0e982a7f44ccfcca0717a3bf250accdf62ef985776
 EBUILD glib-utils-2.66.3.ebuild 2401 BLAKE2B 520f38ab480c4e463a1a6f141221556b6d20d0857b5c91525170bac962b268dd904f31bb42a60693dcde317ff30a18cbb12300aa027db4e333ea33445ee4e384 SHA512 42cc368b74c34714a28b9189f29cd7a891d0c5fe908f16c12683c0030d5e12724cf3cbdd7ada38d6b5512a0e982a7f44ccfcca0717a3bf250accdf62ef985776
+EBUILD glib-utils-2.66.4.ebuild 2401 BLAKE2B 520f38ab480c4e463a1a6f141221556b6d20d0857b5c91525170bac962b268dd904f31bb42a60693dcde317ff30a18cbb12300aa027db4e333ea33445ee4e384 SHA512 42cc368b74c34714a28b9189f29cd7a891d0c5fe908f16c12683c0030d5e12724cf3cbdd7ada38d6b5512a0e982a7f44ccfcca0717a3bf250accdf62ef985776
 MISC metadata.xml 332 BLAKE2B 1e3c081ae9a2c8ae53cee6c3ae133cbd5e8543a68c03d4a4f7e164437502d996ea9364789e93114687271e1f472bcf13a418cca5b74ecb95a51849f0a5f3dafa SHA512 f7680d9be4071b841f50ece99b5041dc492901d84ae05383c1ff05b6a73bab804b153a50eb70f5417137f6e2041230c5ba8eaede10f7a0bf8a899508642588c6
diff --git a/dev-util/glib-utils/glib-utils-2.66.4.ebuild b/dev-util/glib-utils/glib-utils-2.66.4.ebuild
new file mode 100644
index 000000000000..03ff214270c2
--- /dev/null
+++ b/dev-util/glib-utils/glib-utils-2.66.4.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+GNOME_ORG_MODULE="glib"
+
+inherit gnome.org python-single-r1
+
+DESCRIPTION="Build utilities for GLib using projects"
+HOMEPAGE="https://www.gtk.org/"
+
+LICENSE="LGPL-2.1+"
+SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+
+RDEPEND="${PYTHON_DEPS}
+	!<dev-libs/glib-2.56.2:2
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-libs/libxslt
+	app-text/docbook-xsl-stylesheets
+"
+
+src_configure() { :; }
+
+do_xsltproc_command() {
+	# Taken from meson.build for manual manpage building - keep in sync (also copied to dev-util/gdbus-codegen)
+	xsltproc \
+		--nonet \
+		--stringparam man.output.quietly 1 \
+		--stringparam funcsynopsis.style ansi \
+		--stringparam man.th.extra1.suppress 1 \
+		--stringparam man.authors.section.enabled 0 \
+		--stringparam man.copyright.section.enabled 0 \
+		-o "${2}" \
+		http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \
+		"${1}" || die "manpage generation failed"
+}
+
+src_compile() {
+	sed -e "s:@VERSION@:${PV}:g;s:@PYTHON@:python:g" gobject/glib-genmarshal.in > gobject/glib-genmarshal || die
+	sed -e "s:@VERSION@:${PV}:g;s:@PYTHON@:python:g" gobject/glib-mkenums.in > gobject/glib-mkenums || die
+	sed -e "s:@GLIB_VERSION@:${PV}:g;s:@PYTHON@:python:g" glib/gtester-report.in > glib/gtester-report || die
+	do_xsltproc_command docs/reference/gobject/glib-genmarshal.xml docs/reference/gobject/glib-genmarshal.1
+	do_xsltproc_command docs/reference/gobject/glib-mkenums.xml docs/reference/gobject/glib-mkenums.1
+	do_xsltproc_command docs/reference/glib/gtester-report.xml docs/reference/glib/gtester-report.1
+}
+
+src_install() {
+	python_fix_shebang gobject/glib-genmarshal
+	python_fix_shebang gobject/glib-mkenums
+	python_fix_shebang glib/gtester-report
+	exeinto /usr/bin
+	doexe gobject/glib-genmarshal
+	doexe gobject/glib-mkenums
+	doexe glib/gtester-report
+	doman docs/reference/gobject/glib-genmarshal.1
+	doman docs/reference/gobject/glib-mkenums.1
+	doman docs/reference/glib/gtester-report.1
+}
diff --git a/dev-util/glslang/Manifest b/dev-util/glslang/Manifest
index 6f64f6bcc3ab..8e5fea0b7abb 100644
--- a/dev-util/glslang/Manifest
+++ b/dev-util/glslang/Manifest
@@ -1,14 +1,6 @@
-AUX glslang-7.12.3353_pre20191027-fix-relative-includes.patch 663 BLAKE2B 4d0e8efd9152610b16813d45251a83b8b685c07d3491c6bc1a1c2656ecabde2eed8840a53712bfd9aa9e6f047f332f56ead1e3c0d8185a81c4de0eb286f5d048 SHA512 db8bf5424aca0eb215db3059665eb7e6ffbbab029979de9f5b574e577274f6d0ca8a27acde10bd53769561eaae2996ec6da1a4916b2c39e82f343c33b120915f
-AUX glslang-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-files.patch 4974 BLAKE2B 9bb7807618a2dd6c322244557bf93809c21631be064bde4fc659724c45cb27d3e615fecde8692658edc1e3d229b4daadfa2b51732ebddb5d49f85abdb3af5399 SHA512 a07654d40172d6669d3ee3c3685463dbd58cc163ce726a20db18237ab710044b011e511defc8828f7ccd8b4fc128bb38f75669686085f7572ce8cc98887266d3
 DIST glslang-10.11.0.0_pre20200924.tar.gz 3246618 BLAKE2B e4353a9cf06273f6a5fc79004c5f97df3da3444a793ddefb6adee96cbcf541d6088bf2f2edc65dea53363cbcb254f7da80fefb8a93b8650adf2ed283b243fa24 SHA512 01551b2347f25e6135ef82f5ae838dbf275cb3f20300659b830c85fded334a8dea3928c017ff7d48d58d89ddf93f5429191f0a326f310db9ee989f622e23477f
-DIST glslang-7.12.3353_pre20191027.tar.gz 3119760 BLAKE2B 4a7eda7bf89b1589cb8a712660589e2746ff13ce3cac589a5651486fbdaa149b0fd8fceb791af0e43c9342aa9ca31459f66d0236c31d22959e519e8eb4457018 SHA512 6f247dbf9a50cdfe7b6ffbf79f73c46c57f8f61ef10037e0775ddd6faf4c5fd4b9b6b6761ecf26cc71c3711a650ee8619e2f0a33dfcf8ca8dc2974e497a685a7
-DIST glslang-8.13.3559.tar.gz 3122936 BLAKE2B 856e6068a06407195f97478b3e6bd91aa619213d8468a8c9ff7ee8e7a36a904e4896e34e021e8e4e047fab6ea406d89206849058a659de8075c52a06118b0e7b SHA512 d2f09888dd1b6edb4f324502627aeca0c78411f61ab50e672fa2a6d9ae46611849e1d13b9c6069b77f31092d843abcf3d74ed7cfc3c9144ced80e65876f4b781
-DIST glslang-8.13.3560_pre20200404.tar.gz 3185684 BLAKE2B fac831212b46b22f10657ee44afc788d174779dd36e9d5f045f8e84ab3cca448aee89aab13771a29598b242653d6a29e4eb8fd8965e1c03ceec599e7ab1fafa9 SHA512 ec5b89d918cf55bb0a166f59eeea3662d54f29a986f979a9b04ab35bc8e02e5b01d13c24f336666669115f90d3d97eb91abe7ba4b9108590ec9b8a78e976223f
-DIST glslang-8.13.3743.tar.gz 3183453 BLAKE2B 2e8fc3693477be8bd6f8000a0eb032b314f5903991dc5a73dbd913a92aa0d6878e45f29f0a01ca5e8453b566d8a503a3cf4256def7f90a4cb561391b047c2a1d SHA512 19169c4ffa511113978af8e8efc57b290d4aa962a4c2429dbea1af72204787c6ce20ffbbb452dc04bef5416e00510819d84463a2e76295b9a59b409e12af6792
-EBUILD glslang-10.11.0.0_pre20200924.ebuild 892 BLAKE2B 02ea8c0d451b7d06f18c653f20ffbf2bea94d96252b48d74579ca1429431fb43cfc05291c0e1b7f2a4412df81991f5e8f7bf8499cf65a6a8445bf2675f0189b6 SHA512 da75d32d2c8ee1df404afbb93625a35028dab80dedb096e516f0bedc2a16e53e662d8273a60ffeded743e62222fc5c43021b210eb20623c5f5683c814e5bf1dd
-EBUILD glslang-7.12.3353_pre20191027-r2.ebuild 848 BLAKE2B c21ffc390e783a2abae679b7c10b20b0f6b2c7c0240638a54b2717c0e65289006b367ddc96115f6234a3c999515314736011649283c14ec73aec8c37abd26710 SHA512 d6b739906ffc084106aa5dcd0182980c91a0874b1425f1eaa2b05e206597e2f7c807f87c02c8fca0db5c1f9860a378579cbfb4646f429bca72de672c151e87ee
-EBUILD glslang-8.13.3559.ebuild 759 BLAKE2B 64a7cb4e904a835110d41ce432dbb04a2e60efd884daa5daea7f36eaa6356126793239889b0b69ce87ebdcaea2987550b84405c58553dd87276a579a61b788f2 SHA512 0a362fa37d32551a976a8ced67b9dee1556b3c8f5c90cdb7446643c4ea4f07e388bfc9594e9de9ad3daa5f8c638db3373ef6592566ed72349dd892c5a24777b6
-EBUILD glslang-8.13.3560_pre20200404.ebuild 870 BLAKE2B a79d014151d18393e8fc95cd4bf3ca7eb859ba7250665ea97d3f77c60973dd496c0ca82a1c0f90d5870bcb6b2e87d5fb29ee9bc968b70b9df6900cdc90827f6b SHA512 47ad53da564d55ab780b5a69abcc232798f2c48b9babf9391416abf34a8f7871ffbb27d6893cf98caf56cf079b3885f06e8b6e60a3407a5e051938beef7b8cd7
-EBUILD glslang-8.13.3743-r1.ebuild 849 BLAKE2B 1d1c72d989d355232f47950c46c56ce92b3b78c12f1d6d9bbbc382f868b5534723037a8e03f1b65add39ee352fe37559a48092577b41b60e230cf9574b017c58 SHA512 e4bc4ecace4c588b787c40b959660e7fb93be18210aedb712e7cdc4ab0153067124d138286747f99f7eaa68083e3be977d5605349dca54ff1710963578cceb85
-EBUILD glslang-9999.ebuild 758 BLAKE2B f4f9a1e734aff4245c035d872d6c3a04abebf472730398d666bddab58cda002843b4dd9f06eac7d652c4db176cc9333e025ad27ddd1752a509786e12e341f9d1 SHA512 dc7eed08504ce61a142ad4ab3e6a9cdef360163dc5deb29dc61823ddf25f4915abfc0e127900c0acaeea3173e46c2fc152eaff41bdb6313861b04c052c57925f
+DIST glslang-10.11.0.0_pre20201216.tar.gz 3290064 BLAKE2B 46ce951ab6c69eb25dc2490e3eb817c5cc0e2bf2416f29842b45bb1efb83ea439d72c823c981e2f37803e203077ea01d1c84c28391fb78288c107510a47d2241 SHA512 4b9e300152dc2ec3b14657b3a745d5b26b5da49e5ff3da0d75680f84126237ec6af0f7cee5aaa74b2d4a123a386522cd7342b5f25e4c01f114da3d5d92057128
+EBUILD glslang-10.11.0.0_pre20200924.ebuild 891 BLAKE2B 8e165d654410d5a8c2be32c5bf59d3dd7c083e58731651760abf380e7e92bcb8f13b4cdd41bc0603193c673e9ee87911c38ca11b317fdbb493a895aff9205d5e SHA512 1934b386247d8389e6b346e937aef0e94c3fdc87de9bacda0fda7abe188248ef31a3255e74a7c20e4a76c81e72775596c84e8f100ccd3b5e31744e65abc0dfcc
+EBUILD glslang-10.11.0.0_pre20201216.ebuild 898 BLAKE2B 4ce47780386eac2f393b79e9ddcbdd94ed455669bedb85a63b855deed9ca719ffb01063ae11699eda61b445a383b1579f2cbf065558b997c0ea37c5aa90658b6 SHA512 a86ce43f8afa66bf9d1df56cc8ba1e679338d2f85c9e87e60ffc2dcf50731cb993c291c39b5b5df18dcec6336dc7db54a7c042d1b23c13ab22fadab280d9fc09
+EBUILD glslang-9999.ebuild 760 BLAKE2B c5653ce28262fc6dd00c8fa38fb7188c7892e40ab339eaa19d90c7d2c8b90050ea4d8002eaf81f4049ab7aae853d6adae178fc441c3637f2b6c7f16922023ce7 SHA512 127fd825c4cd0e8b690e3163b0e12c35d39744cf52b01ad717b38028c932932aa2d9b6bc6e260b5478f964e6e4ce7eb88e9c83685772d4666611e7164b6c451a
 MISC metadata.xml 330 BLAKE2B fd98c615a1b5c3364e122b66d18e9667ff1bae51218e2474862a0376f352421cfbe7aa3b4f9751ff8e8f24510f4a6e3f0e1977ca759b566b54f48fa45243980c SHA512 9658890a6aa3ae0c91e71416c3996d9c8064bb970521b5c444d617fc4a51ef2edb62aa7d44b25ef96768417de0c5478999e74405c6d9ff847816311990c945ee
diff --git a/dev-util/glslang/files/glslang-7.12.3353_pre20191027-fix-relative-includes.patch b/dev-util/glslang/files/glslang-7.12.3353_pre20191027-fix-relative-includes.patch
deleted file mode 100644
index 4c44cfbbbedd..000000000000
--- a/dev-util/glslang/files/glslang-7.12.3353_pre20191027-fix-relative-includes.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/SPIRV/GlslangToSpv.h b/SPIRV/GlslangToSpv.h
-index 86e1c23b..3907be43 100755
---- a/SPIRV/GlslangToSpv.h
-+++ b/SPIRV/GlslangToSpv.h
-@@ -40,7 +40,7 @@
- #endif
- 
- #include "SpvTools.h"
--#include "../glslang/Include/intermediate.h"
-+#include "glslang/Include/intermediate.h"
- 
- #include <string>
- #include <vector>
-diff --git a/SPIRV/SpvTools.h b/SPIRV/SpvTools.h
-index 7422d012..59c914da 100644
---- a/SPIRV/SpvTools.h
-+++ b/SPIRV/SpvTools.h
-@@ -46,7 +46,7 @@
- #include <ostream>
- #endif
- 
--#include "../glslang/MachineIndependent/localintermediate.h"
-+#include "glslang/MachineIndependent/localintermediate.h"
- #include "Logger.h"
- 
- namespace glslang {
diff --git a/dev-util/glslang/files/glslang-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-files.patch b/dev-util/glslang/files/glslang-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-files.patch
deleted file mode 100644
index 8838a97809d4..000000000000
--- a/dev-util/glslang/files/glslang-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-files.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-diff --git a/OGLCompilersDLL/CMakeLists.txt b/OGLCompilersDLL/CMakeLists.txt
-index af4ab587..e0096743 100644
---- a/OGLCompilersDLL/CMakeLists.txt
-+++ b/OGLCompilersDLL/CMakeLists.txt
-@@ -11,5 +11,5 @@ endif(WIN32)
- if(ENABLE_GLSLANG_INSTALL)
-     install(TARGETS OGLCompiler EXPORT OGLCompilerTargets
-             ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
--	install(EXPORT OGLCompilerTargets DESTINATION lib/cmake)
-+	install(EXPORT OGLCompilerTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
- endif(ENABLE_GLSLANG_INSTALL)
-diff --git a/SPIRV/CMakeLists.txt b/SPIRV/CMakeLists.txt
-index e25ec0a1..364f04cc 100644
---- a/SPIRV/CMakeLists.txt
-+++ b/SPIRV/CMakeLists.txt
-@@ -91,8 +91,8 @@ if(ENABLE_GLSLANG_INSTALL)
-                 ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
-     endif()
- 	
--	install(EXPORT SPVRemapperTargets DESTINATION lib/cmake)
--	install(EXPORT SPIRVTargets DESTINATION lib/cmake)
-+	install(EXPORT SPVRemapperTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
-+	install(EXPORT SPIRVTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
- 
-     install(FILES ${HEADERS} ${SPVREMAP_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/glslang/SPIRV/)
- endif(ENABLE_GLSLANG_INSTALL)
-diff --git a/StandAlone/CMakeLists.txt b/StandAlone/CMakeLists.txt
-index 0878965c..d9d71d1a 100644
---- a/StandAlone/CMakeLists.txt
-+++ b/StandAlone/CMakeLists.txt
-@@ -49,12 +49,12 @@ if(ENABLE_GLSLANG_INSTALL)
-     install(TARGETS spirv-remap EXPORT spirv-remapTargets
-             RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
- 	
--	install(EXPORT glslangValidatorTargets DESTINATION lib/cmake)
--	install(EXPORT spirv-remapTargets DESTINATION lib/cmake)
-+	install(EXPORT glslangValidatorTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
-+	install(EXPORT spirv-remapTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
-             
-     if(BUILD_SHARED_LIBS)
-         install(TARGETS glslang-default-resource-limits EXPORT glslang-default-resource-limitsTargets
-                 LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
--		install(EXPORT glslang-default-resource-limitsTargets DESTINATION lib/cmake)
-+		install(EXPORT glslang-default-resource-limitsTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
-     endif()
- endif(ENABLE_GLSLANG_INSTALL)
-diff --git a/glslang/CMakeLists.txt b/glslang/CMakeLists.txt
-index 42df1d1e..446cabb9 100644
---- a/glslang/CMakeLists.txt
-+++ b/glslang/CMakeLists.txt
-@@ -112,7 +112,7 @@ if(ENABLE_GLSLANG_INSTALL)
-         install(TARGETS glslang EXPORT glslangTargets
-                 ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
-     endif()
--	install(EXPORT glslangTargets DESTINATION lib/cmake)
-+	install(EXPORT glslangTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
- endif(ENABLE_GLSLANG_INSTALL)
- 
- if(ENABLE_GLSLANG_INSTALL)
-diff --git a/glslang/OSDependent/Unix/CMakeLists.txt b/glslang/OSDependent/Unix/CMakeLists.txt
-index 91fb45a7..9994314f 100644
---- a/glslang/OSDependent/Unix/CMakeLists.txt
-+++ b/glslang/OSDependent/Unix/CMakeLists.txt
-@@ -22,5 +22,5 @@ endif()
- if(ENABLE_GLSLANG_INSTALL)
-     install(TARGETS OSDependent EXPORT OSDependentTargets
-             ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
--	install(EXPORT OSDependentTargets DESTINATION lib/cmake)
-+	install(EXPORT OSDependentTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
- endif(ENABLE_GLSLANG_INSTALL)
-diff --git a/glslang/OSDependent/Windows/CMakeLists.txt b/glslang/OSDependent/Windows/CMakeLists.txt
-index f6bd4e9d..c050ef61 100644
---- a/glslang/OSDependent/Windows/CMakeLists.txt
-+++ b/glslang/OSDependent/Windows/CMakeLists.txt
-@@ -17,5 +17,5 @@ endif(WIN32)
- if(ENABLE_GLSLANG_INSTALL)
-     install(TARGETS OSDependent EXPORT OSDependentTargets
-             ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
--	install(EXPORT OSDependentTargets DESTINATION lib/cmake)
-+	install(EXPORT OSDependentTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
- endif(ENABLE_GLSLANG_INSTALL)
-diff --git a/gtests/CMakeLists.txt b/gtests/CMakeLists.txt
-index 77d217f1..aadf9a54 100644
---- a/gtests/CMakeLists.txt
-+++ b/gtests/CMakeLists.txt
-@@ -33,7 +33,7 @@ if(BUILD_TESTING)
-         if(ENABLE_GLSLANG_INSTALL)
-             install(TARGETS glslangtests EXPORT glslangtestsTargets
-                     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
--			install(EXPORT glslangtestsTargets DESTINATION lib/cmake)
-+			install(EXPORT glslangtestsTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
-         endif(ENABLE_GLSLANG_INSTALL)
- 
-         set(GLSLANG_TEST_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../Test")
-diff --git a/hlsl/CMakeLists.txt b/hlsl/CMakeLists.txt
-index 44f9d6a2..ae0d4d4e 100644
---- a/hlsl/CMakeLists.txt
-+++ b/hlsl/CMakeLists.txt
-@@ -41,5 +41,5 @@ if(ENABLE_GLSLANG_INSTALL)
-         install(TARGETS HLSL EXPORT HLSLTargets
-                 ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
-     endif()
--	install(EXPORT HLSLTargets DESTINATION lib/cmake)
-+	install(EXPORT HLSLTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
- endif(ENABLE_GLSLANG_INSTALL)
diff --git a/dev-util/glslang/glslang-10.11.0.0_pre20200924.ebuild b/dev-util/glslang/glslang-10.11.0.0_pre20200924.ebuild
index 9cdeed43912d..f1e8c702dbee 100644
--- a/dev-util/glslang/glslang-10.11.0.0_pre20200924.ebuild
+++ b/dev-util/glslang/glslang-10.11.0.0_pre20200924.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	SNAPSHOT_COMMIT="bacaef3237c515e40d1a24722be48c0a0b30f75f"
 	SRC_URI="https://github.com/KhronosGroup/${PN}/archive/${SNAPSHOT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 arm arm64 ~ppc ppc64 ~riscv x86"
+	KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
 	S="${WORKDIR}/${PN}-${SNAPSHOT_COMMIT}"
 fi
 
diff --git a/dev-util/glslang/glslang-8.13.3560_pre20200404.ebuild b/dev-util/glslang/glslang-10.11.0.0_pre20201216.ebuild
index b39594040ce6..7e40994e48ac 100644
--- a/dev-util/glslang/glslang-8.13.3560_pre20200404.ebuild
+++ b/dev-util/glslang/glslang-10.11.0.0_pre20201216.ebuild
@@ -4,16 +4,16 @@
 EAPI=7
 
 CMAKE_ECLASS="cmake"
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 inherit cmake-multilib python-any-r1
 
 if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/KhronosGroup/${PN}.git"
 	inherit git-r3
 else
-	SNAPSHOT_COMMIT="b5757b95005bbf6b0287096c5b708c5e25645311"
+	SNAPSHOT_COMMIT="c594de23cdd790d64ad5f9c8b059baae0ee2941d"
 	SRC_URI="https://github.com/KhronosGroup/${PN}/archive/${SNAPSHOT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~ppc64 x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 	S="${WORKDIR}/${PN}-${SNAPSHOT_COMMIT}"
 fi
 
diff --git a/dev-util/glslang/glslang-7.12.3353_pre20191027-r2.ebuild b/dev-util/glslang/glslang-7.12.3353_pre20191027-r2.ebuild
deleted file mode 100644
index 99b6659f2a23..000000000000
--- a/dev-util/glslang/glslang-7.12.3353_pre20191027-r2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=(python{3_6,3_7})
-
-inherit cmake-multilib cmake-utils python-any-r1
-
-SNAPSHOT_COMMIT="b131630e7c749a5dc19faa458024260c71fb170f"
-SRC_URI="https://github.com/KhronosGroup/${PN}/archive/${SNAPSHOT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="amd64 ~ppc64 x86"
-S="${WORKDIR}/glslang-${SNAPSHOT_COMMIT}"
-
-DESCRIPTION="Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator"
-HOMEPAGE="https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/"
-
-LICENSE="BSD"
-SLOT="0"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-relative-includes.patch"
-	"${FILESDIR}/${PN}-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-files.patch"
-	)
-
-RDEPEND="!<media-libs/shaderc-2019-r1"
-BDEPEND="${PYTHON_DEPS}"
-
-# Bug 698850
-RESTRICT="test"
diff --git a/dev-util/glslang/glslang-8.13.3559.ebuild b/dev-util/glslang/glslang-8.13.3559.ebuild
deleted file mode 100644
index 7ce2721cbd0d..000000000000
--- a/dev-util/glslang/glslang-8.13.3559.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS="cmake"
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit cmake-multilib python-any-r1
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/KhronosGroup/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64 ~x86"
-fi
-
-DESCRIPTION="Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator"
-HOMEPAGE="https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/ https://github.com/KhronosGroup/glslang"
-
-LICENSE="BSD"
-SLOT="0"
-
-RDEPEND="!<media-libs/shaderc-2019-r1"
-BDEPEND="${PYTHON_DEPS}"
-
-# Bug 698850
-RESTRICT="test"
diff --git a/dev-util/glslang/glslang-8.13.3743-r1.ebuild b/dev-util/glslang/glslang-8.13.3743-r1.ebuild
deleted file mode 100644
index 09634fb83a93..000000000000
--- a/dev-util/glslang/glslang-8.13.3743-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS="cmake"
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit cmake-multilib python-any-r1
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/${PN}.git"
-	inherit git-r3
-else
-	SNAPSHOT_COMMIT="${PV}"
-	SRC_URI="https://github.com/KhronosGroup/${PN}/archive/${SNAPSHOT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86"
-	S="${WORKDIR}/${PN}-${SNAPSHOT_COMMIT}"
-fi
-
-DESCRIPTION="Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator"
-HOMEPAGE="https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/ https://github.com/KhronosGroup/glslang"
-
-LICENSE="BSD"
-SLOT="0"
-
-RDEPEND="!<media-libs/shaderc-2020.1"
-BDEPEND="${PYTHON_DEPS}"
-
-# Bug 698850
-RESTRICT="test"
diff --git a/dev-util/glslang/glslang-9999.ebuild b/dev-util/glslang/glslang-9999.ebuild
index 169c585773e9..96d98ee5f12d 100644
--- a/dev-util/glslang/glslang-9999.ebuild
+++ b/dev-util/glslang/glslang-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 CMAKE_ECLASS="cmake"
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 inherit cmake-multilib python-any-r1
 
 if [[ ${PV} == *9999* ]]; then
diff --git a/dev-util/howdoi/Manifest b/dev-util/howdoi/Manifest
index 5e7ae0e11129..a42b4f730f25 100644
--- a/dev-util/howdoi/Manifest
+++ b/dev-util/howdoi/Manifest
@@ -1,9 +1,5 @@
-DIST howdoi-1.2.1.tar.gz 13112 BLAKE2B 33492547fab53085aebff295202e8ad88d41850503155b944f38382137d6ec8fbcd4f6050583b16c01c3701683ccf18c6929c525b5d8f34bf6f2ed9410668f36 SHA512 83af30118087105392ddb95b05d9e7442f5ee5df981faa9143770dedb8927c164a4f30f37ccd219a826340f0f8cd81fc5eb9a3b12e5d3956786294699b6e2f9b
-DIST howdoi-2.0.5.tar.gz 23910 BLAKE2B aace040311845cd8c958d5186ea804a9b0d746694563e2acebd2dbc5630ccbeff66c8a1848245b0f4c127ca611218a0b56e4051d6991e8cd796017a8b5022c46 SHA512 5ad8a99758774c28b26afe5a5ee0f1d2fd6f8ea1afcae5f29b3a02ab3c25758b8cd8aaeccd3afd10a3d02495c6616966cad5da03327c94979e89fc3c601bd367
-DIST howdoi-2.0.6.tar.gz 25113 BLAKE2B 0b83b28d1d0a75a20e49fea0bdd0b3eebae10fee17b2ca195289b8ed014befa7bf17a3c8221dd90d0a2de166f9fab9be24619aa24c886120f2f1d2ee4afe0d84 SHA512 3153ec28f5c3c1c78b786a50da3a328586dc05f5a6fe0bcb33621baf13ae8cda55e15c3538c772dba309cd5a24f631c36c09924ff535cfc8494743b631e01fb5
 DIST howdoi-2.0.7.tar.gz 25167 BLAKE2B 5923aaae6d6aaee4da7e02cd283d6e794c31d600d2834d1354e0d90194ac573d80140517ba7289bbf97b01923b6ed8c9c2ab6abe0beea0534fc41ecf24196c24 SHA512 9f8278e6ea688c40fee5227aa23375cb7dc7339d579953c73dbf7111087550ece412e26508e129f377e2326ce4635c38d96ad99f98c8c6f1131a01bbaf062275
-EBUILD howdoi-1.2.1.ebuild 613 BLAKE2B eb1915c84777fe6f247c2abef28ae2130648c377ed539bb80b984f19b7eba421fe9cd3e097c2fc390810d0a6cebf7f68286a6f104ed6c354d963e49595f14808 SHA512 cf39a6512968c9bf70684e59421471ce8cc7b5958a94588b4a2462761a216eb4133b9087ff9d48bd2cbd4983e55834996022d76115dded1a5c8377581add7dbe
-EBUILD howdoi-2.0.5.ebuild 655 BLAKE2B 9db2a97feddd4f5460a4bdd4a62861f1aef99caf76602d34de731b586f44e62080e3eeae7b77f57b715e01c5dd2f8a027733cedb48a08dc8f33108bc10af3949 SHA512 56a487f4271914cf55c3267ab705e2ea620b6e10ff550bb87f7f4800eabdc64560ff1f26323b72cf06b2db430c0b897de07d2b047c6ca237d4c09a1323765478
-EBUILD howdoi-2.0.6.ebuild 655 BLAKE2B 9db2a97feddd4f5460a4bdd4a62861f1aef99caf76602d34de731b586f44e62080e3eeae7b77f57b715e01c5dd2f8a027733cedb48a08dc8f33108bc10af3949 SHA512 56a487f4271914cf55c3267ab705e2ea620b6e10ff550bb87f7f4800eabdc64560ff1f26323b72cf06b2db430c0b897de07d2b047c6ca237d4c09a1323765478
-EBUILD howdoi-2.0.7.ebuild 694 BLAKE2B c0667a8e0ad928f61abaada0476c107bf5aecc05487fea466718a4c6c6fabc5480fc65224a0a875c0c6ec75404b34df801fdbd1915b63db52e8cbeb663254732 SHA512 73d0270e9d1d3de2362bfae171563488300fb5ae82d01c50e15ef2d584a1588830ca79c66bfad7cc67a86ef2626b8d0747de82c333d5522ca80ad041b0c046a2
-MISC metadata.xml 343 BLAKE2B 34cc8c4f7372fc0492d8b328ccae1b94946bc5593d20a181d6e32d3fc8e79471f517eea7509cf32172ef55092d898ed65350167d465b22bf127f62fbab6dc1c5 SHA512 f83f432490f25508a138dfbce3a67a120937fa12fee712cbdda9302d238805f3bd18034cc52d473d28b990221bb73748c9305f31cdc9912aed91a79f86386efa
+DIST howdoi-2.0.8.tar.gz 25366 BLAKE2B f444b600f80c60cea658781b2b1e12dbb241b6707f51f419e55099334cd45c8bfda402ada052473b2ef35ffbc77c88d33000b210fada5eb4f09b529589fe8d60 SHA512 c2a62f5e6669fcca41a706cdeec8827e39816d31d37464d061b881ed3731995163cab56322d73362863acf5064d35dc82c383db1fad78434152bd36678ec0794
+EBUILD howdoi-2.0.7.ebuild 693 BLAKE2B f3349a11696b95e0cfdee1a19b9589d487bbd762c2bdf034d0c41865413908b52bf0db1357ba8fe612db3ea5e14a6c63e14b090f763eab8a2ae52b07d2fed09b SHA512 99fef66aa24ea1ddc962d9637a79691b215bc86633ef16359bc2bed9b1b39f4298bf8974fa643e88fb9d42220a4fa4ee6214e0ba1e98ef55e8043b6e527db01c
+EBUILD howdoi-2.0.8.ebuild 695 BLAKE2B 2ae9852f20f40a24cae7afcd591022d1c824ec2d34bb1939ad3321ea92e6507071245fba5064fe229128eebb31d6a99c4067d7fe53bf1b3558f304332fc71c52 SHA512 526ac025b6ef755e21b26db1d3fc0fcdd672ade3b24c642a151a95c4546dba4e391728352ad6056ccacfad7e3211255eb8a2b3075a7cd9483700622a983db134
+MISC metadata.xml 367 BLAKE2B cad999effcfe4ba7eb7fcce4efa22b7cc1bc501c01f28c647c8d94fd560645b96d25bc89703bd43c8f5a969606f9842e14f955bc7ace46fcff0333469843e62b SHA512 eacaf9118ec14ec50c3f22d0abf5deafb42ebbcb3bfbdb87f01c6908983b36c6c837b13f903c0cdd7be3137d9c999f66d7983157a7ec33685d08d608096f0e27
diff --git a/dev-util/howdoi/howdoi-1.2.1.ebuild b/dev-util/howdoi/howdoi-1.2.1.ebuild
deleted file mode 100644
index 4c5234bb257a..000000000000
--- a/dev-util/howdoi/howdoi-1.2.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-inherit distutils-r1
-
-DESCRIPTION="A code search tool"
-HOMEPAGE="https://pypi.org/project/howdoi/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="
-	dev-python/appdirs[${PYTHON_USEDEP}]
-	dev-python/cachelib[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	>=dev-python/pyquery-1.4.0[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-"
diff --git a/dev-util/howdoi/howdoi-2.0.6.ebuild b/dev-util/howdoi/howdoi-2.0.6.ebuild
deleted file mode 100644
index c7dca4f4594c..000000000000
--- a/dev-util/howdoi/howdoi-2.0.6.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_7 )
-inherit distutils-r1
-
-DESCRIPTION="A code search tool"
-HOMEPAGE="https://pypi.org/project/howdoi/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="
-	dev-python/appdirs[${PYTHON_USEDEP}]
-	dev-python/cachelib[${PYTHON_USEDEP}]
-	dev-python/keep[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	>=dev-python/pyquery-1.4.1[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.24.0[${PYTHON_USEDEP}]
-"
diff --git a/dev-util/howdoi/howdoi-2.0.7.ebuild b/dev-util/howdoi/howdoi-2.0.7.ebuild
index ef6d331c9143..7f0d6beafd7b 100644
--- a/dev-util/howdoi/howdoi-2.0.7.ebuild
+++ b/dev-util/howdoi/howdoi-2.0.7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-util/howdoi/howdoi-2.0.5.ebuild b/dev-util/howdoi/howdoi-2.0.8.ebuild
index c7dca4f4594c..a9a2eb1a0456 100644
--- a/dev-util/howdoi/howdoi-2.0.5.ebuild
+++ b/dev-util/howdoi/howdoi-2.0.8.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_7 )
+DISTUTILS_USE_SETUPTOOLS="manual"
+PYTHON_COMPAT=( python{3_7,3_8} )
 inherit distutils-r1
 
 DESCRIPTION="A code search tool"
diff --git a/dev-util/howdoi/metadata.xml b/dev-util/howdoi/metadata.xml
index f0b5605e5be0..574b0f2a708f 100644
--- a/dev-util/howdoi/metadata.xml
+++ b/dev-util/howdoi/metadata.xml
@@ -4,6 +4,7 @@
 	<maintainer type="person">
 		<email>kensington@gentoo.org</email>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">gleitz/howdoi</remote-id>
 		<remote-id type="pypi">howdoi</remote-id>
diff --git a/dev-util/itstool/Manifest b/dev-util/itstool/Manifest
index d7591ae54c14..8c66892ce8ce 100644
--- a/dev-util/itstool/Manifest
+++ b/dev-util/itstool/Manifest
@@ -1,3 +1,3 @@
 DIST itstool-2.0.6.tar.bz2 103067 BLAKE2B 72d3254cb88ef9d02f9b3509a46c2208e98bf6327f139e5d29b99cc6d80651bd41ea3bfb78e48e23cf7c217770cd8c6c74b00946ad9d2608a92925e43457edf0 SHA512 51058bdcb208f6fb84810f71f9bf67e42b00bf157a9756be45f060849c0aff36f695f4403404193720d4446818fa77de61fa94eed9e8789d26c07a2926072eb7
-EBUILD itstool-2.0.6-r1.ebuild 1001 BLAKE2B baf37159a34d90789b25377900e268be21c712880f365d963230feada3e823ac2675b47f41afacf68e3fbf1550b7347e7466b7d78eb7888e1a8762d6a98aa2ea SHA512 5e952b78b167af3b2cc630ed7974cc80a1db47b923be3a84b8371da6408085d2919b1eb785e98a83e002e06937d685343bae43133125d547d12c426d60e4688d
+EBUILD itstool-2.0.6-r1.ebuild 1003 BLAKE2B e2f07b569c4dcc574ab8fd4e89f5375e855c4016b0084d24a4155c05cae9f7a520cf089bf8b29a9c0e59a306c55109b47bdab2de7e1c7a5bbb5ad42483f7d3d7 SHA512 70765082cf5f3b3f5273bc23b0d2327f893ff23776839e05555b1e9ac506f629eda8c188d279718a754d4585db8ead6888d723d3f32055a8a15a7ff70cdd5237
 MISC metadata.xml 525 BLAKE2B a7e426bd9dd273bed10ad74315547eb758df04ceb7ee6ef66f643ba23e60ad8b9c80aa344688e4af7a16fd699a500cf7ceb9d24eb94a930eebf1637e09919a5f SHA512 ad9928fa0359257e3418c0fb6bba6c416fc4505911f35e97377ef7c1426e228b34312fc3156e98f3657974f1156ee2bdc58bbb4b51903bb40b10c97b0714b39b
diff --git a/dev-util/itstool/itstool-2.0.6-r1.ebuild b/dev-util/itstool/itstool-2.0.6-r1.ebuild
index a1a296a1d356..a8ed9c271124 100644
--- a/dev-util/itstool/itstool-2.0.6-r1.ebuild
+++ b/dev-util/itstool/itstool-2.0.6-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 PYTHON_REQ_USE="xml"
 
 inherit python-single-r1
diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest
index e2bafcb53a7c..16d40010e83f 100644
--- a/dev-util/perf/Manifest
+++ b/dev-util/perf/Manifest
@@ -11,5 +11,5 @@ DIST patch-5.9.9.xz 502816 BLAKE2B 104fa2ecaac3c543662b891de22cb881a917320317d58
 EBUILD perf-5.4.20.ebuild 6651 BLAKE2B e1a091114d71ba1c01f838b8d5ff372e2adad012769b973a2e79d662f6c5f6ed6fd97b2f7be880bfc57fbb99c549c487a084bf2450a935dc34ef22725268047a SHA512 e14917b4e051d3734fa515f3dbf61a2fe2cfdbe5b3aed29b9ce3b05e70609a13276d5f8fd0522f0b4addca16abdd986fb70b16d2b51f1204d02df848b64e6138
 EBUILD perf-5.7-r1.ebuild 6481 BLAKE2B 049d8502779dcc2b3f80cff18ab9795855495ce13342ab0394f29c22d552f45652c7faf0b19e24953180d5851167c875b397540375e3db0f66141863851387ab SHA512 66b7922dd0b77f2ee974695bbc6c2330c06b523b1cbc0d0dac0bf16f32489cb4266152267b70ee6130ad252075fac7f3858e5dc222e06d6ab2a8f2a10344f52e
 EBUILD perf-5.8.ebuild 6647 BLAKE2B 961f9690951c762298aa6d87371ce27079bf5387e3f470d6ffa90e8233fa9e1823aeb975658079ce165893420d4a980082414dc28befce63fb522a2250fe3c3e SHA512 39ebe613bafbeb9a2d7544e60e68b15645d51b8514b05e96f4fae8e2f4da0e7bb66059dcefb55e75c2e07c0bda2539468d70dc09d2e08b28fc1bc53c79337258
-EBUILD perf-5.9.9.ebuild 6860 BLAKE2B 1803c9d7d4f1387a1c1d68d16618d2575631566d60a77420aa44809d910a5f1f1982c3a3bfad1e31f3aafa9dfacf4b81536b5837cb542f920007a2b715ff172c SHA512 26d047b194db438875a348317c90fe71550f9523b3c81a26de48b91e0157b89e83ce8a239c63dad622e67f58c7337398c476d88d8aec402f8a5bff07b450a8e9
+EBUILD perf-5.9.9.ebuild 6865 BLAKE2B b668d3c975dbce2c588560d8c0e59555d259cdf0513c86ed7830c95cf9954d8310f0c24bd15e6a0fd14fba404b1fc30006b1e6b49c10bc215dbb2008dc7fd001 SHA512 09b92c9e707ee58bc0facf6813b74953c27cf24b7d8bbf105ce123fd1c2c6c9422fb8a0053ffe6bdf2b6172bd85a4d979ab399978cd7788eca8d506f830eda8b
 MISC metadata.xml 1506 BLAKE2B 3f82b3824ed6e126239ccedc332b79b450a695df6149b094b05674e6bf99c1300919fd7046bc47b62a39f879cfaa72d1f496f46c2f6b76aded8ef154b3ae5a2d SHA512 ba7560b91456c4930c44427865859512166e747002fb4e5331530a2fd2b40f0828870ec59f21abb2836b6c51c70ddf77a820d475f7f8f97a03737c7178b5d8d6
diff --git a/dev-util/perf/perf-5.9.9.ebuild b/dev-util/perf/perf-5.9.9.ebuild
index 4ab143e4afea..0b729ff3cc0c 100644
--- a/dev-util/perf/perf-5.9.9.ebuild
+++ b/dev-util/perf/perf-5.9.9.ebuild
@@ -31,7 +31,7 @@ SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="audit clang crypt debug +demangle +doc gtk java libpfm lzma numa perl python slang systemtap unwind zlib"
 # TODO babeltrace
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-util/spirv-headers/Manifest b/dev-util/spirv-headers/Manifest
index 2d541f552f9d..c333efdb2f53 100644
--- a/dev-util/spirv-headers/Manifest
+++ b/dev-util/spirv-headers/Manifest
@@ -1,6 +1,6 @@
-DIST spirv-headers-1.5.3.tar.gz 387520 BLAKE2B 80f210792294232b9f1ebd12e96a8070b27ca29fcfcf8f61c19b0ddef493511bd1f5f85d44f6112de6154108237147feb564334cd47fb37b6f3e7dfb50620a7e SHA512 fab90cd073aed34320d2a03c441746101e757a4bd44f0b259aaa34e1fafd450b9576d8d539d85a8066cdf0eda3e78c807ccf65cd86ab9d8660195a96e9a50795
+DIST spirv-headers-1.5.4.1.tar.gz 395834 BLAKE2B e4852f1d694271e9928f1f9aa460c6ba33ad2d0568bd38b24ba31e8dd0390a5542192f9c6977cd3ff4a56520af83280b779fd4e7cece6adc33a5261ef2d2398d SHA512 3578a0210b954e904ac154307a0b98a2c01410adf910e549669109b1b559781959bb5771e39945c50523548a6613d064576fcba15aa3c9125255c0443d3e61a6
 DIST spirv-headers-1.5.4.tar.gz 394957 BLAKE2B c94d0ab2e98242aeb78c6948ac915467ba2cc9568483b8e3d00d5c5e1f422a23e9645161ea6b958cb3a8f7b2d51cf8e8040b7479712dd32382c5c5cbba30e4f3 SHA512 050ae8ded345bbef3d94e91f22dd72860fdeed3072f943bafaa37f86f2d522e59d7c4ff2e6aa5bddb3c3df55f124200394a91e6d99eb95933463e7b8ce360aad
-EBUILD spirv-headers-1.5.3.ebuild 514 BLAKE2B e5d846bf7b3aaf4b39a254e17b55926ca91c016bea43f57f52a8c30ab5152013f5f4b96a9d25981b32e0c58091626704ee4bc79088d9447f72ad9af0897d3ee8 SHA512 8edf411df280b4c0d143263d7eca5f3a1866972c4df4f8b62c899f7e2c1d3975a3d6bc80ab570d36f7dcbe1131529c2fadf658349167a15494affde48a7e5679
-EBUILD spirv-headers-1.5.4.ebuild 487 BLAKE2B b201adb9dc981e5f7523b926e843941cd53ffbe0466f858c1933307cf2bce2e34371ef59cdb2a92db17b3211261e6ddf12b9112751f3993c3ef26a226803105a SHA512 5b75746f154205fc72676597f6650bc3e4c54bcecfa55240e4f3a8a1cad110fd3cd7e8cfeca0058d738a982c68502e95bb49313cac18b2dba7f53d15fedd1640
+EBUILD spirv-headers-1.5.4.1.ebuild 526 BLAKE2B 4843ac3173d4b943d7bac8b0a0f090f63ba3554463642a2a09eb49091c1b8101de70d7ce385e430b7cac7788b66b03a8c5145590cdadc52bab63a6b354a34163 SHA512 a99b7e8b4ea4a57d36c23bfbcc21c2375757b9521f1a69a78162332cade62198527234ada1aa8d42def89e0af0d5078d2e1f4785a40603e57ec5759c58e0a835
+EBUILD spirv-headers-1.5.4.ebuild 486 BLAKE2B 70210f64f9151c4676d41bae9eef920ce25fa4da56531c2978d67841757a76c4f250932ccf2c90b810e6df0343a9329bcc9e677d3cf94e8bdf839d5ff07c07a8 SHA512 d5c18b4b5938377b4795364b1013e28c5c2793fa35cc8307456495d25dbc08d65987bbf2e49d1abdf298a0762c1e45f5a4918cbcd094d9951f6d6396683f94f0
 EBUILD spirv-headers-9999.ebuild 600 BLAKE2B e52054009b4c2a119218fe8e7d1d7606a5355fa93c8a9e14d7e6174dc212d2c87a7d2c57106bd4d217c8fd0ab88234e5a186f700664ccbd04de8b3520afef10e SHA512 420d7be91c892302e0b052c9bf1a628d663f95051a6d38580944aafd1c43c395cb87cec8df6d2d756b8fb4a177b23671911f58c05e9e5b035a41b0b9bb399dfe
 MISC metadata.xml 431 BLAKE2B 2a03bfd5ff92d23da598ab731032790658e828cfc16c1bb1bcaed0e8e8aeba5d76ca97d5b52f5433bae5391e5f50d2d1028c49689114da7d4fc9703e40f964d6 SHA512 a770e25b42892a5062dc35739c6776d1e8baa22ee4ac9c745b0283fdb3322ae4f6549693045f9125b6a604f4f103c34e52bc069c11f47394373400c522a877c5
diff --git a/dev-util/spirv-headers/spirv-headers-1.5.3.ebuild b/dev-util/spirv-headers/spirv-headers-1.5.4.1.ebuild
index 4f2bba2c5394..90856517cc36 100644
--- a/dev-util/spirv-headers/spirv-headers-1.5.3.ebuild
+++ b/dev-util/spirv-headers/spirv-headers-1.5.4.1.ebuild
@@ -7,11 +7,11 @@ inherit cmake-utils
 
 DESCRIPTION="Machine-readable files for the SPIR-V Registry"
 HOMEPAGE="https://www.khronos.org/registry/spir-v/"
-EGIT_COMMIT="c0df742ec0b8178ad58c68cff3437ad4b6a06e26"
+EGIT_COMMIT="f027d53ded7e230e008d37c8b47ede7cd308e19d"
 SRC_URI="https://github.com/KhronosGroup/SPIRV-Headers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 
 S="${WORKDIR}/SPIRV-Headers-${EGIT_COMMIT}"
diff --git a/dev-util/spirv-headers/spirv-headers-1.5.4.ebuild b/dev-util/spirv-headers/spirv-headers-1.5.4.ebuild
index d9ba70c80794..d6312ae27fb4 100644
--- a/dev-util/spirv-headers/spirv-headers-1.5.4.ebuild
+++ b/dev-util/spirv-headers/spirv-headers-1.5.4.ebuild
@@ -12,6 +12,6 @@ SRC_URI="https://github.com/KhronosGroup/SPIRV-Headers/archive/${EGIT_COMMIT}.ta
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ~ppc ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
 
 S="${WORKDIR}/SPIRV-Headers-${EGIT_COMMIT}"
diff --git a/dev-util/spirv-tools/Manifest b/dev-util/spirv-tools/Manifest
index 118229546b8f..2bc672d50ea5 100644
--- a/dev-util/spirv-tools/Manifest
+++ b/dev-util/spirv-tools/Manifest
@@ -1,6 +1,6 @@
-DIST spirv-tools-2020.3.tar.gz 2170858 BLAKE2B c9fdc6bbf6edbb6e3e5aba1fff9bd179b7b435ecb4ebbe29db38ce0c71166269484f8c3798a69a0fe5d936392b07fc6ccd5f058945aa70330612a6ef8fafe12f SHA512 8abb4fe227dbe9d0fc4279523eb714ce3a590a3c56e3dcd226317bc7835e2dceaef3a46c0873c2f144c61b28f41c0fcdf2985cc4f708fa496186c16738cc493f
 DIST spirv-tools-2020.5_pre20201107.tar.gz 2583541 BLAKE2B f234e34142af47a98268d85fa12861b9c66c78d74af7e44d4aa9150ad5cfce8e65780d89344ec947b4866de9811a8198e174480c23c30f690193feca7cc136a6 SHA512 a65174e5f1b7cad3be80e0df0d46e8fbfbb62f397fe98eb1b2c37bb85cf8f92d7b4c9103b5e9e8181240bcf97e5a7e3f09323f78159d4b25f7f02176e982f542
-EBUILD spirv-tools-2020.3.ebuild 1088 BLAKE2B 9576a7b33287e9139790225411a344c0a2eb17459140d6c165791195bc6e265be3038e269c7de85ca54405e4030f80d3d3e863ff832ca59772bbf0a9027774f9 SHA512 947a778123f62fd3901d017dfaf9743c50cb75d2014c2e85289b9709958d21462371bdfc926c3e6b5cbc5e2e6a4a86481552b45f062810c04007b09fac529b64
-EBUILD spirv-tools-2020.5_pre20201107.ebuild 1231 BLAKE2B 42263f9563cfdf7d4efbbc932b377f6ad0e92b01b1ff457690dbcbe72aaa19c22a862dad5a4161ca2bbb4d9a7f4347599522f859a4d07504bc4ec24fb53ae656 SHA512 999f277a3e3acfdf1644c2bf1ad0a8c41a60c7322eaf588183bb251ee19ce16a3b83217bd5f2ce18dcc8a21147c1ee3056ce6c89614c7fcff174b93c4153fef1
-EBUILD spirv-tools-9999.ebuild 1228 BLAKE2B 93c5fb104f3264f14e1ac18a0d7954dfb166e2add2ba2d79b6bab09e89e7e7605e9baa53824f919c8e825f354f719b226bfa647d814b5be45d9861dcfaeccb99 SHA512 54e65f2212524e7a11d5d73bf0368151048a4efcfdcf9636cb42a7da890a97f5e4aad6b9b53a035ec94e78608bc6d488627d50f46905a8986108e4e255f3d85d
+DIST spirv-tools-2020.6.tar.gz 2595300 BLAKE2B bd500824866fcd0f0e05ccf3f43a168e33bc4783396d24fa6ddc58d4e46110b001cc32acde1cadcd793a997d547476f58c07475f43c3cbec5314b039926896b2 SHA512 b6d3667581101536e1f4d405e9c1c64e64a0aba174cc2f41d31e080f44d23bcfaed9642fd31f1d44a56c3df3e894526b643c572832cb96218b16d748b1ac6fe2
+EBUILD spirv-tools-2020.5_pre20201107.ebuild 1230 BLAKE2B c22ed6c1c229fbd4530eb631dd6920fef98c29578432ba71370512be1bafcc2fb8da12478be16ca2f54a8a126237689ba7cdad1cd5782a34ff409fa43053e24b SHA512 172fce20975bd218161edf8d873beb6d1c647377d099627797d522befa4773bb224393eafc95bc5a7c123236106d41453ecb9873ff8663c1a857c3b663fdb365
+EBUILD spirv-tools-2020.6.ebuild 1205 BLAKE2B 4e74e0c95341d93f71be441da32b0ee04a8b29834242c668a6f87378497fd8463537a7a15b61d40a70cbc953f9522918fb8965c581e37fb135ad379313d7a47e SHA512 7fa96042df7287684db7bc86dba3e5baa2ff266ea0442d324b6660ec9aee791772f3ae600b687d62d4913010981d48928111b9bbe380088abdf7d117a9d75365
+EBUILD spirv-tools-9999.ebuild 1232 BLAKE2B 0c5acd106fbf664a8f9f1d82ee921e1ad8f8f73ee1b7182f69c7dc1f6303dd6f53ce9bbd96a0b2dd6ded7b73baf7956e2cd757540e7b36a57923b1a4afdbfb70 SHA512 c6d27ddeed7cfa4ec06d6dfa9366082ed1818f4a87dea5c4b01fa6aef87bda429c93776e9d5c7187ee018a10dc5b68d058710425dd11f8271ad61d3e19236733
 MISC metadata.xml 429 BLAKE2B 84129eb27ea4a745c90ed7eab09723b41b45a696375c41458c45a6163dc00cd15d208d6858ea4fd92280e3ff3bb385f340ec3684c980a97ea5fd46fdc4c24001 SHA512 13b340b0e43ba726370f3b013759adab727fc37e251ec5777d10541976843e3e575be23ee015af83dd2e98a1917f4d2511467a38afd064cef025ab4700f005a6
diff --git a/dev-util/spirv-tools/spirv-tools-2020.5_pre20201107.ebuild b/dev-util/spirv-tools/spirv-tools-2020.5_pre20201107.ebuild
index 7921c01f46cd..41ee1a4b749d 100644
--- a/dev-util/spirv-tools/spirv-tools-2020.5_pre20201107.ebuild
+++ b/dev-util/spirv-tools/spirv-tools-2020.5_pre20201107.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	EGIT_COMMIT="a61d07a72763c1eb200de0a2c316703643a0d1d9"
 	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 arm arm64 ~ppc ppc64 ~riscv x86"
+	KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
 	S="${WORKDIR}"/${MY_PN}-${EGIT_COMMIT}
 fi
 
diff --git a/dev-util/spirv-tools/spirv-tools-2020.3.ebuild b/dev-util/spirv-tools/spirv-tools-2020.6.ebuild
index 16c82fcd1bd9..d6ecf835b95b 100644
--- a/dev-util/spirv-tools/spirv-tools-2020.3.ebuild
+++ b/dev-util/spirv-tools/spirv-tools-2020.6.ebuild
@@ -5,16 +5,17 @@ EAPI=7
 
 MY_PN=SPIRV-Tools
 CMAKE_ECLASS="cmake"
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 inherit cmake-multilib python-any-r1
 
 if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
 	inherit git-r3
 else
-	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86"
-	S="${WORKDIR}"/${MY_PN}-${PV}
+	EGIT_COMMIT="${PV}"
+	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+	S="${WORKDIR}"/${MY_PN}-${EGIT_COMMIT}
 fi
 
 DESCRIPTION="Provides an API and commands for processing SPIR-V modules"
@@ -25,7 +26,7 @@ SLOT="0"
 # Tests fail upon finding symbols that do not match a regular expression
 # in the generated library. Easily hit with non-standard compiler flags
 RESTRICT="test"
-COMMON_DEPEND=">=dev-util/spirv-headers-1.5.3"
+COMMON_DEPEND=">=dev-util/spirv-headers-1.5.4.1"
 DEPEND="${COMMON_DEPEND}"
 RDEPEND=""
 BDEPEND="${PYTHON_DEPS}
@@ -35,6 +36,8 @@ multilib_src_configure() {
 	local mycmakeargs=(
 		"-DSPIRV-Headers_SOURCE_DIR=/usr/"
 		"-DSPIRV_WERROR=OFF"
+		"-DSPIRV_TOOLS_BUILD_STATIC=OFF"
+		"-DBUILD_SHARED_LIBS=ON"
 	)
 
 	cmake_src_configure
diff --git a/dev-util/spirv-tools/spirv-tools-9999.ebuild b/dev-util/spirv-tools/spirv-tools-9999.ebuild
index d1cdb00c129a..5e644f17681c 100644
--- a/dev-util/spirv-tools/spirv-tools-9999.ebuild
+++ b/dev-util/spirv-tools/spirv-tools-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 MY_PN=SPIRV-Tools
 CMAKE_ECLASS="cmake"
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 inherit cmake-multilib python-any-r1
 
 if [[ ${PV} == *9999* ]]; then
@@ -26,7 +26,7 @@ SLOT="0"
 # Tests fail upon finding symbols that do not match a regular expression
 # in the generated library. Easily hit with non-standard compiler flags
 RESTRICT="test"
-COMMON_DEPEND=">=dev-util/spirv-headers-1.5.4"
+COMMON_DEPEND=">=dev-util/spirv-headers-1.5.4.1"
 DEPEND="${COMMON_DEPEND}"
 RDEPEND=""
 BDEPEND="${PYTHON_DEPS}
diff --git a/dev-util/strace/Manifest b/dev-util/strace/Manifest
index e7facf5c9417..0912de852c02 100644
--- a/dev-util/strace/Manifest
+++ b/dev-util/strace/Manifest
@@ -1,8 +1,10 @@
 AUX strace-5.4-fix-LTO-CFLAGS-handling.patch 843 BLAKE2B 2cd4c87e972b2bfe6d5755141a64ffbca386047ea68d37c8871bc37e7475f8eb3ce978ead5082ecb3099f599e12914f087773733a7440875a084a5b452b1f92c SHA512 9606c3334d3e01aecccafaa396b5a7440a652872c590ced3c1a88ca6ef083c176a420dfb2154396f94f65b826d6fe2f20556620f364c17d01d0069d630dc5cfe
 AUX strace-5.5-static.patch 5187 BLAKE2B 9015d649d644dd4e5fe6b89d7fd4b1d759b7021627384f575e6668fa24841438c49e3acd8d09f0302374fc457001df89a9f384193ddde1da105a5b95167f944a SHA512 a1adbbcc7bc87f37b1071b888f1b2c830113cfd40c341316d7e96e72e142781f41d1b8823277ea0c61079e557460e9a43d1795e7c8cc97cbca9c6aec8d08f682
+DIST strace-5.10.tar.xz 1859688 BLAKE2B 45c40854c9af95395cb274fbfddc3d0084e77cc403ffe104f72ce7592800452776f5c19d03649cdd6705bccc7a0859364e470bdd5344f64af54b798fab50475e SHA512 1baa41b6d52f2e40e42a22850beee1ae278fafe712796694631898f06a7540d8f2c3fa70807e0062734f0976ebbd0824457c733ccda248f017c218387366ed48
 DIST strace-5.4.tar.xz 1599396 BLAKE2B 0a7fd9600488f5f07042ead8123151cf0113f82329c3cc786c8f3ffb8673f73eaaa1a489f1f27c47800a20e5b6327f1bf5fb09a5b798156908f9e10374a04970 SHA512 4ddba2ec4457a2257c18b26dca851e49a275813c4eb3069379a93fcc60228f9b63a3dee9e3719ae606a7cc61d55ab21ce147327223903c302c061e381097a8d7
 DIST strace-5.8.tar.xz 1813640 BLAKE2B 315edf404fa57890dcff512f9fd76818e8e7d5ad06bc297b68561ec7073297c2e5aaf2c3d9a102382f5833bedacb2a54540068a9f9438094c9180f45b5dc4715 SHA512 633c3daa2dd3d273839cbb8ebd7f6512a38b39af0d0d89f4676c2067e199f346615406d85e3e13f9e4da8dbeb62095185895ffae986eb99b64775a4287e38f4c
 DIST strace-5.9.tar.xz 1847036 BLAKE2B 92d6b5e1a7821086b4e0e535d5db7849158e58ac0604fb9bb667e106b72b1ce17dfadd3960efcf553d7c7dec4622db36833aa5cdd4bc924f8b54ec6168ed82dd SHA512 f28d5dcceccb44557b39ed6f295f3250662804dc3ad79959bfadffcecc9b736e532c7c90dc89ebf9d07eb3e02a5ace231605851148ca09d41c8c60dc1ff68206
+EBUILD strace-5.10.ebuild 2354 BLAKE2B 65b3aaf00c35f709158d0f3de01f7bcc0b1a8daaab9e614bb9d381d0b4ae26794cd6fe8e502e1d8f953a9271e8fe0bd460b84f8ca84266192635a37d54c3b653 SHA512 879a423a1786a2147484d817a89060960e1e4796f481902f2001b872a0942a84e7d78ad87869d35637bc9cd2b3ad61821067a32def5a8dbb196b3a638676f3c2
 EBUILD strace-5.4.ebuild 2524 BLAKE2B 3a21233c29527856cbe1723407ddac3525b57efe6fa3bf379b6ba4d902d5dfe607049a5a9264f91f947ab2678cd36cebc4629eb49812658bb895583840fa5fdd SHA512 fae99e9ba572c1c6445ba03ec257759165d5c3be57d6de5269f1e886e6c9fb50361995956671772bfae26ec4d54785e9f40ac7dad25a5d4b2c33f8c3e2eb94b4
 EBUILD strace-5.8.ebuild 2346 BLAKE2B 92f60380f83865c45f25a76347a47baee0fa23e240dd7d7879ac31a47a8a6e8614b37d9c8ef4068463527c1c0f31e5f05091febd9082515191faa30ffa1cff45 SHA512 9793e5ef0ad81c97b7bf7e29d3233a1504adce9dd1ace85cbb5b7b04e6b1e9f38b88d8b28c9d36dbeee6dd644615a6068ef45021355b9b587b0b00503b60b929
 EBUILD strace-5.9.ebuild 2354 BLAKE2B 65b3aaf00c35f709158d0f3de01f7bcc0b1a8daaab9e614bb9d381d0b4ae26794cd6fe8e502e1d8f953a9271e8fe0bd460b84f8ca84266192635a37d54c3b653 SHA512 879a423a1786a2147484d817a89060960e1e4796f481902f2001b872a0942a84e7d78ad87869d35637bc9cd2b3ad61821067a32def5a8dbb196b3a638676f3c2
diff --git a/dev-util/strace/strace-5.10.ebuild b/dev-util/strace/strace-5.10.ebuild
new file mode 100644
index 000000000000..c08dbf18c0a5
--- /dev/null
+++ b/dev-util/strace/strace-5.10.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic toolchain-funcs
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/strace/strace.git"
+	inherit git-r3 autotools
+else
+	SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="A useful diagnostic, instructional, and debugging tool"
+HOMEPAGE="https://strace.io/"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="aio perl static unwind elfutils"
+
+REQUIRED_USE="?? ( unwind elfutils )"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+LIB_DEPEND="
+	unwind? ( sys-libs/libunwind[static-libs(+)] )
+	elfutils? ( dev-libs/elfutils[static-libs(+)] )
+"
+# strace only uses the header from libaio to decode structs
+DEPEND="
+	static? ( ${LIB_DEPEND} )
+	aio? ( >=dev-libs/libaio-0.3.106 )
+	sys-kernel/linux-headers
+"
+RDEPEND="
+	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	perl? ( dev-lang/perl )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.5-static.patch"
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+
+	if [[ ! -e configure ]] ; then
+		# git generation
+		sed /autoreconf/d -i bootstrap || die
+		./bootstrap || die
+		eautoreconf
+		[[ ! -e CREDITS ]] && cp CREDITS{.in,}
+	fi
+
+	filter-lfs-flags # configure handles this sanely
+
+	export ac_cv_header_libaio_h=$(usex aio)
+	use elibc_musl && export ac_cv_header_stdc=no
+
+	# Stub out the -k test since it's known to be flaky. #545812
+	sed -i '1iexit 77' tests*/strace-k.test || die
+}
+
+src_configure() {
+	# Set up the default build settings, and then use the names strace expects.
+	tc-export_build_env BUILD_{CC,CPP}
+	local v bv
+	for v in CC CPP {C,CPP,LD}FLAGS ; do
+		bv="BUILD_${v}"
+		export "${v}_FOR_BUILD=${!bv}"
+	done
+
+	# Don't require mpers support on non-multilib systems. #649560
+	local myeconfargs=(
+		--disable-gcc-Werror
+		--enable-mpers=check
+		$(use_enable static)
+		$(use_with unwind libunwind)
+		$(use_with elfutils libdw)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	if has usersandbox ${FEATURES} ; then
+		ewarn "Test suite is known to fail with FEATURES=usersandbox -- skipping ..." #643044
+		return 0
+	fi
+
+	default
+}
+
+src_install() {
+	default
+	if ! use perl ; then
+		rm "${ED}"/usr/bin/strace-graph || die
+	fi
+	dodoc CREDITS
+}
diff --git a/dev-util/vulkan-headers/Manifest b/dev-util/vulkan-headers/Manifest
index d6865c16f151..a448f2b92685 100644
--- a/dev-util/vulkan-headers/Manifest
+++ b/dev-util/vulkan-headers/Manifest
@@ -1,6 +1,6 @@
-DIST vulkan-headers-1.2.143.tar.gz 758635 BLAKE2B e1fa8e1290d2fd1e4cef932e4dcd2bc10ef14449cdb41d57f0e4ef58f9a758add7e05d06d7884b08e080250cbb93bf0b211ac3570f0be6b256f6c70bd9eb1704 SHA512 fafd28822da050211525b289a324d333d5651e74e455a7b1010db55eac624edbbf50f5e7f899e2003c821fd06a9a61fec32ea7d07dc4d90a3b3697e03d3ddcc3
 DIST vulkan-headers-1.2.154.tar.gz 817069 BLAKE2B 66b073daf01741d74a8c2524e6f2692a4c2143340bba8349f3c85408ce12cd7405f960fac0b6ffe3cbd6dcddfcbb04a6481b2743428c66a527d51c16cbd326c6 SHA512 97f9b56b57a762a3616ff3e9795de01c9b9327b80903adf2b141f33be45b30980acd50007ac6af9562ee1897491929d23f7f5dc6a8bafced59e14df27dfca6a9
-EBUILD vulkan-headers-1.2.143.ebuild 605 BLAKE2B caf8d1eff6c89b36ca7e4a544a97699aa257bd306b69bb40e3522a743469f079c3fdbcb26e79bcee137267eccf2de8f7886a3282e6d0582e3a33bd3cfade49ee SHA512 211cf1ac07e4dd0bcdf133cc9cf288bf4613ee91cf1358c406a7534584aa117a72e0d2a51a45afed59e5884c05ce87d2acfe49995ad91b3e20fa15b54cd5d6ed
-EBUILD vulkan-headers-1.2.154.ebuild 613 BLAKE2B e14d48d56969086af316c53f09968f0825b036e69923aa7ec3ba9da858a9f88777e0a639cc9afdfbd74c2e093bc8b43248fbe512a6bf7985a8d037c58dcb0ab4 SHA512 9028c31acfa8c3d622b0ac7fd9195440fef9c6639d456fc950904aa70248b5ee533ddb4d94573cc1913d25caadb4c63b96fbf01140439aa9564154600b33a3f4
+DIST vulkan-headers-1.2.162.tar.gz 852973 BLAKE2B 3907c247f115f4dee2fc8697f157aeb30a3ef91a774132591771c0b327090abf7c0caad2082edb86c787883c167ce1ffe75c199d9b94fc642aae30526f5311cd SHA512 7b33f6ef32f1ef34d3b37ad38b077a3a2ebcef62612371afa1b6f4910815bbab8418a837c49b3872b57d2e5012c15623521121f5d62836e46d6f20773841d7b0
+EBUILD vulkan-headers-1.2.154.ebuild 612 BLAKE2B 64c4431737365668e9e0625218152e4299dd9fc06b60a341ae93b7642667663f0ee7a8d3d19e709d484826f34a9c37d9901942c42659d1e1f9ad7e4bb5379642 SHA512 e6fd884d43405daab2ad3df6c02fc2d3e029647d1facecb79acbaed0a456d41e7709e56aaa8d752dab8ce59a82de51cc6bba7cd365edbe911f329e788c084c98
+EBUILD vulkan-headers-1.2.162.ebuild 617 BLAKE2B c9b53f7d664cca2f4f793712f2db1d41eb37a837602813ec1462302779bc5a63d10e8fa87bad10de41577a2339cf55cfe99340271d398470272849b4917df486 SHA512 ae8aae0d72ee4de778d818ee0865313de580d3585c95f3eb1415e7ef57bae3373f790d25af1f7d37b0c31196c43200da4061476b8bd6b85b5d5948af1ea3b657
 EBUILD vulkan-headers-9999.ebuild 593 BLAKE2B 101dc4954cc61f0375202d2398a3bab6e99e379f9dbc3aaab01129670e0413cba3fc9d15f031a44f634ec7576f0cd6bbd52ccfdbec0de9d703f6db5a9a2eff52 SHA512 a95238b09e9d71d72588e9e90af0d99590a8d4fffb6b134cc75c5b9bfc542c40f7a438447ce06aaf4a5ea5922d9ce49763af91b49934c8f66fc5dbb1d7ea8246
 MISC metadata.xml 432 BLAKE2B e6c1f4f34e41862d3739bad772b910b21348dce97dbde38cc7fbc9cb42993a493881dd100a0c21be3615805f27d3987259233ae5830ef56e2d1dd928c285c09f SHA512 f4f93b16ad29f813a2c0397ec46c6decf7c9bdb3f4a376e1f24a29724c136feabd230d0558d37a502f2795f71c959833a662e6d2544a78704408b3be9be314fc
diff --git a/dev-util/vulkan-headers/vulkan-headers-1.2.154.ebuild b/dev-util/vulkan-headers/vulkan-headers-1.2.154.ebuild
index 79af58fcdc70..82d54c8ea81d 100644
--- a/dev-util/vulkan-headers/vulkan-headers-1.2.154.ebuild
+++ b/dev-util/vulkan-headers/vulkan-headers-1.2.154.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 arm arm64 ~ppc ppc64 ~riscv x86"
+	KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
 	S="${WORKDIR}"/${MY_PN}-${PV}
 fi
 
diff --git a/dev-util/vulkan-headers/vulkan-headers-1.2.143.ebuild b/dev-util/vulkan-headers/vulkan-headers-1.2.162.ebuild
index 3c7d217ae9fa..b7d53089df0c 100644
--- a/dev-util/vulkan-headers/vulkan-headers-1.2.143.ebuild
+++ b/dev-util/vulkan-headers/vulkan-headers-1.2.162.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 	S="${WORKDIR}"/${MY_PN}-${PV}
 fi
 
diff --git a/dev-util/vulkan-tools/Manifest b/dev-util/vulkan-tools/Manifest
index ee08b36bf45b..bec96618d2ed 100644
--- a/dev-util/vulkan-tools/Manifest
+++ b/dev-util/vulkan-tools/Manifest
@@ -1,6 +1,6 @@
-DIST vulkan-tools-1.2.141.tar.gz 711666 BLAKE2B 0ad31cba26106ea76ddeb26e05b59302a6f35c9172eb75fe31b6a05370be0131a92db33a4c54a006b6ba5145447079239d7ff174f7be10feb172fe03d7a1a619 SHA512 5dce372f60f55570bfc7dc4e4da7b4a07f632cfac6a2862bdf773cab61a8c6260bb38cbd48d944e08479248bfe29248214618a78952fac0aeef285e5b888d337
 DIST vulkan-tools-1.2.154.tar.gz 719166 BLAKE2B 351fd168be69615691bf956f65c0a6f2050c1061897745ecc227cc11336d2d3b39b0475a0c941c0ccdb011b9d37ef0417b22e0935ec956c5d37bbb8c6cd2e6d2 SHA512 51d6521af4f65c5b93bc5a10ef921f3770f04d6a363a9c4f0941421bf762e17cb8948bbdd3ed1d5449d015e1ac86e42e63583aee4a442cc275a1d410f61813a7
-EBUILD vulkan-tools-1.2.141.ebuild 1885 BLAKE2B 145b76e22548ae638ec3eedf9b3692d03b026484a2cc611221c25a9dc4ac4d57a077531ff34533579f983d997fdf5eae9ded0c2c25e5573daa99a698e6eb9b49 SHA512 2d76c2ff116686ed5d6bfd3cca4de4c8e2bd227bd7a4373e0b1f7ef12f9c26d871be9048c92d0f9569ea11b04369215f6fe6bd7b31054db4dca675f3cd2d57e1
-EBUILD vulkan-tools-1.2.154.ebuild 1886 BLAKE2B 370a628f1edc87ffbfa541531dc4ddaf7e956963365050debcc3d66dafefb0ebdce6b93c1b7c7e2e80400607007d3130860241cf636029288c3106955f9044dd SHA512 6a457f33f1d21ca91f72876c892da529305b43afcce57c9266fb8660825cb0971782e8496f34d9f4cf1d4b2f0c2dfa9e8a3ce9fc25de268b119ff57481138ddb
-EBUILD vulkan-tools-9999.ebuild 1886 BLAKE2B 370a628f1edc87ffbfa541531dc4ddaf7e956963365050debcc3d66dafefb0ebdce6b93c1b7c7e2e80400607007d3130860241cf636029288c3106955f9044dd SHA512 6a457f33f1d21ca91f72876c892da529305b43afcce57c9266fb8660825cb0971782e8496f34d9f4cf1d4b2f0c2dfa9e8a3ce9fc25de268b119ff57481138ddb
+DIST vulkan-tools-1.2.162.tar.gz 724232 BLAKE2B 16eb2dde35883fb2c7c263a72a615818ff8e1557ac9d74553ec3784d96a827e6900efa4e42218cb9081f7501d9b1a53eac82c360c2d20922043308515ab48983 SHA512 7827f6775dfb26820a2a2cbc60e7da8c7e7bdcb57b65523fbc6b2e989ae6869b04a57ae458c72715722c67d842660574697834c92f9b909dd5673da1945ac6dc
+EBUILD vulkan-tools-1.2.154.ebuild 1885 BLAKE2B 145b76e22548ae638ec3eedf9b3692d03b026484a2cc611221c25a9dc4ac4d57a077531ff34533579f983d997fdf5eae9ded0c2c25e5573daa99a698e6eb9b49 SHA512 2d76c2ff116686ed5d6bfd3cca4de4c8e2bd227bd7a4373e0b1f7ef12f9c26d871be9048c92d0f9569ea11b04369215f6fe6bd7b31054db4dca675f3cd2d57e1
+EBUILD vulkan-tools-1.2.162.ebuild 1888 BLAKE2B 7635fd4593b06c176a16b09aa251b9825d155edbfae0160f314ea23c2c14fdaba7e1652709fbd89934df5374157d75aa260b028958e96366495599335fe1478c SHA512 024da45078e75055b6a66bccef0835d21699e2e457837e359ca5bc0307a1edd99f16754329e473ade28e3ef527f413428beb3148c15338403287570934f32b25
+EBUILD vulkan-tools-9999.ebuild 1888 BLAKE2B 7635fd4593b06c176a16b09aa251b9825d155edbfae0160f314ea23c2c14fdaba7e1652709fbd89934df5374157d75aa260b028958e96366495599335fe1478c SHA512 024da45078e75055b6a66bccef0835d21699e2e457837e359ca5bc0307a1edd99f16754329e473ade28e3ef527f413428beb3148c15338403287570934f32b25
 MISC metadata.xml 500 BLAKE2B 2b03cd2296502530b43020bacbbef0edaabacc6b8d2458ef6d5f653fbbdf6b02ff5fba9988fd19ee9c9e14e41df359c150cbc2fd141769960f2f1b95e213d8ed SHA512 327529a5a8a57115e116c31c5b86a00f978c8612a4905eed90ad3b33671acaabbaa5e7e82bb140ad5d9b1574b0f37a53882d117c50ec320c1ea0c8d5fc25994e
diff --git a/dev-util/vulkan-tools/vulkan-tools-1.2.154.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.2.154.ebuild
index 1dad1fe14b60..a23ebee93695 100644
--- a/dev-util/vulkan-tools/vulkan-tools-1.2.154.ebuild
+++ b/dev-util/vulkan-tools/vulkan-tools-1.2.154.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64"
 	S="${WORKDIR}"/${MY_PN}-${PV}
 fi
 
diff --git a/dev-util/vulkan-tools/vulkan-tools-1.2.141.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.2.162.ebuild
index a23ebee93695..484eb9bb156c 100644
--- a/dev-util/vulkan-tools/vulkan-tools-1.2.141.ebuild
+++ b/dev-util/vulkan-tools/vulkan-tools-1.2.162.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 MY_PN=Vulkan-Tools
 CMAKE_ECLASS="cmake"
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 inherit cmake-multilib python-any-r1
 
 if [[ ${PV} == *9999* ]]; then
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64"
 	S="${WORKDIR}"/${MY_PN}-${PV}
 fi
 
diff --git a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
index 1dad1fe14b60..484eb9bb156c 100644
--- a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
+++ b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 MY_PN=Vulkan-Tools
 CMAKE_ECLASS="cmake"
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 inherit cmake-multilib python-any-r1
 
 if [[ ${PV} == *9999* ]]; then
diff --git a/dev-util/wiggle/Manifest b/dev-util/wiggle/Manifest
index 3db124dbb272..4f24ddffde4a 100644
--- a/dev-util/wiggle/Manifest
+++ b/dev-util/wiggle/Manifest
@@ -2,5 +2,5 @@ AUX wiggle-1.0-cflags.patch 576 BLAKE2B 25b065a28bb88f3163c063a90a9dc60ec9171e4a
 DIST wiggle-0.9.tar.gz 809756 BLAKE2B 62fd35c721c4d54204984fd196686decff54c1613ceabf5c727b6383500158a04110c4fa2e63d6456452ac79fb811aac611876528fd2503c1acb7e0eb000e49f SHA512 2e3a4977704231f3bd6aa96ffaba8bc733acde425773b86a9649312676b44360c5b85cb48bf944cd383d8e4d0a541d88755f23be7d7a8884213f68a6320c62d9
 DIST wiggle-1.0.tar.gz 868216 BLAKE2B 7241cbbde488b5cbf8970feb1cc258deb04c935347d793796f34993feba3e82870c9ac2aa7d5039f4739308cd0b20b4b104fb50c5ce64a5c66381ff3f6c545d4 SHA512 e9bd6e794ba0cff70db96a648c53aa21b427967758375b843fccf409dd17faf59468c11bafb1e0a7af8bfa657551da8bc1903b9ccf8def1ed9acc84f50c7e0b3
 EBUILD wiggle-0.9-r1.ebuild 1714 BLAKE2B e8c17c40f61dad213d8cfd43e3211fdcb5293eb46baee1f875f6b262382d6931b1e739d80ffcee7bec2930d6fba1878a1e8d4553dea17daa9be9b74851202f3f SHA512 8b976140f14ac386c2c483f3402097ac49b89bfc7742e8800c1053e3cb46fb75fc8b10ba6be49627aaaaf4261f6c8dff11a8834fdadc31f1029304f062eebe8a
-EBUILD wiggle-1.0.ebuild 1491 BLAKE2B 031b2ad8091f0521f9ab17900309ca336f7616570a99188b22fcbdec4f237f5e232e1453d569bb06152374dd7bbc568b94636181ddc279bc614c05dbdd83df0b SHA512 7d62261ed2d1187a2e5d5efe13f792179a2f47975b704627e0b63e953b3c2bb501e4ec90c96ea12ae43de52e3dd88dbfc0c52f493315be30809831b5721661f0
+EBUILD wiggle-1.0.ebuild 1490 BLAKE2B 24e5ccd7bf02838a717d0229d8d4a95f37151ebefcbff72d1ae7d64e64bf8b2cf57367b23e8b46652e7ae8073007dcba0cf1e5903d6a61541acbe5aaa4fed056 SHA512 71fe38aff8390d637b414f8dd88134f5997330756daaceb9a55fe947b154829ecb50d681b8cfbacbd8b100a66309caadb14e2d7e4b24ec5de83dcd820395495d
 MISC metadata.xml 256 BLAKE2B 7380eb4443aa7d04fc02d228edb72f675580a9f36244c083c4bbdcbc492a4c5169fb3121158d4a613f25f7c0464042bba7951fb92cf9f11c5208a2d9699e195e SHA512 574345bb2730bbc2d0190a03b16703d10441ccd589623c5e8bdddf84d7ce86226da7e079d7b2135e4c724d0813973c551143cdd0f525a58efdd37716dd83edfd
diff --git a/dev-util/wiggle/wiggle-1.0.ebuild b/dev-util/wiggle/wiggle-1.0.ebuild
index 33e321fa5383..2ae059f746e4 100644
--- a/dev-util/wiggle/wiggle-1.0.ebuild
+++ b/dev-util/wiggle/wiggle-1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://neil.brown.name/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/xfce4-dev-tools/Manifest b/dev-util/xfce4-dev-tools/Manifest
index ee1b555ffc69..b17d3e4a2ed8 100644
--- a/dev-util/xfce4-dev-tools/Manifest
+++ b/dev-util/xfce4-dev-tools/Manifest
@@ -1,7 +1,5 @@
 DIST xfce4-dev-tools-4.14.0.tar.bz2 292275 BLAKE2B 18f28394ded038a7bcf0e754ebb359464358df245903a0c4441df2845e57c9059de6e6775a90c0e6c3cde4936a847ddf26ae88ff61fe7612fc2626b00f1d56a7 SHA512 e22b139ff7516ec0e510f882cc6a9e8e8b2b7bd41093c8e67e5ef11eb6c2c2848637513369d652f7238f10b5005c5483a938d3348020b48a4c1fadadd6d635f8
-DIST xfce4-dev-tools-4.15.0.tar.bz2 336453 BLAKE2B 9072d86b4b1645e72c04f26b5609162f50aac9d90ad007d2f629bb1ec67d242f3addea4bdd6f129f3336658b04f0eaecbd039154dfd98ccb87a85840b502d11f SHA512 125c8a7d594b17ce822dc5f57f5c700e69ee6208b06931cb0fefcbd1aa70281f388a9eebe8b451ffb55f16682070f9119a43b148f97adcdfd2278b4901910425
 DIST xfce4-dev-tools-4.15.1.tar.bz2 340738 BLAKE2B 73c08f27011ce0d2144eaa1672209669a382695bc9fc9c0a7b9966398df09cf4813afdde9f809354b48d8ddc06644b6e8d4f45ed758dfca24c92e557f5536c8e SHA512 e24fb63774b36f5b3cd901394b75b36e891a68fe7a46a1503a1fc3cfe901bd267e2d8d4aa35a2c760226524079617059e5344b93ef98b3f97dce85e765e5c5dc
 EBUILD xfce4-dev-tools-4.14.0.ebuild 578 BLAKE2B ee9471d511f0f61bebc4458fafd29ec7c246ede52b393404d055058f8453149fb13a0c5e83504aa15465ac4549ec67a8bc693d59f44cb268e61ab313de3b0aac SHA512 de4981b2dd476a6582654f5bc09b3e6008d0f96b310737e0797c66bf3e469783a7dbef58445ff20d5e9d8ea02539d334e6c5047f78ecbb82290deab39a9aa83a
-EBUILD xfce4-dev-tools-4.15.0.ebuild 584 BLAKE2B 6b2f6fcd2f8ed91d4a09138a3ea90c1ecb1e5cf8236dc7e16bbf4889d0aabb9a08d822b7cca7b0888ee586837e41a5c055d71836cb2255ac82c99af875a58cf7 SHA512 35e950fba2c4de9b286afa8d9af5560c8c1ec72c8df70ab2fafc67015005bee23f5e7b59e79e8d631e668cb1ceb423106c4a1fddfdbd39e8e7741e6fb9fe1c9e
 EBUILD xfce4-dev-tools-4.15.1.ebuild 584 BLAKE2B 6b2f6fcd2f8ed91d4a09138a3ea90c1ecb1e5cf8236dc7e16bbf4889d0aabb9a08d822b7cca7b0888ee586837e41a5c055d71836cb2255ac82c99af875a58cf7 SHA512 35e950fba2c4de9b286afa8d9af5560c8c1ec72c8df70ab2fafc67015005bee23f5e7b59e79e8d631e668cb1ceb423106c4a1fddfdbd39e8e7741e6fb9fe1c9e
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.15.0.ebuild b/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.15.0.ebuild
deleted file mode 100644
index 665633a8f721..000000000000
--- a/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.15.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A set of scripts and m4/autoconf macros that ease build system maintenance"
-HOMEPAGE="https://www.xfce.org/ http://users.xfce.org/~benny/projects/xfce4-dev-tools/"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.42"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
diff --git a/dev-util/ydiff/Manifest b/dev-util/ydiff/Manifest
index de1d1d1e300a..2222fdbf4d12 100644
--- a/dev-util/ydiff/Manifest
+++ b/dev-util/ydiff/Manifest
@@ -1,5 +1,3 @@
-DIST ydiff-1.1.tar.gz 36357 BLAKE2B 4465c85132bb7c7d58c13dd79903610c74edec3b2b8ab8980918a1bf3a98f2b8387872a0974743503fcaad1e7ecb24c21d312a13d9aabe94780e9d623c35175a SHA512 575b3327edd3b8796f5f150fc7ebde32561e1782582e03e9b63bf9010998913fb8b00a8245d799f6cd5599e286f07f9e97e160f23606323d1a6f6059faa59bc9
 DIST ydiff-1.2.tar.gz 42808 BLAKE2B 927482c2ed9a96efc354178679b4ba50497289bc31107e8cdef3062a71d91268fa703620f1f4b0be03aebaf339eba5254f4b43c16403f1d7818b84b0c450defb SHA512 0eb2230b64f43e20f6dc2411296389dc99356ef626152dc7f234583f70678e64a07b764fd89635479e7ac4aa7e2490db6e76c744369eefef8ab6a5386db1a7b5
-EBUILD ydiff-1.1.ebuild 652 BLAKE2B 64b7eb0fa137e38a02ff45de004eded3d9b07863d546b992a7f7e80fdee29b7ea3c82842e4183752012e64811369c3d8d54927f0fb72dd24106c46d7941edd19 SHA512 c274ee20ef7535608aeacf48704fd40f24d8b53dd398c702f7ab475cefa31d9fa44243b3361cddaa6a9fda4177eee46e1c576d81509ca308d08f05571373430d
-EBUILD ydiff-1.2.ebuild 642 BLAKE2B 92d9aade555437c87e66e26ada7f59ffd5733a622c7eacb8541f4e7ffc43593b971d8c091e698e5736422ce374507099433f5b09c04f87b6afae15107c2e0815 SHA512 94d99b71d6243d7a18bf5ab2a006d3742e6512587a544418aec562195872dfa49318cb1064d688cc3ac094e2389faec68a2790187714c57d62a8cdee05b1e302
-MISC metadata.xml 369 BLAKE2B e1679b4929852125cc2ce7ec0ede870da64132b820c16865d6fa4e572227c64d699871e07df5588ea46ae67cab3775be9908a76d2d222d75bc2f59ea9269b14a SHA512 798de8606d059795e57d1cfaf513e2587b132e512a8833d422d94e7708473379ddbcee63ec2cf8068653f7c1e02de516f7facb5e5fea59a9dca98698cc3c6d57
+EBUILD ydiff-1.2.ebuild 641 BLAKE2B b0fb4d05d81a594c53084bf1fb1f223aad84826b8ce73d0cc2781ab349517945f6bde6e415fe121c6bcc6409fba27dd67f62679fa8927449a2604b92b874d92a SHA512 9de5bc0965a88bc26277e16cb69cae584b56824996e25a0373428e30cbea9d417ee6ff9a1ac13c6489875c4a8eb7bc0111df8b9ef368922a7d27cad2330bfbd6
+MISC metadata.xml 393 BLAKE2B a469859412c431ab72df7f29759bf03532bc356cdfd556385ea6b62688d68cc430b5655f980b0d6816333097828e5b3266febe2b1cd5abef7fee7474c35c1998 SHA512 901e8ab9f695585a175507658185427f15c20cfc7fabf9b502707d2a3acf7215dcd244fc1556b6a2981ea1e93e44153c715f53017ef72a4c30bf9182f09f3534
diff --git a/dev-util/ydiff/metadata.xml b/dev-util/ydiff/metadata.xml
index a42be58d1e78..6ad1949b1bf5 100644
--- a/dev-util/ydiff/metadata.xml
+++ b/dev-util/ydiff/metadata.xml
@@ -5,6 +5,7 @@
 		<email>sping@gentoo.org</email>
 		<name>Sebastian Pipping</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">ydiff</remote-id>
 		<remote-id type="github">ymattw/ydiff</remote-id>
diff --git a/dev-util/ydiff/ydiff-1.1.ebuild b/dev-util/ydiff/ydiff-1.1.ebuild
deleted file mode 100644
index 4d5e505aa774..000000000000
--- a/dev-util/ydiff/ydiff-1.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit distutils-r1
-
-DESCRIPTION="Colored, side-by-side diff terminal viewer (ex. cdiff)"
-HOMEPAGE="https://github.com/ymattw/ydiff"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-
-DEPEND="sys-apps/less"
-RDEPEND=""
-
-DOCS=( CHANGES.rst README.rst )
-
-RESTRICT="test"
-
-python_test() {
-	${PYTHON} tests/test_ydiff.py || die "Unit tests failed."
-
-	./tests/regression.sh || die "Regression tests failed."
-}
diff --git a/dev-util/ydiff/ydiff-1.2.ebuild b/dev-util/ydiff/ydiff-1.2.ebuild
index cdfe106fd620..3db2a37750ee 100644
--- a/dev-util/ydiff/ydiff-1.2.ebuild
+++ b/dev-util/ydiff/ydiff-1.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="sys-apps/less"