diff --git a/app-editors/mg/mg-20240709.ebuild b/app-editors/mg/mg-20240709.ebuild
index eeb80ed3f03d7..9c5cb6f36310f 100644
--- a/app-editors/mg/mg-20240709.ebuild
+++ b/app-editors/mg/mg-20240709.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/hboetes/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="livecd"
 
 RDEPEND="
diff --git a/app-emacs/cond-let/cond-let-0.2.1.ebuild b/app-emacs/cond-let/cond-let-0.2.1.ebuild
index b54a79dc4146b..9934cddc037c2 100644
--- a/app-emacs/cond-let/cond-let-0.2.1.ebuild
+++ b/app-emacs/cond-let/cond-let-0.2.1.ebuild
@@ -19,7 +19,7 @@ else
 	SRC_URI="https://github.com/tarsius/${PN}/archive/v${PV}.tar.gz
 		-> ${P}.gh.tar.gz"
 
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 fi
 
 LICENSE="GPL-3+"
diff --git a/app-emacs/transient/transient-0.12.0-r1.ebuild b/app-emacs/transient/transient-0.12.0-r1.ebuild
index aade4d15bfe72..c1228b0665b3e 100644
--- a/app-emacs/transient/transient-0.12.0-r1.ebuild
+++ b/app-emacs/transient/transient-0.12.0-r1.ebuild
@@ -19,7 +19,7 @@ else
 	SRC_URI="https://github.com/magit/${PN}/archive/v${PV}.tar.gz
 		-> ${P}.gh.tar.gz"
 
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 fi
 
 LICENSE="GPL-3+"
diff --git a/app-office/scribus/scribus-1.7.2.ebuild b/app-office/scribus/scribus-1.7.2.ebuild
index 49a2d2bb763e1..ef46281cd6e8e 100644
--- a/app-office/scribus/scribus-1.7.2.ebuild
+++ b/app-office/scribus/scribus-1.7.2.ebuild
@@ -19,7 +19,7 @@ else
 		https://downloads.sourceforge.net/project/${PN}/${PN}-devel/${PV}/${P}.tar.xz
 	"
 	S="${WORKDIR}/${P}"
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/app-text/poppler/poppler-26.02.0.ebuild b/app-text/poppler/poppler-26.02.0.ebuild
index 4fb25360879ba..32dff8bcec982 100644
--- a/app-text/poppler/poppler-26.02.0.ebuild
+++ b/app-text/poppler/poppler-26.02.0.ebuild
@@ -18,7 +18,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 ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
 	SLOT="0/157"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
diff --git a/dev-build/bazelisk/bazelisk-1.28.1.ebuild b/dev-build/bazelisk/bazelisk-1.28.1.ebuild
index 68fc12987b251..8754369d252df 100644
--- a/dev-build/bazelisk/bazelisk-1.28.1.ebuild
+++ b/dev-build/bazelisk/bazelisk-1.28.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 IUSE="+bazel-symlink"
 
 DOCS=( CONTRIBUTING.md README.md )
diff --git a/dev-cpp/catch/catch-3.12.0.ebuild b/dev-cpp/catch/catch-3.12.0.ebuild
index 84d0752b1d051..8b9884010f45d 100644
--- a/dev-cpp/catch/catch-3.12.0.ebuild
+++ b/dev-cpp/catch/catch-3.12.0.ebuild
@@ -15,7 +15,7 @@ else
 	SRC_URI="https://github.com/catchorg/Catch2/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
 	S="${WORKDIR}/${MY_P}"
 
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 DESCRIPTION="Modern C++ header-only framework for unit-tests"
diff --git a/dev-db/sqlite/sqlite-3.51.2.ebuild b/dev-db/sqlite/sqlite-3.51.2.ebuild
index 7a6ac9e0e9c37..06981e6d84782 100644
--- a/dev-db/sqlite/sqlite-3.51.2.ebuild
+++ b/dev-db/sqlite/sqlite-3.51.2.ebuild
@@ -24,7 +24,7 @@ else
 	"
 	S="${WORKDIR}/${PN}-src-${SRC_PV}"
 
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="public-domain"
diff --git a/dev-debug/valgrind/valgrind-3.26.0_p1.ebuild b/dev-debug/valgrind/valgrind-3.26.0_p1.ebuild
index d9ec373663006..3280daff3f836 100644
--- a/dev-debug/valgrind/valgrind-3.26.0_p1.ebuild
+++ b/dev-debug/valgrind/valgrind-3.26.0_p1.ebuild
@@ -42,7 +42,7 @@ else
 	S="${WORKDIR}"/${MY_P}
 
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~x64-macos ~x64-solaris"
+		KEYWORDS="-* amd64 ~arm arm64 ppc ppc64 ~riscv x86 ~x64-macos ~x64-solaris"
 	fi
 fi
 
diff --git a/dev-libs/libsodium/libsodium-1.0.21_p20260122.ebuild b/dev-libs/libsodium/libsodium-1.0.21_p20260122.ebuild
index e9dd0c1d168d6..b8759cbfee367 100644
--- a/dev-libs/libsodium/libsodium-1.0.21_p20260122.ebuild
+++ b/dev-libs/libsodium/libsodium-1.0.21_p20260122.ebuild
@@ -30,7 +30,7 @@ fi
 
 LICENSE="ISC"
 SLOT="0/26"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
 IUSE="+asm static-libs +urandom"
 
 CPU_USE=( cpu_flags_x86_{aes,sse4_1} )
diff --git a/dev-libs/spdlog/spdlog-1.17.0.ebuild b/dev-libs/spdlog/spdlog-1.17.0.ebuild
index ae2320fae478a..8fc6bdb5a8553 100644
--- a/dev-libs/spdlog/spdlog-1.17.0.ebuild
+++ b/dev-libs/spdlog/spdlog-1.17.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/gabime/${PN}"
 else
 	SRC_URI="https://github.com/gabime/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-python/black/black-26.1.0.ebuild b/dev-python/black/black-26.1.0.ebuild
index 6b5f37ab98e51..985607457c7d8 100644
--- a/dev-python/black/black-26.1.0.ebuild
+++ b/dev-python/black/black-26.1.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~loong ppc ~ppc64 ~riscv ~s390 x86"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 x86"
 
 RDEPEND="
 	>=dev-python/click-8.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pytokens/pytokens-0.4.1.ebuild b/dev-python/pytokens/pytokens-0.4.1.ebuild
index 5da06dc568ed9..5088465fcada5 100644
--- a/dev-python/pytokens/pytokens-0.4.1.ebuild
+++ b/dev-python/pytokens/pytokens-0.4.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~loong ppc ~ppc64 ~riscv ~s390 x86"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 x86"
 
 EPYTEST_PLUGINS=()
 distutils_enable_tests pytest
diff --git a/dev-util/ccache/ccache-4.12.3.ebuild b/dev-util/ccache/ccache-4.12.3.ebuild
index b967e9d60e411..209263dbcca51 100644
--- a/dev-util/ccache/ccache-4.12.3.ebuild
+++ b/dev-util/ccache/ccache-4.12.3.ebuild
@@ -35,7 +35,7 @@ fi
 LICENSE="GPL-3+ || ( CC0-1.0 Apache-2.0 ) Boost-1.0 CC0-1.0"
 LICENSE+=" elibc_mingw? ( LGPL-3 ISC PSF-2 )"
 SLOT="0"
-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"
 # Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
 IUSE="${MY_DOCS_USEFLAG} redis +static-c++ test"
 RESTRICT="!test? ( test )"
diff --git a/dev-util/mesa_clc/mesa_clc-25.3.6.ebuild b/dev-util/mesa_clc/mesa_clc-25.3.6.ebuild
index a475e67c1ba5d..5ab412f4b4552 100644
--- a/dev-util/mesa_clc/mesa_clc-25.3.6.ebuild
+++ b/dev-util/mesa_clc/mesa_clc-25.3.6.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	S="${WORKDIR}/mesa-${MY_PV}"
 	SRC_URI="https://archive.mesa3d.org/mesa-${MY_PV}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
+	KEYWORDS="amd64 ~arm arm64 x86"
 fi
 
 LICENSE="MIT"
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.58.3.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.58.3.ebuild
index 912a63af4877a..ec040cfe8acd2 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.58.3.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.58.3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/evolution/-/wikis/home https://gitlab.g
 LICENSE="|| ( LGPL-2 LGPL-3 ) BSD Sleepycat"
 SLOT="0/66-11-21-4-3-27-2-27-4-0" # subslot = libcamel-1.2/libebackend-1.2/libebook-1.2/libebook-contacts-1.2/libecal-2.0/libedata-book-1.2/libedata-cal-2.0/libedataserver-1.2/libedataserverui-1.2/libedataserverui4-1.0 soname version
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 IUSE="berkdb +gnome-online-accounts +gtk gtk-doc +introspection ldap kerberos oauth-gtk3 oauth-gtk4 sound vala +weather"
 REQUIRED_USE="
diff --git a/gnome-extra/evolution-ews/evolution-ews-3.58.3.ebuild b/gnome-extra/evolution-ews/evolution-ews-3.58.3.ebuild
index 62a12af59e409..f3a8495c43a2e 100644
--- a/gnome-extra/evolution-ews/evolution-ews-3.58.3.ebuild
+++ b/gnome-extra/evolution-ews/evolution-ews-3.58.3.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/evolution/-/wikis/home https://gitlab.g
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~riscv ~x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/mail-client/evolution/evolution-3.58.3.ebuild b/mail-client/evolution/evolution-3.58.3.ebuild
index 5bb85f3ce85e4..a61f075b5b096 100644
--- a/mail-client/evolution/evolution-3.58.3.ebuild
+++ b/mail-client/evolution/evolution-3.58.3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/evolution/-/wikis/home https://gitlab.g
 LICENSE="|| ( LGPL-2 LGPL-3 ) CC-BY-SA-3.0 FDL-1.3+ OPENLDAP"
 SLOT="2.0"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86"
 
 IUSE="archive +bogofilter geolocation gtk-doc highlight ldap libnotify selinux sound spamassassin spell ssl +weather ytnef"
 
diff --git a/media-libs/libsdl2/libsdl2-2.32.8.ebuild b/media-libs/libsdl2/libsdl2-2.32.8.ebuild
index 4af8cc865dcb8..ab50889edaa42 100644
--- a/media-libs/libsdl2/libsdl2-2.32.8.ebuild
+++ b/media-libs/libsdl2/libsdl2-2.32.8.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="ZLIB"
 SLOT="0"
-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"
 
 IUSE="alsa aqua cpu_flags_ppc_altivec cpu_flags_x86_3dnow cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 custom-cflags dbus doc fcitx gles1 gles2 +haptic ibus jack +joystick kms libsamplerate nas opengl oss pipewire pulseaudio sndio +sound static-libs test udev +video vulkan wayland X xscreensaver"
 RESTRICT="!test? ( test )"
diff --git a/media-libs/mesa/mesa-25.3.6.ebuild b/media-libs/mesa/mesa-25.3.6.ebuild
index 524ec22069c63..36f0e1c799b07 100644
--- a/media-libs/mesa/mesa-25.3.6.ebuild
+++ b/media-libs/mesa/mesa-25.3.6.ebuild
@@ -37,7 +37,7 @@ else
 	SRC_URI="
 		https://archive.mesa3d.org/${MY_P}.tar.xz
 	"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-solaris"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-solaris"
 fi
 
 # This should be {CARGO_CRATE_URIS//.crate/.tar.gz} to correspond to the wrap files,
diff --git a/media-libs/sdl2-image/sdl2-image-2.8.8.ebuild b/media-libs/sdl2-image/sdl2-image-2.8.8.ebuild
index e13a966747a04..8c69af3533baf 100644
--- a/media-libs/sdl2-image/sdl2-image-2.8.8.ebuild
+++ b/media-libs/sdl2-image/sdl2-image-2.8.8.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 IUSE="avif gif jpeg jpegxl png samples static-libs test tiff webp"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( jpeg png )"
diff --git a/net-analyzer/net-snmp/net-snmp-5.9.5.2.ebuild b/net-analyzer/net-snmp/net-snmp-5.9.5.2.ebuild
index b1d8b6137a35f..734f70ee6ea01 100644
--- a/net-analyzer/net-snmp/net-snmp-5.9.5.2.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.9.5.2.ebuild
@@ -18,7 +18,7 @@ else
 	# https://github.com/net-snmp/net-snmp/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
 	SRC_URI="https://downloads.sourceforge.net/${PN}/${PN}/${PV}/${P}.tar.gz"
 
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 SRC_URI+=" https://dev.gentoo.org/~jsmolic/distfiles/${PN}-5.7.3-patches-3.tar.xz"
diff --git a/net-misc/curl/curl-8.18.0.ebuild b/net-misc/curl/curl-8.18.0.ebuild
index 95d0552fd34fe..ebfe40a02bfed 100644
--- a/net-misc/curl/curl-8.18.0.ebuild
+++ b/net-misc/curl/curl-8.18.0.ebuild
@@ -22,7 +22,7 @@ else
 		S="${WORKDIR}/${P//_/-}"
 	else
 		CURL_URI="https://curl.se/download/"
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
+		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 	fi
 	SRC_URI="
 		${CURL_URI}${P//_/-}.tar.xz