commit:     f68a9a0baebf3d178e1da2fa99280b1146fc7920
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 11 15:38:31 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Oct 11 15:38:31 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f68a9a0b

x11-libs: Remove *-fbsd KEYWORDS

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 x11-libs/agg/agg-2.5-r3.ebuild                                    | 2 +-
 x11-libs/cairo/cairo-1.16.0-r3.ebuild                             | 2 +-
 x11-libs/cairo/cairo-9999.ebuild                                  | 2 +-
 x11-libs/colord-gtk/colord-gtk-0.1.26.ebuild                      | 2 +-
 x11-libs/fltk/fltk-1.3.3-r3.ebuild                                | 2 +-
 x11-libs/fltk/fltk-1.3.4.ebuild                                   | 2 +-
 x11-libs/fltk/fltk-1.3.5-r2.ebuild                                | 2 +-
 x11-libs/fox-wrapper/fox-wrapper-3.ebuild                         | 2 +-
 x11-libs/fox/fox-1.6.49.ebuild                                    | 2 +-
 x11-libs/fox/fox-1.6.50.ebuild                                    | 2 +-
 x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.12.ebuild                     | 2 +-
 x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.1.ebuild                      | 2 +-
 x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.2.ebuild                      | 2 +-
 x11-libs/gnome-pty-helper/gnome-pty-helper-0.40.2.ebuild          | 2 +-
 x11-libs/goffice/goffice-0.10.41.ebuild                           | 2 +-
 x11-libs/goffice/goffice-0.10.43.ebuild                           | 2 +-
 x11-libs/goocanvas/goocanvas-1.0.0.ebuild                         | 2 +-
 x11-libs/goocanvas/goocanvas-2.0.4.ebuild                         | 2 +-
 x11-libs/gtk+/gtk+-2.24.32-r1.ebuild                              | 2 +-
 x11-libs/gtk+/gtk+-3.24.1.ebuild                                  | 2 +-
 x11-libs/gtk+/gtk+-3.24.10.ebuild                                 | 2 +-
 x11-libs/gtk+/gtk+-3.24.11.ebuild                                 | 2 +-
 x11-libs/gtk+/gtk+-3.24.4-r1.ebuild                               | 2 +-
 x11-libs/gtk+/gtk+-3.24.8.ebuild                                  | 2 +-
 x11-libs/gtkglarea/gtkglarea-2.0.1-r1.ebuild                      | 2 +-
 x11-libs/gtkglarea/gtkglarea-2.1.0.ebuild                         | 2 +-
 x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild                        | 2 +-
 x11-libs/gtksourceview/gtksourceview-2.10.5-r3.ebuild             | 2 +-
 x11-libs/gtksourceview/gtksourceview-3.24.11.ebuild               | 2 +-
 x11-libs/gtksourceview/gtksourceview-4.2.0.ebuild                 | 2 +-
 x11-libs/libFS/libFS-1.0.8.ebuild                                 | 2 +-
 x11-libs/libICE/libICE-1.0.10.ebuild                              | 2 +-
 x11-libs/libSM/libSM-1.2.3.ebuild                                 | 2 +-
 x11-libs/libX11/libX11-1.6.8.ebuild                               | 2 +-
 x11-libs/libX11/libX11-1.6.9.ebuild                               | 2 +-
 x11-libs/libXScrnSaver/libXScrnSaver-1.2.3.ebuild                 | 2 +-
 x11-libs/libXau/libXau-1.0.9.ebuild                               | 2 +-
 x11-libs/libXaw/libXaw-1.0.13-r1.ebuild                           | 2 +-
 x11-libs/libXaw3d/libXaw3d-1.6.3.ebuild                           | 2 +-
 x11-libs/libXcomposite/libXcomposite-0.4.5.ebuild                 | 2 +-
 x11-libs/libXcursor/libXcursor-1.2.0.ebuild                       | 2 +-
 x11-libs/libXdamage/libXdamage-1.1.5.ebuild                       | 2 +-
 x11-libs/libXdmcp/libXdmcp-1.1.3.ebuild                           | 2 +-
 x11-libs/libXext/libXext-1.3.4.ebuild                             | 2 +-
 x11-libs/libXfixes/libXfixes-5.0.3-r1.ebuild                      | 2 +-
 x11-libs/libXfont2/libXfont2-2.0.4.ebuild                         | 2 +-
 x11-libs/libXft/libXft-2.3.3.ebuild                               | 2 +-
 x11-libs/libXi/libXi-1.7.10.ebuild                                | 2 +-
 x11-libs/libXinerama/libXinerama-1.1.4.ebuild                     | 2 +-
 x11-libs/libXmu/libXmu-1.1.3.ebuild                               | 2 +-
 x11-libs/libXpm/libXpm-3.5.12-r1.ebuild                           | 2 +-
 x11-libs/libXpresent/libXpresent-1.0.0-r1.ebuild                  | 2 +-
 x11-libs/libXrandr/libXrandr-1.5.2.ebuild                         | 2 +-
 x11-libs/libXrender/libXrender-0.9.10-r1.ebuild                   | 2 +-
 x11-libs/libXres/libXres-1.2.0-r1.ebuild                          | 2 +-
 x11-libs/libXt/libXt-1.2.0.ebuild                                 | 2 +-
 x11-libs/libXtst/libXtst-1.2.3-r1.ebuild                          | 2 +-
 x11-libs/libXv/libXv-1.0.11-r1.ebuild                             | 2 +-
 x11-libs/libXvMC/libXvMC-1.0.11.ebuild                            | 2 +-
 x11-libs/libXvMC/libXvMC-1.0.12.ebuild                            | 2 +-
 x11-libs/libXxf86dga/libXxf86dga-1.1.5.ebuild                     | 2 +-
 x11-libs/libXxf86misc/libXxf86misc-1.0.4.ebuild                   | 2 +-
 x11-libs/libXxf86vm/libXxf86vm-1.1.4-r1.ebuild                    | 2 +-
 x11-libs/libast/libast-0.7-r2.ebuild                              | 2 +-
 x11-libs/libcryptui/libcryptui-3.12.2-r1.ebuild                   | 2 +-
 x11-libs/libdmx/libdmx-1.1.4.ebuild                               | 2 +-
 x11-libs/libdrm/libdrm-2.4.99.ebuild                              | 2 +-
 x11-libs/libdrm/libdrm-9999.ebuild                                | 2 +-
 x11-libs/libfontenc/libfontenc-1.1.4.ebuild                       | 2 +-
 x11-libs/libnotify/libnotify-0.7.7-r1.ebuild                      | 2 +-
 x11-libs/libnotify/libnotify-0.7.8.ebuild                         | 2 +-
 x11-libs/libpciaccess/libpciaccess-0.16.ebuild                    | 2 +-
 x11-libs/libvdpau/libvdpau-1.2.ebuild                             | 2 +-
 x11-libs/libvdpau/libvdpau-1.3.ebuild                             | 2 +-
 x11-libs/libwnck/libwnck-2.31.0.ebuild                            | 2 +-
 x11-libs/libwnck/libwnck-3.30.0.ebuild                            | 2 +-
 x11-libs/libxcb/libxcb-1.13.1.ebuild                              | 2 +-
 x11-libs/libxkbcommon/libxkbcommon-0.8.4.ebuild                   | 2 +-
 x11-libs/libxkbfile/libxkbfile-1.1.0.ebuild                       | 2 +-
 x11-libs/libxklavier/libxklavier-5.4.ebuild                       | 2 +-
 x11-libs/libxshmfence/libxshmfence-1.3-r1.ebuild                  | 2 +-
 x11-libs/motif/motif-2.3.8-r1.ebuild                              | 2 +-
 x11-libs/neXtaw/neXtaw-0.15.1-r3.ebuild                           | 2 +-
 x11-libs/pango/pango-1.42.4-r2.ebuild                             | 2 +-
 x11-libs/pangox-compat/pangox-compat-0.0.2-r1.ebuild              | 2 +-
 x11-libs/pangox-compat/pangox-compat-0.0.2.ebuild                 | 2 +-
 x11-libs/pixman/pixman-0.38.4.ebuild                              | 2 +-
 x11-libs/pixman/pixman-9999.ebuild                                | 2 +-
 x11-libs/rep-gtk/rep-gtk-0.90.8.3.ebuild                          | 2 +-
 x11-libs/startup-notification/startup-notification-0.12-r1.ebuild | 2 +-
 x11-libs/vte/vte-0.28.2-r208.ebuild                               | 2 +-
 x11-libs/vte/vte-0.48.4.ebuild                                    | 2 +-
 x11-libs/vte/vte-0.54.4.ebuild                                    | 2 +-
 x11-libs/vte/vte-0.56.3.ebuild                                    | 2 +-
 x11-libs/wxGTK/wxGTK-3.0.3-r300.ebuild                            | 2 +-
 x11-libs/wxGTK/wxGTK-3.0.3.ebuild                                 | 2 +-
 x11-libs/wxGTK/wxGTK-3.0.4-r1.ebuild                              | 2 +-
 x11-libs/wxGTK/wxGTK-3.0.4-r2.ebuild                              | 2 +-
 x11-libs/wxGTK/wxGTK-3.0.4-r300.ebuild                            | 2 +-
 x11-libs/wxGTK/wxGTK-3.0.4-r301.ebuild                            | 2 +-
 x11-libs/wxGTK/wxGTK-3.0.4-r302.ebuild                            | 2 +-
 x11-libs/wxGTK/wxGTK-3.0.4.ebuild                                 | 2 +-
 x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r2.ebuild          | 2 +-
 x11-libs/xcb-util-image/xcb-util-image-0.4.0-r1.ebuild            | 2 +-
 x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.4.0-r1.ebuild        | 2 +-
 x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.9-r2.ebuild  | 2 +-
 x11-libs/xcb-util-wm/xcb-util-wm-0.4.1-r2.ebuild                  | 2 +-
 x11-libs/xcb-util/xcb-util-0.4.0-r1.ebuild                        | 2 +-
 x11-libs/xosd/xosd-2.2.14-r1.ebuild                               | 2 +-
 x11-libs/xosd/xosd-2.2.14_p2_p1.ebuild                            | 2 +-
 x11-libs/xtrans/xtrans-1.4.0.ebuild                               | 2 +-
 111 files changed, 111 insertions(+), 111 deletions(-)

diff --git a/x11-libs/agg/agg-2.5-r3.ebuild b/x11-libs/agg/agg-2.5-r3.ebuild
index 98492c566a2..78e303ff492 100644
--- a/x11-libs/agg/agg-2.5-r3.ebuild
+++ b/x11-libs/agg/agg-2.5-r3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://antigrain.com/${P}.tar.gz";
 
 LICENSE="GPL-2 gpc? ( free-noncomm )"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux 
~x86-linux"
+KEYWORDS="amd64 ~arm ~hppa ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+gpc sdl static-libs +truetype +X"
 
 # preffer X with enabled xcb, really

diff --git a/x11-libs/cairo/cairo-1.16.0-r3.ebuild 
b/x11-libs/cairo/cairo-1.16.0-r3.ebuild
index 6c8fc8546e0..b759d204805 100644
--- a/x11-libs/cairo/cairo-1.16.0-r3.ebuild
+++ b/x11-libs/cairo/cairo-1.16.0-r3.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 ~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-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 cc6873271ec..f2e28c9ed36 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 ~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-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/colord-gtk/colord-gtk-0.1.26.ebuild 
b/x11-libs/colord-gtk/colord-gtk-0.1.26.ebuild
index ea830dad04d..a388681d24d 100644
--- a/x11-libs/colord-gtk/colord-gtk-0.1.26.ebuild
+++ b/x11-libs/colord-gtk/colord-gtk-0.1.26.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://www.freedesktop.org/software/colord/releases/${P}.tar.xz";
 
 LICENSE="LGPL-3+"
 SLOT="0/1" # subslot = libcolord-gtk soname version
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 
~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 
 # We still need to build gtk-doc, 
https://bugs.freedesktop.org/show_bug.cgi?id=69107
 IUSE="doc +introspection vala"

diff --git a/x11-libs/fltk/fltk-1.3.3-r3.ebuild 
b/x11-libs/fltk/fltk-1.3.3-r3.ebuild
index e0631dc59cc..aaa5aa2bbd5 100644
--- a/x11-libs/fltk/fltk-1.3.3-r3.ebuild
+++ b/x11-libs/fltk/fltk-1.3.3-r3.ebuild
@@ -10,7 +10,7 @@ 
SRC_URI="https://www.fltk.org/pub/${PN}/${PV}/${P}-source.tar.gz";
 
 SLOT="1"
 LICENSE="FLTK LGPL-2"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd 
~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux 
~x86-linux ~x86-macos"
 IUSE="cairo debug doc examples games +opengl static-libs +threads +xft 
+xinerama"
 
 RDEPEND="

diff --git a/x11-libs/fltk/fltk-1.3.4.ebuild b/x11-libs/fltk/fltk-1.3.4.ebuild
index 19245b16e22..14c0aafdc53 100644
--- a/x11-libs/fltk/fltk-1.3.4.ebuild
+++ b/x11-libs/fltk/fltk-1.3.4.ebuild
@@ -10,7 +10,7 @@ 
SRC_URI="https://www.fltk.org/pub/${PN}/${PV}/${P}-source.tar.gz";
 
 SLOT="1"
 LICENSE="FLTK LGPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 
~amd64-linux ~x86-linux ~x86-macos"
 IUSE="cairo debug doc examples games +opengl static-libs +threads +xft 
+xinerama"
 
 RDEPEND="

diff --git a/x11-libs/fltk/fltk-1.3.5-r2.ebuild 
b/x11-libs/fltk/fltk-1.3.5-r2.ebuild
index 5688e630c5e..1a7a9638b19 100644
--- a/x11-libs/fltk/fltk-1.3.5-r2.ebuild
+++ b/x11-libs/fltk/fltk-1.3.5-r2.ebuild
@@ -10,7 +10,7 @@ 
SRC_URI="https://www.fltk.org/pub/${PN}/${PV}/${P}-source.tar.gz";
 
 SLOT="1"
 LICENSE="FLTK LGPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 
~amd64-linux ~x86-linux ~x86-macos"
 IUSE="cairo debug doc examples games +opengl static-libs +threads +xft 
+xinerama"
 
 RDEPEND="

diff --git a/x11-libs/fox-wrapper/fox-wrapper-3.ebuild 
b/x11-libs/fox-wrapper/fox-wrapper-3.ebuild
index 6fcc4113bf1..9826efa3129 100644
--- a/x11-libs/fox-wrapper/fox-wrapper-3.ebuild
+++ b/x11-libs/fox-wrapper/fox-wrapper-3.ebuild
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 
~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=""

diff --git a/x11-libs/fox/fox-1.6.49.ebuild b/x11-libs/fox/fox-1.6.49.ebuild
index fde8d32d03a..ef0f71f8e06 100644
--- a/x11-libs/fox/fox-1.6.49.ebuild
+++ b/x11-libs/fox/fox-1.6.49.ebuild
@@ -7,7 +7,7 @@ inherit eutils fox
 
 LICENSE="LGPL-2.1"
 SLOT="1.6"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE="+bzip2 +jpeg +opengl +png tiff +truetype +zlib"
 
 RDEPEND="x11-libs/libXrandr

diff --git a/x11-libs/fox/fox-1.6.50.ebuild b/x11-libs/fox/fox-1.6.50.ebuild
index b44e36ac786..330f85c8a75 100644
--- a/x11-libs/fox/fox-1.6.50.ebuild
+++ b/x11-libs/fox/fox-1.6.50.ebuild
@@ -7,7 +7,7 @@ inherit eutils fox
 
 LICENSE="LGPL-2.1"
 SLOT="1.6"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 
~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="+bzip2 +jpeg +opengl +png tiff +truetype +zlib"
 
 RDEPEND="x11-libs/libXrandr

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 abf08b26b45..63600effa7d 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 ~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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="X debug +introspection jpeg tiff test"
 
 # Remove SRC_URI when gnome bug #795069 is fixed

diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.1.ebuild 
b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.1.ebuild
index 742cfe83cb1..b6c4d2b8018 100644
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.1.ebuild
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.1.ebuild
@@ -10,7 +10,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 ~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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="X gtk-doc +introspection jpeg tiff"
 
 # TODO: For windows/darwin support: shared-mime-info conditional, 
native_windows_loaders option review

diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.2.ebuild 
b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.2.ebuild
index 35bdc66994e..59812852fb3 100644
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.2.ebuild
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.2.ebuild
@@ -10,7 +10,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 ~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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="X gtk-doc +introspection jpeg tiff"
 
 # TODO: For windows/darwin support: shared-mime-info conditional, 
native_windows_loaders option review

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 c254408c7dd..095161f7724 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/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 ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 
~amd64-linux ~x86-linux"
 IUSE="+hardened"
 
 # gnome-pty-helper was spit out with 0.27.90

diff --git a/x11-libs/goffice/goffice-0.10.41.ebuild 
b/x11-libs/goffice/goffice-0.10.41.ebuild
index 6ce1d66a8eb..bf0f4ec8c4b 100644
--- a/x11-libs/goffice/goffice-0.10.41.ebuild
+++ b/x11-libs/goffice/goffice-0.10.41.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://git.gnome.org/browse/goffice/";
 
 LICENSE="GPL-2"
 SLOT="0.10"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd 
~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux 
~x86-linux ~x64-solaris"
 IUSE="+introspection"
 
 # FIXME: add lasem to tree

diff --git a/x11-libs/goffice/goffice-0.10.43.ebuild 
b/x11-libs/goffice/goffice-0.10.43.ebuild
index 690248f0287..c6f1937ccbd 100644
--- a/x11-libs/goffice/goffice-0.10.43.ebuild
+++ b/x11-libs/goffice/goffice-0.10.43.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/goffice/";
 
 LICENSE="GPL-2"
 SLOT="0.10"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd 
~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux 
~x86-linux ~x64-solaris"
 IUSE="+introspection"
 
 # FIXME: add lasem to tree

diff --git a/x11-libs/goocanvas/goocanvas-1.0.0.ebuild 
b/x11-libs/goocanvas/goocanvas-1.0.0.ebuild
index 1f7e1454778..fa288d656dd 100644
--- a/x11-libs/goocanvas/goocanvas-1.0.0.ebuild
+++ b/x11-libs/goocanvas/goocanvas-1.0.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GooCanvas";
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux 
~x86-linux"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 RDEPEND="

diff --git a/x11-libs/goocanvas/goocanvas-2.0.4.ebuild 
b/x11-libs/goocanvas/goocanvas-2.0.4.ebuild
index dcf4b83a0e6..411d9cb1b05 100644
--- a/x11-libs/goocanvas/goocanvas-2.0.4.ebuild
+++ b/x11-libs/goocanvas/goocanvas-2.0.4.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/GooCanvas";
 
 LICENSE="LGPL-2"
 SLOT="2.0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
 IUSE="examples +introspection python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 

diff --git a/x11-libs/gtk+/gtk+-2.24.32-r1.ebuild 
b/x11-libs/gtk+/gtk+-2.24.32-r1.ebuild
index 59b15296034..3d5b08622f6 100644
--- a/x11-libs/gtk+/gtk+-2.24.32-r1.ebuild
+++ b/x11-libs/gtk+/gtk+-2.24.32-r1.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 ~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-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.24.1.ebuild b/x11-libs/gtk+/gtk+-3.24.1.ebuild
index b06c229a87d..f11ad18ee97 100644
--- a/x11-libs/gtk+/gtk+-3.24.1.ebuild
+++ b/x11-libs/gtk+/gtk+-3.24.1.ebuild
@@ -18,7 +18,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 ~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-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.24.10.ebuild 
b/x11-libs/gtk+/gtk+-3.24.10.ebuild
index c6c3df1c4b1..6fa0df4f0b2 100644
--- a/x11-libs/gtk+/gtk+-3.24.10.ebuild
+++ b/x11-libs/gtk+/gtk+-3.24.10.ebuild
@@ -18,7 +18,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 ~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-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.24.11.ebuild 
b/x11-libs/gtk+/gtk+-3.24.11.ebuild
index 02e0bf47e15..05a59ced16c 100644
--- a/x11-libs/gtk+/gtk+-3.24.11.ebuild
+++ b/x11-libs/gtk+/gtk+-3.24.11.ebuild
@@ -18,7 +18,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 ~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-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.24.4-r1.ebuild 
b/x11-libs/gtk+/gtk+-3.24.4-r1.ebuild
index cbc785377ab..e3217afab7e 100644
--- a/x11-libs/gtk+/gtk+-3.24.4-r1.ebuild
+++ b/x11-libs/gtk+/gtk+-3.24.4-r1.ebuild
@@ -18,7 +18,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 ~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-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.24.8.ebuild b/x11-libs/gtk+/gtk+-3.24.8.ebuild
index 2d9a9b11f63..0f01ee9831f 100644
--- a/x11-libs/gtk+/gtk+-3.24.8.ebuild
+++ b/x11-libs/gtk+/gtk+-3.24.8.ebuild
@@ -19,7 +19,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 ~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-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/gtkglarea/gtkglarea-2.0.1-r1.ebuild 
b/x11-libs/gtkglarea/gtkglarea-2.0.1-r1.ebuild
index cb9a9c4063b..a90b252b4c6 100644
--- a/x11-libs/gtkglarea/gtkglarea-2.0.1-r1.ebuild
+++ b/x11-libs/gtkglarea/gtkglarea-2.0.1-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.mono-project.com/archived/gtkglarea/";
 
 LICENSE="LGPL-2+ GPL-2+" # examples are GPL-2+, library is LGPL-2+
 SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd 
~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-linux 
~x86-linux"
 IUSE="examples"
 
 RDEPEND=">=x11-libs/gtk+-2.0.3:2

diff --git a/x11-libs/gtkglarea/gtkglarea-2.1.0.ebuild 
b/x11-libs/gtkglarea/gtkglarea-2.1.0.ebuild
index ec6c963a105..96ee0444ee5 100644
--- a/x11-libs/gtkglarea/gtkglarea-2.1.0.ebuild
+++ b/x11-libs/gtkglarea/gtkglarea-2.1.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.mono-project.com/archived/gtkglarea/";
 
 LICENSE="LGPL-2+ GPL-2+" # examples are GPL-2+, library is LGPL-2+
 SLOT="2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 
~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 
~amd64-linux ~x86-linux"
 IUSE="examples"
 
 RDEPEND="

diff --git a/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild 
b/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild
index 4276833aa20..ada7eb76d17 100644
--- a/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild
+++ b/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd 
~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux 
~x86-linux"
 IUSE=""
 
 RDEPEND="

diff --git a/x11-libs/gtksourceview/gtksourceview-2.10.5-r3.ebuild 
b/x11-libs/gtksourceview/gtksourceview-2.10.5-r3.ebuild
index d21a6d5a14d..da35f28e5a6 100644
--- a/x11-libs/gtksourceview/gtksourceview-2.10.5-r3.ebuild
+++ b/x11-libs/gtksourceview/gtksourceview-2.10.5-r3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.gnome.org/";
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="2.0"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 
~amd64-linux ~x86-linux ~x86-solaris"
 IUSE=""
 
 RDEPEND="

diff --git a/x11-libs/gtksourceview/gtksourceview-3.24.11.ebuild 
b/x11-libs/gtksourceview/gtksourceview-3.24.11.ebuild
index 56272d5b1ce..653d1abc6be 100644
--- a/x11-libs/gtksourceview/gtksourceview-3.24.11.ebuild
+++ b/x11-libs/gtksourceview/gtksourceview-3.24.11.ebuild
@@ -16,7 +16,7 @@ SLOT="3.0/3"
 IUSE="glade +introspection +vala"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="alpha amd64 arm arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd 
~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 
 RDEPEND="
        >=dev-libs/glib-2.48:2

diff --git a/x11-libs/gtksourceview/gtksourceview-4.2.0.ebuild 
b/x11-libs/gtksourceview/gtksourceview-4.2.0.ebuild
index 3fab679122c..3f3ddb9091e 100644
--- a/x11-libs/gtksourceview/gtksourceview-4.2.0.ebuild
+++ b/x11-libs/gtksourceview/gtksourceview-4.2.0.ebuild
@@ -16,7 +16,7 @@ SLOT="4"
 IUSE="glade +introspection +vala"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 
 RDEPEND="
        >=dev-libs/glib-2.48:2

diff --git a/x11-libs/libFS/libFS-1.0.8.ebuild 
b/x11-libs/libFS/libFS-1.0.8.ebuild
index 7819d972355..62c6bf14584 100644
--- a/x11-libs/libFS/libFS-1.0.8.ebuild
+++ b/x11-libs/libFS/libFS-1.0.8.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org FS library"
 
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 
~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="ipv6"
 
 DEPEND="x11-base/xorg-proto

diff --git a/x11-libs/libICE/libICE-1.0.10.ebuild 
b/x11-libs/libICE/libICE-1.0.10.ebuild
index 5761add9e76..47e97098721 100644
--- a/x11-libs/libICE/libICE-1.0.10.ebuild
+++ b/x11-libs/libICE/libICE-1.0.10.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Inter-Client Exchange library"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 
~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="ipv6"
 
 DEPEND="x11-base/xorg-proto

diff --git a/x11-libs/libSM/libSM-1.2.3.ebuild 
b/x11-libs/libSM/libSM-1.2.3.ebuild
index 5ad07e3996c..1db39ba474e 100644
--- a/x11-libs/libSM/libSM-1.2.3.ebuild
+++ b/x11-libs/libSM/libSM-1.2.3.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 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-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 ~x64-cygwin ~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.8.ebuild 
b/x11-libs/libX11/libX11-1.6.8.ebuild
index 378e2f72aa9..5eeda931335 100644
--- a/x11-libs/libX11/libX11-1.6.8.ebuild
+++ b/x11-libs/libX11/libX11-1.6.8.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org X11 library"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 
~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 
~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="ipv6 test"
 
 RDEPEND=">=x11-libs/libxcb-1.11.1[${MULTILIB_USEDEP}]"

diff --git a/x11-libs/libX11/libX11-1.6.9.ebuild 
b/x11-libs/libX11/libX11-1.6.9.ebuild
index ff545068a6c..ed1704469e0 100644
--- a/x11-libs/libX11/libX11-1.6.9.ebuild
+++ b/x11-libs/libX11/libX11-1.6.9.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org X11 library"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos"
 IUSE="ipv6 test"
 
 RDEPEND=">=x11-libs/libxcb-1.11.1[${MULTILIB_USEDEP}]

diff --git a/x11-libs/libXScrnSaver/libXScrnSaver-1.2.3.ebuild 
b/x11-libs/libXScrnSaver/libXScrnSaver-1.2.3.ebuild
index d02df00cc4c..fbbabb0bee8 100644
--- a/x11-libs/libXScrnSaver/libXScrnSaver-1.2.3.ebuild
+++ b/x11-libs/libXScrnSaver/libXScrnSaver-1.2.3.ebuild
@@ -7,7 +7,7 @@ XORG_MULTILIB=yes
 inherit xorg-2
 
 DESCRIPTION="X.Org XScrnSaver library"
-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 ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 
~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris 
~x86-solaris"
 IUSE=""
 
 RDEPEND="x11-base/xorg-proto

diff --git a/x11-libs/libXau/libXau-1.0.9.ebuild 
b/x11-libs/libXau/libXau-1.0.9.ebuild
index 863ed99c4dc..38d1b195d2d 100644
--- a/x11-libs/libXau/libXau-1.0.9.ebuild
+++ b/x11-libs/libXau/libXau-1.0.9.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 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-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 ~x64-cygwin ~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 170868ae3bc..4fd09c43a82 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 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-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 ~x64-cygwin ~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/libXaw3d/libXaw3d-1.6.3.ebuild 
b/x11-libs/libXaw3d/libXaw3d-1.6.3.ebuild
index 7b0215fa2e7..aabaaa03894 100644
--- a/x11-libs/libXaw3d/libXaw3d-1.6.3.ebuild
+++ b/x11-libs/libXaw3d/libXaw3d-1.6.3.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Xaw3d library"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris 
~x86-solaris"
 IUSE="unicode xpm"
 
 RDEPEND="x11-libs/libX11

diff --git a/x11-libs/libXcomposite/libXcomposite-0.4.5.ebuild 
b/x11-libs/libXcomposite/libXcomposite-0.4.5.ebuild
index aaf238779f5..9f7608cbf87 100644
--- a/x11-libs/libXcomposite/libXcomposite-0.4.5.ebuild
+++ b/x11-libs/libXcomposite/libXcomposite-0.4.5.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
 
 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 ~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-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris 
~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="

diff --git a/x11-libs/libXcursor/libXcursor-1.2.0.ebuild 
b/x11-libs/libXcursor/libXcursor-1.2.0.ebuild
index 0b21cf280e7..eca02e82efb 100644
--- a/x11-libs/libXcursor/libXcursor-1.2.0.ebuild
+++ b/x11-libs/libXcursor/libXcursor-1.2.0.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 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 ~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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris 
~x64-solaris ~x86-solaris"
 IUSE="doc"
 
 RDEPEND=">=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]

diff --git a/x11-libs/libXdamage/libXdamage-1.1.5.ebuild 
b/x11-libs/libXdamage/libXdamage-1.1.5.ebuild
index d3d80e924f6..a673bbaaf66 100644
--- a/x11-libs/libXdamage/libXdamage-1.1.5.ebuild
+++ b/x11-libs/libXdamage/libXdamage-1.1.5.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 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 ~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-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris 
~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="

diff --git a/x11-libs/libXdmcp/libXdmcp-1.1.3.ebuild 
b/x11-libs/libXdmcp/libXdmcp-1.1.3.ebuild
index b6a22aa7cae..feea6fc3056 100644
--- a/x11-libs/libXdmcp/libXdmcp-1.1.3.ebuild
+++ b/x11-libs/libXdmcp/libXdmcp-1.1.3.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
 
 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 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="elibc_glibc? ( dev-libs/libbsd )"

diff --git a/x11-libs/libXext/libXext-1.3.4.ebuild 
b/x11-libs/libXext/libXext-1.3.4.ebuild
index b62c20f07a8..d2ac43ade89 100644
--- a/x11-libs/libXext/libXext-1.3.4.ebuild
+++ b/x11-libs/libXext/libXext-1.3.4.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xext library"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 
~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND=">=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]"

diff --git a/x11-libs/libXfixes/libXfixes-5.0.3-r1.ebuild 
b/x11-libs/libXfixes/libXfixes-5.0.3-r1.ebuild
index e92d14351fc..32fcc3a3fb0 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 ~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-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.4.ebuild 
b/x11-libs/libXfont2/libXfont2-2.0.4.ebuild
index 659a660a964..84f1af84a08 100644
--- a/x11-libs/libXfont2/libXfont2-2.0.4.ebuild
+++ b/x11-libs/libXfont2/libXfont2-2.0.4.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
 
 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 ~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-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.3.ebuild 
b/x11-libs/libXft/libXft-2.3.3.ebuild
index 88f315e0188..c09a279c8c8 100644
--- a/x11-libs/libXft/libXft-2.3.3.ebuild
+++ b/x11-libs/libXft/libXft-2.3.3.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 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 ~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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="doc"
 
 RDEPEND=">=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]

diff --git a/x11-libs/libXi/libXi-1.7.10.ebuild 
b/x11-libs/libXi/libXi-1.7.10.ebuild
index 1d09b606548..cf71dd8e561 100644
--- a/x11-libs/libXi/libXi-1.7.10.ebuild
+++ b/x11-libs/libXi/libXi-1.7.10.ebuild
@@ -8,7 +8,7 @@ XORG_MULTILIB=yes
 inherit xorg-3
 
 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 ~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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="

diff --git a/x11-libs/libXinerama/libXinerama-1.1.4.ebuild 
b/x11-libs/libXinerama/libXinerama-1.1.4.ebuild
index 0dbff84a96e..d368d6b710c 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 ~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-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.3.ebuild 
b/x11-libs/libXmu/libXmu-1.1.3.ebuild
index 982da180edb..299a6267c67 100644
--- a/x11-libs/libXmu/libXmu-1.1.3.ebuild
+++ b/x11-libs/libXmu/libXmu-1.1.3.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xmu library"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 
~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="ipv6"
 
 RDEPEND="

diff --git a/x11-libs/libXpm/libXpm-3.5.12-r1.ebuild 
b/x11-libs/libXpm/libXpm-3.5.12-r1.ebuild
index 9761493ffd8..84d3cc4c758 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 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-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 ~x64-cygwin ~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/libXpresent/libXpresent-1.0.0-r1.ebuild 
b/x11-libs/libXpresent/libXpresent-1.0.0-r1.ebuild
index b78713721bb..497f8e46a72 100644
--- a/x11-libs/libXpresent/libXpresent-1.0.0-r1.ebuild
+++ b/x11-libs/libXpresent/libXpresent-1.0.0-r1.ebuild
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="X Present Extension C Library"
 
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 
~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 
~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="

diff --git a/x11-libs/libXrandr/libXrandr-1.5.2.ebuild 
b/x11-libs/libXrandr/libXrandr-1.5.2.ebuild
index 8ede6932101..28dd1b0b99d 100644
--- a/x11-libs/libXrandr/libXrandr-1.5.2.ebuild
+++ b/x11-libs/libXrandr/libXrandr-1.5.2.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 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 ~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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="doc"
 
 RDEPEND="

diff --git a/x11-libs/libXrender/libXrender-0.9.10-r1.ebuild 
b/x11-libs/libXrender/libXrender-0.9.10-r1.ebuild
index b205dec2a0c..2bc7074a391 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 ~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-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/libXres/libXres-1.2.0-r1.ebuild 
b/x11-libs/libXres/libXres-1.2.0-r1.ebuild
index f943dd0cebc..b9db64bd2dd 100644
--- a/x11-libs/libXres/libXres-1.2.0-r1.ebuild
+++ b/x11-libs/libXres/libXres-1.2.0-r1.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org XRes library"
 
-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"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 
~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/libXt/libXt-1.2.0.ebuild 
b/x11-libs/libXt/libXt-1.2.0.ebuild
index c12e5e220c5..a3031eda5bd 100644
--- a/x11-libs/libXt/libXt-1.2.0.ebuild
+++ b/x11-libs/libXt/libXt-1.2.0.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org X Toolkit Intrinsics library"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 
~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="test"
 
 RDEPEND="

diff --git a/x11-libs/libXtst/libXtst-1.2.3-r1.ebuild 
b/x11-libs/libXtst/libXtst-1.2.3-r1.ebuild
index 756a51d159f..ddac2c28ef0 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 ~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-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 608ec8e0dcc..91a53ce718b 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 ~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-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/libXvMC/libXvMC-1.0.11.ebuild 
b/x11-libs/libXvMC/libXvMC-1.0.11.ebuild
index 85a4fb51580..95960c87214 100644
--- a/x11-libs/libXvMC/libXvMC-1.0.11.ebuild
+++ b/x11-libs/libXvMC/libXvMC-1.0.11.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org XvMC library"
 
-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-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="

diff --git a/x11-libs/libXvMC/libXvMC-1.0.12.ebuild 
b/x11-libs/libXvMC/libXvMC-1.0.12.ebuild
index 7b097fee4de..bc7f23ae07b 100644
--- a/x11-libs/libXvMC/libXvMC-1.0.12.ebuild
+++ b/x11-libs/libXvMC/libXvMC-1.0.12.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org XvMC library"
 
-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-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="

diff --git a/x11-libs/libXxf86dga/libXxf86dga-1.1.5.ebuild 
b/x11-libs/libXxf86dga/libXxf86dga-1.1.5.ebuild
index 8f51193b1a5..c1276b7d99e 100644
--- a/x11-libs/libXxf86dga/libXxf86dga-1.1.5.ebuild
+++ b/x11-libs/libXxf86dga/libXxf86dga-1.1.5.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xxf86dga library"
 
-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"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 IUSE="doc"
 
 RDEPEND="

diff --git a/x11-libs/libXxf86misc/libXxf86misc-1.0.4.ebuild 
b/x11-libs/libXxf86misc/libXxf86misc-1.0.4.ebuild
index 1c815d1e57e..fed84544102 100644
--- a/x11-libs/libXxf86misc/libXxf86misc-1.0.4.ebuild
+++ b/x11-libs/libXxf86misc/libXxf86misc-1.0.4.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Xxf86misc library"
 
-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"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 
~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/libXxf86vm/libXxf86vm-1.1.4-r1.ebuild 
b/x11-libs/libXxf86vm/libXxf86vm-1.1.4-r1.ebuild
index e8e42c00378..e45264fc836 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 ~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-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/libast/libast-0.7-r2.ebuild 
b/x11-libs/libast/libast-0.7-r2.ebuild
index e357c168a6a..f8921d81d98 100644
--- a/x11-libs/libast/libast-0.7-r2.ebuild
+++ b/x11-libs/libast/libast-0.7-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.eterm.org/download/${P}.tar.gz";
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd 
~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="imlib cpu_flags_x86_mmx pcre"
 
 RDEPEND="

diff --git a/x11-libs/libcryptui/libcryptui-3.12.2-r1.ebuild 
b/x11-libs/libcryptui/libcryptui-3.12.2-r1.ebuild
index 833983133db..f9dd72c1724 100644
--- a/x11-libs/libcryptui/libcryptui-3.12.2-r1.ebuild
+++ b/x11-libs/libcryptui/libcryptui-3.12.2-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Seahorse";
 LICENSE="GPL-2+ LGPL-2.1+ FDL-1.1"
 SLOT="0"
 IUSE="debug +introspection libnotify"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 x86"
 
 # Pull in libnotify-0.7 because it's controlled via an automagic ifdef
 COMMON_DEPEND="

diff --git a/x11-libs/libdmx/libdmx-1.1.4.ebuild 
b/x11-libs/libdmx/libdmx-1.1.4.ebuild
index 9b17f213159..8c13dd56a5a 100644
--- a/x11-libs/libdmx/libdmx-1.1.4.ebuild
+++ b/x11-libs/libdmx/libdmx-1.1.4.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 inherit xorg-2
 
 DESCRIPTION="X.Org dmx library"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 
~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
 IUSE=""
 
 RDEPEND="x11-base/xorg-proto

diff --git a/x11-libs/libdrm/libdrm-2.4.99.ebuild 
b/x11-libs/libdrm/libdrm-2.4.99.ebuild
index 76499a8ff61..0c94777c867 100644
--- a/x11-libs/libdrm/libdrm-2.4.99.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.99.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 ~x86-linux"
+       KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh 
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/libdrm/libdrm-9999.ebuild 
b/x11-libs/libdrm/libdrm-9999.ebuild
index 29daf988738..7178075e743 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 ~x86-linux"
+       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sh ~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/libfontenc/libfontenc-1.1.4.ebuild 
b/x11-libs/libfontenc/libfontenc-1.1.4.ebuild
index 6d9ac818b87..8780178c9b1 100644
--- a/x11-libs/libfontenc/libfontenc-1.1.4.ebuild
+++ b/x11-libs/libfontenc/libfontenc-1.1.4.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 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 ~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-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.7-r1.ebuild 
b/x11-libs/libnotify/libnotify-0.7.7-r1.ebuild
index 0d78cf58394..25aba2e2934 100644
--- a/x11-libs/libnotify/libnotify-0.7.7-r1.ebuild
+++ b/x11-libs/libnotify/libnotify-0.7.7-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/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 ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="+introspection test"
 
 RDEPEND="

diff --git a/x11-libs/libnotify/libnotify-0.7.8.ebuild 
b/x11-libs/libnotify/libnotify-0.7.8.ebuild
index ff9add88c10..538f0001f93 100644
--- a/x11-libs/libnotify/libnotify-0.7.8.ebuild
+++ b/x11-libs/libnotify/libnotify-0.7.8.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/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 ~x86-linux ~ppc-macos ~x86-macos 
~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="+introspection test"
 
 RDEPEND="

diff --git a/x11-libs/libpciaccess/libpciaccess-0.16.ebuild 
b/x11-libs/libpciaccess/libpciaccess-0.16.ebuild
index 666beb73d27..0b575e1c91d 100644
--- a/x11-libs/libpciaccess/libpciaccess-0.16.ebuild
+++ b/x11-libs/libpciaccess/libpciaccess-0.16.ebuild
@@ -7,7 +7,7 @@ XORG_MULTILIB=yes
 inherit xorg-3
 
 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 ~x86-linux ~sparc-solaris ~x64-solaris 
~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 
~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="zlib"
 
 DEPEND="!<x11-base/xorg-server-1.5

diff --git a/x11-libs/libvdpau/libvdpau-1.2.ebuild 
b/x11-libs/libvdpau/libvdpau-1.2.ebuild
index 6c0d86d35a7..14027d0ac57 100644
--- a/x11-libs/libvdpau/libvdpau-1.2.ebuild
+++ b/x11-libs/libvdpau/libvdpau-1.2.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://gitlab.freedesktop.org/vdpau/${PN}/-/archive/${P}/${PN}-${P}.ta
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm64 x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm64 x86"
 IUSE="doc dri"
 
 RDEPEND="

diff --git a/x11-libs/libvdpau/libvdpau-1.3.ebuild 
b/x11-libs/libvdpau/libvdpau-1.3.ebuild
index 2dc4d12a5fa..260b116d827 100644
--- a/x11-libs/libvdpau/libvdpau-1.3.ebuild
+++ b/x11-libs/libvdpau/libvdpau-1.3.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://gitlab.freedesktop.org/vdpau/${PN}/-/archive/${PV}/${P}.tar.bz2
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm64 ~x86"
 IUSE="doc dri"
 
 RDEPEND="

diff --git a/x11-libs/libwnck/libwnck-2.31.0.ebuild 
b/x11-libs/libwnck/libwnck-2.31.0.ebuild
index ef06538442c..525c7cdbc1d 100644
--- a/x11-libs/libwnck/libwnck-2.31.0.ebuild
+++ b/x11-libs/libwnck/libwnck-2.31.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.gnome.org/";
 
 LICENSE="LGPL-2+"
 SLOT="1"
-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 
~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 IUSE="+introspection startup-notification"
 

diff --git a/x11-libs/libwnck/libwnck-3.30.0.ebuild 
b/x11-libs/libwnck/libwnck-3.30.0.ebuild
index 36b74e5febe..b7cde39c556 100644
--- a/x11-libs/libwnck/libwnck-3.30.0.ebuild
+++ b/x11-libs/libwnck/libwnck-3.30.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://developer.gnome.org/libwnck/stable/";
 
 LICENSE="LGPL-2+"
 SLOT="3"
-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 
~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 IUSE="+introspection startup-notification tools"
 

diff --git a/x11-libs/libxcb/libxcb-1.13.1.ebuild 
b/x11-libs/libxcb/libxcb-1.13.1.ebuild
index fb517c56a07..8cd3208c9f4 100644
--- a/x11-libs/libxcb/libxcb-1.13.1.ebuild
+++ b/x11-libs/libxcb/libxcb-1.13.1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://xcb.freedesktop.org/ 
https://gitlab.freedesktop.org/xorg/lib/l
 [[ ${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 
~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-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 
~x64-cygwin ~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/libxkbcommon/libxkbcommon-0.8.4.ebuild 
b/x11-libs/libxkbcommon/libxkbcommon-0.8.4.ebuild
index 2b838286091..e92a52c52bd 100644
--- a/x11-libs/libxkbcommon/libxkbcommon-0.8.4.ebuild
+++ b/x11-libs/libxkbcommon/libxkbcommon-0.8.4.ebuild
@@ -17,7 +17,7 @@ inherit xorg-3 ${GIT_ECLASS}
 
 DESCRIPTION="X.Org xkbcommon library"
 HOMEPAGE="https://xkbcommon.org/";
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 
~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="X doc test"
 
 BDEPEND="

diff --git a/x11-libs/libxkbfile/libxkbfile-1.1.0.ebuild 
b/x11-libs/libxkbfile/libxkbfile-1.1.0.ebuild
index 15eb831dbc3..1225f3449f0 100644
--- a/x11-libs/libxkbfile/libxkbfile-1.1.0.ebuild
+++ b/x11-libs/libxkbfile/libxkbfile-1.1.0.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 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 ~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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="x11-libs/libX11[${MULTILIB_USEDEP}]"

diff --git a/x11-libs/libxklavier/libxklavier-5.4.ebuild 
b/x11-libs/libxklavier/libxklavier-5.4.ebuild
index 10cb8a21944..ce4f9c400f0 100644
--- a/x11-libs/libxklavier/libxklavier-5.4.ebuild
+++ b/x11-libs/libxklavier/libxklavier-5.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://people.freedesktop.org/~svu/${P}.tar.bz2";
 
 LICENSE="LGPL-2"
 SLOT="0/16"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 
~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="+introspection vala"
 REQUIRED_USE="vala? ( introspection )"
 

diff --git a/x11-libs/libxshmfence/libxshmfence-1.3-r1.ebuild 
b/x11-libs/libxshmfence/libxshmfence-1.3-r1.ebuild
index 18d71fd532e..b206ebcb15d 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 ~x86-linux ~sparc-solaris ~x64-solaris 
~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 
~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=""

diff --git a/x11-libs/motif/motif-2.3.8-r1.ebuild 
b/x11-libs/motif/motif-2.3.8-r1.ebuild
index f5478550c05..6f17e1ab2e9 100644
--- a/x11-libs/motif/motif-2.3.8-r1.ebuild
+++ b/x11-libs/motif/motif-2.3.8-r1.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="mirror://sourceforge/project/motif/Motif%20${PV}%20Source%20Code/${P}.t
 
 LICENSE="LGPL-2.1+ MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~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"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 
~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples jpeg +motif22-compatibility png static-libs unicode xft"
 
 RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]

diff --git a/x11-libs/neXtaw/neXtaw-0.15.1-r3.ebuild 
b/x11-libs/neXtaw/neXtaw-0.15.1-r3.ebuild
index bda42cb10d4..d1d73b5a863 100644
--- a/x11-libs/neXtaw/neXtaw-0.15.1-r3.ebuild
+++ b/x11-libs/neXtaw/neXtaw-0.15.1-r3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://siag.nu/pub/neXtaw/${P}.tar.gz";
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd 
~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux 
~x86-linux ~ppc-macos ~sparc-solaris"
 IUSE=""
 
 RDEPEND="x11-base/xorg-proto

diff --git a/x11-libs/pango/pango-1.42.4-r2.ebuild 
b/x11-libs/pango/pango-1.42.4-r2.ebuild
index f9f788295a8..667c939a2b0 100644
--- a/x11-libs/pango/pango-1.42.4-r2.ebuild
+++ b/x11-libs/pango/pango-1.42.4-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI+=" 
https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz";
 
 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 ~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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 IUSE="X +introspection test"
 

diff --git a/x11-libs/pangox-compat/pangox-compat-0.0.2-r1.ebuild 
b/x11-libs/pangox-compat/pangox-compat-0.0.2-r1.ebuild
index 0194f284d59..c0fcef606f2 100644
--- a/x11-libs/pangox-compat/pangox-compat-0.0.2-r1.ebuild
+++ b/x11-libs/pangox-compat/pangox-compat-0.0.2-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.pango.org/";
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 
~amd64-fbsd ~x86-fbsd ~amd64-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 ~sh sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris 
~x64-solaris ~x86-solaris"
 
 RDEPEND=">=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
        >=x11-libs/pango-1.36.3[${MULTILIB_USEDEP}]

diff --git a/x11-libs/pangox-compat/pangox-compat-0.0.2.ebuild 
b/x11-libs/pangox-compat/pangox-compat-0.0.2.ebuild
index a079bc01d1d..461ea69dc1c 100644
--- a/x11-libs/pangox-compat/pangox-compat-0.0.2.ebuild
+++ b/x11-libs/pangox-compat/pangox-compat-0.0.2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.pango.org/";
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd 
~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris 
~x86-solaris"
 
 RDEPEND=">=dev-libs/glib-2.31:2
        >=x11-libs/pango-1.32

diff --git a/x11-libs/pixman/pixman-0.38.4.ebuild 
b/x11-libs/pixman/pixman-0.38.4.ebuild
index 91bb30113a6..e1d98ec9a93 100644
--- a/x11-libs/pixman/pixman-0.38.4.ebuild
+++ b/x11-libs/pixman/pixman-0.38.4.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="http://www.pixman.org/ 
https://gitlab.freedesktop.org/pixman/pixman/";
 if [[ ${PV} = 9999* ]]; then
        SRC_URI=""
 else
-       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"
+       KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh 
sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
        SRC_URI="https://www.x.org/releases/individual/lib/${P}.tar.gz";
 fi
 

diff --git a/x11-libs/pixman/pixman-9999.ebuild 
b/x11-libs/pixman/pixman-9999.ebuild
index 95726ead8e9..b8c477a351e 100644
--- a/x11-libs/pixman/pixman-9999.ebuild
+++ b/x11-libs/pixman/pixman-9999.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="http://www.pixman.org/ 
https://gitlab.freedesktop.org/pixman/pixman/";
 if [[ ${PV} = 9999* ]]; then
        SRC_URI=""
 else
-       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"
+       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
        SRC_URI="https://www.x.org/releases/individual/lib/${P}.tar.gz";
 fi
 

diff --git a/x11-libs/rep-gtk/rep-gtk-0.90.8.3.ebuild 
b/x11-libs/rep-gtk/rep-gtk-0.90.8.3.ebuild
index 80b9fd2b78f..e099e52a4bd 100644
--- a/x11-libs/rep-gtk/rep-gtk-0.90.8.3.ebuild
+++ b/x11-libs/rep-gtk/rep-gtk-0.90.8.3.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="http://download.tuxfamily.org/librep/${PN}/${MY_P}.tar.xz";
 
 LICENSE="GPL-2"
 SLOT="gtk-2.0"
-KEYWORDS="alpha amd64 ia64 ppc ~ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ia64 ppc ~ppc64 sparc x86"
 IUSE="examples"
 
 RDEPEND=">=dev-libs/librep-0.90.5

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 84aab905895..46df2448200 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 ~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-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 ee46bf6bbbd..ad2f3425c45 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 ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 
~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.48.4.ebuild b/x11-libs/vte/vte-0.48.4.ebuild
index 779dabd7b87..5ffe7d62e34 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/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 ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 
~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/vte/vte-0.54.4.ebuild b/x11-libs/vte/vte-0.54.4.ebuild
index e11d9d2ec6b..5aa7db15493 100644
--- a/x11-libs/vte/vte-0.54.4.ebuild
+++ b/x11-libs/vte/vte-0.54.4.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/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 ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86 
~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 REQUIRED_USE="vala? ( introspection )"
 
 SRC_URI="${SRC_URI} !vanilla? ( 
https://dev.gentoo.org/~leio/distfiles/${PN}-0.54.1-command-notify.patch.xz )"

diff --git a/x11-libs/vte/vte-0.56.3.ebuild b/x11-libs/vte/vte-0.56.3.ebuild
index a7ee915e5f7..a1d0b27dbcd 100644
--- a/x11-libs/vte/vte-0.56.3.ebuild
+++ b/x11-libs/vte/vte-0.56.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/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 ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc 
~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 REQUIRED_USE="vala? ( introspection )"
 
 SRC_URI="${SRC_URI} !vanilla? ( 
https://dev.gentoo.org/~leio/distfiles/${PN}-0.54.1-command-notify.patch.xz )"

diff --git a/x11-libs/wxGTK/wxGTK-3.0.3-r300.ebuild 
b/x11-libs/wxGTK/wxGTK-3.0.3-r300.ebuild
index 30890d5025f..4fb40d29f62 100644
--- a/x11-libs/wxGTK/wxGTK-3.0.3-r300.ebuild
+++ b/x11-libs/wxGTK/wxGTK-3.0.3-r300.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidge
        https://dev.gentoo.org/~leio/distfiles/wxGTK-3.0.3_p20180104.tar.xz
        doc? ( 
https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}-docs-html.tar.bz2
 )"
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86 
~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="+X aqua doc debug gstreamer libnotify opengl sdl tiff webkit"
 
 WXSUBVERSION=${PV}.0-gtk3                      # 3.0.3.0-gtk3

diff --git a/x11-libs/wxGTK/wxGTK-3.0.3.ebuild 
b/x11-libs/wxGTK/wxGTK-3.0.3.ebuild
index 866cbd7ed0a..eb34842c551 100644
--- a/x11-libs/wxGTK/wxGTK-3.0.3.ebuild
+++ b/x11-libs/wxGTK/wxGTK-3.0.3.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidge
        https://dev.gentoo.org/~leio/distfiles/wxGTK-3.0.3_p20180104.tar.xz
        doc? ( 
https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}-docs-html.tar.bz2
 )"
 
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 
~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="+X aqua doc debug gstreamer libnotify opengl sdl tiff"
 
 SLOT="3.0"

diff --git a/x11-libs/wxGTK/wxGTK-3.0.4-r1.ebuild 
b/x11-libs/wxGTK/wxGTK-3.0.4-r1.ebuild
index 56faa601ce2..cadb5dd2158 100644
--- a/x11-libs/wxGTK/wxGTK-3.0.4-r1.ebuild
+++ b/x11-libs/wxGTK/wxGTK-3.0.4-r1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidge
        https://dev.gentoo.org/~leio/distfiles/wxGTK-3.0.4_p20181106.tar.xz
        doc? ( 
https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}-docs-html.tar.bz2
 )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc 
~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="+X aqua doc debug gstreamer libnotify opengl sdl tiff"
 
 SLOT="3.0"

diff --git a/x11-libs/wxGTK/wxGTK-3.0.4-r2.ebuild 
b/x11-libs/wxGTK/wxGTK-3.0.4-r2.ebuild
index 13c4e43a5f0..62e063a1f83 100644
--- a/x11-libs/wxGTK/wxGTK-3.0.4-r2.ebuild
+++ b/x11-libs/wxGTK/wxGTK-3.0.4-r2.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidge
        https://dev.gentoo.org/~leio/distfiles/wxGTK-3.0.4_p20190713.tar.xz
        doc? ( 
https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}-docs-html.tar.bz2
 )"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 
~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="+X aqua doc debug gstreamer libnotify opengl sdl tiff"
 
 SLOT="3.0"

diff --git a/x11-libs/wxGTK/wxGTK-3.0.4-r300.ebuild 
b/x11-libs/wxGTK/wxGTK-3.0.4-r300.ebuild
index 2556c14de1e..cb528081365 100644
--- a/x11-libs/wxGTK/wxGTK-3.0.4-r300.ebuild
+++ b/x11-libs/wxGTK/wxGTK-3.0.4-r300.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidge
        https://dev.gentoo.org/~leio/distfiles/wxGTK-3.0.4_p20180507.tar.xz
        doc? ( 
https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}-docs-html.tar.bz2
 )"
 
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86 
~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="+X aqua doc debug gstreamer libnotify opengl sdl tiff webkit"
 
 WXSUBVERSION=${PV}.0-gtk3                      # 3.0.3.0-gtk3

diff --git a/x11-libs/wxGTK/wxGTK-3.0.4-r301.ebuild 
b/x11-libs/wxGTK/wxGTK-3.0.4-r301.ebuild
index a4027d4e263..66769f55bf3 100644
--- a/x11-libs/wxGTK/wxGTK-3.0.4-r301.ebuild
+++ b/x11-libs/wxGTK/wxGTK-3.0.4-r301.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidge
        https://dev.gentoo.org/~leio/distfiles/wxGTK-3.0.4_p20181106.tar.xz
        doc? ( 
https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}-docs-html.tar.bz2
 )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 
~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="+X aqua doc debug gstreamer libnotify opengl sdl tiff webkit"
 
 WXSUBVERSION=${PV}.0-gtk3                      # 3.0.3.0-gtk3

diff --git a/x11-libs/wxGTK/wxGTK-3.0.4-r302.ebuild 
b/x11-libs/wxGTK/wxGTK-3.0.4-r302.ebuild
index 84bc2610f00..0b9aa87a724 100644
--- a/x11-libs/wxGTK/wxGTK-3.0.4-r302.ebuild
+++ b/x11-libs/wxGTK/wxGTK-3.0.4-r302.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidge
        https://dev.gentoo.org/~leio/distfiles/wxGTK-3.0.4_p20190713.tar.xz
        doc? ( 
https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}-docs-html.tar.bz2
 )"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86 
~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="+X aqua doc debug gstreamer libnotify opengl sdl tiff webkit"
 
 WXSUBVERSION=${PV}.0-gtk3                      # 3.0.3.0-gtk3

diff --git a/x11-libs/wxGTK/wxGTK-3.0.4.ebuild 
b/x11-libs/wxGTK/wxGTK-3.0.4.ebuild
index dfe66ea8f45..a31c63e26a3 100644
--- a/x11-libs/wxGTK/wxGTK-3.0.4.ebuild
+++ b/x11-libs/wxGTK/wxGTK-3.0.4.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidge
        https://dev.gentoo.org/~leio/distfiles/wxGTK-3.0.4_p20180507.tar.xz
        doc? ( 
https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}-docs-html.tar.bz2
 )"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 
~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="+X aqua doc debug gstreamer libnotify opengl sdl tiff"
 
 SLOT="3.0"

diff --git a/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r2.ebuild 
b/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r2.ebuild
index 53b7223a8b1..1834b93a127 100644
--- a/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r2.ebuild
+++ b/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r2.ebuild
@@ -15,7 +15,7 @@ EGIT_HAS_SUBMODULES=yes
 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 ~mips ppc ppc64 s390 ~sh sparc x86 
~amd64-fbsd ~x86-fbsd ~amd64-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-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-image/xcb-util-image-0.4.0-r1.ebuild 
b/x11-libs/xcb-util-image/xcb-util-image-0.4.0-r1.ebuild
index 65e88314ce5..78f7fa07930 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://gitlab.freedesktop.org/xorg/lib/libxcb-image.git";
 DESCRIPTION="X C-language Bindings sample implementations"
 HOMEPAGE="https://xcb.freedesktop.org/ 
https://gitlab.freedesktop.org/xorg/lib/libxcb-image";
 
-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"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 
~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 0390fce9d62..90590ca324e 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://gitlab.freedesktop.org/xorg/lib/libxcb-keysyms.git";
 DESCRIPTION="X C-language Bindings sample implementations"
 HOMEPAGE="https://xcb.freedesktop.org/ 
https://gitlab.freedesktop.org/xorg/lib/libxcb-keysyms";
 
-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"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 
~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 1c2e9b8587d..4bc4fe6626e 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/ 
https://gitlab.freedesktop.org/xorg/lib/libxcb-render-util";
 
-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"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 
~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-wm/xcb-util-wm-0.4.1-r2.ebuild 
b/x11-libs/xcb-util-wm/xcb-util-wm-0.4.1-r2.ebuild
index db1390311f0..2514f291920 100644
--- a/x11-libs/xcb-util-wm/xcb-util-wm-0.4.1-r2.ebuild
+++ b/x11-libs/xcb-util-wm/xcb-util-wm-0.4.1-r2.ebuild
@@ -15,7 +15,7 @@ EGIT_HAS_SUBMODULES=yes
 DESCRIPTION="X C-language Bindings sample implementations"
 HOMEPAGE="https://xcb.freedesktop.org/ 
https://gitlab.freedesktop.org/xorg/lib/libxcb-wm";
 
-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"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 
~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 019f7ed0350..c026a21ea9a 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://gitlab.freedesktop.org/xorg/lib/libxcb-util.git";
 DESCRIPTION="X C-language Bindings sample implementations"
 HOMEPAGE="https://xcb.freedesktop.org/ 
https://gitlab.freedesktop.org/xorg/lib/libxcb-util";
 
-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"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 
~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/xosd/xosd-2.2.14-r1.ebuild 
b/x11-libs/xosd/xosd-2.2.14-r1.ebuild
index 1279eb3dc26..41cacad2ed4 100644
--- a/x11-libs/xosd/xosd-2.2.14-r1.ebuild
+++ b/x11-libs/xosd/xosd-2.2.14-r1.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="mirror://debian/pool/main/x/xosd/${PN}_${PV}.orig.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86"
 IUSE="xinerama"
 
 RDEPEND="x11-libs/libX11

diff --git a/x11-libs/xosd/xosd-2.2.14_p2_p1.ebuild 
b/x11-libs/xosd/xosd-2.2.14_p2_p1.ebuild
index 0baa188d2ac..f2845e01ca5 100644
--- a/x11-libs/xosd/xosd-2.2.14_p2_p1.ebuild
+++ b/x11-libs/xosd/xosd-2.2.14_p2_p1.ebuild
@@ -16,7 +16,7 @@ 
SRC_URI="mirror://debian/pool/main/x/xosd/${PN}_${MY_PV}.orig.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ppc ppc64 sparc x86"
 IUSE="static-libs xinerama"
 
 RDEPEND="x11-libs/libX11

diff --git a/x11-libs/xtrans/xtrans-1.4.0.ebuild 
b/x11-libs/xtrans/xtrans-1.4.0.ebuild
index 516d060aff4..a9392aa423c 100644
--- a/x11-libs/xtrans/xtrans-1.4.0.ebuild
+++ b/x11-libs/xtrans/xtrans-1.4.0.ebuild
@@ -10,7 +10,7 @@ XORG_DOC=doc
 inherit xorg-3
 
 DESCRIPTION="X.Org xtrans library"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc 
x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=""

Reply via email to