diff --git a/dev-cpp/magic_enum/magic_enum-0.9.6.ebuild b/dev-cpp/magic_enum/magic_enum-0.9.6.ebuild
index 5a4a0dda0b76f..11cfa5c71ac56 100644
--- a/dev-cpp/magic_enum/magic_enum-0.9.6.ebuild
+++ b/dev-cpp/magic_enum/magic_enum-0.9.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2023-2024 Gentoo Authors
+# Copyright 2023-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/Neargye/magic_enum/archive/refs/tags/v${PV}.tar.gz -
 
 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/games-misc/fortune-mod/fortune-mod-3.24.0.ebuild b/games-misc/fortune-mod/fortune-mod-3.24.0.ebuild
index 3d029dc31bf1c..78c4a4dde32d2 100644
--- a/games-misc/fortune-mod/fortune-mod-3.24.0.ebuild
+++ b/games-misc/fortune-mod/fortune-mod-3.24.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~m68k ~mips ppc64 ~riscv ~sparc x86"
 IUSE="offensive pcre test"
 RESTRICT="!test? ( test )"
 
diff --git a/games-util/qstat/qstat-2.17.ebuild b/games-util/qstat/qstat-2.17.ebuild
index 5c52aed5d6581..17c587be37f4a 100644
--- a/games-util/qstat/qstat-2.17.ebuild
+++ b/games-util/qstat/qstat-2.17.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Unity-Technologies/${PN}/archive/v${PV}.tar.gz -> ${
 
 LICENSE="Artistic"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc64 x86"
 IUSE="debug"
 
 RDEPEND="!sys-cluster/torque"
diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.12_p20240525.ebuild b/media-libs/sdl-mixer/sdl-mixer-1.2.12_p20240525.ebuild
index da1aae150000e..636ddd8a4b928 100644
--- a/media-libs/sdl-mixer/sdl-mixer-1.2.12_p20240525.ebuild
+++ b/media-libs/sdl-mixer/sdl-mixer-1.2.12_p20240525.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}"/${MY_PN}-${SDL_MIXER_COMMIT}
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="flac fluidsynth mad midi mikmod mod modplug mp3 playtools smpeg static-libs timidity vorbis +wav"
 
 REQUIRED_USE="
diff --git a/media-libs/sdl2-image/sdl2-image-2.8.5.ebuild b/media-libs/sdl2-image/sdl2-image-2.8.5.ebuild
index d1df4d536df44..b24bdc86ad59e 100644
--- a/media-libs/sdl2-image/sdl2-image-2.8.5.ebuild
+++ b/media-libs/sdl2-image/sdl2-image-2.8.5.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~loong ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong 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/media-libs/sdl2-ttf/sdl2-ttf-2.24.0.ebuild b/media-libs/sdl2-ttf/sdl2-ttf-2.24.0.ebuild
index fea5f735a6322..b218d63843239 100644
--- a/media-libs/sdl2-ttf/sdl2-ttf-2.24.0.ebuild
+++ b/media-libs/sdl2-ttf/sdl2-ttf-2.24.0.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv x86"
 IUSE="+harfbuzz static-libs X"
 
 # On bumps, check external/ for versions of bundled freetype + harfbuzz
diff --git a/net-analyzer/wireshark/wireshark-4.4.5.ebuild b/net-analyzer/wireshark/wireshark-4.4.5.ebuild
index 224f229d4a465..5327bec52dc7d 100644
--- a/net-analyzer/wireshark/wireshark-4.4.5.ebuild
+++ b/net-analyzer/wireshark/wireshark-4.4.5.ebuild
@@ -23,7 +23,7 @@ else
 	S="${WORKDIR}/${P/_/}"
 
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc64 ~riscv ~x86"
+		KEYWORDS="~amd64 arm arm64 ~hppa ~loong ~ppc64 ~riscv ~x86"
 	fi
 fi
 
diff --git a/sys-libs/minizip-ng/minizip-ng-4.0.8.ebuild b/sys-libs/minizip-ng/minizip-ng-4.0.8.ebuild
index 80ab367352e54..7d57de8f7e5ae 100644
--- a/sys-libs/minizip-ng/minizip-ng-4.0.8.ebuild
+++ b/sys-libs/minizip-ng/minizip-ng-4.0.8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/zlib-ng/minizip-ng/archive/refs/tags/${PV}.tar.gz ->
 
 LICENSE="ZLIB"
 SLOT="0/4"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc64 ~riscv ~x86"
 IUSE="compat lzma openssl test zstd"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-libs/zlib-ng/zlib-ng-2.2.3.ebuild b/sys-libs/zlib-ng/zlib-ng-2.2.3.ebuild
index abb9e9bf93236..149fb82affc7f 100644
--- a/sys-libs/zlib-ng/zlib-ng-2.2.3.ebuild
+++ b/sys-libs/zlib-ng/zlib-ng-2.2.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc64 ~riscv ~sparc ~x86"
 
 CPU_USE=(
 	x86_{avx2,avx512f,avx512_vnni,sse2,ssse3,sse4_2,pclmul,vpclmulqdq}