diff --git a/app-containers/apptainer/apptainer-1.2.3.ebuild b/app-containers/apptainer/apptainer-1.2.3.ebuild
index b5e7811c6f005..f32ad5c897517 100644
--- a/app-containers/apptainer/apptainer-1.2.3.ebuild
+++ b/app-containers/apptainer/apptainer-1.2.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/apptainer/${PN}/releases/download/v${PV}/${P}.tar.gz
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 IUSE="examples +network suid systemd"
 
 # Do not complain about CFLAGS etc. since go projects do not use them.
diff --git a/app-emulation/wine-mono/wine-mono-8.0.1.ebuild b/app-emulation/wine-mono/wine-mono-8.0.1.ebuild
index 96896ce732cf5..27069cdc43d34 100644
--- a/app-emulation/wine-mono/wine-mono-8.0.1.ebuild
+++ b/app-emulation/wine-mono/wine-mono-8.0.1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"
 
 LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT MPL-1.1"
 SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+shared"
 
 src_install() {
diff --git a/app-text/tree/tree-2.1.1.ebuild b/app-text/tree/tree-2.1.1.ebuild
index a8aa448762ab8..438c5fdd164c6 100644
--- a/app-text/tree/tree-2.1.1.ebuild
+++ b/app-text/tree/tree-2.1.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitlab.com/OldManProgrammer/unix-${PN}/-/archive/${PV}/unix-${P
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
 
 S=${WORKDIR}/unix-${P}
 
diff --git a/dev-cpp/benchmark/benchmark-1.8.3.ebuild b/dev-cpp/benchmark/benchmark-1.8.3.ebuild
index 10aeaa9813720..a1e07fedd680b 100644
--- a/dev-cpp/benchmark/benchmark-1.8.3.ebuild
+++ b/dev-cpp/benchmark/benchmark-1.8.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~x86"
 IUSE="debug doc lto test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-java/java-getopt/java-getopt-1.0.14-r2.ebuild b/dev-java/java-getopt/java-getopt-1.0.14-r2.ebuild
index efcb94a4aeeac..44bec027d4f25 100644
--- a/dev-java/java-getopt/java-getopt-1.0.14-r2.ebuild
+++ b/dev-java/java-getopt/java-getopt-1.0.14-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.urbanophile.com/arenn/hacking/getopt/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="1"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/xalan-serializer/xalan-serializer-2.7.3.ebuild b/dev-java/xalan-serializer/xalan-serializer-2.7.3.ebuild
index 1fd7aefc9d5b8..77fed6e351c23 100644
--- a/dev-java/xalan-serializer/xalan-serializer-2.7.3.ebuild
+++ b/dev-java/xalan-serializer/xalan-serializer-2.7.3.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/xalan-j_${PV//./_}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 DEPEND="virtual/jdk:1.8"
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/xalan/xalan-2.7.3.ebuild b/dev-java/xalan/xalan-2.7.3.ebuild
index 864ecd32f7303..30b317fd49437 100644
--- a/dev-java/xalan/xalan-2.7.3.ebuild
+++ b/dev-java/xalan/xalan-2.7.3.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/xalan-j_${PV//./_}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 CP_DEPEND="
 	dev-java/bcel:0
diff --git a/dev-libs/libxmlb/libxmlb-0.3.14.ebuild b/dev-libs/libxmlb/libxmlb-0.3.14.ebuild
index c6599b5571e76..79ea4d4847b0a 100644
--- a/dev-libs/libxmlb/libxmlb-0.3.14.ebuild
+++ b/dev-libs/libxmlb/libxmlb-0.3.14.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/hughsie/libxmlb/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="LGPL-2.1+"
 SLOT="0/2" # libxmlb.so version
 
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86"
 IUSE="doc introspection stemmer test +zstd"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-python/cryptography/cryptography-41.0.4.ebuild b/dev-python/cryptography/cryptography-41.0.4.ebuild
index 1a10ca759f9ab..2c63b8ebd4a59 100644
--- a/dev-python/cryptography/cryptography-41.0.4.ebuild
+++ b/dev-python/cryptography/cryptography-41.0.4.ebuild
@@ -87,7 +87,7 @@ LICENSE+="
 	Unicode-DFS-2016
 "
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~loong ppc ~ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm ~arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-libs/openssl-1.0.2o-r6:0=
diff --git a/dev-python/pip-run/pip-run-12.4.0.ebuild b/dev-python/pip-run/pip-run-12.4.0.ebuild
index 39a7e2d47eda8..b6bb7613891b1 100644
--- a/dev-python/pip-run/pip-run-12.4.0.ebuild
+++ b/dev-python/pip-run/pip-run-12.4.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ~ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/autocommand[${PYTHON_USEDEP}]
diff --git a/dev-python/subunit/subunit-1.4.3.ebuild b/dev-python/subunit/subunit-1.4.3.ebuild
index 86c321187762f..5530709ef362a 100644
--- a/dev-python/subunit/subunit-1.4.3.ebuild
+++ b/dev-python/subunit/subunit-1.4.3.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0 BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/typeguard/typeguard-4.1.5.ebuild b/dev-python/typeguard/typeguard-4.1.5.ebuild
index b20954b320d3a..fcb8380128ee3 100644
--- a/dev-python/typeguard/typeguard-4.1.5.ebuild
+++ b/dev-python/typeguard/typeguard-4.1.5.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-scheme/c-wrapper/files/c-wrapper-gauche-abi-0.98.patch b/dev-scheme/c-wrapper/files/c-wrapper-gauche-abi-0.98.patch
index 15e8b6990cc7c..6c9f0cb371b20 100644
--- a/dev-scheme/c-wrapper/files/c-wrapper-gauche-abi-0.98.patch
+++ b/dev-scheme/c-wrapper/files/c-wrapper-gauche-abi-0.98.patch
@@ -12,6 +12,30 @@
      } else {
          Scm_Error("wrong slot number: %d", sa->slotNumber);
      }
+--- a/src/c-lex.c
++++ b/src/c-lex.c
+@@ -992,11 +992,6 @@
+     SCM_RETURN(Scm_MakeInteger(v));
+ }
+ 
+-ScmObj Scm_ReadStringLiteral()
+-{
+-    SCM_RETURN(read_string_literal());
+-}
+-
+ ScmObj Scm_ReadCharacterConstant()
+ {
+     SCM_RETURN(read_character_constant());
+--- a/src/c-lex.h
++++ b/src/c-lex.h
+@@ -78,7 +78,6 @@
+ extern ScmObj Scm_IsForceIdentifierSet(ScmObj v);
+ extern ScmObj Scm_ReadIdentifier(ScmObj l);
+ extern ScmObj Scm_ReadOperator(ScmObj c);
+-extern ScmObj Scm_ReadStringLiteral();
+ extern ScmObj Scm_ReadCharacterConstant();
+ extern ScmObj Scm_ReadOctalOrFlonum(ScmObj l);
+ extern ScmObj Scm_ReadDecimal(ScmObj l);
 --- a/src/c-lexlib.stub
 +++ b/src/c-lexlib.stub
 @@ -40,7 +40,11 @@
@@ -26,3 +50,13 @@
          "}"))
  
  (define-cproc strtod (nptr::<const-cstring>)
+@@ -136,9 +140,6 @@
+ (define-cproc read-operator (c)
+   (call "Scm_ReadOperator"))
+ 
+-(define-cproc read-string-literal ()
+-  (call "Scm_ReadStringLiteral"))
+-
+ (define-cproc read-character-constant ()
+   (call "Scm_ReadCharacterConstant"))
+ 
diff --git a/dev-util/cmake/cmake-3.27.7.ebuild b/dev-util/cmake/cmake-3.27.7.ebuild
index 99786150eb33d..3b3f104ca5357 100644
--- a/dev-util/cmake/cmake-3.27.7.ebuild
+++ b/dev-util/cmake/cmake-3.27.7.ebuild
@@ -48,7 +48,7 @@ else
 			https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt.asc
 		)"
 
-		KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~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 ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
 		BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-bradking-20230817 )"
 	fi
diff --git a/net-libs/libvncserver/libvncserver-0.9.14-r1.ebuild b/net-libs/libvncserver/libvncserver-0.9.14-r1.ebuild
index 79389a4491b79..94af0ee8711e4 100644
--- a/net-libs/libvncserver/libvncserver-0.9.14-r1.ebuild
+++ b/net-libs/libvncserver/libvncserver-0.9.14-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${MY_P}"
 LICENSE="GPL-2 GPL-2+ LGPL-2.1+ BSD MIT"
 # no sub slot wanted (yet), see #578958
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+24bpp +filetransfer +gcrypt gnutls ipv6 +jpeg lzo +png sasl ssl systemd +threads +zlib"
 # https://bugs.gentoo.org/690202
 # https://bugs.gentoo.org/435326
diff --git a/net-misc/linuxptp/linuxptp-4.1.ebuild b/net-misc/linuxptp/linuxptp-4.1.ebuild
index 4824094162976..f121905d932c1 100644
--- a/net-misc/linuxptp/linuxptp-4.1.ebuild
+++ b/net-misc/linuxptp/linuxptp-4.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/project/${PN}/v$(ver_cut 1-2)/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~riscv ~x86"
 
 DEPEND="elibc_musl? ( sys-libs/queue-standalone )"
 
diff --git a/sci-libs/geos/geos-3.11.2.ebuild b/sci-libs/geos/geos-3.11.2.ebuild
index 88b55f52a8706..abd21d2081ac8 100644
--- a/sci-libs/geos/geos-3.11.2.ebuild
+++ b/sci-libs/geos/geos-3.11.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.osgeo.org/geos/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/sec-keys/openpgp-keys-bradking/openpgp-keys-bradking-20230817.ebuild b/sec-keys/openpgp-keys-bradking/openpgp-keys-bradking-20230817.ebuild
index 0f9383a621d04..0294dddffab62 100644
--- a/sec-keys/openpgp-keys-bradking/openpgp-keys-bradking-20230817.ebuild
+++ b/sec-keys/openpgp-keys-bradking/openpgp-keys-bradking-20230817.ebuild
@@ -11,7 +11,7 @@ S="${WORKDIR}"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86"
 
 src_install() {
 	local files=( ${A} )
diff --git a/sys-apps/gptfdisk/gptfdisk-1.0.9-r3.ebuild b/sys-apps/gptfdisk/gptfdisk-1.0.9-r3.ebuild
index 9656c9322eb5d..e364c3dfdb6a1 100644
--- a/sys-apps/gptfdisk/gptfdisk-1.0.9-r3.ebuild
+++ b/sys-apps/gptfdisk/gptfdisk-1.0.9-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="ncurses static"
 
 # libuuid from util-linux is required.
diff --git a/sys-apps/hdparm/hdparm-9.65-r1.ebuild b/sys-apps/hdparm/hdparm-9.65-r1.ebuild
index e98c6ed37a59d..ccd5a7e1a4b00 100644
--- a/sys-apps/hdparm/hdparm-9.65-r1.ebuild
+++ b/sys-apps/hdparm/hdparm-9.65-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/hdparm/${P}.tar.gz"
 # GPL-2 only
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static"
 
 PATCHES=(
diff --git a/sys-apps/smartmontools/smartmontools-7.4.ebuild b/sys-apps/smartmontools/smartmontools-7.4.ebuild
index 3791510f37b28..7a4d4c1bf1890 100644
--- a/sys-apps/smartmontools/smartmontools-7.4.ebuild
+++ b/sys-apps/smartmontools/smartmontools-7.4.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit autotools subversion
 else
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 fi
 
 DESCRIPTION="Tools to monitor storage systems to provide advanced warning of disk degradation"
diff --git a/sys-block/thin-provisioning-tools/thin-provisioning-tools-1.0.6.ebuild b/sys-block/thin-provisioning-tools/thin-provisioning-tools-1.0.6.ebuild
index 297db2dc83cda..7697688d63119 100644
--- a/sys-block/thin-provisioning-tools/thin-provisioning-tools-1.0.6.ebuild
+++ b/sys-block/thin-provisioning-tools/thin-provisioning-tools-1.0.6.ebuild
@@ -146,7 +146,7 @@ else
 		https://github.com/jthornber/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 		${CARGO_CRATE_URIS}
 	"
-	KEYWORDS="~amd64 ~arm arm64 ~loong ~mips ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm arm64 ~loong ~mips ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="Apache-2.0 BSD GPL-3 MIT Unicode-DFS-2016"
diff --git a/sys-fs/btrfs-progs/btrfs-progs-6.5.2.ebuild b/sys-fs/btrfs-progs/btrfs-progs-6.5.2.ebuild
index a3c40daba6ed4..cd3842458c306 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-6.5.2.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-6.5.2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} != 9999 ]]; then
 	SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz"
 
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ~ppc64 ~riscv ~sparc x86"
+		KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 	fi
 
 	S="${WORKDIR}"/${PN}-${MY_PV}
diff --git a/sys-libs/libblockdev/libblockdev-3.0.3.ebuild b/sys-libs/libblockdev/libblockdev-3.0.3.ebuild
index 7d50d311061b3..a90f36e278d10 100644
--- a/sys-libs/libblockdev/libblockdev-3.0.3.ebuild
+++ b/sys-libs/libblockdev/libblockdev-3.0.3.ebuild
@@ -17,7 +17,7 @@ if [[ "${PV}" == *9999 ]] ; then
 else
 	MY_PV="${PV}-1"
 	SRC_URI="https://github.com/storaged-project/${PN}/releases/download/${MY_PV}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~x86"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~loong ~mips ppc64 ~riscv x86"
 fi
 LICENSE="LGPL-2+"
 SLOT="0/3"	# subslot is SOVERSION
diff --git a/sys-libs/libsmbios/libsmbios-2.4.3-r1.ebuild b/sys-libs/libsmbios/libsmbios-2.4.3-r1.ebuild
index e1bb901b8e36d..d730612f8ea65 100644
--- a/sys-libs/libsmbios/libsmbios-2.4.3-r1.ebuild
+++ b/sys-libs/libsmbios/libsmbios-2.4.3-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/dell/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( GPL-2+ OSL-2.1 ) BSD Boost-1.0"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~ia64 ~x86"
+KEYWORDS="-* amd64 ~ia64 x86"
 IUSE="doc graphviz nls +python static-libs test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
 	test? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/sys-power/acpid/acpid-2.0.34-r1.ebuild b/sys-power/acpid/acpid-2.0.34-r1.ebuild
index 258a20d571b50..3ab4de5b8769f 100644
--- a/sys-power/acpid/acpid-2.0.34-r1.ebuild
+++ b/sys-power/acpid/acpid-2.0.34-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}2/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~loong ~riscv x86"
 IUSE="selinux"
 
 RDEPEND="selinux? ( sec-policy/selinux-apm )"