13 files changed, 16 insertions, 124 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index d11830f6fcbc..7f85a4f7f474 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/geany-plugins/Manifest b/dev-util/geany-plugins/Manifest
index 21178103ae20..6e1fde0c6839 100644
--- a/dev-util/geany-plugins/Manifest
+++ b/dev-util/geany-plugins/Manifest
@@ -1,5 +1,5 @@
 AUX geany-plugins-1.38-libgit2-1.4.patch 4854 BLAKE2B 5605f5776186adaadbc0f861a1de217587a0cadcbd5f0844a0071246e5622ac830f759de4b1c7a5a3540d809c40822b619d0985561cb0f05c557c6d4d06a4a37 SHA512 9b35a656171a6183bbc8764622903d2e7767fafb548c3f2d3cb4e072a01c0bdbbfbeee20b65d42dc36f30bbfde28c5c2899e14f5ccdde1c8e96c877670889977
 DIST geany-plugins-1.38.tar.gz 4783970 BLAKE2B 386a05d7136183799059ef6d73b28a0d67d738939b0dc57649ac68f1049104568fe7c8453ebf2144277f60ee0834564b19bf4e756168864f1551962ba2411c14 SHA512 82d04331e23c5d81765b11e081a960a7a17172184cabe94efd2ddb37ac94668349b036e6083f77c867ac650fa7b251ba3970ae26b562b4568d6e313652763339
 EBUILD geany-plugins-1.38-r1.ebuild 2910 BLAKE2B 76181571b98ee1e7296a5f2859aea3b0acb51cda51fb729e670ea9c4d3818377b5d9d54d8399a9af866a0451b82fea5198cc13eb9b233682357b64849a14bbbb SHA512 e7f18ef4f0f9ba326050e9ff48aed4bd3a493be4d71ede5e76da1952c870b78c8c56d1d9cb5401b8fdec0cf0cf2248e11e84cb5aee7f32c266dbe24441460f89
-EBUILD geany-plugins-1.38-r2.ebuild 2956 BLAKE2B 34b04f4838c371dd032e39aea981d8146759032e2dfbec17d36ea1f8898340f03f5a07ca33018935454d4ecd01d6738878098faff0f4199d8d90f1b92463ca24 SHA512 2f0391e05ccc5e7a7ddf7a3d93a1eea65207e0829b1e0c69c002b6a8cf2e4a76254519e707e8cebf1b3fd7fca96e8b0d8ca9e54d60ec6c436af5c07e32316c2a
+EBUILD geany-plugins-1.38-r2.ebuild 2955 BLAKE2B e479aa2a95a584f6692734cbf2e99710c70cc0ba171969493531aff02b81e00fc9474e22974ec62432e0d9cab88fd265623e6f24eeb5f8199618a3eb16f9e0f8 SHA512 afb4c425c29fdbb50cbcee22fb1a55da925cdf9364d451ae42407745fc9e31677e5ecd631c0ced5df7cb6d5252b7f16d8b38bc12b5eca8db657a3e8bd3d95b11
 MISC metadata.xml 1201 BLAKE2B 4ee72164edb11f331607e02bc93f143214ca497d7ef461e6bb621d1dae99d128bc2243ec712707d63a935969bdacc6309ce4edb5d4f30eda08b2827c8674aa79 SHA512 5180861ae35b043f48125ac03dc6f28864f83186c84b6a3b0111da3b264537553ddb296e960dd2bbb8b7626b8bb842e4ff76931837210d39ab885213608ef51a
diff --git a/dev-util/geany-plugins/geany-plugins-1.38-r2.ebuild b/dev-util/geany-plugins/geany-plugins-1.38-r2.ebuild
index e0c49a45502a..6de03c67623f 100644
--- a/dev-util/geany-plugins/geany-plugins-1.38-r2.ebuild
+++ b/dev-util/geany-plugins/geany-plugins-1.38-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://plugins.geany.org/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 arm ~ppc ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 arm ~ppc ppc64 ~sparc x86"
 
 IUSE="ctags debugger enchant git gpg gtkspell lua markdown nls pretty-printer scope soup workbench"
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index d7de5b1bbbfd..6ab1dd1712d3 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -1,11 +1,9 @@
 AUX meson-0.63-xtools-support.patch 1136 BLAKE2B 7600b29f1c4accbf33ca587b848566d4f9d30e26695b125aa895ec8a48ee0f7355c7692845c0d9bbb59eb452fc0cd8b634bd2a90d8918efa0b65ef4759b56d8e SHA512 725b193afe229690b6ef0d7a2a832695b7c09ca3376512097baec597a84df6e8e18791e9f29221e8a4a3537ad2371672e74041aa05ec6a218ed9b6218ea2ab61
 DIST meson-0.62.2.tar.gz 2038542 BLAKE2B 51446cd348f3e8681a61ebecf95f5aafcafd90654e3c86d87ee2b68239237bd889b667f3c6543faba7d4b98d7e0ed73d96c6a988913e5262d3b9611b80ff8db2 SHA512 4089588701f0f702eb3b794e0ede78b99f13ec7545d1a7470c7bfd6a857de59673684a543928dd578402578c53f38365a3a59e3e29022fd30a525353818a4195
-DIST meson-0.63.0.tar.gz 2060688 BLAKE2B 763d35a6dee42d7ef61b00c472681042289f38737374178d43eb8e66c3abe38affd372fca7aea4f4c7cd52f25ad3754485f54f24ac5e453b7a58011397ddbbb8 SHA512 8d427261bb42d2bd1da7d4f7b5f53908044aa2cea6d020fb320b0ab9d9848e17cf28deb12ae6dc139807f9e377db0c8a546561e94301216b634bd77703f17cea
-DIST meson-0.63.1.tar.gz 2064118 BLAKE2B 2d7bf439ed096cc38d9e676a8837069d10f34299cc5a61773df7a27d9a67fd33ce3b4193f33b35e5d77dc5cc346098e427f70f0dc0eafcebce055940420c785e SHA512 25f96e18bcdbb6346c44d9f8e63035d6cb3d8f781cf43ac5530ddd6f8090f4d16d192f8d331240154602e92b498b410fabb1381dc5f39db1dfb9da05a964d44e
 DIST meson-0.63.2.tar.gz 2063397 BLAKE2B 765ef8994168bb149cce4dbbbdab4a5531b1c1119db5dace1a66c2728241830c7de075d586187d3f987fcc99e4181176a5910da56552ba735dda110a641d2541 SHA512 770d8d82502c5cd419123e09f6a445d2cbaea4463c5fa79f1497c868bf5defc5e5779a6e550ef5fcf75d57322d2b25b61574f4df0cbf001c4325c6abdbbc30b4
+DIST meson-0.63.3.tar.gz 2067612 BLAKE2B aa6052330f15aa6b1f64598a60075ea3b245ba4b53d65e760670fd526e3e462c110f95e710a83f91ab32f316fdb66dff1783c79ea832ed11d263fe0a3304eaa8 SHA512 6855b2bfe05d592419bfeaf4346c3d1079319f14de995109c09a7e5e9770cef829f66d659553337b3e54ca0dd6c497bccd4abef720f299173077b664d905864b
 EBUILD meson-0.62.2.ebuild 2848 BLAKE2B 0f1794a5141c01af083d614e9acd9d37461a0ffc68f71d33177bf934efe1261c260c1518e502552193d45814529335e9a98ba1ceb78349cf243bcdbe6eb3b12d SHA512 d333739fa3d7557cf9e84950004c1539c072ce43a3dcd88bd1409af4961ab2a37cf2989ed34fd0c6e80bf79d66a53f0e7e9d550e5e802d8b70ecc7f54a3dcd68
-EBUILD meson-0.63.0.ebuild 2895 BLAKE2B 8927bd8e995e0dcd1de37d303f5ee045dcd3a5969078f1619ccbb4b360da151fa7e5859a033548ffb7fa3002047f9e204d24c0e8568b2e06932f7091336eff97 SHA512 6b1af00bb3305ff75b19d7e442df9978a05a754aa244e2a19e5272316761dbac12ff23b4f7ba96122c6744f72aaf58f9567f182e9e115695133a7933152b45da
-EBUILD meson-0.63.1.ebuild 2895 BLAKE2B 8927bd8e995e0dcd1de37d303f5ee045dcd3a5969078f1619ccbb4b360da151fa7e5859a033548ffb7fa3002047f9e204d24c0e8568b2e06932f7091336eff97 SHA512 6b1af00bb3305ff75b19d7e442df9978a05a754aa244e2a19e5272316761dbac12ff23b4f7ba96122c6744f72aaf58f9567f182e9e115695133a7933152b45da
-EBUILD meson-0.63.2-r1.ebuild 2949 BLAKE2B cbe3babbae2b3ca6f2d31fde64e80196dca4983d3ca42374be09b6638ab0ba4324f8432092629e36218100d7c2dd62eaccf15b16df07f5d1c4bc1af931537f4c SHA512 a556f7e43ac5e34346cad8758fd28131455995521505d48852f1c91265c551adc621d1c7e6dcf86b48cd80575d9ea886e5bd242205d47146916b695957252cb3
+EBUILD meson-0.63.2-r1.ebuild 2947 BLAKE2B 9a65ea044fa4c3c8dc8b26e98f1859364597d336ccb7c58d78fad3048abbabbb6c8a722351a8a4e6704f3935c6dac84a2386498e635fad2d690b852c719faec1 SHA512 0c9a751013f170417ad67a87903c537ca5b28422e5529fc1235f5fe2777df6cfd92a4c6b4a179287e4766283946342cacd6011a3a106b0bc9dfc2bc66c01d629
+EBUILD meson-0.63.3.ebuild 2955 BLAKE2B ce83a122ad852be0032506fdde5a0948ce56fc94acb61f84002dfece2c36320040fbae9c4ced3f37023bac0fcf97c9d391c5286d2401a941ff7d0f2e786f2703 SHA512 abaa87cd7153c900120c1dcdffec5ea4232128a6848a7f5cdb736b07f906bd28dd6942b5bea39f9841f7be2c087c9ddd7cbb0cf3cb519e5a5731d0b0f1e5ccdd
 EBUILD meson-9999.ebuild 2955 BLAKE2B ce83a122ad852be0032506fdde5a0948ce56fc94acb61f84002dfece2c36320040fbae9c4ced3f37023bac0fcf97c9d391c5286d2401a941ff7d0f2e786f2703 SHA512 abaa87cd7153c900120c1dcdffec5ea4232128a6848a7f5cdb736b07f906bd28dd6942b5bea39f9841f7be2c087c9ddd7cbb0cf3cb519e5a5731d0b0f1e5ccdd
 MISC metadata.xml 480 BLAKE2B 5d3a0af4d84e497dcc2ccd5eb680e898beda896d5c37dc71fcaad2fe63f436f758d356990a5bca06baee9d265389b6e7084daec90d13c004f5523df4d0badbff SHA512 748f91fc17a18302ad0892d458e8e59650ab23dd3db5e83da85cfbca03d7932633c37b16f039faa12d87f6e4ec75a7a7fe4cc22f17328e61d57d99b073b6df3f
diff --git a/dev-util/meson/meson-0.63.1.ebuild b/dev-util/meson/meson-0.63.1.ebuild
deleted file mode 100644
index 14ecaa4f465b..000000000000
--- a/dev-util/meson/meson-0.63.1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 2016-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-DISTUTILS_USE_PEP517=setuptools
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/mesonbuild/meson"
-	inherit git-r3
-else
-	MY_P=${P/_/}
-	S=${WORKDIR}/${MY_P}
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-inherit bash-completion-r1 distutils-r1 toolchain-funcs
-
-DESCRIPTION="Open source build system"
-HOMEPAGE="https://mesonbuild.com/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	test? (
-		dev-libs/glib:2
-		dev-libs/gobject-introspection
-		dev-util/ninja
-		dev-vcs/git
-		sys-libs/zlib[static-libs(+)]
-		virtual/pkgconfig
-	)
-"
-
-python_prepare_all() {
-	local disable_unittests=(
-		# ASAN and sandbox both want control over LD_PRELOAD
-		# https://bugs.gentoo.org/673016
-		-e 's/test_generate_gir_with_address_sanitizer/_&/'
-
-		# ASAN is unsupported on some targets
-		# https://bugs.gentoo.org/692822
-		-e 's/test_pch_with_address_sanitizer/_&/'
-
-		# https://github.com/mesonbuild/meson/issues/7203
-		-e 's/test_templates/_&/'
-
-		# Broken due to python2 wrapper
-		-e 's/test_python_module/_&/'
-	)
-
-	sed -i "${disable_unittests[@]}" unittests/*.py || die
-
-	# Broken due to python2 script created by python_wrapper_setup
-	rm -r "test cases/frameworks/1 boost" || die
-
-	distutils-r1_python_prepare_all
-}
-
-src_test() {
-	tc-export PKG_CONFIG
-	if ${PKG_CONFIG} --exists Qt5Core && ! ${PKG_CONFIG} --exists Qt5Gui; then
-		ewarn "Found Qt5Core but not Qt5Gui; skipping tests"
-	else
-		distutils-r1_src_test
-	fi
-}
-
-python_test() {
-	(
-		# test_meson_installed
-		unset PYTHONDONTWRITEBYTECODE
-
-		# https://bugs.gentoo.org/687792
-		unset PKG_CONFIG
-
-		# test_cross_file_system_paths
-		unset XDG_DATA_HOME
-
-		# 'test cases/unit/73 summary' expects 80 columns
-		export COLUMNS=80
-
-		# If JAVA_HOME is not set, meson looks for javac in PATH.
-		# If javac is in /usr/bin, meson assumes /usr/include is a valid
-		# JDK include path. Setting JAVA_HOME works around this broken
-		# autodetection. If no JDK is installed, we should end up with an empty
-		# value in JAVA_HOME, and the tests should get skipped.
-		export JAVA_HOME=$(java-config -O 2>/dev/null)
-
-		# Call python3 instead of EPYTHON to satisfy test_meson_uninstalled.
-		python3 run_tests.py
-	) || die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	insinto /usr/share/vim/vimfiles
-	doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax}
-
-	insinto /usr/share/zsh/site-functions
-	doins data/shell-completions/zsh/_meson
-
-	dobashcomp data/shell-completions/bash/meson
-}
diff --git a/dev-util/meson/meson-0.63.2-r1.ebuild b/dev-util/meson/meson-0.63.2-r1.ebuild
index 35037c2833ae..4001abf8a0a6 100644
--- a/dev-util/meson/meson-0.63.2-r1.ebuild
+++ b/dev-util/meson/meson-0.63.2-r1.ebuild
@@ -13,7 +13,7 @@ else
 	MY_P=${P/_/}
 	S=${WORKDIR}/${MY_P}
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 inherit bash-completion-r1 distutils-r1 toolchain-funcs
diff --git a/dev-util/meson/meson-0.63.0.ebuild b/dev-util/meson/meson-0.63.3.ebuild
index 14ecaa4f465b..f2e31397c003 100644
--- a/dev-util/meson/meson-0.63.0.ebuild
+++ b/dev-util/meson/meson-0.63.3.ebuild
@@ -37,6 +37,10 @@ DEPEND="
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.63-xtools-support.patch
+)
+
 python_prepare_all() {
 	local disable_unittests=(
 		# ASAN and sandbox both want control over LD_PRELOAD
diff --git a/dev-util/patchelf/Manifest b/dev-util/patchelf/Manifest
index a066031ba74e..00df6f97c703 100644
--- a/dev-util/patchelf/Manifest
+++ b/dev-util/patchelf/Manifest
@@ -1,5 +1,5 @@
 DIST patchelf-0.14.5.tar.gz 124767 BLAKE2B f2e02fb468db7c8c0c4270c7f95ea6c8dc6ffab7ddb0a6479bd5d1dd0481cbc55982af21a13f42076504417264a11e74d50a9f15d3d5735e47019001abf33e41 SHA512 1b7eca84f6fe2d6f6d4469ca1ccdf35dc920d2052ba94b7daeba6c8cb41fdaff20b1e5bac7c8a7650ff12bf4156da87f84d32e75b09958636dc992a1b7b1a59d
 DIST patchelf-0.15.0.tar.gz 125803 BLAKE2B 08fc2cffd7d9e835c01c828c16762fb0b3c3e422990f2d0028a65a3e0ec849d01bdef699b6f68afa6bf307e34f5e76121fc94460793c95c055552e1d8a68d772 SHA512 3b2d3d6458be5b2d43cd2878dfb1a185a95cc13cd4c94abd0ee79979afb36f46e347acc292b8d9c2954a342b7291774e6a1b63930e9f90a1cf4179ec075ab046
 EBUILD patchelf-0.14.5.ebuild 551 BLAKE2B acd9c8b3dfef45e8449dd812861edf4441a6e54e529b8fab13048d64504ca2c9cf5058159a8b47ff06e552c4e4d74c6aa7da9afeb99d1aab70a264f3253ff8be SHA512 ce28a15e8d82eb2909d4ad3f3b111883988a37dd5495c05a6ac92b64819eae108488a1edad659d72ed94a174912dddc57495b42e4136de8cec23a4905da9bc57
-EBUILD patchelf-0.15.0.ebuild 583 BLAKE2B 495d8a7f2678c8359d7e3774769c135189d18dc5e36b3ef9ec01e9c6dc4d2fa97d12525f5d01af579c15ab5eb29d585a48343705e6913f2dcb8d0825de2b45b6 SHA512 32ab5074d6057a78b4e381fb7c37052f18b9d21415c767cf9e573c666097112b412be768da8c50d7b34f75796ae3aa31a5bdce0ff3fbda11bd3d3795fd8fa940
+EBUILD patchelf-0.15.0.ebuild 581 BLAKE2B bc0e41e8d43635652528d3fe3cab5af3d2c79458dc10a4337dc13985b41522c8bc386d0d571ceebc1aaf2cfaf446fb0907777754c5891d4c568aa334bcbde549 SHA512 cd5f2cac516581cdb58e298d6221de8bc09578843d9bf2795894a49571eed328fca4d394b7aeb2fe95746fac99584ab003c960b91ddd66435bdef7fb359dcbd3
 MISC metadata.xml 221 BLAKE2B 89c194836288a2092e342c7932283845027e33ed24c07238828996c457bbe637c44e0d39236fcf5f50db27dd3c66545a0239c4336f74e7f3b463bc2e7374a1a4 SHA512 3fb0d91be78f12317cfcafccc851b13b7e6a1fd588a5762e0dba27add0a9c6b5f8b22d3c27f2fcf6665cb8f8a5e36175d74eb4a97b42bd176afe6a8128254c10
diff --git a/dev-util/patchelf/patchelf-0.15.0.ebuild b/dev-util/patchelf/patchelf-0.15.0.ebuild
index eef94aea4993..49a53011cbb0 100644
--- a/dev-util/patchelf/patchelf-0.15.0.ebuild
+++ b/dev-util/patchelf/patchelf-0.15.0.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Small utility to modify the dynamic linker and RPATH of ELF executa
 HOMEPAGE="https://github.com/NixOS/patchelf"
 SRC_URI="https://github.com/NixOS/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~riscv-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~riscv-linux ~x86-linux"
 LICENSE="GPL-3"
 
 src_prepare() {
diff --git a/dev-util/rbtools/Manifest b/dev-util/rbtools/Manifest
index 83861e8a0fac..aa83fd0b17f6 100644
--- a/dev-util/rbtools/Manifest
+++ b/dev-util/rbtools/Manifest
@@ -4,7 +4,7 @@ DIST RBTools-3.1.2.tar.gz 322538 BLAKE2B ab459e60e1c25a8eb3cb8afbe9ad1c5c63d1d5b
 DIST RBTools-3.1.tar.gz 317015 BLAKE2B dccabc93af3a8095f5e166f9e3a31cce52155876cb38675b3dd43b6556024bb9b4ed66291e495ab42b41b09934f136f4eeca7a185fc0fbb2aa2d03e1ef12d656 SHA512 2568aa905dfd119e0b66213e3ae9c8edad5a3337df00228b955006cc85e90c1492e1dc4cccc2695b53f5879103c5d4ee8dba6262112c8781e452dea7633d2c0b
 DIST RBTools-4.0.tar.gz 397113 BLAKE2B 25d743a81e22e00575c6bc2a08d5bab04c35e554f6a1a17090eb55bbcaf0e8e5f4c2ad6a68a0415acb76c093c99b7bb223aeccd68392877bae97eac354578002 SHA512 d2dbe94dbd63fbd11ef0fc8c08eecbd7000df23388afe21d30151854ff4ef2b3a6c780c60ee52408832a146570a1f7b3f0269fc0c831953e871d2dda1ed8cb3f
 EBUILD rbtools-2.0.1.ebuild 1250 BLAKE2B 8c939c64d8bcb5ec0d15a27aecbba090f40a1b4d2dd35e2f38863b36b7f95db3ae558f7cff3cb0d74aa5d04eda9c7e93aa000994e4ca60c3d2eb355e1a0059f8 SHA512 447cb645f0715067e6e22817bcb2ffede46ed87f9ed10dca60c6b9375e1738ffcd26295aa404707ecde6eea99a326d2f8ff1379c0d087c06a8f893f19ee40521
-EBUILD rbtools-3.1.1.ebuild 1348 BLAKE2B 13538dd2b7cf09854daa8ea13148d75476c834ec799d358735144893ce00ebdadc9da9fc4772bec64b7dcbb5930f850b8b9db606a024e7baf45f3938be84efe9 SHA512 077649c23fbc94cfbf294541d064400d0f2e5af453f3d7c17b8710a8c83904e4e15f8a44e6b1dcdeb4979df79898afbac133c8d91358b90367b16e372461f8e9
+EBUILD rbtools-3.1.1.ebuild 1346 BLAKE2B 4d5aee256901d80aa1511e9e66def578ebd1c5b76bf82bd302b3739f0e38fe3de1e550f7e0bb3ec52e8a6db8a5facd945f0ff634cac08c69ba9e6e6b5cf8040c SHA512 3056584ca24081f687eb4e75782d7981ed9f14de3cd5829dd6f14a5d6ed7c6cddeb14661a4cbcfa865f15c0ee2fd95531ab83862469330eec2ded2d80f3086d3
 EBUILD rbtools-3.1.2.ebuild 1348 BLAKE2B 13538dd2b7cf09854daa8ea13148d75476c834ec799d358735144893ce00ebdadc9da9fc4772bec64b7dcbb5930f850b8b9db606a024e7baf45f3938be84efe9 SHA512 077649c23fbc94cfbf294541d064400d0f2e5af453f3d7c17b8710a8c83904e4e15f8a44e6b1dcdeb4979df79898afbac133c8d91358b90367b16e372461f8e9
 EBUILD rbtools-3.1.ebuild 1348 BLAKE2B 13538dd2b7cf09854daa8ea13148d75476c834ec799d358735144893ce00ebdadc9da9fc4772bec64b7dcbb5930f850b8b9db606a024e7baf45f3938be84efe9 SHA512 077649c23fbc94cfbf294541d064400d0f2e5af453f3d7c17b8710a8c83904e4e15f8a44e6b1dcdeb4979df79898afbac133c8d91358b90367b16e372461f8e9
 EBUILD rbtools-4.0.ebuild 1600 BLAKE2B 9cfb4c98f0335115397ed1982518dc95668667b297ae8d91ae12d69cc8dec5c18379beca6c8f5734196832ec0cfaf8e7b3ce883333e9554cf85b4d8cdd534156 SHA512 6352e4916c6148879d5a4e01b4f69798a5d2ebd95e0df495d0dfcf04976fbf51acc1138e01c99a4da44adf0a473360c1b3a91bd6da1ddfc8077ab22fefee89f7
diff --git a/dev-util/rbtools/rbtools-3.1.1.ebuild b/dev-util/rbtools/rbtools-3.1.1.ebuild
index 9fb63ed11ab4..475155951a75 100644
--- a/dev-util/rbtools/rbtools-3.1.1.ebuild
+++ b/dev-util/rbtools/rbtools-3.1.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://downloads.reviewboard.org/releases/${MY_PN}/$(ver_cut 1-2)/${MY
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-util/tree-sitter-cli/Manifest b/dev-util/tree-sitter-cli/Manifest
index b41f8427a5e6..3c59c00fedc3 100644
--- a/dev-util/tree-sitter-cli/Manifest
+++ b/dev-util/tree-sitter-cli/Manifest
@@ -108,5 +108,5 @@ DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f955297217
 DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 EBUILD tree-sitter-cli-0.20.6.ebuild 2926 BLAKE2B f92a2937d094f4f357aedad06f6bd714f7c881b521a4e5c9b360dcc288844b11343b0d7bee922502e4d0fbd64df96ff74298289b333f2f63d483a8c98841edde SHA512 7472165b035d24e7108ed13e4cea1e75bd686d5ad32c9320ec45ae0c4c5ae047489861cf0607b6a1890fedf966625df83148fd692ed66b12ce658a29459bce2c
-EBUILD tree-sitter-cli-0.20.7.ebuild 2932 BLAKE2B 0e7863902c045cf755712ac1902e3526f7c84a3d16b6af8b98d2c9274a96c37b0786110b2a2119611c668e57658364b480fafef014b1bab0bc97d52ba5eb69b7 SHA512 c75a0e1e888802e86c83f13f4b8e18f388cd13e72765a07970189afbbeecb7b3b9308cd1491577945fa8f3499696bd0ee8572fd5bcd4a02997f7dd78b18fcb0b
+EBUILD tree-sitter-cli-0.20.7.ebuild 2930 BLAKE2B a4864252f7dc44cdee01ad466befea91fb827e12427fd371f926e6e410a0fd1154253024a3c54b9eb379dfef28372cf497cbffd600127f571bc0a0bc6e23ac53 SHA512 686e4055ad1072a79bdf2a7894d24f2a24e1a5a7048bfc70dba6e395742f99e04f186c9cc0daef92dc4fa45a0224dc9149fe25b22f8ad9223d10a93817a15cc4
 MISC metadata.xml 678 BLAKE2B e000f4502ed07b8fffcbf05a9dcf0730407d70a00ddf289b8ffdd9e6d28df6481f7e6eec3416aa1278ad9602c098bde72bcaad4f7819c9554c39baf045555dc8 SHA512 37e64d773a4b01b34208b65be600e6f46c7633571d7ad39210b7957f41f31b296565304a4dc8a4ec0518489a89b1bf7a1b204111c4d428307b562e3f6d0575f8
diff --git a/dev-util/tree-sitter-cli/tree-sitter-cli-0.20.7.ebuild b/dev-util/tree-sitter-cli/tree-sitter-cli-0.20.7.ebuild
index 80bde82b0e80..e5faca30d8d0 100644
--- a/dev-util/tree-sitter-cli/tree-sitter-cli-0.20.7.ebuild
+++ b/dev-util/tree-sitter-cli/tree-sitter-cli-0.20.7.ebuild
@@ -124,7 +124,7 @@ S="${WORKDIR}"/${MY_P}/cli
 
 LICENSE="Apache-2.0 BSD-2 CC0-1.0 ISC MIT"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ppc64 ~riscv sparc ~x86"
+KEYWORDS="amd64 arm arm64 ppc64 ~riscv sparc x86"
 
 # Test seems to require files (grammar definitions) that we don't have.
 RESTRICT="test"