Keywords sync.

46 files changed, 46 insertions, 46 deletions

diff --git a/x11-libs/glamor/glamor-9999.ebuild b/x11-libs/glamor/glamor-9999.ebuild
index de142a8b..03172123 100644
--- a/x11-libs/glamor/glamor-9999.ebuild
+++ b/x11-libs/glamor/glamor-9999.ebuild
@@ -15,7 +15,7 @@ else
 	SRC_URI="mirror://gentoo/${P}.tar.gz"
 fi
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ia64 ~x86"
 IUSE="gles"
 
 RDEPEND=">=x11-base/xorg-server-1.10
diff --git a/x11-libs/libICE/libICE-9999.ebuild b/x11-libs/libICE/libICE-9999.ebuild
index ba327679..c4f278ce 100644
--- a/x11-libs/libICE/libICE-9999.ebuild
+++ b/x11-libs/libICE/libICE-9999.ebuild
@@ -9,7 +9,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org ICE library"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="ipv6"
 
 RDEPEND="x11-libs/xtrans
diff --git a/x11-libs/libSM/libSM-9999.ebuild b/x11-libs/libSM/libSM-9999.ebuild
index b2cd5648..a278b2cb 100644
--- a/x11-libs/libSM/libSM-9999.ebuild
+++ b/x11-libs/libSM/libSM-9999.ebuild
@@ -9,7 +9,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org SM library"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="ipv6 +uuid"
 
 RDEPEND=">=x11-libs/libICE-1.0.5
diff --git a/x11-libs/libX11/libX11-9999.ebuild b/x11-libs/libX11/libX11-9999.ebuild
index 84530c6d..7e9b099b 100644
--- a/x11-libs/libX11/libX11-9999.ebuild
+++ b/x11-libs/libX11/libX11-9999.ebuild
@@ -9,7 +9,7 @@ inherit xorg-2 toolchain-funcs flag-o-matic
 
 DESCRIPTION="X.Org X11 library"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~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-libs/libxcb-1.1.92
diff --git a/x11-libs/libXScrnSaver/libXScrnSaver-9999.ebuild b/x11-libs/libXScrnSaver/libXScrnSaver-9999.ebuild
index 79c3f085..2e7e65e8 100644
--- a/x11-libs/libXScrnSaver/libXScrnSaver-9999.ebuild
+++ b/x11-libs/libXScrnSaver/libXScrnSaver-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=4
 inherit xorg-2
 
 DESCRIPTION="X.Org XScrnSaver library"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~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"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-libs/libXTrap/libXTrap-9999.ebuild b/x11-libs/libXTrap/libXTrap-9999.ebuild
index 5eb42d1a..16e083fe 100644
--- a/x11-libs/libXTrap/libXTrap-9999.ebuild
+++ b/x11-libs/libXTrap/libXTrap-9999.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org XTrap 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 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-libs/libXau/libXau-9999.ebuild b/x11-libs/libXau/libXau-9999.ebuild
index 0bd78234..0aecee6e 100644
--- a/x11-libs/libXau/libXau-9999.ebuild
+++ b/x11-libs/libXau/libXau-9999.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Xau library"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="x11-proto/xproto"
diff --git a/x11-libs/libXaw/libXaw-9999.ebuild b/x11-libs/libXaw/libXaw-9999.ebuild
index 5312b450..0b18081c 100644
--- a/x11-libs/libXaw/libXaw-9999.ebuild
+++ b/x11-libs/libXaw/libXaw-9999.ebuild
@@ -9,7 +9,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Xaw library"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-libs/libXaw3d/libXaw3d-9999.ebuild b/x11-libs/libXaw3d/libXaw3d-9999.ebuild
index 301b5928..aabca587 100644
--- a/x11-libs/libXaw3d/libXaw3d-9999.ebuild
+++ b/x11-libs/libXaw3d/libXaw3d-9999.ebuild
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Xaw3d library"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-libs/libXcomposite/libXcomposite-9999.ebuild b/x11-libs/libXcomposite/libXcomposite-9999.ebuild
index 9822dee3..0674e940 100644
--- a/x11-libs/libXcomposite/libXcomposite-9999.ebuild
+++ b/x11-libs/libXcomposite/libXcomposite-9999.ebuild
@@ -9,7 +9,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Xcomposite library"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-libs/libXcursor/libXcursor-9999.ebuild b/x11-libs/libXcursor/libXcursor-9999.ebuild
index 8b14a2ed..9ba663d3 100644
--- a/x11-libs/libXcursor/libXcursor-9999.ebuild
+++ b/x11-libs/libXcursor/libXcursor-9999.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Xcursor library"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~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 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=x11-libs/libXrender-0.8.2
diff --git a/x11-libs/libXdamage/libXdamage-9999.ebuild b/x11-libs/libXdamage/libXdamage-9999.ebuild
index aebbf2a8..49395a32 100644
--- a/x11-libs/libXdamage/libXdamage-9999.ebuild
+++ b/x11-libs/libXdamage/libXdamage-9999.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Xdamage library"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-libs/libXdmcp/libXdmcp-9999.ebuild b/x11-libs/libXdmcp/libXdmcp-9999.ebuild
index 9e4a7d5d..dbd14b4a 100644
--- a/x11-libs/libXdmcp/libXdmcp-9999.ebuild
+++ b/x11-libs/libXdmcp/libXdmcp-9999.ebuild
@@ -9,7 +9,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Xdmcp library"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="x11-proto/xproto"
diff --git a/x11-libs/libXext/libXext-9999.ebuild b/x11-libs/libXext/libXext-9999.ebuild
index 955c641f..53949b37 100644
--- a/x11-libs/libXext/libXext-9999.ebuild
+++ b/x11-libs/libXext/libXext-9999.ebuild
@@ -9,7 +9,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Xext library"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~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.2
diff --git a/x11-libs/libXfixes/libXfixes-9999.ebuild b/x11-libs/libXfixes/libXfixes-9999.ebuild
index bdc54437..c8363e6e 100644
--- a/x11-libs/libXfixes/libXfixes-9999.ebuild
+++ b/x11-libs/libXfixes/libXfixes-9999.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Xfixes library"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~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
diff --git a/x11-libs/libXfont/libXfont-9999.ebuild b/x11-libs/libXfont/libXfont-9999.ebuild
index 5c55e1bb..edd98ac4 100644
--- a/x11-libs/libXfont/libXfont-9999.ebuild
+++ b/x11-libs/libXfont/libXfont-9999.ebuild
@@ -9,7 +9,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Xfont library"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="ipv6"
 
 RDEPEND="x11-libs/xtrans
diff --git a/x11-libs/libXft/libXft-9999.ebuild b/x11-libs/libXft/libXft-9999.ebuild
index b48027ef..deb0bf7b 100644
--- a/x11-libs/libXft/libXft-9999.ebuild
+++ b/x11-libs/libXft/libXft-9999.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2 flag-o-matic
 
 DESCRIPTION="X.Org Xft library"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND=">=x11-libs/libXrender-0.8.2
diff --git a/x11-libs/libXi/libXi-9999.ebuild b/x11-libs/libXi/libXi-9999.ebuild
index f6349f55..ecc78288 100644
--- a/x11-libs/libXi/libXi-9999.ebuild
+++ b/x11-libs/libXi/libXi-9999.ebuild
@@ -8,7 +8,7 @@ XORG_DOC=doc
 inherit xorg-2
 
 DESCRIPTION="X.Org Xi library"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND=">=x11-libs/libX11-1.4.99.1
diff --git a/x11-libs/libXinerama/libXinerama-9999.ebuild b/x11-libs/libXinerama/libXinerama-9999.ebuild
index ca2f1cd1..23fd0380 100644
--- a/x11-libs/libXinerama/libXinerama-9999.ebuild
+++ b/x11-libs/libXinerama/libXinerama-9999.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Xinerama library"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-libs/libXmu/libXmu-9999.ebuild b/x11-libs/libXmu/libXmu-9999.ebuild
index c226fd0e..33b295cd 100644
--- a/x11-libs/libXmu/libXmu-9999.ebuild
+++ b/x11-libs/libXmu/libXmu-9999.ebuild
@@ -9,7 +9,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Xmu library"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="ipv6"
 
 RDEPEND="x11-libs/libXt
diff --git a/x11-libs/libXp/libXp-9999.ebuild b/x11-libs/libXp/libXp-9999.ebuild
index cf23f399..adb834fa 100644
--- a/x11-libs/libXp/libXp-9999.ebuild
+++ b/x11-libs/libXp/libXp-9999.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Xp library"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-libs/libXpm/libXpm-9999.ebuild b/x11-libs/libXpm/libXpm-9999.ebuild
index 50f01a40..c2c4f937 100644
--- a/x11-libs/libXpm/libXpm-9999.ebuild
+++ b/x11-libs/libXpm/libXpm-9999.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2 flag-o-matic
 
 DESCRIPTION="X.Org Xpm library"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-libs/libXrandr/libXrandr-9999.ebuild b/x11-libs/libXrandr/libXrandr-9999.ebuild
index b49e61ed..b00d5cdf 100644
--- a/x11-libs/libXrandr/libXrandr-9999.ebuild
+++ b/x11-libs/libXrandr/libXrandr-9999.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Xrandr library"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-libs/libXrender/libXrender-9999.ebuild b/x11-libs/libXrender/libXrender-9999.ebuild
index 3d0a672f..fc727ad4 100644
--- a/x11-libs/libXrender/libXrender-9999.ebuild
+++ b/x11-libs/libXrender/libXrender-9999.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Xrender library"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~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
diff --git a/x11-libs/libXres/libXres-9999.ebuild b/x11-libs/libXres/libXres-9999.ebuild
index c768e572..2b4c0deb 100644
--- a/x11-libs/libXres/libXres-9999.ebuild
+++ b/x11-libs/libXres/libXres-9999.ebuild
@@ -8,7 +8,7 @@ inherit xorg-2
 EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/lib/libXRes"
 DESCRIPTION="X.Org XRes library"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-libs/libXt/libXt-9999.ebuild b/x11-libs/libXt/libXt-9999.ebuild
index b241900e..187ee4d5 100644
--- a/x11-libs/libXt/libXt-9999.ebuild
+++ b/x11-libs/libXt/libXt-9999.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2 toolchain-funcs
 
 DESCRIPTION="X.Org Xt library"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~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
diff --git a/x11-libs/libXtst/libXtst-9999.ebuild b/x11-libs/libXtst/libXtst-9999.ebuild
index fff13146..67fcf8cf 100644
--- a/x11-libs/libXtst/libXtst-9999.ebuild
+++ b/x11-libs/libXtst/libXtst-9999.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Xtst library"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-libs/libXv/libXv-9999.ebuild b/x11-libs/libXv/libXv-9999.ebuild
index 7e1bffc0..ae18c626 100644
--- a/x11-libs/libXv/libXv-9999.ebuild
+++ b/x11-libs/libXv/libXv-9999.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Xv library"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-libs/libXvMC/libXvMC-9999.ebuild b/x11-libs/libXvMC/libXvMC-9999.ebuild
index 02f33a9b..69b240b2 100644
--- a/x11-libs/libXvMC/libXvMC-9999.ebuild
+++ b/x11-libs/libXvMC/libXvMC-9999.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org XvMC library"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-libs/libXxf86dga/libXxf86dga-9999.ebuild b/x11-libs/libXxf86dga/libXxf86dga-9999.ebuild
index 368d89f4..980fd63a 100644
--- a/x11-libs/libXxf86dga/libXxf86dga-9999.ebuild
+++ b/x11-libs/libXxf86dga/libXxf86dga-9999.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Xxf86dga library"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-libs/libXxf86misc/libXxf86misc-9999.ebuild b/x11-libs/libXxf86misc/libXxf86misc-9999.ebuild
index 7fe0d3f7..1564577b 100644
--- a/x11-libs/libXxf86misc/libXxf86misc-9999.ebuild
+++ b/x11-libs/libXxf86misc/libXxf86misc-9999.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Xxf86misc library"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-libs/libXxf86vm/libXxf86vm-9999.ebuild b/x11-libs/libXxf86vm/libXxf86vm-9999.ebuild
index 748c9670..4380f440 100644
--- a/x11-libs/libXxf86vm/libXxf86vm-9999.ebuild
+++ b/x11-libs/libXxf86vm/libXxf86vm-9999.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Xxf86vm library"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-libs/libdmx/libdmx-9999.ebuild b/x11-libs/libdmx/libdmx-9999.ebuild
index a4e066a7..8884d4e6 100644
--- a/x11-libs/libdmx/libdmx-9999.ebuild
+++ b/x11-libs/libdmx/libdmx-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=4
 inherit xorg-2
 
 DESCRIPTION="X.Org dmx 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 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-libs/libdrm/libdrm-9999.ebuild b/x11-libs/libdrm/libdrm-9999.ebuild
index 16cefaa7..cf064e9d 100644
--- a/x11-libs/libdrm/libdrm-9999.ebuild
+++ b/x11-libs/libdrm/libdrm-9999.ebuild
@@ -15,7 +15,7 @@ else
 	SRC_URI="http://dri.freedesktop.org/${PN}/${P}.tar.bz2"
 fi
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 VIDEO_CARDS="exynos intel nouveau omap radeon vmware"
 for card in ${VIDEO_CARDS}; do
 	IUSE_VIDEO_CARDS+=" video_cards_${card}"
diff --git a/x11-libs/libfontenc/libfontenc-9999.ebuild b/x11-libs/libfontenc/libfontenc-9999.ebuild
index 43d9abc1..e2256f3a 100644
--- a/x11-libs/libfontenc/libfontenc-9999.ebuild
+++ b/x11-libs/libfontenc/libfontenc-9999.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org fontenc library"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~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/libpciaccess/libpciaccess-9999.ebuild b/x11-libs/libpciaccess/libpciaccess-9999.ebuild
index b859e26c..4bedc0e2 100644
--- a/x11-libs/libpciaccess/libpciaccess-9999.ebuild
+++ b/x11-libs/libpciaccess/libpciaccess-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=4
 inherit xorg-2
 
 DESCRIPTION="Library providing generic access to the PCI bus and devices"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="minimal zlib"
 
 DEPEND="!<x11-base/xorg-server-1.5
diff --git a/x11-libs/libxcb/libxcb-9999.ebuild b/x11-libs/libxcb/libxcb-9999.ebuild
index 1aad0e61..dfe0a828 100644
--- a/x11-libs/libxcb/libxcb-9999.ebuild
+++ b/x11-libs/libxcb/libxcb-9999.ebuild
@@ -13,7 +13,7 @@ EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/libxcb"
 [[ ${PV} != 9999* ]] && \
 	SRC_URI="http://xcb.freedesktop.org/dist/${P}.tar.bz2"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="selinux"
 
 RDEPEND="dev-libs/libpthread-stubs
diff --git a/x11-libs/libxkbfile/libxkbfile-9999.ebuild b/x11-libs/libxkbfile/libxkbfile-9999.ebuild
index 8385adcd..20691376 100644
--- a/x11-libs/libxkbfile/libxkbfile-9999.ebuild
+++ b/x11-libs/libxkbfile/libxkbfile-9999.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org xkbfile library"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~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
diff --git a/x11-libs/pixman/pixman-9999.ebuild b/x11-libs/pixman/pixman-9999.ebuild
index 17b72bfa..7d439139 100644
--- a/x11-libs/pixman/pixman-9999.ebuild
+++ b/x11-libs/pixman/pixman-9999.ebuild
@@ -8,7 +8,7 @@ inherit xorg-2 toolchain-funcs versionator
 EGIT_REPO_URI="git://anongit.freedesktop.org/git/pixman"
 DESCRIPTION="Low-level pixel manipulation routines"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="altivec iwmmxt mmx neon sse2"
 
 src_configure() {
diff --git a/x11-libs/startup-notification/startup-notification-9999.ebuild b/x11-libs/startup-notification/startup-notification-9999.ebuild
index af2fb4da..2ac4abf8 100644
--- a/x11-libs/startup-notification/startup-notification-9999.ebuild
+++ b/x11-libs/startup-notification/startup-notification-9999.ebuild
@@ -12,7 +12,7 @@ EGIT_REPO_URI="git://anongit.freedesktop.org/startup-notification"
 
 LICENSE="LGPL-2 MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-libs/xcb-util-image/xcb-util-image-9999.ebuild b/x11-libs/xcb-util-image/xcb-util-image-9999.ebuild
index 13f294c2..36cd6566 100644
--- a/x11-libs/xcb-util-image/xcb-util-image-9999.ebuild
+++ b/x11-libs/xcb-util-image/xcb-util-image-9999.ebuild
@@ -15,7 +15,7 @@ EGIT_HAS_SUBMODULES=yes
 DESCRIPTION="X C-language Bindings sample implementations"
 HOMEPAGE="http://xcb.freedesktop.org/"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="test"
 
 RDEPEND=">=x11-libs/xcb-util-${PV}
diff --git a/x11-libs/xcb-util-keysyms/xcb-util-keysyms-9999.ebuild b/x11-libs/xcb-util-keysyms/xcb-util-keysyms-9999.ebuild
index 444a3b05..29fc55ee 100644
--- a/x11-libs/xcb-util-keysyms/xcb-util-keysyms-9999.ebuild
+++ b/x11-libs/xcb-util-keysyms/xcb-util-keysyms-9999.ebuild
@@ -15,7 +15,7 @@ EGIT_HAS_SUBMODULES=yes
 DESCRIPTION="X C-language Bindings sample implementations"
 HOMEPAGE="http://xcb.freedesktop.org/"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="test"
 
 RDEPEND=">=x11-libs/xcb-util-${PV}
diff --git a/x11-libs/xcb-util-renderutil/xcb-util-renderutil-9999.ebuild b/x11-libs/xcb-util-renderutil/xcb-util-renderutil-9999.ebuild
index c2f67546..5e8ebe44 100644
--- a/x11-libs/xcb-util-renderutil/xcb-util-renderutil-9999.ebuild
+++ b/x11-libs/xcb-util-renderutil/xcb-util-renderutil-9999.ebuild
@@ -15,7 +15,7 @@ EGIT_HAS_SUBMODULES=yes
 DESCRIPTION="X C-language Bindings sample implementations"
 HOMEPAGE="http://xcb.freedesktop.org/"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="test"
 
 RDEPEND=">=x11-libs/xcb-util-${PV}
diff --git a/x11-libs/xcb-util-wm/xcb-util-wm-9999.ebuild b/x11-libs/xcb-util-wm/xcb-util-wm-9999.ebuild
index 29c8ead2..de5cca4c 100644
--- a/x11-libs/xcb-util-wm/xcb-util-wm-9999.ebuild
+++ b/x11-libs/xcb-util-wm/xcb-util-wm-9999.ebuild
@@ -15,7 +15,7 @@ EGIT_HAS_SUBMODULES=yes
 DESCRIPTION="X C-language Bindings sample implementations"
 HOMEPAGE="http://xcb.freedesktop.org/"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="test"
 
 RDEPEND=">=x11-libs/xcb-util-${PV}
diff --git a/x11-libs/xcb-util/xcb-util-9999.ebuild b/x11-libs/xcb-util/xcb-util-9999.ebuild
index d2f70840..e0879160 100644
--- a/x11-libs/xcb-util/xcb-util-9999.ebuild
+++ b/x11-libs/xcb-util/xcb-util-9999.ebuild
@@ -15,7 +15,7 @@ EGIT_HAS_SUBMODULES=yes
 DESCRIPTION="X C-language Bindings sample implementations"
 HOMEPAGE="http://xcb.freedesktop.org/"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="test"
 
 RDEPEND=">=x11-libs/libxcb-1.7
diff --git a/x11-libs/xtrans/xtrans-9999.ebuild b/x11-libs/xtrans/xtrans-9999.ebuild
index 7ccb7214..a6f97bea 100644
--- a/x11-libs/xtrans/xtrans-9999.ebuild
+++ b/x11-libs/xtrans/xtrans-9999.ebuild
@@ -11,7 +11,7 @@ XORG_DOC=doc
 inherit xorg-2
 
 DESCRIPTION="X.Org xtrans library"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=""