Merge updates from master

68 files changed, 104 insertions, 248 deletions

diff --git a/app-admin/drush/drush-6.7.0-r8.ebuild b/app-admin/drush/drush-6.7.0-r8.ebuild
index dc578f5db914..97986b3adab5 100644
--- a/app-admin/drush/drush-6.7.0-r8.ebuild
+++ b/app-admin/drush/drush-6.7.0-r8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/drush-ops/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="dev-lang/php[cli,ctype,json(+),simplexml]
 	dev-php/PEAR-Console_Table"
diff --git a/app-admin/genromfs/genromfs-0.5.7.ebuild b/app-admin/genromfs/genromfs-0.5.7.ebuild
index 78d99976ffad..30542d8ad89e 100644
--- a/app-admin/genromfs/genromfs-0.5.7.ebuild
+++ b/app-admin/genromfs/genromfs-0.5.7.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/chexum/${PN}/archive/refs/tags/${PV}.tar.gz
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~loong ppc ~ppc64 ~s390 ~x86"
+KEYWORDS="amd64 arm64 ~loong ppc ~ppc64 ~s390 x86"
 
 PATCHES=( "${FILESDIR}"/${P}-build.patch )
 
diff --git a/app-admin/sagan/sagan-2.0.2.ebuild b/app-admin/sagan/sagan-2.0.2.ebuild
index b4f057665816..090a2ae6bb0b 100644
--- a/app-admin/sagan/sagan-2.0.2.ebuild
+++ b/app-admin/sagan/sagan-2.0.2.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}-v-2-0.2/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="geoip +libdnet mysql redis +pcap smtp"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/app-admin/sxid/sxid-4.20130802.ebuild b/app-admin/sxid/sxid-4.20130802.ebuild
index c2b5a9aeaad8..8f02bc234b13 100644
--- a/app-admin/sxid/sxid-4.20130802.ebuild
+++ b/app-admin/sxid/sxid-4.20130802.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://linukz.org/download/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="selinux"
 
 RDEPEND="
diff --git a/app-admin/tenshi/tenshi-0.18.ebuild b/app-admin/tenshi/tenshi-0.18.ebuild
index bb83314f54c0..813d1f8735d1 100644
--- a/app-admin/tenshi/tenshi-0.18.ebuild
+++ b/app-admin/tenshi/tenshi-0.18.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/f-secure-foundry/${PN}/archive/${PV}.tar.gz -> ${P}.
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="amd64 ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 
 RDEPEND="
 	acct-group/tenshi
diff --git a/app-arch/libpar2/libpar2-0.4-r1.ebuild b/app-arch/libpar2/libpar2-0.4-r1.ebuild
index e80fc9ce441b..21fbc06a9051 100644
--- a/app-arch/libpar2/libpar2-0.4-r1.ebuild
+++ b/app-arch/libpar2/libpar2-0.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ppc x86"
+KEYWORDS="amd64 ppc x86"
 
 RDEPEND="dev-libs/libsigc++:2"
 DEPEND="${RDEPEND}"
diff --git a/app-crypt/libscrypt/libscrypt-1.22-r2.ebuild b/app-crypt/libscrypt/libscrypt-1.22-r2.ebuild
index f8a96d393e16..c4212185d78c 100644
--- a/app-crypt/libscrypt/libscrypt-1.22-r2.ebuild
+++ b/app-crypt/libscrypt/libscrypt-1.22-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/technion/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ~hppa ~mips ppc ~ppc64 ~riscv sparc ~x86"
+KEYWORDS="~amd64 arm arm64 ~hppa ~mips ppc ~ppc64 ~riscv sparc x86"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.22-no-clobber-fortify-source.patch
diff --git a/app-dicts/verbiste/verbiste-0.1.48.ebuild b/app-dicts/verbiste/verbiste-0.1.48.ebuild
index 96bfc1d31a7c..a6a1b33bb1f9 100644
--- a/app-dicts/verbiste/verbiste-0.1.48.ebuild
+++ b/app-dicts/verbiste/verbiste-0.1.48.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://sarrazip.com/dev/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ppc ~riscv ~x86"
+KEYWORDS="amd64 ppc ~riscv x86"
 IUSE="gtk test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-dicts/ydpdict/ydpdict-1.0.5.ebuild b/app-dicts/ydpdict/ydpdict-1.0.5.ebuild
index fb5a37501241..1b9ad1aee8c6 100644
--- a/app-dicts/ydpdict/ydpdict-1.0.5.ebuild
+++ b/app-dicts/ydpdict/ydpdict-1.0.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/wojtekka/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv x86"
+KEYWORDS="amd64 ~riscv x86"
 IUSE="ao"
 
 RDEPEND="
diff --git a/app-editors/dav/dav-0.9.0.ebuild b/app-editors/dav/dav-0.9.0.ebuild
index 22cab2b3b160..a5c2652e13d7 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-emacs/ghub/ghub-4.1.1.ebuild b/app-emacs/ghub/ghub-4.1.1.ebuild
index 137580e04d5e..7489aa2ed3a3 100644
--- a/app-emacs/ghub/ghub-4.1.1.ebuild
+++ b/app-emacs/ghub/ghub-4.1.1.ebuild
@@ -17,7 +17,7 @@ else
 	SRC_URI="https://github.com/magit/${PN}/archive/v${PV}.tar.gz
 		-> ${P}.tar.gz"
 
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="GPL-3+"
diff --git a/app-emacs/use-package/use-package-2.4.6.ebuild b/app-emacs/use-package/use-package-2.4.6.ebuild
index 2065e0b87342..4eaeb13c8046 100644
--- a/app-emacs/use-package/use-package-2.4.6.ebuild
+++ b/app-emacs/use-package/use-package-2.4.6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://dev.gentoo.org/~xgqt/distfiles/repackaged/${P}.tar.xz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	app-emacs/bind-chord
diff --git a/app-misc/banner/banner-1.3.6.ebuild b/app-misc/banner/banner-1.3.6.ebuild
index 9ea2d9108bce..091940226f29 100644
--- a/app-misc/banner/banner-1.3.6.ebuild
+++ b/app-misc/banner/banner-1.3.6.ebuild
@@ -10,6 +10,6 @@ S="${WORKDIR}/${PN}-${PN^^}_V${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~mips ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm64 ~mips ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="!<=games-misc/bsd-games-3"
diff --git a/app-misc/scrub/scrub-2.6.1-r2.ebuild b/app-misc/scrub/scrub-2.6.1-r2.ebuild
index 013a92f4d63b..ecd37b1362b7 100644
--- a/app-misc/scrub/scrub-2.6.1-r2.ebuild
+++ b/app-misc/scrub/scrub-2.6.1-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/chaos/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv ~sparc x86"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-implicit-function-declaration-test.patch
diff --git a/app-text/ocrad/ocrad-0.29.ebuild b/app-text/ocrad/ocrad-0.29.ebuild
index a342de018084..3c460f4fa252 100644
--- a/app-text/ocrad/ocrad-0.29.ebuild
+++ b/app-text/ocrad/ocrad-0.29.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.lz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ppc ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~sparc x86"
 
 BDEPEND="$(unpacker_src_uri_depends)"
 
diff --git a/app-text/poppler/poppler-24.11.0-r1.ebuild b/app-text/poppler/poppler-24.11.0-r1.ebuild
index f432eea6736d..c10f84d944eb 100644
--- a/app-text/poppler/poppler-24.11.0-r1.ebuild
+++ b/app-text/poppler/poppler-24.11.0-r1.ebuild
@@ -17,7 +17,7 @@ else
 	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
 	SRC_URI+=" test? ( https://gitlab.freedesktop.org/poppler/test/-/archive/${TEST_COMMIT}/test-${TEST_COMMIT}.tar.bz2 -> ${PN}-test-${TEST_COMMIT}.tar.bz2 )"
 	SRC_URI+=" verify-sig? ( https://poppler.freedesktop.org/${P}.tar.xz.sig )"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 	SLOT="0/143"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
diff --git a/dev-ada/gtkada/gtkada-24.0.0.ebuild b/dev-ada/gtkada/gtkada-24.0.0.ebuild
index d99581906f41..9ac9d7bc4141 100644
--- a/dev-ada/gtkada/gtkada-24.0.0.ebuild
+++ b/dev-ada/gtkada/gtkada-24.0.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="+shared static-libs static-pic"
 
 RDEPEND="${ADA_DEPS}
diff --git a/dev-lang/python/python-3.10.15_p2.ebuild b/dev-lang/python/python-3.10.15_p2.ebuild
index ca655efa4656..c1e3463af7a9 100644
--- a/dev-lang/python/python-3.10.15_p2.ebuild
+++ b/dev-lang/python/python-3.10.15_p2.ebuild
@@ -28,7 +28,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="
 	bluetooth build debug +ensurepip examples gdbm libedit
 	+ncurses pgo +readline +sqlite +ssl test tk valgrind
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.28-r5.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.28-r5.ebuild
index e21f49679d33..fd1da2a46266 100644
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.28-r5.ebuild
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.28-r5.ebuild
@@ -15,7 +15,7 @@ SRC_URI+=" https://dev.gentoo.org/~grobian/distfiles/${MY_PATCH_VER}.tar.xz"
 
 LICENSE="BSD-with-attribution"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="authdaemond berkdb gdbm kerberos ldapdb openldap mysql pam postgres sample selinux sqlite srp ssl static-libs urandom"
 REQUIRED_USE="ldapdb? ( openldap )"
 
diff --git a/dev-libs/hidapi/hidapi-0.14.0.ebuild b/dev-libs/hidapi/hidapi-0.14.0.ebuild
index 8f61d97e7649..a82035c07c55 100644
--- a/dev-libs/hidapi/hidapi-0.14.0.ebuild
+++ b/dev-libs/hidapi/hidapi-0.14.0.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}-${P}"
 
 LICENSE="|| ( BSD GPL-3 HIDAPI )"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
 IUSE="doc"
 
 DEPEND="
diff --git a/dev-libs/icu-layoutex/icu-layoutex-75.1.ebuild b/dev-libs/icu-layoutex/icu-layoutex-75.1.ebuild
index 484d41097871..6e0c58945d0c 100644
--- a/dev-libs/icu-layoutex/icu-layoutex-75.1.ebuild
+++ b/dev-libs/icu-layoutex/icu-layoutex-75.1.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}"/${PN/-layoutex}/source
 LICENSE="BSD"
 SLOT="0/${PV%.*}"
 if [[ ${PV} != *_rc* ]] ; then
-	KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 sparc ~x86"
 fi
 IUSE="debug static-libs test"
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/icu/icu-75.1.ebuild b/dev-libs/icu/icu-75.1.ebuild
index 9de8164ebc09..48cdbd1fed81 100644
--- a/dev-libs/icu/icu-75.1.ebuild
+++ b/dev-libs/icu/icu-75.1.ebuild
@@ -19,7 +19,7 @@ SRC_URI+=" verify-sig? ( https://github.com/unicode-org/icu/releases/download/re
 S="${WORKDIR}"/${PN}/source
 
 if [[ ${PV} != *_rc* ]] ; then
-	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"
 fi
 LICENSE="BSD"
 SLOT="0/${PV%.*}"
diff --git a/dev-libs/libzip/libzip-1.11.2.ebuild b/dev-libs/libzip/libzip-1.11.2.ebuild
index 5309c7f91ad9..39ea0e50d5e4 100644
--- a/dev-libs/libzip/libzip-1.11.2.ebuild
+++ b/dev-libs/libzip/libzip-1.11.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.nih.at/libzip/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0/5"
-KEYWORDS="~amd64 ~mips ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="bzip2 gnutls lzma mbedtls ssl static-libs test tools zstd"
 REQUIRED_USE="test? ( tools )"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/jack-client/Manifest b/dev-python/jack-client/Manifest
index 3caa7c25d1fe..18259967296c 100644
--- a/dev-python/jack-client/Manifest
+++ b/dev-python/jack-client/Manifest
@@ -1,2 +1 @@
-DIST JACK-Client-0.5.4.tar.gz 48960 BLAKE2B 3130342714f0634abacc74c9aa4a7edac70087db82439197717c104e3b0cafc00916fc8d425b2b99c98df82d1c7a2c44a4df8021e84a2209301c19f5b1ae9d96 SHA512 bc75d1b58a10c855ab26fbb123ed6774f182a06501e6f31efffdd7c82d384761053dddd7af8315969f67421e4ba17bfc0b49f63f0454c8cc18b4b8385b928d26
 DIST jack_client-0.5.5.tar.gz 46664 BLAKE2B cd04c15c3a1d73ce76b37c8fc4076c0c9ebbe4327249c833c785a2b0954592437724eaf8a5e65d3b54f999a8946ef73f5383071a99c92dddd941f957bbe57c49 SHA512 cfb1d85a4eda22ab4562e8e6554ffc40fcce853affb6a2b978777480f53473ea7adcb0e7afc6c1fc8094641e0af8357f7bd3821e7d338e435e3a897fabeb27b7
diff --git a/dev-python/jack-client/jack-client-0.5.4.ebuild b/dev-python/jack-client/jack-client-0.5.4.ebuild
deleted file mode 100644
index 9a1d6456cc37..000000000000
--- a/dev-python/jack-client/jack-client-0.5.4.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..13} )
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYPI_PN="JACK-Client"
-
-inherit distutils-r1 virtualx pypi
-
-DESCRIPTION="JACK Audio Connection Kit client for Python"
-HOMEPAGE="
-	https://pypi.org/project/JACK-Client/
-	https://github.com/spatialaudio/jackclient-python
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-
-# Tests require disabling the sandbox, ALSA with at least one functioning
-# PCM output device, and a very specific JACK server to even start (so far
-# only media-sound/jack2[alsa] has worked for me).
-RESTRICT="test"
-
-BDEPEND="dev-python/cffi[${PYTHON_USEDEP}]"
-RDEPEND="${BDEPEND}
-	dev-python/numpy[${PYTHON_USEDEP}]
-	virtual/jack"
-
-# sphinx_last_updated_by_git not in the tree yet
-#distutils_enable_sphinx doc dev-python/sphinx-last-updated-by-git
-distutils_enable_tests pytest
-
-python_test() {
-	# virtx lets tests autolaunch dbus-daemon
-	virtx epytest
-}
diff --git a/dev-python/jack-client/jack-client-0.5.5.ebuild b/dev-python/jack-client/jack-client-0.5.5.ebuild
index 3ed6407ee13d..6f30a66340e6 100644
--- a/dev-python/jack-client/jack-client-0.5.5.ebuild
+++ b/dev-python/jack-client/jack-client-0.5.5.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/jack_client-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 # Tests require disabling the sandbox, ALSA with at least one functioning
 # PCM output device, and a very specific JACK server to even start (so far
diff --git a/dev-python/numpy/numpy-2.1.3.ebuild b/dev-python/numpy/numpy-2.1.3.ebuild
index 9f14f3d40fd9..ca8bb2c6d2c9 100644
--- a/dev-python/numpy/numpy-2.1.3.ebuild
+++ b/dev-python/numpy/numpy-2.1.3.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0/2"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86"
 # +lapack because the internal fallbacks are pretty slow. Building without blas
 # is barely supported anyway, see bug #914358.
 IUSE="big-endian +lapack"
diff --git a/dev-python/pulsectl-asyncio/Manifest b/dev-python/pulsectl-asyncio/Manifest
index 6ee8803cbfff..4cda73f7324f 100644
--- a/dev-python/pulsectl-asyncio/Manifest
+++ b/dev-python/pulsectl-asyncio/Manifest
@@ -1,2 +1 @@
-DIST pulsectl-asyncio-1.2.1.gh.tar.gz 19531 BLAKE2B 4a3275d75602907f91b3a0979ff8908f4fa23bcf5d1d04068f878fc477011258180cec8ef16b6e6ebe6cc1713ff493841686cc67c4990222c061aa1b722199ff SHA512 b22d0a634433d558860ff1590020ba7272412be97da478a8b00ec457506cb58353b645537ae26591f1aed300cacc14fd0f50c8a3a0c7d650d610b24cc52248ee
 DIST pulsectl-asyncio-1.2.2.gh.tar.gz 19528 BLAKE2B 8b4ccf8a1509fddff19cf201dc9ff4cbf03aedc2ab47c6f4920f95072706051a0a9ab3704e4a4650be8ebce67682bff28d8dacdfac272c36019810eea358f01f SHA512 ccaa7ae14fd2ca7e9d6483efcb3d48f8364ed87ab99c700323c2f2d803986408394ae0fe83880d4d77b77daf17dfb58c6e9f94043a9b03ad643bff2e909a673a
diff --git a/dev-python/pulsectl-asyncio/pulsectl-asyncio-1.2.1.ebuild b/dev-python/pulsectl-asyncio/pulsectl-asyncio-1.2.1.ebuild
deleted file mode 100644
index b2b42d758a13..000000000000
--- a/dev-python/pulsectl-asyncio/pulsectl-asyncio-1.2.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1
-
-DESCRIPTION="Asyncio frontend for pulsectl, Python bindings of libpulse"
-HOMEPAGE="
-	https://github.com/mhthies/pulsectl-asyncio/
-	https://pypi.org/project/pulsectl-asyncio/
-"
-# sdist is missing examples that are used in tests
-SRC_URI="
-	https://github.com/mhthies/pulsectl-asyncio/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/pulsectl-23.5.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		media-sound/pulseaudio-daemon
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e 's:,<=[0-9.]*::' setup.cfg || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/pulsectl-asyncio/pulsectl-asyncio-1.2.2.ebuild b/dev-python/pulsectl-asyncio/pulsectl-asyncio-1.2.2.ebuild
index 8b6cfcbfc7dc..b2b42d758a13 100644
--- a/dev-python/pulsectl-asyncio/pulsectl-asyncio-1.2.2.ebuild
+++ b/dev-python/pulsectl-asyncio/pulsectl-asyncio-1.2.2.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv ~x86"
 
 RDEPEND="
 	>=dev-python/pulsectl-23.5.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-caja/python-caja-1.28.0.ebuild b/dev-python/python-caja/python-caja-1.28.0.ebuild
index 6527dccbd00b..d9d6fe7c515e 100644
--- a/dev-python/python-caja/python-caja-1.28.0.ebuild
+++ b/dev-python/python-caja/python-caja-1.28.0.ebuild
@@ -10,7 +10,7 @@ PYTHON_COMPAT=( python3_{9..12} )
 inherit mate python-single-r1
 
 if [[ "${PV}" != *9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~loong ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~loong ~riscv x86"
 fi
 
 DESCRIPTION="Python bindings for the Caja file manager"
diff --git a/dev-python/python-tests/python-tests-3.10.15_p2.ebuild b/dev-python/python-tests/python-tests-3.10.15_p2.ebuild
index 872701cc1c5e..4cc74f86a5e4 100644
--- a/dev-python/python-tests/python-tests-3.10.15_p2.ebuild
+++ b/dev-python/python-tests/python-tests-3.10.15_p2.ebuild
@@ -28,7 +28,7 @@ S="${WORKDIR}/${MY_P}/Lib"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
diff --git a/dev-python/regress/Manifest b/dev-python/regress/Manifest
index 9481c197daa6..2fea914b9726 100644
--- a/dev-python/regress/Manifest
+++ b/dev-python/regress/Manifest
@@ -12,22 +12,15 @@ DIST memoffset-0.9.0.crate 9033 BLAKE2B 19090c1af8b8cf54a2cf7593748aff4d3dc685ec
 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-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-ffi-0.22.2.crate 67749 BLAKE2B 0a4357d5f4fbcab9717d58b7a80b63a63bc329267d4725136c4eac7c0101095a50e5f840638dde79034e5df99c4f46664cfdc2ad437837643db5d475c5705cb3 SHA512 bf8b83b4790832d99de8c6a61a15a43fc189505dd843011933305f7f93c4f5f4849fb00cc2a6fa410b788645f8ed8c0df61799cf801966a925abb9756b1ab579
 DIST pyo3-ffi-0.22.5.crate 69354 BLAKE2B 91dfb41a24cb2b12bf54d6e54949a381ba6635ee55623a7f77a7e672fcf71d7f6937b7ab96f20457d770cf132047ddc9df50ea4aae8506d64e833f11a3b504e6 SHA512 36b8ed6273f7a0298179729c41081c787f353eb338be0f470859ce62a12e05305bd53eb24b6e72f2c56971f18bd64d16c63576f41909e9ac849f355041139a91
-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-backend-0.22.2.crate 65620 BLAKE2B 37fba9ff384373418d3a7341acafb8e33308a64e30026f828693a37c32ab4a74d058f2db84d00467a20f9f267c96fe54c0f154d1ebbae92490e8dfc0d29c042f SHA512 0517080c0d5d4ed8136521fd37aa3a192c2eb8cab58545d8543ee4df9cd0dcea19fe0678d5ab90f05fe3eb0f4a86fc2f07b76f2e12ac1fcf7e7c195c2ffa4fd8
 DIST pyo3-macros-backend-0.22.5.crate 66308 BLAKE2B d30c021da6b013abb8bbc8d55f110f3394c79d85f02506d7a42bba256afd639647210ed66bae289f4dfbd6d060995c0365b278749798b302eb89f1b09c074ab3 SHA512 8a79f9c6f948375e20804d2bc4b98d9fd7d39f99a936afb1d9a0fab599a3ad07e95bc985aa51b0ab8410b6b4f5ebaa2aa347013ae722a2b3f4c51f318415d472
 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 regress-0.10.0.crate 329828 BLAKE2B 1de91933e041737579edfbe9471fee10dd3cc95b0733e295b09c350d3bfc190709cf0d176b723658cac6312b2ef96702bcae438023056d0a9b292809b8a15f2b SHA512 627e80d2c7f7cc016d3940788fe9988915b7b23061b25410f5140e1304bb298f95aaf480b5943bcfd7e62c8e9355c3c5684d9f9bc1d69ea1696402dc7d423845
 DIST regress-0.10.1.crate 330415 BLAKE2B 3e1e0b8df45b9644d455305b5b9234d88a783a72c929a4336be6037670458ba1b4a20d96d8b20d8cfa50986abe256d0a1f46146695668f00688d11c63e183a23 SHA512 2f144caff06a70bcd67f4380245e69e3ac781d42c2994a8bb7d5ce937d1b07a4eb7c678590116abe880b8d3654a8a06e5e80db51893bfcbc00ce727b0dae3a50
 DIST regress-2024.11.1.tar.gz 11151 BLAKE2B 1747de6806ca5b058467c24b524681cc62260f53a34eec9b1d2f3b6916d6b3772ffa159b6219e2324667eacb5c66c07fcaff40020c7102bd8d4d1bbad4264230 SHA512 db2b3030344871d36270fddebf411f6144f1999f74d995a00e58d27227083f33dbc50756889c8e9fddc09e3a9f89e9edacdebdbab9b51d7f034533a8420a38e8
-DIST regress-2024.8.1.tar.gz 8830 BLAKE2B f5df7f712f3a1357a59c9760a98f36bbb658f303546f40639fdedf33a3f57880e6ae38de6f1c8e455d8dea17f6061bf9519c3f81cd112d373591f2b093eebbce SHA512 0f7ab40d83b1b7dcdc1df94bd6a910709b089d74a5a505ffb177469b79934ad1a8dd0213de2ac4af9f179805245d7e23ffe3931593aa4a4c9e2e785ae79bfa5f
 DIST syn-2.0.72.crate 267069 BLAKE2B b0b979f78937a10a6db45f96d5d93c595427a4e158d658a2186419d89b219a4a405ade488d88d9ebdbd605ce4b706aba7088ab39a77294f3cf9847bf032d8f91 SHA512 c3d26bf9787555bc6fd8bd789855d252e80ad28a413593e13bad174adf86087ff195a6b4227bdeb6d1a1c87b0af8e965d6f2d04b8d45e7383b6de49990b92e89
 DIST target-lexicon-0.12.16.crate 26488 BLAKE2B e7950e4a302059a1bfc9bc15618a3c1b971a17cffae117a6e8f5f63a0d82fd2bd02680301d15338612d5426d349dd24cfee30ee787a15a7d3187f2a6825e69ce SHA512 092639957c4a0391560b6442b31c47159c04d12e971010f730a6ec9cb5389e4be903ef3d7daa06db95e64dc78b6970731fb647179ebaad2b12e9ed5e9b24da27
 DIST unicode-ident-1.0.8.crate 41962 BLAKE2B 3e3394a421460b0cdd56f96e1149b3816651ffd7064f9ec85c12050917d0b271eeee4bc3f6d3f0a3c1596635df3dac54bd610243d34e459743fe29b3b931a237 SHA512 8104999c6fff002c5aa109e2ca75ce3eaf772155d31dff87bcf39e3eb3da58b6cb543717be7b55acdb0cb1a4bd2a3d2e9c9974f7f75b6528668f5ef665ef4088
diff --git a/dev-python/regress/regress-2024.11.1-r1.ebuild b/dev-python/regress/regress-2024.11.1-r1.ebuild
index 7f155c521cdc..d43fd9303a9d 100644
--- a/dev-python/regress/regress-2024.11.1-r1.ebuild
+++ b/dev-python/regress/regress-2024.11.1-r1.ebuild
@@ -55,7 +55,7 @@ LICENSE="MIT"
 # Dependent crate licenses
 LICENSE+=" Apache-2.0-with-LLVM-exceptions MIT Unicode-DFS-2016"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv"
+KEYWORDS="amd64 ~arm64 ~riscv"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/regress/regress-2024.8.1-r1.ebuild b/dev-python/regress/regress-2024.8.1-r1.ebuild
deleted file mode 100644
index 108fba133b20..000000000000
--- a/dev-python/regress/regress-2024.8.1-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 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="
-	ahash@0.8.11
-	allocator-api2@0.2.18
-	autocfg@1.1.0
-	cc@1.1.7
-	cfg-if@1.0.0
-	hashbrown@0.14.5
-	heck@0.5.0
-	indoc@2.0.4
-	libc@0.2.140
-	memchr@2.5.0
-	memoffset@0.9.0
-	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
-	regress@0.10.0
-	syn@2.0.72
-	target-lexicon@0.12.16
-	unicode-ident@1.0.8
-	unindent@0.2.3
-	version_check@0.9.4
-	zerocopy-derive@0.7.35
-	zerocopy@0.7.35
-"
-
-inherit cargo distutils-r1
-
-DESCRIPTION="Python bindings to the Rust regress crate"
-HOMEPAGE="
-	https://pypi.org/project/regress/
-	https://github.com/crate-py/regress
-"
-SRC_URI="
-	https://github.com/crate-py/regress/releases/download/v${PV}/${P}.tar.gz
-	${CARGO_CRATE_URIS}
-"
-
-LICENSE="MIT"
-# Dependent crate licenses
-LICENSE+=" Apache-2.0-with-LLVM-exceptions MIT Unicode-DFS-2016"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv"
-
-distutils_enable_tests pytest
-
-QA_FLAGS_IGNORED="usr/lib/py.*/site-packages/regress/regress.*.so"
diff --git a/dev-python/yappi/Manifest b/dev-python/yappi/Manifest
index bed6f955789c..618b4a2ed8d9 100644
--- a/dev-python/yappi/Manifest
+++ b/dev-python/yappi/Manifest
@@ -1,3 +1,2 @@
-DIST yappi-1.6.0.gh.tar.gz 938098 BLAKE2B 7d5ad3066647419502ce43a2577509dbfc2ba898a8a68187a0e2efa2868764139c5a0bde873eb270f4acbb98749ee770e0cd00d24079318ab291dd5becc7a00e SHA512 d6b9e30129d83ab24ac80732e6a31e7dcc9e7e0f8bedc39cd578b73b12007c38db6c5b101e4364d3d129ba24bb0adaae71bc48827ac577c8ef96c9a557a9d80f
 DIST yappi-1.6.10.tar.gz 59379 BLAKE2B 683077b7aa070d2f2e34c983bbd7d653d07dbe0aba958962af370c124a947923587c6b3facd015c22f4176e48ad9e6b8f3e9908f042e727973cfb1196ab55535 SHA512 c484066ed6ccd667aa8e0d1890d9da5681c811f02c763128101d99848bc762114d77660c6351c6b163a8b4ffceb2678951acbcd45f2fff9349a62f37be2d0c43
 DIST yappi-1.6.9.gh.tar.gz 938153 BLAKE2B a14f7cc20a53b7e8b03544cad81c2d35e8874e15b6a4ef69b3fbaf06343e12a89513f768e62a2e91869175eaff4636caa4e60663caea56e1ca68cc85bdd36deb SHA512 c75e8911772473adb534b5b9afcde7053d73398b30938b8a64aa2d5af12c26618aca90d871f4fdd30f06ec58966931ae5088d4946cf0779e24e5be9f68e1ac22
diff --git a/dev-python/yappi/yappi-1.6.0.ebuild b/dev-python/yappi/yappi-1.6.0.ebuild
deleted file mode 100644
index dabf63096b10..000000000000
--- a/dev-python/yappi/yappi-1.6.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1
-
-DESCRIPTION="Yet Another Python Profiler"
-HOMEPAGE="
-	https://pypi.org/project/yappi/
-	https://github.com/sumerc/yappi/
-"
-SRC_URI="
-	https://github.com/sumerc/yappi/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-
-distutils_enable_tests unittest
-
-PATCHES=(
-	"${FILESDIR}/yappi-1.2.5-warnings.patch"
-)
-
-python_test() {
-	local -x PYTHONPATH=tests
-	eunittest
-}
diff --git a/dev-python/yappi/yappi-1.6.9.ebuild b/dev-python/yappi/yappi-1.6.9.ebuild
index 546e553f37c7..594dab20c7fe 100644
--- a/dev-python/yappi/yappi-1.6.9.ebuild
+++ b/dev-python/yappi/yappi-1.6.9.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 distutils_enable_tests unittest
 
diff --git a/dev-util/pkgcheck/pkgcheck-0.10.32.ebuild b/dev-util/pkgcheck/pkgcheck-0.10.32.ebuild
index 812fcd49d7a6..4c4597c93e17 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-vcs/git-machete/git-machete-3.25.2.ebuild b/dev-vcs/git-machete/git-machete-3.25.2.ebuild
index 550b46b65536..f91dac7c798c 100644
--- a/dev-vcs/git-machete/git-machete-3.25.2.ebuild
+++ b/dev-vcs/git-machete/git-machete-3.25.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/VirtusLab/${PN}/archive/refs/tags/v${PV}.tar.gz -> $
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv"
+KEYWORDS="amd64 ~riscv"
 
 RDEPEND="dev-vcs/git"
 BDEPEND="test? (
diff --git a/mail-filter/bmf/bmf-0.9.4-r4.ebuild b/mail-filter/bmf/bmf-0.9.4-r4.ebuild
index 13bcdad75d46..280dcc5fd4e0 100644
--- a/mail-filter/bmf/bmf-0.9.4-r4.ebuild
+++ b/mail-filter/bmf/bmf-0.9.4-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/bmf/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="mysql berkdb"
 
 DEPEND="
diff --git a/media-gfx/gifsicle/gifsicle-1.95.ebuild b/media-gfx/gifsicle/gifsicle-1.95.ebuild
index 667a5da63694..27d12da3ef03 100644
--- a/media-gfx/gifsicle/gifsicle-1.95.ebuild
+++ b/media-gfx/gifsicle/gifsicle-1.95.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.lcdf.org/~eddietwo/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2 MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="X"
 
 RDEPEND="
diff --git a/media-gfx/igal/igal-3.2.ebuild b/media-gfx/igal/igal-3.2.ebuild
index cbff7582130d..a8bcda0f25db 100644
--- a/media-gfx/igal/igal-3.2.ebuild
+++ b/media-gfx/igal/igal-3.2.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/${PN}2-${PV}"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 RDEPEND="
 	dev-lang/perl
diff --git a/media-gfx/jp2a/jp2a-1.2.0.ebuild b/media-gfx/jp2a/jp2a-1.2.0.ebuild
index 189d666c4af9..32c18a376dfd 100644
--- a/media-gfx/jp2a/jp2a-1.2.0.ebuild
+++ b/media-gfx/jp2a/jp2a-1.2.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/Talinx/jp2a/releases/download/v${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ppc ~ppc64 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 ppc ~ppc64 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="curl"
 
 # TODO: restore ncurses support?
diff --git a/media-gfx/renderdoc/renderdoc-1.32.ebuild b/media-gfx/renderdoc/renderdoc-1.32.ebuild
index c8d27b42b52d..d78db3dbcb7c 100644
--- a/media-gfx/renderdoc/renderdoc-1.32.ebuild
+++ b/media-gfx/renderdoc/renderdoc-1.32.ebuild
@@ -40,7 +40,7 @@ SRC_URI="
 # swig: GPL-3+ BSD BSD-2
 LICENSE="BSD BSD-2 CC-BY-3.0 GPL-3+ MIT OFL-1.1 public-domain ZLIB"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="qt5"
 REQUIRED_USE="doc? ( qt5 ) qt5? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/media-gfx/xloadimage/xloadimage-4.1-r17.ebuild b/media-gfx/xloadimage/xloadimage-4.1-r17.ebuild
index 17ba67ea90d1..f730d9a7139b 100644
--- a/media-gfx/xloadimage/xloadimage-4.1-r17.ebuild
+++ b/media-gfx/xloadimage/xloadimage-4.1-r17.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}"/${P/-/.}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="tiff jpeg png"
 
 RDEPEND="x11-libs/libX11
diff --git a/media-libs/ctl/ctl-1.5.3.ebuild b/media-libs/ctl/ctl-1.5.3.ebuild
index 11e4fd2a2845..9420224f11cb 100644
--- a/media-libs/ctl/ctl-1.5.3.ebuild
+++ b/media-libs/ctl/ctl-1.5.3.ebuild
@@ -5,8 +5,6 @@ EAPI=8
 
 inherit cmake flag-o-matic
 
-MY_COMMIT=3fc4ae7a8af35d380654e573d895216fd5ba407e
-
 DESCRIPTION="AMPAS' Color Transformation Language"
 HOMEPAGE="https://github.com/ampas/CTL"
 SRC_URI="https://github.com/ampas/CTL/archive/${P}.tar.gz"
diff --git a/media-libs/harfbuzz/harfbuzz-10.1.0.ebuild b/media-libs/harfbuzz/harfbuzz-10.1.0.ebuild
index 7214ae683e59..84806b43fd49 100644
--- a/media-libs/harfbuzz/harfbuzz-10.1.0.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-10.1.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/harfbuzz/harfbuzz/releases/download/${PV}/${P}.tar.xz"
-	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"
 fi
 
 LICENSE="Old-MIT ISC icu"
diff --git a/media-libs/libfishsound/libfishsound-1.0.0-r2.ebuild b/media-libs/libfishsound/libfishsound-1.0.0-r2.ebuild
index 06d38b4de4be..71fd52981ae6 100644
--- a/media-libs/libfishsound/libfishsound-1.0.0-r2.ebuild
+++ b/media-libs/libfishsound/libfishsound-1.0.0-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://downloads.xiph.org/releases/libfishsound/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="flac speex"
 
 RDEPEND="
diff --git a/media-libs/libsfml/libsfml-2.6.1.ebuild b/media-libs/libsfml/libsfml-2.6.1.ebuild
index 87c36048ce3e..8f807c430c23 100644
--- a/media-libs/libsfml/libsfml-2.6.1.ebuild
+++ b/media-libs/libsfml/libsfml-2.6.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/SFML/SFML/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 IUSE="debug doc examples"
 
 RDEPEND="
diff --git a/media-libs/svt-av1/svt-av1-2.1.2.ebuild b/media-libs/svt-av1/svt-av1-2.1.2.ebuild
index 71c16d51de56..4e4d8d956d1e 100644
--- a/media-libs/svt-av1/svt-av1-2.1.2.ebuild
+++ b/media-libs/svt-av1/svt-av1-2.1.2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="https://gitlab.com/AOMediaCodec/SVT-AV1.git"
 else
 	SRC_URI="https://gitlab.com/AOMediaCodec/SVT-AV1/-/archive/v${PV}/SVT-AV1-v${PV}.tar.bz2"
-	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"
 	S="${WORKDIR}/SVT-AV1-v${PV}"
 fi
 
diff --git a/media-libs/x264/x264-0.0.20240513.ebuild b/media-libs/x264/x264-0.0.20240513.ebuild
index b4fc70b9daba..14b38ff6c75b 100644
--- a/media-libs/x264/x264-0.0.20240513.ebuild
+++ b/media-libs/x264/x264-0.0.20240513.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	X264_COMMIT="4613ac3c15fd75cebc4b9f65b7fb95e70a3acce1"
 	SRC_URI="https://code.videolan.org/videolan/x264/-/archive/${X264_COMMIT}/x264-${X264_COMMIT}.tar.bz2 -> ${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ~ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 	S="${WORKDIR}/${PN}-${X264_COMMIT}"
 fi
 
diff --git a/media-video/smplayer/smplayer-24.5.0.ebuild b/media-video/smplayer/smplayer-24.5.0.ebuild
index b81468316555..4c6686c2ede7 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/media-video/x264-encoder/x264-encoder-0.0.20240513.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20240513.ebuild
index 710d2992b673..c53a2644e307 100644
--- a/media-video/x264-encoder/x264-encoder-0.0.20240513.ebuild
+++ b/media-video/x264-encoder/x264-encoder-0.0.20240513.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	X264_COMMIT="4613ac3c15fd75cebc4b9f65b7fb95e70a3acce1"
 	SRC_URI="https://code.videolan.org/videolan/x264/-/archive/${X264_COMMIT}/x264-${X264_COMMIT}.tar.bz2 -> ${P/-encoder}.tar.bz2"
-	KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 	S="${WORKDIR}/${PN/-encoder}-${X264_COMMIT}"
 fi
 
diff --git a/net-libs/libmicrodns/libmicrodns-0.2.0-r1.ebuild b/net-libs/libmicrodns/libmicrodns-0.2.0-r1.ebuild
index f5a66116cf46..1b17de8bee73 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-misc/gsasl/gsasl-2.2.1.ebuild b/net-misc/gsasl/gsasl-2.2.1.ebuild
index 317f333de377..54e17ead5ade 100644
--- a/net-misc/gsasl/gsasl-2.2.1.ebuild
+++ b/net-misc/gsasl/gsasl-2.2.1.ebuild
@@ -13,7 +13,7 @@ LICENSE="GPL-3"
 SLOT="0"
 # Before giving keywords (or ideally even bumping), please check https://www.gnu.org/software/gsasl/ to see
 # if it's a stable release or not!
-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"
 IUSE="+client gcrypt gnutls idn kerberos nls ntlm +server static-libs"
 REQUIRED_USE="|| ( client server )"
 
diff --git a/net-misc/htbinit/htbinit-0.8.5-r8.ebuild b/net-misc/htbinit/htbinit-0.8.5-r8.ebuild
index f76c703881dc..ca5e49da2156 100644
--- a/net-misc/htbinit/htbinit-0.8.5-r8.ebuild
+++ b/net-misc/htbinit/htbinit-0.8.5-r8.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE="esfq"
 
 DEPEND="sys-apps/iproute2"
diff --git a/net-misc/sshpass/sshpass-1.10.ebuild b/net-misc/sshpass/sshpass-1.10.ebuild
index 6856c6b7624b..5c5fe90f7960 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/net-misc/vncsnapshot/vncsnapshot-1.2a-r1.ebuild b/net-misc/vncsnapshot/vncsnapshot-1.2a-r1.ebuild
index 27dde2183d95..5be727be8366 100644
--- a/net-misc/vncsnapshot/vncsnapshot-1.2a-r1.ebuild
+++ b/net-misc/vncsnapshot/vncsnapshot-1.2a-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P}-src.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ppc ~x86"
+KEYWORDS="~amd64 ~arm64 ppc x86"
 
 DEPEND="
 	media-libs/libjpeg-turbo:=
diff --git a/sys-apps/mawk/mawk-1.3.4_p20240905.ebuild b/sys-apps/mawk/mawk-1.3.4_p20240905.ebuild
index 6de292ef353a..79a43f3db44b 100644
--- a/sys-apps/mawk/mawk-1.3.4_p20240905.ebuild
+++ b/sys-apps/mawk/mawk-1.3.4_p20240905.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-thomasdickey-20240114 )"
 
diff --git a/sys-apps/pmount/pmount-0.9.99_alpha-r8.ebuild b/sys-apps/pmount/pmount-0.9.99_alpha-r8.ebuild
index daa3952caad9..04afc5a4c554 100644
--- a/sys-apps/pmount/pmount-0.9.99_alpha-r8.ebuild
+++ b/sys-apps/pmount/pmount-0.9.99_alpha-r8.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"/${P/_/-}
 
 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="crypt"
 
 # cryptsetup is executed at runtime only, no libraries used AFAICT
diff --git a/sys-power/suspend/files/suspend-1.0_p20200924-Use-pkgconf-for-libgcrypt.patch b/sys-power/suspend/files/suspend-1.0_p20200924-Use-pkgconf-for-libgcrypt.patch
new file mode 100644
index 000000000000..ea77ab450e71
--- /dev/null
+++ b/sys-power/suspend/files/suspend-1.0_p20200924-Use-pkgconf-for-libgcrypt.patch
@@ -0,0 +1,18 @@
+diff --git a/configure.ac b/configure.ac
+index 5f3adb5..b7f21eb 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -211,7 +211,12 @@ fi
+ if test "${enable_encrypt}" = "yes"; then
+ 	CONFIG_FEATURES="${CONFIG_FEATURES} encrypt"
+ 	AC_DEFINE([CONFIG_ENCRYPT], [1], [Define if encryption enabled])
+-	AM_PATH_LIBGCRYPT([1:1.6.3], [], [AC_MSG_ERROR([Cannot locate >=libgcrypt-1.6.3])])
++	PKG_CONFIG="pkg-config --static"
++		PKG_CHECK_MODULES([LIBGCRYPT],
++				  [libgcrypt >= 1.6.3],
++				  ,
++				  [AC_MSG_ERROR("Cannot locate >=libgcrypt-1.6.3")]
++		)
+ fi
+ 
+ if test "${enable_splashy}" = "yes"; then
diff --git a/sys-power/suspend/files/suspend-1.0_p20200924-fix-loff_t-for-musl.patch b/sys-power/suspend/files/suspend-1.0_p20200924-fix-loff_t-for-musl.patch
new file mode 100644
index 000000000000..37a77118f0c7
--- /dev/null
+++ b/sys-power/suspend/files/suspend-1.0_p20200924-fix-loff_t-for-musl.patch
@@ -0,0 +1,24 @@
+diff --git a/configure.ac b/configure.ac
+index 5f3adb5..0c544c8 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -126,6 +126,7 @@ AC_CHECK_PROGS([M4], [m4])
+ AC_CHECK_PROG(PERL, perl, perl)
+ 
+ AC_SYS_LARGEFILE
++AC_USE_SYSTEM_EXTENSIONS
+ 
+ if test "${enable_create_device}" = "yes"; then
+ 	AC_CHECK_PROGS([MKNOD], [mknod])
+diff --git a/swsusp.h b/swsusp.h
+index 5f89902..6f4863e 100644
+--- a/swsusp.h
++++ b/swsusp.h
+@@ -9,6 +9,7 @@
+  *
+  */
+ 
++#include "config.h"
+ #include <stdint.h>
+ #include <linux/fs.h>
+ #include <linux/suspend_ioctls.h>
diff --git a/sys-power/suspend/suspend-1.0_p20200924.ebuild b/sys-power/suspend/suspend-1.0_p20200924.ebuild
index 56be503b7da8..b4d67354418a 100644
--- a/sys-power/suspend/suspend-1.0_p20200924.ebuild
+++ b/sys-power/suspend/suspend-1.0_p20200924.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -32,7 +32,11 @@ BDEPEND="
 
 S="${WORKDIR}/${PN}"
 
-PATCHES=( "${WORKDIR}/${P}.patch" )
+PATCHES=(
+	"${WORKDIR}/${P}.patch"
+	"${FILESDIR}/${PN}-1.0_p20200924-Use-pkgconf-for-libgcrypt.patch"
+	"${FILESDIR}/${PN}-1.0_p20200924-fix-loff_t-for-musl.patch"
+	)
 
 src_prepare() {
 	default
diff --git a/www-client/links/links-2.30.ebuild b/www-client/links/links-2.30.ebuild
index 49394f17925e..8cf55c39fe20 100644
--- a/www-client/links/links-2.30.ebuild
+++ b/www-client/links/links-2.30.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://${PN}.twibright.com/download/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="avif brotli bzip2 fbcon freetype gpm jpeg libevent livecd lzip lzma selinux ssl suid svga tiff webp X zlib zstd"
 
 GRAPHICS_DEPEND="media-libs/libpng:="
diff --git a/x11-plugins/vicious/vicious-2.7.0.ebuild b/x11-plugins/vicious/vicious-2.7.0.ebuild
index b76d5eb36a21..d73b13590aa3 100644
--- a/x11-plugins/vicious/vicious-2.7.0.ebuild
+++ b/x11-plugins/vicious/vicious-2.7.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}-widgets/${PN}/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~riscv x86"
 IUSE="contrib"
 
 RDEPEND="x11-wm/awesome"
diff --git a/x11-plugins/wmclockmon/wmclockmon-1.0.0.ebuild b/x11-plugins/wmclockmon/wmclockmon-1.0.0.ebuild
index 9e1910c60e11..1a474b449b7f 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-wm/jwm/jwm-2.4.3.ebuild b/x11-wm/jwm/jwm-2.4.3.ebuild
index 2949e83f9b81..61f032cceffc 100644
--- a/x11-wm/jwm/jwm-2.4.3.ebuild
+++ b/x11-wm/jwm/jwm-2.4.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/joewing/${PN}/releases/download/v${PV}/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc x86"
+KEYWORDS="amd64 ~hppa ~ppc x86"
 IUSE="svg debug iconv jpeg nls png pango truetype xinerama xpm"
 
 RDEPEND="dev-libs/expat