Drop arm-linux keyword from tree.

  "arm-linux" is considered deprecated, unmaintained and easily
  replaced by "arm".

Closes: https://bugs.gentoo.org/664598
Reference: https://archives.gentoo.org/gentoo-dev/message/63bafa051cccd1eb3d2ade16823671fa

60 files changed, 60 insertions, 60 deletions

diff --git a/x11-libs/cairo/cairo-1.14.12.ebuild b/x11-libs/cairo/cairo-1.14.12.ebuild
index 4aa4c57a63c1..56b515b49622 100644
--- a/x11-libs/cairo/cairo-1.14.12.ebuild
+++ b/x11-libs/cairo/cairo-1.14.12.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A vector graphics library with cross-device output support"
diff --git a/x11-libs/cairo/cairo-9999.ebuild b/x11-libs/cairo/cairo-9999.ebuild
index 0814ca8fec0c..cf8db822d91b 100644
--- a/x11-libs/cairo/cairo-9999.ebuild
+++ b/x11-libs/cairo/cairo-9999.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A vector graphics library with cross-device output support"
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.11.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.11.ebuild
index 698b08005536..67766b367ca7 100644
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.11.ebuild
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.11.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://git.gnome.org/browse/gdk-pixbuf"
 
 LICENSE="LGPL-2+"
 SLOT="2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="X debug +introspection jpeg jpeg2k tiff test"
 
 COMMON_DEPEND="
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.12.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.12.ebuild
index 90affa089f3c..4f8ee189a2f4 100644
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.12.ebuild
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.12.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://git.gnome.org/browse/gdk-pixbuf"
 
 LICENSE="LGPL-2+"
 SLOT="2"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ~ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ~ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="X debug +introspection jpeg jpeg2k tiff test"
 
 # Remove SRC_URI when gnome bug #795069 is fixed
diff --git a/x11-libs/gnome-pty-helper/gnome-pty-helper-0.36.3.ebuild b/x11-libs/gnome-pty-helper/gnome-pty-helper-0.36.3.ebuild
index 806af6dfc093..719f93187ac4 100644
--- a/x11-libs/gnome-pty-helper/gnome-pty-helper-0.36.3.ebuild
+++ b/x11-libs/gnome-pty-helper/gnome-pty-helper-0.36.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/action/show/Apps/Terminal/VTE"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="+hardened"
 
 # gnome-pty-helper was spit out with 0.27.90
diff --git a/x11-libs/gnome-pty-helper/gnome-pty-helper-0.38.3.ebuild b/x11-libs/gnome-pty-helper/gnome-pty-helper-0.38.3.ebuild
index 7acc2a4586df..5ce679f4e3aa 100644
--- a/x11-libs/gnome-pty-helper/gnome-pty-helper-0.38.3.ebuild
+++ b/x11-libs/gnome-pty-helper/gnome-pty-helper-0.38.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/action/show/Apps/Terminal/VTE"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="+hardened"
 
 # gnome-pty-helper was spit out with 0.27.90
diff --git a/x11-libs/gnome-pty-helper/gnome-pty-helper-0.40.2.ebuild b/x11-libs/gnome-pty-helper/gnome-pty-helper-0.40.2.ebuild
index 7acc2a4586df..5ce679f4e3aa 100644
--- a/x11-libs/gnome-pty-helper/gnome-pty-helper-0.40.2.ebuild
+++ b/x11-libs/gnome-pty-helper/gnome-pty-helper-0.40.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/action/show/Apps/Terminal/VTE"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="+hardened"
 
 # gnome-pty-helper was spit out with 0.27.90
diff --git a/x11-libs/gtk+/gtk+-2.24.31-r1.ebuild b/x11-libs/gtk+/gtk+-2.24.31-r1.ebuild
index cd1dca6f259d..71effec2ec84 100644
--- a/x11-libs/gtk+/gtk+-2.24.31-r1.ebuild
+++ b/x11-libs/gtk+/gtk+-2.24.31-r1.ebuild
@@ -16,7 +16,7 @@ REQUIRED_USE="
 	xinerama? ( !aqua )
 "
 
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # Upstream wants us to do their job:
 # https://bugzilla.gnome.org/show_bug.cgi?id=768663#c1
diff --git a/x11-libs/gtk+/gtk+-2.24.32.ebuild b/x11-libs/gtk+/gtk+-2.24.32.ebuild
index 742692094513..2d39c4ff0304 100644
--- a/x11-libs/gtk+/gtk+-2.24.32.ebuild
+++ b/x11-libs/gtk+/gtk+-2.24.32.ebuild
@@ -18,7 +18,7 @@ REQUIRED_USE="
 	xinerama? ( !aqua )
 "
 
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # Upstream wants us to do their job:
 # https://bugzilla.gnome.org/show_bug.cgi?id=768663#c1
diff --git a/x11-libs/gtk+/gtk+-3.22.19.ebuild b/x11-libs/gtk+/gtk+-3.22.19.ebuild
index 6220fd3c590f..af9e928cbf8b 100644
--- a/x11-libs/gtk+/gtk+-3.22.19.ebuild
+++ b/x11-libs/gtk+/gtk+-3.22.19.ebuild
@@ -17,7 +17,7 @@ REQUIRED_USE="
 	xinerama? ( X )
 "
 
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # Upstream wants us to do their job:
 # https://bugzilla.gnome.org/show_bug.cgi?id=768662#c1
diff --git a/x11-libs/gtk+/gtk+-3.22.29.ebuild b/x11-libs/gtk+/gtk+-3.22.29.ebuild
index 41f1969b357f..7b364715e71e 100644
--- a/x11-libs/gtk+/gtk+-3.22.29.ebuild
+++ b/x11-libs/gtk+/gtk+-3.22.29.ebuild
@@ -17,7 +17,7 @@ REQUIRED_USE="
 	xinerama? ( X )
 "
 
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # Upstream wants us to do their job:
 # https://bugzilla.gnome.org/show_bug.cgi?id=768662#c1
diff --git a/x11-libs/gtk+/gtk+-3.22.30.ebuild b/x11-libs/gtk+/gtk+-3.22.30.ebuild
index e3234636431d..14b9ed417faf 100644
--- a/x11-libs/gtk+/gtk+-3.22.30.ebuild
+++ b/x11-libs/gtk+/gtk+-3.22.30.ebuild
@@ -17,7 +17,7 @@ REQUIRED_USE="
 	xinerama? ( X )
 "
 
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # Upstream wants us to do their job:
 # https://bugzilla.gnome.org/show_bug.cgi?id=768662#c1
diff --git a/x11-libs/libICE/libICE-1.0.9-r2.ebuild b/x11-libs/libICE/libICE-1.0.9-r2.ebuild
index 15c12557b37c..d0c2f3ea1f81 100644
--- a/x11-libs/libICE/libICE-1.0.9-r2.ebuild
+++ b/x11-libs/libICE/libICE-1.0.9-r2.ebuild
@@ -9,7 +9,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Inter-Client Exchange library"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="ipv6"
 
 RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libSM/libSM-1.2.2-r2.ebuild b/x11-libs/libSM/libSM-1.2.2-r2.ebuild
index e77426b2a5fa..e34a0aac36c4 100644
--- a/x11-libs/libSM/libSM-1.2.2-r2.ebuild
+++ b/x11-libs/libSM/libSM-1.2.2-r2.ebuild
@@ -9,7 +9,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Session Management library"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="doc ipv6 +uuid"
 
 RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libX11/libX11-1.6.5-r1.ebuild b/x11-libs/libX11/libX11-1.6.5-r1.ebuild
index 0d9033a57f09..765aa43ccd5a 100644
--- a/x11-libs/libX11/libX11-1.6.5-r1.ebuild
+++ b/x11-libs/libX11/libX11-1.6.5-r1.ebuild
@@ -10,7 +10,7 @@ inherit xorg-2 toolchain-funcs
 
 DESCRIPTION="X.Org X11 library"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="ipv6 test"
 
 RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libX11/libX11-1.6.6.ebuild b/x11-libs/libX11/libX11-1.6.6.ebuild
index 5c90881f8160..8190f12894f5 100644
--- a/x11-libs/libX11/libX11-1.6.6.ebuild
+++ b/x11-libs/libX11/libX11-1.6.6.ebuild
@@ -10,7 +10,7 @@ inherit xorg-2 toolchain-funcs
 
 DESCRIPTION="X.Org X11 library"
 
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="ipv6 test"
 
 RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libXau/libXau-1.0.8-r1.ebuild b/x11-libs/libXau/libXau-1.0.8-r1.ebuild
index 9426c2577a1f..fbf754046123 100644
--- a/x11-libs/libXau/libXau-1.0.8-r1.ebuild
+++ b/x11-libs/libXau/libXau-1.0.8-r1.ebuild
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org X authorization library"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="x11-base/xorg-proto"
diff --git a/x11-libs/libXaw/libXaw-1.0.13-r1.ebuild b/x11-libs/libXaw/libXaw-1.0.13-r1.ebuild
index 28e032558011..ce50c9fd3f3e 100644
--- a/x11-libs/libXaw/libXaw-1.0.13-r1.ebuild
+++ b/x11-libs/libXaw/libXaw-1.0.13-r1.ebuild
@@ -9,7 +9,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Xaw library"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="deprecated"
 
 RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libXcomposite/libXcomposite-0.4.4-r2.ebuild b/x11-libs/libXcomposite/libXcomposite-0.4.4-r2.ebuild
index 500527554510..f77957fb578a 100644
--- a/x11-libs/libXcomposite/libXcomposite-0.4.4-r2.ebuild
+++ b/x11-libs/libXcomposite/libXcomposite-0.4.4-r2.ebuild
@@ -9,7 +9,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Xcomposite library"
 
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libXcursor/libXcursor-1.1.15.ebuild b/x11-libs/libXcursor/libXcursor-1.1.15.ebuild
index 2ac37fa7086c..d4fd82aa0ee6 100644
--- a/x11-libs/libXcursor/libXcursor-1.1.15.ebuild
+++ b/x11-libs/libXcursor/libXcursor-1.1.15.ebuild
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Xcursor library"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
diff --git a/x11-libs/libXdamage/libXdamage-1.1.4-r2.ebuild b/x11-libs/libXdamage/libXdamage-1.1.4-r2.ebuild
index 6ac8df3b6d1c..671b2987558f 100644
--- a/x11-libs/libXdamage/libXdamage-1.1.4-r2.ebuild
+++ b/x11-libs/libXdamage/libXdamage-1.1.4-r2.ebuild
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Xdamage library"
 
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libXdmcp/libXdmcp-1.1.2-r2.ebuild b/x11-libs/libXdmcp/libXdmcp-1.1.2-r2.ebuild
index b8f338fe220a..d5a2fe314b11 100644
--- a/x11-libs/libXdmcp/libXdmcp-1.1.2-r2.ebuild
+++ b/x11-libs/libXdmcp/libXdmcp-1.1.2-r2.ebuild
@@ -9,7 +9,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org X Display Manager Control Protocol library"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libXext/libXext-1.3.3-r1.ebuild b/x11-libs/libXext/libXext-1.3.3-r1.ebuild
index 623397b55a2e..c318766369be 100644
--- a/x11-libs/libXext/libXext-1.3.3-r1.ebuild
+++ b/x11-libs/libXext/libXext-1.3.3-r1.ebuild
@@ -9,7 +9,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Xext library"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libXfixes/libXfixes-5.0.3-r1.ebuild b/x11-libs/libXfixes/libXfixes-5.0.3-r1.ebuild
index a2aafad2172a..e92d14351fc0 100644
--- a/x11-libs/libXfixes/libXfixes-5.0.3-r1.ebuild
+++ b/x11-libs/libXfixes/libXfixes-5.0.3-r1.ebuild
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Xfixes library"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libXfont2/libXfont2-2.0.3-r1.ebuild b/x11-libs/libXfont2/libXfont2-2.0.3-r1.ebuild
index 43063d817f72..4941e3b2e1b8 100644
--- a/x11-libs/libXfont2/libXfont2-2.0.3-r1.ebuild
+++ b/x11-libs/libXfont2/libXfont2-2.0.3-r1.ebuild
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Xfont library"
 
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 ipv6 truetype"
 
 RDEPEND="sys-libs/zlib
diff --git a/x11-libs/libXft/libXft-2.3.2-r1.ebuild b/x11-libs/libXft/libXft-2.3.2-r1.ebuild
index 8f58a4bd08e0..e93d08c43e2d 100644
--- a/x11-libs/libXft/libXft-2.3.2-r1.ebuild
+++ b/x11-libs/libXft/libXft-2.3.2-r1.ebuild
@@ -8,7 +8,7 @@ inherit xorg-2 flag-o-matic
 
 DESCRIPTION="X.Org Xft library"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND=">=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
diff --git a/x11-libs/libXi/libXi-1.7.9-r1.ebuild b/x11-libs/libXi/libXi-1.7.9-r1.ebuild
index 07c4fb0b20e4..d9480e375ab8 100644
--- a/x11-libs/libXi/libXi-1.7.9-r1.ebuild
+++ b/x11-libs/libXi/libXi-1.7.9-r1.ebuild
@@ -8,7 +8,7 @@ XORG_MULTILIB=yes
 inherit xorg-2
 
 DESCRIPTION="X.Org Xi library"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libXinerama/libXinerama-1.1.3-r1.ebuild b/x11-libs/libXinerama/libXinerama-1.1.3-r1.ebuild
index efa7fb3a6619..57b9c5c4e96c 100644
--- a/x11-libs/libXinerama/libXinerama-1.1.3-r1.ebuild
+++ b/x11-libs/libXinerama/libXinerama-1.1.3-r1.ebuild
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Xinerama library"
 
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libXinerama/libXinerama-1.1.4.ebuild b/x11-libs/libXinerama/libXinerama-1.1.4.ebuild
index 24a2056b5334..a1006b48b3c6 100644
--- a/x11-libs/libXinerama/libXinerama-1.1.4.ebuild
+++ b/x11-libs/libXinerama/libXinerama-1.1.4.ebuild
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Xinerama library"
 
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libXmu/libXmu-1.1.2-r1.ebuild b/x11-libs/libXmu/libXmu-1.1.2-r1.ebuild
index 9d2fb369a83e..4e3fe40f06f7 100644
--- a/x11-libs/libXmu/libXmu-1.1.2-r1.ebuild
+++ b/x11-libs/libXmu/libXmu-1.1.2-r1.ebuild
@@ -9,7 +9,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Xmu library"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="ipv6"
 
 RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libXpm/libXpm-3.5.12-r1.ebuild b/x11-libs/libXpm/libXpm-3.5.12-r1.ebuild
index 8f1106a177a2..dbe539de9bfc 100644
--- a/x11-libs/libXpm/libXpm-3.5.12-r1.ebuild
+++ b/x11-libs/libXpm/libXpm-3.5.12-r1.ebuild
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Xpm library"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
diff --git a/x11-libs/libXrandr/libXrandr-1.5.1-r1.ebuild b/x11-libs/libXrandr/libXrandr-1.5.1-r1.ebuild
index 271af5bb90e6..0a80a41e1842 100644
--- a/x11-libs/libXrandr/libXrandr-1.5.1-r1.ebuild
+++ b/x11-libs/libXrandr/libXrandr-1.5.1-r1.ebuild
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Xrandr library"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libXrender/libXrender-0.9.10-r1.ebuild b/x11-libs/libXrender/libXrender-0.9.10-r1.ebuild
index 9c3c6b06579a..b205dec2a0c0 100644
--- a/x11-libs/libXrender/libXrender-0.9.10-r1.ebuild
+++ b/x11-libs/libXrender/libXrender-0.9.10-r1.ebuild
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Xrender library"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libXt/libXt-1.1.5-r1.ebuild b/x11-libs/libXt/libXt-1.1.5-r1.ebuild
index 01e3155a1e8d..613851d24a42 100644
--- a/x11-libs/libXt/libXt-1.1.5-r1.ebuild
+++ b/x11-libs/libXt/libXt-1.1.5-r1.ebuild
@@ -8,7 +8,7 @@ inherit xorg-2 toolchain-funcs
 
 DESCRIPTION="X.Org X Toolkit Intrinsics library"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="test"
 
 RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libXtst/libXtst-1.2.3-r1.ebuild b/x11-libs/libXtst/libXtst-1.2.3-r1.ebuild
index 245dfc3321b3..756a51d159fb 100644
--- a/x11-libs/libXtst/libXtst-1.2.3-r1.ebuild
+++ b/x11-libs/libXtst/libXtst-1.2.3-r1.ebuild
@@ -9,7 +9,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Xlib-based client API for the XTEST & RECORD extensions library"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libXv/libXv-1.0.11-r1.ebuild b/x11-libs/libXv/libXv-1.0.11-r1.ebuild
index 5755b4641418..608ec8e0dccd 100644
--- a/x11-libs/libXv/libXv-1.0.11-r1.ebuild
+++ b/x11-libs/libXv/libXv-1.0.11-r1.ebuild
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Xv library"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libXxf86vm/libXxf86vm-1.1.4-r1.ebuild b/x11-libs/libXxf86vm/libXxf86vm-1.1.4-r1.ebuild
index 0f80ab8fea46..31ddf7a13cc7 100644
--- a/x11-libs/libXxf86vm/libXxf86vm-1.1.4-r1.ebuild
+++ b/x11-libs/libXxf86vm/libXxf86vm-1.1.4-r1.ebuild
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Xxf86vm library"
 
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libdrm/libdrm-2.4.89.ebuild b/x11-libs/libdrm/libdrm-2.4.89.ebuild
index 5967bc7164e3..d730ab8fab43 100644
--- a/x11-libs/libdrm/libdrm-2.4.89.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.89.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999* ]]; then
 	EGIT_REPO_URI="https://anongit.freedesktop.org/git/mesa/drm.git"
 else
 	SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 fi
 
 VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware"
diff --git a/x11-libs/libdrm/libdrm-2.4.91.ebuild b/x11-libs/libdrm/libdrm-2.4.91.ebuild
index 5eb1bc8ff251..78bbb3f2cc44 100644
--- a/x11-libs/libdrm/libdrm-2.4.91.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.91.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 fi
 
 VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware"
diff --git a/x11-libs/libdrm/libdrm-2.4.92.ebuild b/x11-libs/libdrm/libdrm-2.4.92.ebuild
index e516fe208c88..ec0bdd16c350 100644
--- a/x11-libs/libdrm/libdrm-2.4.92.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.92.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 fi
 
 VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware"
diff --git a/x11-libs/libdrm/libdrm-2.4.93.ebuild b/x11-libs/libdrm/libdrm-2.4.93.ebuild
index 3395dc4f6cec..a95c09ec6788 100644
--- a/x11-libs/libdrm/libdrm-2.4.93.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.93.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+	KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 fi
 
 VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware"
diff --git a/x11-libs/libdrm/libdrm-9999.ebuild b/x11-libs/libdrm/libdrm-9999.ebuild
index e516fe208c88..ec0bdd16c350 100644
--- a/x11-libs/libdrm/libdrm-9999.ebuild
+++ b/x11-libs/libdrm/libdrm-9999.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 fi
 
 VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware"
diff --git a/x11-libs/libfontenc/libfontenc-1.1.3-r1.ebuild b/x11-libs/libfontenc/libfontenc-1.1.3-r1.ebuild
index 260a06ad7415..d2b4e89fe49c 100644
--- a/x11-libs/libfontenc/libfontenc-1.1.3-r1.ebuild
+++ b/x11-libs/libfontenc/libfontenc-1.1.3-r1.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org fontenc library"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="sys-libs/zlib"
diff --git a/x11-libs/libnotify/libnotify-0.7.6-r3.ebuild b/x11-libs/libnotify/libnotify-0.7.6-r3.ebuild
index bb919cb7bab0..9eef580869b9 100644
--- a/x11-libs/libnotify/libnotify-0.7.6-r3.ebuild
+++ b/x11-libs/libnotify/libnotify-0.7.6-r3.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://git.gnome.org/browse/libnotify"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="+introspection test"
 
 RDEPEND="
diff --git a/x11-libs/libnotify/libnotify-0.7.7.ebuild b/x11-libs/libnotify/libnotify-0.7.7.ebuild
index d66913a9afaf..7616626ccace 100644
--- a/x11-libs/libnotify/libnotify-0.7.7.ebuild
+++ b/x11-libs/libnotify/libnotify-0.7.7.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://git.gnome.org/browse/libnotify"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="+introspection test"
 
 RDEPEND="
diff --git a/x11-libs/libpciaccess/libpciaccess-0.14.ebuild b/x11-libs/libpciaccess/libpciaccess-0.14.ebuild
index 27d19496e55f..16b611ed00bd 100644
--- a/x11-libs/libpciaccess/libpciaccess-0.14.ebuild
+++ b/x11-libs/libpciaccess/libpciaccess-0.14.ebuild
@@ -7,7 +7,7 @@ XORG_MULTILIB=yes
 inherit xorg-2
 
 DESCRIPTION="Library providing generic access to the PCI bus and devices"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="zlib"
 
 DEPEND="!<x11-base/xorg-server-1.5
diff --git a/x11-libs/libxcb/libxcb-1.13.ebuild b/x11-libs/libxcb/libxcb-1.13.ebuild
index cccb4a8a0b00..102ff1507d80 100644
--- a/x11-libs/libxcb/libxcb-1.13.ebuild
+++ b/x11-libs/libxcb/libxcb-1.13.ebuild
@@ -16,7 +16,7 @@ EGIT_REPO_URI="https://anongit.freedesktop.org/git/xcb/libxcb.git"
 [[ ${PV} != 9999* ]] && \
 	SRC_URI="https://xcb.freedesktop.org/dist/${P}.tar.bz2"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc selinux test xkb"
 SLOT="0/1.12"
 
diff --git a/x11-libs/libxkbfile/libxkbfile-1.0.9-r2.ebuild b/x11-libs/libxkbfile/libxkbfile-1.0.9-r2.ebuild
index 74a529e35b09..f674bb0a3ad0 100644
--- a/x11-libs/libxkbfile/libxkbfile-1.0.9-r2.ebuild
+++ b/x11-libs/libxkbfile/libxkbfile-1.0.9-r2.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org xkbfile library"
 
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libxshmfence/libxshmfence-1.3-r1.ebuild b/x11-libs/libxshmfence/libxshmfence-1.3-r1.ebuild
index f185fc38d7fd..79f8f3ecdf62 100644
--- a/x11-libs/libxshmfence/libxshmfence-1.3-r1.ebuild
+++ b/x11-libs/libxshmfence/libxshmfence-1.3-r1.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
 
 DESCRIPTION="Shared memory fences using futexes"
 
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/x11-libs/pango/pango-1.40.14-r1.ebuild b/x11-libs/pango/pango-1.40.14-r1.ebuild
index 11af940b9d31..91243e67b181 100644
--- a/x11-libs/pango/pango-1.40.14-r1.ebuild
+++ b/x11-libs/pango/pango-1.40.14-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.pango.org/"
 
 LICENSE="LGPL-2+ FTL"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 IUSE="X +introspection test"
 
diff --git a/x11-libs/pango/pango-1.42.4.ebuild b/x11-libs/pango/pango-1.42.4.ebuild
index 86f894866ac4..de270e632c78 100644
--- a/x11-libs/pango/pango-1.42.4.ebuild
+++ b/x11-libs/pango/pango-1.42.4.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.pango.org/"
 
 LICENSE="LGPL-2+ FTL"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 IUSE="X +introspection test"
 
diff --git a/x11-libs/startup-notification/startup-notification-0.12-r1.ebuild b/x11-libs/startup-notification/startup-notification-0.12-r1.ebuild
index 5ab3c6b03cbb..323479b453fc 100644
--- a/x11-libs/startup-notification/startup-notification-0.12-r1.ebuild
+++ b/x11-libs/startup-notification/startup-notification-0.12-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/releases/${P}.tar.gz"
 
 LICENSE="LGPL-2 MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=x11-libs/libX11-1.4.3
diff --git a/x11-libs/vte/vte-0.28.2-r208.ebuild b/x11-libs/vte/vte-0.28.2-r208.ebuild
index 9ff769292a1c..ee46bf6bbbd9 100644
--- a/x11-libs/vte/vte-0.28.2-r208.ebuild
+++ b/x11-libs/vte/vte-0.28.2-r208.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/VTE"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE="debug +introspection python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/x11-libs/vte/vte-0.36.5.ebuild b/x11-libs/vte/vte-0.36.5.ebuild
index 7aeb7122d3af..0320ed9f709c 100644
--- a/x11-libs/vte/vte-0.36.5.ebuild
+++ b/x11-libs/vte/vte-0.36.5.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/action/show/Apps/Terminal/VTE"
 LICENSE="LGPL-2+"
 SLOT="2.90"
 IUSE="debug glade +introspection"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 
 PDEPEND=">=x11-libs/gnome-pty-helper-${PV}"
 RDEPEND="
diff --git a/x11-libs/vte/vte-0.48.4.ebuild b/x11-libs/vte/vte-0.48.4.ebuild
index 4a57aac7e9b7..386ce27988cf 100644
--- a/x11-libs/vte/vte-0.48.4.ebuild
+++ b/x11-libs/vte/vte-0.48.4.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/action/show/Apps/Terminal/VTE"
 LICENSE="LGPL-2+"
 SLOT="2.91"
 IUSE="+crypt debug glade +introspection vala vanilla"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 REQUIRED_USE="vala? ( introspection )"
 
 SRC_URI="${SRC_URI} !vanilla? ( https://dev.gentoo.org/~eva/distfiles/${PN}/${P}-command-notify.patch.xz )"
diff --git a/x11-libs/xcb-util-image/xcb-util-image-0.4.0-r1.ebuild b/x11-libs/xcb-util-image/xcb-util-image-0.4.0-r1.ebuild
index ad8310e9b70e..cffe41c8dbd0 100644
--- a/x11-libs/xcb-util-image/xcb-util-image-0.4.0-r1.ebuild
+++ b/x11-libs/xcb-util-image/xcb-util-image-0.4.0-r1.ebuild
@@ -14,7 +14,7 @@ EGIT_REPO_URI="https://anongit.freedesktop.org/git/xcb/util-image.git"
 DESCRIPTION="X C-language Bindings sample implementations"
 HOMEPAGE="https://xcb.freedesktop.org/"
 
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="test"
 
 RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.4.0-r1.ebuild b/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.4.0-r1.ebuild
index 07f7f585d6a2..21e675f69d9a 100644
--- a/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.4.0-r1.ebuild
+++ b/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.4.0-r1.ebuild
@@ -14,7 +14,7 @@ EGIT_REPO_URI="https://anongit.freedesktop.org/git/xcb/util-keysyms.git"
 DESCRIPTION="X C-language Bindings sample implementations"
 HOMEPAGE="https://xcb.freedesktop.org/"
 
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="test"
 
 RDEPEND="x11-libs/libxcb:=[${MULTILIB_USEDEP}]"
diff --git a/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.9-r2.ebuild b/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.9-r2.ebuild
index dcef6ff96031..2ccf528bf096 100644
--- a/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.9-r2.ebuild
+++ b/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.9-r2.ebuild
@@ -15,7 +15,7 @@ EGIT_HAS_SUBMODULES=yes
 DESCRIPTION="X C-language Bindings sample implementations"
 HOMEPAGE="https://xcb.freedesktop.org/"
 
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="test"
 
 RDEPEND=">=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]"
diff --git a/x11-libs/xcb-util/xcb-util-0.4.0-r1.ebuild b/x11-libs/xcb-util/xcb-util-0.4.0-r1.ebuild
index 19ecb0f2b80c..0ab6cfec776c 100644
--- a/x11-libs/xcb-util/xcb-util-0.4.0-r1.ebuild
+++ b/x11-libs/xcb-util/xcb-util-0.4.0-r1.ebuild
@@ -14,7 +14,7 @@ EGIT_REPO_URI="https://anongit.freedesktop.org/git/xcb/util.git"
 DESCRIPTION="X C-language Bindings sample implementations"
 HOMEPAGE="https://xcb.freedesktop.org/"
 
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="test"
 
 RDEPEND=">=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]"
diff --git a/x11-libs/xtrans/xtrans-1.3.5.ebuild b/x11-libs/xtrans/xtrans-1.3.5.ebuild
index e14fffdb7424..2f0195136379 100644
--- a/x11-libs/xtrans/xtrans-1.3.5.ebuild
+++ b/x11-libs/xtrans/xtrans-1.3.5.ebuild
@@ -10,7 +10,7 @@ XORG_DOC=doc
 inherit xorg-2
 
 DESCRIPTION="X.Org xtrans library"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=""