Merge updates from master

39 files changed, 42 insertions, 42 deletions

diff --git a/app-admin/awscli/awscli-1.32.49.ebuild b/app-admin/awscli/awscli-1.32.49.ebuild
index 4a677affdbc4..b7c9ceb6d88f 100644
--- a/app-admin/awscli/awscli-1.32.49.ebuild
+++ b/app-admin/awscli/awscli-1.32.49.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86"
 
 # botocore is x.(y+2).z
 BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
diff --git a/app-arch/libarchive/libarchive-3.7.2-r2.ebuild b/app-arch/libarchive/libarchive-3.7.2-r2.ebuild
index 690f6b400ac8..5d5523f3066f 100644
--- a/app-arch/libarchive/libarchive-3.7.2-r2.ebuild
+++ b/app-arch/libarchive/libarchive-3.7.2-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="BSD BSD-2 BSD-4 public-domain"
 SLOT="0/13"
-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="
 	acl blake2 +bzip2 +e2fsprogs expat +iconv lz4 +lzma lzo nettle
 	static-libs test xattr zstd
diff --git a/app-editors/mousepad/mousepad-0.6.2.ebuild b/app-editors/mousepad/mousepad-0.6.2.ebuild
index 8a7c7a985021..7e6e7e6466fe 100644
--- a/app-editors/mousepad/mousepad-0.6.2.ebuild
+++ b/app-editors/mousepad/mousepad-0.6.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm ~arm64 ~ia64 ~loong ~ppc ppc64 ~riscv x86"
 IUSE="policykit spell +shortcuts"
 
 DEPEND="
diff --git a/dev-python/boto3/boto3-1.34.49.ebuild b/dev-python/boto3/boto3-1.34.49.ebuild
index b64e7191fd19..2a35a5b9c0d0 100644
--- a/dev-python/boto3/boto3-1.34.49.ebuild
+++ b/dev-python/boto3/boto3-1.34.49.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/botocore-${PV}[${PYTHON_USEDEP}]
diff --git a/dev-python/botocore/botocore-1.34.49.ebuild b/dev-python/botocore/botocore-1.34.49.ebuild
index ba6cd2a5d2a2..7a44b043295f 100644
--- a/dev-python/botocore/botocore-1.34.49.ebuild
+++ b/dev-python/botocore/botocore-1.34.49.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	<dev-python/jmespath-2[${PYTHON_USEDEP}]
diff --git a/dev-python/cliff/cliff-4.6.0.ebuild b/dev-python/cliff/cliff-4.6.0.ebuild
index 285b66c49d90..c8436db6e065 100644
--- a/dev-python/cliff/cliff-4.6.0.ebuild
+++ b/dev-python/cliff/cliff-4.6.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/autopage-0.4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/coverage/coverage-7.4.3.ebuild b/dev-python/coverage/coverage-7.4.3.ebuild
index d7fb22bbd856..6cb1ef323e33 100644
--- a/dev-python/coverage/coverage-7.4.3.ebuild
+++ b/dev-python/coverage/coverage-7.4.3.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/debtcollector/debtcollector-3.0.0.ebuild b/dev-python/debtcollector/debtcollector-3.0.0.ebuild
index e778e9427b2d..6e7f4f545909 100644
--- a/dev-python/debtcollector/debtcollector-3.0.0.ebuild
+++ b/dev-python/debtcollector/debtcollector-3.0.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/wrapt-1.7.0[${PYTHON_USEDEP}]
diff --git a/dev-python/elasticsearch/elasticsearch-8.12.1.ebuild b/dev-python/elasticsearch/elasticsearch-8.12.1.ebuild
index 43bb4d8286ac..a82981a22028 100644
--- a/dev-python/elasticsearch/elasticsearch-8.12.1.ebuild
+++ b/dev-python/elasticsearch/elasticsearch-8.12.1.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0/$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 ~x86"
 
 RDEPEND="
 	<dev-python/aiohttp-4[${PYTHON_USEDEP}]
diff --git a/dev-python/ensurepip-setuptools/ensurepip-setuptools-69.1.1.ebuild b/dev-python/ensurepip-setuptools/ensurepip-setuptools-69.1.1.ebuild
index 97aca4a61872..56dcbec72238 100644
--- a/dev-python/ensurepip-setuptools/ensurepip-setuptools-69.1.1.ebuild
+++ b/dev-python/ensurepip-setuptools/ensurepip-setuptools-69.1.1.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/google-api-python-client/google-api-python-client-2.119.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.119.0.ebuild
index c5a2303ef5ac..c85cfb6d1745 100644
--- a/dev-python/google-api-python-client/google-api-python-client-2.119.0.ebuild
+++ b/dev-python/google-api-python-client/google-api-python-client-2.119.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 
 RDEPEND="
 	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
diff --git a/dev-python/keystoneauth1/keystoneauth1-5.6.0.ebuild b/dev-python/keystoneauth1/keystoneauth1-5.6.0.ebuild
index 520cf301a0bb..ed2cf6660439 100644
--- a/dev-python/keystoneauth1/keystoneauth1-5.6.0.ebuild
+++ b/dev-python/keystoneauth1/keystoneauth1-5.6.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/orjson/orjson-3.9.15.ebuild b/dev-python/orjson/orjson-3.9.15.ebuild
index 07049313d177..b300387bda68 100644
--- a/dev-python/orjson/orjson-3.9.15.ebuild
+++ b/dev-python/orjson/orjson-3.9.15.ebuild
@@ -70,7 +70,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"
 
 BDEPEND="
 	>=virtual/rust-1.72
diff --git a/dev-python/oslo-config/oslo-config-9.4.0.ebuild b/dev-python/oslo-config/oslo-config-9.4.0.ebuild
index 4d5e415463a5..8a5bbb36170a 100644
--- a/dev-python/oslo-config/oslo-config-9.4.0.ebuild
+++ b/dev-python/oslo-config/oslo-config-9.4.0.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/pbr-1.3[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-context/oslo-context-5.5.0.ebuild b/dev-python/oslo-context/oslo-context-5.5.0.ebuild
index a67ee6deeadd..e0b85a6c9c79 100644
--- a/dev-python/oslo-context/oslo-context-5.5.0.ebuild
+++ b/dev-python/oslo-context/oslo-context-5.5.0.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-i18n/oslo-i18n-6.3.0.ebuild b/dev-python/oslo-i18n/oslo-i18n-6.3.0.ebuild
index c578a7449021..2dc5bb3ea861 100644
--- a/dev-python/oslo-i18n/oslo-i18n-6.3.0.ebuild
+++ b/dev-python/oslo-i18n/oslo-i18n-6.3.0.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-log/oslo-log-5.5.0.ebuild b/dev-python/oslo-log/oslo-log-5.5.0.ebuild
index 54b6b6ddafc8..e63de4665b79 100644
--- a/dev-python/oslo-log/oslo-log-5.5.0.ebuild
+++ b/dev-python/oslo-log/oslo-log-5.5.0.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/pbr-3.1.1[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-serialization/oslo-serialization-5.4.0.ebuild b/dev-python/oslo-serialization/oslo-serialization-5.4.0.ebuild
index 3a806bd91546..19ada5c2ddc6 100644
--- a/dev-python/oslo-serialization/oslo-serialization-5.4.0.ebuild
+++ b/dev-python/oslo-serialization/oslo-serialization-5.4.0.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/msgpack-0.5.2[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-utils/oslo-utils-7.1.0.ebuild b/dev-python/oslo-utils/oslo-utils-7.1.0.ebuild
index 3a01dee2b2fc..f9e606e99301 100644
--- a/dev-python/oslo-utils/oslo-utils-7.1.0.ebuild
+++ b/dev-python/oslo-utils/oslo-utils-7.1.0.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
diff --git a/dev-python/prettytable/prettytable-3.10.0.ebuild b/dev-python/prettytable/prettytable-3.10.0.ebuild
index ea6a41c440a1..da5eee7bc662 100644
--- a/dev-python/prettytable/prettytable-3.10.0.ebuild
+++ b/dev-python/prettytable/prettytable-3.10.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/wcwidth[${PYTHON_USEDEP}]
diff --git a/dev-python/puremagic/puremagic-1.21.ebuild b/dev-python/puremagic/puremagic-1.21.ebuild
index e9212eebd43c..191a35734637 100644
--- a/dev-python/puremagic/puremagic-1.21.ebuild
+++ b/dev-python/puremagic/puremagic-1.21.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 DOCS=( CHANGELOG.md README.rst )
 
diff --git a/dev-python/pylint/pylint-3.0.4.ebuild b/dev-python/pylint/pylint-3.0.4.ebuild
index 036b20dedc71..7e31ce7cc0b9 100644
--- a/dev-python/pylint/pylint-3.0.4.ebuild
+++ b/dev-python/pylint/pylint-3.0.4.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-2"
 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="examples"
 
 # Make sure to check https://github.com/pylint-dev/pylint/blob/main/pyproject.toml#L34 on bumps
diff --git a/dev-python/pytest-home/pytest-home-0.5.1.ebuild b/dev-python/pytest-home/pytest-home-0.5.1.ebuild
index 5d54eea6bc7f..84418a65c968 100644
--- a/dev-python/pytest-home/pytest-home-0.5.1.ebuild
+++ b/dev-python/pytest-home/pytest-home-0.5.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	dev-python/pytest[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-lazy-fixtures/pytest-lazy-fixtures-1.0.5.ebuild b/dev-python/pytest-lazy-fixtures/pytest-lazy-fixtures-1.0.5.ebuild
index 7bcbae90deae..b62c708bfe26 100644
--- a/dev-python/pytest-lazy-fixtures/pytest-lazy-fixtures-1.0.5.ebuild
+++ b/dev-python/pytest-lazy-fixtures/pytest-lazy-fixtures-1.0.5.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/pytest-7[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-shell-utilities/pytest-shell-utilities-1.9.0.ebuild b/dev-python/pytest-shell-utilities/pytest-shell-utilities-1.9.0.ebuild
index 8700e30af1a1..c6d8c2dc29b4 100644
--- a/dev-python/pytest-shell-utilities/pytest-shell-utilities-1.9.0.ebuild
+++ b/dev-python/pytest-shell-utilities/pytest-shell-utilities-1.9.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/attrs-22.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-dbusmock/python-dbusmock-0.31.1.ebuild b/dev-python/python-dbusmock/python-dbusmock-0.31.1.ebuild
index 4915685b8472..1bb811a3f527 100644
--- a/dev-python/python-dbusmock/python-dbusmock-0.31.1.ebuild
+++ b/dev-python/python-dbusmock/python-dbusmock-0.31.1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="LGPL-3+"
 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="
 	dev-python/dbus-python[${PYTHON_USEDEP}]
diff --git a/dev-python/setuptools/setuptools-69.1.1.ebuild b/dev-python/setuptools/setuptools-69.1.1.ebuild
index 5d86dcb8a1e4..b0404c272e6d 100644
--- a/dev-python/setuptools/setuptools-69.1.1.ebuild
+++ b/dev-python/setuptools/setuptools-69.1.1.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/stripe/stripe-8.4.0.ebuild b/dev-python/stripe/stripe-8.4.0.ebuild
index 5ed0d9dd1b63..79c3e3bba170 100644
--- a/dev-python/stripe/stripe-8.4.0.ebuild
+++ b/dev-python/stripe/stripe-8.4.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="telemetry"
 
 RDEPEND="
diff --git a/dev-python/trimesh/trimesh-4.1.5.ebuild b/dev-python/trimesh/trimesh-4.1.5.ebuild
index f3f894583c89..c897b1b7aaa2 100644
--- a/dev-python/trimesh/trimesh-4.1.5.ebuild
+++ b/dev-python/trimesh/trimesh-4.1.5.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 ~x86"
 
 RDEPEND="
 	dev-python/chardet[${PYTHON_USEDEP}]
diff --git a/media-gfx/ristretto/ristretto-0.13.2.ebuild b/media-gfx/ristretto/ristretto-0.13.2.ebuild
index 947b3e2b0d7f..ab6c56cc0e64 100644
--- a/media-gfx/ristretto/ristretto-0.13.2.ebuild
+++ b/media-gfx/ristretto/ristretto-0.13.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86"
 
 DEPEND="
 	>=dev-libs/glib-2.56.0:2
diff --git a/media-libs/libjxl/libjxl-0.9.1-r1.ebuild b/media-libs/libjxl/libjxl-0.9.1-r1.ebuild
index 7fc55d455e4f..521e8e5b5653 100644
--- a/media-libs/libjxl/libjxl-0.9.1-r1.ebuild
+++ b/media-libs/libjxl/libjxl-0.9.1-r1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc x86"
 IUSE="gdk-pixbuf openexr test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-video/ffmpeg-chromium/ffmpeg-chromium-121.ebuild b/media-video/ffmpeg-chromium/ffmpeg-chromium-121.ebuild
index 3bb780532c13..b15c702a5284 100644
--- a/media-video/ffmpeg-chromium/ffmpeg-chromium-121.ebuild
+++ b/media-video/ffmpeg-chromium/ffmpeg-chromium-121.ebuild
@@ -16,7 +16,7 @@ LICENSE="
 	gpl? ( GPL-2 )
 "
 
-KEYWORDS="~amd64 ~arm ~arm64"
+KEYWORDS="amd64 ~arm ~arm64"
 
 # Options to use as use_enable in the foo[:bar] form.
 # This will feed configure with $(use_enable foo bar)
diff --git a/www-client/vivaldi/Manifest b/www-client/vivaldi/Manifest
index ba6e8600673d..dedcaf29cce1 100644
--- a/www-client/vivaldi/Manifest
+++ b/www-client/vivaldi/Manifest
@@ -1,6 +1,6 @@
-DIST vivaldi-stable_6.5.3206.63-1_amd64.deb 106985404 BLAKE2B a3a720324a1120300b568448eaf9dcb96cc6af35a53991adeee38846501a6c290e51b2952a7c06b67ffdc84d5612056cf92c5b8e77f745d136e3e7e67bd733bb SHA512 4cf7f791ddcfd57f544241653dcdc9d54c4954ee327eb0e278e1495492b0a24107b900f4eeef297e46aebe073f31984881bb603acdfac89953da91bfdd3a45b6
-DIST vivaldi-stable_6.5.3206.63-1_arm64.deb 100875736 BLAKE2B 4864c854cddb20defe6c82fbfddb31c71b83ecf687b8c41668f5ad0c8b11dd286e2ca921f02cf00abc4d32483fceac33a2a0f20b4e6a2de8c8572792b65a1eaa SHA512 a0b42957ff6afe62a37777dd0056391f317136b47c03286a30e444d6bab098d25323daf687d69d40104a33c1486a79fe073cab7ee87b9b4d8e9d5bf8bbf99715
-DIST vivaldi-stable_6.5.3206.63-1_armhf.deb 102288568 BLAKE2B a35396dc89834fb517b22a6559ef3208fc4a2f6fe96dc01774bf3976484aba55cd5287aac249f42748bb8dc617e5dd8901436f1f2ab669bd9ee3ee53933abecc SHA512 8e489226a3c0d72266fac1b52617253a63f0aca28a44a58077ef8c52f663a30b509d23aba6f98501dc7930526a8f098dd2a456f6ecb5b884db712255fbd78470
 DIST vivaldi-stable_6.6.3271.45-1_amd64.deb 107763116 BLAKE2B 19a06058fed03e5df74f6b0558b5cd17ad4a7bfacf7ccae7b0776f8967466cce93201a745ec8dca9fc96f2fa4141fab91d521899375034c1f710011e33ca32bf SHA512 eb72e154e9d83d0b1a3dffe0476b02704bb0d40688793da5d9d6aaeaa32a8de935f9c7535f484a3fc752b9a03ed70c872a644fb846d4e1ae54b0080feff3ceb9
 DIST vivaldi-stable_6.6.3271.45-1_arm64.deb 100867868 BLAKE2B f1c5aa01d50240b5c09ceb9fcc748b7f1d0e39369d7bc9b51a07440e28d8510284680b626c5daf96c58c07ce3dd2f4397a27cdbc7e22fb4a2fbaf079fadbd31b SHA512 ffc7ce2fa5fb6e5e43ca80d6bed034dc89420f1e199af2dbce4fbc78248b7d58083942dc1f1780338143eb5b0a75deeebe55e3df440502182eae228c7acce338
 DIST vivaldi-stable_6.6.3271.45-1_armhf.deb 101425828 BLAKE2B 97d51922f6bced0d733f6be998fee79f26360302ffc45ec2cdfb87a015a904c041e3c3cad30b42ccb92770a39df6ed2387708b94fa771ec92954c59e68a5d844 SHA512 bdf5247e034a4d106ac20eba3e894e5a81edde7f27472bf541b152cfc7241200be39c593c3651b778531ef3439ef6b18125f9d55432f56707f3dd93c8708b89b
+DIST vivaldi-stable_6.6.3271.48-1_amd64.deb 107735244 BLAKE2B 5bd19716e26983e9cb1e57408af4224379abf3e65059968cdf8713a6698c4851798cc5c24ab2320b803cdb7c72d652d634a86fa3d482f79a457a2ccf25b6993c SHA512 a1dcadb0ad281530461cbf07b8fa10e22699a86d187d6f26455e57c70e7f044cf21f6d841fe74b0112e02a9e79b5271bfd58680cdc81680b0d75d926dc8a89d7
+DIST vivaldi-stable_6.6.3271.48-1_arm64.deb 100865472 BLAKE2B ffdcacd543280203fa1a1875f9575c7386efd372d332ad6e602fce9b19a242aa417d594e68ccba58b63111b15488edd7b3f0c3a542f219b41076244e86075b27 SHA512 67f9649d3d7abc726559ccbb07b40c10da96e14fe88b6d522f37002608e564162d2513f5408578ff8290b05499d511f25371f8325c521933db03ae1bdcb28e18
+DIST vivaldi-stable_6.6.3271.48-1_armhf.deb 102217912 BLAKE2B bb6bc6d96178eb91863306c3ebf7c7ecac6f6acf77daab0339dc8837b4974c08522a865dd2ed562ea2dd1039ab509843f1e1f4616a3273eaf9d7efde18daa0f3 SHA512 e0c3d9e7074b10969fcecd643d15ead305c57c159eb5b698ed7cd4cebae69eff7dd4094d852bc9f111fa2d831a37b89cef971b388c79c998928161e71825b310
diff --git a/www-client/vivaldi/vivaldi-6.6.3271.45.ebuild b/www-client/vivaldi/vivaldi-6.6.3271.45.ebuild
index 633a1587fed0..a2ab26c86006 100644
--- a/www-client/vivaldi/vivaldi-6.6.3271.45.ebuild
+++ b/www-client/vivaldi/vivaldi-6.6.3271.45.ebuild
@@ -98,7 +98,7 @@ else
 	DEB_REV=1
 fi
 
-KEYWORDS="-* ~amd64 ~arm ~arm64"
+KEYWORDS="-* amd64 ~arm ~arm64"
 VIVALDI_BASE_URI="https://downloads.vivaldi.com/${VIVALDI_PN#vivaldi-}/${VIVALDI_PN}_${PV%_p*}-${DEB_REV}_"
 
 SRC_URI="
diff --git a/www-client/vivaldi/vivaldi-6.5.3206.63.ebuild b/www-client/vivaldi/vivaldi-6.6.3271.48.ebuild
index acbfa53909e3..633a1587fed0 100644
--- a/www-client/vivaldi/vivaldi-6.5.3206.63.ebuild
+++ b/www-client/vivaldi/vivaldi-6.6.3271.48.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-CHROMIUM_VERSION="120"
+CHROMIUM_VERSION="121"
 CHROMIUM_LANGS="
 	af
 	am
@@ -98,7 +98,7 @@ else
 	DEB_REV=1
 fi
 
-KEYWORDS="-* amd64 ~arm ~arm64"
+KEYWORDS="-* ~amd64 ~arm ~arm64"
 VIVALDI_BASE_URI="https://downloads.vivaldi.com/${VIVALDI_PN#vivaldi-}/${VIVALDI_PN}_${PV%_p*}-${DEB_REV}_"
 
 SRC_URI="
diff --git a/x11-terms/xfce4-terminal/xfce4-terminal-1.1.3.ebuild b/x11-terms/xfce4-terminal/xfce4-terminal-1.1.3.ebuild
index 1937b280276f..93b28676ab9a 100644
--- a/x11-terms/xfce4-terminal/xfce4-terminal-1.1.3.ebuild
+++ b/x11-terms/xfce4-terminal/xfce4-terminal-1.1.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/apps/${PN}/$(ver_cut 1-2)/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
 IUSE="utempter wayland X"
 REQUIRED_USE="|| ( wayland X )"
 
diff --git a/xfce-base/xfce4-panel/xfce4-panel-4.18.6.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.18.6.ebuild
index 9076c31499d1..ccbae2f5ee38 100644
--- a/xfce-base/xfce4-panel/xfce4-panel-4.18.6.ebuild
+++ b/xfce-base/xfce4-panel/xfce4-panel-4.18.6.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-notifyd/xfce4-notifyd-0.9.4.ebuild b/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.9.4.ebuild
index f1b06c391860..10817382ee6c 100644
--- a/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.9.4.ebuild
+++ b/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.9.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE="sound wayland X"
 
 DEPEND="
diff --git a/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.10.5.ebuild b/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.10.5.ebuild
index b3df7c6def59..33bc1cb0c594 100644
--- a/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.10.5.ebuild
+++ b/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.10.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 ~ia64 ~loong ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
 	>=dev-libs/glib-2.66.0