Merge updates from master

33 files changed, 33 insertions, 33 deletions

diff --git a/dev-libs/libevdev/libevdev-1.12.1.ebuild b/dev-libs/libevdev/libevdev-1.12.1.ebuild
index a1a35572caec..f60546e3111a 100644
--- a/dev-libs/libevdev/libevdev-1.12.1.ebuild
+++ b/dev-libs/libevdev/libevdev-1.12.1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://www.freedesktop.org/software/libevdev/${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/media-libs/freeglut/freeglut-3.2.2.ebuild b/media-libs/freeglut/freeglut-3.2.2.ebuild
index 6c9d9afe555f..123edb809f60 100644
--- a/media-libs/freeglut/freeglut-3.2.2.ebuild
+++ b/media-libs/freeglut/freeglut-3.2.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="static-libs"
 
 # enabling GLES support seems to cause build failures
diff --git a/media-libs/libepoxy/libepoxy-1.5.10.ebuild b/media-libs/libepoxy/libepoxy-1.5.10.ebuild
index 2f254719a4f5..6284dda51ed1 100644
--- a/media-libs/libepoxy/libepoxy-1.5.10.ebuild
+++ b/media-libs/libepoxy/libepoxy-1.5.10.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/mesa-22.0.3.ebuild b/media-libs/mesa/mesa-22.0.3.ebuild
index 844f0e338d37..773c1f32a8ac 100644
--- a/media-libs/mesa/mesa-22.0.3.ebuild
+++ b/media-libs/mesa/mesa-22.0.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 ~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/x11-apps/appres/appres-1.0.6.ebuild b/x11-apps/appres/appres-1.0.6.ebuild
index f691e9fb5d69..89f15c5df986 100644
--- a/x11-apps/appres/appres-1.0.6.ebuild
+++ b/x11-apps/appres/appres-1.0.6.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="list X application resource database"
 
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris ~x86-winnt"
 
 RDEPEND="
 	x11-libs/libX11
diff --git a/x11-apps/bitmap/bitmap-1.1.0.ebuild b/x11-apps/bitmap/bitmap-1.1.0.ebuild
index 960b250e6a91..ad0f2db34825 100644
--- a/x11-apps/bitmap/bitmap-1.1.0.ebuild
+++ b/x11-apps/bitmap/bitmap-1.1.0.ebuild
@@ -7,7 +7,7 @@ XORG_TARBALL_SUFFIX=xz
 inherit xorg-3
 
 DESCRIPTION="X.Org bitmap 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/editres/editres-1.0.8.ebuild b/x11-apps/editres/editres-1.0.8.ebuild
index d9f5ea912f7a..6beb9bf65a19 100644
--- a/x11-apps/editres/editres-1.0.8.ebuild
+++ b/x11-apps/editres/editres-1.0.8.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="a dynamic resource editor for X Toolkit applications"
 
-KEYWORDS="amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
+KEYWORDS="amd64 ~arm ~hppa ~mips ppc ~ppc64 ~s390 ~sparc x86"
 
 RDEPEND="
 	x11-libs/libX11
diff --git a/x11-apps/iceauth/iceauth-1.0.9.ebuild b/x11-apps/iceauth/iceauth-1.0.9.ebuild
index 368a6062c857..7d7f1fd697c1 100644
--- a/x11-apps/iceauth/iceauth-1.0.9.ebuild
+++ b/x11-apps/iceauth/iceauth-1.0.9.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="ICE authority file utility"
 
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris ~x86-winnt"
 
 RDEPEND="x11-libs/libICE"
 DEPEND="${RDEPEND}
diff --git a/x11-apps/listres/listres-1.0.5.ebuild b/x11-apps/listres/listres-1.0.5.ebuild
index 16bf176aa7aa..666c78ad7c4c 100644
--- a/x11-apps/listres/listres-1.0.5.ebuild
+++ b/x11-apps/listres/listres-1.0.5.ebuild
@@ -7,7 +7,7 @@ XORG_TARBALL_SUFFIX="xz"
 inherit xorg-3
 
 DESCRIPTION="list resources in widgets"
-KEYWORDS="amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
+KEYWORDS="amd64 ~arm ~hppa ~mips ppc ~ppc64 ~s390 ~sparc x86"
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXt
diff --git a/x11-apps/mkfontscale/mkfontscale-1.2.2.ebuild b/x11-apps/mkfontscale/mkfontscale-1.2.2.ebuild
index 5e2b5f156352..d469d4e3eec8 100644
--- a/x11-apps/mkfontscale/mkfontscale-1.2.2.ebuild
+++ b/x11-apps/mkfontscale/mkfontscale-1.2.2.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="create an index of scalable font files for X"
 
-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"
 
 RDEPEND="
 	x11-libs/libfontenc
diff --git a/x11-apps/rstart/rstart-1.0.6.ebuild b/x11-apps/rstart/rstart-1.0.6.ebuild
index 487081dae639..8b759a38c168 100644
--- a/x11-apps/rstart/rstart-1.0.6.ebuild
+++ b/x11-apps/rstart/rstart-1.0.6.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org rstart application"
 
-KEYWORDS="amd64 ~arm ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
+KEYWORDS="amd64 ~arm ~mips ppc ~ppc64 ~s390 ~sparc x86"
 
 DEPEND="x11-base/xorg-proto"
 RDEPEND=""
diff --git a/x11-apps/setxkbmap/setxkbmap-1.3.3.ebuild b/x11-apps/setxkbmap/setxkbmap-1.3.3.ebuild
index 8ae745be868f..1b94c4a41956 100644
--- a/x11-apps/setxkbmap/setxkbmap-1.3.3.ebuild
+++ b/x11-apps/setxkbmap/setxkbmap-1.3.3.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="Controls the keyboard layout of a running X server"
 
-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"
 
 COMMON_DEPEND="
 	x11-libs/libxkbfile
diff --git a/x11-apps/xauth/xauth-1.1.2.ebuild b/x11-apps/xauth/xauth-1.1.2.ebuild
index 0c046c83629c..6a2b0461a442 100644
--- a/x11-apps/xauth/xauth-1.1.2.ebuild
+++ b/x11-apps/xauth/xauth-1.1.2.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 if [[ ${PV} == 9999* ]]; then
 	SRC_URI=""
 else
-	KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="X authority file utility"
diff --git a/x11-apps/xcalc/xcalc-1.1.1.ebuild b/x11-apps/xcalc/xcalc-1.1.1.ebuild
index 9a328e28eb71..0b10186451a8 100644
--- a/x11-apps/xcalc/xcalc-1.1.1.ebuild
+++ b/x11-apps/xcalc/xcalc-1.1.1.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="scientific calculator for X"
 
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 
 RDEPEND="x11-libs/libXaw
 	x11-libs/libXt
diff --git a/x11-apps/xclock/xclock-1.1.1.ebuild b/x11-apps/xclock/xclock-1.1.1.ebuild
index e6f9a4714485..b65b52c6e71f 100644
--- a/x11-apps/xclock/xclock-1.1.1.ebuild
+++ b/x11-apps/xclock/xclock-1.1.1.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="analog / digital clock for X"
 
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-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"
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXmu
diff --git a/x11-apps/xdm/xdm-1.1.13.ebuild b/x11-apps/xdm/xdm-1.1.13.ebuild
index ab342cc152e7..93fd88fb7644 100644
--- a/x11-apps/xdm/xdm-1.1.13.ebuild
+++ b/x11-apps/xdm/xdm-1.1.13.ebuild
@@ -11,7 +11,7 @@ DEFAULTVT=vt7
 
 DESCRIPTION="X.Org xdm application"
 
-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"
 IUSE="ipv6 pam systemd truetype xinerama xpm"
 
 RDEPEND="
diff --git a/x11-apps/xdpyinfo/xdpyinfo-1.3.3.ebuild b/x11-apps/xdpyinfo/xdpyinfo-1.3.3.ebuild
index a05b200648aa..60ad669c863c 100644
--- a/x11-apps/xdpyinfo/xdpyinfo-1.3.3.ebuild
+++ b/x11-apps/xdpyinfo/xdpyinfo-1.3.3.ebuild
@@ -7,7 +7,7 @@ XORG_TARBALL_SUFFIX="xz"
 inherit xorg-3
 
 DESCRIPTION="Display information utility for X"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris ~x86-winnt"
 IUSE="dga dmx xinerama"
 
 RDEPEND="
diff --git a/x11-apps/xedit/xedit-1.2.3.ebuild b/x11-apps/xedit/xedit-1.2.3.ebuild
index 566b105d2494..ecaf5d0255c4 100644
--- a/x11-apps/xedit/xedit-1.2.3.ebuild
+++ b/x11-apps/xedit/xedit-1.2.3.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="simple text editor for X"
 
-KEYWORDS="amd64 ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm64 ~hppa ~mips ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
 	x11-libs/libXaw
diff --git a/x11-apps/xload/xload-1.1.4.ebuild b/x11-apps/xload/xload-1.1.4.ebuild
index ba16258302e6..c49854a3d2bd 100644
--- a/x11-apps/xload/xload-1.1.4.ebuild
+++ b/x11-apps/xload/xload-1.1.4.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="system load average display 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/libXaw
diff --git a/x11-apps/xlsfonts/xlsfonts-1.0.7.ebuild b/x11-apps/xlsfonts/xlsfonts-1.0.7.ebuild
index 1aeee05aa212..3a14b7c5e7d6 100644
--- a/x11-apps/xlsfonts/xlsfonts-1.0.7.ebuild
+++ b/x11-apps/xlsfonts/xlsfonts-1.0.7.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org xlsfonts application"
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 
 RDEPEND="x11-libs/libX11"
 DEPEND="${RDEPEND}
diff --git a/x11-apps/xsm/xsm-1.0.5.ebuild b/x11-apps/xsm/xsm-1.0.5.ebuild
index a242d412ace7..ea68f4f1cd79 100644
--- a/x11-apps/xsm/xsm-1.0.5.ebuild
+++ b/x11-apps/xsm/xsm-1.0.5.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="X Session Manager"
 
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 RDEPEND="x11-libs/libXaw
 	x11-libs/libX11
diff --git a/x11-base/xorg-proto/xorg-proto-2022.1.ebuild b/x11-base/xorg-proto/xorg-proto-2022.1.ebuild
index f3386fafb33d..afb4b4a99ffa 100644
--- a/x11-base/xorg-proto/xorg-proto-2022.1.ebuild
+++ b/x11-base/xorg-proto/xorg-proto-2022.1.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="https://gitlab.freedesktop.org/xorg/proto/xorgproto"
 if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
-	KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 	SRC_URI="https://xorg.freedesktop.org/archive/individual/proto/${MY_P}.tar.gz"
 	S="${WORKDIR}/${MY_P}"
 fi
diff --git a/x11-base/xorg-server/xorg-server-21.1.3-r2.ebuild b/x11-base/xorg-server/xorg-server-21.1.3-r2.ebuild
index 4663a46b58ef..c298173668a9 100644
--- a/x11-base/xorg-server/xorg-server-21.1.3-r2.ebuild
+++ b/x11-base/xorg-server/xorg-server-21.1.3-r2.ebuild
@@ -11,7 +11,7 @@ EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git"
 DESCRIPTION="X.Org X servers"
 SLOT="0/${PV}"
 if [[ ${PV} != 9999* ]]; then
-	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
 
 IUSE_SERVERS="xephyr xnest xorg xvfb"
diff --git a/x11-base/xwayland/xwayland-22.1.1.ebuild b/x11-base/xwayland/xwayland-22.1.1.ebuild
index 1eba0f13884b..ac9d820c5c4b 100644
--- a/x11-base/xwayland/xwayland-22.1.1.ebuild
+++ b/x11-base/xwayland/xwayland-22.1.1.ebuild
@@ -13,7 +13,7 @@ IUSE="selinux video_cards_nvidia unwind xcsecurity"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 
 COMMON_DEPEND="
 	dev-libs/libbsd
diff --git a/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.4.0.ebuild b/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.4.0.ebuild
index eecbe5d558f6..61dd289e0743 100644
--- a/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.4.0.ebuild
+++ b/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.4.0.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org driver for dummy cards"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND=""
 DEPEND="x11-base/xorg-proto"
diff --git a/x11-libs/libX11/libX11-1.7.5.ebuild b/x11-libs/libX11/libX11-1.7.5.ebuild
index 61df0cf6e2d9..b93b77909220 100644
--- a/x11-libs/libX11/libX11-1.7.5.ebuild
+++ b/x11-libs/libX11/libX11-1.7.5.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="ipv6 test"
 RESTRICT="!test? ( test )"
 
diff --git a/x11-libs/libXcursor/libXcursor-1.2.1.ebuild b/x11-libs/libXcursor/libXcursor-1.2.1.ebuild
index 095ff801c122..47327239f940 100644
--- a/x11-libs/libXcursor/libXcursor-1.2.1.ebuild
+++ b/x11-libs/libXcursor/libXcursor-1.2.1.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xcursor library"
 
-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"
 IUSE="doc"
 
 RDEPEND=">=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
diff --git a/x11-libs/libXvMC/libXvMC-1.0.13.ebuild b/x11-libs/libXvMC/libXvMC-1.0.13.ebuild
index 86e4ce071e0e..b8de935811ca 100644
--- a/x11-libs/libXvMC/libXvMC-1.0.13.ebuild
+++ b/x11-libs/libXvMC/libXvMC-1.0.13.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3 meson-multilib
 
 DESCRIPTION="X.Org XvMC library"
 
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 
 RDEPEND="
 	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
diff --git a/x11-libs/libdrm/libdrm-2.4.110.ebuild b/x11-libs/libdrm/libdrm-2.4.110.ebuild
index 8f412ec60d52..15f240d2e8c9 100644
--- a/x11-libs/libdrm/libdrm-2.4.110.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.110.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/libxkbcommon/libxkbcommon-1.4.0.ebuild b/x11-libs/libxkbcommon/libxkbcommon-1.4.0.ebuild
index 1928a5e2d281..5a282e685e1c 100644
--- a/x11-libs/libxkbcommon/libxkbcommon-1.4.0.ebuild
+++ b/x11-libs/libxkbcommon/libxkbcommon-1.4.0.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/xkbcommon/${PN}"
 else
 	SRC_URI="https://xkbcommon.org/download/${P}.tar.xz"
-	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
 
 PYTHON_COMPAT=( python3_{8..10} )
diff --git a/x11-misc/compose-tables/compose-tables-1.7.5.ebuild b/x11-misc/compose-tables/compose-tables-1.7.5.ebuild
index 681b98026ecb..485723ecfba1 100644
--- a/x11-misc/compose-tables/compose-tables-1.7.5.ebuild
+++ b/x11-misc/compose-tables/compose-tables-1.7.5.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 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 # Only needed by configure
 DEPEND="
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.35.1.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.35.1.ebuild
index 61ee79dadc75..ec16ddd59437 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.35.1.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.35.1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://www.x.org/releases/individual/data/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-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 ~sparc-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/x11-wm/twm/twm-1.0.12.ebuild b/x11-wm/twm/twm-1.0.12.ebuild
index 1e10bc078cdf..ef27341034d2 100644
--- a/x11-wm/twm/twm-1.0.12.ebuild
+++ b/x11-wm/twm/twm-1.0.12.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Tab Window Manager"
 
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 COMMON_DEPEND="