gentoo resync : 08.07.2021

38 files changed, 333 insertions, 402 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index f75b87fb323e..40a6883092ad 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index 8ea663b3284d..d4e148c99c02 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1,8 +1,6 @@
-DIST catalyst-3.0.17.tar.bz2 621403 BLAKE2B 210bc38d036e04282732179b37e018ac12ac17f83517fc41198ee1bb1ce9ef8481e791eb38d0b13aa1f7edccb7fa6b57403a433c7db7063854ac2227b64f3c39 SHA512 636ebcd137b53f2cc3a80daf3ce79d218eeec2e4e44f8980df9d1b1365c4218e096c84359262d87e0096ba35370e37d973f8b35071a36823c46bd859d096991d
 DIST catalyst-3.0.18.tar.bz2 621208 BLAKE2B 63f76634b96006ef4a751b0ce166ab36dcba3016234251b2e44e89b43b0c6909e57914007d6287e54584094ff7f064c0251a79f095c87e4c7957925e9d4605cd SHA512 94a30304b242b4e63cc14f34916acd68c03700876ba1cc2f516880f4e8365258de8b62db85cddc9492229414484ba6908edc91991b70b13da0578792b8b96aa3
-DIST catalyst-3.0.19.tar.bz2 621000 BLAKE2B 162367363615fc83ce8847bd21f5f1b1e6e6e7ae90c65f6e58af6182a00f14d1bd26c7b994d984517447744b84bd7fbf9e865724a36316dff2cc294dab80685e SHA512 e375960f4b44d616112ec200278c20a9ee3597de04adc87e692b164dcaa3eb7cd4951b41a094c062a500d4920b375ad9750918b4985120ac71e97d118073020e
-EBUILD catalyst-3.0.17.ebuild 1998 BLAKE2B 19e8fc43f1322c3a24de6f07afd62693cda7680e5af7dbf443a893cce089a94c38b3dbe76530f801a67d5b33a5580edeb4681210f5d71e3a6ecbb7b273a1c70a SHA512 9414c001dcf2770efb5801909583dc0d044b6e376465509bb7ef7a3e633f2c9edff6e2c31aa4a8d3027530c9ac6ddf590153cbbc4504a1fbd90b23c0619f4109
+DIST catalyst-3.0.20.tar.bz2 620395 BLAKE2B 24e1e1def627bccebea4da7b4c0f787d1b7e06cc3a830847896d71e997d859ecc2131a85d328f2d58226bbf2d459ca349d50b1af68b95bb06bfe8e1843f4c4aa SHA512 f2f2b0003a70b7843006155edca0971508d19199dfe803b85477d2f2fd0365304b9e65531cc19bfb06b83fa98dac11960b72001e899bed0f9b55c0f6881a853e
 EBUILD catalyst-3.0.18.ebuild 1998 BLAKE2B 19e8fc43f1322c3a24de6f07afd62693cda7680e5af7dbf443a893cce089a94c38b3dbe76530f801a67d5b33a5580edeb4681210f5d71e3a6ecbb7b273a1c70a SHA512 9414c001dcf2770efb5801909583dc0d044b6e376465509bb7ef7a3e633f2c9edff6e2c31aa4a8d3027530c9ac6ddf590153cbbc4504a1fbd90b23c0619f4109
-EBUILD catalyst-3.0.19.ebuild 1980 BLAKE2B 684d3ff85a3eb0b116f57c90a3d50612b60defe2666fde94b2aa23dd5e886daa497a11261ba1ee6c251a61c73a15eda5989dfe9f14d364597975e408e682f8b7 SHA512 6012d8c24a63ca062f7b4a8e48ce517be4df82d9a07629cbe0c52f2793201c9a022dac4b753421cb4402b17e8d76094c0f6f42dca41b94b276c11eec360482af
+EBUILD catalyst-3.0.20.ebuild 1986 BLAKE2B 0dace821cdc90ea2d09a61233beaace1fe057a3f90452d500c27c255ccde60f6e9ed69487bd1a8b1af61802422ca6cac1c2c19337f1f6140f44e84d114b4c5b9 SHA512 4386898cb4ea1a4df1fdf72bbbf9e15172df347b668f6ce02c82aeae7753cb42ef2a04477436279f7c07a17f01fabfa4d80c5b9eb92f0eaa7374f86bf0ce24cf
 EBUILD catalyst-9999.ebuild 2177 BLAKE2B 33a8c3f97e7cb4e7b8a56487eaf6a5d83cc2ba14e703a9bf43f3ca37e6dc035ad7d08406ad9112b5ebbe20361348bfd3e2e95d2857b22c6870b920ff8ab3baab SHA512 1dc17150656538bb6d6cfd1c058565ffe9f6d1ecd4da99542454e5c7f3f781f9dbdd59df36fe1ad587f46d0ab1b1da9b01559d11b2a4b600face3fd684df2404
 MISC metadata.xml 512 BLAKE2B 27e0e3638c330c780f163608e5e62b71ed636a2e26291f97465c4506ae1b99345d081046bcab70b1bf56e36c5b9a6b8220b94da8433f2b313235c784ad6b9b5f SHA512 7d6683e83df2d311f3210af91880486ede8f7ddea57044e765f29694eb3e1b8df6f3d22c9a729c480ae9d49ebe3778cfe7a6509365f59eaae34f8438afe97afd
diff --git a/dev-util/catalyst/catalyst-3.0.17.ebuild b/dev-util/catalyst/catalyst-3.0.17.ebuild
deleted file mode 100644
index 5793fe90faef..000000000000
--- a/dev-util/catalyst/catalyst-3.0.17.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 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 ~s390 sparc x86"
-fi
-
-PYTHON_COMPAT=( python3_{8,9} )
-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}]
-	<dev-python/snakeoil-0.9.6[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
-	<dev-python/snakeoil-0.9.6[${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-3.0.19.ebuild b/dev-util/catalyst/catalyst-3.0.20.ebuild
index a95863df1def..a674a9c53c82 100644
--- a/dev-util/catalyst/catalyst-3.0.19.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.20.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_BRANCH="master"
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 fi
 
 PYTHON_COMPAT=( python3_{8,9} )
diff --git a/dev-util/cmocka/Manifest b/dev-util/cmocka/Manifest
index de9c74857c03..03e71643a948 100644
--- a/dev-util/cmocka/Manifest
+++ b/dev-util/cmocka/Manifest
@@ -1,3 +1,3 @@
 DIST cmocka-1.1.5.tar.xz 81004 BLAKE2B 5625dc293ad481c654848f3de806ef88d1b651192c2461e52b54bf9d443b5e2ea5d2a685ab85b044685f57e5723ade6c4c17e38624f59c4eab240cb4feeaab1e SHA512 cad7f04757183d004f6eaad39036fc0e24c5e0e987f80e85bc43bc66dba22389cb02b08e25531cc28a541d0a24a86b29be134a2d6fc339128e87d66952f502bd
-EBUILD cmocka-1.1.5.ebuild 1073 BLAKE2B e7fda2d9cf6252da13b4fafb8f9148d290b2590bb0c42f9dfc35e2513a9c581a55d0ecd44c45b7bcf51d215ed7a4259a2cad7f518ad5fc594d17915ed7b46374 SHA512 3a983bdfb5c73f313e2cf9f96c01ea986c9b866159548c963cb941f60167c190b423b081df20be13bb6e14a10b8f3fa73a8fb349ed63c955e0f9f5d66076606c
+EBUILD cmocka-1.1.5.ebuild 1080 BLAKE2B b1467723466aebf876e9dc242e3128632332801e5ca5a13227fb460ab0dafaa52497407eac8060953a77c7e25b17654809c8ef5790aff3275484ed034310fc9c SHA512 5011e8d47d1e12fa6209780e244b717ada75cb10e575f6bede3ac52635634bb3df011c07bec3b5f300e69e722d603fa625024e135318f10230b4fd36d942c73d
 MISC metadata.xml 259 BLAKE2B 3044f05d4962d450917bbf89d1e3d1f97146baaa2eaa09f3318909ac3b23095296b4ab60ea7009752d7210838912803240c61e0a13e8d0f228096c08de64d9c8 SHA512 68f65bd895ef024776c04553356a38903f55b2976923374cdc3b89455f6c4adad0f2be4f3eb0d12c43c08e2feee2abe9b83e2e8af0d27901b4cda32e9d821d41
diff --git a/dev-util/cmocka/cmocka-1.1.5.ebuild b/dev-util/cmocka/cmocka-1.1.5.ebuild
index 05c9f84919f9..9c29dda05d03 100644
--- a/dev-util/cmocka/cmocka-1.1.5.ebuild
+++ b/dev-util/cmocka/cmocka-1.1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://cmocka.org/files/1.1/${P}.tar.xz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/cucumber-rails/Manifest b/dev-util/cucumber-rails/Manifest
index 6df2f5ef22e7..b753ebf56e5c 100644
--- a/dev-util/cucumber-rails/Manifest
+++ b/dev-util/cucumber-rails/Manifest
@@ -1,9 +1,5 @@
 DIST cucumber-rails-1.8.0.gem 43008 BLAKE2B ac2fbc89ea952add031429b281986de37b3a8511e398b34d49435c70221b3c454589c51acd5b1fcecdf0285a8e446d4c2c0e0a77216eb78f8fa222086fb6db36 SHA512 757f50719309418353cf1e6b42902ce6166806d2e2a9cd1a27842ffde3d8ce61af97de12f4ffa9e31a50693cc8c40ece9a74e5ec91973096e77860b56034d439
-DIST cucumber-rails-2.0.0.gem 41984 BLAKE2B e6dd46d1957478ede25ff226d7423d54fa6aa187f398483815fd9504b23308aca01d5336b62eca152e5384fbf23328d0cd1cd6d1200cd61dc4319508353a7b59 SHA512 d48472b4c6694c612a46ade99fa20add1ee1699cbcd14ddb91c0dcadab25c0f4c18c2f22f713ed8a00dcf765d583d4f46b7e9c99b0f94f0521296e3e4846ed95
-DIST cucumber-rails-2.1.0.gem 42496 BLAKE2B 7e2862ddb006becd6e74374e2075c9ac7aadc62600985c9742af76c90ede6a1506d714d7dd82ad364c2f70ce102f424471fadf9431253aee7937c2d9ee2e591e SHA512 43b7f09ec5829c4ce86579c5840830f6a3effb956cefa661ed66362bd2f71c1ebd97f90414198c8120df25803b309af94a6ab529f8ed48ecc7994e33cf49d26a
 DIST cucumber-rails-2.2.0.gem 136704 BLAKE2B 660037bb5938ad01aa0b1188e5e48522f9932662d6578f1c0a107cdacbd5cf8527e48b6ddb2c91d975577a71db0259a7250d762004ef0a49ebc063f45103aab0 SHA512 ca8a0ce9c9cdb1306b6a5f8e3d9ba68a2beb3d0a35a58fd6c51ba3ce76e2104045b2768054d27bb4bfcd437534aeb6d39fa2be87396f3a4084c0044201e96252
 EBUILD cucumber-rails-1.8.0.ebuild 1184 BLAKE2B 418d8325a0cd90834c31ef87e86d3fb7a7a8b6602fb73546e4c8b9cc86c492e6556055d5ef8bb2fdac12b97f9cd6b53594cf45e4892f8b356a209aaf57c3688c SHA512 fa921b40e01409ab7f3da2b5dc9b781059a2c8d05f6ef9d4e94360005f58e601d99423aae349af78c23ec17e390728f716375ac80784b2065e5c23d5f4ee91e8
-EBUILD cucumber-rails-2.0.0-r1.ebuild 1221 BLAKE2B c23a7bb31a02af2f57ddfa1820eae96c175ccd87bf7d15f74de8d0d824a6ae678b99bf1ea2bfbc8ac6f332f908418fa9ffd38739997ebb553495fcce5c0fec26 SHA512 8cc97442c6650b734bc458dcc972e6391994269a5ee03dea633548edae0b15e5e6782c06372b576d0673086bc852bbbf737235c9ec7ae3356ededf7a826e09b5
-EBUILD cucumber-rails-2.1.0.ebuild 1208 BLAKE2B ef4ed22a7df3bbdc445893f3a28d8be3b7bad1c1fdb7bbe4464c236d4c8da717c1be26ce65d1c03b6bd4ea75263421650c56509bcd8cd8d92c78b281e18e6f2b SHA512 890e64004bf2b4f84c11f3555e1246a0dfe4efe5c71ab9c660e289d9cf277acccabb0942290d2a197d6963c06917c97609c4ee663c86c5492bd2c70599f31609
-EBUILD cucumber-rails-2.2.0.ebuild 1189 BLAKE2B 34cb251f979f9070d60b1d9a47a2baa85f8a70ef79a35f5814c9cc6044332a82363ea48f51664989e671bc7f213afa3a96f5d3f72426c1ca5fcf82f92dd569f7 SHA512 a9de414f4a24b1e7207c76a73b2d14bc7e1dfd77b2aeb97c13cd7e0c2f36ea127e3aaea967605554f5b7393cc02e6b976dd9757a91d7d4daa864db596f823862
+EBUILD cucumber-rails-2.2.0.ebuild 1196 BLAKE2B 204bff27ac75def4b5e88ccfb332b824d8cceec2672f4a2b298c9afc4c32c5c176fd03534fbd6136c9f6d9356a2692ad4a6b1dbf43444334735e3f5e28a714f2 SHA512 70a349b9c1e0b6417fc9e7625ae09f670220bef05f7a8a5c820637ff2cae11b0a5918bee4baa29b1a2e701d6f37d4b2844fabb497a2003abda5857dfafcbdbc9
 MISC metadata.xml 299 BLAKE2B 1f0765d5fb94004b9a72b4b9b4c50cb14b05e611c84016704210aa24909d554a6f817d475fb924573d2ec6ccbd389165d9689ee8ccb7212744292dfbc55a0749 SHA512 b655a45650726e475ccae46d7bc062ba32c527277160c9033382684f6a7aed520220c6a197f7abb9dfe18f8ebea051b5fdcbfd10c744031f123ac684ce3225c7
diff --git a/dev-util/cucumber-rails/cucumber-rails-2.0.0-r1.ebuild b/dev-util/cucumber-rails/cucumber-rails-2.0.0-r1.ebuild
deleted file mode 100644
index 8b941d88443d..000000000000
--- a/dev-util/cucumber-rails/cucumber-rails-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26"
-
-# There are also cucumber features. They require a Rails project with
-# factory girl which we don't have packaged yet.
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="cucumber-rails.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Executable feature scenarios for Rails"
-HOMEPAGE="https://github.com/cucumber/cucumber/wikis"
-LICENSE="Ruby"
-
-KEYWORDS="~amd64"
-SLOT="$(ver_cut 1)"
-IUSE=""
-
-# Restrict tests since Appraisal is now mandatory to manage different
-# rails versions, even for the specs.
-RESTRICT="test"
-#ruby_add_bdepend "
-#	test? (
-#		>=dev-ruby/ammeter-0.2.2
-#		>=dev-ruby/rspec-rails-2.7.0:2
-#	)"
-
-ruby_add_rdepend "
-	>=dev-util/cucumber-3.0.2 <dev-util/cucumber-4
-	>=dev-ruby/nokogiri-1.8
-	>=dev-ruby/capybara-2.12:* <dev-ruby/capybara-4:*
-	>=dev-ruby/railties-4.2:* <dev-ruby/railties-7:*
-	>=dev-ruby/mime-types-2.0:* <dev-ruby/mime-types-4:*"
-
-all_ruby_prepare() {
-	rm Gemfile || die
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-	sed -i -e '/git ls/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-util/cucumber-rails/cucumber-rails-2.1.0.ebuild b/dev-util/cucumber-rails/cucumber-rails-2.1.0.ebuild
deleted file mode 100644
index 22e786917fea..000000000000
--- a/dev-util/cucumber-rails/cucumber-rails-2.1.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26"
-
-# There are also cucumber features. They require a Rails project with
-# factory girl which we don't have packaged yet.
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="cucumber-rails.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Executable feature scenarios for Rails"
-HOMEPAGE="https://github.com/cucumber/cucumber/wikis"
-LICENSE="Ruby"
-
-KEYWORDS="~amd64"
-SLOT="$(ver_cut 1)"
-IUSE=""
-
-# Restrict tests since Appraisal is now mandatory to manage different
-# rails versions, even for the specs.
-RESTRICT="test"
-#ruby_add_bdepend "
-#	test? (
-#		>=dev-ruby/ammeter-0.2.2
-#		>=dev-ruby/rspec-rails-2.7.0:2
-#	)"
-
-ruby_add_rdepend "
-	>=dev-util/cucumber-3.0.2 <dev-util/cucumber-5
-	>=dev-ruby/nokogiri-1.8
-	>=dev-ruby/capybara-2.12:* <dev-ruby/capybara-4:*
-	>=dev-ruby/rails-4.2:* <dev-ruby/rails-7:*
-	>=dev-ruby/mime-types-2.0:* <dev-ruby/mime-types-4:*"
-
-all_ruby_prepare() {
-	rm Gemfile || die
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-	sed -i -e '/git ls/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-util/cucumber-rails/cucumber-rails-2.2.0.ebuild b/dev-util/cucumber-rails/cucumber-rails-2.2.0.ebuild
index d590e771b365..7e0c9521aa9e 100644
--- a/dev-util/cucumber-rails/cucumber-rails-2.2.0.ebuild
+++ b/dev-util/cucumber-rails/cucumber-rails-2.2.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby25 ruby26"
+USE_RUBY="ruby25 ruby26 ruby27"
 
 # There are also cucumber features. They require a Rails project with
 # factory girl which we don't have packaged yet.
diff --git a/dev-util/cucumber/Manifest b/dev-util/cucumber/Manifest
index 95e33df64f10..166443f44a0c 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 2750 BLAKE2B a2098d1c0860e45a13a27badd5485ad0a2cc4743cae3585cc3832b6f8a04b82ac335a8853667384848ded290f74677548957e2b51198391f23a56ed1333a1bdc SHA512 5a851d7d42761cee2c48149c8fc65c2daddec95fc3a9940cd1661cf830248e450a903f4d9978900b82c750ce2bf63e24585e64f9e302133a523bad560a28a52a
-EBUILD cucumber-3.2.0.ebuild 2869 BLAKE2B 9daa8920680899ec0a419eea7768c22641ff81b1ac4fbb1d3b33d1a1a77c326293f743478a629071dcf83f908a82faa1c717f1c276ba6e6e5a3cb3ae5353a0b4 SHA512 60bac1e11f4a1ca47edbbd820f7d9ce7f66c64e68f59ffb2fb68cc28d3b4213c127092eda318e0e69de389930555ec2a21019cd3fd1422b49edb5e890a7fe6a1
+EBUILD cucumber-3.2.0.ebuild 2866 BLAKE2B 7c47db83a5af8c7989af5c0a94dc08dc3c6cbce57794ca828216631850ea38dd05324a02d3497fe0cfb3a09e0c4f16972ecc91f9825ea9cac6ff6fbfd53da590 SHA512 205d0ab2b0353f45870fde9c07769d09c58b6b3f5c6c006a56a35509bd8635112e5cfeebb2773085f5e9b946f7f0f3b77490edac3aeeefa4b1927a10c03eddd2
 MISC metadata.xml 304 BLAKE2B 1f2a69030fdeaccf7280372ef0e8abc7e1ab0456951e88d6f1839ba3615f8a6588bb3a96d05bffdbe343cf3a4b89fc32fdbefc83faeaf2a54e0cdca9c68e03bd SHA512 1e0e844510269d137017ff7ecbe1b98c9542f7264ec0e5b8858119f06887720645c0d968228825d91fcb69016b78d7f7c7d344482f08c3fe0dd6cc3df4f52902
diff --git a/dev-util/cucumber/cucumber-3.2.0.ebuild b/dev-util/cucumber/cucumber-3.2.0.ebuild
index c079d001922d..74102d4c3a77 100644
--- a/dev-util/cucumber/cucumber-3.2.0.ebuild
+++ b/dev-util/cucumber/cucumber-3.2.0.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/diffuse/Manifest b/dev-util/diffuse/Manifest
index 4b97b7343bcc..eed9fe4d4af4 100644
--- a/dev-util/diffuse/Manifest
+++ b/dev-util/diffuse/Manifest
@@ -1,3 +1,3 @@
 DIST diffuse-0.6.0.tar.gz 621120 BLAKE2B c39cbe55edb6e1734d4db1343a0b0029ab146fe92ef4edc58cd6ea82bc6780e3f789d6765d2bddecd941fa458781c59ddde71a010f1b90d4ca238e6d6b233dc2 SHA512 fe9842738560dbefe9c546c8bba3f9f1cefcf4c327ad644430c512ec6bb1b4877986ca2b816af75226975eefa9b0f70120a4ed574e2ed90058b0a92380e8995a
-EBUILD diffuse-0.6.0.ebuild 1359 BLAKE2B e799eda9eba9ab630c0a02d307e084cbf80cd768be7bf8ee8d16cb25a2a150ce8cc9927d5ae161506b38ce6d2e56a7f706ec649c66506348021e3aac21ddbf04 SHA512 ed65cf78bc5950503174d825a70be7d960e62b08d7909c9ea371c6d569641d7dd06032e1b12455faa5ff35aa9601a30342da98c775ba357ff977a60cb594b787
+EBUILD diffuse-0.6.0.ebuild 1356 BLAKE2B 90d9cfbbdfd808ad3dbe96b5d5096ae1d7948bf5261540ba651d2c380b9afe61a8745e3e90edef3d27239fadfab3a73a3de4a99480ef435671cfe5548265dc7e SHA512 8a43b4807b1679209e4f46d58f49c1f19523545c9a76ccef7a6856bd1252d79c851ba2e300947191201f5069ee8cc79024da1d6dc9a27d11681b36d475055fe4
 MISC metadata.xml 323 BLAKE2B cc8163e0d9562747e2d52729e8298b38ba93b077f3b6a387a800c4720d52ad90bc13482f4120ba9ca9a41ee65e15e2ed2d52b81c41d9906c0ee2b677d4c67b8f SHA512 327c3e242485b96d7923358eb647b5a711d87b6b75c0cf76f01b6118b5b9a3436b0286de1e390a07a76d78d752b701a51319f5c35e24af2160dd6745521d965c
diff --git a/dev-util/diffuse/diffuse-0.6.0.ebuild b/dev-util/diffuse/diffuse-0.6.0.ebuild
index 3a755a4b5aeb..45e2c14bd2c8 100644
--- a/dev-util/diffuse/diffuse-0.6.0.ebuild
+++ b/dev-util/diffuse/diffuse-0.6.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 PYTHON_COMPAT=( python3_{7..9} )
 PLOCALES="cs de es it ja ko pl pt ru sv th zh_CN zh_TW"
-inherit meson python-single-r1 l10n xdg-utils
+inherit meson plocale python-single-r1 xdg-utils
 
 DESCRIPTION="A graphical tool to compare and merge text files"
 HOMEPAGE="http://diffuse.sourceforge.net/ https://github.com/MightyCreak/diffuse/"
@@ -28,7 +28,7 @@ DEPEND="${DEPEND}
 
 src_prepare() {
 	default
-	l10n_find_plocales_changes translations '' '.po'
+	plocale_find_changes translations '' '.po'
 
 	rm_locale() {
 		rm -f translations/${1}.po
@@ -38,7 +38,7 @@ src_prepare() {
 		sed -e "/^${1}/d" -i translations/LINGUAS
 	}
 
-	l10n_for_each_disabled_locale_do rm_locale
+	plocale_for_each_disabled_locale rm_locale
 }
 
 src_install() {
diff --git a/dev-util/gdbus-codegen/Manifest b/dev-util/gdbus-codegen/Manifest
index 297affc4522c..885ab950f529 100644
--- a/dev-util/gdbus-codegen/Manifest
+++ b/dev-util/gdbus-codegen/Manifest
@@ -3,5 +3,5 @@ AUX setup.py-2.32.4 192 BLAKE2B 574320d89095d1452a3eee4404b5ebb19fbed32febf2a154
 DIST glib-2.68.2.tar.xz 4944192 BLAKE2B d35489dcfe9d57d8bd6ecf4f893b7c8e93a5b8108765791071fc811598d1f41287e03d95f20591d50d51a78db34f11833cc7970b1bf29299385357a14977ba0b SHA512 74d481552629cab67d22f8a440a7263a4e4b83adb6f3b772d368e255c17321b206aafd3af4653e5efbb2c3c14ca67d35f453728cbc5cd68728275d0b56789019
 DIST glib-2.68.3.tar.xz 4945236 BLAKE2B 6086b7490f418cb98119ab25670766e3a84de81fd180dbc6e8f929d8f8ab748b0ae7ad6a85f5419ab3c00589c3afba95972d8b4541b310acdf6b6dc9b460a07d SHA512 fb120105c4cb582491a53a0e4c61fe4bdd1f94b279bb7c362afd591369ede50a196c706375564ededf3550d4062a285b038e20b605e6d5dfe36f5d208f4bad3f
 EBUILD gdbus-codegen-2.68.2.ebuild 2182 BLAKE2B 741ec8a0d0b2d882043adab8f0e1226c6aff3414ab29b8b4ec8e321fcba5cbdd242e02e8a20d6538c3b7fca3672b2f5aa6d44f09debbce61d6442a377e78cfa4 SHA512 4e5ae6e7b0afadf83abee18973a71e0c0801f8cfded55df24baeda5bc182222f77935eb4a44cd881d6271c14f6972be097e9567c956a152ef15bef967922093b
-EBUILD gdbus-codegen-2.68.3.ebuild 2190 BLAKE2B 76ed4b80e4192e59b7f720c08c3dd989b80f44164f0700b3cb95433e99a1079082496479a975d19d10a3753999ebdc891c67f1f4e89e9a0b1f0175d1f2480db1 SHA512 6b1e79b3c796a6481841635cf0f287717949f0262bf031c0417a68b0b93fb603139b29bf3105f2a5d5c83b4a390f4a98311eb2a325299cb95c991c1fd2fc7b12
+EBUILD gdbus-codegen-2.68.3.ebuild 2188 BLAKE2B d4777e26ba0102d80cd657301fd601e24558c3ccddb3afaf3e4a56b435e2566e8226eca1ac63785833c5e7d6fa40e71156431dd763091734dae85be7869827f7 SHA512 acfe8dbdff009f529db4618627ea214e2eb01df563ae6091783a6ea131cdabe53079456f4d7d1e3b319fcff0647502f191d21bde739dc813cab4dea920f95b73
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.68.3.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.68.3.ebuild
index f79468dd48ce..a5bd7e419617 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.68.3.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.68.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://www.gtk.org/"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="${PYTHON_DEPS}"
 DEPEND="${RDEPEND}"
diff --git a/dev-util/glib-utils/Manifest b/dev-util/glib-utils/Manifest
index f3dac0feaf3e..e2b65f5d5c37 100644
--- a/dev-util/glib-utils/Manifest
+++ b/dev-util/glib-utils/Manifest
@@ -1,5 +1,5 @@
 DIST glib-2.68.2.tar.xz 4944192 BLAKE2B d35489dcfe9d57d8bd6ecf4f893b7c8e93a5b8108765791071fc811598d1f41287e03d95f20591d50d51a78db34f11833cc7970b1bf29299385357a14977ba0b SHA512 74d481552629cab67d22f8a440a7263a4e4b83adb6f3b772d368e255c17321b206aafd3af4653e5efbb2c3c14ca67d35f453728cbc5cd68728275d0b56789019
 DIST glib-2.68.3.tar.xz 4945236 BLAKE2B 6086b7490f418cb98119ab25670766e3a84de81fd180dbc6e8f929d8f8ab748b0ae7ad6a85f5419ab3c00589c3afba95972d8b4541b310acdf6b6dc9b460a07d SHA512 fb120105c4cb582491a53a0e4c61fe4bdd1f94b279bb7c362afd591369ede50a196c706375564ededf3550d4062a285b038e20b605e6d5dfe36f5d208f4bad3f
 EBUILD glib-utils-2.68.2.ebuild 2324 BLAKE2B 14053ce23924b454e18751045fecaf44fab2ddfeae9c92c94d51c4330c4e8e011481fdf36f0d3900f2df8db8fe6300df4b72fd806ddef79c0513e84dcdd18bbd SHA512 e9d496fd828a32ef852877913fbb1fc855fce580ed135e175644220429a4d49421278e7f6e4adcaf1474ed390284d287b3eb00ecbac37e6d585beaf70d6d641b
-EBUILD glib-utils-2.68.3.ebuild 2332 BLAKE2B 0f54cd1381a48b546ee77599660d40a83f605c29c43a713d7908b416f4933345a46ed186762fc05f8fbec59dffb6bdcc56c926d7e70996b3ae71b5cc1621235b SHA512 0fcf59511090213835d203d12d150070ffb6e3432f2e6a99fe32198a4a0088f9934e81f4033e13dfba3ce8e7a730417b9a4a6c56a722b6cbf9ff92654395328b
+EBUILD glib-utils-2.68.3.ebuild 2330 BLAKE2B 9c1b388930cb908f7f1d2398f76eefedc7521fcfe4cc5ab52a7ab31effc32d1f56e3f53eaa3a3f6edb57edf8ae99805277406e180b5ab27473bc4519c2008275 SHA512 d04d6b66d9c14a59d9d51478b1f135792fdc751ab18bfe4822b93ef39db5a3a2951e7cdb241428e327b07811cd2f4148664bfba223398586b0eee41632e1e33e
 MISC metadata.xml 332 BLAKE2B 1e3c081ae9a2c8ae53cee6c3ae133cbd5e8543a68c03d4a4f7e164437502d996ea9364789e93114687271e1f472bcf13a418cca5b74ecb95a51849f0a5f3dafa SHA512 f7680d9be4071b841f50ece99b5041dc492901d84ae05383c1ff05b6a73bab804b153a50eb70f5417137f6e2041230c5ba8eaede10f7a0bf8a899508642588c6
diff --git a/dev-util/glib-utils/glib-utils-2.68.3.ebuild b/dev-util/glib-utils/glib-utils-2.68.3.ebuild
index 8bdd1b9a92db..33abe13ea327 100644
--- a/dev-util/glib-utils/glib-utils-2.68.3.ebuild
+++ b/dev-util/glib-utils/glib-utils-2.68.3.ebuild
@@ -14,7 +14,7 @@ LICENSE="LGPL-2.1+"
 SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 
 RDEPEND="${PYTHON_DEPS}"
 DEPEND="${RDEPEND}"
diff --git a/dev-util/jenkins-bin/Manifest b/dev-util/jenkins-bin/Manifest
index 990591f48bb0..4637dd195e6e 100644
--- a/dev-util/jenkins-bin/Manifest
+++ b/dev-util/jenkins-bin/Manifest
@@ -2,12 +2,8 @@ AUX jenkins-bin-r2.init 1782 BLAKE2B 25c78b64308be71d605f3c4f2d33c5cf1074ab431e2
 AUX jenkins-bin-r2.logrotate 479 BLAKE2B ccfe2179a1c3a5a49140373bb594fd4fd2c40edb7ffc7fcdeef6dd7a8da0116bb7f1d7da42f914b779651a6b69c147cbbacd02bb6f5fc1ecd7a8b3269ace56de SHA512 b06d0900e92d14fe6bfd194d5eee667e40a49a13d57c6a1720767a925b5647da1d7b2e6239e7d64d86ff7798df215cac6332e09a89e11ab6fe1a1dc42ac818aa
 AUX jenkins-bin-r2.service 566 BLAKE2B 38511fddc783a70ae3deab70526c737a883ef090bcfb20216658b0775667022782f3ee8a6638515b46e6a4df96228fb2368521c74a0ddca2f121e9170549df8e SHA512 87b59349edcb1503e6c91440327092732f0dddb8cc35e4576c81da55e08a2ad67d462a4d871c46da4f3ed037de8b9109d766ba36ca9acf244506d129766ed5cb
 AUX jenkins-bin.confd 998 BLAKE2B 5c44e37118e15fdd76fc7eb0e10e06683828d3efe086877a49d048334c7f94ea915040943b20ff96b7b60f983a434f1cd2c15743d2c387c86915e0597ac5ed1d SHA512 465ade6325efa05b4a150234f847ad19b9824f667fdc8f783af3d9842afc2815ee3d20dfd9566348701102bf28e1e0627af27ae43d055a9a6279ed638d8ece8b
-DIST jenkins-bin-2.289.1.war 74253062 BLAKE2B 142ef28f6d0e0a5445de3d758137b7a46e35e347cfaefdf88e3140afbdadd0499f4b900f16ebee9632ad0d66c0895f7e0905abeb997c1c4467839b53cc9f4027 SHA512 4d17cc0b5099231f4468a2160b8d174f9602930be9c8bf59a0a0ababf6bf0cf6ddf7e727add19f2dc04a5a6a538f53761a97d250745cb8c787c11a347c1908a6
 DIST jenkins-bin-2.289.2.war 74258848 BLAKE2B d217375b2846093430822392ec58fa0a44b1c2c0a311c8b1f057053911f0050c69df74d3a972c3ba84915a34ed999a8220318b2e8a22540234f89cc3d2e69194 SHA512 b1e82bd3297c2cc1c40dbe076d57eaaeb73102389ea5cdbbbe599644b92e107cdd8d8b2604125683ac986db0eaaa8a33dcc769bea8ce56cf9b292e6dff0e5c95
-DIST jenkins-bin-2.297.war 71626854 BLAKE2B ebfbd8beef01a9fa9f5be608d2287cc6f3e021b9d4f620bf9206b30334602502fe78836fe70d5a672f7e9b985b39bda79bc85fc592c018887a73ec999c81e270 SHA512 bb7c78d30409696483ce50a14ef68923e8c51969df9ff5d20efa1f550ef9f0204aa96c23e2737ae847d554d879e4bb3f2e546b4fb0714afcc9401e8cb84a1824
 DIST jenkins-bin-2.300.war 71017525 BLAKE2B 26fab2a5f26a59a2e137f8a3eb1b84e17a14c48cf7ce8171176ad60c66acf939a73cd397266abd3d779f1fc293acbae96076bd506e53cde2ba5a4b7630f0a75d SHA512 fc9903d3e280af3ab68a3926950cefda13d77a03c1366f3a88c2681163da668793a79104ec6de153df76d32f655253a327e85e468449de81897658da4184eece
-EBUILD jenkins-bin-2.289.1-r1.ebuild 1106 BLAKE2B 8c0c672d140152b492d16a6199e1cdb7c7cf6b43189e3f694e6d7fd9f14eb1ae56be43e05bececddcfa08efed55c5c453d31481e3bddc9d4e3c414791fa3e017 SHA512 909f9120605b66bd35369495ef5c6f5ad6be9f9f62e07502d6e28186807e7b6a8e218595e54ba468312003801d564a7cd7ae234b89f9bf09268e2f40defacf2e
 EBUILD jenkins-bin-2.289.2.ebuild 1106 BLAKE2B 8c0c672d140152b492d16a6199e1cdb7c7cf6b43189e3f694e6d7fd9f14eb1ae56be43e05bececddcfa08efed55c5c453d31481e3bddc9d4e3c414791fa3e017 SHA512 909f9120605b66bd35369495ef5c6f5ad6be9f9f62e07502d6e28186807e7b6a8e218595e54ba468312003801d564a7cd7ae234b89f9bf09268e2f40defacf2e
-EBUILD jenkins-bin-2.297-r1.ebuild 1099 BLAKE2B b59b9cd91612f6f0d8f65bc28c21787c9853929306cf521b8779f81b4d2bbb59e555ca5b18a9a6f417acbcddb40a63b0f0440498301f03d90d9ff8efb64cca12 SHA512 47409e719a68d55bbc7ae5a12655e4eb78e160c7276ed7e9e93cd9dc258c987d669691077e612961dbb7009b91facd4e3aa92172d6acc6e21b36fd9b4ea98dbb
 EBUILD jenkins-bin-2.300.ebuild 1099 BLAKE2B b59b9cd91612f6f0d8f65bc28c21787c9853929306cf521b8779f81b4d2bbb59e555ca5b18a9a6f417acbcddb40a63b0f0440498301f03d90d9ff8efb64cca12 SHA512 47409e719a68d55bbc7ae5a12655e4eb78e160c7276ed7e9e93cd9dc258c987d669691077e612961dbb7009b91facd4e3aa92172d6acc6e21b36fd9b4ea98dbb
 MISC metadata.xml 397 BLAKE2B b1a7fd87c8d5857ab102ec3d3bf5830c26c6988bb97caf89018b05e159f038c9c3a092b4f35788929d05042ac5cfd694bd03a8381686b9472880d0d205a451cd SHA512 4087fd799f4019f09103fb32d7f120e74d94715205bcc66858d11b9457774acaed37f3ad97ca0328f4ec28230a409dcfb0cbaceec142eb0a5fd3241ca35f8810
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.289.1-r1.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.289.1-r1.ebuild
deleted file mode 100644
index 4f917fe82dac..000000000000
--- a/dev-util/jenkins-bin/jenkins-bin-2.289.1-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd
-
-DESCRIPTION="Extensible continuous integration server"
-HOMEPAGE="https://jenkins.io/"
-LICENSE="MIT"
-SRC_URI="http://mirrors.jenkins-ci.org/war-stable/${PV}/${PN/-bin/}.war -> ${P}.war"
-SLOT="lts"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux"
-IUSE=""
-
-DEPEND="acct-group/jenkins
-	acct-user/jenkins"
-
-RDEPEND="acct-group/jenkins
-	acct-user/jenkins
-	media-fonts/dejavu
-	media-libs/freetype
-	!dev-util/jenkins-bin:0
-	>=virtual/jre-1.8.0"
-
-S="${WORKDIR}"
-
-src_install() {
-	local JENKINS_DIR=/var/lib/jenkins
-
-	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
-
-	insinto /opt/jenkins
-	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}-r2.logrotate ${PN/-bin/}
-
-	newinitd "${FILESDIR}"/${PN}-r2.init jenkins
-	newconfd "${FILESDIR}"/${PN}.confd jenkins
-
-	systemd_newunit "${FILESDIR}"/${PN}-r2.service jenkins.service
-
-	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
-}
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.297-r1.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.297-r1.ebuild
deleted file mode 100644
index af8ebb51388e..000000000000
--- a/dev-util/jenkins-bin/jenkins-bin-2.297-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd
-
-DESCRIPTION="Extensible continuous integration server"
-HOMEPAGE="https://jenkins.io/"
-LICENSE="MIT"
-SRC_URI="http://mirrors.jenkins-ci.org/war/${PV}/${PN/-bin/}.war -> ${P}.war"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux"
-IUSE=""
-
-DEPEND="acct-group/jenkins
-	acct-user/jenkins"
-
-RDEPEND="acct-group/jenkins
-	acct-user/jenkins
-	media-fonts/dejavu
-	media-libs/freetype
-	!dev-util/jenkins-bin:lts
-	>=virtual/jre-1.8.0"
-
-S="${WORKDIR}"
-
-src_install() {
-	local JENKINS_DIR=/var/lib/jenkins
-
-	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
-
-	insinto /opt/jenkins
-	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}-r2.logrotate ${PN/-bin/}
-
-	newinitd "${FILESDIR}"/${PN}-r2.init jenkins
-	newconfd "${FILESDIR}"/${PN}.confd jenkins
-
-	systemd_newunit "${FILESDIR}"/${PN}-r2.service jenkins.service
-
-	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
-}
diff --git a/dev-util/libabigail/Manifest b/dev-util/libabigail/Manifest
index 8123ec59d1f5..89d759868ee9 100644
--- a/dev-util/libabigail/Manifest
+++ b/dev-util/libabigail/Manifest
@@ -1,5 +1,5 @@
 DIST libabigail-1.6.tar.gz 176133766 BLAKE2B 4a8fd6861f2213f45bbc5814a8a4e0941c236660ea6f84f09eedf6c08eff963c956f27967581501cd73b51057c3d36a74d53b6bf63d0be4d2c931d465d0564eb SHA512 2ba775bd836b53265dae60e66065fc2106e7f633e890cc70b6abacb8426e04ec0b7b38593c21336f5785cf5e4eb8d110fb15ce63124cddc59f660f31c7b25b3c
 DIST libabigail-1.8.2.tar.gz 258919334 BLAKE2B 6e06c888dcc3f5e0fc5d4046e69f14ba06b3a78206f89e32e4687b07aae1e1d798582285cff5ac9f43d6ba326fe11ec11552eefb5ed05813c25785e337092ba2 SHA512 fa8edaf39632e26430481f15e962a098459eac087074e85ca055293ba324ec5944c45880fcb36f1c54a64652605a439cbf9247dfea9bfd3ec502cc7292dd1c8d
 EBUILD libabigail-1.6.ebuild 1505 BLAKE2B eaf813c7f56b0d703e03ae350885ed6beb54fa7dd08bc62eb58c7b935d4d4a9857f7c8f0e130ee74334bb52c1f967e334d835922ea52569f435df5857276adbf SHA512 5b6db24c5a22f369675f0a1e308ad42b4e79940a8e632503c28f43c528051227a2cb808e050c2cc5918fc519002bedcabb3f8a745bc7c3a125596650a57b84d4
-EBUILD libabigail-1.8.2.ebuild 1507 BLAKE2B ce5cf5f1ab6829a4d7665f66bd38197ea942b1ecefeb94a71d824baa14a3e7ac7a14f39010ca6cf20f4a71cfcd7e66f88fe7a0add7c161f8ca50e3992766c014 SHA512 7eee82bb72ba18edc2852db198c7d6b95e84e998245bb98852c4b64142a31afe689c0ae43c181c63f40478edb5b46ff7d74b177d28f9237c07c83131c9c9974b
+EBUILD libabigail-1.8.2.ebuild 1514 BLAKE2B 0dd6747cbacc667a2f967a87415c37e386c1cd4edf0e3fc9c373b375136c2a1496c4a84afd58159e3dff1483d9337ba8c3df0bdcd4d2762ea7b36d8ff688b953 SHA512 6c6b06af24bbd8e448b92b094d6c1ebf507f369a5c4541ec5c76a53d373f9d34aab2800ab0e0367b3d91a1073ce94181ab8b791076676b48219fa38a508b37e9
 MISC metadata.xml 244 BLAKE2B bd2c6209566a4936a38d9109a9a533aa1669dd50701ff8a96d2a65411aa692517ab70cafd98afcad7058979d62f1a7ac796c5b99a520c0f6ca1ed92cf9e0e207 SHA512 57959095dc10704e073e5517ac49ceee80e42fb1cc3f26b1b7308f872ffda810ce42e0b80ea6da57faa7a759878a9b8d2476fe351fecac1450f9c83751802787
diff --git a/dev-util/libabigail/libabigail-1.8.2.ebuild b/dev-util/libabigail/libabigail-1.8.2.ebuild
index 33dbef7e4574..21168a763469 100644
--- a/dev-util/libabigail/libabigail-1.8.2.ebuild
+++ b/dev-util/libabigail/libabigail-1.8.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://mirrors.kernel.org/sourceware/libabigail/${P}.tar.gz"
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~ppc64"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index 788f2ef306c6..7e2fe722070e 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -1,13 +1,11 @@
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81
 DIST llvmorg-12.0.0.tar.gz 134226215 BLAKE2B f9c3ba8c58571855caa4f206fd285c9b5be66672fb0814cb8bc0964a051f57f5d35013aa1e27cbda502652b37df1ec23474129109e76a42066847860db441dbe SHA512 0cff02155c5ac0d6db2b72d60d9819d5b5dd859663b45f721b1c7540239c2fceb1f57d9173f6870c49de851c242ed8e85c5c6d6577a1f8092a7c5dcd12513b26
-DIST llvmorg-12.0.1-rc1.tar.gz 134261735 BLAKE2B d29510495641c06e6d7a5ac165e6d34e0ba15d1a5b786534e186e341e3a0550cdd3d8a2b61deb3e2bf44c0b0ff8561224bf7f8cebc2ce9415639cb67ceae289e SHA512 4595a26df56eed7d5941240fe92116ad2f1c61639f0f464697c2c530a601347032fbad6802d1fa915ced8574c7b30ef05bc8c0be737784c844d3860892817e6e
-DIST llvmorg-12.0.1-rc2.tar.gz 134274147 BLAKE2B 2d3f6ce8d5239cf2e5ea52f4b9020d6a8fedb8d6a4df02ca0d8e4398237f4eb967865e1e65570d16cd191865281b9619a63905c1e1c47b31183b881e97e49867 SHA512 cdebb954016dc92251cd9c6281804f7a36e7bc8c6f101a6817d96cc121aba4d361fb99501c259409a29c90d7749b224be670c41177fe43fa64b730ff294831b8
+DIST llvmorg-12.0.1-rc4.tar.gz 134278617 BLAKE2B d407421c7244bb125151e69e2a341f1af0a0cf8c1fda3b8ae3d4114c3a285d6307620bbf82b22d96d2c7782b37b0975e87be80c24e3ce1fdc71152734be1e8f8 SHA512 1a2c18435a970491eb9fc9381ba66af726e17dcbd5bf6774f9341b1e82fd35f2e5686844743f5317ebd2106b902c39e09aa98102e58a86e290b29102241c949f
 EBUILD lldb-10.0.1.ebuild 2336 BLAKE2B a9ddc5d6965882c37d0cf11e6331e77130c16ea9d60a90c8733c67b8bef0e947656a0c9e1888d483d4b497453475490b9d8bdd85f1396a8be605efec076d5db8 SHA512 7b352de97e3c2cfbf75e724f2e8a6b393bfc5d6240c4067f4f7bf3d04c52e769de6cf85743635410ea4938e587acc4fc925eb501e51733c6a80d442e0df098a0
 EBUILD lldb-11.1.0.ebuild 2343 BLAKE2B ad45919d6e378904f946147277776a8f8dab3b16c64a0ee7f92e5d11d5efc67896151c1f90cf7fd08109b2343816222b1dee706bfa3c14de3ccd1c160091b4bb SHA512 461a00a379331e6e47115c412878d8bac8c8f04f233d7245548769527809a02672e3cefbcbfa3c39e2d71db1b144693fa57ce5f3328d57cd078f49683654d488
 EBUILD lldb-12.0.0.ebuild 2415 BLAKE2B 12061d64f8e264dd341e4831a575473bd16b92b70a12d25e6b9f4197d784bb1f671f3591eeeac2b0e8c3ae529880fa58acaae7da5ea3a174e823c3dfe6412f6f SHA512 ae8afe01ff6959cac205830a811eab50588568f9d0016ff9ff468894375b64deb4d359140636066b72efd2eca12019522647b2b4b59b5ed1d9a90c3aeef25d7a
-EBUILD lldb-12.0.1.9999.ebuild 2396 BLAKE2B 113bec8d6f4cce99e0156c39fc23deb6fc90a220aaedbfec32769174a33bb40856e5afee02dad197b40e445df71cd2829a1198a7821ef661f28ce42e28b3f5e3 SHA512 7947f7f49e61d05c1dc8b21171d1b462ff2058f2bdaa080ffd3ff65b4cf7cc74084008e8aa9235627de6d4ef156121ebb6c20c353663d379f2d9aae1661179b6
-EBUILD lldb-12.0.1_rc1.ebuild 2396 BLAKE2B 113bec8d6f4cce99e0156c39fc23deb6fc90a220aaedbfec32769174a33bb40856e5afee02dad197b40e445df71cd2829a1198a7821ef661f28ce42e28b3f5e3 SHA512 7947f7f49e61d05c1dc8b21171d1b462ff2058f2bdaa080ffd3ff65b4cf7cc74084008e8aa9235627de6d4ef156121ebb6c20c353663d379f2d9aae1661179b6
-EBUILD lldb-12.0.1_rc2.ebuild 2396 BLAKE2B 113bec8d6f4cce99e0156c39fc23deb6fc90a220aaedbfec32769174a33bb40856e5afee02dad197b40e445df71cd2829a1198a7821ef661f28ce42e28b3f5e3 SHA512 7947f7f49e61d05c1dc8b21171d1b462ff2058f2bdaa080ffd3ff65b4cf7cc74084008e8aa9235627de6d4ef156121ebb6c20c353663d379f2d9aae1661179b6
-EBUILD lldb-13.0.0.9999.ebuild 2396 BLAKE2B 113bec8d6f4cce99e0156c39fc23deb6fc90a220aaedbfec32769174a33bb40856e5afee02dad197b40e445df71cd2829a1198a7821ef661f28ce42e28b3f5e3 SHA512 7947f7f49e61d05c1dc8b21171d1b462ff2058f2bdaa080ffd3ff65b4cf7cc74084008e8aa9235627de6d4ef156121ebb6c20c353663d379f2d9aae1661179b6
+EBUILD lldb-12.0.1.9999.ebuild 2397 BLAKE2B c1eef59c390f1d068c0d3a88a7904de48c4d4eb11d0ac24f5da867f9b615f4fad80060c4bfb5476ebacf7d30101327e1a8f458f03b8f18bf142edd7fac1ca8e0 SHA512 cc2296e0d6dc7b5174cae77a10f3f1c175d31b3aaa122e64c96ba1f1f6e970adef1d545fa021f8338a3e18c256d60f67d150c176c3e268d0636d9ce17501703a
+EBUILD lldb-12.0.1_rc4.ebuild 2397 BLAKE2B c1eef59c390f1d068c0d3a88a7904de48c4d4eb11d0ac24f5da867f9b615f4fad80060c4bfb5476ebacf7d30101327e1a8f458f03b8f18bf142edd7fac1ca8e0 SHA512 cc2296e0d6dc7b5174cae77a10f3f1c175d31b3aaa122e64c96ba1f1f6e970adef1d545fa021f8338a3e18c256d60f67d150c176c3e268d0636d9ce17501703a
+EBUILD lldb-13.0.0.9999.ebuild 2397 BLAKE2B c1eef59c390f1d068c0d3a88a7904de48c4d4eb11d0ac24f5da867f9b615f4fad80060c4bfb5476ebacf7d30101327e1a8f458f03b8f18bf142edd7fac1ca8e0 SHA512 cc2296e0d6dc7b5174cae77a10f3f1c175d31b3aaa122e64c96ba1f1f6e970adef1d545fa021f8338a3e18c256d60f67d150c176c3e268d0636d9ce17501703a
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-util/lldb/lldb-12.0.1.9999.ebuild b/dev-util/lldb/lldb-12.0.1.9999.ebuild
index 283e64ba210c..468fe7b0cf61 100644
--- a/dev-util/lldb/lldb-12.0.1.9999.ebuild
+++ b/dev-util/lldb/lldb-12.0.1.9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit cmake llvm llvm.org python-single-r1 toolchain-funcs
 
 DESCRIPTION="The LLVM debugger"
diff --git a/dev-util/lldb/lldb-12.0.1_rc2.ebuild b/dev-util/lldb/lldb-12.0.1_rc2.ebuild
deleted file mode 100644
index 283e64ba210c..000000000000
--- a/dev-util/lldb/lldb-12.0.1_rc2.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit cmake llvm llvm.org python-single-r1 toolchain-funcs
-
-DESCRIPTION="The LLVM debugger"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS=""
-IUSE="+libedit lzma ncurses +python test"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-RESTRICT="test"
-
-RDEPEND="
-	libedit? ( dev-libs/libedit:0= )
-	lzma? ( app-arch/xz-utils:= )
-	ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
-	python? (
-		$(python_gen_cond_dep '
-			dev-python/six[${PYTHON_USEDEP}]
-		')
-		${PYTHON_DEPS}
-	)
-	~sys-devel/clang-${PV}[xml]
-	~sys-devel/llvm-${PV}
-	!<sys-devel/llvm-4.0"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	>=dev-util/cmake-3.16
-	python? ( >=dev-lang/swig-3.0.11 )
-	test? (
-		$(python_gen_cond_dep "
-			~dev-python/lit-${PV}[\${PYTHON_USEDEP}]
-			dev-python/psutil[\${PYTHON_USEDEP}]
-		")
-		sys-devel/lld
-	)
-	${PYTHON_DEPS}"
-
-LLVM_COMPONENTS=( lldb )
-LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest )
-llvm.org_set_globals
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLLDB_ENABLE_CURSES=$(usex ncurses)
-		-DLLDB_ENABLE_LIBEDIT=$(usex libedit)
-		-DLLDB_ENABLE_PYTHON=$(usex python)
-		-DLLDB_ENABLE_LZMA=$(usex lzma)
-		-DLLDB_USE_SYSTEM_SIX=1
-		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
-
-		-DLLDB_INCLUDE_TESTS=$(usex test)
-
-		-DCLANG_LINK_CLANG_DYLIB=ON
-		# TODO: fix upstream to detect this properly
-		-DHAVE_LIBDL=ON
-		-DHAVE_LIBPTHREAD=ON
-
-		# normally we'd have to set LLVM_ENABLE_TERMINFO, HAVE_TERMINFO
-		# and TERMINFO_LIBS... so just force FindCurses.cmake to use
-		# ncurses with complete library set (including autodetection
-		# of -ltinfo)
-		-DCURSES_NEED_NCURSES=ON
-
-		-DLLDB_EXTERNAL_CLANG_RESOURCE_DIR="${BROOT}/usr/lib/clang/${PV%_*}"
-
-		-DPython3_EXECUTABLE="${PYTHON}"
-	)
-	use test && mycmakeargs+=(
-		-DLLVM_BUILD_TESTS=$(usex test)
-		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
-		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-		-DLLVM_LIT_ARGS="$(get_lit_flags)"
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check-lldb-lit
-	# failures + hangs
-	#use python && cmake_build check-lldb
-}
-
-src_install() {
-	cmake_src_install
-	find "${D}" -name '*.a' -delete || die
-
-	use python && python_optimize
-}
diff --git a/dev-util/lldb/lldb-12.0.1_rc1.ebuild b/dev-util/lldb/lldb-12.0.1_rc4.ebuild
index 283e64ba210c..468fe7b0cf61 100644
--- a/dev-util/lldb/lldb-12.0.1_rc1.ebuild
+++ b/dev-util/lldb/lldb-12.0.1_rc4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit cmake llvm llvm.org python-single-r1 toolchain-funcs
 
 DESCRIPTION="The LLVM debugger"
diff --git a/dev-util/lldb/lldb-13.0.0.9999.ebuild b/dev-util/lldb/lldb-13.0.0.9999.ebuild
index 283e64ba210c..468fe7b0cf61 100644
--- a/dev-util/lldb/lldb-13.0.0.9999.ebuild
+++ b/dev-util/lldb/lldb-13.0.0.9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit cmake llvm llvm.org python-single-r1 toolchain-funcs
 
 DESCRIPTION="The LLVM debugger"
diff --git a/dev-util/ltrace/Manifest b/dev-util/ltrace/Manifest
index 3a800c6c865b..70049ebb065f 100644
--- a/dev-util/ltrace/Manifest
+++ b/dev-util/ltrace/Manifest
@@ -17,4 +17,4 @@ DIST ltrace_0.7.3-6.1.debian.tar.xz 11404 BLAKE2B d38ce51dfcbf809d7622029fb6dd0a
 DIST ltrace_0.7.3.orig.tar.bz2 482658 BLAKE2B 30d1dbb178a41043e4bbbac17a23676db202b64327c9bb4393ae7ace9f5e1a1e2a5ded56cabc7faf2ea55b22ed17126a94c121147aeefb40250710b7307a50d3 SHA512 a842b16dcb81da869afa0bddc755fdff0d57b35672505bf2c7164fd983b1938d28b126714128930994cc1230ced69d779456d0cfc16f4008c9b6d19f0852285d
 EBUILD ltrace-0.7.3.6.1.ebuild 2071 BLAKE2B c2ce6a6f96bddb7c888f53b1487ed5ef16d56858c328d27536d55189e5d358652572a1817f55f87bc6b0c89f53083dc3b43a5b4591833de1101be8eedbbb71c4 SHA512 9b44939be42c26e86c61ccfbfffd6c9bc749b90d9c4fd14bdd5caa4991839ea12221ea63bdf764ffdd760168cfbfb4809691775aba596075b5d5d7afb1e99ee2
 EBUILD ltrace-0.7.3_p4-r1.ebuild 2059 BLAKE2B 18f68766243bb36ac07581b4b8acb2bb981d157c0b7767e897598b0b1ceae3fe52b90fb2b702d669b704259db00cee1f30a9883e3bf399fc7a1fb88e1cc9d217 SHA512 8c85708282e7e5fb1f9f3226fb1e074e63579a17addd15b7f93c3f2f5471814284c8ac2d869dd699b438aac0ad082ab7aaa6ef175d336230791c2288a3adc932
-MISC metadata.xml 463 BLAKE2B 8ea04502515bbaaeade9d2e15f21973d307f44be7f02b87aa311a8a9f173307578caf53b4cbd585986b64b351b9bd17a50aeaed32e5d84cf1aa9eedffcc35ac7 SHA512 7a4c8a4dc798b58f1720602a5693d35be4771aa0305c9882fabfa6864e7500a1ff55081c0588ba64dec387cbc40c23fe3427c16e3175dfb216ab64f48600fe95
+MISC metadata.xml 351 BLAKE2B 10ba0f4d5e3d25ad4600055231bbe91e49f92c51b146e767f2ec961802f6c1bc9f2f40e537c231b71dd2c93a378b2c4768a7df5f91c385c81f83613377a66c6a SHA512 53e7ecf115629b97964a6df1dbf49c396bd288982cec22ab6abfd6841a94e6695fb863a813286ffa24e04e3d8c5591e656aca7285d9b170e7f87c90cc6ad99c3
diff --git a/dev-util/ltrace/metadata.xml b/dev-util/ltrace/metadata.xml
index 6aab4e7e499e..dc1393caf978 100644
--- a/dev-util/ltrace/metadata.xml
+++ b/dev-util/ltrace/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>slyfox@gentoo.org</email>
-		<name>Sergei Trofimovich</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>marecki@gentoo.org</email>
 		<name>Marek Szuba</name>
 	</maintainer>
diff --git a/dev-util/mingw64-runtime/Manifest b/dev-util/mingw64-runtime/Manifest
index 528231224a06..ec7e3a348e96 100644
--- a/dev-util/mingw64-runtime/Manifest
+++ b/dev-util/mingw64-runtime/Manifest
@@ -2,7 +2,9 @@ AUX mingw64-runtime-7.0.0-fortify-only-ssp.patch 637 BLAKE2B 3a8eff14b3150446da5
 AUX mingw64-runtime-8.0.0-__rdtsc.patch 773 BLAKE2B 8ec970049ee9d1003caed099a6eb0301f066cd3f0986895f08b2912b14248d3c41c87558a1df40b7f452e73d382da73215942827f4e5e551df65d779eda23eef SHA512 df986f2b24ea1e4db7babad2a837a55a59e1abd20f41ef03f438907477829561238a69fa8e8891ede1a45eef6dca36deb82c6be61293ce0f39e7f94f82483cad
 DIST mingw-w64-v7.0.0.tar.bz2 9071231 BLAKE2B da00794ec456ede5913a565248c79255407c058469cb7338cf81b8d03c1e39f4189016b01734b786c0ad8f18166a24fdb95ca72edc954f31151e5d3aa2b2a899 SHA512 30e5b2824a24eeb99ab519e3fc134cc9a7f04ee8b853bc8d66a13d1ab74144bf78b93e162bfe6de2a5e61f63c0e620a933b260b02d019cd68cc4b78bd36c67fd
 DIST mingw-w64-v8.0.0.tar.bz2 9370799 BLAKE2B ec65191722f6f2ddbb93488ea4c4c21e22fb5ef777ef293d65d13de1057d96c9105a4a4936999d4babbd8fdfc52ed14675f1c5fbc630524df28805e0f66b1a2b SHA512 cefcc86ac3e6337c88ed224ab4692abbd5eb543ce78fb6c5462198a85f36c9274a0a1df0a0bebd182137fd527c15831f9237c782711a85f32e77d9104b28359e
+DIST mingw-w64-v9.0.0.tar.bz2 9537758 BLAKE2B 298b97f50c7632972aee2c75e90de0776f64c1dd5aaeb52d4e4be10a8e0365efee82c93179990cc090cc7b9f83525a7abf51a5d069b7a3e39abb37fdb733a70c SHA512 6691331a2ab521d22c1d32bebe0ed049bd62a7a7722cff38e7792b4e42c6b8df4356084afff6c916b487b3ebddc4372b398ab7cd0c7f4ff6991a70fe64177386
 EBUILD mingw64-runtime-7.0.0-r1.ebuild 2982 BLAKE2B 8f053374e0a9efb5d5bf80f2da61ba9e3c5b4fdc46c70b68bea330dff90e35aa1063b2a46634344c32af369f3f595220a5546b06f07cca8f9684a75be1330e49 SHA512 207053be905bba9e9a956d1c0fa3d4ba10280e3c92ad958f0aa3b9408ab6473333dabb6472d5217ccdfb5f4fc8343bc80f4728105b708ec75071772226ae1099
 EBUILD mingw64-runtime-8.0.0-r1.ebuild 3030 BLAKE2B 9a90af1f77827b0fb93194b28d115cd32a0ea45f78366bb07c19b8536ed93b7059fc8eaf85537988779b2a30e7cc0738306c713be944e22b27a0250cbe298bc7 SHA512 0892656f775b1d550ca486a2a02703caf4d56c46c7dd96f7e66f10b260062a97759d2e2cb5e690b1a809e8c6b09c5d3a4e4a0f98c2dac479ce6c67feb490e210
 EBUILD mingw64-runtime-8.0.0.ebuild 2989 BLAKE2B eff772061575f14ffcc9b85a1c6d4658eb2854b19a9b103eecb8e579bbf44e31084c1e915dff3415cecfcf0ae3e41444c31b7f4d5a5559c9c0addd2a94129999 SHA512 baff94670008ee2e907924fa7c0cc6c86f7902ceb60fe39e53a4d6d3b3a093bfce0270b89bc2a11ef0c11e724d1e3fd90de04b1ab0ae3b40cb934971d834f4e3
+EBUILD mingw64-runtime-9.0.0.ebuild 3030 BLAKE2B 9a90af1f77827b0fb93194b28d115cd32a0ea45f78366bb07c19b8536ed93b7059fc8eaf85537988779b2a30e7cc0738306c713be944e22b27a0250cbe298bc7 SHA512 0892656f775b1d550ca486a2a02703caf4d56c46c7dd96f7e66f10b260062a97759d2e2cb5e690b1a809e8c6b09c5d3a4e4a0f98c2dac479ce6c67feb490e210
 MISC metadata.xml 563 BLAKE2B 84e56e99482d2f7bb1e1095d84915b42190ba74fe7242ffdce548c4249a40be17018a29911d32b9b09df8fc5e04d912dcfe6f473e5eb2478f55d317808b24f4b SHA512 27dca35a3b2d5444b712802c3099c595d9b9fda21f29b6b709222e5bb0aad78f353d0170500eb3b632b254935d35cf43fc43d4ecb61722b711799ca4d28211bd
diff --git a/dev-util/mingw64-runtime/mingw64-runtime-9.0.0.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-9.0.0.ebuild
new file mode 100644
index 000000000000..3dfff3894bf5
--- /dev/null
+++ b/dev-util/mingw64-runtime/mingw64-runtime-9.0.0.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY} == cross-* ]] ; then
+		export CTARGET=${CATEGORY#cross-}
+	fi
+fi
+
+inherit autotools flag-o-matic toolchain-funcs
+
+DESCRIPTION="Free Win64 runtime and import library definitions"
+HOMEPAGE="http://mingw-w64.sourceforge.net/"
+SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PV}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+# USE=libraries needs working stage2 compiler: bug #665512
+IUSE="headers-only idl libraries tools"
+RESTRICT="strip"
+
+S="${WORKDIR}/mingw-w64-v${PV}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-7.0.0-fortify-only-ssp.patch
+	"${FILESDIR}"/${PN}-8.0.0-__rdtsc.patch
+)
+
+is_crosscompile() {
+	[[ ${CHOST} != ${CTARGET} ]]
+}
+just_headers() {
+	use headers-only
+}
+alt_prefix() {
+	is_crosscompile && echo /usr/${CTARGET}
+}
+crt_with() {
+	just_headers && echo --without-$1 || echo --with-$1
+}
+crt_use_enable() {
+	just_headers && echo --without-$2 || use_enable "$@"
+}
+crt_use_with() {
+	just_headers && echo --without-$2 || use_with "$@"
+}
+
+pkg_setup() {
+	if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
+		die "Invalid configuration"
+	fi
+}
+
+src_configure() {
+	CHOST=${CTARGET} strip-unsupported-flags
+	# Normally mingw-64 does not use dynamic linker.
+	# But at configure time it uses $LDFLAGS.
+	# When default -Wl,--hash-style=gnu is passed
+	# __CTORS_LIST__ / __DTORS_LIST__ is mis-detected
+	# for target ld and binaries crash at shutdown.
+	filter-ldflags '-Wl,--hash-style=*'
+
+	if ! just_headers; then
+		mkdir "${WORKDIR}/headers"
+		pushd "${WORKDIR}/headers" > /dev/null
+		CHOST=${CTARGET} "${S}/configure" \
+			--prefix="${T}/tmproot" \
+			--with-headers \
+			--without-crt \
+			|| die
+		popd > /dev/null
+		append-cppflags "-I${T}/tmproot/include"
+	fi
+
+	# By default configure tries to set --sysroot=${prefix}. We disable
+	# this behaviour with --with-sysroot=no to use gcc's sysroot default.
+	# That way we can cross-build mingw64-runtime with cross-emerge.
+	local prefix="${EPREFIX}"$(alt_prefix)/usr
+	CHOST=${CTARGET} econf \
+		--with-sysroot=no \
+		--prefix="${prefix}" \
+		--libdir="${prefix}"/lib \
+		--with-headers \
+		--enable-sdk \
+		$(crt_with crt) \
+		$(crt_use_enable idl idl) \
+		$(crt_use_with libraries libraries) \
+		$(crt_use_with tools tools) \
+		$(
+			$(tc-getCPP ${CTARGET}) ${CPPFLAGS} -dM - < /dev/null | grep -q __MINGW64__ \
+				&& echo --disable-lib32 --enable-lib64 \
+				|| echo --enable-lib32 --disable-lib64
+		)
+}
+
+src_compile() {
+	if ! just_headers; then
+		emake -C "${WORKDIR}/headers" install
+	fi
+	default
+}
+
+src_install() {
+	default
+
+	if is_crosscompile ; then
+		# gcc is configured to look at specific hard-coded paths for mingw #419601
+		dosym usr /usr/${CTARGET}/mingw
+		dosym usr /usr/${CTARGET}/${CTARGET}
+		dosym usr/include /usr/${CTARGET}/sys-include
+	fi
+
+	rm -rf "${ED}/usr/share"
+}
diff --git a/dev-util/visualvm/Manifest b/dev-util/visualvm/Manifest
index 46289c1dd973..80ec41741ef5 100644
--- a/dev-util/visualvm/Manifest
+++ b/dev-util/visualvm/Manifest
@@ -1,5 +1,7 @@
 AUX visualvm-r2.conf 1243 BLAKE2B a1e97a1e1ee914620a29bd68580043654304b9cff29edbb700de02473113a7984f3ec910cbff674465ccab6f1deac4da5412ade9a8069918b4acae839ba8d731 SHA512 0f826859bba484e8eae20750e4c3f021ce129cd06dc6c19cf2724b0c2c3d4c68a4370788bdc5cf7e0859348197466382c877c885937c0a87c0e8467944160bf7
 AUX visualvm-r2.sh 423 BLAKE2B cdc5db4465a339735ccff5f37bed89d76da2f2d514f522b7768fa37aad46804997d267285b09d6346674d43964d0ef0a0cadb24d28e9b90256a593d7420aab4a SHA512 eb7356e10a94db048fb471215b2115b93764931ed4178594bca5a1aac480f2262ef361b2f53fc23dbcdb4d44e1aeab678204c50583abb8016696a7d87288a9bb
 DIST visualvm-2.0.6.tar.gz 39086223 BLAKE2B f5657d4ccc0063281226b4d70c35820c78333db5574bae5acadc321938cfe42a3e0e4c1752badcc3e01b5694f6081213f5da898f5a13587d44e36d18fbd5c2c7 SHA512 03ad628f753e31f26217366d8f5f184f4657ba55badd55f1466dbf00cda61e9c320cc8ddb82b228863b9c6416aec3e94a01c5429e2b2f4664c9daaccd02f5d7b
+DIST visualvm-2.0.7.tar.gz 39155599 BLAKE2B 8a460cb161357114d829d41a7e4b2306e9e0023a6995aceed89cc12fc0b54d5e05402bc1b8c72d4cb3caba5a4844bfbebb4734d7f7c5663343dfb3bd4470945a SHA512 d75217fb1b2a8c4d1c44b600dc42d488be8447fc569f78c10c59954c7c64f8e1ccdeef2e6a7936e7708b9392bbd7634d7149c6d6cc797df1f0036c6c473398ff
 EBUILD visualvm-2.0.6.ebuild 1903 BLAKE2B 612e393a06c26225c1f0e76925dfc447d41e7843e63b26a0019126f674b4a09b418fa10dd7b1b8471000b1573fd211e8ea778b08fd55ac986cc48ea34eddc83e SHA512 8123f7999a45111a745f7e8e38fde858d7af3cea4032c8d72cd3e46e91d412c128b2541082960fb212f45592aaabfbdf08c9e14083b8c463f7b9635d6a85d0df
+EBUILD visualvm-2.0.7.ebuild 1904 BLAKE2B 302b2318c8f5be891333ff791de2834a47f2c1a67225a1837c181190c55008ea03e5ad96c8766b6a0d738f47dc9ecd5398b72391bff572de68dfe5d5843b1b92 SHA512 c4c921215285343094f8e31faf4b3cde7bfca6e77e23b2fad60e91ebf0e098626b160f47fcc50faf12b9ae7b796cbbe31a50b5389af8fbe6c757a93200942bf9
 MISC metadata.xml 316 BLAKE2B ad191b52b75273728dec1af289e8df2ee7d538cde7dd30b2c8facd2623a6984de090356891a9e9f992d99da4bff9ae48be15bc7257987e8b6419fe8beaa979d9 SHA512 46972dae3e0d778f11af43101b50944f9edd850d1e7eecca9f5bf08c4db438dd53415348f61b85f37f788435410867e61bb516960d4ceb6edb8e88fde71cb243
diff --git a/dev-util/visualvm/visualvm-2.0.7.ebuild b/dev-util/visualvm/visualvm-2.0.7.ebuild
new file mode 100644
index 000000000000..e132e704c5ce
--- /dev/null
+++ b/dev-util/visualvm/visualvm-2.0.7.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+NBV=113
+NBT=27102020
+NBZ=nb${NBV}_platform_${NBT}.zip
+
+inherit java-pkg-2 java-ant-2 desktop
+
+DESCRIPTION="Integrates commandline JDK tools and profiling capabilities"
+HOMEPAGE="https://visualvm.github.io"
+
+# Netbeans plattform is already included in the main archive this time
+#    SRC_URI="https://github.com/oracle/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+#       https://github.com/oracle/${PN}/releases/download/${PV}/${NBZ}"
+SRC_URI="https://github.com/oracle/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="7"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=virtual/jre-1.8"
+
+# it does not compile with java 11
+DEPEND="
+	virtual/jdk:1.8"
+
+S="${WORKDIR}/${P}/${PN}"
+
+QA_PREBUILT="
+	/usr/share/visualvm/platform/modules/lib/amd64/linux/libjnidispatch-nb.so
+	/usr/share/visualvm/cluster/lib/deployed/jdk1[56]/linux-amd64/libprofilerinterface.so
+"
+
+EANT_BUILD_TARGET=build
+INSTALL_DIR=/usr/share/${PN}
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd "${S}" || die
+	# unpack ${NBZ}
+	unpack "${S}"/"${NBZ}"  # archive is included in the main archive
+}
+
+src_prepare() {
+	default
+
+	# Remove unneeded binaries
+	rm -rv netbeans/platform/lib/*.{dll,exe} \
+		netbeans/platform/modules/lib/{amd64/*.dll,i386,x86} || die
+	find libs.profiler/lib.profiler/release/lib/deployed/jdk1? -mindepth 1 \
+		-maxdepth 1 ! -name linux-amd64 -exec rm -rv {} + || die
+}
+
+src_install() {
+	# this is the visualvm cluster
+	insinto ${INSTALL_DIR}
+	doins -r build/cluster netbeans/{harness,platform}
+
+	# configuration file that can be used to tweak visualvm startup parameters
+	insinto /etc/${PN}
+	newins "${FILESDIR}"/${PN}-r2.conf ${PN}.conf
+
+	# visualvm runtime script
+	newbin "${FILESDIR}"/${PN}-r2.sh ${PN}
+
+	# makes visualvm entry
+	make_desktop_entry ${PN} VisualVM java "Development;Java;"
+}
diff --git a/dev-util/vulkan-headers/Manifest b/dev-util/vulkan-headers/Manifest
index 7dc309d2d98f..faff9424edbb 100644
--- a/dev-util/vulkan-headers/Manifest
+++ b/dev-util/vulkan-headers/Manifest
@@ -1,8 +1,10 @@
 DIST vulkan-headers-1.2.162.tar.gz 852973 BLAKE2B 3907c247f115f4dee2fc8697f157aeb30a3ef91a774132591771c0b327090abf7c0caad2082edb86c787883c167ce1ffe75c199d9b94fc642aae30526f5311cd SHA512 7b33f6ef32f1ef34d3b37ad38b077a3a2ebcef62612371afa1b6f4910815bbab8418a837c49b3872b57d2e5012c15623521121f5d62836e46d6f20773841d7b0
 DIST vulkan-headers-1.2.170.tar.gz 890902 BLAKE2B a38fa355e1716940f2bd34b4ac7e90ef95bf85da13b19e6408b488051441c20f9618e044d72ca06e1906851bb54b3087e894d6aeeb786a8dd028885f08d485ba SHA512 458e69f34776eb032ef9024744b34083c2a5e3dd074d511a3076d6be61a03dbe1383e6588979e700099a13a6411a72eaba97df9f0968b0b98e85049bc62a1c73
 DIST vulkan-headers-1.2.179.tar.gz 1048047 BLAKE2B 7ffdbc12e9bd3f1f37598620c03989a7e70d98af8c42c660ab52478857fbe32a215ca1fba2b43ff25fe1c61f4c09d439ab353d6ba2a4044894219eee4e9cc981 SHA512 c82ae0de40c19db97c385fe3012beb6018f57d96f8bfa5829c77416730fdbffdb03aaaa96710a3a52d3b3e03d86a5089383f504a86d7cb3fa7ee61077dad3ee7
+DIST vulkan-headers-1.2.182.tar.gz 1162517 BLAKE2B 0dd396dde2cea94529b99a079cb082d01b4223cd1a63a4bff6405f882b95d896080d62ebfe34365ee104de8530ceaaba6f889443a813926838c82db9938d5ee0 SHA512 045091ad94d335fb4743fb033ca581a5c128b23633d61dc403bddfef8f88b6ae86afff628b2f2f333ee5edfb0f6f68f060e2402d27d5ab53eaed850a16de8782
 EBUILD vulkan-headers-1.2.162.ebuild 611 BLAKE2B a0dc00cde81752730cd13704bd71f06943f2a523306bb250ec4043c2cbbb7fccf9a9ab4e90ca7bb6811852f9b866940a7722e623dea0d36abff1d7001d8ffe40 SHA512 e08e859280da3384fc8248b255333b8e781e4a6d57c3cf8952b37f905bc78b5ca8df25bae6d79f39ca52bf21f1e11786bd2b60d0d70cb7a6b93eb66cb49e0b7c
 EBUILD vulkan-headers-1.2.170.ebuild 611 BLAKE2B a0dc00cde81752730cd13704bd71f06943f2a523306bb250ec4043c2cbbb7fccf9a9ab4e90ca7bb6811852f9b866940a7722e623dea0d36abff1d7001d8ffe40 SHA512 e08e859280da3384fc8248b255333b8e781e4a6d57c3cf8952b37f905bc78b5ca8df25bae6d79f39ca52bf21f1e11786bd2b60d0d70cb7a6b93eb66cb49e0b7c
 EBUILD vulkan-headers-1.2.179.ebuild 617 BLAKE2B de17fc55658dff792497262a77db71dbc9a360c6a35497522a7681452bf52398f90435bf6738477f09fa4cc1fcf96c3785ed6b222d9d7a5bb4ff257778dc63eb SHA512 9396dd22eee89217748990fcd336163561244de835947edc5ab6028b63ab16666c9ce28fb737563d572891de036bf3b435b68f6a89191bd2f97b12575af1b80e
+EBUILD vulkan-headers-1.2.182.ebuild 617 BLAKE2B de17fc55658dff792497262a77db71dbc9a360c6a35497522a7681452bf52398f90435bf6738477f09fa4cc1fcf96c3785ed6b222d9d7a5bb4ff257778dc63eb SHA512 9396dd22eee89217748990fcd336163561244de835947edc5ab6028b63ab16666c9ce28fb737563d572891de036bf3b435b68f6a89191bd2f97b12575af1b80e
 EBUILD vulkan-headers-9999.ebuild 593 BLAKE2B 101dc4954cc61f0375202d2398a3bab6e99e379f9dbc3aaab01129670e0413cba3fc9d15f031a44f634ec7576f0cd6bbd52ccfdbec0de9d703f6db5a9a2eff52 SHA512 a95238b09e9d71d72588e9e90af0d99590a8d4fffb6b134cc75c5b9bfc542c40f7a438447ce06aaf4a5ea5922d9ce49763af91b49934c8f66fc5dbb1d7ea8246
 MISC metadata.xml 431 BLAKE2B 69dedef8b74edc3fa3b45eb8af40784b585f84007d205c4db52c3d05abccb20e7c078708f3bcedcc8dac268eced84c03b0bf92cd836ee7a9f2dda01b1c87a65d SHA512 88631011f2fc130495c8a9feeb24691389bfac96a8db4b1bc4b5503e354f0fa882a516ba1af7bcf72d7604c8974ab72a2189c8cd7feddefaaaada54cb405898d
diff --git a/dev-util/vulkan-headers/vulkan-headers-1.2.182.ebuild b/dev-util/vulkan-headers/vulkan-headers-1.2.182.ebuild
new file mode 100644
index 000000000000..9eea670b13dc
--- /dev/null
+++ b/dev-util/vulkan-headers/vulkan-headers-1.2.182.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN=Vulkan-Headers
+inherit cmake
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+	S="${WORKDIR}"/${MY_PN}-${PV}
+fi
+
+DESCRIPTION="Vulkan Header files and API registry"
+HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Headers"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+BDEPEND=">=dev-util/cmake-3.10.2"
diff --git a/dev-util/vulkan-tools/Manifest b/dev-util/vulkan-tools/Manifest
index c66c48b6c3f1..09a89e7e37b9 100644
--- a/dev-util/vulkan-tools/Manifest
+++ b/dev-util/vulkan-tools/Manifest
@@ -1,8 +1,10 @@
 DIST vulkan-tools-1.2.162.tar.gz 724232 BLAKE2B 16eb2dde35883fb2c7c263a72a615818ff8e1557ac9d74553ec3784d96a827e6900efa4e42218cb9081f7501d9b1a53eac82c360c2d20922043308515ab48983 SHA512 7827f6775dfb26820a2a2cbc60e7da8c7e7bdcb57b65523fbc6b2e989ae6869b04a57ae458c72715722c67d842660574697834c92f9b909dd5673da1945ac6dc
 DIST vulkan-tools-1.2.170.tar.gz 835063 BLAKE2B 5b7b9c9ea07b3a25d2b989a0981417b4a1c4f97d03fc9f1ab765ac2ade3bd33e99657813a3cb6b3290559539cd9dca3d6992cacf848c0ea9eee536eeef99553f SHA512 0cc361c1a7cecf74dab25e6a4bead7870a0cf363b07a6e5fbd6fa245027fb8e4f2b651affda095fadad90e114507c4f80370c2fcb4e6b9cbc013eac8a67d2d6b
 DIST vulkan-tools-1.2.179.tar.gz 843725 BLAKE2B 0304f7672b5405404dca9b9800dd0927f3af0f17580f021bc30e651ecda5b5e6194971a6a95e30cce956d094cc8fbab580f0f0ecd8fa4c81a9bc15ced5ad92ac SHA512 227b5023c21720c94fb5583f0f6635cf2b9d8067cae02dc6f22f39a106bc0b3e569b2730a1dc4fd469fe0a5e5653167fdc56fe37852a1acfc38df953b4524dcc
+DIST vulkan-tools-1.2.182.tar.gz 847991 BLAKE2B 5ab9d73383338bcc3c54487f0f433466d9974269d3be2aa0d50281affeee8fb94414eb638fc94be6fd2dc059c0a2d3dca4e9a8caf3e2b8758c03c57373e2f73b SHA512 5cc9500923288641529556e82a708b88f7dc775c75166d10ae2a807562ce9dda3993aa01a261ff4f9c2cc31ea47423a12f21ec64d32e6aee66ef7c3fc2dc17fc
 EBUILD vulkan-tools-1.2.162.ebuild 1881 BLAKE2B 4c9129b5619a374830b27c7d425f2c119e1613a667c9d901101cdf0a59ae5c9c70d340e5fdf885b1b84901df01f152b03a4e687d1674d9d8ad65620fdb30a386 SHA512 ec5501ccda226135f0b33c818c6c5fe1fd33325d3bb01586775a55d6236e1d5aec3bac9c87cc309f88a648df0754bfaae310cfd92e4a818c4bd8024d3c46e3b1
 EBUILD vulkan-tools-1.2.170.ebuild 1881 BLAKE2B 4c9129b5619a374830b27c7d425f2c119e1613a667c9d901101cdf0a59ae5c9c70d340e5fdf885b1b84901df01f152b03a4e687d1674d9d8ad65620fdb30a386 SHA512 ec5501ccda226135f0b33c818c6c5fe1fd33325d3bb01586775a55d6236e1d5aec3bac9c87cc309f88a648df0754bfaae310cfd92e4a818c4bd8024d3c46e3b1
 EBUILD vulkan-tools-1.2.179.ebuild 1865 BLAKE2B d1666ff63c8fc969109848012d01ca40071995b98fda6203c5663a9cc4443d4f452272837a1c1aafc74646e95a78057971ddbeb4633f1d13158108fb297e16b3 SHA512 abe5dcc70239e8d31d31412a8beed52c8c3dfcd03889857e8ae91923f16435fc413fdda9aa5137f4b7801ab2deb0f6b94c3aea6e0f53c8cf33b32eae127bda70
+EBUILD vulkan-tools-1.2.182.ebuild 1865 BLAKE2B d1666ff63c8fc969109848012d01ca40071995b98fda6203c5663a9cc4443d4f452272837a1c1aafc74646e95a78057971ddbeb4633f1d13158108fb297e16b3 SHA512 abe5dcc70239e8d31d31412a8beed52c8c3dfcd03889857e8ae91923f16435fc413fdda9aa5137f4b7801ab2deb0f6b94c3aea6e0f53c8cf33b32eae127bda70
 EBUILD vulkan-tools-9999.ebuild 1860 BLAKE2B 90d45eff50aecafa4f59ddfcfe22919ad54c32d75f8d1c398cc91286ce092a32bfe34c168f29355b51284226f04879f3de7b236770dc8f4e4599b0466ad22cdf SHA512 ae072450e257f0766f657be7bcad7180679eed3983858284fe649e59f9acdc2039cf6f23f146aa67c542d7576caae9b564d9f31b88fd4db034a541ce9a552b15
 MISC metadata.xml 499 BLAKE2B 9ede9725de281e0877f865e41ce68be15d5c04fd95023d3ab1180f4987c506a8f12ad23412ecf5795f6f8e6f36e576bc65f7cef786ced70296f5a4a8584ac4f1 SHA512 eb5dbcfbb58449c5a6ae7580f0c8a25c06f85fd6ac32fe1354fffe550214465921dace3c05264c11517d7dbeeffa444eb468d63f4781c6383f4be8a4202ecefd
diff --git a/dev-util/vulkan-tools/vulkan-tools-1.2.182.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.2.182.ebuild
new file mode 100644
index 000000000000..fd88aef18326
--- /dev/null
+++ b/dev-util/vulkan-tools/vulkan-tools-1.2.182.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN=Vulkan-Tools
+CMAKE_ECLASS="cmake"
+PYTHON_COMPAT=( python3_{8,9} )
+inherit cmake-multilib python-any-r1
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
+	EGIT_SUBMODULES=()
+	inherit git-r3
+else
+	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv"
+	S="${WORKDIR}"/${MY_PN}-${PV}
+fi
+
+DESCRIPTION="Official Vulkan Tools and Utilities for Windows, Linux, Android, and MacOS"
+HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Tools"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="cube wayland +X"
+
+# Cube demo only supports one window system at a time
+REQUIRED_USE="cube? ( ^^ ( X wayland ) )"
+
+BDEPEND="${PYTHON_DEPS}
+	>=dev-util/cmake-3.10.2
+	cube? ( dev-util/glslang:=[${MULTILIB_USEDEP}] )
+"
+RDEPEND="
+	>=media-libs/vulkan-loader-${PV}:=[${MULTILIB_USEDEP},wayland?,X?]
+	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
+	X? (
+		x11-libs/libX11:=[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}
+	>=dev-util/vulkan-headers-${PV}
+"
+
+pkg_setup() {
+	MULTILIB_CHOST_TOOLS=(
+		/usr/bin/vulkaninfo
+	)
+
+	use cube && MULTILIB_CHOST_TOOLS+=(
+		/usr/bin/vkcube
+		/usr/bin/vkcubepp
+	)
+
+	python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=ON
+		-DBUILD_VULKANINFO=ON
+		-DBUILD_CUBE=$(usex cube)
+		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
+		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
+		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
+		-DVULKAN_HEADERS_INSTALL_DIR="${ESYSROOT}/usr"
+	)
+
+	use cube && mycmakeargs+=(
+		-DGLSLANG_INSTALL_DIR="${ESYSROOT}/usr"
+		-DCUBE_WSI_SELECTION=$(usex X XCB WAYLAND)
+	)
+
+	cmake_src_configure
+}
+
+multilib_src_install() {
+	cmake_src_install
+}