diff --git a/dev-build/b2/b2-5.2.1.ebuild b/dev-build/b2/b2-5.2.1.ebuild
index 264bedaf275f8..399760d23745e 100644
--- a/dev-build/b2/b2-5.2.1.ebuild
+++ b/dev-build/b2/b2-5.2.1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${P}/src"
 
 LICENSE="Boost-1.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~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 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="examples"
 RESTRICT="test"
 
diff --git a/dev-cpp/catch/catch-3.7.1.ebuild b/dev-cpp/catch/catch-3.7.1.ebuild
index cb18cade24676..af4d31f445e11 100644
--- a/dev-cpp/catch/catch-3.7.1.ebuild
+++ b/dev-cpp/catch/catch-3.7.1.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-lang/tcl/tcl-8.6.15.ebuild b/dev-lang/tcl/tcl-8.6.15.ebuild
index a4318fe4030d1..d5937675afa2f 100644
--- a/dev-lang/tcl/tcl-8.6.15.ebuild
+++ b/dev-lang/tcl/tcl-8.6.15.ebuild
@@ -18,7 +18,7 @@ S="${SPARENT}"/unix
 
 LICENSE="tcltk Spencer-99"
 SLOT="0/8.6"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~loong ~m68k ~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 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="debug +threads"
 
 RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"
diff --git a/dev-lang/tk/tk-8.6.15.ebuild b/dev-lang/tk/tk-8.6.15.ebuild
index 3feae30ca7807..35e43b0f7a988 100644
--- a/dev-lang/tk/tk-8.6.15.ebuild
+++ b/dev-lang/tk/tk-8.6.15.ebuild
@@ -18,7 +18,7 @@ S="${SPARENT}"/unix
 
 LICENSE="tcltk"
 SLOT="0/8.6"
-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="debug +threads truetype aqua xscreensaver"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/boehm-gc/boehm-gc-8.2.8.ebuild b/dev-libs/boehm-gc/boehm-gc-8.2.8.ebuild
index f4de742b719be..d51b70f472fec 100644
--- a/dev-libs/boehm-gc/boehm-gc-8.2.8.ebuild
+++ b/dev-libs/boehm-gc/boehm-gc-8.2.8.ebuild
@@ -17,7 +17,7 @@ LICENSE="boehm-gc"
 # We've been using subslot 0 for these instead of "1.1".
 SLOT="0"
 # Don't keyword versions if upstream mark them as pre-release.
-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="cxx +large static-libs +threads"
 
 RDEPEND=">=dev-libs/libatomic_ops-7.4[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/libmspack/libmspack-1.11.ebuild b/dev-libs/libmspack/libmspack-1.11.ebuild
index 4d0769e9345f0..8ae48497d8f26 100644
--- a/dev-libs/libmspack/libmspack-1.11.ebuild
+++ b/dev-libs/libmspack/libmspack-1.11.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/kyz/libmspack.git"
 	inherit git-r3
 else
-	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"
 	SRC_URI="https://github.com/kyz/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
diff --git a/dev-libs/link-grammar/link-grammar-5.12.5.ebuild b/dev-libs/link-grammar/link-grammar-5.12.5.ebuild
index 326a3d0b05e8e..81ae25150b9ec 100644
--- a/dev-libs/link-grammar/link-grammar-5.12.5.ebuild
+++ b/dev-libs/link-grammar/link-grammar-5.12.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.gnucash.org/link-grammar/downloads/${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/5"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~riscv sparc ~x86"
 IUSE="aspell +hunspell python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/dev-tcltk/bwidget/bwidget-1.9.16.ebuild b/dev-tcltk/bwidget/bwidget-1.9.16.ebuild
index e2c9622efa8e5..79eaa1bb25fd7 100644
--- a/dev-tcltk/bwidget/bwidget-1.9.16.ebuild
+++ b/dev-tcltk/bwidget/bwidget-1.9.16.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/tcllib/BWidget/${PV}/${P}.tar.gz"
 
 LICENSE="tcltk"
 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="doc"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-tcltk/itk/itk-4.2.3-r1.ebuild b/dev-tcltk/itk/itk-4.2.3-r1.ebuild
index 1357ecb6f938d..4e6617a8db47a 100644
--- a/dev-tcltk/itk/itk-4.2.3-r1.ebuild
+++ b/dev-tcltk/itk/itk-4.2.3-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~arm64 ~ppc ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc ~riscv sparc ~x86 ~amd64-linux ~x86-linux"
 RESTRICT="!test? ( test )"
 
 DEPEND="
diff --git a/dev-util/lttng-ust/lttng-ust-2.13.8.ebuild b/dev-util/lttng-ust/lttng-ust-2.13.8.ebuild
index 4d43ed2786c16..21876345d14f7 100644
--- a/dev-util/lttng-ust/lttng-ust-2.13.8.ebuild
+++ b/dev-util/lttng-ust/lttng-ust-2.13.8.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0/${MY_SLOT}"
-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="examples numa test"
 RESTRICT="!test? ( test )"
 
diff --git a/mail-filter/opendmarc/opendmarc-1.4.1.1-r6.ebuild b/mail-filter/opendmarc/opendmarc-1.4.1.1-r6.ebuild
index c7ae48d4c1635..370e023e96e9d 100644
--- a/mail-filter/opendmarc/opendmarc-1.4.1.1-r6.ebuild
+++ b/mail-filter/opendmarc/opendmarc-1.4.1.1-r6.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/OpenDMARC-rel-${PN}-${PV//./-}"
 
 LICENSE="BSD"
 SLOT="0/3"  # 1.4 has API breakage with 1.3, yet uses same soname
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ppc ppc64 sparc x86"
 IUSE="spf +reports"
 
 DEPEND="mail-filter/libmilter:=
diff --git a/media-libs/plotutils/plotutils-2.6-r3.ebuild b/media-libs/plotutils/plotutils-2.6-r3.ebuild
index 9e99519f5a2f0..37fc0f56a857b 100644
--- a/media-libs/plotutils/plotutils-2.6-r3.ebuild
+++ b/media-libs/plotutils/plotutils-2.6-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/plotutils/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+png X"
 
 DEPEND="
diff --git a/media-video/mkvtoolnix/mkvtoolnix-86.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-86.0.ebuild
index b44d36acb42fd..87c2b373a6254 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-86.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-86.0.ebuild
@@ -17,7 +17,7 @@ else
 		https://mkvtoolnix.download/sources/${P}.tar.xz
 		verify-sig? ( https://mkvtoolnix.download/sources/${P}.tar.xz.sig )
 	"
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~ppc ppc64 ~x86"
 
 	VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/mkvtoolnix.asc"
 fi
diff --git a/net-misc/taylor-uucp/taylor-uucp-1.07-r7.ebuild b/net-misc/taylor-uucp/taylor-uucp-1.07-r7.ebuild
index 2980765e94792..01f56219ffb90 100644
--- a/net-misc/taylor-uucp/taylor-uucp-1.07-r7.ebuild
+++ b/net-misc/taylor-uucp/taylor-uucp-1.07-r7.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/uucp-${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ppc ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ppc sparc x86"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-gentoo.patch
diff --git a/sys-apps/mawk/mawk-1.3.4_p20240905.ebuild b/sys-apps/mawk/mawk-1.3.4_p20240905.ebuild
index 15eb57b1d28db..6de292ef353ae 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/www-client/lynx/lynx-2.9.2.ebuild b/www-client/lynx/lynx-2.9.2.ebuild
index 66128a4f13c81..ec538545156d0 100644
--- a/www-client/lynx/lynx-2.9.2.ebuild
+++ b/www-client/lynx/lynx-2.9.2.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="brotli bzip2 cjk gnutls idn nls ssl"
 
 RDEPEND="
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.43.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.43.ebuild
index 8469ac5041165..62667bffe4f4e 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.43.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.43.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://www.x.org/releases/individual/data/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 fi
 
 LICENSE="MIT"