Merge updates from master

31 files changed, 31 insertions, 31 deletions

diff --git a/dev-libs/wayland-protocols/wayland-protocols-1.26.ebuild b/dev-libs/wayland-protocols/wayland-protocols-1.26.ebuild
index af5326e000f9..f4cd12f8845d 100644
--- a/dev-libs/wayland-protocols/wayland-protocols-1.26.ebuild
+++ b/dev-libs/wayland-protocols/wayland-protocols-1.26.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://wayland.freedesktop.org/releases/${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-libs/wayland/wayland-1.21.0.ebuild b/dev-libs/wayland/wayland-1.21.0.ebuild
index 1b58a888674f..d1fb659d7c5c 100644
--- a/dev-libs/wayland/wayland-1.21.0.ebuild
+++ b/dev-libs/wayland/wayland-1.21.0.ebuild
@@ -8,7 +8,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
 inherit meson-multilib
 
diff --git a/dev-util/wayland-scanner/wayland-scanner-1.21.0.ebuild b/dev-util/wayland-scanner/wayland-scanner-1.21.0.ebuild
index 5678052cd128..725331dbcae2 100644
--- a/dev-util/wayland-scanner/wayland-scanner-1.21.0.ebuild
+++ b/dev-util/wayland-scanner/wayland-scanner-1.21.0.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gitlab.freedesktop.org/wayland/wayland/-/releases/${PV}/downloads/wayland-${PV}.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"
 	S="${WORKDIR}/wayland-${PV}"
 fi
 inherit meson
diff --git a/gui-libs/display-manager-init/display-manager-init-1.0-r4.ebuild b/gui-libs/display-manager-init/display-manager-init-1.0-r4.ebuild
index a6d2ebc3a24b..9953d10f747f 100644
--- a/gui-libs/display-manager-init/display-manager-init-1.0-r4.ebuild
+++ b/gui-libs/display-manager-init/display-manager-init-1.0-r4.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Project:X11"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 S="${WORKDIR}"
 
diff --git a/media-fonts/encodings/encodings-1.0.6.ebuild b/media-fonts/encodings/encodings-1.0.6.ebuild
index ab672e1c076b..f7644363f374 100644
--- a/media-fonts/encodings/encodings-1.0.6.ebuild
+++ b/media-fonts/encodings/encodings-1.0.6.ebuild
@@ -10,7 +10,7 @@ inherit font xorg-3
 
 DESCRIPTION="X.Org font encodings"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-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 ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 BDEPEND="x11-apps/mkfontscale
 	>=media-fonts/font-util-1.1.1-r1"
diff --git a/media-fonts/font-util/font-util-1.3.3.ebuild b/media-fonts/font-util/font-util-1.3.3.ebuild
index 76874e8d63fc..83324427a5ae 100644
--- a/media-fonts/font-util/font-util-1.3.3.ebuild
+++ b/media-fonts/font-util/font-util-1.3.3.ebuild
@@ -10,7 +10,7 @@ EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/font/util.git"
 DESCRIPTION="X.Org font utilities"
 HOMEPAGE="https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/util"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 XORG_CONFIGURE_OPTIONS=(
 	--with-fontrootdir="${EPREFIX}"/usr/share/fonts
diff --git a/media-libs/libepoxy/libepoxy-1.5.10-r1.ebuild b/media-libs/libepoxy/libepoxy-1.5.10-r1.ebuild
index 80cf73a3ee05..aff915cb5ea2 100644
--- a/media-libs/libepoxy/libepoxy-1.5.10-r1.ebuild
+++ b/media-libs/libepoxy/libepoxy-1.5.10-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/anholt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	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"
 fi
 
 DESCRIPTION="Library for handling OpenGL function pointer management"
diff --git a/media-libs/mesa-amber/mesa-amber-21.3.9.ebuild b/media-libs/mesa-amber/mesa-amber-21.3.9.ebuild
index 921f6eb01aa1..e83298684a55 100644
--- a/media-libs/mesa-amber/mesa-amber-21.3.9.ebuild
+++ b/media-libs/mesa-amber/mesa-amber-21.3.9.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/media-libs/mesa/mesa-22.1.3.ebuild b/media-libs/mesa/mesa-22.1.3.ebuild
index eacb37f7abb7..86d50a149f31 100644
--- a/media-libs/mesa/mesa-22.1.3.ebuild
+++ b/media-libs/mesa/mesa-22.1.3.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/media-libs/waffle/waffle-1.7.0-r2.ebuild b/media-libs/waffle/waffle-1.7.0-r2.ebuild
index c480c84fbf0b..013a7e9b36be 100644
--- a/media-libs/waffle/waffle-1.7.0-r2.ebuild
+++ b/media-libs/waffle/waffle-1.7.0-r2.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = *9999* ]]; then
 	GIT_ECLASS="git-r3"
 else
 	SRC_URI="https://gitlab.freedesktop.org/mesa/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+	KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 x86"
 	S="${WORKDIR}"/${PN}-v${PV}
 fi
 inherit meson-multilib multilib ${GIT_ECLASS}
diff --git a/x11-apps/mesa-progs/mesa-progs-8.5.0.ebuild b/x11-apps/mesa-progs/mesa-progs-8.5.0.ebuild
index ed3c6548623a..c6992765249d 100644
--- a/x11-apps/mesa-progs/mesa-progs-8.5.0.ebuild
+++ b/x11-apps/mesa-progs/mesa-progs-8.5.0.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} = 9999* ]]; then
 else
 	SRC_URI="https://mesa.freedesktop.org/archive/demos/${MY_P}.tar.bz2
 		https://mesa.freedesktop.org/archive/demos/${PV}/${MY_P}.tar.bz2"
-	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"
 	S="${WORKDIR}/${MY_P}"
 fi
 LICENSE="LGPL-2"
diff --git a/x11-apps/xclipboard/xclipboard-1.1.4.ebuild b/x11-apps/xclipboard/xclipboard-1.1.4.ebuild
index df0308435890..058396de970c 100644
--- a/x11-apps/xclipboard/xclipboard-1.1.4.ebuild
+++ b/x11-apps/xclipboard/xclipboard-1.1.4.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="interchange between cut buffer and selection"
 
-KEYWORDS="amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 sparc x86"
+KEYWORDS="amd64 arm ~hppa ~mips ~ppc ~ppc64 ~s390 sparc x86"
 
 RDEPEND="
 	x11-libs/libXaw
diff --git a/x11-apps/xcmsdb/xcmsdb-1.0.6.ebuild b/x11-apps/xcmsdb/xcmsdb-1.0.6.ebuild
index 02841c7a2f6a..8598276fd56e 100644
--- a/x11-apps/xcmsdb/xcmsdb-1.0.6.ebuild
+++ b/x11-apps/xcmsdb/xcmsdb-1.0.6.ebuild
@@ -7,7 +7,7 @@ XORG_TARBALL_SUFFIX="xz"
 inherit xorg-3
 
 DESCRIPTION="Device Color Characterization utility for X Color Management System"
-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"
 
 RDEPEND="x11-libs/libX11"
 DEPEND="${RDEPEND}
diff --git a/x11-apps/xconsole/xconsole-1.0.8.ebuild b/x11-apps/xconsole/xconsole-1.0.8.ebuild
index 09de46db8e5b..19ae3a396faf 100644
--- a/x11-apps/xconsole/xconsole-1.0.8.ebuild
+++ b/x11-apps/xconsole/xconsole-1.0.8.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-apps/xev/xev-1.2.5.ebuild b/x11-apps/xev/xev-1.2.5.ebuild
index 0fb6aae9575e..be9fdfa717bf 100644
--- a/x11-apps/xev/xev-1.2.5.ebuild
+++ b/x11-apps/xev/xev-1.2.5.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="Print contents of X events"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-winnt"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-winnt"
 
 RDEPEND="
 	x11-libs/libX11
diff --git a/x11-apps/xfontsel/xfontsel-1.1.0.ebuild b/x11-apps/xfontsel/xfontsel-1.1.0.ebuild
index 0d8bd2b3178c..ee89636a9fe3 100644
--- a/x11-apps/xfontsel/xfontsel-1.1.0.ebuild
+++ b/x11-apps/xfontsel/xfontsel-1.1.0.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="point and click selection of X11 font names"
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="
 	x11-libs/libXaw
diff --git a/x11-apps/xkbutils/xkbutils-1.0.5.ebuild b/x11-apps/xkbutils/xkbutils-1.0.5.ebuild
index 461e964b8dab..6a3d944d285f 100644
--- a/x11-apps/xkbutils/xkbutils-1.0.5.ebuild
+++ b/x11-apps/xkbutils/xkbutils-1.0.5.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org xkbutils application"
 
-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"
 
 RDEPEND="
 	x11-libs/libX11
diff --git a/x11-apps/xmag/xmag-1.0.7.ebuild b/x11-apps/xmag/xmag-1.0.7.ebuild
index c13f6065dc46..ae846bca2d02 100644
--- a/x11-apps/xmag/xmag-1.0.7.ebuild
+++ b/x11-apps/xmag/xmag-1.0.7.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org xmag application"
 
-KEYWORDS="amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 sparc x86"
+KEYWORDS="amd64 arm ~hppa ~mips ~ppc ~ppc64 ~s390 sparc x86"
 
 RDEPEND="
 	x11-libs/libXaw
diff --git a/x11-apps/xmessage/xmessage-1.0.6.ebuild b/x11-apps/xmessage/xmessage-1.0.6.ebuild
index 476b8a3fe398..524ec28337e7 100644
--- a/x11-apps/xmessage/xmessage-1.0.6.ebuild
+++ b/x11-apps/xmessage/xmessage-1.0.6.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="display a message or query in a window (X-based /bin/echo)"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	x11-libs/libXaw
diff --git a/x11-apps/xmodmap/xmodmap-1.0.11.ebuild b/x11-apps/xmodmap/xmodmap-1.0.11.ebuild
index 1be7ade33965..b17ed53f27f7 100644
--- a/x11-apps/xmodmap/xmodmap-1.0.11.ebuild
+++ b/x11-apps/xmodmap/xmodmap-1.0.11.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="utility for modifying keymaps and pointer button mappings in X"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="x11-libs/libX11"
 DEPEND="${RDEPEND}
diff --git a/x11-apps/xpr/xpr-1.1.0.ebuild b/x11-apps/xpr/xpr-1.1.0.ebuild
index f819068581ba..a6d85c69af1e 100644
--- a/x11-apps/xpr/xpr-1.1.0.ebuild
+++ b/x11-apps/xpr/xpr-1.1.0.ebuild
@@ -7,7 +7,7 @@ XORG_TARBALL_SUFFIX="xz"
 inherit xorg-3
 
 DESCRIPTION="X.Org xpr application"
-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"
 
 RDEPEND="
 	x11-libs/libX11
diff --git a/x11-apps/xrefresh/xrefresh-1.0.7.ebuild b/x11-apps/xrefresh/xrefresh-1.0.7.ebuild
index 87fd76001fcf..8d541649e45e 100644
--- a/x11-apps/xrefresh/xrefresh-1.0.7.ebuild
+++ b/x11-apps/xrefresh/xrefresh-1.0.7.ebuild
@@ -7,7 +7,7 @@ XORG_TARBALL_SUFFIX="xz"
 inherit xorg-3
 
 DESCRIPTION="refresh all or part of an X screen"
-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"
 
 RDEPEND="x11-libs/libX11"
 DEPEND="${RDEPEND}
diff --git a/x11-apps/xwud/xwud-1.0.6.ebuild b/x11-apps/xwud/xwud-1.0.6.ebuild
index f38552563a7d..6fe8c15d866c 100644
--- a/x11-apps/xwud/xwud-1.0.6.ebuild
+++ b/x11-apps/xwud/xwud-1.0.6.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="image displayer for X"
 
-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"
 
 RDEPEND="x11-libs/libX11"
 DEPEND="${RDEPEND}
diff --git a/x11-base/xcb-proto/xcb-proto-1.15.2.ebuild b/x11-base/xcb-proto/xcb-proto-1.15.2.ebuild
index 3ba7616e2635..f6a0a259a5ed 100644
--- a/x11-base/xcb-proto/xcb-proto-1.15.2.ebuild
+++ b/x11-base/xcb-proto/xcb-proto-1.15.2.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="X C-language Bindings protocol headers"
 HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/proto/xcbproto"
 EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/proto/xcbproto.git"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND=""
diff --git a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.9.2.ebuild b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.9.2.ebuild
index adaf74531f3e..3fdbc7f2ed65 100644
--- a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.9.2.ebuild
+++ b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.9.2.ebuild
@@ -8,7 +8,7 @@ inherit linux-info xorg-3
 
 DESCRIPTION="Driver for Synaptics touchpads"
 
-KEYWORDS="amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 x86"
+KEYWORDS="amd64 arm ~arm64 ~loong ~mips ~ppc ~ppc64 x86"
 
 RDEPEND="
 	>=x11-base/xorg-server-1.14
diff --git a/x11-libs/libX11/libX11-1.8.1.ebuild b/x11-libs/libX11/libX11-1.8.1.ebuild
index 8aa370fb6c42..8e814b318e3f 100644
--- a/x11-libs/libX11/libX11-1.8.1.ebuild
+++ b/x11-libs/libX11/libX11-1.8.1.ebuild
@@ -11,7 +11,7 @@ inherit toolchain-funcs xorg-3
 # Note: please bump this with x11-misc/compose-tables
 DESCRIPTION="X.Org X11 library"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/x11-libs/libdrm/libdrm-2.4.112.ebuild b/x11-libs/libdrm/libdrm-2.4.112.ebuild
index 5e7f543139ae..384154316271 100644
--- a/x11-libs/libdrm/libdrm-2.4.112.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.112.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware"
diff --git a/x11-libs/libxcb/libxcb-1.15-r1.ebuild b/x11-libs/libxcb/libxcb-1.15-r1.ebuild
index 43e5cbb93bc0..4f9d5fd0b773 100644
--- a/x11-libs/libxcb/libxcb-1.15-r1.ebuild
+++ b/x11-libs/libxcb/libxcb-1.15-r1.ebuild
@@ -15,7 +15,7 @@ inherit python-any-r1 xorg-3
 DESCRIPTION="X C-language Bindings library"
 HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc selinux test +xkb"
 RESTRICT="!test? ( test )"
 SLOT="0/1.12"
diff --git a/x11-libs/libxcvt/libxcvt-0.1.2.ebuild b/x11-libs/libxcvt/libxcvt-0.1.2.ebuild
index f22a65d77bca..f82ef25ee886 100644
--- a/x11-libs/libxcvt/libxcvt-0.1.2.ebuild
+++ b/x11-libs/libxcvt/libxcvt-0.1.2.ebuild
@@ -7,7 +7,7 @@ XORG_TARBALL_SUFFIX="xz"
 inherit xorg-3 meson
 
 if [[ ${PV} != *9999* ]]; then
-	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
 
 DESCRIPTION="X.Org xcvt library and cvt program"
diff --git a/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r4.ebuild b/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r4.ebuild
index 4a627d1b889c..f41351c20b84 100644
--- a/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r4.ebuild
+++ b/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r4.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
 DESCRIPTION="X C-language Bindings sample implementations"
 HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-cursor"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
 
 RDEPEND=">=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]
 	>=x11-libs/xcb-util-image-0.3.9-r1[${MULTILIB_USEDEP}]
diff --git a/x11-misc/compose-tables/compose-tables-1.8.1.ebuild b/x11-misc/compose-tables/compose-tables-1.8.1.ebuild
index 0e6ce1f53aa4..14d925f40bcd 100644
--- a/x11-misc/compose-tables/compose-tables-1.8.1.ebuild
+++ b/x11-misc/compose-tables/compose-tables-1.8.1.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="X.Org Compose Key tables from libX11"
 SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/lib/libX11-${PV}.tar.${XORG_TARBALL_SUFFIX}"
 S="${WORKDIR}/libX11-${PV}/"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 # Only needed by configure
 DEPEND="