Merge updates from master

91 files changed, 99 insertions, 99 deletions

diff --git a/app-crypt/gnupg/gnupg-2.2.43.ebuild b/app-crypt/gnupg/gnupg-2.2.43.ebuild
index 9f84a193d88f..1273cd75d344 100644
--- a/app-crypt/gnupg/gnupg-2.2.43.ebuild
+++ b/app-crypt/gnupg/gnupg-2.2.43.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~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 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl test tofu tools usb user-socket wks-server"
 RESTRICT="!test? ( test )"
 
diff --git a/app-crypt/heimdal/heimdal-7.8.0-r3.ebuild b/app-crypt/heimdal/heimdal-7.8.0-r3.ebuild
index 597d9cf695c5..da75879e5dd5 100644
--- a/app-crypt/heimdal/heimdal-7.8.0-r3.ebuild
+++ b/app-crypt/heimdal/heimdal-7.8.0-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="afs +berkdb caps gdbm hdb-ldap +lmdb otp selinux static-libs test X"
 RESTRICT="!test? ( test )"
 
diff --git a/app-editors/nano/nano-8.0.ebuild b/app-editors/nano/nano-8.0.ebuild
index b2711faf22a3..1ab91a8b3d8f 100644
--- a/app-editors/nano/nano-8.0.ebuild
+++ b/app-editors/nano/nano-8.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]] ; then
 else
 	MY_P="${PN}-${PV/_}"
 	SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.xz"
-	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"
 fi
 
 DESCRIPTION="GNU GPL'd Pico clone with more functionality"
diff --git a/app-text/mdbook/mdbook-0.4.40.ebuild b/app-text/mdbook/mdbook-0.4.40.ebuild
index b3249d4b1ee6..e5e76b2f6ed6 100644
--- a/app-text/mdbook/mdbook-0.4.40.ebuild
+++ b/app-text/mdbook/mdbook-0.4.40.ebuild
@@ -268,7 +268,7 @@ S="${WORKDIR}/${P/b/B}"
 LICENSE="MPL-2.0 CC-BY-4.0 OFL-1.1"
 LICENSE+=" Apache-2.0 CC0-1.0 ISC MIT Unicode-DFS-2016" # crates
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ~ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="doc"
 
 QA_FLAGS_IGNORED="usr/bin/${PN}"
diff --git a/dev-debug/systemtap/systemtap-5.0-r1.ebuild b/dev-debug/systemtap/systemtap-5.0-r1.ebuild
index 89e33536ce6c..e3e98ce134ac 100644
--- a/dev-debug/systemtap/systemtap-5.0-r1.ebuild
+++ b/dev-debug/systemtap/systemtap-5.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.sourceware.org/ftp/${PN}/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ~ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="libvirt selinux sqlite +ssl test zeroconf"
 
 CDEPEND="
diff --git a/dev-java/openjdk-bin/openjdk-bin-17.0.11_p9.ebuild b/dev-java/openjdk-bin/openjdk-bin-17.0.11_p9.ebuild
index 1e59953a44c8..447013da8fd8 100644
--- a/dev-java/openjdk-bin/openjdk-bin-17.0.11_p9.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-17.0.11_p9.ebuild
@@ -42,7 +42,7 @@ SRC_URI="
 DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin"
 HOMEPAGE="https://adoptium.net"
 LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x64-macos"
 IUSE="alsa cups headless-awt selinux source"
 
 RDEPEND="
diff --git a/dev-java/openjdk-bin/openjdk-bin-8.412_p08.ebuild b/dev-java/openjdk-bin/openjdk-bin-8.412_p08.ebuild
index ffff2917ded0..ce663bd48b77 100644
--- a/dev-java/openjdk-bin/openjdk-bin-8.412_p08.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-8.412_p08.ebuild
@@ -41,7 +41,7 @@ SRC_URI="
 "
 
 LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x64-macos"
 
 IUSE="alsa cups examples headless-awt selinux source"
 
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.412_p08.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.412_p08.ebuild
index 04fb01a2b751..30f0a4d988c1 100644
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.412_p08.ebuild
+++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.412_p08.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 "
 
 LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 IUSE="alsa cups headless-awt selinux"
 
diff --git a/dev-java/openjdk/openjdk-17.0.11_p9.ebuild b/dev-java/openjdk/openjdk-17.0.11_p9.ebuild
index 1c4f51f66acd..dbec2d8ea9b9 100644
--- a/dev-java/openjdk/openjdk-17.0.11_p9.ebuild
+++ b/dev-java/openjdk/openjdk-17.0.11_p9.ebuild
@@ -50,7 +50,7 @@ S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV//+/-}"
 
 LICENSE="GPL-2-with-classpath-exception"
 SLOT="${MY_PV%%[.+]*}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 
 IUSE="alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap lto selinux source system-bootstrap systemtap"
 
diff --git a/dev-java/openjdk/openjdk-8.412_p08.ebuild b/dev-java/openjdk/openjdk-8.412_p08.ebuild
index 6280651782d6..a0290466d06c 100644
--- a/dev-java/openjdk/openjdk-8.412_p08.ebuild
+++ b/dev-java/openjdk/openjdk-8.412_p08.ebuild
@@ -47,7 +47,7 @@ S="${WORKDIR}/jdk${SLOT}u-jdk${MY_PV}"
 
 LICENSE="GPL-2-with-classpath-exception"
 SLOT="${PV%%[.+]*}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="alsa big-endian debug cups doc examples headless-awt javafx +jbootstrap selinux system-bootstrap source"
 
 COMMON_DEPEND="
diff --git a/dev-lang/spidermonkey/spidermonkey-115.10.0.ebuild b/dev-lang/spidermonkey/spidermonkey-115.10.0.ebuild
index 4c2c9717b3b1..41c724870547 100644
--- a/dev-lang/spidermonkey/spidermonkey-115.10.0.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-115.10.0.ebuild
@@ -61,7 +61,7 @@ SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> ${MOZ_P_DISTFILES}
 DESCRIPTION="SpiderMonkey is Mozilla's JavaScript engine written in C and C++"
 HOMEPAGE="https://spidermonkey.dev https://firefox-source-docs.mozilla.org/js/index.html "
 
-KEYWORDS="amd64 arm arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc x86"
 
 SLOT="$(ver_cut 1)"
 LICENSE="MPL-2.0"
diff --git a/dev-lang/swig/swig-4.2.1.ebuild b/dev-lang/swig/swig-4.2.1.ebuild
index 403f503bde74..9455e5922f3b 100644
--- a/dev-lang/swig/swig-4.2.1.ebuild
+++ b/dev-lang/swig/swig-4.2.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+ BSD BSD-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 ~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"
 IUSE="ccache doc pcre test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/wayland-protocols/wayland-protocols-1.36.ebuild b/dev-libs/wayland-protocols/wayland-protocols-1.36.ebuild
index 7820286edec2..96126f5f4342 100644
--- a/dev-libs/wayland-protocols/wayland-protocols-1.36.ebuild
+++ b/dev-libs/wayland-protocols/wayland-protocols-1.36.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gitlab.freedesktop.org/wayland/${PN}/-/releases/${PV}/downloads/${P}.tar.xz"
-	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"
 fi
 
 LICENSE="MIT"
diff --git a/dev-ml/async/async-0.16.0.ebuild b/dev-ml/async/async-0.16.0.ebuild
index 3bd14cb8c36e..af5947cb1aff 100644
--- a/dev-ml/async/async-0.16.0.ebuild
+++ b/dev-ml/async/async-0.16.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 IUSE="+ocamlopt"
 
 # Need qtest_lib, netkit_sockets
diff --git a/dev-ml/async_unix/async_unix-0.16.0.ebuild b/dev-ml/async_unix/async_unix-0.16.0.ebuild
index c8ec8cfad6cf..543b7efc038c 100644
--- a/dev-ml/async_unix/async_unix-0.16.0.ebuild
+++ b/dev-ml/async_unix/async_unix-0.16.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 IUSE="+ocamlopt"
 
 RDEPEND="
diff --git a/dev-ml/core_unix/core_unix-0.16.0-r1.ebuild b/dev-ml/core_unix/core_unix-0.16.0-r1.ebuild
index c1f4d14d1f55..7c3d2c84cfee 100644
--- a/dev-ml/core_unix/core_unix-0.16.0-r1.ebuild
+++ b/dev-ml/core_unix/core_unix-0.16.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/refs/tags/v${PV}.tar.gz
 
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 IUSE="+ocamlopt"
 
 DEPEND="
diff --git a/dev-ml/expect_test_helpers_core/expect_test_helpers_core-0.16.0.ebuild b/dev-ml/expect_test_helpers_core/expect_test_helpers_core-0.16.0.ebuild
index d9880e2ad159..8971bfd1aa06 100644
--- a/dev-ml/expect_test_helpers_core/expect_test_helpers_core-0.16.0.ebuild
+++ b/dev-ml/expect_test_helpers_core/expect_test_helpers_core-0.16.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/refs/tags/v${PV}.tar.gz
 
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="+ocamlopt"
 
 DEPEND="
diff --git a/dev-ml/ocaml_intrinsics/ocaml_intrinsics-0.16.0.ebuild b/dev-ml/ocaml_intrinsics/ocaml_intrinsics-0.16.0.ebuild
index 7e383a4f2da6..18297e6b84b1 100644
--- a/dev-ml/ocaml_intrinsics/ocaml_intrinsics-0.16.0.ebuild
+++ b/dev-ml/ocaml_intrinsics/ocaml_intrinsics-0.16.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz
 
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 IUSE="+ocamlopt"
 RESTRICT="test"
 
diff --git a/dev-ml/sexp_pretty/sexp_pretty-0.16.0.ebuild b/dev-ml/sexp_pretty/sexp_pretty-0.16.0.ebuild
index 76bb6484838f..27e956314c61 100644
--- a/dev-ml/sexp_pretty/sexp_pretty-0.16.0.ebuild
+++ b/dev-ml/sexp_pretty/sexp_pretty-0.16.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2023 Gentoo Authors
+# Copyright 2023-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/refs/tags/v${PV}.tar.gz
 
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="+ocamlopt"
 
 DEPEND="
diff --git a/dev-ml/textutils/textutils-0.16.0.ebuild b/dev-ml/textutils/textutils-0.16.0.ebuild
index 38a352a5fee9..30a09cbf3065 100644
--- a/dev-ml/textutils/textutils-0.16.0.ebuild
+++ b/dev-ml/textutils/textutils-0.16.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 IUSE="+ocamlopt"
 
 RDEPEND="
diff --git a/dev-ml/textutils_kernel/textutils_kernel-0.16.0.ebuild b/dev-ml/textutils_kernel/textutils_kernel-0.16.0.ebuild
index 37289a18f25c..c61c993b3c42 100644
--- a/dev-ml/textutils_kernel/textutils_kernel-0.16.0.ebuild
+++ b/dev-ml/textutils_kernel/textutils_kernel-0.16.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/refs/tags/v${PV}.tar.gz
 
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="+ocamlopt"
 
 DEPEND="
diff --git a/dev-ml/timezone/timezone-0.16.0-r1.ebuild b/dev-ml/timezone/timezone-0.16.0-r1.ebuild
index 535ba4635b52..14cbb62e3f98 100644
--- a/dev-ml/timezone/timezone-0.16.0-r1.ebuild
+++ b/dev-ml/timezone/timezone-0.16.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="+ocamlopt"
 
 RDEPEND="
diff --git a/dev-python/bottleneck/bottleneck-1.3.8-r1.ebuild b/dev-python/bottleneck/bottleneck-1.3.8-r1.ebuild
index 9807a15d57be..1466f916a5e9 100644
--- a/dev-python/bottleneck/bottleneck-1.3.8-r1.ebuild
+++ b/dev-python/bottleneck/bottleneck-1.3.8-r1.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
 
 DEPEND="
 	>=dev-python/numpy-1.9.1:=[${PYTHON_USEDEP}]
diff --git a/dev-python/contourpy/contourpy-1.2.1.ebuild b/dev-python/contourpy/contourpy-1.2.1.ebuild
index 8505bc23e71f..a5206110e500 100644
--- a/dev-python/contourpy/contourpy-1.2.1.ebuild
+++ b/dev-python/contourpy/contourpy-1.2.1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
 
 RDEPEND="
 	>=dev-python/numpy-1.20[${PYTHON_USEDEP}]
diff --git a/dev-python/ensurepip-setuptools/ensurepip-setuptools-70.0.0.ebuild b/dev-python/ensurepip-setuptools/ensurepip-setuptools-70.0.0.ebuild
index aaae7e464d59..56dcbec72238 100644
--- a/dev-python/ensurepip-setuptools/ensurepip-setuptools-70.0.0.ebuild
+++ b/dev-python/ensurepip-setuptools/ensurepip-setuptools-70.0.0.ebuild
@@ -12,7 +12,7 @@ S=${DISTDIR}
 
 LICENSE="MIT"
 SLOT="0"
-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"
 
 RDEPEND="
 	!<dev-python/ensurepip-wheels-100
diff --git a/dev-python/lxml/lxml-5.2.2.ebuild b/dev-python/lxml/lxml-5.2.2.ebuild
index 4bb6e24d8ceb..b11b87bb66b6 100644
--- a/dev-python/lxml/lxml-5.2.2.ebuild
+++ b/dev-python/lxml/lxml-5.2.2.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/lxml-${P}
 
 LICENSE="BSD ElementTree GPL-2 PSF-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 ~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"
 IUSE="doc examples +threads test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pypax/pypax-0.9.5-r2.ebuild b/dev-python/pypax/pypax-0.9.5-r2.ebuild
index dd3e589bc9dc..ff59e2c83ce5 100644
--- a/dev-python/pypax/pypax-0.9.5-r2.ebuild
+++ b/dev-python/pypax/pypax-0.9.5-r2.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~blueness/elfix/elfix-${PV}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
 	S="${WORKDIR}/elfix-${PV}"
 fi
 
diff --git a/dev-python/pyproject-fmt-rust/pyproject-fmt-rust-1.1.3.ebuild b/dev-python/pyproject-fmt-rust/pyproject-fmt-rust-1.1.3.ebuild
index ad22e64b4a32..7a06a39df7e1 100644
--- a/dev-python/pyproject-fmt-rust/pyproject-fmt-rust-1.1.3.ebuild
+++ b/dev-python/pyproject-fmt-rust/pyproject-fmt-rust-1.1.3.ebuild
@@ -143,7 +143,7 @@ LICENSE+="
 	|| ( Apache-2.0 Boost-1.0 )
 "
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/pyproject-fmt/pyproject-fmt-2.1.3.ebuild b/dev-python/pyproject-fmt/pyproject-fmt-2.1.3.ebuild
index 48f7e117200d..35e3ca485f1b 100644
--- a/dev-python/pyproject-fmt/pyproject-fmt-2.1.3.ebuild
+++ b/dev-python/pyproject-fmt/pyproject-fmt-2.1.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 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-python/pyproject-fmt-rust-1.1.3[${PYTHON_USEDEP}]
diff --git a/dev-python/regex/regex-2024.5.15.ebuild b/dev-python/regex/regex-2024.5.15.ebuild
index 8d367240f477..4cabe9493565 100644
--- a/dev-python/regex/regex-2024.5.15.ebuild
+++ b/dev-python/regex/regex-2024.5.15.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
 IUSE="doc"
 
 PATCHES=(
diff --git a/dev-python/scikit-build-core/scikit-build-core-0.9.4.ebuild b/dev-python/scikit-build-core/scikit-build-core-0.9.4.ebuild
index 8c69dc4f02bf..dac757db0521 100644
--- a/dev-python/scikit-build-core/scikit-build-core-0.9.4.ebuild
+++ b/dev-python/scikit-build-core/scikit-build-core-0.9.4.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 # we always want [pyproject] extra
 RDEPEND="
diff --git a/dev-python/setuptools/setuptools-70.0.0.ebuild b/dev-python/setuptools/setuptools-70.0.0.ebuild
index d4a92c9fbff6..acd80884f3cb 100644
--- a/dev-python/setuptools/setuptools-70.0.0.ebuild
+++ b/dev-python/setuptools/setuptools-70.0.0.ebuild
@@ -21,7 +21,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"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/zope-interface/zope-interface-6.4_p2.ebuild b/dev-python/zope-interface/zope-interface-6.4_p2.ebuild
index 754a58b4875d..b9beb0c51e47 100644
--- a/dev-python/zope-interface/zope-interface-6.4_p2.ebuild
+++ b/dev-python/zope-interface/zope-interface-6.4_p2.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="ZPL"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~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 ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	!dev-python/namespace-zope
diff --git a/dev-qt/qt-docs/qt-docs-6.7.1_p202404231200.ebuild b/dev-qt/qt-docs/qt-docs-6.7.1_p202404231200.ebuild
index 2751695c80fc..24d19bae0044 100644
--- a/dev-qt/qt-docs/qt-docs-6.7.1_p202404231200.ebuild
+++ b/dev-qt/qt-docs/qt-docs-6.7.1_p202404231200.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://doc.qt.io/"
 
 LICENSE="FDL-1.3"
 SLOT="6"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86"
 IUSE="+examples +html +qch"
 REQUIRED_USE="|| ( examples html qch )"
 
diff --git a/dev-qt/qt3d/qt3d-6.7.1.ebuild b/dev-qt/qt3d/qt3d-6.7.1.ebuild
index db2eacdd658c..1d6c2f7e0838 100644
--- a/dev-qt/qt3d/qt3d-6.7.1.ebuild
+++ b/dev-qt/qt3d/qt3d-6.7.1.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="3D rendering module for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 ~riscv x86"
+	KEYWORDS="amd64 arm arm64 ~riscv x86"
 elif [[ ${QT6_BUILD_TYPE} == live ]]; then
 	EGIT_SUBMODULES=() # skip qtquick3d-assimp
 fi
diff --git a/dev-qt/qt5compat/qt5compat-6.7.1.ebuild b/dev-qt/qt5compat/qt5compat-6.7.1.ebuild
index 44f457932756..6a8fbc7286ea 100644
--- a/dev-qt/qt5compat/qt5compat-6.7.1.ebuild
+++ b/dev-qt/qt5compat/qt5compat-6.7.1.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Qt module containing the unsupported Qt 5 APIs"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv x86"
 fi
 
 IUSE="icu qml"
diff --git a/dev-qt/qtbase/qtbase-6.7.1.ebuild b/dev-qt/qtbase/qtbase-6.7.1.ebuild
index 8fcaa6b8b960..534c7504e39a 100644
--- a/dev-qt/qtbase/qtbase-6.7.1.ebuild
+++ b/dev-qt/qtbase/qtbase-6.7.1.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build toolchain-funcs
 DESCRIPTION="Cross-platform application development framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86"
 fi
 
 declare -A QT6_IUSE=(
diff --git a/dev-qt/qtcharts/qtcharts-6.7.1.ebuild b/dev-qt/qtcharts/qtcharts-6.7.1.ebuild
index cd530c7da12c..921ab22ff912 100644
--- a/dev-qt/qtcharts/qtcharts-6.7.1.ebuild
+++ b/dev-qt/qtcharts/qtcharts-6.7.1.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Chart component library for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 ~loong ~ppc ppc64 ~riscv x86"
+	KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv x86"
 fi
 
 IUSE="gles2-only qml"
diff --git a/dev-qt/qtconnectivity/qtconnectivity-6.7.1.ebuild b/dev-qt/qtconnectivity/qtconnectivity-6.7.1.ebuild
index b41fdcce407a..47ec23329c20 100644
--- a/dev-qt/qtconnectivity/qtconnectivity-6.7.1.ebuild
+++ b/dev-qt/qtconnectivity/qtconnectivity-6.7.1.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Bluetooth and NFC support library for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 ~loong ~riscv x86"
+	KEYWORDS="amd64 arm arm64 ~loong ~riscv x86"
 fi
 
 IUSE="+bluetooth nfc smartcard"
diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.7.1.ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.7.1.ebuild
index 9dcd80455eb5..59627e482a84 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-6.7.1.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-6.7.1.ebuild
@@ -14,7 +14,7 @@ inherit python-any-r1 qt6-build
 DESCRIPTION="Qt Declarative (Quick 2)"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE="accessibility +jit +network opengl qmlls +sql +ssl svg vulkan +widgets"
diff --git a/dev-qt/qtimageformats/qtimageformats-6.7.1.ebuild b/dev-qt/qtimageformats/qtimageformats-6.7.1.ebuild
index d349e9d590b4..ac6f299f55a0 100644
--- a/dev-qt/qtimageformats/qtimageformats-6.7.1.ebuild
+++ b/dev-qt/qtimageformats/qtimageformats-6.7.1.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Additional format plugins for the Qt image I/O system"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 ~hppa ~loong ppc64 ~riscv x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc64 ~riscv x86"
 fi
 
 IUSE="mng"
diff --git a/dev-qt/qtlocation/qtlocation-6.7.1.ebuild b/dev-qt/qtlocation/qtlocation-6.7.1.ebuild
index 6c9fc174029c..087dd20a6ae2 100644
--- a/dev-qt/qtlocation/qtlocation-6.7.1.ebuild
+++ b/dev-qt/qtlocation/qtlocation-6.7.1.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Location (places, maps, navigation) library for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 ~riscv x86"
+	KEYWORDS="amd64 arm arm64 ~riscv x86"
 fi
 
 RDEPEND="
diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.7.1.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.7.1.ebuild
index cd60950c95ba..1d78a1de5024 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-6.7.1.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-6.7.1.ebuild
@@ -8,7 +8,7 @@ inherit flag-o-matic qt6-build
 DESCRIPTION="Multimedia (audio, video, radio, camera) library for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv x86"
 fi
 
 IUSE="+X alsa eglfs +ffmpeg gstreamer opengl pulseaudio qml v4l vaapi vulkan"
diff --git a/dev-qt/qtnetworkauth/qtnetworkauth-6.7.1.ebuild b/dev-qt/qtnetworkauth/qtnetworkauth-6.7.1.ebuild
index 796b91765470..49cf5546a07e 100644
--- a/dev-qt/qtnetworkauth/qtnetworkauth-6.7.1.ebuild
+++ b/dev-qt/qtnetworkauth/qtnetworkauth-6.7.1.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Network authorization library for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm64 ~riscv x86"
+	KEYWORDS="amd64 arm64 ~riscv x86"
 fi
 
 RDEPEND="~dev-qt/qtbase-${PV}:6[network]"
diff --git a/dev-qt/qtpositioning/qtpositioning-6.7.1.ebuild b/dev-qt/qtpositioning/qtpositioning-6.7.1.ebuild
index 3efd0b983134..1f349010160e 100644
--- a/dev-qt/qtpositioning/qtpositioning-6.7.1.ebuild
+++ b/dev-qt/qtpositioning/qtpositioning-6.7.1.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Physical position determination library for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv x86"
 fi
 
 IUSE="geoclue nmea +qml"
diff --git a/dev-qt/qtquick3d/qtquick3d-6.7.1.ebuild b/dev-qt/qtquick3d/qtquick3d-6.7.1.ebuild
index 76a066f3aa26..4efd1a2ee293 100644
--- a/dev-qt/qtquick3d/qtquick3d-6.7.1.ebuild
+++ b/dev-qt/qtquick3d/qtquick3d-6.7.1.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Qt module and API for defining 3D content in Qt QuickTools"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 ~loong ~ppc ppc64 ~riscv x86"
+	KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv x86"
 elif [[ ${QT6_BUILD_TYPE} == live ]]; then
 	EGIT_SUBMODULES=() # skip qtquick3d-assimp
 fi
diff --git a/dev-qt/qtquicktimeline/qtquicktimeline-6.7.1.ebuild b/dev-qt/qtquicktimeline/qtquicktimeline-6.7.1.ebuild
index 22c0334a9ce2..5baaa72f2711 100644
--- a/dev-qt/qtquicktimeline/qtquicktimeline-6.7.1.ebuild
+++ b/dev-qt/qtquicktimeline/qtquicktimeline-6.7.1.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Qt module for keyframe-based timeline construction"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 ~loong ~ppc ppc64 ~riscv x86"
+	KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv x86"
 fi
 
 RDEPEND="
diff --git a/dev-qt/qtscxml/qtscxml-6.7.1.ebuild b/dev-qt/qtscxml/qtscxml-6.7.1.ebuild
index 9dc0a14f8cf2..67054f2b3468 100644
--- a/dev-qt/qtscxml/qtscxml-6.7.1.ebuild
+++ b/dev-qt/qtscxml/qtscxml-6.7.1.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="State Chart XML (SCXML) support library for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 ~riscv x86"
+	KEYWORDS="amd64 arm arm64 ~riscv x86"
 fi
 
 IUSE="qml"
diff --git a/dev-qt/qtsensors/qtsensors-6.7.1.ebuild b/dev-qt/qtsensors/qtsensors-6.7.1.ebuild
index e775fcc2f89b..9b0c73bc0aab 100644
--- a/dev-qt/qtsensors/qtsensors-6.7.1.ebuild
+++ b/dev-qt/qtsensors/qtsensors-6.7.1.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Hardware sensor access library for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 ~hppa ~loong ~ppc ~riscv x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ~riscv x86"
 fi
 
 IUSE="qml"
diff --git a/dev-qt/qtserialport/qtserialport-6.7.1.ebuild b/dev-qt/qtserialport/qtserialport-6.7.1.ebuild
index da926f70a33e..67ab8b8451f2 100644
--- a/dev-qt/qtserialport/qtserialport-6.7.1.ebuild
+++ b/dev-qt/qtserialport/qtserialport-6.7.1.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Serial port abstraction library for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv x86"
 fi
 
 RDEPEND="
diff --git a/dev-qt/qtshadertools/qtshadertools-6.7.1.ebuild b/dev-qt/qtshadertools/qtshadertools-6.7.1.ebuild
index 918e99450a94..e8a5a86f2b64 100644
--- a/dev-qt/qtshadertools/qtshadertools-6.7.1.ebuild
+++ b/dev-qt/qtshadertools/qtshadertools-6.7.1.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Qt APIs and Tools for Graphics Pipelines"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86"
 fi
 
 RDEPEND="
diff --git a/dev-qt/qtspeech/qtspeech-6.7.1.ebuild b/dev-qt/qtspeech/qtspeech-6.7.1.ebuild
index 39e1c27792c5..4abab299c0ab 100644
--- a/dev-qt/qtspeech/qtspeech-6.7.1.ebuild
+++ b/dev-qt/qtspeech/qtspeech-6.7.1.ebuild
@@ -13,7 +13,7 @@ inherit qt6-build
 DESCRIPTION="Text-to-speech library for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 ~loong ~riscv x86"
+	KEYWORDS="amd64 arm arm64 ~loong ~riscv x86"
 fi
 
 IUSE="flite qml +speechd"
diff --git a/dev-qt/qtsvg/qtsvg-6.7.1.ebuild b/dev-qt/qtsvg/qtsvg-6.7.1.ebuild
index 17d4afa2d11e..73a0e9316b19 100644
--- a/dev-qt/qtsvg/qtsvg-6.7.1.ebuild
+++ b/dev-qt/qtsvg/qtsvg-6.7.1.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="SVG rendering library for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv x86"
 fi
 
 RDEPEND="
diff --git a/dev-qt/qttools/qttools-6.7.1.ebuild b/dev-qt/qttools/qttools-6.7.1.ebuild
index cb5d463ddc63..b00cc875577e 100644
--- a/dev-qt/qttools/qttools-6.7.1.ebuild
+++ b/dev-qt/qttools/qttools-6.7.1.ebuild
@@ -16,7 +16,7 @@ inherit desktop llvm-r1 optfeature qt6-build
 DESCRIPTION="Qt Tools Collection"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE="
diff --git a/dev-qt/qttranslations/qttranslations-6.7.1.ebuild b/dev-qt/qttranslations/qttranslations-6.7.1.ebuild
index 388783a3f00e..f4c597c04812 100644
--- a/dev-qt/qttranslations/qttranslations-6.7.1.ebuild
+++ b/dev-qt/qttranslations/qttranslations-6.7.1.ebuild
@@ -9,7 +9,7 @@ inherit qt6-build
 DESCRIPTION="Translation files for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86"
 fi
 
 DEPEND="~dev-qt/qtbase-${PV}:6"
diff --git a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-6.7.1.ebuild b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-6.7.1.ebuild
index 67b682b52842..750b938eb651 100644
--- a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-6.7.1.ebuild
+++ b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-6.7.1.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Customizable input framework and virtual keyboard for Qt"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 ~loong ~riscv x86"
+	KEYWORDS="amd64 arm arm64 ~loong ~riscv x86"
 fi
 
 IUSE="+spell"
diff --git a/dev-qt/qtwayland/qtwayland-6.7.1.ebuild b/dev-qt/qtwayland/qtwayland-6.7.1.ebuild
index db818b46ad53..e9e5a4004120 100644
--- a/dev-qt/qtwayland/qtwayland-6.7.1.ebuild
+++ b/dev-qt/qtwayland/qtwayland-6.7.1.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Wayland platform plugin for Qt"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 ~loong ~ppc ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE="accessibility compositor qml vulkan"
diff --git a/dev-qt/qtwebchannel/qtwebchannel-6.7.1.ebuild b/dev-qt/qtwebchannel/qtwebchannel-6.7.1.ebuild
index 092447b546c8..4a114a17039b 100644
--- a/dev-qt/qtwebchannel/qtwebchannel-6.7.1.ebuild
+++ b/dev-qt/qtwebchannel/qtwebchannel-6.7.1.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Qt WebChannel"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 ~loong ~ppc ~riscv x86"
+	KEYWORDS="amd64 arm arm64 ~loong ~ppc ~riscv x86"
 fi
 
 IUSE="qml"
diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.1.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.1.ebuild
index 75985162ac1c..9191f4cdc4da 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7.1.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI+="
 "
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm64"
+	KEYWORDS="amd64 arm64"
 fi
 
 IUSE="
diff --git a/dev-qt/qtwebsockets/qtwebsockets-6.7.1.ebuild b/dev-qt/qtwebsockets/qtwebsockets-6.7.1.ebuild
index bb56820e9762..e0d2d0094da1 100644
--- a/dev-qt/qtwebsockets/qtwebsockets-6.7.1.ebuild
+++ b/dev-qt/qtwebsockets/qtwebsockets-6.7.1.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Implementation of the WebSocket protocol for the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 ~hppa ~loong ~ppc ~riscv x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ~riscv x86"
 fi
 
 IUSE="qml +ssl"
diff --git a/dev-qt/qtwebview/qtwebview-6.7.1.ebuild b/dev-qt/qtwebview/qtwebview-6.7.1.ebuild
index 9e7e9d36e4ab..39a6aa99e416 100644
--- a/dev-qt/qtwebview/qtwebview-6.7.1.ebuild
+++ b/dev-qt/qtwebview/qtwebview-6.7.1.ebuild
@@ -8,7 +8,7 @@ inherit qt6-build
 DESCRIPTION="Module for displaying web content in a QML application using the Qt6 framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm64"
+	KEYWORDS="amd64 arm64"
 fi
 
 RDEPEND="
diff --git a/dev-ruby/childprocess/childprocess-5.0.0.ebuild b/dev-ruby/childprocess/childprocess-5.0.0.ebuild
index b037b6ac9eec..6b79d906a3c5 100644
--- a/dev-ruby/childprocess/childprocess-5.0.0.ebuild
+++ b/dev-ruby/childprocess/childprocess-5.0.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/enkessler/childprocess"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ~ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/ffi-1.0.11"
diff --git a/dev-ruby/rspec-core/rspec-core-3.13.0.ebuild b/dev-ruby/rspec-core/rspec-core-3.13.0.ebuild
index a7e4e8181421..02d57ba11782 100644
--- a/dev-ruby/rspec-core/rspec-core-3.13.0.ebuild
+++ b/dev-ruby/rspec-core/rspec-core-3.13.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-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="highlight test"
 
 SUBVERSION="$(ver_cut 1-2)"
diff --git a/dev-ruby/rspec-expectations/rspec-expectations-3.13.0.ebuild b/dev-ruby/rspec-expectations/rspec-expectations-3.13.0.ebuild
index 49654865096a..da99fac8e53d 100644
--- a/dev-ruby/rspec-expectations/rspec-expectations-3.13.0.ebuild
+++ b/dev-ruby/rspec-expectations/rspec-expectations-3.13.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-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="test"
 
 SUBVERSION="$(ver_cut 1-2)"
diff --git a/dev-ruby/rspec-mocks/rspec-mocks-3.13.1.ebuild b/dev-ruby/rspec-mocks/rspec-mocks-3.13.1.ebuild
index fe1a04f3e368..2fb83c31eda9 100644
--- a/dev-ruby/rspec-mocks/rspec-mocks-3.13.1.ebuild
+++ b/dev-ruby/rspec-mocks/rspec-mocks-3.13.1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-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="test"
 
 SUBVERSION="$(ver_cut 1-2)"
diff --git a/dev-ruby/rspec-support/rspec-support-3.13.1.ebuild b/dev-ruby/rspec-support/rspec-support-3.13.1.ebuild
index ac05eb8e862c..85ee17e5830b 100644
--- a/dev-ruby/rspec-support/rspec-support-3.13.1.ebuild
+++ b/dev-ruby/rspec-support/rspec-support-3.13.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-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="test"
 
 ruby_add_bdepend "test? ( >=dev-ruby/rspec-3.9.0:3 >=dev-ruby/thread_order-1.1.0 )"
diff --git a/dev-ruby/rspec/rspec-3.13.0.ebuild b/dev-ruby/rspec/rspec-3.13.0.ebuild
index 391b9bacae47..58cb7312f0cd 100644
--- a/dev-ruby/rspec/rspec-3.13.0.ebuild
+++ b/dev-ruby/rspec/rspec-3.13.0.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/rspec/rspec"
 
 LICENSE="MIT"
 SLOT="3"
-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"
 
 SUBVERSION="$(ver_cut 1-2)"
 
diff --git a/dev-ruby/sqlite3/sqlite3-1.7.3.ebuild b/dev-ruby/sqlite3/sqlite3-1.7.3.ebuild
index 437c4cc99326..d0098c536183 100644
--- a/dev-ruby/sqlite3/sqlite3-1.7.3.ebuild
+++ b/dev-ruby/sqlite3/sqlite3-1.7.3.ebuild
@@ -18,7 +18,7 @@ DESCRIPTION="An extension library to access a SQLite database from Ruby"
 HOMEPAGE="https://github.com/sparklemotion/sqlite3-ruby"
 LICENSE="BSD"
 
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 SLOT="0"
 IUSE="doc test"
 
diff --git a/dev-util/cppcheck/cppcheck-2.13.0.ebuild b/dev-util/cppcheck/cppcheck-2.13.0.ebuild
index c8ff44651195..71c678e92cc5 100644
--- a/dev-util/cppcheck/cppcheck-2.13.0.ebuild
+++ b/dev-util/cppcheck/cppcheck-2.13.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/danmar/cppcheck/archive/refs/tags/${PV}.tar.gz -> ${
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv ~x86"
 IUSE="charts gui qt6 htmlreport pcre test threads"
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
diff --git a/dev-vcs/git/git-2.39.5.ebuild b/dev-vcs/git/git-2.39.5.ebuild
index 362bc6ebc4f9..f932bb0a2f5e 100644
--- a/dev-vcs/git/git-2.39.5.ebuild
+++ b/dev-vcs/git/git-2.39.5.ebuild
@@ -50,7 +50,7 @@ if [[ ${PV} != *9999 ]]; then
 	SRC_URI+=" doc? ( ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} )"
 
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~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 ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 	fi
 fi
 
diff --git a/dev-vcs/git/git-2.43.5.ebuild b/dev-vcs/git/git-2.43.5.ebuild
index 25092fa19b5b..47b4f773c026 100644
--- a/dev-vcs/git/git-2.43.5.ebuild
+++ b/dev-vcs/git/git-2.43.5.ebuild
@@ -50,7 +50,7 @@ if [[ ${PV} != *9999 ]]; then
 	SRC_URI+=" doc? ( ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} )"
 
 	if [[ ${PV} != *_rc* ]] ; then
-		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"
 	fi
 fi
 
diff --git a/dev-vcs/mercurial/mercurial-6.6.2.ebuild b/dev-vcs/mercurial/mercurial-6.6.2.ebuild
index 14955c8234f6..c122a1e7154e 100644
--- a/dev-vcs/mercurial/mercurial-6.6.2.ebuild
+++ b/dev-vcs/mercurial/mercurial-6.6.2.ebuild
@@ -181,7 +181,7 @@ LICENSE="GPL-2+
 	rust? (
 		0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD Boost-1.0 MIT MPL-2.0 PSF-2 Unicode-DFS-2016 Unlicense ZLIB )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~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 x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="+chg emacs gpg test tk rust"
 
 BDEPEND="rust? ( ${RUST_DEPEND} )"
diff --git a/media-fonts/noto/noto-20240430.ebuild b/media-fonts/noto/noto-20240430.ebuild
index 1bf8a7432370..27a2170cac63 100644
--- a/media-fonts/noto/noto-20240430.ebuild
+++ b/media-fonts/noto/noto-20240430.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/notofonts/notofonts.github.io/archive/${COMMIT}.tar.
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ~ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
 # Extra allows to optionally reduce disk usage even returning to tofu
 # issue as described in https://fonts.google.com/noto
 IUSE="cjk +extra"
diff --git a/media-gfx/simple-scan/simple-scan-46.0.ebuild b/media-gfx/simple-scan/simple-scan-46.0.ebuild
index 5f3bd3dfab81..58f4ebe759f8 100644
--- a/media-gfx/simple-scan/simple-scan-46.0.ebuild
+++ b/media-gfx/simple-scan/simple-scan-46.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/simple-scan"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~riscv x86"
 IUSE="colord webp"
 
 DEPEND="
diff --git a/media-sound/lash/lash-0.5.4-r6.ebuild b/media-sound/lash/lash-0.5.4-r6.ebuild
index 7bfcd922bfa8..50c2e07fd925 100644
--- a/media-sound/lash/lash-0.5.4-r6.ebuild
+++ b/media-sound/lash/lash-0.5.4-r6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ~ppc64 ~riscv sparc x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv sparc x86"
 IUSE="alsa debug gtk python static-libs" # doc
 
 BDEPEND="
diff --git a/media-sound/qsynth/qsynth-0.9.91.ebuild b/media-sound/qsynth/qsynth-0.9.91.ebuild
index d43d29694748..e030f127d687 100644
--- a/media-sound/qsynth/qsynth-0.9.91.ebuild
+++ b/media-sound/qsynth/qsynth-0.9.91.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://downloads.sourceforge.net/qsynth/${P}.tar.gz"
-	KEYWORDS="amd64 ppc ~ppc64 x86"
+	KEYWORDS="amd64 ppc ppc64 x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-analyzer/wireshark/wireshark-4.0.15.ebuild b/net-analyzer/wireshark/wireshark-4.0.15.ebuild
index 7dfb89f2d31c..f3715b72f3e7 100644
--- a/net-analyzer/wireshark/wireshark-4.0.15.ebuild
+++ b/net-analyzer/wireshark/wireshark-4.0.15.ebuild
@@ -23,7 +23,7 @@ else
 	S="${WORKDIR}/${P/_/}"
 
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc64 ~riscv x86"
+		KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc64 ~riscv x86"
 	fi
 fi
 
diff --git a/net-dns/idnkit/idnkit-2.3-r1.ebuild b/net-dns/idnkit/idnkit-2.3-r1.ebuild
index ddaa8c2c4f00..5d3c02c28776 100644
--- a/net-dns/idnkit/idnkit-2.3-r1.ebuild
+++ b/net-dns/idnkit/idnkit-2.3-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://jprs.co.jp/idn/${P}.tar.bz2"
 
 LICENSE="JPRS"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="liteonly"
 RESTRICT="test"
 
diff --git a/net-ftp/ncftp/ncftp-3.2.7-r2.ebuild b/net-ftp/ncftp/ncftp-3.2.7-r2.ebuild
index a0963db220d5..7a116d80d69f 100644
--- a/net-ftp/ncftp/ncftp-3.2.7-r2.ebuild
+++ b/net-ftp/ncftp/ncftp-3.2.7-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.ncftp.com/public_ftp/${PN}/${P}-src.tar.xz"
 
 LICENSE="Clarified-Artistic"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos"
 IUSE="pch"
 
 DEPEND="
diff --git a/net-im/pidgin/pidgin-2.14.13.ebuild b/net-im/pidgin/pidgin-2.14.13.ebuild
index c3b286a3a238..ffe76a5b51c5 100644
--- a/net-im/pidgin/pidgin-2.14.13.ebuild
+++ b/net-im/pidgin/pidgin-2.14.13.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0/2" # libpurple version
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~loong ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 # The new gui useflag depends on the gtk useflag, as most pidgin plugins depend
 # on the gtk flag. As soon as all plugins have been updated to use the new
 # gui flag, the gtk flag can get removed.
diff --git a/net-libs/serf/serf-1.3.10.ebuild b/net-libs/serf/serf-1.3.10.ebuild
index c7e7d9ad5e07..4496a28008e8 100644
--- a/net-libs/serf/serf-1.3.10.ebuild
+++ b/net-libs/serf/serf-1.3.10.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://apache/${PN}/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~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 ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="kerberos"
 # Many test failures.
 RESTRICT="test"
diff --git a/net-nds/openldap/openldap-2.6.4-r3.ebuild b/net-nds/openldap/openldap-2.6.4-r3.ebuild
index cba05d444128..c151ba02fdc5 100644
--- a/net-nds/openldap/openldap-2.6.4-r3.ebuild
+++ b/net-nds/openldap/openldap-2.6.4-r3.ebuild
@@ -26,7 +26,7 @@ S="${WORKDIR}"/${PN}-OPENLDAP_REL_ENG_${MY_PV}
 LICENSE="OPENLDAP GPL-2"
 # Subslot added for bug #835654
 SLOT="0/$(ver_cut 1-2)"
-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_DAEMON="argon2 +cleartext crypt experimental minimal samba tcpd"
 IUSE_OVERLAY="overlays perl autoca"
diff --git a/net-print/hplip/hplip-3.23.12-r3.ebuild b/net-print/hplip/hplip-3.23.12-r3.ebuild
index ac3b85848605..334bc12d73c9 100644
--- a/net-print/hplip/hplip-3.23.12-r3.ebuild
+++ b/net-print/hplip/hplip-3.23.12-r3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PN}/${PV}/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc ppc64 x86"
 
 IUSE="doc fax +hpcups hpijs kde libnotify libusb0 minimal parport policykit qt5 scanner +snmp static-ppds X"
 
diff --git a/net-vpn/openvpn/openvpn-2.6.9.ebuild b/net-vpn/openvpn/openvpn-2.6.9.ebuild
index 58f25f892c8a..a454e266b420 100644
--- a/net-vpn/openvpn/openvpn-2.6.9.ebuild
+++ b/net-vpn/openvpn/openvpn-2.6.9.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://build.openvpn.net/downloads/releases/${P}.tar.gz"
-	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"
 fi
 
 LICENSE="GPL-2"
diff --git a/sci-astronomy/stellarium/stellarium-24.1.ebuild b/sci-astronomy/stellarium/stellarium-24.1.ebuild
index 1820bdef0de0..5065b8b36107 100644
--- a/sci-astronomy/stellarium/stellarium-24.1.ebuild
+++ b/sci-astronomy/stellarium/stellarium-24.1.ebuild
@@ -33,7 +33,7 @@ SRC_URI="
 
 LICENSE="GPL-2+ SGI-B-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~ppc ppc64 ~riscv ~x86"
 IUSE="debug deep-sky doc gps +lens-distortion media nls qt6 +scripting +show-my-sky stars telescope test webengine +xlsx"
 
 # Python interpreter is used while building RemoteControl plugin
diff --git a/sys-apps/dbus-broker/dbus-broker-36.ebuild b/sys-apps/dbus-broker/dbus-broker-36.ebuild
index 9b567317a1b0..a5799ed9f4c4 100644
--- a/sys-apps/dbus-broker/dbus-broker-36.ebuild
+++ b/sys-apps/dbus-broker/dbus-broker-36.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/bus1/dbus-broker.git"
 else
 	SRC_URI="https://github.com/bus1/${PN}/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv"
+	KEYWORDS="amd64 arm64 ~loong ppc64 ~riscv"
 fi
 
 DESCRIPTION="Linux D-Bus Message Broker"
diff --git a/sys-auth/polkit/polkit-124-r1.ebuild b/sys-auth/polkit/polkit-124-r1.ebuild
index 4c81ceeb4ef9..93c8e6eaf48b 100644
--- a/sys-auth/polkit/polkit-124-r1.ebuild
+++ b/sys-auth/polkit/polkit-124-r1.ebuild
@@ -22,7 +22,7 @@ fi
 
 LICENSE="LGPL-2"
 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"
 IUSE="+daemon +duktape examples gtk +introspection kde pam selinux systemd test"
 RESTRICT="!test? ( test )"
 
diff --git a/x11-apps/xconsole/xconsole-1.1.0.ebuild b/x11-apps/xconsole/xconsole-1.1.0.ebuild
index a96c41f2d9ee..67daa07451b6 100644
--- a/x11-apps/xconsole/xconsole-1.1.0.ebuild
+++ b/x11-apps/xconsole/xconsole-1.1.0.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="monitor system console messages with X"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	x11-libs/libXaw
diff --git a/x11-misc/gammastep/gammastep-2.0.9-r2.ebuild b/x11-misc/gammastep/gammastep-2.0.9-r2.ebuild
index 15c7f17ff67d..ab2bd2c3b9ea 100644
--- a/x11-misc/gammastep/gammastep-2.0.9-r2.ebuild
+++ b/x11-misc/gammastep/gammastep-2.0.9-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://gitlab.com/chinstrap/gammastep/-/archive/v${PV}/gammastep-v${PV
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ppc64 ~x86"
 IUSE="appindicator geoclue gtk nls wayland"
 
 COMMON_DEPEND=">=x11-libs/libX11-1.4
diff --git a/x11-misc/redshift/redshift-1.12-r11.ebuild b/x11-misc/redshift/redshift-1.12-r11.ebuild
index ac07d75dcb04..cba0bd3c1a6b 100644
--- a/x11-misc/redshift/redshift-1.12-r11.ebuild
+++ b/x11-misc/redshift/redshift-1.12-r11.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/jonls/${PN}/releases/download/v${PV}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
+KEYWORDS="amd64 arm64 ppc64 ~riscv x86"
 IUSE="appindicator geoclue gtk nls"
 
 COMMON_DEPEND=">=x11-libs/libX11-1.4
diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-9.31-r3.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-9.31-r3.ebuild
index 8cb229a8e4c8..9dba422b68bc 100644
--- a/x11-terms/rxvt-unicode/rxvt-unicode-9.31-r3.ebuild
+++ b/x11-terms/rxvt-unicode/rxvt-unicode-9.31-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://dist.schmorp.de/rxvt-unicode/Attic/${P}.tar.bz2
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 IUSE="24-bit-color 256-color blink fading-colors +font-styles gdk-pixbuf iso14755 +mousewheel
 	perl startup-notification unicode3 wide-glyphs xft"