gentoo resync : 07.05.2021

26 files changed, 180 insertions, 201 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index cdedbf7f5560..67dba90fcfa2 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/ebuildtester/Manifest b/dev-util/ebuildtester/Manifest
new file mode 100644
index 000000000000..cc8935bdac2d
--- /dev/null
+++ b/dev-util/ebuildtester/Manifest
@@ -0,0 +1,8 @@
+AUX ebuildtester.bash-completion 538 BLAKE2B b56fd67648a73b184c6965c1377066bfded9e3adc795a06e8a753dd27784b9171589119cc8c4e26dd0b03def5c0fb6668f9ef960f7f93da34e33c996373b923f SHA512 21c413a8aa7ddaae5e11c4f279f9c6ffd700e8fc3f64c1df6cd07087d5cd0e6097e193a01bc266ec669dbb3d516e1e6361c3e1461e8ee07ecd7cd4fae05482f5
+DIST ebuildtester-0.1.27.tar.gz 17347 BLAKE2B 4b4b97235b073bfa1fc78dd3e4f5d03a2e64b277a8675669061beef3185e87c01f882ae830fc5c11b1ba97ea5deb50e93b7cc02b78cef5a0046bb7f2c7ac3433 SHA512 f50fb020e47750c318d0198628721adf166ee3d8544be50169b2012ad72370f063b1367e521af842df0574e491d469e5c2a6aba1576a9f364c95e72a9579950d
+DIST ebuildtester-0.1.29.tar.gz 17446 BLAKE2B d0dccc4e290e9907b90d93ecd87cb263e842ee60944ea9e8a0cb3864029595a5979c16e3c13d59dfd6d5bdc989a6211bf56262b88bbf2f28a86b236f1c305fd9 SHA512 4093df87f85fc581dc1b286b7377929f111d0f1efc960d7623ff3cbd833ef997174b0508422567de819490c30a8246a431d6a29bf71f1e828064b3987bd129a4
+DIST ebuildtester-0.1.30.tar.gz 17436 BLAKE2B 264a10b1f61fcb9ef0ef232118ab1f830da4754ddf724d9797beaabbbd03b6d8a6c790150847dde2f8a0436a71ea0351b547ea3996709da41abcaad02cdfcac8 SHA512 0138b220bfc109ea05a8052150150ca38e6612e7089926d88f5a8dc99f7c27b16adce10cce1779f981eb8bb4ee05a2aac381d5a875ef38ffa83243a2945d3666
+EBUILD ebuildtester-0.1.27.ebuild 747 BLAKE2B b46af72fb9ef83aa005b144b0072edcdd06be51e77ff3cc63912b6ad39bae54420a5a13d28754a3942b1e84f8f084291475748c56a197140405ae8280dcf70f3 SHA512 55865a40e59e3079bcff7ce61ff46c28e0b787c3139d0a68966bd9caa1f966f08bfe5521c2141bb70d86c71f7d56b355004db7b19414c62f0cc61799a9cc4baa
+EBUILD ebuildtester-0.1.29.ebuild 747 BLAKE2B b46af72fb9ef83aa005b144b0072edcdd06be51e77ff3cc63912b6ad39bae54420a5a13d28754a3942b1e84f8f084291475748c56a197140405ae8280dcf70f3 SHA512 55865a40e59e3079bcff7ce61ff46c28e0b787c3139d0a68966bd9caa1f966f08bfe5521c2141bb70d86c71f7d56b355004db7b19414c62f0cc61799a9cc4baa
+EBUILD ebuildtester-0.1.30.ebuild 747 BLAKE2B b46af72fb9ef83aa005b144b0072edcdd06be51e77ff3cc63912b6ad39bae54420a5a13d28754a3942b1e84f8f084291475748c56a197140405ae8280dcf70f3 SHA512 55865a40e59e3079bcff7ce61ff46c28e0b787c3139d0a68966bd9caa1f966f08bfe5521c2141bb70d86c71f7d56b355004db7b19414c62f0cc61799a9cc4baa
+MISC metadata.xml 297 BLAKE2B 05f415213e45849ac677a97c4cff26321825063b9a1026150831a64fc0b164001c13c8d8ac34048acca005e188796ce05b7150d97951cc861962a21da07d1436 SHA512 fbc9cabab9c3d9f281384b2c937d13602811023027cc1a30f31ccc13b1cb45fb1f60754ac5b7626b865c20be0dfe928b1b8890388a7642e452a227f99e0617c7
diff --git a/dev-util/ebuildtester/ebuildtester-0.1.27.ebuild b/dev-util/ebuildtester/ebuildtester-0.1.27.ebuild
new file mode 100644
index 000000000000..b6204349693b
--- /dev/null
+++ b/dev-util/ebuildtester/ebuildtester-0.1.27.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="A dockerized approach to test a Gentoo package within a clean stage3 container"
+HOMEPAGE="https://ebuildtester.readthedocs.io/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	app-emulation/docker
+	sys-fs/fuse
+"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]
+"
+
+src_install() {
+	distutils-r1_src_install
+	newbashcomp "${FILESDIR}/${PN}.bash-completion" "${PN}"
+}
diff --git a/dev-util/ebuildtester/ebuildtester-0.1.29.ebuild b/dev-util/ebuildtester/ebuildtester-0.1.29.ebuild
new file mode 100644
index 000000000000..b6204349693b
--- /dev/null
+++ b/dev-util/ebuildtester/ebuildtester-0.1.29.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="A dockerized approach to test a Gentoo package within a clean stage3 container"
+HOMEPAGE="https://ebuildtester.readthedocs.io/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	app-emulation/docker
+	sys-fs/fuse
+"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]
+"
+
+src_install() {
+	distutils-r1_src_install
+	newbashcomp "${FILESDIR}/${PN}.bash-completion" "${PN}"
+}
diff --git a/dev-util/ebuildtester/ebuildtester-0.1.30.ebuild b/dev-util/ebuildtester/ebuildtester-0.1.30.ebuild
new file mode 100644
index 000000000000..b6204349693b
--- /dev/null
+++ b/dev-util/ebuildtester/ebuildtester-0.1.30.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="A dockerized approach to test a Gentoo package within a clean stage3 container"
+HOMEPAGE="https://ebuildtester.readthedocs.io/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	app-emulation/docker
+	sys-fs/fuse
+"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]
+"
+
+src_install() {
+	distutils-r1_src_install
+	newbashcomp "${FILESDIR}/${PN}.bash-completion" "${PN}"
+}
diff --git a/dev-util/ebuildtester/files/ebuildtester.bash-completion b/dev-util/ebuildtester/files/ebuildtester.bash-completion
new file mode 100644
index 000000000000..ca0266720622
--- /dev/null
+++ b/dev-util/ebuildtester/files/ebuildtester.bash-completion
@@ -0,0 +1,20 @@
+_ebuildtester() {
+    local cur prev opts
+    COMPREPLY=()
+    cur="${COMP_WORDS[COMP_CWORD]}"
+    prev="${COMP_WORDS[COMP_CWORD-1]}"
+    opts="--help --portage-dir --overlay-dir --update --atom --threads"
+
+    if [[ ${cur} == -* || ${COMP_CWORD} -eq 1 ]] ; then
+        COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
+        return 0
+    fi
+
+    case "${prev}" in
+        --portage-dir|--overlay-dir)
+            COMPREPLY=( $(compgen -o dirnames -A directory ${cur}) )
+            ;;
+    esac
+
+}
+complete -F _ebuildtester ebuildtester
diff --git a/dev-util/ebuildtester/metadata.xml b/dev-util/ebuildtester/metadata.xml
new file mode 100644
index 000000000000..17fead7d2c14
--- /dev/null
+++ b/dev-util/ebuildtester/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>nicolasbock@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">ebuildtester</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/gi-docgen/Manifest b/dev-util/gi-docgen/Manifest
index 48b9d8694111..48074622dfee 100644
--- a/dev-util/gi-docgen/Manifest
+++ b/dev-util/gi-docgen/Manifest
@@ -1,3 +1,3 @@
 DIST gi-docgen-2021.5.tar.gz 1251568 BLAKE2B 6dfd34ba97881562e5474874e3d51214b9536356d02c341ac2e7b135c49c5948114e0c78b2d53678ca09006238ec5ead50a1c0a50328ea5392960cd8c434c8e9 SHA512 30b91c2edf4be92eb4164ba64433948d2ae1c2857e54ac07a71aa1393d2ab61b77371c03504b521049f1841093ef3384788eaffab4208ef4e6fda8f254736ec6
-EBUILD gi-docgen-2021.5.ebuild 849 BLAKE2B 78a6d7017ab44595ddb7f4dee4136619e01206c106cc8c205b11a39798e923424fa48f3aba6ad321ef633c6a9d2269763bf42468a8fdfa4fa8320b9141b6cbfd SHA512 1a746cecd2b0a3e5b2b6980b319e425d89a289c121c356e340566adcdae63875febc05df87b7453118d04b2e81027c46513f3061f01ab7adcbb09d08f5f0a1fc
+EBUILD gi-docgen-2021.5.ebuild 862 BLAKE2B 3c83e342d5b37a57ad467d1390ad76078285f19d2f4ee87c788ffb17e72d92d66d260fcfa51609bbc008ef8df7ecba13a5e6b628837c4903362e7407e3a0a9e7 SHA512 3c71ffaab8a8b1896de05682faa1f426c6c5135e95e3f2356fd8ca549f5ca25447b62b090ce4841a830ece42294554d19c2365b0c83b2789728f0ff403da3cb6
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/gi-docgen/gi-docgen-2021.5.ebuild b/dev-util/gi-docgen/gi-docgen-2021.5.ebuild
index f3453e3540d5..69ed1b9834b6 100644
--- a/dev-util/gi-docgen/gi-docgen-2021.5.ebuild
+++ b/dev-util/gi-docgen/gi-docgen-2021.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( Apache-2.0 GPL-3+ ) CC0-1.0 OFL-1.1 MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~ia64 ~sparc"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
diff --git a/dev-util/glade/Manifest b/dev-util/glade/Manifest
index 9be2b64d3e22..bf116eb19e14 100644
--- a/dev-util/glade/Manifest
+++ b/dev-util/glade/Manifest
@@ -2,5 +2,5 @@ AUX glade-3.14.1-doc-version.patch 853 BLAKE2B b7cad3cc9d49cfe24189ba21bffaec2c5
 DIST glade-3.36.0.tar.xz 4466808 BLAKE2B ebc93c9471225782bcbcbafc4a475638e77ad763d607188d95e8ac77b3de70f76fefe963027bb6b32ae71adeb1daafdb1a2c98363b25030d83f20f767613f68e SHA512 c984613ade26e3fe68a700a48cccadf5ac96eb716a6e90aad36f3de684faeb607d9aaf112d74a048cd33e222a02388ee6583ca915648486f0259cc805e16d243
 DIST glade-3.38.2.tar.xz 2709224 BLAKE2B 2bcd447b90d6e67abc44dd273f0f5d7fc1d6848ef0bd878481f2c10e8846828e63fbf9c9c96e5effe8126b4aec7eb05886606ca1dc5fb94943bc5d1d8d0ef4e2 SHA512 2df8c8363206905663cd3ac9196da44445425a888b64f1b3b3ac6cd41e14c4a82a5d2c299730ef0606c3970a04dd8f245bb5639218794eb67dcbd26fae17565e
 EBUILD glade-3.36.0.ebuild 2291 BLAKE2B e14a55178057ebc2f8feaa1be8e1f1fdcaa2eaca28b16bd6f2641f6683d99aa15fdf4dbbc012006bb212354bcb43eafbe7265f8e64c8926b9f8e8e2b81634c3e SHA512 fc273664dfc8f9766bd92a8314ff786a2c232727d62ef0160e547728758e332e4f3ea1857527a3a86c0c07908e60a10d91aa49b2c982887d06e8f0f6e990e720
-EBUILD glade-3.38.2.ebuild 1901 BLAKE2B 8f118d66885a5c06e89c1b137330889286985e32ccc626f27f161e32eb28ecbbb2b6a36d274c77a70e53208c4394736b8e7d763c21d7e4767b66e67fd7fc39da SHA512 a7b4bbcd6942d3634609cd2925c712c129f2ef29dbe7941ea4f522647ae7367d4bf9944435b4bd6531aca641b841ad8e19de6a1640b81559a03c0ae6a7a094d9
+EBUILD glade-3.38.2.ebuild 1900 BLAKE2B 773d69739d1ae310e6867bc4c15ec4ec0a24f7ce772c766e478edf99c2822692ae971e5701e7a000b24c6842fdb8dcb30c353076df0f4e80bb1a91b30ef022e1 SHA512 ffd37e23795ecaff26afaa0fb82a8f89055bfddae95b969cd40839fd69f94b4824fa286d1374e147001cb312550c8db585830aeb16dcf1dd88d0022e14e649cd
 MISC metadata.xml 442 BLAKE2B aff6c373736411da1244bc230767cce9e4edd0d10f51f4157f1cfecbb134b54f282d2504901b621e988e7973fc43e5253d6b0aaefa3c3015ddace6c0790ba13b SHA512 c819e5ce58646f681aa536d6c859bba6e847aa27ba651ea0574bd81008030e359610eb68663a610a20a899a8aa4e94fa215a4085524eed09ab84d5c50fd9a536
diff --git a/dev-util/glade/glade-3.38.2.ebuild b/dev-util/glade/glade-3.38.2.ebuild
index c59c3571ebc3..365fa2842742 100644
--- a/dev-util/glade/glade-3.38.2.ebuild
+++ b/dev-util/glade/glade-3.38.2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://glade.gnome.org/"
 
 LICENSE="GPL-2+ FDL-1.1+"
 SLOT="3.10/13" # subslot = suffix of libgladeui-2.so
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 
 IUSE="gjs gtk-doc +introspection python webkit"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-util/glslang/Manifest b/dev-util/glslang/Manifest
index d1347ead5c66..31401164475b 100644
--- a/dev-util/glslang/Manifest
+++ b/dev-util/glslang/Manifest
@@ -1,6 +1,6 @@
 DIST glslang-10.11.0.0_pre20201216.tar.gz 3290064 BLAKE2B 46ce951ab6c69eb25dc2490e3eb817c5cc0e2bf2416f29842b45bb1efb83ea439d72c823c981e2f37803e203077ea01d1c84c28391fb78288c107510a47d2241 SHA512 4b9e300152dc2ec3b14657b3a745d5b26b5da49e5ff3da0d75680f84126237ec6af0f7cee5aaa74b2d4a123a386522cd7342b5f25e4c01f114da3d5d92057128
 DIST glslang-11.2.0.tar.gz 3295235 BLAKE2B 42417f3be070a57f0c71f5a0c81ffcf4938044c74fd59435fad6889b74c077032fda18e73971db41b180341c1eb6bcdc24081d5ff57fb9baf36c32fbfac9e67a SHA512 0d6cd866c4e28069dbc2c5f0ceba2acab73356751499f8fe81177357c61b2bdae92d2502c47889687d57094dd9fd59b78a06234de1d9c4989a204f9ce3c73751
 EBUILD glslang-10.11.0.0_pre20201216.ebuild 890 BLAKE2B d2ae97e1228f30154c2e0674284aeee59943c6b97c619a594106e0765353c14a58e5a03ab03a024a934ccd6b6d66091764af9ad181dc79f577a495037415ef77 SHA512 889bd334d5a13e3ad22e97de659687bdcdc575f30cb45e21a4c253e469181008a5fdb05ef6ca5a21dc03ae22ef3ebbcf88ac8d09941c1d7ce0442942d826f5a0
-EBUILD glslang-11.2.0.ebuild 861 BLAKE2B bffd4abe4cf2742a3b4b69c8462175a09dca24545000686ef3fd3a5620abf5aa2af5648b0bfadd90871674b3b21534eb3b8f777306c657e56da3b95edfad50ad SHA512 96086d4cade525c556c58b6c869fae8c14dc8d2096b792cc028e989ad65fa5e7a9ca66cad22d01c708abeee810575924c49748b1b27ea18b5ce6d8c686a749fd
+EBUILD glslang-11.2.0.ebuild 855 BLAKE2B 76f4c363a7ef228854cd948e1017f92c5cda2bca6240a4e011745775981a35266e06a84d9aa77092d111b4685218027facdf7390a020f1bfb074598ce5529ea7 SHA512 c6032b4b76e3cdcb80ff17e7c6dacc1df7930fc58869a6a48df3132665f4ad6661cf3b726f70ad2b5ee660331f90daa1607285aec6dbabcaa063e3b41d963f5f
 EBUILD glslang-9999.ebuild 758 BLAKE2B 802d3dec30280cea4dc1c5b8dc652495537f93ef3b52c7d60740d8f9d6ea1343f22b0f0f4b6bc127eb3bca925daf6b1837a1763416cb27489e6db07173aec4ca SHA512 c8db05953380d7c0709e25a9507d5f043a05da423d9e119ae09ef00e5afae939c209b078a0b6da9d6072f07d04c3c20fd9d3827f6fdd71c793ea21036d4e03a6
 MISC metadata.xml 329 BLAKE2B 6238c1e548b8044e1112033dc166f06d7690d05bbdd006670f2151f28640a2c96d9d7fe4d8e6eeb6beb1bd6248cf177315e5cff314593718d838c91a81c02832 SHA512 6242378037de440c8e216330d6f2861ed3d473a0dfe55b9df1234c0956365d3206c1951034b9b2ee31702f741483f4fa113d801c6b1fdece9aad468021202326
diff --git a/dev-util/glslang/glslang-11.2.0.ebuild b/dev-util/glslang/glslang-11.2.0.ebuild
index 2fe500d17138..12268208d43e 100644
--- a/dev-util/glslang/glslang-11.2.0.ebuild
+++ b/dev-util/glslang/glslang-11.2.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	SNAPSHOT_COMMIT="${PV}"
 	SRC_URI="https://github.com/KhronosGroup/${PN}/archive/${SNAPSHOT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
 	S="${WORKDIR}/${PN}-${SNAPSHOT_COMMIT}"
 fi
 
diff --git a/dev-util/gnome-builder/Manifest b/dev-util/gnome-builder/Manifest
index 6cc277ec7e2b..d77985d05063 100644
--- a/dev-util/gnome-builder/Manifest
+++ b/dev-util/gnome-builder/Manifest
@@ -1,7 +1,5 @@
 DIST gnome-builder-3.38.2.tar.xz 12078024 BLAKE2B 9cf8a74be5a48b73c21ce247a07fcb1441482edab8fd118a2d773429f68efcd50f4a8a1ef826cf90a9f76e482f25d9a092ca1700504178051fcf903abe9eb1ae SHA512 6f9d284a9c915562fe55a863ddcc385ca9278b4ee201f4b97272f425937066d630c35c0b337bdf94ce4b12226080a9020eb5dc253ccfb25bc6cdbf8e50779569
-DIST gnome-builder-3.40.0.tar.xz 12088472 BLAKE2B ae392efb375e562b1a2820004a23f6170d78e0cd724924ddd334af7d87ab90e85b0e1996ba593e283a9f8d6e4ae9b5bb9a9d15f61e8ab2f620351ec45434d68b SHA512 9346a42371bd2529a146f81fe5a1b333495c1895978780bcb3748ef7b46e68a08241b261055b855e1d9dca47c1449fbcddc64e8bcfb7e6d780eedea214280fdc
-DIST gnome-builder-3.40.1.tar.xz 12083836 BLAKE2B 3e4dc4e3e2e1356ee3e52c8898d387875cadd9a866d03d409560d6a5322e2d59883115d7cbb7de16f7d51b5afdf0062982e7bf458614db903077ae114e13532b SHA512 aa53a883286a56c5548f30521b5c0c6980d7d53b4c43771da6049e2605ef8f802a1a0079c4347c03dd85545a69d225cf49c162bf2669bb56307f3543597e9083
+DIST gnome-builder-3.40.2.tar.xz 12083992 BLAKE2B 136c3e89378221116b5252a8472768888f11bd580cf9d1d524504f9000b8123ee479e19073630bb678cc7392b716e45d122b406dc7d44b13ba0ba77b435077e0 SHA512 e0d1f0f21fe0f681f87d1ad672cb5bf60df3ef16541fffd8ca62d447339371bdb5cbc10d8fc83496822d6eb35ad8078b095ff97d950d940d862d6fd7968147a4
 EBUILD gnome-builder-3.38.2.ebuild 6819 BLAKE2B da4de776fd37f346f2cd346b0e1e41825106ffdc1b2dacfff145bae47e799d83958ff019adb0ab9c9f12f1ba3e4a055e85cf7897eaa0dde1321d8a4d90aae5bb SHA512 7dd08896e752c1060fa2e82525bd096203cc56fcbf0be2de94432f74a10ceadeec4ef1eca3a8a39f6e5905e8dcfff25eaa9b4c520f4a992f5fc3453d794de83b
-EBUILD gnome-builder-3.40.0.ebuild 7006 BLAKE2B ad8748872d3e8accd07aeb11d4d2f1e67d9e54d5ef41eb810fc64a0c1611d5e918b2c2e6d52ce64e9fe09b506044dbd54133f38854776c13e7d12597b696a950 SHA512 99bf6501c32491a02ce60880e861462b5f7b1606e87e59057a473d8b9e8de820d8d02de2d08c105b35a9ef7f020cc13dc35e734b1c589f7b741954cd4ade0565
-EBUILD gnome-builder-3.40.1.ebuild 7006 BLAKE2B ad8748872d3e8accd07aeb11d4d2f1e67d9e54d5ef41eb810fc64a0c1611d5e918b2c2e6d52ce64e9fe09b506044dbd54133f38854776c13e7d12597b696a950 SHA512 99bf6501c32491a02ce60880e861462b5f7b1606e87e59057a473d8b9e8de820d8d02de2d08c105b35a9ef7f020cc13dc35e734b1c589f7b741954cd4ade0565
+EBUILD gnome-builder-3.40.2.ebuild 7006 BLAKE2B ad8748872d3e8accd07aeb11d4d2f1e67d9e54d5ef41eb810fc64a0c1611d5e918b2c2e6d52ce64e9fe09b506044dbd54133f38854776c13e7d12597b696a950 SHA512 99bf6501c32491a02ce60880e861462b5f7b1606e87e59057a473d8b9e8de820d8d02de2d08c105b35a9ef7f020cc13dc35e734b1c589f7b741954cd4ade0565
 MISC metadata.xml 976 BLAKE2B 088592bf7fc4c650b17862e771d3283aced4d7a5003f66938dd5830c4a8b88884fb46362e50745b09f9903347dad3233b1ba8339bdaa66c7ea9f70024071a3b8 SHA512 136ec6b271c0084e86f8b7e309f46cd89d382e96d815269f50f0dae33795084d17790daf360fb760a17a2d4885a4a5aae5f8563449160ebec49bf4c9f69438a8
diff --git a/dev-util/gnome-builder/gnome-builder-3.40.1.ebuild b/dev-util/gnome-builder/gnome-builder-3.40.1.ebuild
deleted file mode 100644
index 0723a1d75844..000000000000
--- a/dev-util/gnome-builder/gnome-builder-3.40.1.ebuild
+++ /dev/null
@@ -1,183 +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} )
-DISABLE_AUTOFORMATTING=1
-FORCE_PRINT_ELOG=1
-
-inherit gnome.org gnome2-utils llvm meson optfeature python-single-r1 readme.gentoo-r1 virtualx xdg
-
-DESCRIPTION="An IDE for writing GNOME-based software"
-HOMEPAGE="https://wiki.gnome.org/Apps/Builder"
-
-# FIXME: Review licenses at some point
-LICENSE="GPL-3+ GPL-2+ LGPL-3+ LGPL-2+ MIT CC-BY-SA-3.0 CC0-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="clang +devhelp doc +git +glade gtk-doc spell sysprof test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# When bumping, pay attention to all the included plugins/*/meson.build (and other) build files and the requirements within.
-# `grep -rI dependency * --include='meson.build'` can give a good initial idea for external deps and their double checking.
-# The listed RDEPEND order shold roughly match that output as well, with toplevel one first then sorted by file path.
-# Most plugins have no extra requirements and default to enabled; we need to handle the ones with extra requirements. Many of
-# them have optional runtime dependencies, for which we try to at least notify the user via DOC_CONTENTS (but not all small
-# things); `grep -rI -e 'command-pattern.*=' -e 'push_arg'` can give a (spammy) idea, plus python imports in try/except.
-
-# FIXME: plugin_flatpak needs flatpak.pc >=0.8.0, ostree-1, libsoup-2.4.pc >=2.52.0 and git plugin enabled
-# Editorconfig needs old pcre, with vte migrating away, might want it optional or ported to pcre2?
-# An introspection USE flag of a dep is required if any introspection based language plugin wants to use it (grep for gi.repository). Last full check at 3.28.4
-
-# TODO: Handle llvm slots via llvm.eclass; see plugins/clang/meson.build
-# TODO: automagic libportal dep
-# TODO: automagic sysprof dep for tracing paths from toplevel meson.build
-RDEPEND="
-	>=dev-libs/libdazzle-3.37.0[introspection]
-	>=dev-libs/glib-2.67.4:2
-	>=x11-libs/gtk+-3.22.26:3[introspection]
-	>=x11-libs/gtksourceview-4.0.0:4[introspection]
-	>=dev-libs/json-glib-1.2.0
-	>=dev-libs/jsonrpc-glib-3.19.91
-	>=x11-libs/pango-1.38.0
-	>=dev-libs/libpeas-1.22.0[python,${PYTHON_SINGLE_USEDEP}]
-	>=dev-libs/template-glib-3.28.0[introspection]
-	>=x11-libs/vte-0.40.2:2.91[introspection]
-	>=net-libs/webkit-gtk-2.26:4=[introspection]
-	>=dev-libs/libxml2-2.9.0
-	git? ( dev-libs/libgit2:=[ssh,threads]
-		>=dev-libs/libgit2-glib-0.28.0.1[ssh]
-	)
-	dev-libs/libpcre:3
-	dev-libs/libpcre2
-
-	>=dev-libs/gobject-introspection-1.54.0:=
-	$(python_gen_cond_dep '
-		>=dev-python/pygobject-3.22.0:3[${PYTHON_USEDEP}]
-	')
-	${PYTHON_DEPS}
-	clang? ( sys-devel/clang:= )
-	devhelp? ( >=dev-util/devhelp-3.25.1:= )
-	glade? ( >=dev-util/glade-3.22.0:3.10= )
-	spell? ( >=app-text/gspell-1.8:0=
-		app-text/enchant:2 )
-	sysprof? ( >=dev-util/sysprof-3.37.1:0/4[gtk] )
-"
-DEPEND="${RDEPEND}"
-# TODO: runtime ctags path finding..
-
-# desktop-file-utils required for tests, but we have it in deptree for xdg update-desktop-database anyway, so be explicit and unconditional
-# appstream-glib needed for validation with appstream-util with FEATURES=test
-BDEPEND="
-	doc? ( $(python_gen_cond_dep '
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	') )
-	gtk-doc? ( dev-util/gtk-doc
-		app-text/docbook-xml-dtd:4.3 )
-	test? (
-		dev-libs/appstream-glib
-		sys-apps/dbus )
-	dev-util/desktop-file-utils
-	dev-util/glib-utils
-	>=dev-util/meson-0.49.2
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-DOC_CONTENTS='gnome-builder can use various other dependencies on runtime to provide
-extra capabilities beyond these expressed via USE flags. Some of these
-that are currently available with packages include:
-
-* dev-util/uncrustify and dev-python/autopep8 for various Code Beautifier
-  plugin out of the box functionality.
-* dev-util/ctags with exuberant-ctags selected via "eselect ctags" for
-  C, C++, Python, JavaScript, CSS, HTML and Ruby autocompletion, semantic
-  highlighting and symbol resolving support.
-* dev-python/jedi and dev-python/lxml for more accurate Python
-  autocompletion support.
-* dev-util/valgrind for integration with valgrind.
-* dev-util/meson for integration with the Meson build system.
-* dev-util/cargo for integration with the Rust Cargo build system.
-* dev-util/cmake for integration with the CMake build system.
-* net-libs/nodejs[npm] for integration with the NPM package system.
-'
-# FIXME: Package codespell and mention here
-# FIXME: Package gnome-code-assistance and mention here, or maybe USE flag and default enable because it's rather important
-# eslint for additional diagnostics in JavaScript files (what package has this? At least something via NPM..)
-# jhbuild support
-# rust support via rust-analyzer (rls plugin now disabled by default); Go via go-langserver
-# autotools stuff for autotools plugin; gtkmm/autoconf-archive for C++ template
-# gjs/gettext/mono/PHPize stuff, but most of these are probably installed for other reasons anyways, when needed inside IDE
-# stylelint for stylesheet (CSS and co) linting
-# gvls for vala language-server integration
-
-llvm_check_deps() {
-	has_version "sys-devel/clang:${LLVM_SLOT}"
-}
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	use clang && llvm_pkg_setup
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dtracing=false
-		-Dprofiling=false # not passing -pg to CFLAGS
-		-Dtcmalloc=false
-		-Dchannel=other
-
-		$(meson_use doc help)
-		$(meson_use gtk-doc docs)
-
-		-Dnetwork_tests=false
-		$(meson_use clang plugin_clang)
-		-Dplugin_color_picker=false # needs libportal
-		$(meson_use devhelp plugin_devhelp)
-		-Dplugin_deviced=false
-		-Dplugin_editorconfig=true # needs libpcre
-		-Dplugin_flatpak=false
-		$(meson_use git plugin_git)
-		$(meson_use glade plugin_glade)
-		-Dplugin_podman=false
-		$(meson_use spell plugin_spellcheck)
-		$(meson_use sysprof plugin_sysprof)
-		-Dplugin_update_manager=false
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	python_optimize
-	if use doc; then
-		rm "${ED}"/usr/share/doc/gnome-builder/en/.buildinfo || die
-		rm "${ED}"/usr/share/doc/gnome-builder/en/objects.inv || die
-		# custom docdir in build system, blocked by https://github.com/mesonbuild/meson/issues/825
-		mv "${ED}"/usr/share/doc/gnome-builder/en "${ED}"/usr/share/doc/${PF}/html || die
-		# _sources subdir left in on purpose, as HTML links to the rst files as "View page source". Additionally default docompress exclusion of /html/ already ensures they aren't compressed, thus linkable as-is.
-		rmdir "${ED}"/usr/share/doc/gnome-builder/ || die
-	fi
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-	readme.gentoo_print_elog
-
-	optfeature_header "Code beautifiers"
-	optfeature "Python" dev-python/autopep8
-	optfeature "C/C++/Java" dev-util/uncrustify
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
-
-src_test() {
-	# FIXME: can't run meson_src_test together with virtx or dbus-run-session
-	virtx dbus-run-session meson test -C "${BUILD_DIR}"
-}
diff --git a/dev-util/gnome-builder/gnome-builder-3.40.0.ebuild b/dev-util/gnome-builder/gnome-builder-3.40.2.ebuild
index 0723a1d75844..0723a1d75844 100644
--- a/dev-util/gnome-builder/gnome-builder-3.40.0.ebuild
+++ b/dev-util/gnome-builder/gnome-builder-3.40.2.ebuild
diff --git a/dev-util/opencl-headers/Manifest b/dev-util/opencl-headers/Manifest
index 809c83e2da23..7e8f726234a8 100644
--- a/dev-util/opencl-headers/Manifest
+++ b/dev-util/opencl-headers/Manifest
@@ -1,5 +1,7 @@
 DIST opencl-headers-2020.06.16.tar.gz 54769 BLAKE2B 8b8bf4e1948a38e12cbaba8a5df22757136655c72059af3c1e4526db529e272198fb84d805a79b275bf8432eec6a0f102f062f203e5d43b29bb482d109d05b08 SHA512 702c64648cd5d220aaeea1fc7f8a552f3ec75d1a867e1e9db7295452b288f22c2794e7b9a9bce7f01362b1fc2466940eef45aa7e88dd0e5a4570450a79c66391
 DIST opencl-headers-2020.12.18.tar.gz 59558 BLAKE2B e3956e86df3877fc3a73f748be082b9189eda6b52e6fecea19de788cea61fd6486c2407eca0e89bcc73dc873bfefff55affc4ea8142cd09ae86c88e5bc93c723 SHA512 e083c373a2afd81932daa91d4e7fd449ceefae32ce0d7378def19511f35a96005d10f3b38c55def4754dc34dfb311471e8418a5ede389df673eeb7295110060d
+DIST opencl-headers-2021.04.29.tar.gz 59775 BLAKE2B 9e1728ce33066430711de911f4b2713abca5a0a57b8e52cb662aabe37657c703ab39dbbd990332847ae3d9f31f4855708c17832b801f8ca6a6f12ab12b139711 SHA512 370d02044c61f2394e9a8a9772b30b996074e3b51461387a570aaf1c29488844fe9090d873b2679eb4a472135bac7a9ba5590daf9d79c006de17f709afcb74e1
 EBUILD opencl-headers-2020.06.16.ebuild 607 BLAKE2B dc2f65912fb55daeda19f5bf83b09713304eb2e6d9fcaed827e4298e7492436f467b3348dc053e8317364597e44534cee464b057a81e2ffb125fe1a02caaf05f SHA512 27dc174b9cea161c162a2b1511f4f252c1f39fee0c9ad254afcc486d7104ad64034a430981e05490ba1b91672b06767be7682b2b9449af1ea9f17f319ff63080
 EBUILD opencl-headers-2020.12.18.ebuild 609 BLAKE2B 0fd1055b41fbc2b3b996afd9a51d0ab7a645fb97cba6bef71857e725445e13d8a1e624089e7a4fe5ee0ad291789245f8d6cd0a7d37aa780dca2d336e97df956c SHA512 f93611aa63aa761b28f07a8360f0c7f02f60a515526b89f696238a9250db889c10c85dc699e69bb17c050c20a291a41d4747e6641b32d7e1bb12ae2f003a695b
+EBUILD opencl-headers-2021.04.29.ebuild 504 BLAKE2B 82a02684abaa01bd65a9f2a66a196cd10834af0983b36e3eaa400e2b16281a184c1cf09162859b3657ad02ffcdf1780f083cb981ca9f3ddc8051c87a28b8dfb5 SHA512 f3537bdf4727f05029afdfca3d6f5801a9a118c354d90392a9932f5ece48467f339d35083861d100db220e591c7550b6174b2a3f3126a7a47e72e1095ffecdcd
 MISC metadata.xml 1054 BLAKE2B 30fb473e3841df882a700e175f5abef4d5ed0c198c60efdcce36622bb8a1dedf69c1b1a9f745f35b0f2be64fcf13f4c5ca2cd5503dadbf7021a74469f10438fa SHA512 85d2d58484a5def1de36b0922a796658cfcd104c2d25ca6e9916287768955b5a9dc6fce5d00f93211e9ad2b0a743abb07637a78131b6da3bcdfd880c86b7139c
diff --git a/dev-util/opencl-headers/opencl-headers-2021.04.29.ebuild b/dev-util/opencl-headers/opencl-headers-2021.04.29.ebuild
new file mode 100644
index 000000000000..0808709a2f73
--- /dev/null
+++ b/dev-util/opencl-headers/opencl-headers-2021.04.29.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="OpenCL-Headers"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Unified C language headers for the OpenCL API"
+HOMEPAGE="https://github.com/KhronosGroup/OpenCL-Headers"
+SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	insinto /usr/include
+	doins -r "${S}"/CL
+}
diff --git a/dev-util/spirv-headers/Manifest b/dev-util/spirv-headers/Manifest
index 23e096a4a104..c627f1847b09 100644
--- a/dev-util/spirv-headers/Manifest
+++ b/dev-util/spirv-headers/Manifest
@@ -1,6 +1,6 @@
 DIST spirv-headers-1.5.4.1.tar.gz 395834 BLAKE2B e4852f1d694271e9928f1f9aa460c6ba33ad2d0568bd38b24ba31e8dd0390a5542192f9c6977cd3ff4a56520af83280b779fd4e7cece6adc33a5261ef2d2398d SHA512 3578a0210b954e904ac154307a0b98a2c01410adf910e549669109b1b559781959bb5771e39945c50523548a6613d064576fcba15aa3c9125255c0443d3e61a6
 DIST spirv-headers-1.5.4.2_pre20210327.tar.gz 403907 BLAKE2B 9154b2c9abed730c0d292c5adc38d2723a8748d1eaad885ebf624631128edd227521f3e7f7185daddbd9ff404741e9fcd9adcd5eafff7a6a234585c7a327beb5 SHA512 02631716e4307f2bef9e7e294a5e4f2e6f7522f2b42f34eb919c7b8280fa8e55437ff1dcf6b5cf4bcdef062f1f0ed00b3afcb1dd1051b63ad3ec0b5a311b15fa
 EBUILD spirv-headers-1.5.4.1.ebuild 520 BLAKE2B cdc4447f89db8ce4c51313de7f062404c0fbf6b7f30fe33bbaf2853f597c702a0ee406ef626d717e022fe55c2e19104aa67840136057b44231c1054da5ce8961 SHA512 20637f37df7f01a551d19ea6e1e324f4022b0f9a7652fbb69a39fba38748a7c2d13a698233233d666ad3ae5867914d2f2fb75b50ddeb6ba26e12c9ff159ff4bc
-EBUILD spirv-headers-1.5.4.2_pre20210327.ebuild 520 BLAKE2B 5c80438230556f810aee1b9ee8897fee2156d794a599c7e7d06cbad1427ccde2fa973357e4ea8454cb1f98e890b195f11e815ba4325861d2fdbd81b8d67d7b81 SHA512 65f6bafda2e9fd5daa074dd2ee21f312af0685eb9d86392d383aaa84412e4ab4a791fb43d2bf5930f04dba85420b22d2534948501bcc841a35f76ef0789e9f68
+EBUILD spirv-headers-1.5.4.2_pre20210327.ebuild 514 BLAKE2B 3baa735fc68ed6d407a02356bedc3ee715f7f110684bf6b34356d9e176072fcbacca66d2994e6471607044a81c1eca03c6c1c77e989947f456b881ff77c14aae SHA512 811f7deb5744b644935908953bbfc82106e35a04656452cae833bf470d1ee26d3123feafa32c4a80e99f290e52b22d4efe87b9e014f5f8c67897312eabfaaf97
 EBUILD spirv-headers-9999.ebuild 600 BLAKE2B e52054009b4c2a119218fe8e7d1d7606a5355fa93c8a9e14d7e6174dc212d2c87a7d2c57106bd4d217c8fd0ab88234e5a186f700664ccbd04de8b3520afef10e SHA512 420d7be91c892302e0b052c9bf1a628d663f95051a6d38580944aafd1c43c395cb87cec8df6d2d756b8fb4a177b23671911f58c05e9e5b035a41b0b9bb399dfe
 MISC metadata.xml 430 BLAKE2B 6b143a506671795115d2b676cd50050b856f54cb93569d7c4892d620b742c9f2c0cceea268e9438b20854a73d7c7a157d78b353e17a595302c21c3d2c52b55cd SHA512 59dc2bf8f8df13626f1b48600ebfa1f9d14fad03efe8e0512f9db5b1928d98ccee16182ade4567f49764f69bb4004747d6746a1e966ef6d1feeb88bf0be766d4
diff --git a/dev-util/spirv-headers/spirv-headers-1.5.4.2_pre20210327.ebuild b/dev-util/spirv-headers/spirv-headers-1.5.4.2_pre20210327.ebuild
index 6f9d77a1dcde..7832d997ae67 100644
--- a/dev-util/spirv-headers/spirv-headers-1.5.4.2_pre20210327.ebuild
+++ b/dev-util/spirv-headers/spirv-headers-1.5.4.2_pre20210327.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 069b47c35292..3056a11ef332 100644
--- a/dev-util/spirv-tools/Manifest
+++ b/dev-util/spirv-tools/Manifest
@@ -1,6 +1,6 @@
 DIST spirv-tools-2020.6.tar.gz 2595300 BLAKE2B bd500824866fcd0f0e05ccf3f43a168e33bc4783396d24fa6ddc58d4e46110b001cc32acde1cadcd793a997d547476f58c07475f43c3cbec5314b039926896b2 SHA512 b6d3667581101536e1f4d405e9c1c64e64a0aba174cc2f41d31e080f44d23bcfaed9642fd31f1d44a56c3df3e894526b643c572832cb96218b16d748b1ac6fe2
 DIST spirv-tools-2021.0_pre20210327.tar.gz 2591201 BLAKE2B e850bb2ccdd83bbd618ded22df8553c6e977e65ef623e881ec5b4dc15c3646a2c679dbf2a41166ddc98b75aa73a3404a870cd6fac577197c21623c97e7f07192 SHA512 56c206bf62d45a2341272612f979f9ef9bb933185e2f2852a39367dfb68f6647662d8995dfb9067e71b04cd76d2da0789346335dbabd7258406d96627f689e96
 EBUILD spirv-tools-2020.6.ebuild 1197 BLAKE2B 05ac606f25f2bfd1280ba5c19574628578046b033a9f01b2c939c7e2d1e55d0386ba71db94d988e8689cd8b20bd8f427ccb2f8259f17b7352e770d44aa337238 SHA512 bf598004767b75ee52149e7e2cb90e949c10284e3e0053bfd06de3ad69ad19cfee608f24b11eaf46345ed07d21239cc601f5e6984e82c738de6157a077d15a66
-EBUILD spirv-tools-2021.0_pre20210327.ebuild 1249 BLAKE2B a1b152db67b48ab095b895cd7171f9eaed714308d7f2dbd34e31a415429f51cc127bd44d31dd261e323556a5a7f7960c3be7ba3b417b8e56b5ba5e9cdc794cef SHA512 7e5d2801912a845a4d076396e2704c05d3b182be2d17c5e40b6b7f9b46cf934fd4b5c22a38c4722d1dd22d27c64b3c19a718dc7303e2e5fc566bbffad0851672
+EBUILD spirv-tools-2021.0_pre20210327.ebuild 1243 BLAKE2B 81b3d871bbb9b6cea243057ee94379cfb24ae80fe6b53586d0929d40634e8bfdca891c1f793319cfefcc11334ae8dfb2cefe5b5f0e7d5ed6cdc096d22a7bd848 SHA512 016926e221828e62db8c27539e94fc4368cb21cf5db3262f5e73f9d692c06b257b4bd9c815080cd428d8641d633fc137aab5aeec7418ecf77cfbdec0ec21516a
 EBUILD spirv-tools-9999.ebuild 1249 BLAKE2B a1b152db67b48ab095b895cd7171f9eaed714308d7f2dbd34e31a415429f51cc127bd44d31dd261e323556a5a7f7960c3be7ba3b417b8e56b5ba5e9cdc794cef SHA512 7e5d2801912a845a4d076396e2704c05d3b182be2d17c5e40b6b7f9b46cf934fd4b5c22a38c4722d1dd22d27c64b3c19a718dc7303e2e5fc566bbffad0851672
 MISC metadata.xml 428 BLAKE2B e5ec493782c93cb593d56b58a4f1d8b89dad2b0a11cc5eb2faf6b9cdb898e1097440ad446f0c920c69bd0eddfb9225bf8fce8d3749a03f8e6e5c94cdeea5173a SHA512 a5c873d573590a7c538f96d03bbe66b9a42eaabd5b96bafe8642a9cdde2a27bd067e5e46802ceb76e83160af0e4dd052ecc0b6e8c3b6fda3ee15a2eedf1d8b08
diff --git a/dev-util/spirv-tools/spirv-tools-2021.0_pre20210327.ebuild b/dev-util/spirv-tools/spirv-tools-2021.0_pre20210327.ebuild
index 0f8c9646f36f..e4fac91f50fb 100644
--- a/dev-util/spirv-tools/spirv-tools-2021.0_pre20210327.ebuild
+++ b/dev-util/spirv-tools/spirv-tools-2021.0_pre20210327.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	EGIT_COMMIT="1b35745ad1c9a988bc427b976a9a2fe7afd4dada"
 	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/vulkan-headers/Manifest b/dev-util/vulkan-headers/Manifest
index f0bd7adcd86c..cea3f0e59266 100644
--- a/dev-util/vulkan-headers/Manifest
+++ b/dev-util/vulkan-headers/Manifest
@@ -1,6 +1,6 @@
 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
 EBUILD vulkan-headers-1.2.162.ebuild 611 BLAKE2B a0dc00cde81752730cd13704bd71f06943f2a523306bb250ec4043c2cbbb7fccf9a9ab4e90ca7bb6811852f9b866940a7722e623dea0d36abff1d7001d8ffe40 SHA512 e08e859280da3384fc8248b255333b8e781e4a6d57c3cf8952b37f905bc78b5ca8df25bae6d79f39ca52bf21f1e11786bd2b60d0d70cb7a6b93eb66cb49e0b7c
-EBUILD vulkan-headers-1.2.170.ebuild 617 BLAKE2B de17fc55658dff792497262a77db71dbc9a360c6a35497522a7681452bf52398f90435bf6738477f09fa4cc1fcf96c3785ed6b222d9d7a5bb4ff257778dc63eb SHA512 9396dd22eee89217748990fcd336163561244de835947edc5ab6028b63ab16666c9ce28fb737563d572891de036bf3b435b68f6a89191bd2f97b12575af1b80e
+EBUILD vulkan-headers-1.2.170.ebuild 611 BLAKE2B a0dc00cde81752730cd13704bd71f06943f2a523306bb250ec4043c2cbbb7fccf9a9ab4e90ca7bb6811852f9b866940a7722e623dea0d36abff1d7001d8ffe40 SHA512 e08e859280da3384fc8248b255333b8e781e4a6d57c3cf8952b37f905bc78b5ca8df25bae6d79f39ca52bf21f1e11786bd2b60d0d70cb7a6b93eb66cb49e0b7c
 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.170.ebuild b/dev-util/vulkan-headers/vulkan-headers-1.2.170.ebuild
index 9eea670b13dc..482f4914180d 100644
--- a/dev-util/vulkan-headers/vulkan-headers-1.2.170.ebuild
+++ b/dev-util/vulkan-headers/vulkan-headers-1.2.170.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-tools/Manifest b/dev-util/vulkan-tools/Manifest
index c1723ec56ba5..2eea7cb830c9 100644
--- a/dev-util/vulkan-tools/Manifest
+++ b/dev-util/vulkan-tools/Manifest
@@ -1,6 +1,6 @@
 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
 EBUILD vulkan-tools-1.2.162.ebuild 1881 BLAKE2B 4c9129b5619a374830b27c7d425f2c119e1613a667c9d901101cdf0a59ae5c9c70d340e5fdf885b1b84901df01f152b03a4e687d1674d9d8ad65620fdb30a386 SHA512 ec5501ccda226135f0b33c818c6c5fe1fd33325d3bb01586775a55d6236e1d5aec3bac9c87cc309f88a648df0754bfaae310cfd92e4a818c4bd8024d3c46e3b1
-EBUILD vulkan-tools-1.2.170.ebuild 1886 BLAKE2B 9c2492531c87da11e3a5cdb6c9fd863ae721013392c867a0ab47f21a07b872e910d13c2c0147bb364dca8c0dca0bb59a2f31cbab9d48d7861427b2d2e43e7851 SHA512 314aa393ac36a75192062eac58ea3eeb3fbaa5d67565757db67cf30a674fa49cfe16a675d413cdcd0249d03b9e559a94a06ff46610c3cd28565f1a8bd699ff5c
+EBUILD vulkan-tools-1.2.170.ebuild 1881 BLAKE2B 4c9129b5619a374830b27c7d425f2c119e1613a667c9d901101cdf0a59ae5c9c70d340e5fdf885b1b84901df01f152b03a4e687d1674d9d8ad65620fdb30a386 SHA512 ec5501ccda226135f0b33c818c6c5fe1fd33325d3bb01586775a55d6236e1d5aec3bac9c87cc309f88a648df0754bfaae310cfd92e4a818c4bd8024d3c46e3b1
 EBUILD vulkan-tools-9999.ebuild 1886 BLAKE2B 2afef23e4399f9547e7fd691ec1050473993ca0decefa62e56a1d5499663bc5071aaa680d0a743a4776993997c0adc5bc92587ad24dc0cce3ffa6c325a86b35c SHA512 1769b436f7e1a8d4c4c22a7f99d1c2884db790b0f15dcdd8dc4e7cb144796654c48cfa6a75ff413653a5a2bf974c142c7a1dc0e81804fd7968e8d7a78bf5fb39
 MISC metadata.xml 499 BLAKE2B 9ede9725de281e0877f865e41ce68be15d5c04fd95023d3ab1180f4987c506a8f12ad23412ecf5795f6f8e6f36e576bc65f7cef786ced70296f5a4a8584ac4f1 SHA512 eb5dbcfbb58449c5a6ae7580f0c8a25c06f85fd6ac32fe1354fffe550214465921dace3c05264c11517d7dbeeffa444eb468d63f4781c6383f4be8a4202ecefd
diff --git a/dev-util/vulkan-tools/vulkan-tools-1.2.170.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.2.170.ebuild
index dd3ff96da94c..6a7567745c07 100644
--- a/dev-util/vulkan-tools/vulkan-tools-1.2.170.ebuild
+++ b/dev-util/vulkan-tools/vulkan-tools-1.2.170.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