Merge updates from master

40 files changed, 96 insertions, 488 deletions

diff --git a/app-admin/sysstat/sysstat-12.6.2-r2.ebuild b/app-admin/sysstat/sysstat-12.6.2-r2.ebuild
index 6e6bd9631867..bbe832569391 100644
--- a/app-admin/sysstat/sysstat-12.6.2-r2.ebuild
+++ b/app-admin/sysstat/sysstat-12.6.2-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="dcron debug nls lm-sensors selinux systemd"
 
 BDEPEND="
diff --git a/app-admin/xstow/xstow-1.1.1.ebuild b/app-admin/xstow/xstow-1.1.1.ebuild
index cdfb5d511cef..9dea751cbf2c 100644
--- a/app-admin/xstow/xstow-1.1.1.ebuild
+++ b/app-admin/xstow/xstow-1.1.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/majorkingleo/${PN}/releases/download/${PV}/${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="ncurses"
 
 DEPEND="ncurses? ( sys-libs/ncurses:= )"
diff --git a/app-cdr/extract-xiso/extract-xiso-2.7.1_p202303040307.ebuild b/app-cdr/extract-xiso/extract-xiso-2.7.1_p202303040307.ebuild
index d80e4bdb75a8..9f0717334cf1 100644
--- a/app-cdr/extract-xiso/extract-xiso-2.7.1_p202303040307.ebuild
+++ b/app-cdr/extract-xiso/extract-xiso-2.7.1_p202303040307.ebuild
@@ -19,4 +19,4 @@ fi
 
 LICENSE="BSD-4"
 SLOT="0"
-KEYWORDS="~amd64 ppc ~x86"
+KEYWORDS="amd64 ppc x86"
diff --git a/app-editors/dav/dav-0.9.0.ebuild b/app-editors/dav/dav-0.9.0.ebuild
index 31027bf9d8b3..22cab2b3b160 100644
--- a/app-editors/dav/dav-0.9.0.ebuild
+++ b/app-editors/dav/dav-0.9.0.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/dav-text-dav-text-${PV}"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ppc ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ppc ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 RDEPEND="sys-libs/ncurses:0="
 DEPEND="${RDEPEND}"
diff --git a/app-editors/neovim/neovim-0.10.2.ebuild b/app-editors/neovim/neovim-0.10.2.ebuild
index edf16933b50b..7efc3104baed 100644
--- a/app-editors/neovim/neovim-0.10.2.ebuild
+++ b/app-editors/neovim/neovim-0.10.2.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/neovim/neovim.git"
 else
 	SRC_URI="https://github.com/neovim/neovim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~x64-macos"
+	KEYWORDS="~amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~x86 ~x64-macos"
 fi
 
 LICENSE="Apache-2.0 vim"
diff --git a/app-misc/klavaro/klavaro-3.14.ebuild b/app-misc/klavaro/klavaro-3.14.ebuild
index 189bff37fea8..5061243795cc 100644
--- a/app-misc/klavaro/klavaro-3.14.ebuild
+++ b/app-misc/klavaro/klavaro-3.14.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/project/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 
 BDEPEND="
 	dev-util/intltool
diff --git a/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.3.3.ebuild b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.3.3.ebuild
index 627726640cb1..49a9e9903c32 100644
--- a/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.3.3.ebuild
+++ b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.3.3.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-pdf-poppler.git"
 	EGIT_BRANCH="develop"
 else
-	KEYWORDS="amd64 arm ~arm64 ~riscv ~x86"
+	KEYWORDS="amd64 arm ~arm64 ~riscv x86"
 	SRC_URI="https://github.com/pwmt/zathura-pdf-poppler/archive/${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
diff --git a/dev-cpp/nlohmann_json/nlohmann_json-3.11.3.ebuild b/dev-cpp/nlohmann_json/nlohmann_json-3.11.3.ebuild
index 4101cac09957..647f8194b619 100644
--- a/dev-cpp/nlohmann_json/nlohmann_json-3.11.3.ebuild
+++ b/dev-cpp/nlohmann_json/nlohmann_json-3.11.3.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}/json-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ~loong ppc ~ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ~ppc64 ~riscv x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-db/freetds/Manifest b/dev-db/freetds/Manifest
index fe46ee8b16a4..c4779f4efac4 100644
--- a/dev-db/freetds/Manifest
+++ b/dev-db/freetds/Manifest
@@ -1,2 +1,3 @@
 DIST freetds-1.4.17.tar.bz2 2401147 BLAKE2B 7155f902043411e57a9244c16bae49aa095d1f6af0b40bd1dc1e6949b3d78b3c8e58a7b6b2284ebac9e7b26920485a8ae12b691cc838410835786be51f027c89 SHA512 df5804a4bea20f995ecd3ef3ae4b898b9d9b32af6827aa2bada95008c8b909b682779c6776efb0d778615e21ac7af20b4aa0d1518a7a0d50bb793f4688a0e1a9
+DIST freetds-1.4.23.tar.bz2 2402595 BLAKE2B aca65226d09ff95094c79330f10d19a5e8336222e5b19706d8c602405ddab4541e4c34da1c40b3c1765de1761f9a58a096250f22d53e2b4e13758b664ce7db36 SHA512 9b51b21d9c5dc7cac3d9fdccb3a600a6b3b2a0df6f7a0396497ba3377c9a6925b3e4ea3dfbb671bd4563c321692bea82c6f70c2ccefb30eaa0d006ebd3aac249
 DIST freetds-dev.1.2.18.tar.gz 3406990 BLAKE2B f0134ee0a322cb9e7a7fefbf9e85c60b826318b546febde78e53d5ec22dc2c8e269b7e830da6d84267d16a2dc2cf367a54354765017a40e07af2c3c6be54676e SHA512 315f40ba0d97281f852ec99fac457ec4b2a30879a2384bfa2d7c680aad6c056b6ae23fc192c18db4fba75caff552ef86de7bbfc5d7b608ea5a12531bf9eadc4c
diff --git a/dev-db/freetds/freetds-1.4.23.ebuild b/dev-db/freetds/freetds-1.4.23.ebuild
new file mode 100644
index 000000000000..28268059925d
--- /dev/null
+++ b/dev-db/freetds/freetds-1.4.23.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Tabular Datastream Library"
+HOMEPAGE="https://www.freetds.org/"
+SRC_URI="https://www.freetds.org/files/stable/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-macos"
+IUSE="debug gnutls iconv kerberos mssql iodbc odbc ssl static-libs"
+# iODBC and unixODBC are mutually-exclusive choices for
+# the ODBC driver manager. Future versions of FreeTDS
+# will throw an error if you specify both.
+REQUIRED_USE="?? ( iodbc odbc )"
+# Nearly wired up as of 1.4.23 but had link failures
+RESTRICT="test"
+
+COMMON_DEPEND="
+	app-alternatives/awk
+	gnutls? ( net-libs/gnutls:= )
+	iconv? ( virtual/libiconv )
+	iodbc? ( dev-db/libiodbc )
+	kerberos? ( virtual/krb5 )
+	odbc? ( dev-db/unixODBC )
+	ssl? ( dev-libs/openssl:= )
+"
+DEPEND="${COMMON_DEPEND}"
+# bind-tools is needed because the osql script calls "host".
+RDEPEND="
+	${COMMON_DEPEND}
+	net-dns/bind-tools
+"
+
+src_configure() {
+	econf \
+		--enable-shared \
+		$(use_enable debug) \
+		$(use_enable iconv libiconv) \
+		$(use_enable kerberos krb5) \
+		$(use_enable mssql msdblib) \
+		$(use_with iodbc) \
+		$(use_with odbc unixodbc "${EPREFIX}/usr") \
+		$(use_with iconv libiconv-prefix "${EPREFIX}/usr") \
+		$(use_with gnutls) \
+		$(use_with ssl openssl "${EPREFIX}/usr")
+}
+
+src_test() {
+	# These tests need a running database.
+	local XFAIL_TESTS=(
+		corrupt dataread dynamic1 nulls
+		t0001 t0002 t0003 t0004 t0005 t0006
+		toodynamic utf8_1 utf8_2 utf8_3
+	)
+
+	emake check XFAIL_TESTS="${XFAIL_TESTS[*]}"
+}
+
+src_install() {
+	default
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-lang/ispc/Manifest b/dev-lang/ispc/Manifest
index 18256b5445d0..baf634df3bd2 100644
--- a/dev-lang/ispc/Manifest
+++ b/dev-lang/ispc/Manifest
@@ -1,3 +1 @@
-DIST ispc-1.24.0.gh.tar.gz 19674211 BLAKE2B 246a079f03fa17f1ab4d80c55b992e92f44d5395e3f1feadee90c773771496ead4de0671b3869c70d5a93038d7c0ccaf9ed3ad5b5e40eb156d605a73150b15d9 SHA512 ad9feab1b5986471a52c775c1220ae46904ae952b33a14299f525eb03e004c6e1395dd171ddedee833892d57ad195ffddb234b26a2df42138fb1b2364b62803e
-DIST ispc-1.25.2.gh.tar.gz 19805407 BLAKE2B d4722725778f06a963a9bbc2fa691707e51b907fcc6cabac5987a7dcd65cc6855f27d4bd2559f6e79185067de7211ec9da48635c29d146c6525963db2f0fa11a SHA512 29c0adb0d28be280ef6223253f34eaeae6530d4ab63f67c94791837144eb20a2d596b0bd450188841b86f277d9f7d68a96b3c1e9e25297590e496d7f04ad55c3
 DIST ispc-1.25.3.gh.tar.gz 19805596 BLAKE2B 6e98d2297b2b9b7da32c74328c0b3883a7bd7dc997624ed5c5eff1193779b28a29b6e505ec09f6ba471f0b3ba4b3c603561717311a370bad5350d7e898b9d5f1 SHA512 12bbf7b15d6ec97658d46d65d1c02103bdada4101dcaa2ebb5c8477c39934a588d1035371ae09636c0fa73267f4d714579b8fffcd8690d4f3d95eb12436908ab
diff --git a/dev-lang/ispc/ispc-1.24.0.ebuild b/dev-lang/ispc/ispc-1.24.0.ebuild
deleted file mode 100644
index 9c93989e4624..000000000000
--- a/dev-lang/ispc/ispc-1.24.0.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( {17..18} )
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit cmake llvm-r1 multiprocessing python-any-r1 toolchain-funcs
-
-DESCRIPTION="Intel SPMD Program Compiler"
-HOMEPAGE="
-	https://ispc.github.io/
-	https://github.com/ispc/ispc/
-"
-SRC_URI="
-	https://github.com/ispc/ispc/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD BSD-2 UoI-NCSA"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="examples gpu openmp test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	$(llvm_gen_dep '
-		sys-devel/clang:${LLVM_SLOT}
-	')
-	sys-libs/ncurses:=
-	gpu? ( dev-libs/level-zero:= )
-	!openmp? ( dev-cpp/tbb:= )
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	app-alternatives/yacc
-	app-alternatives/lex
-	${PYTHON_DEPS}
-"
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-	llvm-r1_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	if use amd64; then
-		# On amd64 systems, build system enables x86/i686 build too.
-		# This ebuild doesn't even have multilib support, nor need it.
-		# https://bugs.gentoo.org/730062
-		einfo "Removing auto-x86 build on amd64"
-		sed -i -e 's:set(target_arch "i686"):return():' cmake/GenerateBuiltins.cmake || die
-	fi
-
-	# do not require bundled gtest
-	mkdir -p ispcrt/tests/vendor/google/googletest || die
-	cat > ispcrt/tests/vendor/google/googletest/CMakeLists.txt <<-EOF || die
-		find_package(GTest)
-	EOF
-	# remove hacks that break unbundling
-	sed -i -e '/gmock/d' -e '/install/,$d' ispcrt/tests/CMakeLists.txt || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DARM_ENABLED=$(usex arm)
-		-DCMAKE_SKIP_RPATH=ON
-		-DISPC_INCLUDE_EXAMPLES=OFF
-		-DISPC_INCLUDE_TESTS=$(usex test)
-		-DISPC_INCLUDE_UTILS=OFF
-		-DISPCRT_BUILD_GPU=$(usex gpu)
-		-DISPCRT_BUILD_TASK_MODEL=$(usex openmp OpenMP TBB)
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	# Inject path to prevent using system ispc
-	local -x PATH="${BUILD_DIR}/bin:${PATH}"
-	"${EPYTHON}" ./run_tests.py "-j$(makeopts_jobs)" -v ||
-		die "Testing failed under ${EPYTHON}"
-}
-
-src_install() {
-	cmake_src_install
-
-	if use examples; then
-		docompress -x /usr/share/doc/${PF}/examples
-		dodoc -r examples
-	fi
-}
diff --git a/dev-lang/ispc/ispc-1.25.2.ebuild b/dev-lang/ispc/ispc-1.25.2.ebuild
deleted file mode 100644
index d19ed81775c4..000000000000
--- a/dev-lang/ispc/ispc-1.25.2.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( {17..19} )
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit cmake llvm-r1 multiprocessing python-any-r1 toolchain-funcs
-
-DESCRIPTION="Intel SPMD Program Compiler"
-HOMEPAGE="
-	https://ispc.github.io/
-	https://github.com/ispc/ispc/
-"
-SRC_URI="
-	https://github.com/ispc/ispc/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD BSD-2 UoI-NCSA"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="examples gpu openmp test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	$(llvm_gen_dep '
-		sys-devel/clang:${LLVM_SLOT}
-	')
-	sys-libs/ncurses:=
-	gpu? ( dev-libs/level-zero:= )
-	!openmp? ( dev-cpp/tbb:= )
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	app-alternatives/yacc
-	app-alternatives/lex
-	${PYTHON_DEPS}
-"
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-	llvm-r1_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# do not require bundled gtest
-	mkdir -p ispcrt/tests/vendor/google/googletest || die
-	cat > ispcrt/tests/vendor/google/googletest/CMakeLists.txt <<-EOF || die
-		find_package(GTest)
-	EOF
-	# remove hacks that break unbundling
-	sed -i -e '/gmock/d' -e '/install/,$d' ispcrt/tests/CMakeLists.txt || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DARM_ENABLED=$(usex arm)
-		-DCMAKE_SKIP_RPATH=ON
-		-DISPC_INCLUDE_EXAMPLES=OFF
-		-DISPC_INCLUDE_TESTS=$(usex test)
-		-DISPC_INCLUDE_UTILS=OFF
-		-DISPCRT_BUILD_GPU=$(usex gpu)
-		-DISPCRT_BUILD_TASK_MODEL=$(usex openmp OpenMP TBB)
-		# prevent it from trying to find the git repo
-		-DGIT_BINARY=GIT_BINARY-NOTFOUND
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	# Inject path to prevent using system ispc
-	local -x PATH="${BUILD_DIR}/bin:${PATH}"
-	"${EPYTHON}" ./scripts/run_tests.py "-j$(makeopts_jobs)" -v ||
-		die "Testing failed under ${EPYTHON}"
-}
-
-src_install() {
-	cmake_src_install
-
-	if use examples; then
-		docompress -x /usr/share/doc/${PF}/examples
-		dodoc -r examples
-	fi
-}
diff --git a/dev-lang/ispc/ispc-1.25.3.ebuild b/dev-lang/ispc/ispc-1.25.3.ebuild
index d19ed81775c4..78ce9c17741d 100644
--- a/dev-lang/ispc/ispc-1.25.3.ebuild
+++ b/dev-lang/ispc/ispc-1.25.3.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="BSD BSD-2 UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="examples gpu openmp test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/cdk/cdk-5.0.20240331.ebuild b/dev-libs/cdk/cdk-5.0.20240331.ebuild
index cdce81d09ed5..7a2837499e80 100644
--- a/dev-libs/cdk/cdk-5.0.20240331.ebuild
+++ b/dev-libs/cdk/cdk-5.0.20240331.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="MIT"
 SLOT="0/6" # subslot = soname version
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples unicode"
 
 DEPEND="sys-libs/ncurses:=[unicode(+)?]"
diff --git a/dev-python/rpds-py/Manifest b/dev-python/rpds-py/Manifest
index 61f18a169b54..8cb22aaaaab4 100644
--- a/dev-python/rpds-py/Manifest
+++ b/dev-python/rpds-py/Manifest
@@ -1,4 +1,3 @@
-DIST archery-1.2.0.crate 22842 BLAKE2B 018539188a76836c35834d948f64e51888083021a90bfd56229e3cf9cba2f12db289a248d2602a71431a04a09c4a9194d11530ec769fa85eaeff239388d00a44 SHA512 82c51b29984ebf611597ef530af2b04aa4046f7e532276612f7ad8485d79cea675f70a7ca60ce65f87114abb72ad6984b2c48c2f257957ba53a05a61537531ea
 DIST archery-1.2.1.crate 21224 BLAKE2B fff66a0d32479c398fb8e722245ee9a741e529a8c38839a3f68325735cb4c36d3190170cdbad4ff379938228fbff7b781efdc0ce5e45017a72095bfa0bcfec80 SHA512 b8a5bafcc6cbc20426619e522f7d31e60f2bbc68af87e7bd9cbd4f4c1ccaa55f210b46dcf650fb354786f41b27778bdfba307ad3607b118da254fb18990ad5db
 DIST autocfg-1.3.0.crate 16524 BLAKE2B 7d5a03853d6b4f0da08d8e139fb200da21e47fa7e50d1956270d0ff0cc496f660f8f800122c95eee9ba98d9210ab200c3010b782097483d12d6be4ac0df0e7c9 SHA512 a5570b955d57a7183ba148b335837dc5af24b202e80681027536d33fe2822509ba644fc70c29f018c893285ced2bf6774f44ca6c59f7c7e2226d5349cf7c3635
 DIST cc-1.0.90.crate 73954 BLAKE2B 840417889519dec96a745c49ecbc8b0d3da9b37a4b6b0165ee8983c07b8150061690b34409381365ae4c70c5780923d19cddce29d5fbc370eb6b6fff29121436 SHA512 349f3c3f8208632f8754cc05d70976eb14f3f13a14d59413994c656efc36bb32b7310adc7d5f3a6745f15e0aaa88334644c9aba8d29fb961215d74bec605307e
@@ -10,28 +9,15 @@ DIST memoffset-0.9.1.crate 9032 BLAKE2B 0aab55fe084134bb599c52d77c96400db40949b1
 DIST once_cell-1.19.0.crate 33046 BLAKE2B c14b374eaf4ac0f60acc2e02f7bba270a0e8e0a6978d749cd3cb0ab3eb26907e4fbea70dd5132982f90290381ed18ff8a87fd530f1415fabffac864f157ea380 SHA512 4154876afd34a699ee650d1a8a1c5ee5a25f0ebd9388b8bef2564e33629fae68f113d7507488c68abbe7ea1acf9bbc41813cbbf3ef3e464e3f3b9cc7a51d870c
 DIST portable-atomic-1.6.0.crate 140689 BLAKE2B c91d06e04a87c9a207233d8a850859aa1f5cc43dda8aed34511c3fe9641c27412796539ed045a58e649d2a0c7d71100b6b2d78a0c662fc061fd961a652ae8722 SHA512 b27cf57655a2f1e2d6ea7b45d80b4f9920a836e462f132c50dc1e4d314e162444309de1baecf45dad2defc7a5b99759165e54da9fe759b24092f8cb8755c515c
 DIST proc-macro2-1.0.86.crate 48958 BLAKE2B 4b89e07f23af8328dbb34fe2b3f1b202f1e6a3885a6269740a23359b41bb4099ac2484565d3b2b0936261689ca525785ac620c766997234fd8d0f409e80e5ea3 SHA512 1cdb7e22a35ae231d880c9420784c9acf97bda2db258b3d34aae5061dc1858449defe19a49e12c6a4173906aa72a4115059ac2db0fc760205fd2ab8b5b414434
-DIST pyo3-0.22.2.crate 538342 BLAKE2B faf347695117f9fe0ebe5cd7f6aa1b0dcfe718343875d6c06438046deccc1075f104d2a2413dcda41ae9827bc363aa147057b45968f6634f577a6a4510a4bb8e SHA512 e8bae09059f50ffe477dad44499cedeaf3a734665f0fd8e8bd4b44f48578d21e4bdb8d55ceea00c5a27da750761842ddf89cfcecdecb2e7a4a17ab192259be9c
-DIST pyo3-0.22.5.crate 546700 BLAKE2B 8ee81360b205bcfc763dbd3d313e2d2f31bde4577bdc77a2ebc3084aa06e30bcc1f7efb97349d781b27882af5b8e82c6476498c86039b9c39286721ed1c08504 SHA512 48b9ada19bb12c6e5f1d41982c3b607f206d88dc078517c45106b631e0ad973145b0b60af06e58013a5189ca8b50e1cfa326c6904bba5aadb791933272ffb277
 DIST pyo3-0.22.6.crate 546746 BLAKE2B 2a6f8c5ce2ee96e1812177a11c5fad7e15f3a73d9e30850edf0855b13db6cc95427e186883b4aae25a2d2466d3fe82f56180a39f3e6e0a54bb0a3ef78d495400 SHA512 d746007eae22f5b7bbf173759c61cbd2aa893898d88b8be5680a0237deec4d113246edf5f62fbbec3579ad4bd7307499b94b887ec306112ffe3df5190fe70e44
-DIST pyo3-build-config-0.22.2.crate 31225 BLAKE2B c2e6a3d3d23b7f2f51bcbf1214ab20a298a1e62f85c9af3dab1e77b09f20b657b576feefffb18eb49d438f0ffab525b6bcd1086d500601c327ffd4fd24a719ee SHA512 644c82d30bb27051557efcc9789a81380a64e29bc62abf97de88f42c3791dac74228c7a7d09e0d46d14f07c0475f0bc03fac6ed1367b9a616153e8820b94cbc8
-DIST pyo3-build-config-0.22.5.crate 31293 BLAKE2B c1e10f78ce66993fa4a88a5994f0266200a529c2939dc1d29137aaa6133bd4c83062cd00d347b491afe5dfcf2995f4a1a0da271a24baf198447b5983a9620d83 SHA512 c11ebfeff1e8ada612dbab16bd86fb8659edb9026bbd826cba84601096fa4192faf260e067b5f9efcd0e8e72fe90bc8f08358cbced45175c662d78bde5eb3d82
 DIST pyo3-build-config-0.22.6.crate 31369 BLAKE2B a1a72de120c4ac4f23a3faaf9b2e340231d7a778a29083ef25fd863fa213afb2a9b720333e3d46a6e1d32105f63073276a23b9bcd999a97fe71eaff3afc7db99 SHA512 9ab44c830e56ddb9ee537ce438fc690664d2c5416f01cdf72498ce062e4c1e7192eac8b7dc2de86c9f2212890b133b69a66209b1615c4eabdf4eaa6882a980fe
-DIST pyo3-ffi-0.22.2.crate 67749 BLAKE2B 0a4357d5f4fbcab9717d58b7a80b63a63bc329267d4725136c4eac7c0101095a50e5f840638dde79034e5df99c4f46664cfdc2ad437837643db5d475c5705cb3 SHA512 bf8b83b4790832d99de8c6a61a15a43fc189505dd843011933305f7f93c4f5f4849fb00cc2a6fa410b788645f8ed8c0df61799cf801966a925abb9756b1ab579
-DIST pyo3-ffi-0.22.5.crate 69354 BLAKE2B 91dfb41a24cb2b12bf54d6e54949a381ba6635ee55623a7f77a7e672fcf71d7f6937b7ab96f20457d770cf132047ddc9df50ea4aae8506d64e833f11a3b504e6 SHA512 36b8ed6273f7a0298179729c41081c787f353eb338be0f470859ce62a12e05305bd53eb24b6e72f2c56971f18bd64d16c63576f41909e9ac849f355041139a91
 DIST pyo3-ffi-0.22.6.crate 69352 BLAKE2B 99eea6ed87001b23fdeb263937bc14be0fadadc1ad77d4fa8834045ba2fc6ba5c0b89f4051916a058b7640be655afe22785b1da42aac8a32d10209b7b37bf810 SHA512 616e51a0eae1207830fe95251d5b62f126daf446bec68ac98cb1b8538aaa59761dbde62d446a9ee205c23453dbd32bd8ecb15e26265ed1fa1e5e2056efd96369
-DIST pyo3-macros-0.22.2.crate 8136 BLAKE2B 9dc97d2f60581db1b8ddb562dac917069525f297fe2cbb9aff3ed34d5a08ea43c112c9c7a450539da3536d753778b5ca506dd1b18e1d6b8a3649fc098e7af439 SHA512 f4f4f6af8dc3aa4bcc1698661990ab2112391ef9502e9f71d86e35bd10dc4e1be309102ebb1b7b32751817a6033168dc0486fdb16b35c626101e69f0de807a4a
-DIST pyo3-macros-0.22.5.crate 8186 BLAKE2B 78f0c348fec0878ce4c873af3d4c438ccf02a5e971f2fd8b1cc9ea40a3aa8396dc6ea11e4d421a8b8c5eff5752182623632d92403ba6c5565b6b71b386768b04 SHA512 cfd848fb82f183290791930ca2e43a0db63de4f23436c1f1d3c688efdcbba1462346177c5956817418a0f0ea172b1039f5408a02a05ff03671dbb025f0697076
 DIST pyo3-macros-0.22.6.crate 8182 BLAKE2B 81998e4f4cb325763e4d3477af05b332e184cabf6391761f850d23508cebcf8d496ce12f747ea241523bb3899886eb20494b076a0651151744bb81d52901a1b4 SHA512 63f7a7b42e099742518c8a3bbc7647e98debb5500d08c39e11e8140fc146e790ab06e005d8d14c89aba79ebc5bf04fe1c92c0e9c5b13421307d3a4682d044179
-DIST pyo3-macros-backend-0.22.2.crate 65620 BLAKE2B 37fba9ff384373418d3a7341acafb8e33308a64e30026f828693a37c32ab4a74d058f2db84d00467a20f9f267c96fe54c0f154d1ebbae92490e8dfc0d29c042f SHA512 0517080c0d5d4ed8136521fd37aa3a192c2eb8cab58545d8543ee4df9cd0dcea19fe0678d5ab90f05fe3eb0f4a86fc2f07b76f2e12ac1fcf7e7c195c2ffa4fd8
-DIST pyo3-macros-backend-0.22.5.crate 66308 BLAKE2B d30c021da6b013abb8bbc8d55f110f3394c79d85f02506d7a42bba256afd639647210ed66bae289f4dfbd6d060995c0365b278749798b302eb89f1b09c074ab3 SHA512 8a79f9c6f948375e20804d2bc4b98d9fd7d39f99a936afb1d9a0fab599a3ad07e95bc985aa51b0ab8410b6b4f5ebaa2aa347013ae722a2b3f4c51f318415d472
 DIST pyo3-macros-backend-0.22.6.crate 66312 BLAKE2B ec0b11bee1ad2192e8d95cebab0075d6ec5bf628e3344b86fb8e20a6d0bc1f891b56ccfa4622840a609480581f32bd211b9a3d1dd989716cf255efe3fdc89331 SHA512 87463939b5a5674e30e8ca05ae747f652f8679f0c5c85d20967e9910ad853768a769a914580e82e409188fe4add80a3117ccb9da24c250406bc6f76fe4453799
 DIST python3-dll-a-0.2.10.crate 74573 BLAKE2B 770c5b070f4dd1b9639b8aff59bb733575eb1117ae8e510818b6e13bdc69b22bcad395bb5cf0d1931de3562775a56e1404bb7fca7384b62e5e782e6284fa1494 SHA512 c1171c29f6914ff809950a9f6c330638e72c58c7c691bf4d9e765dee47166915cc91131b494b65aeb3a812543690c5072f2f5ff32cdebb76ba588330f9c74cdb
 DIST quote-1.0.36.crate 28507 BLAKE2B b93495163ed205e33543ed45f084870240d479071d643704b6e348fb9ada6e1d8401893c13348b9964f4b6b17ddb96cb5458eec540f0d761655fcb96a4cd9129 SHA512 f1f002a912692f7ffd4912ca980ec57ff4aca3a7d9e2e42e9e3409e2105c9f59d86c05719f6af309bccaef2f8843b0848a6e3afda3356e045d8e7cc5956ae685
 DIST rpds-1.1.0.crate 69493 BLAKE2B f2d02c758de1abd46ff133965e0491a0276e4a95be5b64b6c83947bf8b3718896781eb96cf96d4abac84aba0c7caaa5e95abf1364ab2ffd65d573d0af212e058 SHA512 b24640e34c2f88ecfff5efb1581941eb02987bb7b342dc439513e8d7c8ee0afa63949f8dee09bf8f445ec6f3b3ec22d2927d3d03be05fee3c651b29c924a6b3e
-DIST rpds_py-0.19.1.tar.gz 25022 BLAKE2B f0ca3173d5afa5c44a67a9012be234eb143a3bd6e1a89b1bd3a0e7f23d31999017ed5d5359c01ea33f4a28b2eab655113b03d9cfbb5880488bbd66a50c206db5 SHA512 dfb0b7180c5fbd77108e2a90d0b664d6410d3f3d00efcb9b7a79291ac736668f3cd3d7dec12292d30ae4bd445f909563e35aaa841814075b2b020863f2e49f3c
-DIST rpds_py-0.20.1.tar.gz 25931 BLAKE2B a55933ddf5d897f4dd03812ed53d16c3bf61ff8da279c18fb7034543c07a2da0ed6d3853e3bf1628b465f66fddfc914fb9609f0147042239f930f2e60bbc08c9 SHA512 326062aa5cffae52b65d697a101d72dff15fd7d684541936a89e4c69c2c5b6b6bb6c4ba7a0a62639a65b36e7d8c7615b515b6965ca42f699c4dfe036a2786c7c
 DIST rpds_py-0.21.0.tar.gz 26335 BLAKE2B fa85722ccba1c21b20fe6a7f8069a68bdd03fc953299c5b53aa6b3343db363e8ebe491590a8ba6174e9fb2f2eb3b02bc43020896471b81c0cdc13c4296bf57ee SHA512 0cb1c48f6672d69c00e2b6c22cf586396849491fbeea4ca86a493fe09e59c2e4354bf4356320de32b5825c0a013b462085b03d2a7446ed878e52a139d97a41c7
-DIST static_assertions-1.1.0.crate 18480 BLAKE2B 358dd5ac413d06f62da0388e2016c5fcb8ec68fd7dceb0dbbcb97665c032b7509b7e083c20701648b6a9174485f117c02682ae4bde7ef037e80a85cdf6a0c86e SHA512 46d0e35f77941dee6f60f574c130472248063dc38494c1c4f84f7c048244cc2a58a86fe17c0990e3f0f01406b75ed385a13d00058612b27cf0e867c8d31c92ee
 DIST syn-2.0.69.crate 265441 BLAKE2B b01576c2c86426d2bbb2c9553dc1dce6a309d9922c35167ee6a718ad08cf3d0a22f0aed4d4c547cdbed85b47283e5b60a128fd1bbb230a6687f0c28af3a9c228 SHA512 fddc0f1ffa3e68ce57833c6ff18382296838287dd98f9f77f679ced471c3f801af30376363a870232f337bda27b3ba6ea93074f8e3c05ee390bcc024e3690bea
 DIST target-lexicon-0.12.14.crate 25508 BLAKE2B 5ebb6b49e5c3b0057959557651287d4bf5ffe5b499340019ff64d5fc3b64e780e344982e358c94b1b25a20bf0f526a584aeecc704695b50a55cc268dd65edb97 SHA512 3410ecc0faf854f49c41c99f83972960e67065b1e0e78557a7c4996d996109bfd167d2121a019f5256f996c896cd45af032038ab7918fdcc6ee6311693ce951a
 DIST triomphe-0.1.13.crate 29568 BLAKE2B f0450292e3a4c2df6b400621bada57c099e5779cd3659c6171e452b552d2acaedbb2c0cd074c8f2144fbba9dc095648ba1c43a3fdcfe6fe3e01efe2561f6971d SHA512 e8364bf262d41aaf23de5c519c0303fd6ad928d8691843c7e0eda26b530c746c458837b08421559c50edf1cb8b9a2a216d7c32f5ea50be1543a2dec2cc60dd6a
diff --git a/dev-python/rpds-py/rpds-py-0.19.1-r1.ebuild b/dev-python/rpds-py/rpds-py-0.19.1-r1.ebuild
deleted file mode 100644
index 629949dd782e..000000000000
--- a/dev-python/rpds-py/rpds-py-0.19.1-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=maturin
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-
-CRATES="
-	archery@1.2.0
-	autocfg@1.3.0
-	cc@1.0.90
-	cfg-if@1.0.0
-	heck@0.5.0
-	indoc@2.0.5
-	libc@0.2.155
-	memoffset@0.9.1
-	once_cell@1.19.0
-	portable-atomic@1.6.0
-	proc-macro2@1.0.86
-	pyo3-build-config@0.22.2
-	pyo3-ffi@0.22.2
-	pyo3-macros-backend@0.22.2
-	pyo3-macros@0.22.2
-	pyo3@0.22.2
-	python3-dll-a@0.2.10
-	quote@1.0.36
-	rpds@1.1.0
-	static_assertions@1.1.0
-	syn@2.0.69
-	target-lexicon@0.12.14
-	triomphe@0.1.13
-	unicode-ident@1.0.12
-	unindent@0.2.3
-"
-
-RUST_MIN_VER="1.77.1"
-
-inherit cargo distutils-r1 pypi
-
-DESCRIPTION="Python bindings to Rust's persistent data structures (rpds)"
-HOMEPAGE="
-	https://github.com/crate-py/rpds/
-	https://pypi.org/project/rpds-py/
-"
-SRC_URI+="
-	${CARGO_CRATE_URIS}
-"
-
-LICENSE="MIT"
-# Dependent crate licenses
-LICENSE+=" Apache-2.0-with-LLVM-exceptions MIT MPL-2.0 Unicode-DFS-2016"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/rpds/rpds.*.so"
-
-distutils_enable_tests pytest
-
-export UNSAFE_PYO3_SKIP_VERSION_CHECK=1
diff --git a/dev-python/rpds-py/rpds-py-0.20.1-r1.ebuild b/dev-python/rpds-py/rpds-py-0.20.1-r1.ebuild
deleted file mode 100644
index a7c044d8f8fd..000000000000
--- a/dev-python/rpds-py/rpds-py-0.20.1-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=maturin
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-
-CRATES="
-	archery@1.2.1
-	autocfg@1.3.0
-	cc@1.0.90
-	cfg-if@1.0.0
-	heck@0.5.0
-	indoc@2.0.5
-	libc@0.2.155
-	memoffset@0.9.1
-	once_cell@1.19.0
-	portable-atomic@1.6.0
-	proc-macro2@1.0.86
-	pyo3-build-config@0.22.5
-	pyo3-ffi@0.22.5
-	pyo3-macros-backend@0.22.5
-	pyo3-macros@0.22.5
-	pyo3@0.22.5
-	python3-dll-a@0.2.10
-	quote@1.0.36
-	rpds@1.1.0
-	syn@2.0.69
-	target-lexicon@0.12.14
-	triomphe@0.1.13
-	unicode-ident@1.0.12
-	unindent@0.2.3
-"
-
-RUST_MIN_VER="1.77.1"
-
-inherit cargo distutils-r1 pypi
-
-DESCRIPTION="Python bindings to Rust's persistent data structures (rpds)"
-HOMEPAGE="
-	https://github.com/crate-py/rpds/
-	https://pypi.org/project/rpds-py/
-"
-SRC_URI+="
-	${CARGO_CRATE_URIS}
-"
-
-LICENSE="MIT"
-# Dependent crate licenses
-LICENSE+=" Apache-2.0-with-LLVM-exceptions MIT MPL-2.0 Unicode-DFS-2016"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/rpds/rpds.*.so"
-
-distutils_enable_tests pytest
-
-export UNSAFE_PYO3_SKIP_VERSION_CHECK=1
diff --git a/dev-python/rpds-py/rpds-py-0.21.0-r1.ebuild b/dev-python/rpds-py/rpds-py-0.21.0-r1.ebuild
index a675708299b1..798a4a1c3b8e 100644
--- a/dev-python/rpds-py/rpds-py-0.21.0-r1.ebuild
+++ b/dev-python/rpds-py/rpds-py-0.21.0-r1.ebuild
@@ -51,7 +51,7 @@ LICENSE="MIT"
 # Dependent crate licenses
 LICENSE+=" Apache-2.0-with-LLVM-exceptions MIT MPL-2.0 Unicode-DFS-2016"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/rpds/rpds.*.so"
 
diff --git a/dev-python/selenium/selenium-4.26.1.ebuild b/dev-python/selenium/selenium-4.26.1.ebuild
index 3199598130f7..ed6b841befc5 100644
--- a/dev-python/selenium/selenium-4.26.1.ebuild
+++ b/dev-python/selenium/selenium-4.26.1.ebuild
@@ -28,7 +28,7 @@ SRC_URI+="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 arm ~arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm ~arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="test-rust"
 
 RDEPEND="
diff --git a/dev-util/pkgcheck/pkgcheck-0.10.32.ebuild b/dev-util/pkgcheck/pkgcheck-0.10.32.ebuild
index 7c6573244e53..812fcd49d7a6 100644
--- a/dev-util/pkgcheck/pkgcheck-0.10.32.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-0.10.32.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then
 		https://github.com/pkgcore/pkgcheck.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha ~amd64 arm arm64 hppa ~loong ~mips ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~x64-macos"
+	KEYWORDS="~alpha ~amd64 arm arm64 hppa ~loong ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 	inherit pypi
 fi
 
diff --git a/dev-util/selenium-manager/Manifest b/dev-util/selenium-manager/Manifest
index cfad7eec6edf..7e8a5937bae8 100644
--- a/dev-util/selenium-manager/Manifest
+++ b/dev-util/selenium-manager/Manifest
@@ -1,4 +1,2 @@
-DIST selenium-manager-4.24.0-crates.tar.xz 27591764 BLAKE2B 42c120a77df5c48b840200772d3d49aa88c0cbfec67244d13435037631a8f0d67d03249031da44cfc6ecddfb8cd9b90b879df0be896a072141d98f772933aeab SHA512 93943e9cfc54f7e66fc25290c67bb6eee679de5c1a8c1af23c8e79d0ce15aaec4de8a38b8b2346c632ac8e93446cb8c5e37767ba955a3aa5850ad6f4dfdec340
 DIST selenium-manager-4.26.0-crates.tar.xz 25659608 BLAKE2B 35c8c7aab560a16424580a79245bf096112b3eaa2a5a64a08535e5ad523331c905e1391138c5ee9555cb74169c758ffc6a1ef0ec36eba9754b883c66ae313321 SHA512 114c880feeead5cc37d57197b8d9eeefde428d9f8ed1f8c946f86064ec633e6f925c250114f91de8ed5fae6b1a25424754f008210f4f897a972c11a80a03eaf0
-DIST selenium-selenium-4.25.0.gh.tar.gz 77158053 BLAKE2B 9978239a874d32e23d98ec98eb5292153496c42abcdd0f959875b2b460df5a85c0b532b6843e0d13b931078490958ebdc2944a8c21ce2eae24a0ac6a3c830772 SHA512 6d11d1aa22d27dbc07c3d39f5f852080c5089b12b1da0251e7b09c38ac3b8f56f452a24c64a20685eb0aff238698ab4bd18a8b7089c69f261cfbcdc679ceeac8
 DIST selenium-selenium-4.26.0.gh.tar.gz 77107740 BLAKE2B d4e466dbdb9a12126ae8ee9e311d5d997228da3b22620ead3dbf1a553232503fbd8c19470419d6ad5862acfc19f0012c4c48b3a5e1ccecaf0f7c4171f35904fb SHA512 03197215c04e8f6e151631d769975e70b5140d2d7635443c07e43e63b1c0cc3bc99b0694300ca4dbfea6178af9d037d28699a756ef74926a357f7a3030086182
diff --git a/dev-util/selenium-manager/selenium-manager-4.25.0-r1.ebuild b/dev-util/selenium-manager/selenium-manager-4.25.0-r1.ebuild
deleted file mode 100644
index 1e46fdad2294..000000000000
--- a/dev-util/selenium-manager/selenium-manager-4.25.0-r1.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CRATES="
-"
-
-inherit cargo
-
-TAG=selenium-${PV}
-MY_P=selenium-${TAG}
-CRATES_P=${PN}-4.24.0
-DESCRIPTION="CLI tool that manages the browser/driver infrastructure required by Selenium"
-HOMEPAGE="
-	https://www.selenium.dev/
-	https://github.com/SeleniumHQ/selenium/
-"
-SRC_URI="
-	https://github.com/SeleniumHQ/selenium/archive/selenium-${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-if [[ ${PKGBUMPING} != ${PVR} ]]; then
-	SRC_URI+="
-		https://dev.gentoo.org/~mgorny/dist/${CRATES_P}-crates.tar.xz
-	"
-fi
-S="${WORKDIR}/${MY_P}/rust"
-
-LICENSE="Apache-2.0"
-# Dependent crate licenses
-LICENSE+=" Apache-2.0 BSD ISC MIT MPL-2.0 Unicode-DFS-2016"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 ~riscv x86"
-IUSE="telemetry test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	app-arch/bzip2:=
-	app-arch/xz-utils:=
-	app-arch/zstd:=
-	sys-libs/zlib:=
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	test? (
-		|| (
-			www-client/firefox
-			www-client/firefox-bin
-		)
-	)
-"
-
-QA_FLAGS_IGNORED="usr/bin/${PN}"
-
-src_prepare() {
-	default
-
-	sed -i -e '/strip/d' Cargo.toml || die
-	if ! use telemetry; then
-		sed -i -e '/avoid-stats/s:false:true:' src/config.rs || die
-	fi
-
-	# Avoid tests requiring Internet or specific browsers (or trying
-	# to fetch them, whatever).
-	rm tests/browser_download_tests.rs || die
-	rm tests/cache_tests.rs || die
-	rm tests/exec_driver_tests.rs || die
-	rm tests/grid_tests.rs || die
-	rm tests/browser_tests.rs || die
-	rm tests/config_tests.rs || die
-	rm tests/iexplorer_tests.rs || die
-	rm tests/mirror_tests.rs || die
-	rm tests/output_tests.rs || die
-	rm tests/stable_browser_tests.rs || die
-	rm tests/webview_tests.rs || die
-
-	# enable system libraries where supported
-	export ZSTD_SYS_USE_PKG_CONFIG=1
-	sed -i -e '/features.*static/d' "${ECARGO_VENDOR}"/apple-xar-*/Cargo.toml || die
-
-	# remove unbundled sources, just in case
-	# (smoke.c is actually used to test system -lz, sigh)
-	find "${ECARGO_VENDOR}"/*-sys-*/ \
-		\( -name '*.c' -a -not -name 'smoke.c' \) -delete || die
-
-	# bzip2-sys requires a pkg-config file
-	# https://github.com/alexcrichton/bzip2-rs/issues/104
-	mkdir "${T}/pkg-config" || die
-	export PKG_CONFIG_PATH=${T}/pkg-config${PKG_CONFIG_PATH+:${PKG_CONFIG_PATH}}
-	cat >> "${T}/pkg-config/bzip2.pc" <<-EOF || die
-		Name: bzip2
-		Version: 9999
-		Description:
-		Libs: -lbz2
-	EOF
-}
-
-src_test() {
-	local -x PATH=${T}/bin:${PATH}
-
-	mkdir "${T}/bin" || die
-	if ! has_version "www-client/firefox"; then
-		# upstream expects "firefox" rather than "firefox-bin"
-		ln -s "$(type -P firefox-bin)" "${T}/bin/firefox" || die
-	fi
-
-	cargo_src_test --no-fail-fast
-}
-
-src_install() {
-	cargo_src_install
-	einstalldocs
-	dodoc README.md
-
-	newenvd - 70selenium-manager <<-EOF || die
-		SE_MANAGER_PATH="${EPREFIX}/usr/bin/selenium-manager"
-	EOF
-}
diff --git a/games-util/wit/wit-3.05a.ebuild b/games-util/wit/wit-3.05a.ebuild
index c2f24e10a5b7..9ce9ed4a4543 100644
--- a/games-util/wit/wit-3.05a.ebuild
+++ b/games-util/wit/wit-3.05a.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://download.wiimm.de/source/wiimms-iso-tools/${MY_P}.txz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+fuse +zlib"
 
 RDEPEND="
diff --git a/mail-mta/exim/exim-4.97.1-r6.ebuild b/mail-mta/exim/exim-4.97.1-r6.ebuild
index 22c7fa1cc29c..52dd08532a83 100644
--- a/mail-mta/exim/exim-4.97.1-r6.ebuild
+++ b/mail-mta/exim/exim-4.97.1-r6.ebuild
@@ -44,7 +44,7 @@ HOMEPAGE="https://www.exim.org/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ppc ~ppc64 sparc ~x86"
 
 COMMON_DEPEND=">=sys-apps/sed-4.0.5
 	dev-libs/libpcre2:=
diff --git a/media-libs/kvazaar/kvazaar-2.3.0-r1.ebuild b/media-libs/kvazaar/kvazaar-2.3.0-r1.ebuild
index 194c59977240..e4b201664f36 100644
--- a/media-libs/kvazaar/kvazaar-2.3.0-r1.ebuild
+++ b/media-libs/kvazaar/kvazaar-2.3.0-r1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = *9999 ]] ; then
 else
 	SRC_URI="https://github.com/ultravideo/kvazaar/archive/v${PV}.tar.gz -> ${P}.tar.gz
 		test? ( https://github.com/silentbicycle/greatest/archive/v${GREATEST_PV}.tar.gz -> greatest-${GREATEST_PV}.tar.gz )"
-	KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~loong ~mips ppc ~ppc64 ~riscv sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ~ppc64 ~riscv sparc x86"
 fi
 inherit autotools multilib-minimal
 
diff --git a/media-libs/libheif/libheif-9999.ebuild b/media-libs/libheif/libheif-9999.ebuild
index 0ee4f90982c5..e55830a930cc 100644
--- a/media-libs/libheif/libheif-9999.ebuild
+++ b/media-libs/libheif/libheif-9999.ebuild
@@ -45,9 +45,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-# https://github.com/strukturag/libheif/issues/1249
-PATCHES=( "${FILESDIR}"/${P}-prepend_DESTDIR_when_generating_heif-convert_symlink.patch )
-
 MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/libheif/heif_version.h
 )
diff --git a/media-libs/x265/x265-3.6-r1.ebuild b/media-libs/x265/x265-3.6-r1.ebuild
index a7ff264092fc..ed17464d4301 100644
--- a/media-libs/x265/x265-3.6-r1.ebuild
+++ b/media-libs/x265/x265-3.6-r1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} = 9999* ]]; then
 	MY_P="${PN}-${PV}"
 else
 	SRC_URI="https://bitbucket.org/multicoreware/x265_git/downloads/${PN}_${PV}.tar.gz -> ${PN}-${PV}.tar.gz"
-	KEYWORDS="~amd64 arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="~amd64 arm ~arm64 ~hppa ~loong ~mips ppc ~ppc64 ~riscv ~x86"
 	MY_P="${PN}_${PV}"
 fi
 
diff --git a/media-video/motion/motion-4.5.1-r4.ebuild b/media-video/motion/motion-4.5.1-r4.ebuild
index 3a3e8b1aa6aa..0ea39b3e956f 100644
--- a/media-video/motion/motion-4.5.1-r4.ebuild
+++ b/media-video/motion/motion-4.5.1-r4.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}-release-${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86"
 IUSE="ffmpeg mariadb mysql postgres sqlite v4l webp"
 
 RDEPEND="
diff --git a/media-video/smplayer/smplayer-24.5.0.ebuild b/media-video/smplayer/smplayer-24.5.0.ebuild
index 6ae116a3af27..b81468316555 100644
--- a/media-video/smplayer/smplayer-24.5.0.ebuild
+++ b/media-video/smplayer/smplayer-24.5.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/smplayer-dev/${PN}/releases/download/v${PV}/${P}.tar
 
 LICENSE="GPL-2+ BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~amd64-linux"
 IUSE="bidi debug"
 
 DEPEND="
diff --git a/net-analyzer/zmap/zmap-4.1.1.ebuild b/net-analyzer/zmap/zmap-4.1.1.ebuild
index 3096beae366c..82d4caa4687a 100644
--- a/net-analyzer/zmap/zmap-4.1.1.ebuild
+++ b/net-analyzer/zmap/zmap-4.1.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/zmap/zmap/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 arm ~arm64 x86"
+KEYWORDS="amd64 arm ~arm64 x86"
 IUSE="mongo redis"
 
 RDEPEND="
diff --git a/net-libs/gsoap/gsoap-2.8.130-r1.ebuild b/net-libs/gsoap/gsoap-2.8.130-r1.ebuild
index 53aff75f1f8b..6db675c411de 100644
--- a/net-libs/gsoap/gsoap-2.8.130-r1.ebuild
+++ b/net-libs/gsoap/gsoap-2.8.130-r1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="|| ( gSOAP-1.3b GPL-2+-with-openssl-exception ) GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc debug examples ipv6 gnutls +ssl"
 
 RDEPEND="
diff --git a/net-libs/libmicrodns/libmicrodns-0.2.0-r1.ebuild b/net-libs/libmicrodns/libmicrodns-0.2.0-r1.ebuild
index c132d28d1fa7..f5a66116cf46 100644
--- a/net-libs/libmicrodns/libmicrodns-0.2.0-r1.ebuild
+++ b/net-libs/libmicrodns/libmicrodns-0.2.0-r1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/videolabs/${PN}"
 else
 	SRC_URI="https://github.com/videolabs/${PN}/releases/download/${PV}/${P/lib/}.tar.xz"
-	KEYWORDS="~amd64 ~arm arm64 ~loong ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~loong ppc ~ppc64 ~riscv ~x86"
 	S="${WORKDIR}/${P/lib/}"
 fi
 
diff --git a/net-libs/libotr/libotr-4.1.1-r2.ebuild b/net-libs/libotr/libotr-4.1.1-r2.ebuild
index 64b08a9de6f1..e68cc890331d 100644
--- a/net-libs/libotr/libotr-4.1.1-r2.ebuild
+++ b/net-libs/libotr/libotr-4.1.1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://otr.cypherpunks.ca/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 RDEPEND="
 	dev-libs/libgcrypt:=
diff --git a/net-mail/notmuch/notmuch-0.38.3.ebuild b/net-mail/notmuch/notmuch-0.38.3.ebuild
index 03b328b0a9dd..22bc372d8f25 100644
--- a/net-mail/notmuch/notmuch-0.38.3.ebuild
+++ b/net-mail/notmuch/notmuch-0.38.3.ebuild
@@ -18,7 +18,7 @@ LICENSE="GPL-3"
 # Sub-slot corresponds to major wersion of libnotmuch.so.X.Y. Bump of Y is
 # meant to be binary backward compatible.
 SLOT="0/5"
-KEYWORDS="~alpha ~amd64 arm arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 	apidoc? ( doc )
diff --git a/net-misc/httpie/httpie-3.2.3.ebuild b/net-misc/httpie/httpie-3.2.3.ebuild
index 7b2f0a6071ef..968f126843cb 100644
--- a/net-misc/httpie/httpie-3.2.3.ebuild
+++ b/net-misc/httpie/httpie-3.2.3.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}"/cli-${PV}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-python/charset-normalizer[${PYTHON_USEDEP}]
diff --git a/net-misc/sshpass/sshpass-1.10.ebuild b/net-misc/sshpass/sshpass-1.10.ebuild
index 5a5550a67d4e..6856c6b7624b 100644
--- a/net-misc/sshpass/sshpass-1.10.ebuild
+++ b/net-misc/sshpass/sshpass-1.10.ebuild
@@ -9,6 +9,6 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
 
 RDEPEND="virtual/openssh"
diff --git a/x11-plugins/wmclockmon/wmclockmon-1.0.0.ebuild b/x11-plugins/wmclockmon/wmclockmon-1.0.0.ebuild
index f2c424a5da28..9e1910c60e11 100644
--- a/x11-plugins/wmclockmon/wmclockmon-1.0.0.ebuild
+++ b/x11-plugins/wmclockmon/wmclockmon-1.0.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.dockapps.net/download/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="x11-libs/gtk+:3
 	x11-libs/libXext
diff --git a/x11-terms/xterm/xterm-394.ebuild b/x11-terms/xterm/xterm-394.ebuild
index 764489569457..beaf43db6fc6 100644
--- a/x11-terms/xterm/xterm-394.ebuild
+++ b/x11-terms/xterm/xterm-394.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( https://invisible-island.net/archives/${PN}/${P}.tgz.as
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="+openpty sixel toolbar truetype unicode Xaw3d xinerama"
 
 DEPEND="
diff --git a/x11-wm/xpra/xpra-4.4.6-r2.ebuild b/x11-wm/xpra/xpra-4.4.6-r2.ebuild
index 1b5d002d34a8..69a88735dbad 100644
--- a/x11-wm/xpra/xpra-4.4.6-r2.ebuild
+++ b/x11-wm/xpra/xpra-4.4.6-r2.ebuild
@@ -128,7 +128,7 @@ python_prepare_all() {
 		sed -r -e '/pam_ENABLED/s/DEFAULT/False/' \
 			-e 's/^(xdg_open)_ENABLED = .*/\1_ENABLED = False/' \
 			-i setup.py || die
-		PATCHES+=( "${FILESDIR}"/${PN}-4.4.6_xpra-4.4.6_minimal-features.patch )
+		PATCHES+=( "${FILESDIR}"/${PN}-4.4.6_minimal-features.patch )
 	fi
 
 	distutils-r1_python_prepare_all