Merge updates from master

33 files changed, 33 insertions, 33 deletions

diff --git a/app-misc/jq/jq-1.7.ebuild b/app-misc/jq/jq-1.7.ebuild
index 500b8e49ae5d..53771f0bb061 100644
--- a/app-misc/jq/jq-1.7.ebuild
+++ b/app-misc/jq/jq-1.7.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${MY_P}"
 
 LICENSE="MIT CC-BY-3.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="+oniguruma static-libs test"
 
 ONIGURUMA_MINPV='>=dev-libs/oniguruma-6.9.3' # Keep this in sync with bundled modules/oniguruma/
diff --git a/dev-libs/c-blosc/c-blosc-1.21.5.ebuild b/dev-libs/c-blosc/c-blosc-1.21.5.ebuild
index bfeb84b2d188..0a9536f34cc9 100644
--- a/dev-libs/c-blosc/c-blosc-1.21.5.ebuild
+++ b/dev-libs/c-blosc/c-blosc-1.21.5.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0/1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="+lz4 +snappy test zlib zstd"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libgit2/libgit2-1.7.1.ebuild b/dev-libs/libgit2/libgit2-1.7.1.ebuild
index 50aed827902c..070462e2655e 100644
--- a/dev-libs/libgit2/libgit2-1.7.1.ebuild
+++ b/dev-libs/libgit2/libgit2-1.7.1.ebuild
@@ -16,7 +16,7 @@ S=${WORKDIR}/${P/_/-}
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~ppc-macos"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~ppc-macos"
 IUSE="examples gssapi +ssh test +threads trace"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/aiohttp-socks/aiohttp-socks-0.8.3.ebuild b/dev-python/aiohttp-socks/aiohttp-socks-0.8.3.ebuild
index 2224b12703c0..be5ce72d8255 100644
--- a/dev-python/aiohttp-socks/aiohttp-socks-0.8.3.ebuild
+++ b/dev-python/aiohttp-socks/aiohttp-socks-0.8.3.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	>=dev-python/aiohttp-2.3.2[${PYTHON_USEDEP}]
diff --git a/dev-python/asttokens/asttokens-2.4.0.ebuild b/dev-python/asttokens/asttokens-2.4.0.ebuild
index 8637bf9ebdfa..696c30fdecec 100644
--- a/dev-python/asttokens/asttokens-2.4.0.ebuild
+++ b/dev-python/asttokens/asttokens-2.4.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
+KEYWORDS="~amd64 arm arm64 hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
 
 RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
diff --git a/dev-python/async-lru/async-lru-2.0.4.ebuild b/dev-python/async-lru/async-lru-2.0.4.ebuild
index 306ca5c015e6..537db5699ec0 100644
--- a/dev-python/async-lru/async-lru-2.0.4.ebuild
+++ b/dev-python/async-lru/async-lru-2.0.4.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/dulwich/dulwich-0.21.6.ebuild b/dev-python/dulwich/dulwich-0.21.6.ebuild
index b27e3191d937..01b0ebabaca5 100644
--- a/dev-python/dulwich/dulwich-0.21.6.ebuild
+++ b/dev-python/dulwich/dulwich-0.21.6.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="GPL-2+ Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/fsspec/fsspec-2023.9.2.ebuild b/dev-python/fsspec/fsspec-2023.9.2.ebuild
index 5e5f5057b1a9..142e195a6f58 100644
--- a/dev-python/fsspec/fsspec-2023.9.2.ebuild
+++ b/dev-python/fsspec/fsspec-2023.9.2.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/hatch-jupyter-builder/hatch-jupyter-builder-0.8.3.ebuild b/dev-python/hatch-jupyter-builder/hatch-jupyter-builder-0.8.3.ebuild
index 6faee3d97d1f..51bd5255de9b 100644
--- a/dev-python/hatch-jupyter-builder/hatch-jupyter-builder-0.8.3.ebuild
+++ b/dev-python/hatch-jupyter-builder/hatch-jupyter-builder-0.8.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
 
 RDEPEND="
 	dev-python/hatchling[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyter-lsp/jupyter-lsp-2.2.0.ebuild b/dev-python/jupyter-lsp/jupyter-lsp-2.2.0.ebuild
index 6ba71aa85a2c..4faf6bffa320 100644
--- a/dev-python/jupyter-lsp/jupyter-lsp-2.2.0.ebuild
+++ b/dev-python/jupyter-lsp/jupyter-lsp-2.2.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
 
 RDEPEND="
 	dev-python/entrypoints[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyterlab/jupyterlab-4.0.6.ebuild b/dev-python/jupyterlab/jupyterlab-4.0.6.ebuild
index a329291d6048..3ee8e2895780 100644
--- a/dev-python/jupyterlab/jupyterlab-4.0.6.ebuild
+++ b/dev-python/jupyterlab/jupyterlab-4.0.6.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD MIT GPL-3 Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
 
 RDEPEND="
 	dev-python/async-lru[${PYTHON_USEDEP}]
diff --git a/dev-python/lxml/lxml-4.9.3-r1.ebuild b/dev-python/lxml/lxml-4.9.3-r1.ebuild
index ec7a40a513fa..04ad1c499b4c 100644
--- a/dev-python/lxml/lxml-4.9.3-r1.ebuild
+++ b/dev-python/lxml/lxml-4.9.3-r1.ebuild
@@ -24,7 +24,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/meson-python/meson-python-0.14.0.ebuild b/dev-python/meson-python/meson-python-0.14.0.ebuild
index 45e948ce9d95..7c9f38660787 100644
--- a/dev-python/meson-python/meson-python-0.14.0.ebuild
+++ b/dev-python/meson-python/meson-python-0.14.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~arm64-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~arm64-macos ~x64-macos"
 
 RDEPEND="
 	>=dev-python/pyproject-metadata-0.7.1[${PYTHON_USEDEP}]
diff --git a/dev-python/notebook/notebook-7.0.3.ebuild b/dev-python/notebook/notebook-7.0.3.ebuild
index 955c05ae6c3e..42aac0e4a948 100644
--- a/dev-python/notebook/notebook-7.0.3.ebuild
+++ b/dev-python/notebook/notebook-7.0.3.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
 
 RDEPEND="
 	>=dev-python/jupyter-server-2.4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/notebook/notebook-7.0.4.ebuild b/dev-python/notebook/notebook-7.0.4.ebuild
index 991606132cdb..05a9ca389780 100644
--- a/dev-python/notebook/notebook-7.0.4.ebuild
+++ b/dev-python/notebook/notebook-7.0.4.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
 
 RDEPEND="
 	>=dev-python/jupyter-server-2.4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pandas/pandas-1.5.3.ebuild b/dev-python/pandas/pandas-1.5.3.ebuild
index 88420c150678..d9e03a205cfb 100644
--- a/dev-python/pandas/pandas-1.5.3.ebuild
+++ b/dev-python/pandas/pandas-1.5.3.ebuild
@@ -24,7 +24,7 @@ S=${WORKDIR}/${P/_/}
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="doc full-support minimal test X"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pandas/pandas-2.0.3-r1.ebuild b/dev-python/pandas/pandas-2.0.3-r1.ebuild
index 5502033f33c3..0ea5fa5c5cfe 100644
--- a/dev-python/pandas/pandas-2.0.3-r1.ebuild
+++ b/dev-python/pandas/pandas-2.0.3-r1.ebuild
@@ -25,7 +25,7 @@ S=${WORKDIR}/${P/_/}
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~x86 ~arm64-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~x86 ~arm64-macos ~x64-macos"
 IUSE="doc full-support minimal test X"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pikepdf/pikepdf-8.4.1.ebuild b/dev-python/pikepdf/pikepdf-8.4.1.ebuild
index 07c12370f871..0253d7861e17 100644
--- a/dev-python/pikepdf/pikepdf-8.4.1.ebuild
+++ b/dev-python/pikepdf/pikepdf-8.4.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MPL-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"
 
 # Check QPDF_MIN_VERSION in pyproject.toml on bumps, as well as
 # https://qpdf.readthedocs.io/en/stable/release-notes.html.
diff --git a/dev-python/python-cinderclient/python-cinderclient-9.4.0.ebuild b/dev-python/python-cinderclient/python-cinderclient-9.4.0.ebuild
index d6da6c25c341..bf305a5e6b34 100644
--- a/dev-python/python-cinderclient/python-cinderclient-9.4.0.ebuild
+++ b/dev-python/python-cinderclient/python-cinderclient-9.4.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/keystoneauth1-4.3.1[${PYTHON_USEDEP}]
diff --git a/dev-python/reedsolo/reedsolo-2.1.1_beta1-r1.ebuild b/dev-python/reedsolo/reedsolo-2.1.1_beta1-r1.ebuild
index 715acdcf1fbf..d3144ac6c9ba 100644
--- a/dev-python/reedsolo/reedsolo-2.1.1_beta1-r1.ebuild
+++ b/dev-python/reedsolo/reedsolo-2.1.1_beta1-r1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="|| ( Unlicense MIT-0 )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 IUSE="+native-extensions"
 
 distutils_enable_tests pytest
diff --git a/dev-python/requests-cache/requests-cache-1.1.0.ebuild b/dev-python/requests-cache/requests-cache-1.1.0.ebuild
index 91e80a3dbae9..d63dd86b18da 100644
--- a/dev-python/requests-cache/requests-cache-1.1.0.ebuild
+++ b/dev-python/requests-cache/requests-cache-1.1.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv x86"
+KEYWORDS="amd64 arm ~arm64 ~loong ~ppc64 ~riscv x86"
 
 RDEPEND="
 	dev-python/attrs[${PYTHON_USEDEP}]
diff --git a/dev-python/rpds-py/rpds-py-0.10.3.ebuild b/dev-python/rpds-py/rpds-py-0.10.3.ebuild
index 2c5d8bd28563..c4eb801015d4 100644
--- a/dev-python/rpds-py/rpds-py-0.10.3.ebuild
+++ b/dev-python/rpds-py/rpds-py-0.10.3.ebuild
@@ -63,7 +63,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"
 
 QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/rpds/rpds.*.so"
 
diff --git a/dev-python/sphinx/sphinx-7.2.6.ebuild b/dev-python/sphinx/sphinx-7.2.6.ebuild
index 64c8ee42ce53..8b4651d984c4 100644
--- a/dev-python/sphinx/sphinx-7.2.6.ebuild
+++ b/dev-python/sphinx/sphinx-7.2.6.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="BSD-2"
 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"
 IUSE="doc latex"
 
 RDEPEND="
diff --git a/dev-python/statsmodels/statsmodels-0.14.0.ebuild b/dev-python/statsmodels/statsmodels-0.14.0.ebuild
index ffb0bd68b6e9..6bbcb30de1e9 100644
--- a/dev-python/statsmodels/statsmodels-0.14.0.ebuild
+++ b/dev-python/statsmodels/statsmodels-0.14.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~ia64 ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 DEPEND="
diff --git a/dev-python/twisted/twisted-22.10.0-r3.ebuild b/dev-python/twisted/twisted-22.10.0-r3.ebuild
index b678b28eafcf..5fe05daf9152 100644
--- a/dev-python/twisted/twisted-22.10.0-r3.ebuild
+++ b/dev-python/twisted/twisted-22.10.0-r3.ebuild
@@ -20,7 +20,7 @@ S=${WORKDIR}/${PN}-${P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
 IUSE="conch http2 serial ssl test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/twisted/twisted-23.8.0.ebuild b/dev-python/twisted/twisted-23.8.0.ebuild
index 8d8f1e807f6a..163bd671d999 100644
--- a/dev-python/twisted/twisted-23.8.0.ebuild
+++ b/dev-python/twisted/twisted-23.8.0.ebuild
@@ -22,7 +22,7 @@ SRC_URI+="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
 IUSE="conch http2 serial ssl test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/tzdata/tzdata-9999.ebuild b/dev-python/tzdata/tzdata-9999.ebuild
index 42001246e79f..9ad4c8c83223 100644
--- a/dev-python/tzdata/tzdata-9999.ebuild
+++ b/dev-python/tzdata/tzdata-9999.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://peps.python.org/pep-0615/"
 
 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"
 
 RDEPEND="
 	sys-libs/timezone-data
diff --git a/dev-python/url-normalize/url-normalize-1.4.3-r1.ebuild b/dev-python/url-normalize/url-normalize-1.4.3-r1.ebuild
index c08364802418..1ff9be053798 100644
--- a/dev-python/url-normalize/url-normalize-1.4.3-r1.ebuild
+++ b/dev-python/url-normalize/url-normalize-1.4.3-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv x86"
+KEYWORDS="amd64 arm ~arm64 ~loong ~ppc64 ~riscv x86"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/wsaccel/wsaccel-0.6.6.ebuild b/dev-python/wsaccel/wsaccel-0.6.6.ebuild
index 28c4e7fd75a1..db860afed55a 100644
--- a/dev-python/wsaccel/wsaccel-0.6.6.ebuild
+++ b/dev-python/wsaccel/wsaccel-0.6.6.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 SLOT="0"
 LICENSE="Apache-2.0"
-KEYWORDS="~amd64 arm ~arm64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 arm arm64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="
 	dev-python/cython[${PYTHON_USEDEP}]
diff --git a/xfce-base/thunar/thunar-4.18.7.ebuild b/xfce-base/thunar/thunar-4.18.7.ebuild
index dfcd393d8422..ede9c64d86e3 100644
--- a/xfce-base/thunar/thunar-4.18.7.ebuild
+++ b/xfce-base/thunar/thunar-4.18.7.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0/3"
-KEYWORDS="~alpha ~amd64 arm arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="exif introspection libnotify pcre +trash-panel-plugin udisks"
 
 DEPEND="
diff --git a/xfce-base/xfce4-panel/xfce4-panel-4.18.5.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.18.5.ebuild
index d568aaab1ba7..f4eae44057e8 100644
--- a/xfce-base/xfce4-panel/xfce4-panel-4.18.5.ebuild
+++ b/xfce-base/xfce4-panel/xfce4-panel-4.18.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 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="+dbusmenu introspection vala"
 REQUIRED_USE="vala? ( introspection )"
 
diff --git a/xfce-extra/xfce4-clipman-plugin/xfce4-clipman-plugin-1.6.5.ebuild b/xfce-extra/xfce4-clipman-plugin/xfce4-clipman-plugin-1.6.5.ebuild
index 6b577820744b..71dc220f6861 100644
--- a/xfce-extra/xfce4-clipman-plugin/xfce4-clipman-plugin-1.6.5.ebuild
+++ b/xfce-extra/xfce4-clipman-plugin/xfce4-clipman-plugin-1.6.5.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="X qrcode wayland"
 
 DEPEND="
diff --git a/xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-1.2.8.ebuild b/xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-1.2.8.ebuild
index 952e3decb840..1cb960308f74 100644
--- a/xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-1.2.8.ebuild
+++ b/xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-1.2.8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="BSD-2 GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
 	>=dev-libs/glib-2.50