stabilize for all non-prefix arches

This stabilizes things for all the non-prefix/unsupported arches.
It shouldn't impact the arches we care about (amd64/arm/x86).

Now that cros_portage_upgrade does the same thing for us, we can
mung all the existing ebuilds.

Generated by running:
find -type f -name '*.ebuild' -exec sed -i -r \
	'/^[[:space:]]*KEYWORDS/s:~(alpha|hppa|ia64|m68k|mips|ppc|ppc64|s390|sh|sparc)([ "]):\1\2:g' {} +

BUG=chromium:307180
TEST=`cbuildbot chromiumos-sdk {arm,x86,amd64}-generic-full` work

Change-Id: I6d66b7a22f21428db32dc50216c50fc023023d7f
Reviewed-on: https://chromium-review.googlesource.com/173029
Commit-Queue: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Matt Tennant <mtennant@chromium.org>
diff --git a/app-admin/eselect-ctags/eselect-ctags-1.13.ebuild b/app-admin/eselect-ctags/eselect-ctags-1.13.ebuild
index e487909..6e5011b 100644
--- a/app-admin/eselect-ctags/eselect-ctags-1.13.ebuild
+++ b/app-admin/eselect-ctags/eselect-ctags-1.13.ebuild
@@ -9,7 +9,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=""
diff --git a/app-admin/eselect-emacs/eselect-emacs-1.13.ebuild b/app-admin/eselect-emacs/eselect-emacs-1.13.ebuild
index a72fabe..81ee3fc 100644
--- a/app-admin/eselect-emacs/eselect-emacs-1.13.ebuild
+++ b/app-admin/eselect-emacs/eselect-emacs-1.13.ebuild
@@ -8,7 +8,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=""
diff --git a/app-admin/eselect-fontconfig/eselect-fontconfig-1.0.ebuild b/app-admin/eselect-fontconfig/eselect-fontconfig-1.0.ebuild
index 9d94331..4c6b370 100644
--- a/app-admin/eselect-fontconfig/eselect-fontconfig-1.0.ebuild
+++ b/app-admin/eselect-fontconfig/eselect-fontconfig-1.0.ebuild
@@ -8,7 +8,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND=""
diff --git a/app-admin/eselect-opengl/eselect-opengl-1.2.4.ebuild b/app-admin/eselect-opengl/eselect-opengl-1.2.4.ebuild
index 3fe0fac..4776a5a 100644
--- a/app-admin/eselect-opengl/eselect-opengl-1.2.4.ebuild
+++ b/app-admin/eselect-opengl/eselect-opengl-1.2.4.ebuild
@@ -22,7 +22,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-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 ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+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 ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="app-arch/xz-utils"
diff --git a/app-admin/eselect-python/eselect-python-20100321.ebuild b/app-admin/eselect-python/eselect-python-20100321.ebuild
index 0964b7b..9a0a5c9 100644
--- a/app-admin/eselect-python/eselect-python-20100321.ebuild
+++ b/app-admin/eselect-python/eselect-python-20100321.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=app-admin/eselect-1.2.3"
diff --git a/app-admin/eselect-vi/eselect-vi-1.1.7-r1.ebuild b/app-admin/eselect-vi/eselect-vi-1.1.7-r1.ebuild
index 01e58c3..7e69ba6 100644
--- a/app-admin/eselect-vi/eselect-vi-1.1.7-r1.ebuild
+++ b/app-admin/eselect-vi/eselect-vi-1.1.7-r1.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=app-admin/eselect-1.0.6"
diff --git a/app-admin/eselect/eselect-1.3.1.ebuild b/app-admin/eselect/eselect-1.3.1.ebuild
index dc00e87..26cdde2 100644
--- a/app-admin/eselect/eselect-1.3.1.ebuild
+++ b/app-admin/eselect/eselect-1.3.1.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc"
 
 RDEPEND="sys-apps/sed
diff --git a/app-admin/perl-cleaner/perl-cleaner-2.7.ebuild b/app-admin/perl-cleaner/perl-cleaner-2.7.ebuild
index 6f0d6a8..dfc1131 100644
--- a/app-admin/perl-cleaner/perl-cleaner-2.7.ebuild
+++ b/app-admin/perl-cleaner/perl-cleaner-2.7.ebuild
@@ -9,7 +9,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE=""
 
 DEPEND="app-shells/bash"
diff --git a/app-admin/python-updater/python-updater-0.10.ebuild b/app-admin/python-updater/python-updater-0.10.ebuild
index 78be5c9..49eb53d 100644
--- a/app-admin/python-updater/python-updater-0.10.ebuild
+++ b/app-admin/python-updater/python-updater-0.10.ebuild
@@ -17,7 +17,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE=""
 
 DEPEND="$([[ "${PV}" == "9999" ]] && echo "sys-apps/help2man")"
diff --git a/app-admin/rsyslog/rsyslog-3.22.1.ebuild b/app-admin/rsyslog/rsyslog-3.22.1.ebuild
index 08c0077..1da4d3b 100644
--- a/app-admin/rsyslog/rsyslog-3.22.1.ebuild
+++ b/app-admin/rsyslog/rsyslog-3.22.1.ebuild
@@ -11,7 +11,7 @@
 SRC_URI="http://download.rsyslog.com/${PN}/${P}.tar.gz"
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~sparc ~x86"
+KEYWORDS="~amd64 ~arm hppa sparc ~x86"
 IUSE="debug kerberos dbi gnutls mysql postgres relp snmp zlib"
 
 DEPEND="kerberos? ( virtual/krb5 )
diff --git a/app-admin/rsyslog/rsyslog-5.8.11.ebuild b/app-admin/rsyslog/rsyslog-5.8.11.ebuild
index 98a9f97..2c19ee2 100644
--- a/app-admin/rsyslog/rsyslog-5.8.11.ebuild
+++ b/app-admin/rsyslog/rsyslog-5.8.11.ebuild
@@ -13,7 +13,7 @@
 	zeromq?	( https://github.com/aggregateknowledge/rsyslog-zeromq/tarball/44b551abc29dd5b541884bd51b45b413855a93d8 -> ${PN}-zeromq.tar.gz )"
 
 LICENSE="GPL-3 LGPL-3 Apache-2.0"
-KEYWORDS="amd64 arm ~hppa x86"
+KEYWORDS="amd64 arm hppa x86"
 SLOT="0"
 IUSE="dbi debug doc extras kerberos mysql oracle postgres relp snmp ssl static-libs zeromq zlib"
 
diff --git a/app-admin/sudo/sudo-1.8.6_p7.ebuild b/app-admin/sudo/sudo-1.8.6_p7.ebuild
index 9ba19bc..d49a2f7 100644
--- a/app-admin/sudo/sudo-1.8.6_p7.ebuild
+++ b/app-admin/sudo/sudo-1.8.6_p7.ebuild
@@ -23,7 +23,7 @@
 # 3-clause BSD license
 LICENSE="ISC BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~sparc-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~sparc-solaris"
 IUSE="ldap nls pam offensive selinux skey"
 
 DEPEND="pam? ( virtual/pam )
diff --git a/app-admin/webapp-config/webapp-config-1.50.16-r4.ebuild b/app-admin/webapp-config/webapp-config-1.50.16-r4.ebuild
index 994d58e..8b310ed 100644
--- a/app-admin/webapp-config/webapp-config-1.50.16-r4.ebuild
+++ b/app-admin/webapp-config/webapp-config-1.50.16-r4.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND=""
diff --git a/app-arch/bzip2/bzip2-1.0.6-r3.ebuild b/app-arch/bzip2/bzip2-1.0.6-r3.ebuild
index 8e92d59..94311e2 100644
--- a/app-arch/bzip2/bzip2-1.0.6-r3.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.6-r3.ebuild
@@ -15,7 +15,7 @@
 
 LICENSE="BZIP2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ~ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="static static-libs"
 
 src_prepare() {
diff --git a/app-arch/cabextract/cabextract-1.4.ebuild b/app-arch/cabextract/cabextract-1.4.ebuild
index 4c45922..46d9545 100644
--- a/app-arch/cabextract/cabextract-1.4.ebuild
+++ b/app-arch/cabextract/cabextract-1.4.ebuild
@@ -10,7 +10,7 @@
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE="extra-tools"
 
 RDEPEND="extra-tools? ( dev-lang/perl )"
diff --git a/app-arch/cpio/cpio-2.11.ebuild b/app-arch/cpio/cpio-2.11.ebuild
index 48aaa10..48130a7 100644
--- a/app-arch/cpio/cpio-2.11.ebuild
+++ b/app-arch/cpio/cpio-2.11.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="nls"
 
 src_prepare() {
diff --git a/app-arch/gzip/gzip-1.5.ebuild b/app-arch/gzip/gzip-1.5.ebuild
index 7f32499..f1bb6bb 100644
--- a/app-arch/gzip/gzip-1.5.ebuild
+++ b/app-arch/gzip/gzip-1.5.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="nls pic static"
 
 RDEPEND=""
diff --git a/app-arch/lzop/lzop-1.03.ebuild b/app-arch/lzop/lzop-1.03.ebuild
index 9c5740b..ebe2c7d 100644
--- a/app-arch/lzop/lzop-1.03.ebuild
+++ b/app-arch/lzop/lzop-1.03.ebuild
@@ -10,7 +10,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 arm hppa ia64 mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=dev-libs/lzo-2"
diff --git a/app-arch/pigz/pigz-2.2.5.ebuild b/app-arch/pigz/pigz-2.2.5.ebuild
index 9a98ab8..2debc27 100644
--- a/app-arch/pigz/pigz-2.2.5.ebuild
+++ b/app-arch/pigz/pigz-2.2.5.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~mips ~sparc x86 ~amd64-linux ~sparc64-solaris"
+KEYWORDS="alpha amd64 mips sparc x86 ~amd64-linux ~sparc64-solaris"
 IUSE="static symlink test"
 
 LIB_DEPEND="sys-libs/zlib[static-libs(+)]"
diff --git a/app-arch/rpm2targz/rpm2targz-9.0.0.4g.ebuild b/app-arch/rpm2targz/rpm2targz-9.0.0.4g.ebuild
index 1625e4f..5f2a15d 100644
--- a/app-arch/rpm2targz/rpm2targz-9.0.0.4g.ebuild
+++ b/app-arch/rpm2targz/rpm2targz-9.0.0.4g.ebuild
@@ -10,7 +10,7 @@
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND="app-arch/cpio"
diff --git a/app-arch/sharutils/sharutils-4.7.ebuild b/app-arch/sharutils/sharutils-4.7.ebuild
index 8659717..489c8e9 100644
--- a/app-arch/sharutils/sharutils-4.7.ebuild
+++ b/app-arch/sharutils/sharutils-4.7.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~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 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls"
 
 DEPEND="sys-apps/texinfo
diff --git a/app-arch/unrar/unrar-4.2.4.ebuild b/app-arch/unrar/unrar-4.2.4.ebuild
index 7b1e9f3..23731ba 100644
--- a/app-arch/unrar/unrar-4.2.4.ebuild
+++ b/app-arch/unrar/unrar-4.2.4.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="unRAR"
 SLOT="0"
-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 ~x86-fbsd"
 IUSE=""
 
 RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417"
diff --git a/app-arch/unzip/unzip-6.0-r1.ebuild b/app-arch/unzip/unzip-6.0-r1.ebuild
index a3f8691..948656a 100644
--- a/app-arch/unzip/unzip-6.0-r1.ebuild
+++ b/app-arch/unzip/unzip-6.0-r1.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="Info-ZIP"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 m68k ~ppc ppc64 s390 sh ~sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ppc ppc64 s390 sh sparc x86"
 IUSE="bzip2 unicode"
 
 DEPEND="bzip2? ( app-arch/bzip2 )"
diff --git a/app-arch/xz-utils/xz-utils-4.999.9_beta.ebuild b/app-arch/xz-utils/xz-utils-4.999.9_beta.ebuild
index 38d464c..3749058 100644
--- a/app-arch/xz-utils/xz-utils-4.999.9_beta.ebuild
+++ b/app-arch/xz-utils/xz-utils-4.999.9_beta.ebuild
@@ -15,7 +15,7 @@
 else
 	MY_P="${PN/-utils}-${PV/_}"
 	SRC_URI="http://tukaani.org/xz/${MY_P}.tar.gz"
-	KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 ~s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+	KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
 	S=${WORKDIR}/${MY_P}
 	EXTRA_DEPEND=
 fi
diff --git a/app-arch/zip/zip-3.0.ebuild b/app-arch/zip/zip-3.0.ebuild
index 12b2832..7a6eab1 100644
--- a/app-arch/zip/zip-3.0.ebuild
+++ b/app-arch/zip/zip-3.0.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="Info-ZIP"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 crypt unicode"
 
 RDEPEND="bzip2? ( app-arch/bzip2 )"
diff --git a/app-crypt/mit-krb5/mit-krb5-1.9.2-r2.ebuild b/app-crypt/mit-krb5/mit-krb5-1.9.2-r2.ebuild
index 6b64bdb..dc9c9b5 100644
--- a/app-crypt/mit-krb5/mit-krb5-1.9.2-r2.ebuild
+++ b/app-crypt/mit-krb5/mit-krb5-1.9.2-r2.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="doc +keyutils openldap +pkinit +threads test xinetd"
 
 RDEPEND="!!app-crypt/heimdal
diff --git a/app-editors/emacs/emacs-23.3-r2.ebuild b/app-editors/emacs/emacs-23.3-r2.ebuild
index eacb468..fa6cfba 100644
--- a/app-editors/emacs/emacs-23.3-r2.ebuild
+++ b/app-editors/emacs/emacs-23.3-r2.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="GPL-3 FDL-1.3 BSD as-is MIT W3C unicode PSF-2"
 SLOT="23"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ~ppc ~ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~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 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="alsa aqua athena dbus gconf gif gpm gtk gzip-el hesiod jpeg kerberos livecd m17n-lib motif png sound source svg tiff toolkit-scroll-bars X Xaw3d xft +xpm"
 REQUIRED_USE="aqua? ( !X )"
 
diff --git a/app-editors/vim-core/vim-core-7.3.409.ebuild b/app-editors/vim-core/vim-core-7.3.409.ebuild
index 84ad66f..b7eb551 100644
--- a/app-editors/vim-core/vim-core-7.3.409.ebuild
+++ b/app-editors/vim-core/vim-core-7.3.409.ebuild
@@ -16,5 +16,5 @@
 
 S="${WORKDIR}/vim${VIM_VERSION/.}"
 DESCRIPTION="vim and gvim shared files"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
diff --git a/app-editors/vim/vim-7.3.409.ebuild b/app-editors/vim/vim-7.3.409.ebuild
index dcb8a3b..9f76a95 100644
--- a/app-editors/vim/vim-7.3.409.ebuild
+++ b/app-editors/vim/vim-7.3.409.ebuild
@@ -13,7 +13,7 @@
 
 S="${WORKDIR}/vim${VIM_VERSION/.}"
 DESCRIPTION="Vim, an improved vi-style text editor"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 src_prepare() {
diff --git a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.3-r1.ebuild b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.3-r1.ebuild
index 75346d8..e8eb674 100644
--- a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.3-r1.ebuild
+++ b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.3-r1.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="X emacs22icons"
 
 PDEPEND="virtual/emacs"
diff --git a/app-misc/ckermit/ckermit-8.0.211-r4.ebuild b/app-misc/ckermit/ckermit-8.0.211-r4.ebuild
index a6f2582..7308c4d 100644
--- a/app-misc/ckermit/ckermit-8.0.211-r4.ebuild
+++ b/app-misc/ckermit/ckermit-8.0.211-r4.ebuild
@@ -16,7 +16,7 @@
 
 LICENSE="Kermit"
 SLOT="0"
-KEYWORDS="amd64 arm ~hppa ppc ppc64 x86"
+KEYWORDS="amd64 arm hppa ppc ppc64 x86"
 IUSE="ncurses"
 
 DEPEND="ncurses? ( >=sys-libs/ncurses-5.2 )"
diff --git a/app-misc/editor-wrapper/editor-wrapper-4.ebuild b/app-misc/editor-wrapper/editor-wrapper-4.ebuild
index 2a00bf9..05d276a 100644
--- a/app-misc/editor-wrapper/editor-wrapper-4.ebuild
+++ b/app-misc/editor-wrapper/editor-wrapper-4.ebuild
@@ -10,7 +10,7 @@
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE=""
 
 S="${WORKDIR}"
diff --git a/app-misc/mc/mc-4.8.10.ebuild b/app-misc/mc/mc-4.8.10.ebuild
index 3bb942f..b7909e9 100644
--- a/app-misc/mc/mc-4.8.10.ebuild
+++ b/app-misc/mc/mc-4.8.10.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 IUSE="+edit gpm mclib nls samba sftp +slang spell test X +xdg"
 
 REQUIRED_USE="spell? ( edit )"
diff --git a/app-misc/mime-types/mime-types-8.ebuild b/app-misc/mime-types/mime-types-8.ebuild
index 4178390..3af2b70 100644
--- a/app-misc/mime-types/mime-types-8.ebuild
+++ b/app-misc/mime-types/mime-types-8.ebuild
@@ -8,7 +8,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=""
diff --git a/app-misc/pax-utils/pax-utils-0.4.ebuild b/app-misc/pax-utils/pax-utils-0.4.ebuild
index 09c30a9..0b14cff 100644
--- a/app-misc/pax-utils/pax-utils-0.4.ebuild
+++ b/app-misc/pax-utils/pax-utils-0.4.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="caps"
 #RESTRICT="mirror"
 
diff --git a/app-misc/screen/screen-4.0.3-r4.ebuild b/app-misc/screen/screen-4.0.3-r4.ebuild
index 9a213ff..1f1d1db 100644
--- a/app-misc/screen/screen-4.0.3-r4.ebuild
+++ b/app-misc/screen/screen-4.0.3-r4.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug nethack pam selinux multiuser"
 
 RDEPEND=">=sys-libs/ncurses-5.2
diff --git a/app-misc/tmux/tmux-1.6.ebuild b/app-misc/tmux/tmux-1.6.ebuild
index 819c619..115e7bd 100644
--- a/app-misc/tmux/tmux-1.6.ebuild
+++ b/app-misc/tmux/tmux-1.6.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="amd64 arm ~mips ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="vim-syntax"
 
 DEPEND="
diff --git a/app-office/dia/dia-0.97.2.ebuild b/app-office/dia/dia-0.97.2.ebuild
index ca6fdad..5835bc0 100644
--- a/app-office/dia/dia-0.97.2.ebuild
+++ b/app-office/dia/dia-0.97.2.ebuild
@@ -16,7 +16,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
 # the doc USE flag doesn't seem to do anything without docbook2html
 IUSE="cairo doc gnome python"
 
diff --git a/app-portage/gentoolkit-dev/gentoolkit-dev-0.2.8.ebuild b/app-portage/gentoolkit-dev/gentoolkit-dev-0.2.8.ebuild
index 56edfdf..2231f11 100644
--- a/app-portage/gentoolkit-dev/gentoolkit-dev-0.2.8.ebuild
+++ b/app-portage/gentoolkit-dev/gentoolkit-dev-0.2.8.ebuild
@@ -15,7 +15,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=""
diff --git a/app-portage/gentoolkit/gentoolkit-0.3.0.7-r2.ebuild b/app-portage/gentoolkit/gentoolkit-0.3.0.7-r2.ebuild
index 0f81003..2730725 100644
--- a/app-portage/gentoolkit/gentoolkit-0.3.0.7-r2.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.3.0.7-r2.ebuild
@@ -18,7 +18,7 @@
 SLOT="0"
 IUSE=""
 
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # Note: dev-lang/python dependencies are so emerge will print a blocker if any
 # installed slot of python is not built with +xml.  This is used since
diff --git a/app-portage/portage-utils/portage-utils-0.10.ebuild b/app-portage/portage-utils/portage-utils-0.10.ebuild
index 3db756c..e258a0e 100644
--- a/app-portage/portage-utils/portage-utils-0.10.ebuild
+++ b/app-portage/portage-utils/portage-utils-0.10.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static"
 
 src_configure() {
diff --git a/app-shells/bash-completion/bash-completion-1.3.ebuild b/app-shells/bash-completion/bash-completion-1.3.ebuild
index 97eda02..c0155ae 100644
--- a/app-shells/bash-completion/bash-completion-1.3.ebuild
+++ b/app-shells/bash-completion/bash-completion-1.3.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
 IUSE=""
 
 DEPEND=""
diff --git a/app-shells/bash/bash-4.2_p20.ebuild b/app-shells/bash/bash-4.2_p20.ebuild
index f05034f..c85f4ca 100644
--- a/app-shells/bash/bash-4.2_p20.ebuild
+++ b/app-shells/bash/bash-4.2_p20.ebuild
@@ -34,7 +34,7 @@
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="afs bashlogger examples mem-scramble +net nls plugins vanilla"
 
 DEPEND=">=sys-libs/ncurses-5.2-r2
diff --git a/app-shells/dash/dash-0.5.5.1.7.ebuild b/app-shells/dash/dash-0.5.5.1.7.ebuild
index de51e76..f104652 100644
--- a/app-shells/dash/dash-0.5.5.1.7.ebuild
+++ b/app-shells/dash/dash-0.5.5.1.7.ebuild
@@ -18,7 +18,7 @@
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86"
 IUSE="libedit static"
 
 RDEPEND="!static? ( libedit? ( dev-libs/libedit ) )"
diff --git a/app-shells/gentoo-bashcomp/gentoo-bashcomp-20101217.ebuild b/app-shells/gentoo-bashcomp/gentoo-bashcomp-20101217.ebuild
index 4b3b1e3..4c7b5e1 100644
--- a/app-shells/gentoo-bashcomp/gentoo-bashcomp-20101217.ebuild
+++ b/app-shells/gentoo-bashcomp/gentoo-bashcomp-20101217.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
 IUSE=""
 
 RDEPEND="app-shells/bash-completion"
diff --git a/app-text/asciidoc/asciidoc-8.2.6.ebuild b/app-text/asciidoc/asciidoc-8.2.6.ebuild
index c03a6d3..da65a03 100644
--- a/app-text/asciidoc/asciidoc-8.2.6.ebuild
+++ b/app-text/asciidoc/asciidoc-8.2.6.ebuild
@@ -8,7 +8,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-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 ~x86-fbsd"
 IUSE="examples vim-syntax"
 
 DEPEND=">=virtual/python-2.3
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r3.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r3.ebuild
index ce7c219..34ccf0d 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r3.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r3.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="as-is"
 SLOT="3.0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE=""
 
 DEPEND=">=app-arch/unzip-5.41"
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r3.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r3.ebuild
index 0b16e33..3b28aa0 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r3.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r3.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="as-is"
 SLOT="3.1"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE=""
 
 DEPEND=">=app-arch/unzip-5.41"
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r3.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r3.ebuild
index 40563be..38f08d0 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r3.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r3.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="as-is"
 SLOT="4.0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE=""
 
 DEPEND=">=app-arch/unzip-5.41"
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r3.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r3.ebuild
index 87d2239..107f00f 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r3.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r3.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="as-is"
 SLOT="4.1"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE=""
 
 DEPEND=">=app-arch/unzip-5.41"
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r2.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r2.ebuild
index 45cb840..ec2ca30 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r2.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r2.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="as-is"
 SLOT="4.2"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE=""
 
 DEPEND=">=app-arch/unzip-5.41"
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r2.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r2.ebuild
index 2edb4c5..64ab077 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r2.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r2.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="as-is"
 SLOT="4.3"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE=""
 
 DEPEND=">=app-arch/unzip-5.41"
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4.ebuild
index 0583583..5f5183a 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="as-is"
 SLOT="4.4"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE=""
 
 DEPEND=">=app-arch/unzip-5.41"
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5.ebuild
index 90085fe..17a750f 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="as-is"
 SLOT="4.5"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="alpha ~amd64 ~arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE=""
 
 DEPEND=">=app-arch/unzip-5.41"
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r6.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r6.ebuild
index 189e39b..3cba517 100644
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r6.ebuild
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r6.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="as-is"
 SLOT="${PV}"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r2.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r2.ebuild
index 883b7f7..85af89a 100644
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r2.ebuild
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r2.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="as-is"
 SLOT="${PV}"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r1.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r1.ebuild
index 5c9d9d3..cecd6f7 100644
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r1.ebuild
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r1.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="as-is"
 SLOT="${PV}"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~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 m68k 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"
 IUSE=""
 
 RDEPEND=""
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r1.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r1.ebuild
index c5ca099..f6e4d6e 100644
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r1.ebuild
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r1.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="as-is"
 SLOT="${PV}"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5.ebuild
index dd9cda1..bfe50ad 100644
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5.ebuild
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="as-is"
 SLOT="${PV}"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.75.2.ebuild b/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.75.2.ebuild
index b875008..f8eba2c 100644
--- a/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.75.2.ebuild
+++ b/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.75.2.ebuild
@@ -8,7 +8,7 @@
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~ppc-aix ~sparc-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"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-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=""
 
 RDEPEND=">=app-text/build-docbook-catalog-1.1"
diff --git a/app-text/dos2unix/dos2unix-5.3.1.ebuild b/app-text/dos2unix/dos2unix-5.3.1.ebuild
index 50a5c45..22b5b75 100644
--- a/app-text/dos2unix/dos2unix-5.3.1.ebuild
+++ b/app-text/dos2unix/dos2unix-5.3.1.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
 IUSE="debug nls"
 
 RDEPEND="
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.05.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.05.ebuild
index 7506b97..32e6f0d 100644
--- a/app-text/ghostscript-gpl/ghostscript-gpl-9.05.ebuild
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.05.ebuild
@@ -19,7 +19,7 @@
 
 LICENSE="GPL-3 CPL-1.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="bindist cups dbus djvu gtk idn jpeg2k static-libs X"
 
 COMMON_DEPEND="
diff --git a/app-text/gnome-doc-utils/gnome-doc-utils-0.16.1.ebuild b/app-text/gnome-doc-utils/gnome-doc-utils-0.16.1.ebuild
index cd1c280..c39e753 100644
--- a/app-text/gnome-doc-utils/gnome-doc-utils-0.16.1.ebuild
+++ b/app-text/gnome-doc-utils/gnome-doc-utils-0.16.1.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-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 ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=dev-libs/libxml2-2.6.12[python]
diff --git a/app-text/htmltidy/htmltidy-20090325.ebuild b/app-text/htmltidy/htmltidy-20090325.ebuild
index 8c6f66b..43bcee0 100644
--- a/app-text/htmltidy/htmltidy-20090325.ebuild
+++ b/app-text/htmltidy/htmltidy-20090325.ebuild
@@ -16,7 +16,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="debug doc"
 
 DEPEND="doc? ( app-doc/doxygen )"
diff --git a/app-text/libpaper/libpaper-1.1.23.ebuild b/app-text/libpaper/libpaper-1.1.23.ebuild
index 0f7f6a9..e190a67 100644
--- a/app-text/libpaper/libpaper-1.1.23.ebuild
+++ b/app-text/libpaper/libpaper-1.1.23.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
 IUSE=""
 
 src_unpack() {
diff --git a/app-text/openjade/openjade-1.3.2-r3.ebuild b/app-text/openjade/openjade-1.3.2-r3.ebuild
index 15c5a68..dc6c67d 100644
--- a/app-text/openjade/openjade-1.3.2-r3.ebuild
+++ b/app-text/openjade/openjade-1.3.2-r3.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="static-libs"
 
 RDEPEND="app-text/sgml-common
diff --git a/app-text/opensp/opensp-1.5.2-r1.ebuild b/app-text/opensp/opensp-1.5.2-r1.ebuild
index 02f4558..3fd5701 100644
--- a/app-text/opensp/opensp-1.5.2-r1.ebuild
+++ b/app-text/opensp/opensp-1.5.2-r1.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="JamesClark"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
 IUSE="doc nls"
 
 DEPEND="nls? ( >=sys-devel/gettext-0.14.5 )
diff --git a/app-text/poppler-data/poppler-data-0.4.4.ebuild b/app-text/poppler-data/poppler-data-0.4.4.ebuild
index 768b3f2..c6630e2 100644
--- a/app-text/poppler-data/poppler-data-0.4.4.ebuild
+++ b/app-text/poppler-data/poppler-data-0.4.4.ebuild
@@ -9,7 +9,7 @@
 SRC_URI="http://poppler.freedesktop.org/${P}.tar.gz"
 
 LICENSE="BSD GPL-2 MIT"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
 
diff --git a/app-text/rarian/rarian-0.8.1.ebuild b/app-text/rarian/rarian-0.8.1.ebuild
index 401e14d..3eee7f1 100644
--- a/app-text/rarian/rarian-0.8.1.ebuild
+++ b/app-text/rarian/rarian-0.8.1.ebuild
@@ -9,7 +9,7 @@
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND="dev-libs/libxslt"
diff --git a/app-text/scrollkeeper/scrollkeeper-9999-r1.ebuild b/app-text/scrollkeeper/scrollkeeper-9999-r1.ebuild
index d4337c0..83768ae 100644
--- a/app-text/scrollkeeper/scrollkeeper-9999-r1.ebuild
+++ b/app-text/scrollkeeper/scrollkeeper-9999-r1.ebuild
@@ -7,7 +7,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="=app-text/scrollkeeper-dtd-1.0"
diff --git a/app-text/sgml-common/sgml-common-0.6.3-r5.ebuild b/app-text/sgml-common/sgml-common-0.6.3-r5.ebuild
index 538b959..2f2f3bd 100644
--- a/app-text/sgml-common/sgml-common-0.6.3-r5.ebuild
+++ b/app-text/sgml-common/sgml-common-0.6.3-r5.ebuild
@@ -10,7 +10,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND=""
diff --git a/app-text/texi2html/texi2html-1.78.ebuild b/app-text/texi2html/texi2html-1.78.ebuild
index 0e27e82..c8fa081 100644
--- a/app-text/texi2html/texi2html-1.78.ebuild
+++ b/app-text/texi2html/texi2html-1.78.ebuild
@@ -10,7 +10,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-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 ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+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 ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=dev-lang/perl-5.6.1"
diff --git a/app-text/xmlto/xmlto-0.0.24-r1.ebuild b/app-text/xmlto/xmlto-0.0.24-r1.ebuild
index 5ec7acd..ba1834e 100644
--- a/app-text/xmlto/xmlto-0.0.24-r1.ebuild
+++ b/app-text/xmlto/xmlto-0.0.24-r1.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha ~amd64 ~arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="latex"
 
 RDEPEND="app-shells/bash
diff --git a/app-vim/gentoo-syntax/gentoo-syntax-20101212.ebuild b/app-vim/gentoo-syntax/gentoo-syntax-20101212.ebuild
index a430d1f..d39be84 100644
--- a/app-vim/gentoo-syntax/gentoo-syntax-20101212.ebuild
+++ b/app-vim/gentoo-syntax/gentoo-syntax-20101212.ebuild
@@ -9,7 +9,7 @@
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="vim"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="ignore-glep31"
 
 VIM_PLUGIN_HELPFILES="gentoo-syntax"
diff --git a/dev-cpp/ctemplate/ctemplate-1.0.ebuild b/dev-cpp/ctemplate/ctemplate-1.0.ebuild
index f6c2b81..50215cf 100644
--- a/dev-cpp/ctemplate/ctemplate-1.0.ebuild
+++ b/dev-cpp/ctemplate/ctemplate-1.0.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm ~ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ppc x86 ~amd64-linux ~x86-linux"
 IUSE="doc emacs vim-syntax static-libs test"
 
 DEPEND="test? ( =dev-lang/python-2* )"
diff --git a/dev-cpp/gmock/gmock-1.6.0.ebuild b/dev-cpp/gmock/gmock-1.6.0.ebuild
index ce7fa19..a744fac 100644
--- a/dev-cpp/gmock/gmock-1.6.0.ebuild
+++ b/dev-cpp/gmock/gmock-1.6.0.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc ~ppc64 x86"
+KEYWORDS="amd64 arm mips ppc ppc64 x86"
 IUSE="static-libs"
 
 RDEPEND="=dev-cpp/gtest-${PV}*"
diff --git a/dev-cpp/gtest/gtest-1.6.0-r1.ebuild b/dev-cpp/gtest/gtest-1.6.0-r1.ebuild
index 30ea603..2dd0d79 100644
--- a/dev-cpp/gtest/gtest-1.6.0-r1.ebuild
+++ b/dev-cpp/gtest/gtest-1.6.0-r1.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos"
 IUSE="examples static-libs"
 
 DEPEND="app-arch/unzip"
diff --git a/dev-db/freetds/freetds-0.91.ebuild b/dev-db/freetds/freetds-0.91.ebuild
index a9a78aa..a63b80f 100644
--- a/dev-db/freetds/freetds-0.91.ebuild
+++ b/dev-db/freetds/freetds-0.91.ebuild
@@ -6,7 +6,7 @@
 
 inherit autotools
 
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~ppc-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~ppc-macos"
 DESCRIPTION="Tabular Datastream Library."
 HOMEPAGE="http://www.freetds.org/"
 SRC_URI="http://ibiblio.org/pub/Linux/ALPHA/freetds/stable/${P}.tar.gz"
diff --git a/dev-db/m17n-db/m17n-db-1.6.2.ebuild b/dev-db/m17n-db/m17n-db-1.6.2.ebuild
index 4218d73..e3ea22b 100644
--- a/dev-db/m17n-db/m17n-db-1.6.2.ebuild
+++ b/dev-db/m17n-db/m17n-db-1.6.2.ebuild
@@ -10,7 +10,7 @@
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="alpha ~amd64 ~arm hppa ia64 ppc ppc64 sh sparc ~x86"
 IUSE=""
 
 DEPEND="sys-devel/gettext"
diff --git a/dev-db/sqlite/sqlite-3.6.22-r2.ebuild b/dev-db/sqlite/sqlite-3.6.22-r2.ebuild
index c305c0d..7206e71 100644
--- a/dev-db/sqlite/sqlite-3.6.22-r2.ebuild
+++ b/dev-db/sqlite/sqlite-3.6.22-r2.ebuild
@@ -21,7 +21,7 @@
 
 LICENSE="as-is"
 SLOT="3"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug doc extensions +fts3 icu +readline secure-delete soundex tcl +threadsafe test"
 
 RDEPEND="icu? ( dev-libs/icu )
diff --git a/dev-embedded/libftdi/libftdi-1.0.ebuild b/dev-embedded/libftdi/libftdi-1.0.ebuild
index b1def50..22265ef 100644
--- a/dev-embedded/libftdi/libftdi-1.0.ebuild
+++ b/dev-embedded/libftdi/libftdi-1.0.ebuild
@@ -12,7 +12,7 @@
 	inherit git-2
 else
 	SRC_URI="http://www.intra2net.com/en/developer/${PN}/download/${MY_P}.tar.bz2"
-	KEYWORDS="amd64 arm ~ppc ~ppc64 ~sparc x86"
+	KEYWORDS="amd64 arm ppc ppc64 sparc x86"
 fi
 
 DESCRIPTION="Userspace access to FTDI USB interface chips"
diff --git a/dev-java/java-config-wrapper/java-config-wrapper-0.16.ebuild b/dev-java/java-config-wrapper/java-config-wrapper-0.16.ebuild
index f9719a0..04d6be9 100644
--- a/dev-java/java-config-wrapper/java-config-wrapper-0.16.ebuild
+++ b/dev-java/java-config-wrapper/java-config-wrapper-0.16.ebuild
@@ -8,7 +8,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND="!<dev-java/java-config-1.3"
diff --git a/dev-lang/perl/perl-5.12.4-r1.ebuild b/dev-lang/perl/perl-5.12.4-r1.ebuild
index 2d1245f..616b4e5 100644
--- a/dev-lang/perl/perl-5.12.4-r1.ebuild
+++ b/dev-lang/perl/perl-5.12.4-r1.ebuild
@@ -27,7 +27,7 @@
 
 LICENSE="|| ( Artistic GPL-1 GPL-2 GPL-3 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE="berkdb build debug doc gdbm ithreads"
 
 COMMON_DEPEND="berkdb? ( sys-libs/db )
diff --git a/dev-lang/swig/swig-2.0.4-r1.ebuild b/dev-lang/swig/swig-2.0.4-r1.ebuild
index 73eec0f..24a266c 100644
--- a/dev-lang/swig/swig-2.0.4-r1.ebuild
+++ b/dev-lang/swig/swig-2.0.4-r1.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="GPL-3 as-is"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~ia64-hpux ~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 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="ccache doc pcre"
 RESTRICT="test"
 
diff --git a/dev-lang/tcl/tcl-8.5.7.ebuild b/dev-lang/tcl/tcl-8.5.7.ebuild
index 9586b74..60b1bd6 100644
--- a/dev-lang/tcl/tcl-8.5.7.ebuild
+++ b/dev-lang/tcl/tcl-8.5.7.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="debug threads"
 
 DEPEND=""
diff --git a/dev-libs/apr-util/apr-util-1.3.9.ebuild b/dev-libs/apr-util/apr-util-1.3.9.ebuild
index 4566bb0..aa85af5 100644
--- a/dev-libs/apr-util/apr-util-1.3.9.ebuild
+++ b/dev-libs/apr-util/apr-util-1.3.9.ebuild
@@ -16,7 +16,7 @@
 
 LICENSE="Apache-2.0"
 SLOT="1"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
 IUSE="berkdb doc freetds gdbm ldap mysql odbc postgres sqlite sqlite3"
 RESTRICT="test"
 
diff --git a/dev-libs/apr/apr-1.3.9.ebuild b/dev-libs/apr/apr-1.3.9.ebuild
index cbee7e7..64f8847 100644
--- a/dev-libs/apr/apr-1.3.9.ebuild
+++ b/dev-libs/apr/apr-1.3.9.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="Apache-2.0"
 SLOT="1"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="doc older-kernels-compatibility +urandom"
 RESTRICT="test"
 
diff --git a/dev-libs/atk/atk-1.32.0-r1.ebuild b/dev-libs/atk/atk-1.32.0-r1.ebuild
index 1cb4636..ff08fda 100644
--- a/dev-libs/atk/atk-1.32.0-r1.ebuild
+++ b/dev-libs/atk/atk-1.32.0-r1.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="LGPL-2"
 SLOT="0"
-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 ~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="doc +introspection nls"
 
 RDEPEND="dev-libs/glib:2
diff --git a/dev-libs/check/check-0.9.8.ebuild b/dev-libs/check/check-0.9.8.ebuild
index 856fff1..51bdd17 100644
--- a/dev-libs/check/check-0.9.8.ebuild
+++ b/dev-libs/check/check-0.9.8.ebuild
@@ -10,7 +10,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="alpha ~amd64 ~arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc ~x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-libs/confuse/confuse-2.7.ebuild b/dev-libs/confuse/confuse-2.7.ebuild
index 5477a98..49570eb 100644
--- a/dev-libs/confuse/confuse-2.7.ebuild
+++ b/dev-libs/confuse/confuse-2.7.ebuild
@@ -10,7 +10,7 @@
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="nls static-libs"
 
 DEPEND="sys-devel/flex
diff --git a/dev-libs/dbus-glib/dbus-glib-0.100.2.ebuild b/dev-libs/dbus-glib/dbus-glib-0.100.2.ebuild
index 8fd3c5a..637dabe 100644
--- a/dev-libs/dbus-glib/dbus-glib-0.100.2.ebuild
+++ b/dev-libs/dbus-glib/dbus-glib-0.100.2.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="|| ( GPL-2 AFL-2.1 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="debug doc static-libs test"
 
 RDEPEND=">=dev-libs/expat-2
diff --git a/dev-libs/engine_pkcs11/engine_pkcs11-0.1.8.ebuild b/dev-libs/engine_pkcs11/engine_pkcs11-0.1.8.ebuild
index bf52ce7..e2fb721 100644
--- a/dev-libs/engine_pkcs11/engine_pkcs11-0.1.8.ebuild
+++ b/dev-libs/engine_pkcs11/engine_pkcs11-0.1.8.ebuild
@@ -16,7 +16,7 @@
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ppc ppc64 ~sparc ~x86"
+KEYWORDS="alpha ~amd64 hppa ia64 ppc ppc64 sparc ~x86"
 IUSE="doc"
 
 DEPEND=">=dev-libs/libp11-0.2.5
diff --git a/dev-libs/expat/expat-2.1.0.ebuild b/dev-libs/expat/expat-2.1.0.ebuild
index 6289123..1d47e71 100644
--- a/dev-libs/expat/expat-2.1.0.ebuild
+++ b/dev-libs/expat/expat-2.1.0.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="elibc_FreeBSD examples static-libs unicode"
 
 src_prepare() {
diff --git a/dev-libs/fribidi/fribidi-0.10.7.ebuild b/dev-libs/fribidi/fribidi-0.10.7.ebuild
index 4f4b288..72fcede 100644
--- a/dev-libs/fribidi/fribidi-0.10.7.ebuild
+++ b/dev-libs/fribidi/fribidi-0.10.7.ebuild
@@ -8,7 +8,7 @@
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sh sparc x86 ~x86-fbsd"
 IUSE=""
 
 src_install() {
diff --git a/dev-libs/glib/glib-2.32.4-r1.ebuild b/dev-libs/glib/glib-2.32.4-r1.ebuild
index 5c6df97..23e5579 100644
--- a/dev-libs/glib/glib-2.32.4-r1.ebuild
+++ b/dev-libs/glib/glib-2.32.4-r1.ebuild
@@ -17,7 +17,7 @@
 LICENSE="LGPL-2+"
 SLOT="2"
 IUSE="debug doc fam kernel_linux selinux static-libs systemtap test utils xattr"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 
 RDEPEND="virtual/libiconv
 	virtual/libffi
diff --git a/dev-libs/gmp/gmp-5.0.2_p1.ebuild b/dev-libs/gmp/gmp-5.0.2_p1.ebuild
index 1b80eca..62545e0 100644
--- a/dev-libs/gmp/gmp-5.0.2_p1.ebuild
+++ b/dev-libs/gmp/gmp-5.0.2_p1.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="doc cxx static-libs"
 
 DEPEND="sys-devel/m4"
diff --git a/dev-libs/libaio/libaio-0.3.109-r3.ebuild b/dev-libs/libaio/libaio-0.3.109-r3.ebuild
index affb1ff..98299fe 100644
--- a/dev-libs/libaio/libaio-0.3.109-r3.ebuild
+++ b/dev-libs/libaio/libaio-0.3.109-r3.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="multilib static-libs"
 
 EMULTILIB_PKG="true"
diff --git a/dev-libs/libatomic_ops/libatomic_ops-7.2d.ebuild b/dev-libs/libatomic_ops/libatomic_ops-7.2d.ebuild
index 492f6c9..759c523 100644
--- a/dev-libs/libatomic_ops/libatomic_ops-7.2d.ebuild
+++ b/dev-libs/libatomic_ops/libatomic_ops-7.2d.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="MIT boehm-gc GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~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 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 S=${WORKDIR}/gc-${PV/d}/libatomic_ops
diff --git a/dev-libs/libchewing/libchewing-0.3.2-r1.ebuild b/dev-libs/libchewing/libchewing-0.3.2-r1.ebuild
index 73f9ce5..70896bb 100644
--- a/dev-libs/libchewing/libchewing-0.3.2-r1.ebuild
+++ b/dev-libs/libchewing/libchewing-0.3.2-r1.ebuild
@@ -12,7 +12,7 @@
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ppc ~x86"
 IUSE="debug test static-libs"
 
 RDEPEND=""
diff --git a/dev-libs/libdaemon/libdaemon-0.14-r1.ebuild b/dev-libs/libdaemon/libdaemon-0.14-r1.ebuild
index 93b602e..9b04725 100644
--- a/dev-libs/libdaemon/libdaemon-0.14-r1.ebuild
+++ b/dev-libs/libdaemon/libdaemon-0.14-r1.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="doc examples static-libs"
 
 RDEPEND=""
diff --git a/dev-libs/libevent/libevent-1.4.13.ebuild b/dev-libs/libevent/libevent-1.4.13.ebuild
index 8738d8a..0e48a5e 100644
--- a/dev-libs/libevent/libevent-1.4.13.ebuild
+++ b/dev-libs/libevent/libevent-1.4.13.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-libs/libevent/libevent-2.0.21.ebuild b/dev-libs/libevent/libevent-2.0.21.ebuild
index e243ca2..dadc441 100644
--- a/dev-libs/libevent/libevent-2.0.21.ebuild
+++ b/dev-libs/libevent/libevent-2.0.21.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~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 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+ssl static-libs test"
 
 DEPEND="ssl? ( dev-libs/openssl )"
diff --git a/dev-libs/libgpg-error/libgpg-error-1.10-r1.ebuild b/dev-libs/libgpg-error/libgpg-error-1.10-r1.ebuild
index f03dd8b..42794d1 100644
--- a/dev-libs/libgpg-error/libgpg-error-1.10-r1.ebuild
+++ b/dev-libs/libgpg-error/libgpg-error-1.10-r1.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha ~amd64 ~arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="common-lisp nls static-libs"
 
 RDEPEND="nls? ( virtual/libintl )"
diff --git a/dev-libs/libgpg-error/libgpg-error-1.7.ebuild b/dev-libs/libgpg-error/libgpg-error-1.7.ebuild
index b815600..ddef08b 100644
--- a/dev-libs/libgpg-error/libgpg-error-1.7.ebuild
+++ b/dev-libs/libgpg-error/libgpg-error-1.7.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
 IUSE="common-lisp nls"
 
 RDEPEND="nls? ( virtual/libintl )"
diff --git a/dev-libs/libnl/libnl-1.1-r1.ebuild b/dev-libs/libnl/libnl-1.1-r1.ebuild
index f07e2ac..14d1326 100644
--- a/dev-libs/libnl/libnl-1.1-r1.ebuild
+++ b/dev-libs/libnl/libnl-1.1-r1.ebuild
@@ -9,7 +9,7 @@
 SRC_URI="http://people.suug.ch/~tgr/libnl/files/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 arm hppa ~ia64 ppc ppc64 ~sh ~sparc x86"
+KEYWORDS="amd64 arm hppa ia64 ppc ppc64 sh sparc x86"
 IUSE=""
 
 src_unpack() {
diff --git a/dev-libs/libnl/libnl-3.2.14.ebuild b/dev-libs/libnl/libnl-3.2.14.ebuild
index 80f0fca..4d4ddbe 100644
--- a/dev-libs/libnl/libnl-3.2.14.ebuild
+++ b/dev-libs/libnl/libnl-3.2.14.ebuild
@@ -13,7 +13,7 @@
 "
 LICENSE="LGPL-2.1"
 SLOT="3"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~ia64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~ia64-linux ~x86-linux"
 IUSE="doc static-libs utils"
 
 DEPEND="
diff --git a/dev-libs/libpcre/libpcre-8.30-r2.ebuild b/dev-libs/libpcre/libpcre-8.30-r2.ebuild
index f1ac63b..9467f1e 100644
--- a/dev-libs/libpcre/libpcre-8.30-r2.ebuild
+++ b/dev-libs/libpcre/libpcre-8.30-r2.ebuild
@@ -19,7 +19,7 @@
 
 LICENSE="BSD"
 SLOT="3"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 +cxx +jit pcre16 +readline +recursion-limit static-libs unicode zlib"
 
 RDEPEND="bzip2? ( app-arch/bzip2 )
diff --git a/dev-libs/libtommath/libtommath-0.42.0-r1.ebuild b/dev-libs/libtommath/libtommath-0.42.0-r1.ebuild
index 69b2993..39e4856 100644
--- a/dev-libs/libtommath/libtommath-0.42.0-r1.ebuild
+++ b/dev-libs/libtommath/libtommath-0.42.0-r1.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="WTFPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc examples static-libs"
 
 DEPEND="sys-devel/libtool"
diff --git a/dev-libs/libusb/libusb-0.1.12-r7.ebuild b/dev-libs/libusb/libusb-0.1.12-r7.ebuild
index cb4f06f..c8b0e1f 100644
--- a/dev-libs/libusb/libusb-0.1.12-r7.ebuild
+++ b/dev-libs/libusb/libusb-0.1.12-r7.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug doc +cxx static-libs"
 RESTRICT="test"
 
diff --git a/dev-libs/libusb/libusb-1.0.9.ebuild b/dev-libs/libusb/libusb-1.0.9.ebuild
index 708fea0..bc5fd0e 100644
--- a/dev-libs/libusb/libusb-1.0.9.ebuild
+++ b/dev-libs/libusb/libusb-1.0.9.ebuild
@@ -10,7 +10,7 @@
 
 LICENSE="LGPL-2.1"
 SLOT="1"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 -amd64-fbsd -x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 -amd64-fbsd -x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug doc static-libs"
 
 RDEPEND="!dev-libs/libusbx:1"
diff --git a/dev-libs/libxml2/libxml2-2.9.1-r1.ebuild b/dev-libs/libxml2/libxml2-2.9.1-r1.ebuild
index ed4c313..42a890e 100644
--- a/dev-libs/libxml2/libxml2-2.9.1-r1.ebuild
+++ b/dev-libs/libxml2/libxml2-2.9.1-r1.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="debug examples icu ipv6 lzma readline static-libs test"
 
 XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite"
diff --git a/dev-libs/libxslt/libxslt-1.1.26-r1.ebuild b/dev-libs/libxslt/libxslt-1.1.26-r1.ebuild
index 26ccac4..dd48720 100644
--- a/dev-libs/libxslt/libxslt-1.1.26-r1.ebuild
+++ b/dev-libs/libxslt/libxslt-1.1.26-r1.ebuild
@@ -15,7 +15,7 @@
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="crypt debug python"
 
 DEPEND=">=dev-libs/libxml2-2.6.27:2
diff --git a/dev-libs/libyaml/libyaml-0.1.4.ebuild b/dev-libs/libyaml/libyaml-0.1.4.ebuild
index e10cd20..810cd33 100644
--- a/dev-libs/libyaml/libyaml-0.1.4.ebuild
+++ b/dev-libs/libyaml/libyaml-0.1.4.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples test static-libs"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-libs/lzo/lzo-2.06.ebuild b/dev-libs/lzo/lzo-2.06.ebuild
index 2319908..47c4389 100644
--- a/dev-libs/lzo/lzo-2.06.ebuild
+++ b/dev-libs/lzo/lzo-2.06.ebuild
@@ -10,7 +10,7 @@
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 IUSE="examples static-libs"
 
 src_configure() {
diff --git a/dev-libs/m17n-lib/m17n-lib-1.6.2.ebuild b/dev-libs/m17n-lib/m17n-lib-1.6.2.ebuild
index 238c837..34672e1 100644
--- a/dev-libs/m17n-lib/m17n-lib-1.6.2.ebuild
+++ b/dev-libs/m17n-lib/m17n-lib-1.6.2.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="alpha ~amd64 ~arm hppa ia64 ppc ppc64 sh sparc ~x86"
 #IUSE="anthy gd ispell"
 IUSE="gd X"
 
diff --git a/dev-libs/mpc/mpc-0.8.2.ebuild b/dev-libs/mpc/mpc-0.8.2.ebuild
index 54ffa6b..8d7278b 100644
--- a/dev-libs/mpc/mpc-0.8.2.ebuild
+++ b/dev-libs/mpc/mpc-0.8.2.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=dev-libs/gmp-4.2.3
diff --git a/dev-libs/mpfr/mpfr-3.0.1_p4.ebuild b/dev-libs/mpfr/mpfr-3.0.1_p4.ebuild
index 65a21f3..1ab941e 100644
--- a/dev-libs/mpfr/mpfr-3.0.1_p4.ebuild
+++ b/dev-libs/mpfr/mpfr-3.0.1_p4.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=dev-libs/gmp-4.1.4-r2"
diff --git a/dev-libs/nspr/nspr-4.10.ebuild b/dev-libs/nspr/nspr-4.10.ebuild
index a1a9fd3..63e693e 100644
--- a/dev-libs/nspr/nspr-4.10.ebuild
+++ b/dev-libs/nspr/nspr-4.10.ebuild
@@ -15,7 +15,7 @@
 
 LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-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 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug"
 
 src_prepare() {
diff --git a/dev-libs/openssl/openssl-0.9.8x.ebuild b/dev-libs/openssl/openssl-0.9.8x.ebuild
index bf624e4..6d3d1cc 100644
--- a/dev-libs/openssl/openssl-0.9.8x.ebuild
+++ b/dev-libs/openssl/openssl-0.9.8x.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="openssl"
 SLOT="0.9.8"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="bindist gmp kerberos sse2 test zlib"
 
 RDEPEND="gmp? ( dev-libs/gmp )
diff --git a/dev-libs/pkcs11-helper/pkcs11-helper-1.07.ebuild b/dev-libs/pkcs11-helper/pkcs11-helper-1.07.ebuild
index d8a899b..cc0681d 100644
--- a/dev-libs/pkcs11-helper/pkcs11-helper-1.07.ebuild
+++ b/dev-libs/pkcs11-helper/pkcs11-helper-1.07.ebuild
@@ -8,7 +8,7 @@
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE="doc gnutls nss"
 RESTRICT="test"
 
diff --git a/dev-libs/popt/popt-1.16-r1.ebuild b/dev-libs/popt/popt-1.16-r1.ebuild
index d430a53..04a2b1e 100644
--- a/dev-libs/popt/popt-1.16-r1.ebuild
+++ b/dev-libs/popt/popt-1.16-r1.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="nls static-libs"
 
 RDEPEND="nls? ( virtual/libintl )"
diff --git a/dev-libs/udis86/udis86-1.7.ebuild b/dev-libs/udis86/udis86-1.7.ebuild
index d9d6c23..6ea0a40 100644
--- a/dev-libs/udis86/udis86-1.7.ebuild
+++ b/dev-libs/udis86/udis86-1.7.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ~ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 hppa ppc ppc64 x86 ~x86-fbsd"
 IUSE="pic test"
 
 DEPEND="test? (
diff --git a/dev-libs/xmlrpc-c/xmlrpc-c-1.18.02.ebuild b/dev-libs/xmlrpc-c/xmlrpc-c-1.18.02.ebuild
index 4156ac2..aa7db7c 100644
--- a/dev-libs/xmlrpc-c/xmlrpc-c-1.18.02.ebuild
+++ b/dev-libs/xmlrpc-c/xmlrpc-c-1.18.02.ebuild
@@ -10,7 +10,7 @@
 SRC_URI="mirror://gentoo/${PN}/${P}.tar.bz2"
 HOMEPAGE="http://xmlrpc-c.sourceforge.net/"
 
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86"
 IUSE="+curl +cxx tools +cgi abyss threads"
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-perl/Crypt-PasswdMD5/Crypt-PasswdMD5-1.300.0.ebuild b/dev-perl/Crypt-PasswdMD5/Crypt-PasswdMD5-1.300.0.ebuild
index ed646de..47f2ddc 100644
--- a/dev-perl/Crypt-PasswdMD5/Crypt-PasswdMD5-1.300.0.ebuild
+++ b/dev-perl/Crypt-PasswdMD5/Crypt-PasswdMD5-1.300.0.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="${LICENSE} BEER-WARE"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 
 SRC_TEST="do"
diff --git a/dev-perl/Digest-SHA1/Digest-SHA1-2.12.ebuild b/dev-perl/Digest-SHA1/Digest-SHA1-2.12.ebuild
index 3f367a4..ab458f5 100644
--- a/dev-perl/Digest-SHA1/Digest-SHA1-2.12.ebuild
+++ b/dev-perl/Digest-SHA1/Digest-SHA1-2.12.ebuild
@@ -10,7 +10,7 @@
 DESCRIPTION="NIST SHA message digest algorithm"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="virtual/perl-digest-base"
diff --git a/dev-perl/GD/GD-2.460.0.ebuild b/dev-perl/GD/GD-2.460.0.ebuild
index 589eb4f..f14f1ce 100644
--- a/dev-perl/GD/GD-2.460.0.ebuild
+++ b/dev-perl/GD/GD-2.460.0.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="|| ( Artistic-2 GPL-1 GPL-2 GPL-3 )" # Artistic-2 or GPL1+
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ia64 mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-solaris"
 IUSE="animgif gif jpeg png truetype xpm"
 
 RDEPEND=">=media-libs/gd-2.0.33
diff --git a/dev-perl/Locale-gettext/Locale-gettext-1.50.0.ebuild b/dev-perl/Locale-gettext/Locale-gettext-1.50.0.ebuild
index e9f1c98..cdd8e35 100644
--- a/dev-perl/Locale-gettext/Locale-gettext-1.50.0.ebuild
+++ b/dev-perl/Locale-gettext/Locale-gettext-1.50.0.ebuild
@@ -12,7 +12,7 @@
 DESCRIPTION="A Perl module for accessing the GNU locale utilities"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="sys-devel/gettext"
diff --git a/dev-perl/Text-Unidecode/Text-Unidecode-0.40.0.ebuild b/dev-perl/Text-Unidecode/Text-Unidecode-0.40.0.ebuild
index 5ad9c08..d3bc841 100644
--- a/dev-perl/Text-Unidecode/Text-Unidecode-0.40.0.ebuild
+++ b/dev-perl/Text-Unidecode/Text-Unidecode-0.40.0.ebuild
@@ -11,7 +11,7 @@
 DESCRIPTION="US-ASCII transliterations of Unicode text"
 
 SLOT="0"
-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"
+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=""
 
 SRC_TEST=do
diff --git a/dev-perl/URI/URI-1.55.ebuild b/dev-perl/URI/URI-1.55.ebuild
index 572ef4c..563ee0c 100644
--- a/dev-perl/URI/URI-1.55.ebuild
+++ b/dev-perl/URI/URI-1.55.ebuild
@@ -10,7 +10,7 @@
 DESCRIPTION="A URI Perl Module"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~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 m68k mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="virtual/perl-MIME-Base64"
diff --git a/dev-perl/XML-Parser/XML-Parser-2.410.0.ebuild b/dev-perl/XML-Parser/XML-Parser-2.410.0.ebuild
index 51ba25e..5e7b72d 100644
--- a/dev-perl/XML-Parser/XML-Parser-2.410.0.ebuild
+++ b/dev-perl/XML-Parser/XML-Parser-2.410.0.ebuild
@@ -11,7 +11,7 @@
 DESCRIPTION="A Perl extension interface to James Clark's XML parser, expat"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~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 ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k 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 ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=dev-libs/expat-1.95.1-r1"
diff --git a/dev-perl/libintl-perl/libintl-perl-1.200.0.ebuild b/dev-perl/libintl-perl/libintl-perl-1.200.0.ebuild
index 0269ddb..153e240 100644
--- a/dev-perl/libintl-perl/libintl-perl-1.200.0.ebuild
+++ b/dev-perl/libintl-perl/libintl-perl-1.200.0.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-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"
+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=""
 
 SRC_TEST=do
diff --git a/dev-perl/yaml/yaml-0.71.ebuild b/dev-perl/yaml/yaml-0.71.ebuild
index 64e62dd..d163aff 100644
--- a/dev-perl/yaml/yaml-0.71.ebuild
+++ b/dev-perl/yaml/yaml-0.71.ebuild
@@ -13,7 +13,7 @@
 DESCRIPTION="YAML Ain't Markup Language (tm)"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 SRC_TEST="do"
diff --git a/dev-python/argparse/argparse-1.2.1.ebuild b/dev-python/argparse/argparse-1.2.1.ebuild
index 6295c24..e2c7465 100644
--- a/dev-python/argparse/argparse-1.2.1.ebuild
+++ b/dev-python/argparse/argparse-1.2.1.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~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 ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k 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 ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="dev-python/setuptools"
diff --git a/dev-python/astng/astng-0.21.1.ebuild b/dev-python/astng/astng-0.21.1.ebuild
index ab62c9f..ec34e85 100644
--- a/dev-python/astng/astng-0.21.1.ebuild
+++ b/dev-python/astng/astng-0.21.1.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ia64 ppc ppc64 sparc ~x86 ~x64-macos ~x86-macos"
 IUSE="test"
 
 # Version specified in __pkginfo__.py.
diff --git a/dev-python/beaker/beaker-1.5.4-r1.ebuild b/dev-python/beaker/beaker-1.5.4-r1.ebuild
index 94271d7..2f21cb2 100644
--- a/dev-python/beaker/beaker-1.5.4-r1.ebuild
+++ b/dev-python/beaker/beaker-1.5.4-r1.ebuild
@@ -19,7 +19,7 @@
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm ppc ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm ppc sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="test"
 
 DEPEND="dev-python/setuptools
diff --git a/dev-python/boto/boto-2.5.2.ebuild b/dev-python/boto/boto-2.5.2.ebuild
index f44ac13..3336150 100644
--- a/dev-python/boto/boto-2.5.2.ebuild
+++ b/dev-python/boto/boto-2.5.2.ebuild
@@ -16,7 +16,7 @@
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86 ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ppc sparc x86 ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="test"
 
 DEPEND="dev-python/setuptools
diff --git a/dev-python/ctypesgen/ctypesgen-0_p72.ebuild b/dev-python/ctypesgen/ctypesgen-0_p72.ebuild
index d1b686c..c9d1c8b 100644
--- a/dev-python/ctypesgen/ctypesgen-0_p72.ebuild
+++ b/dev-python/ctypesgen/ctypesgen-0_p72.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="BSD"
 SLOT="0"
-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 ~x86-fbsd"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-python/dbus-python/dbus-python-0.84.0.ebuild b/dev-python/dbus-python/dbus-python-0.84.0.ebuild
index 7069b94..275c461 100644
--- a/dev-python/dbus-python/dbus-python-0.84.0.ebuild
+++ b/dev-python/dbus-python/dbus-python-0.84.0.ebuild
@@ -17,7 +17,7 @@
 
 LICENSE="MIT"
 SLOT="0"
-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 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="doc examples test"
 
 RDEPEND=">=dev-libs/dbus-glib-0.88
diff --git a/dev-python/django/django-1.4.1.ebuild b/dev-python/django/django-1.4.1.ebuild
index 4cd5942..415894b 100644
--- a/dev-python/django/django-1.4.1.ebuild
+++ b/dev-python/django/django-1.4.1.ebuild
@@ -17,7 +17,7 @@
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="doc mysql postgres sqlite test"
 
 RDEPEND="dev-python/imaging
diff --git a/dev-python/flup/flup-1.0.2.ebuild b/dev-python/flup/flup-1.0.2.ebuild
index 945801d..9fe19e2 100644
--- a/dev-python/flup/flup-1.0.2.ebuild
+++ b/dev-python/flup/flup-1.0.2.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ~arm ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
 IUSE=""
 
 DEPEND="dev-python/setuptools"
diff --git a/dev-python/imaging/imaging-1.1.7-r1.ebuild b/dev-python/imaging/imaging-1.1.7-r1.ebuild
index 7e4a0c1..37bb5b3 100644
--- a/dev-python/imaging/imaging-1.1.7-r1.ebuild
+++ b/dev-python/imaging/imaging-1.1.7-r1.ebuild
@@ -19,7 +19,7 @@
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="doc examples lcms scanner tk X"
 
 DEPEND="virtual/jpeg
diff --git a/dev-python/logilab-common/logilab-common-0.53.0.ebuild b/dev-python/logilab-common/logilab-common-0.53.0.ebuild
index 3fd7199..91645df 100644
--- a/dev-python/logilab-common/logilab-common-0.53.0.ebuild
+++ b/dev-python/logilab-common/logilab-common-0.53.0.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ia64 ppc ppc64 s390 sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="test"
 
 RDEPEND="dev-python/setuptools"
diff --git a/dev-python/m2crypto/m2crypto-0.21.1.ebuild b/dev-python/m2crypto/m2crypto-0.21.1.ebuild
index 87b1dd9..89174db 100644
--- a/dev-python/m2crypto/m2crypto-0.21.1.ebuild
+++ b/dev-python/m2crypto/m2crypto-0.21.1.ebuild
@@ -18,7 +18,7 @@
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="doc examples"
 
 RDEPEND=">=dev-libs/openssl-0.9.8"
diff --git a/dev-python/mako/mako-0.7.0.ebuild b/dev-python/mako/mako-0.7.0.ebuild
index 478c970..f76ba30 100644
--- a/dev-python/mako/mako-0.7.0.ebuild
+++ b/dev-python/mako/mako-0.7.0.ebuild
@@ -16,7 +16,7 @@
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm ~hppa ppc ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm hppa ppc sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="doc"
 
 RDEPEND=">=dev-python/beaker-1.1
diff --git a/dev-python/markupsafe/markupsafe-0.15.ebuild b/dev-python/markupsafe/markupsafe-0.15.ebuild
index d4e930b..f9afab8 100644
--- a/dev-python/markupsafe/markupsafe-0.15.ebuild
+++ b/dev-python/markupsafe/markupsafe-0.15.ebuild
@@ -17,7 +17,7 @@
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
 IUSE=""
 
 DEPEND="dev-python/setuptools"
diff --git a/dev-python/mock/mock-1.0.1.ebuild b/dev-python/mock/mock-1.0.1.ebuild
index cfb2e1e..91c22d7 100644
--- a/dev-python/mock/mock-1.0.1.ebuild
+++ b/dev-python/mock/mock-1.0.1.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-macos"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 s390 sh sparc ~x86 ~x64-macos"
 IUSE="doc test"
 
 # dev-python/unittest2 is not required with Python >=3.2.
diff --git a/dev-python/mox/mox-0.5.3.ebuild b/dev-python/mox/mox-0.5.3.ebuild
index d59cd68..99b6814 100644
--- a/dev-python/mox/mox-0.5.3.ebuild
+++ b/dev-python/mox/mox-0.5.3.ebuild
@@ -16,7 +16,7 @@
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86"
+KEYWORDS="amd64 ppc sparc x86"
 IUSE=""
 
 PYTHON_MODNAME="mox.py stubout.py"
diff --git a/dev-python/nose/nose-1.1.2.ebuild b/dev-python/nose/nose-1.1.2.ebuild
index ae82bf0..d479e7c 100644
--- a/dev-python/nose/nose-1.1.2.ebuild
+++ b/dev-python/nose/nose-1.1.2.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="coverage doc examples test"
 
 RDEPEND="coverage? ( dev-python/coverage )
diff --git a/dev-python/pycairo/pycairo-1.8.8.ebuild b/dev-python/pycairo/pycairo-1.8.8.ebuild
index fd9ff12..553fd5d 100644
--- a/dev-python/pycairo/pycairo-1.8.8.ebuild
+++ b/dev-python/pycairo/pycairo-1.8.8.ebuild
@@ -15,7 +15,7 @@
 
 LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
 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 ~x64-solaris ~x86-solaris"
+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 ~x64-solaris ~x86-solaris"
 IUSE="doc examples svg"
 
 RDEPEND=">=x11-libs/cairo-1.8.8[svg?]"
diff --git a/dev-python/pyinotify/pyinotify-0.9.3.ebuild b/dev-python/pyinotify/pyinotify-0.9.3.ebuild
index 5fdda9b..e764dea 100644
--- a/dev-python/pyinotify/pyinotify-0.9.3.ebuild
+++ b/dev-python/pyinotify/pyinotify-0.9.3.ebuild
@@ -15,7 +15,7 @@
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 DEPEND="dev-python/setuptools"
diff --git a/dev-python/pyopenssl/pyopenssl-0.10.ebuild b/dev-python/pyopenssl/pyopenssl-0.10.ebuild
index 60fe404..8d2c1a0 100644
--- a/dev-python/pyopenssl/pyopenssl-0.10.ebuild
+++ b/dev-python/pyopenssl/pyopenssl-0.10.ebuild
@@ -17,7 +17,7 @@
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos ~x64-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos ~x64-solaris"
 IUSE="doc"
 
 RDEPEND=">=dev-libs/openssl-0.9.6g"
diff --git a/dev-python/pyserial/pyserial-2.5_rc2.ebuild b/dev-python/pyserial/pyserial-2.5_rc2.ebuild
index 8e4b758..a70c2d2 100644
--- a/dev-python/pyserial/pyserial-2.5_rc2.ebuild
+++ b/dev-python/pyserial/pyserial-2.5_rc2.ebuild
@@ -15,7 +15,7 @@
 
 LICENSE="PYTHON"
 SLOT="0"
-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 ~x86-fbsd"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-python/python-dateutil/python-dateutil-2.1.ebuild b/dev-python/python-dateutil/python-dateutil-2.1.ebuild
index f2bc1bb..030fce1 100644
--- a/dev-python/python-dateutil/python-dateutil-2.1.ebuild
+++ b/dev-python/python-dateutil/python-dateutil-2.1.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ia64 ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ia64 ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="examples"
 
 RDEPEND="dev-python/six
diff --git a/dev-python/python-xlib/python-xlib-0.14.ebuild b/dev-python/python-xlib/python-xlib-0.14.ebuild
index cd8d2a2..e514c50 100644
--- a/dev-python/python-xlib/python-xlib-0.14.ebuild
+++ b/dev-python/python-xlib/python-xlib-0.14.ebuild
@@ -9,7 +9,7 @@
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ia64 ppc ~ppc64 x86"
+KEYWORDS="alpha amd64 ~arm ia64 ppc ppc64 x86"
 IUSE="doc"
 DEPEND="${RDEPEND}
 	doc? ( virtual/latex-base
diff --git a/dev-python/pyusb/pyusb-0.4.3.ebuild b/dev-python/pyusb/pyusb-0.4.3.ebuild
index b2ef8a9..35c8a71 100644
--- a/dev-python/pyusb/pyusb-0.4.3.ebuild
+++ b/dev-python/pyusb/pyusb-0.4.3.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ppc ~x86"
 IUSE="examples"
 
 ### The bus enumeration does not appear to work with libusb-compat
diff --git a/dev-python/setproctitle/setproctitle-1.1.6.ebuild b/dev-python/setproctitle/setproctitle-1.1.6.ebuild
index 375187d..c0f002d 100644
--- a/dev-python/setproctitle/setproctitle-1.1.6.ebuild
+++ b/dev-python/setproctitle/setproctitle-1.1.6.ebuild
@@ -15,7 +15,7 @@
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-python/setuptools/setuptools-0.6.14.ebuild b/dev-python/setuptools/setuptools-0.6.14.ebuild
index 99a3bcc..148f498 100644
--- a/dev-python/setuptools/setuptools-0.6.14.ebuild
+++ b/dev-python/setuptools/setuptools-0.6.14.ebuild
@@ -17,7 +17,7 @@
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-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 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-python/simplejson/simplejson-2.5.0.ebuild b/dev-python/simplejson/simplejson-2.5.0.ebuild
index 397f61b..2f3a477 100644
--- a/dev-python/simplejson/simplejson-2.5.0.ebuild
+++ b/dev-python/simplejson/simplejson-2.5.0.ebuild
@@ -15,7 +15,7 @@
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm ppc ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm ppc sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-python/six/six-1.1.0.ebuild b/dev-python/six/six-1.1.0.ebuild
index 96a3fa0..06e0a70 100644
--- a/dev-python/six/six-1.1.0.ebuild
+++ b/dev-python/six/six-1.1.0.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ia64 ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ia64 ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="doc"
 
 DEPEND="doc? ( dev-python/sphinx )"
diff --git a/dev-python/twisted/twisted-11.0.0.ebuild b/dev-python/twisted/twisted-11.0.0.ebuild
index ea17fb3..bd57458 100644
--- a/dev-python/twisted/twisted-11.0.0.ebuild
+++ b/dev-python/twisted/twisted-11.0.0.ebuild
@@ -15,7 +15,7 @@
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~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 ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="crypt gtk serial"
 
 DEPEND=">=net-zope/zope-interface-3.0.1
diff --git a/dev-tcltk/expect/expect-5.44.1.15.ebuild b/dev-tcltk/expect/expect-5.44.1.15.ebuild
index 006a65b..f8edf9f 100644
--- a/dev-tcltk/expect/expect-5.44.1.15.ebuild
+++ b/dev-tcltk/expect/expect-5.44.1.15.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
 IUSE="debug doc threads X"
 
 # We need dejagnu for src_test, but dejagnu needs expect
diff --git a/dev-util/ccache/ccache-3.1.9.ebuild b/dev-util/ccache/ccache-3.1.9.ebuild
index ee209a4..cf88b84 100644
--- a/dev-util/ccache/ccache-3.1.9.ebuild
+++ b/dev-util/ccache/ccache-3.1.9.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND="sys-libs/zlib"
diff --git a/dev-util/cmake/cmake-2.8.6-r4.ebuild b/dev-util/cmake/cmake-2.8.6-r4.ebuild
index 5cb0393..83470ad 100644
--- a/dev-util/cmake/cmake-2.8.6-r4.ebuild
+++ b/dev-util/cmake/cmake-2.8.6-r4.ebuild
@@ -14,7 +14,7 @@
 SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz"
 
 LICENSE="CMake"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~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 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE="emacs ncurses qt4 vim-syntax"
 
diff --git a/dev-util/cscope/cscope-15.7a-r1.ebuild b/dev-util/cscope/cscope-15.7a-r1.ebuild
index 840e5d4..3278052 100644
--- a/dev-util/cscope/cscope-15.7a-r1.ebuild
+++ b/dev-util/cscope/cscope-15.7a-r1.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="emacs"
 
 RDEPEND=">=sys-libs/ncurses-5.2
diff --git a/dev-util/ctags/ctags-5.7.ebuild b/dev-util/ctags/ctags-5.7.ebuild
index 0a6ae79..f0f22ea 100644
--- a/dev-util/ctags/ctags-5.7.ebuild
+++ b/dev-util/ctags/ctags-5.7.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
 IUSE="ada"
 
 DEPEND="app-admin/eselect-ctags"
diff --git a/dev-util/diffstat/diffstat-1.55.ebuild b/dev-util/diffstat/diffstat-1.55.ebuild
index f613b3a..47f4b0c 100644
--- a/dev-util/diffstat/diffstat-1.55.ebuild
+++ b/dev-util/diffstat/diffstat-1.55.ebuild
@@ -10,5 +10,5 @@
 
 LICENSE="as-is"
 SLOT="0"
-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 ~x86-solaris"
+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 ~x86-solaris"
 IUSE=""
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.30.2.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.30.2.ebuild
index 25622a9..e2f5557 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.30.2.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.30.2.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-linux"
+KEYWORDS="alpha amd64 ~arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-linux"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-util/gperf/gperf-3.0.3.ebuild b/dev-util/gperf/gperf-3.0.3.ebuild
index 71b6b31..6b2e54c 100644
--- a/dev-util/gperf/gperf-3.0.3.ebuild
+++ b/dev-util/gperf/gperf-3.0.3.ebuild
@@ -8,7 +8,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-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 ~x86-fbsd"
 IUSE=""
 
 src_install() {
diff --git a/dev-util/gperf/gperf-3.0.4.ebuild b/dev-util/gperf/gperf-3.0.4.ebuild
index ca0f8d4..c87b8c9 100644
--- a/dev-util/gperf/gperf-3.0.4.ebuild
+++ b/dev-util/gperf/gperf-3.0.4.ebuild
@@ -10,7 +10,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-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 ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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 ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 src_install() {
diff --git a/dev-util/gtk-doc-am/gtk-doc-am-1.18.ebuild b/dev-util/gtk-doc-am/gtk-doc-am-1.18.ebuild
index 41501ff..cbad88e 100644
--- a/dev-util/gtk-doc-am/gtk-doc-am-1.18.ebuild
+++ b/dev-util/gtk-doc-am/gtk-doc-am-1.18.ebuild
@@ -16,7 +16,7 @@
 
 LICENSE="GPL-2 FDL-1.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=dev-lang/perl-5.6"
diff --git a/dev-util/gtk-doc/gtk-doc-1.18.ebuild b/dev-util/gtk-doc/gtk-doc-1.18.ebuild
index 1c42f54..88f472b 100644
--- a/dev-util/gtk-doc/gtk-doc-1.18.ebuild
+++ b/dev-util/gtk-doc/gtk-doc-1.18.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="GPL-2 FDL-1.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="debug doc emacs highlight vim test"
 
 # dev-tex/tex4ht blocker needed due bug #315287
diff --git a/dev-util/lcov/lcov-1.10.ebuild b/dev-util/lcov/lcov-1.10.ebuild
index b4a0331..145064a 100644
--- a/dev-util/lcov/lcov-1.10.ebuild
+++ b/dev-util/lcov/lcov-1.10.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~x86 ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~arm ppc ~x86 ~x86-linux ~x64-macos"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-util/pkgconfig/pkgconfig-0.26.ebuild b/dev-util/pkgconfig/pkgconfig-0.26.ebuild
index a774ddf..e674ab1 100644
--- a/dev-util/pkgconfig/pkgconfig-0.26.ebuild
+++ b/dev-util/pkgconfig/pkgconfig-0.26.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="elibc_FreeBSD hardened"
 
 RDEPEND="dev-libs/glib:2
diff --git a/dev-util/scons/scons-2.0.1.ebuild b/dev-util/scons/scons-2.0.1.ebuild
index d110698..ab2b1dd 100644
--- a/dev-util/scons/scons-2.0.1.ebuild
+++ b/dev-util/scons/scons-2.0.1.ebuild
@@ -18,7 +18,7 @@
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="doc"
 
 DEPEND=""
diff --git a/dev-util/strace/strace-4.7.ebuild b/dev-util/strace/strace-4.7.ebuild
index 0f598fc..3ca3cd2 100644
--- a/dev-util/strace/strace-4.7.ebuild
+++ b/dev-util/strace/strace-4.7.ebuild
@@ -11,7 +11,7 @@
 	inherit git-2 autotools
 else
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux"
+	KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux"
 fi
 
 DESCRIPTION="A useful diagnostic, instructional, and debugging tool"
diff --git a/dev-util/valgrind/valgrind-3.8.1.ebuild b/dev-util/valgrind/valgrind-3.8.1.ebuild
index 579a043..eeded5a 100644
--- a/dev-util/valgrind/valgrind-3.8.1.ebuild
+++ b/dev-util/valgrind/valgrind-3.8.1.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* amd64 arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos ~x64-macos"
+KEYWORDS="-* amd64 arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos ~x64-macos"
 IUSE="mpi"
 
 DEPEND="mpi? ( virtual/mpi )"
diff --git a/dev-vcs/cvs/cvs-1.12.12-r6.ebuild b/dev-vcs/cvs/cvs-1.12.12-r6.ebuild
index a3b0e8f..5fc98c6 100644
--- a/dev-vcs/cvs/cvs-1.12.12-r6.ebuild
+++ b/dev-vcs/cvs/cvs-1.12.12-r6.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
 
 IUSE="crypt doc kerberos nls pam server"
 
diff --git a/dev-vcs/cvsps/cvsps-2.1.ebuild b/dev-vcs/cvsps/cvsps-2.1.ebuild
index d319260..4ee1096 100644
--- a/dev-vcs/cvsps/cvsps-2.1.ebuild
+++ b/dev-vcs/cvsps/cvsps-2.1.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE=""
 
 DEPEND="sys-libs/zlib"
diff --git a/dev-vcs/git/git-1.7.12.4.ebuild b/dev-vcs/git/git-1.7.12.4.ebuild
index 6b75a13..544afd8 100644
--- a/dev-vcs/git/git-1.7.12.4.ebuild
+++ b/dev-vcs/git/git-1.7.12.4.ebuild
@@ -32,7 +32,7 @@
 			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			)"
-	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-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 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 else
 	SRC_URI=""
 	KEYWORDS=""
diff --git a/dev-vcs/subversion/subversion-1.6.17-r7.ebuild b/dev-vcs/subversion/subversion-1.6.17-r7.ebuild
index 20af521..0f5701d 100644
--- a/dev-vcs/subversion/subversion-1.6.17-r7.ebuild
+++ b/dev-vcs/subversion/subversion-1.6.17-r7.ebuild
@@ -17,7 +17,7 @@
 
 LICENSE="Subversion"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="apache2 berkdb ctypes-python debug doc +dso emacs extras gnome-keyring java kde nls perl python ruby sasl vim-syntax +webdav-neon webdav-serf"
 
 CDEPEND=">=dev-db/sqlite-3.4
diff --git a/gnome-base/libglade/libglade-2.6.4.ebuild b/gnome-base/libglade/libglade-2.6.4.ebuild
index 19c87bf..2317ad6 100644
--- a/gnome-base/libglade/libglade-2.6.4.ebuild
+++ b/gnome-base/libglade/libglade-2.6.4.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="LGPL-2"
 SLOT="2.0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sh sparc x86 ~x86-fbsd"
 IUSE="doc"
 
 RDEPEND=">=dev-libs/glib-2.10
diff --git a/media-fonts/corefonts/corefonts-1-r4.ebuild b/media-fonts/corefonts/corefonts-1-r4.ebuild
index 2a38776..7ec5fe5 100644
--- a/media-fonts/corefonts/corefonts-1-r4.ebuild
+++ b/media-fonts/corefonts/corefonts-1-r4.ebuild
@@ -20,7 +20,7 @@
 
 LICENSE="MSttfEULA"
 SLOT="0"
-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 ~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="X"
 
 DEPEND="app-arch/cabextract"
diff --git a/media-fonts/dejavu/dejavu-2.33.ebuild b/media-fonts/dejavu/dejavu-2.33.ebuild
index 18ff705..0bf923e 100644
--- a/media-fonts/dejavu/dejavu-2.33.ebuild
+++ b/media-fonts/dejavu/dejavu-2.33.ebuild
@@ -30,7 +30,7 @@
 fi
 
 SLOT="0"
-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 ~m68k-mint ~sparc-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 ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris"
 
 IUSE="fontforge"
 DEPEND="fontforge? ( x11-apps/mkfontscale
diff --git a/media-fonts/encodings/encodings-1.0.3.ebuild b/media-fonts/encodings/encodings-1.0.3.ebuild
index 2c54c19..ff9c4b4 100644
--- a/media-fonts/encodings/encodings-1.0.3.ebuild
+++ b/media-fonts/encodings/encodings-1.0.3.ebuild
@@ -9,7 +9,7 @@
 
 DESCRIPTION="X.Org font encodings"
 
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND=""
diff --git a/media-fonts/font-util/font-util-1.2.0.ebuild b/media-fonts/font-util/font-util-1.2.0.ebuild
index 95475df..be1a9cf 100644
--- a/media-fonts/font-util/font-util-1.2.0.ebuild
+++ b/media-fonts/font-util/font-util-1.2.0.ebuild
@@ -8,7 +8,7 @@
 EGIT_REPO_URI="git://anongit.freedesktop.org/xorg/font/util"
 DESCRIPTION="X.Org font utilities"
 
-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 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/media-fonts/urw-fonts/urw-fonts-2.4.9.ebuild b/media-fonts/urw-fonts/urw-fonts-2.4.9.ebuild
index 3e58393..45e6cde 100644
--- a/media-fonts/urw-fonts/urw-fonts-2.4.9.ebuild
+++ b/media-fonts/urw-fonts/urw-fonts-2.4.9.ebuild
@@ -30,7 +30,7 @@
 HOMEPAGE="http://www.urwpp.de/"
 SRC_URI="mirror://gentoo/${PN}-${MY_PV}.fc13.src.rpm"
 
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/media-gfx/imagemagick/imagemagick-6.7.8.7.ebuild b/media-gfx/imagemagick/imagemagick-6.7.8.7.ebuild
index 7161b3c..82a00bd 100644
--- a/media-gfx/imagemagick/imagemagick-6.7.8.7.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.7.8.7.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="imagemagick"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~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 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="autotrace bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q64 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
 
 RESTRICT="perl? ( userpriv )"
diff --git a/media-gfx/sane-backends/sane-backends-1.0.23-r1.ebuild b/media-gfx/sane-backends/sane-backends-1.0.23-r1.ebuild
index a9a9eee..977f765 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.23-r1.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.23-r1.ebuild
@@ -152,7 +152,7 @@
 	https://alioth.debian.org/frs/download.php/3754/sane-backends-1.0.23.tar.gz.3"
 SLOT="0"
 LICENSE="GPL-2 public-domain"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 
 pkg_setup() {
 	enewgroup scanner
diff --git a/media-libs/alsa-lib/alsa-lib-1.0.25-r1.ebuild b/media-libs/alsa-lib/alsa-lib-1.0.25-r1.ebuild
index 668d90b..3e0862e 100644
--- a/media-libs/alsa-lib/alsa-lib-1.0.25-r1.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.0.25-r1.ebuild
@@ -17,7 +17,7 @@
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ~ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc debug alisp python"
 
 DEPEND=">=media-sound/alsa-headers-1.0.25
diff --git a/media-libs/audiofile/audiofile-0.3.4.ebuild b/media-libs/audiofile/audiofile-0.3.4.ebuild
index d315a43..0dbcde0 100644
--- a/media-libs/audiofile/audiofile-0.3.4.ebuild
+++ b/media-libs/audiofile/audiofile-0.3.4.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="static-libs"
 
 DOCS=( ACKNOWLEDGEMENTS AUTHORS ChangeLog NEWS NOTES README TODO )
diff --git a/media-libs/flac/flac-1.2.1-r3.ebuild b/media-libs/flac/flac-1.2.1-r3.ebuild
index db40900..315cc91 100644
--- a/media-libs/flac/flac-1.2.1-r3.ebuild
+++ b/media-libs/flac/flac-1.2.1-r3.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="BSD FDL-1.2 GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sh sparc x86 ~x86-fbsd"
 IUSE="3dnow altivec +cxx debug ogg sse static-libs"
 
 RDEPEND="ogg? ( >=media-libs/libogg-1.1.3 )"
diff --git a/media-libs/freeglut/freeglut-2.4.0-r2.ebuild b/media-libs/freeglut/freeglut-2.4.0-r2.ebuild
index 925d91e..f7d0a24 100644
--- a/media-libs/freeglut/freeglut-2.4.0-r2.ebuild
+++ b/media-libs/freeglut/freeglut-2.4.0-r2.ebuild
@@ -10,7 +10,7 @@
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="alpha ~amd64 ~arm hppa ia64 mips ppc ppc64 sh sparc ~x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND="virtual/opengl
diff --git a/media-libs/gd/gd-2.0.35-r3.ebuild b/media-libs/gd/gd-2.0.35-r3.ebuild
index 8ee203b..4a7b383 100644
--- a/media-libs/gd/gd-2.0.35-r3.ebuild
+++ b/media-libs/gd/gd-2.0.35-r3.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="|| ( as-is BSD )"
 SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="fontconfig jpeg png static-libs truetype xpm zlib"
 
 RDEPEND="fontconfig? ( media-libs/fontconfig )
diff --git a/media-libs/giflib/giflib-4.1.6-r1.ebuild b/media-libs/giflib/giflib-4.1.6-r1.ebuild
index 3ad982c..394f850 100644
--- a/media-libs/giflib/giflib-4.1.6-r1.ebuild
+++ b/media-libs/giflib/giflib-4.1.6-r1.ebuild
@@ -10,7 +10,7 @@
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE="rle X"
 
 DEPEND="!media-libs/libungif
diff --git a/media-libs/glew/glew-1.5.6.ebuild b/media-libs/glew/glew-1.5.6.ebuild
index a410f69..1ed9911 100644
--- a/media-libs/glew/glew-1.5.6.ebuild
+++ b/media-libs/glew/glew-1.5.6.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="BSD MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="x11-libs/libXmu
diff --git a/media-libs/jbig2dec/jbig2dec-0.11-r1.ebuild b/media-libs/jbig2dec/jbig2dec-0.11-r1.ebuild
index 19beb45..4a711aa 100644
--- a/media-libs/jbig2dec/jbig2dec-0.11-r1.ebuild
+++ b/media-libs/jbig2dec/jbig2dec-0.11-r1.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="png static-libs test"
 
 RDEPEND="png? ( >=media-libs/libpng-1.2:0 )"
diff --git a/media-libs/jpeg/jpeg-8b.ebuild b/media-libs/jpeg/jpeg-8b.ebuild
index 92923fc..9c7ed0d 100644
--- a/media-libs/jpeg/jpeg-8b.ebuild
+++ b/media-libs/jpeg/jpeg-8b.ebuild
@@ -17,7 +17,7 @@
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-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"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~sparc-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="static-libs"
 
 src_unpack() {
diff --git a/media-libs/lcms/lcms-2.3.ebuild b/media-libs/lcms/lcms-2.3.ebuild
index 9e3d7b6..06d91f4 100644
--- a/media-libs/lcms/lcms-2.3.ebuild
+++ b/media-libs/lcms/lcms-2.3.ebuild
@@ -10,7 +10,7 @@
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="doc jpeg static-libs test tiff zlib"
 
 RDEPEND="jpeg? ( virtual/jpeg )
diff --git a/media-libs/libao/libao-1.1.0-r1.ebuild b/media-libs/libao/libao-1.1.0-r1.ebuild
index cc8aaf3..6579629 100644
--- a/media-libs/libao/libao-1.1.0-r1.ebuild
+++ b/media-libs/libao/libao-1.1.0-r1.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="alsa nas mmap pulseaudio static-libs"
 
 RDEPEND="alsa? ( media-libs/alsa-lib )
diff --git a/media-libs/libart_lgpl/libart_lgpl-2.3.21-r1.ebuild b/media-libs/libart_lgpl/libart_lgpl-2.3.21-r1.ebuild
index 8eb2079..4294b42 100644
--- a/media-libs/libart_lgpl/libart_lgpl-2.3.21-r1.ebuild
+++ b/media-libs/libart_lgpl/libart_lgpl-2.3.21-r1.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND=""
diff --git a/media-libs/libdvdnav/libdvdnav-4.2.0.ebuild b/media-libs/libdvdnav/libdvdnav-4.2.0.ebuild
index 25f51c1..3010b77 100644
--- a/media-libs/libdvdnav/libdvdnav-4.2.0.ebuild
+++ b/media-libs/libdvdnav/libdvdnav-4.2.0.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=media-libs/libdvdread-${PV}"
diff --git a/media-libs/libdvdread/libdvdread-4.2.0.ebuild b/media-libs/libdvdread/libdvdread-4.2.0.ebuild
index 547152a..aeb78de 100644
--- a/media-libs/libdvdread/libdvdread-4.2.0.ebuild
+++ b/media-libs/libdvdread/libdvdread-4.2.0.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="+css"
 
 RDEPEND="!<media-libs/libdvdnav-${PV}
diff --git a/media-libs/libexif/libexif-0.6.21.ebuild b/media-libs/libexif/libexif-0.6.21.ebuild
index f5aefcd..ec4d7d2 100644
--- a/media-libs/libexif/libexif-0.6.21.ebuild
+++ b/media-libs/libexif/libexif-0.6.21.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-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 ~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 ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="doc nls static-libs"
 
 RDEPEND="nls? ( virtual/libintl )"
diff --git a/media-libs/libid3tag/libid3tag-0.15.1b-r2.ebuild b/media-libs/libid3tag/libid3tag-0.15.1b-r2.ebuild
index 20f7882..2f6a757 100644
--- a/media-libs/libid3tag/libid3tag-0.15.1b-r2.ebuild
+++ b/media-libs/libid3tag/libid3tag-0.15.1b-r2.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="debug static-libs"
 
 RDEPEND=">=sys-libs/zlib-1.1.3"
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-1.2.0-r1.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-1.2.0-r1.ebuild
index 22e2f17..57bda2f 100644
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-1.2.0-r1.ebuild
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-1.2.0-r1.ebuild
@@ -26,7 +26,7 @@
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm hppa ~mips ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm hppa mips ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="java static-libs"
 
 ASM_DEPEND="|| ( dev-lang/nasm dev-lang/yasm )"
diff --git a/media-libs/libogg/libogg-1.3.0.ebuild b/media-libs/libogg/libogg-1.3.0.ebuild
index 228e785..4df2145 100644
--- a/media-libs/libogg/libogg-1.3.0.ebuild
+++ b/media-libs/libogg/libogg-1.3.0.ebuild
@@ -10,7 +10,7 @@
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-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-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 DOCS=( AUTHORS CHANGES )
diff --git a/media-libs/libsamplerate/libsamplerate-0.1.7.ebuild b/media-libs/libsamplerate/libsamplerate-0.1.7.ebuild
index 30cf5d7..c6706eb 100644
--- a/media-libs/libsamplerate/libsamplerate-0.1.7.ebuild
+++ b/media-libs/libsamplerate/libsamplerate-0.1.7.ebuild
@@ -10,7 +10,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="sndfile"
 
 RDEPEND="sndfile? ( >=media-libs/libsndfile-1.0.2 )"
diff --git a/media-libs/libsdl/libsdl-1.2.15-r2.ebuild b/media-libs/libsdl/libsdl-1.2.15-r2.ebuild
index c62ebd7..0843bb7 100644
--- a/media-libs/libsdl/libsdl-1.2.15-r2.ebuild
+++ b/media-libs/libsdl/libsdl-1.2.15-r2.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 # WARNING:
 # If you turn on the custom-cflags use flag in USE and something breaks,
 # you pick up the pieces.  Be prepared for bug reports to be marked INVALID.
diff --git a/media-libs/libsndfile/libsndfile-1.0.25.ebuild b/media-libs/libsndfile/libsndfile-1.0.25.ebuild
index 88428ad..e0b1772 100644
--- a/media-libs/libsndfile/libsndfile-1.0.25.ebuild
+++ b/media-libs/libsndfile/libsndfile-1.0.25.ebuild
@@ -17,7 +17,7 @@
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sh sparc x86 ~x86-fbsd"
 IUSE="alsa minimal sqlite static-libs"
 
 RDEPEND="!minimal? ( >=media-libs/flac-1.2.1
diff --git a/media-libs/libv4l/libv4l-0.8.8.ebuild b/media-libs/libv4l/libv4l-0.8.8.ebuild
index 13f2c19..2f729c8 100644
--- a/media-libs/libv4l/libv4l-0.8.8.ebuild
+++ b/media-libs/libv4l/libv4l-0.8.8.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="virtual/jpeg"
diff --git a/media-libs/libvorbis/libvorbis-1.3.3.ebuild b/media-libs/libvorbis/libvorbis-1.3.3.ebuild
index 54998e7..e46da13 100644
--- a/media-libs/libvorbis/libvorbis-1.3.3.ebuild
+++ b/media-libs/libvorbis/libvorbis-1.3.3.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-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-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND="media-libs/libogg"
diff --git a/media-libs/libvpx/libvpx-1.1.0.ebuild b/media-libs/libvpx/libvpx-1.1.0.ebuild
index 1d80046..d1f39f1 100644
--- a/media-libs/libvpx/libvpx-1.1.0.ebuild
+++ b/media-libs/libvpx/libvpx-1.1.0.ebuild
@@ -11,10 +11,10 @@
 	KEYWORDS=""
 elif [[ ${PV} == *pre* ]]; then
 	SRC_URI="mirror://gentoo/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm ~ia64 ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="alpha amd64 arm ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 else
 	SRC_URI="http://webm.googlecode.com/files/${PN}-v${PV}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm ~ia64 ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="alpha amd64 arm ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 	S="${WORKDIR}/${PN}-v${PV}"
 fi
 
diff --git a/media-libs/speex/speex-1.2_rc1.ebuild b/media-libs/speex/speex-1.2_rc1.ebuild
index 237a297..3034755 100644
--- a/media-libs/speex/speex-1.2_rc1.ebuild
+++ b/media-libs/speex/speex-1.2_rc1.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sh sparc x86 ~x86-fbsd"
 IUSE="ogg sse"
 
 RDEPEND="ogg? ( media-libs/libogg )"
diff --git a/media-libs/tiff/tiff-4.0.0-r1.ebuild b/media-libs/tiff/tiff-4.0.0-r1.ebuild
index 0a26df5..0e66061 100644
--- a/media-libs/tiff/tiff-4.0.0-r1.ebuild
+++ b/media-libs/tiff/tiff-4.0.0-r1.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cxx jbig jpeg lzma static-libs zlib"
 
 RDEPEND="jpeg? ( virtual/jpeg )
diff --git a/media-plugins/alsa-plugins/alsa-plugins-1.0.25-r1.ebuild b/media-plugins/alsa-plugins/alsa-plugins-1.0.25-r1.ebuild
index 8b34cd0..d4b0cf7 100644
--- a/media-plugins/alsa-plugins/alsa-plugins-1.0.25-r1.ebuild
+++ b/media-plugins/alsa-plugins/alsa-plugins-1.0.25-r1.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~ppc ppc64 sh sparc x86 ~amd64-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~amd64-linux"
 IUSE="debug ffmpeg jack libsamplerate pulseaudio speex"
 
 RDEPEND=">=media-libs/alsa-lib-${PV}
diff --git a/media-sound/alsa-headers/alsa-headers-1.0.25.ebuild b/media-sound/alsa-headers/alsa-headers-1.0.25.ebuild
index 402aae0..e358f53 100644
--- a/media-sound/alsa-headers/alsa-headers-1.0.25.ebuild
+++ b/media-sound/alsa-headers/alsa-headers-1.0.25.ebuild
@@ -16,7 +16,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ~ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 DEPEND=""
diff --git a/media-sound/alsa-utils/alsa-utils-1.0.25-r1.ebuild b/media-sound/alsa-utils/alsa-utils-1.0.25-r1.ebuild
index 6626daa..add8f34 100644
--- a/media-sound/alsa-utils/alsa-utils-1.0.25-r1.ebuild
+++ b/media-sound/alsa-utils/alsa-utils-1.0.25-r1.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="GPL-2"
 SLOT="0.9"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ~ppc ppc64 sh sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sh sparc x86"
 IUSE="doc nls minimal"
 
 COMMON_DEPEND=">=sys-libs/ncurses-5.1
diff --git a/media-sound/gsm/gsm-1.0.13.ebuild b/media-sound/gsm/gsm-1.0.13.ebuild
index c2079dd..8ccc77a 100644
--- a/media-sound/gsm/gsm-1.0.13.ebuild
+++ b/media-sound/gsm/gsm-1.0.13.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="gsm"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 S=${WORKDIR}/${PN}-"$(replace_version_separator 2 '-pl' )"
diff --git a/media-sound/sox/sox-14.3.2-r1.ebuild b/media-sound/sox/sox-14.3.2-r1.ebuild
index c7c0d75..c5f189b 100644
--- a/media-sound/sox/sox-14.3.2-r1.ebuild
+++ b/media-sound/sox/sox-14.3.2-r1.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="alsa amr ao debug encode ffmpeg flac id3tag ladspa mad ogg openmp oss png pulseaudio sndfile static-libs wavpack"
 
 # libtool required for libltdl
diff --git a/media-video/mplayer/mplayer-1.0_rc4_p20120405.ebuild b/media-video/mplayer/mplayer-1.0_rc4_p20120405.ebuild
index 33b1658..73578b8 100644
--- a/media-video/mplayer/mplayer-1.0_rc4_p20120405.ebuild
+++ b/media-video/mplayer/mplayer-1.0_rc4_p20120405.ebuild
@@ -158,7 +158,7 @@
 SLOT="0"
 LICENSE="GPL-2"
 if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="amd64 ~hppa ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+	KEYWORDS="amd64 hppa ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 else
 	KEYWORDS=""
 fi
diff --git a/net-analyzer/tcpdump/tcpdump-4.3.0.ebuild b/net-analyzer/tcpdump/tcpdump-4.3.0.ebuild
index c4920be..1f9270d 100644
--- a/net-analyzer/tcpdump/tcpdump-4.3.0.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-4.3.0.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
 IUSE="+chroot smi ssl ipv6 -samba suid test"
 
 RDEPEND="
diff --git a/net-dialup/lrzsz/lrzsz-0.12.20-r2.ebuild b/net-dialup/lrzsz/lrzsz-0.12.20-r2.ebuild
index 641e014..48ce450 100644
--- a/net-dialup/lrzsz/lrzsz-0.12.20-r2.ebuild
+++ b/net-dialup/lrzsz/lrzsz-0.12.20-r2.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-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 ~x86-fbsd"
 IUSE="nls"
 
 DEPEND="nls? ( virtual/libintl )"
diff --git a/net-dialup/minicom/minicom-2.6.ebuild b/net-dialup/minicom/minicom-2.6.ebuild
index 7f1fcde..4cd0bf6 100644
--- a/net-dialup/minicom/minicom-2.6.ebuild
+++ b/net-dialup/minicom/minicom-2.6.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux"
 IUSE="nls"
 
 COMMON_DEPEND="sys-libs/ncurses"
diff --git a/net-dns/avahi/avahi-0.6.31-r1.ebuild b/net-dns/avahi/avahi-0.6.31-r1.ebuild
index abdac00..fe90b69 100644
--- a/net-dns/avahi/avahi-0.6.31-r1.ebuild
+++ b/net-dns/avahi/avahi-0.6.31-r1.ebuild
@@ -18,7 +18,7 @@
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
 IUSE="autoipd bookmarks dbus doc gdbm gtk gtk3 howl-compat +introspection ipv6
 kernel_linux mdnsresponder-compat mono python qt4 test utils"
 
diff --git a/net-dns/c-ares/c-ares-1.7.4.ebuild b/net-dns/c-ares/c-ares-1.7.4.ebuild
index a4aa7c3..4c03e32 100644
--- a/net-dns/c-ares/c-ares-1.7.4.ebuild
+++ b/net-dns/c-ares/c-ares-1.7.4.ebuild
@@ -10,7 +10,7 @@
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris"
+KEYWORDS="alpha ~amd64 ~arm hppa ia64 mips ppc ppc64 s390 sh sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris"
 IUSE=""
 
 DEPEND=""
diff --git a/net-dns/c-ares/c-ares-1.7.5.ebuild b/net-dns/c-ares/c-ares-1.7.5.ebuild
index 05fa256..939eed4 100644
--- a/net-dns/c-ares/c-ares-1.7.5.ebuild
+++ b/net-dns/c-ares/c-ares-1.7.5.ebuild
@@ -10,7 +10,7 @@
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris"
+KEYWORDS="alpha ~amd64 ~arm hppa ia64 mips ppc ppc64 s390 sh sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris"
 IUSE="static-libs"
 
 DOCS=( AUTHORS CHANGES README README.cares RELEASE-NOTES TODO )
diff --git a/net-dns/dnsmasq/dnsmasq-2.50.ebuild b/net-dns/dnsmasq/dnsmasq-2.50.ebuild
index 44d480c..52f7404 100644
--- a/net-dns/dnsmasq/dnsmasq-2.50.ebuild
+++ b/net-dns/dnsmasq/dnsmasq-2.50.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="dbus +dhcp ipv6 nls tftp"
 
 RDEPEND="dbus? ( sys-apps/dbus )
diff --git a/net-ftp/tftp-hpa/tftp-hpa-5.2.ebuild b/net-ftp/tftp-hpa/tftp-hpa-5.2.ebuild
index 7b1f61c..78bf4ea 100644
--- a/net-ftp/tftp-hpa/tftp-hpa-5.2.ebuild
+++ b/net-ftp/tftp-hpa/tftp-hpa-5.2.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~ppc-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~ppc-macos"
 IUSE="ipv6 readline selinux tcpd"
 
 RDEPEND="selinux? ( sec-policy/selinux-tftp )
diff --git a/net-libs/gnutls/gnutls-2.10.5.ebuild b/net-libs/gnutls/gnutls-2.10.5.ebuild
index 3623a95..f911b6f 100644
--- a/net-libs/gnutls/gnutls-2.10.5.ebuild
+++ b/net-libs/gnutls/gnutls-2.10.5.ebuild
@@ -26,7 +26,7 @@
 # GPL-3 for the gnutls-extras library and LGPL for the gnutls library.
 LICENSE="LGPL-2.1 GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="bindist +cxx doc examples guile lzo nls test zlib"
 
 RDEPEND=">=dev-libs/libgcrypt-1.4.0
diff --git a/net-libs/liblockfile/liblockfile-1.08.ebuild b/net-libs/liblockfile/liblockfile-1.08.ebuild
index 65d75f1..c6c3534 100644
--- a/net-libs/liblockfile/liblockfile-1.08.ebuild
+++ b/net-libs/liblockfile/liblockfile-1.08.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE=""
 
 pkg_setup() {
diff --git a/net-libs/libnetfilter_queue/libnetfilter_queue-1.0.1.ebuild b/net-libs/libnetfilter_queue/libnetfilter_queue-1.0.1.ebuild
index ab1e716..d4e37ea 100644
--- a/net-libs/libnetfilter_queue/libnetfilter_queue-1.0.1.ebuild
+++ b/net-libs/libnetfilter_queue/libnetfilter_queue-1.0.1.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~ppc ~sparc x86"
+KEYWORDS="amd64 arm ppc sparc x86"
 IUSE="static-libs"
 
 RDEPEND=">=net-libs/libnfnetlink-0.0.41"
diff --git a/net-libs/libnfnetlink/libnfnetlink-1.0.1.ebuild b/net-libs/libnfnetlink/libnfnetlink-1.0.1.ebuild
index af7d7eb..94323ff 100644
--- a/net-libs/libnfnetlink/libnfnetlink-1.0.1.ebuild
+++ b/net-libs/libnfnetlink/libnfnetlink-1.0.1.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
 IUSE="static-libs"
 
 DOCS=( README )
diff --git a/net-libs/libnfsidmap/libnfsidmap-0.24.ebuild b/net-libs/libnfsidmap/libnfsidmap-0.24.ebuild
index 2956b1a..ec50754 100644
--- a/net-libs/libnfsidmap/libnfsidmap-0.24.ebuild
+++ b/net-libs/libnfsidmap/libnfsidmap-0.24.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
 IUSE="ldap static-libs"
 
 DEPEND="ldap? ( net-nds/openldap )"
diff --git a/net-libs/libpcap/libpcap-1.1.1-r1.ebuild b/net-libs/libpcap/libpcap-1.1.1-r1.ebuild
index 0493f6c..bb60491 100644
--- a/net-libs/libpcap/libpcap-1.1.1-r1.ebuild
+++ b/net-libs/libpcap/libpcap-1.1.1-r1.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha ~amd64 ~arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="bluetooth ipv6 libnl"
 
 RDEPEND="bluetooth? ( net-wireless/bluez )
diff --git a/net-libs/libsoup/libsoup-2.32.2.ebuild b/net-libs/libsoup/libsoup-2.32.2.ebuild
index 903cbb5..316066b 100644
--- a/net-libs/libsoup/libsoup-2.32.2.ebuild
+++ b/net-libs/libsoup/libsoup-2.32.2.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="LGPL-2"
 SLOT="2.4"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="debug doc +introspection ssl test"
 
 RDEPEND=">=dev-libs/glib-2.21.3
diff --git a/net-libs/libtirpc/libtirpc-0.2.0.ebuild b/net-libs/libtirpc/libtirpc-0.2.0.ebuild
index ef2d019..ba25619 100644
--- a/net-libs/libtirpc/libtirpc-0.2.0.ebuild
+++ b/net-libs/libtirpc/libtirpc-0.2.0.ebuild
@@ -10,7 +10,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="alpha ~amd64 ~arm hppa ia64 mips ppc ppc64 s390 sh sparc ~x86"
 IUSE="kerberos"
 
 DEPEND="kerberos? ( net-libs/libgssglue )"
diff --git a/net-libs/neon/neon-0.29.6.ebuild b/net-libs/neon/neon-0.29.6.ebuild
index 34b7b43..fdbd257 100644
--- a/net-libs/neon/neon-0.29.6.ebuild
+++ b/net-libs/neon/neon-0.29.6.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc expat gnutls kerberos libproxy nls pkcs11 ssl static-libs zlib"
 IUSE_LINGUAS="cs de fr ja nn pl ru tr zh_CN"
 for lingua in ${IUSE_LINGUAS}; do
diff --git a/net-libs/serf/serf-0.3.0.ebuild b/net-libs/serf/serf-0.3.0.ebuild
index b3d9393..aa8b839 100644
--- a/net-libs/serf/serf-0.3.0.ebuild
+++ b/net-libs/serf/serf-0.3.0.ebuild
@@ -10,7 +10,7 @@
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND="dev-libs/apr
diff --git a/net-misc/corkscrew/corkscrew-2.0.ebuild b/net-misc/corkscrew/corkscrew-2.0.ebuild
index a3f9919..9c824b2 100644
--- a/net-misc/corkscrew/corkscrew-2.0.ebuild
+++ b/net-misc/corkscrew/corkscrew-2.0.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~sparc x86"
+KEYWORDS="amd64 ~arm ppc sparc x86"
 IUSE=""
 
 src_prepare() {
diff --git a/net-misc/dhcp/dhcp-4.2.2-r1.ebuild b/net-misc/dhcp/dhcp-4.2.2-r1.ebuild
index 218f1d3..57c1c37 100644
--- a/net-misc/dhcp/dhcp-4.2.2-r1.ebuild
+++ b/net-misc/dhcp/dhcp-4.2.2-r1.ebuild
@@ -17,7 +17,7 @@
 
 LICENSE="as-is BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha ~amd64 ~arm hppa mips ppc ppc64 s390 sh sparc ~x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="+client ipv6 kernel_linux ldap selinux +server ssl vim-syntax"
 
 DEPEND="selinux? ( sec-policy/selinux-dhcp )
diff --git a/net-misc/dropbear/dropbear-2012.55.ebuild b/net-misc/dropbear/dropbear-2012.55.ebuild
index 73d18ca..19270bf 100644
--- a/net-misc/dropbear/dropbear-2012.55.ebuild
+++ b/net-misc/dropbear/dropbear-2012.55.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="bsdpty minimal multicall pam static syslog zlib"
 
 LIB_DEPEND="zlib? ( sys-libs/zlib[static-libs(+)] )
diff --git a/net-misc/rsync/rsync-3.0.8.ebuild b/net-misc/rsync/rsync-3.0.8.ebuild
index f9725b7..3ddb298 100644
--- a/net-misc/rsync/rsync-3.0.8.ebuild
+++ b/net-misc/rsync/rsync-3.0.8.ebuild
@@ -10,7 +10,7 @@
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="acl iconv ipv6 static xattr"
 
 DEPEND=">=dev-libs/popt-1.5
diff --git a/net-misc/socat/socat-1.7.2.1.ebuild b/net-misc/socat/socat-1.7.2.1.ebuild
index 30d6080..83cc561 100644
--- a/net-misc/socat/socat-1.7.2.1.ebuild
+++ b/net-misc/socat/socat-1.7.2.1.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc sparc x86 ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc sparc x86 ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="ssl readline ipv6 tcpd"
 
 DEPEND="
diff --git a/net-misc/wget/wget-1.12-r2.ebuild b/net-misc/wget/wget-1.12-r2.ebuild
index 000c3c6..7f9040f 100644
--- a/net-misc/wget/wget-1.12-r2.ebuild
+++ b/net-misc/wget/wget-1.12-r2.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="debug idn ipv6 nls ntlm +ssl static"
 
 RDEPEND="idn? ( net-dns/libidn )
diff --git a/net-nds/rpcbind/rpcbind-0.2.0.ebuild b/net-nds/rpcbind/rpcbind-0.2.0.ebuild
index 46190e1..94336d8 100644
--- a/net-nds/rpcbind/rpcbind-0.2.0.ebuild
+++ b/net-nds/rpcbind/rpcbind-0.2.0.ebuild
@@ -12,7 +12,7 @@
 	#KEYWORDS=""
 else
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+	KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86"
 fi
 
 DESCRIPTION="portmap replacement which supports RPC over various protocols"
diff --git a/net-proxy/tsocks/tsocks-1.8_beta5-r4.ebuild b/net-proxy/tsocks/tsocks-1.8_beta5-r4.ebuild
index df9c2c4..7a0e107 100644
--- a/net-proxy/tsocks/tsocks-1.8_beta5-r4.ebuild
+++ b/net-proxy/tsocks/tsocks-1.8_beta5-r4.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="alpha ~amd64 ppc ppc64 sparc ~x86 ~x86-fbsd"
 IUSE="tordns"
 
 S="${WORKDIR}/${P%%_*}"
diff --git a/net-wireless/wireless-tools/wireless-tools-29.ebuild b/net-wireless/wireless-tools/wireless-tools-29.ebuild
index d8da7ed..f63eac7 100644
--- a/net-wireless/wireless-tools/wireless-tools-29.ebuild
+++ b/net-wireless/wireless-tools/wireless-tools-29.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sh ~sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sh sparc x86"
 IUSE="multicall nls"
 
 DEPEND="sys-apps/sed"
diff --git a/net-zope/zope-fixers/zope-fixers-1.0.ebuild b/net-zope/zope-fixers/zope-fixers-1.0.ebuild
index 065d69c..ec86309 100644
--- a/net-zope/zope-fixers/zope-fixers-1.0.ebuild
+++ b/net-zope/zope-fixers/zope-fixers-1.0.ebuild
@@ -22,7 +22,7 @@
 
 LICENSE="ZPL"
 SLOT="0"
-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"
+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"
 IUSE=""
 
 DEPEND="dev-python/setuptools"
diff --git a/net-zope/zope-interface/zope-interface-3.8.0.ebuild b/net-zope/zope-interface/zope-interface-3.8.0.ebuild
index 33ac804..363c3e5 100644
--- a/net-zope/zope-interface/zope-interface-3.8.0.ebuild
+++ b/net-zope/zope-interface/zope-interface-3.8.0.ebuild
@@ -19,7 +19,7 @@
 
 LICENSE="ZPL"
 SLOT="0"
-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"
+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"
 IUSE=""
 
 # net-zope/zope-fixers is required for building with Python 3.
diff --git a/perl-core/Compress-Raw-Bzip2/Compress-Raw-Bzip2-2.024.ebuild b/perl-core/Compress-Raw-Bzip2/Compress-Raw-Bzip2-2.024.ebuild
index 63a7e78..45cc08a 100644
--- a/perl-core/Compress-Raw-Bzip2/Compress-Raw-Bzip2-2.024.ebuild
+++ b/perl-core/Compress-Raw-Bzip2/Compress-Raw-Bzip2-2.024.ebuild
@@ -10,7 +10,7 @@
 DESCRIPTION="Low-Level Interface to bzip2 compression library"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="app-arch/bzip2"
diff --git a/perl-core/Compress-Raw-Zlib/Compress-Raw-Zlib-2.024.ebuild b/perl-core/Compress-Raw-Zlib/Compress-Raw-Zlib-2.024.ebuild
index 30b9c48..3d3323b 100644
--- a/perl-core/Compress-Raw-Zlib/Compress-Raw-Zlib-2.024.ebuild
+++ b/perl-core/Compress-Raw-Zlib/Compress-Raw-Zlib-2.024.ebuild
@@ -10,7 +10,7 @@
 DESCRIPTION="Low-Level Interface to zlib compression library"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=sys-libs/zlib-1.2.2.1"
diff --git a/perl-core/ExtUtils-CBuilder/ExtUtils-CBuilder-0.27.03.ebuild b/perl-core/ExtUtils-CBuilder/ExtUtils-CBuilder-0.27.03.ebuild
index 530ca62..27d47b4 100644
--- a/perl-core/ExtUtils-CBuilder/ExtUtils-CBuilder-0.27.03.ebuild
+++ b/perl-core/ExtUtils-CBuilder/ExtUtils-CBuilder-0.27.03.ebuild
@@ -13,7 +13,7 @@
 DESCRIPTION="Compile and link C code for Perl modules"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 SRC_TEST="do"
diff --git a/perl-core/ExtUtils-ParseXS/ExtUtils-ParseXS-2.22.05.ebuild b/perl-core/ExtUtils-ParseXS/ExtUtils-ParseXS-2.22.05.ebuild
index 009faf6..8582312 100644
--- a/perl-core/ExtUtils-ParseXS/ExtUtils-ParseXS-2.22.05.ebuild
+++ b/perl-core/ExtUtils-ParseXS/ExtUtils-ParseXS-2.22.05.ebuild
@@ -13,7 +13,7 @@
 DESCRIPTION="Converts Perl XS code into C code"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/perl-core/File-Spec/File-Spec-3.31.ebuild b/perl-core/File-Spec/File-Spec-3.31.ebuild
index 63f3a2f..a32d96d 100644
--- a/perl-core/File-Spec/File-Spec-3.31.ebuild
+++ b/perl-core/File-Spec/File-Spec-3.31.ebuild
@@ -13,7 +13,7 @@
 DESCRIPTION="Handling files and directories portably"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~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"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k 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"
 IUSE=""
 
 SRC_TEST="do"
diff --git a/perl-core/IO-Compress/IO-Compress-2.024.ebuild b/perl-core/IO-Compress/IO-Compress-2.024.ebuild
index 1d32cda..46d38da 100644
--- a/perl-core/IO-Compress/IO-Compress-2.024.ebuild
+++ b/perl-core/IO-Compress/IO-Compress-2.024.ebuild
@@ -10,7 +10,7 @@
 DESCRIPTION="allow reading and writing of compressed data"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="virtual/perl-Scalar-List-Utils
diff --git a/perl-core/IO-Zlib/IO-Zlib-1.100.0.ebuild b/perl-core/IO-Zlib/IO-Zlib-1.100.0.ebuild
index 89c6f7d..a3f1ffd 100644
--- a/perl-core/IO-Zlib/IO-Zlib-1.100.0.ebuild
+++ b/perl-core/IO-Zlib/IO-Zlib-1.100.0.ebuild
@@ -11,7 +11,7 @@
 DESCRIPTION="IO:: style interface to Compress::Zlib"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="virtual/perl-IO-Compress"
diff --git a/perl-core/Module-Build/Module-Build-0.36.07.ebuild b/perl-core/Module-Build/Module-Build-0.36.07.ebuild
index f624376..306b167 100644
--- a/perl-core/Module-Build/Module-Build-0.36.07.ebuild
+++ b/perl-core/Module-Build/Module-Build-0.36.07.ebuild
@@ -13,7 +13,7 @@
 DESCRIPTION="Build and install Perl modules"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="dev-perl/YAML-Tiny
diff --git a/perl-core/Scalar-List-Utils/Scalar-List-Utils-1.230.0.ebuild b/perl-core/Scalar-List-Utils/Scalar-List-Utils-1.230.0.ebuild
index fb9194d..78e73a9 100644
--- a/perl-core/Scalar-List-Utils/Scalar-List-Utils-1.230.0.ebuild
+++ b/perl-core/Scalar-List-Utils/Scalar-List-Utils-1.230.0.ebuild
@@ -11,7 +11,7 @@
 DESCRIPTION="Scalar-List-Utils module for perl"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 SRC_TEST=do
diff --git a/perl-core/Test-Harness/Test-Harness-3.17.ebuild b/perl-core/Test-Harness/Test-Harness-3.17.ebuild
index 40e7dbc..04e2e9d 100644
--- a/perl-core/Test-Harness/Test-Harness-3.17.ebuild
+++ b/perl-core/Test-Harness/Test-Harness-3.17.ebuild
@@ -8,7 +8,7 @@
 DESCRIPTION="Runs perl standard test scripts with statistics"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="dev-lang/perl"
diff --git a/perl-core/Test-Simple/Test-Simple-0.980.0.ebuild b/perl-core/Test-Simple/Test-Simple-0.980.0.ebuild
index f93dbb6..653c1ef 100644
--- a/perl-core/Test-Simple/Test-Simple-0.980.0.ebuild
+++ b/perl-core/Test-Simple/Test-Simple-0.980.0.ebuild
@@ -11,7 +11,7 @@
 DESCRIPTION="Basic utilities for writing tests"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 SRC_TEST="do"
diff --git a/perl-core/digest-base/digest-base-1.160.0.ebuild b/perl-core/digest-base/digest-base-1.160.0.ebuild
index cbfca15..0672183 100644
--- a/perl-core/digest-base/digest-base-1.160.0.ebuild
+++ b/perl-core/digest-base/digest-base-1.160.0.ebuild
@@ -12,7 +12,7 @@
 DESCRIPTION="Modules that calculate message digests"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="virtual/perl-MIME-Base64"
diff --git a/sci-libs/fftw/fftw-3.2.2.ebuild b/sci-libs/fftw/fftw-3.2.2.ebuild
index fd45cc4..dd42b66 100644
--- a/sci-libs/fftw/fftw-3.2.2.ebuild
+++ b/sci-libs/fftw/fftw-3.2.2.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="GPL-2"
 SLOT="3.0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="altivec doc fortran openmp sse sse2 threads"
 
 pkg_setup() {
diff --git a/sys-apps/acl/acl-2.2.51.ebuild b/sys-apps/acl/acl-2.2.51.ebuild
index 1e79ed4..14be91b 100644
--- a/sys-apps/acl/acl-2.2.51.ebuild
+++ b/sys-apps/acl/acl-2.2.51.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ~ppc64 s390 sh sparc x86 ~amd64-linux ~ia64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~ia64-linux ~x86-linux"
 IUSE="nfs nls static-libs"
 
 RDEPEND=">=sys-apps/attr-2.4
diff --git a/sys-apps/attr/attr-2.4.46.ebuild b/sys-apps/attr/attr-2.4.46.ebuild
index 4f28437..19c0908 100644
--- a/sys-apps/attr/attr-2.4.46.ebuild
+++ b/sys-apps/attr/attr-2.4.46.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ~ppc64 s390 sh sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
 IUSE="nls static-libs"
 
 DEPEND="nls? ( sys-devel/gettext )
diff --git a/sys-apps/busybox/busybox-1.20.1.ebuild b/sys-apps/busybox/busybox-1.20.1.ebuild
index c7c94d4..9b8c8df 100644
--- a/sys-apps/busybox/busybox-1.20.1.ebuild
+++ b/sys-apps/busybox/busybox-1.20.1.ebuild
@@ -52,7 +52,7 @@
 else
 	MY_P=${PN}-${PV/_/-}
 	SRC_URI="http://www.busybox.net/downloads/${MY_P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="GPL-2"
diff --git a/sys-apps/coreutils/coreutils-8.20-r1.ebuild b/sys-apps/coreutils/coreutils-8.20-r1.ebuild
index 080cfb1..9e813d9 100644
--- a/sys-apps/coreutils/coreutils-8.20-r1.ebuild
+++ b/sys-apps/coreutils/coreutils-8.20-r1.ebuild
@@ -17,7 +17,7 @@
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd"
 IUSE="acl caps gmp nls selinux static userland_BSD vanilla xattr"
 
 LIB_DEPEND="acl? ( sys-apps/acl[static-libs] )
diff --git a/sys-apps/debianutils/debianutils-3.4.4.ebuild b/sys-apps/debianutils/debianutils-3.4.4.ebuild
index 43702bb..62955cc 100644
--- a/sys-apps/debianutils/debianutils-3.4.4.ebuild
+++ b/sys-apps/debianutils/debianutils-3.4.4.ebuild
@@ -10,7 +10,7 @@
 
 LICENSE="BSD GPL-2 SMAIL"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="kernel_linux static"
 
 PDEPEND="|| ( >=sys-apps/coreutils-6.10-r1 sys-apps/mktemp sys-freebsd/freebsd-ubin )"
diff --git a/sys-apps/diffutils/diffutils-3.2.ebuild b/sys-apps/diffutils/diffutils-3.2.ebuild
index 0570bf9..d929ee2 100644
--- a/sys-apps/diffutils/diffutils-3.2.ebuild
+++ b/sys-apps/diffutils/diffutils-3.2.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static"
 
 RDEPEND=""
diff --git a/sys-apps/eject/eject-2.1.5-r2.ebuild b/sys-apps/eject/eject-2.1.5-r2.ebuild
index 106a0f3..7e40c4e 100644
--- a/sys-apps/eject/eject-2.1.5-r2.ebuild
+++ b/sys-apps/eject/eject-2.1.5-r2.ebuild
@@ -10,7 +10,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
 IUSE="nls"
 
 S=${WORKDIR}/${PN}
diff --git a/sys-apps/file/file-5.09.ebuild b/sys-apps/file/file-5.09.ebuild
index 46da2da..30b02ee 100644
--- a/sys-apps/file/file-5.09.ebuild
+++ b/sys-apps/file/file-5.09.ebuild
@@ -16,7 +16,7 @@
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="python static-libs zlib"
 
 RDEPEND="zlib? ( sys-libs/zlib )"
diff --git a/sys-apps/findutils/findutils-4.4.2-r1.ebuild b/sys-apps/findutils/findutils-4.4.2-r1.ebuild
index 1a4d95e..9419f06 100644
--- a/sys-apps/findutils/findutils-4.4.2-r1.ebuild
+++ b/sys-apps/findutils/findutils-4.4.2-r1.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
 IUSE="nls selinux static"
 
 RDEPEND="selinux? ( sys-libs/libselinux )
diff --git a/sys-apps/gawk/gawk-3.1.8.ebuild b/sys-apps/gawk/gawk-3.1.8.ebuild
index 69a2c0d..2433018 100644
--- a/sys-apps/gawk/gawk-3.1.8.ebuild
+++ b/sys-apps/gawk/gawk-3.1.8.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="nls"
 
 RDEPEND=""
diff --git a/sys-apps/grep/grep-2.14.ebuild b/sys-apps/grep/grep-2.14.ebuild
index 0acc445..35a21e8 100644
--- a/sys-apps/grep/grep-2.14.ebuild
+++ b/sys-apps/grep/grep-2.14.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls pcre"
 
 RDEPEND="nls? ( virtual/libintl )
diff --git a/sys-apps/groff/groff-1.20.1-r3.ebuild b/sys-apps/groff/groff-1.20.1-r3.ebuild
index 3b4226c..f286222 100644
--- a/sys-apps/groff/groff-1.20.1-r3.ebuild
+++ b/sys-apps/groff/groff-1.20.1-r3.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="examples X linguas_ja"
 
 DEPEND=">=sys-apps/texinfo-4.7-r1
diff --git a/sys-apps/hdparm/hdparm-9.39.ebuild b/sys-apps/hdparm/hdparm-9.39.ebuild
index 1c8afe0..c402d82 100644
--- a/sys-apps/hdparm/hdparm-9.39.ebuild
+++ b/sys-apps/hdparm/hdparm-9.39.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="BSD GPL-2" # GPL-2 only
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 src_prepare() {
diff --git a/sys-apps/help2man/help2man-1.36.4-r1.ebuild b/sys-apps/help2man/help2man-1.36.4-r1.ebuild
index 5785dcb..6ab1e56 100644
--- a/sys-apps/help2man/help2man-1.36.4-r1.ebuild
+++ b/sys-apps/help2man/help2man-1.36.4-r1.ebuild
@@ -10,7 +10,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="nls elibc_glibc"
 
 RDEPEND="dev-lang/perl"
diff --git a/sys-apps/hwids/hwids-20120922.ebuild b/sys-apps/hwids/hwids-20120922.ebuild
index 0741c46..05cf6f6 100644
--- a/sys-apps/hwids/hwids-20120922.ebuild
+++ b/sys-apps/hwids/hwids-20120922.ebuild
@@ -10,7 +10,7 @@
 
 LICENSE="|| ( GPL-2 BSD )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND=""
diff --git a/sys-apps/i2c-tools/i2c-tools-3.0.2.ebuild b/sys-apps/i2c-tools/i2c-tools-3.0.2.ebuild
index 405951c..1b5ee6c 100644
--- a/sys-apps/i2c-tools/i2c-tools-3.0.2.ebuild
+++ b/sys-apps/i2c-tools/i2c-tools-3.0.2.ebuild
@@ -15,7 +15,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~sparc x86"
+KEYWORDS="amd64 ~arm sparc x86"
 IUSE="python"
 
 DEPEND="!<sys-apps/lm_sensors-3"
diff --git a/sys-apps/iproute2/iproute2-2.6.38.ebuild b/sys-apps/iproute2/iproute2-2.6.38.ebuild
index 3492a55..62b5284 100644
--- a/sys-apps/iproute2/iproute2-2.6.38.ebuild
+++ b/sys-apps/iproute2/iproute2-2.6.38.ebuild
@@ -13,7 +13,7 @@
 	#KEYWORDS=""
 else
 	SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+	KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
 fi
 
 DESCRIPTION="kernel routing and traffic control utilities"
diff --git a/sys-apps/kbd/kbd-1.15.3.ebuild b/sys-apps/kbd/kbd-1.15.3.ebuild
index fe0a1d9..9377d2d 100644
--- a/sys-apps/kbd/kbd-1.15.3.ebuild
+++ b/sys-apps/kbd/kbd-1.15.3.ebuild
@@ -8,7 +8,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
 IUSE="nls"
 
 RDEPEND=""
diff --git a/sys-apps/less/less-441.ebuild b/sys-apps/less/less-441.ebuild
index 4b63730..c5caeb4 100644
--- a/sys-apps/less/less-441.ebuild
+++ b/sys-apps/less/less-441.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="|| ( GPL-3 BSD-2 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="unicode"
 
 DEPEND=">=sys-libs/ncurses-5.2"
diff --git a/sys-apps/man-pages-posix/man-pages-posix-2003a.ebuild b/sys-apps/man-pages-posix/man-pages-posix-2003a.ebuild
index 1a23af5..bdc8ca4 100644
--- a/sys-apps/man-pages-posix/man-pages-posix-2003a.ebuild
+++ b/sys-apps/man-pages-posix/man-pages-posix-2003a.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="man-pages-posix"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE=""
 RESTRICT="binchecks"
 
diff --git a/sys-apps/man-pages/man-pages-3.32.ebuild b/sys-apps/man-pages/man-pages-3.32.ebuild
index 76370ce..7e4047b 100644
--- a/sys-apps/man-pages/man-pages-3.32.ebuild
+++ b/sys-apps/man-pages/man-pages-3.32.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="as-is GPL-2 BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ~ppc64 s390 sh sparc x86 ~amd64-linux ~ia64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~ia64-linux ~x86-linux"
 IUSE_LINGUAS=" cs da de fr it ja nl pl ro ru zh_CN"
 IUSE="nls ${IUSE_LINGUAS// / linguas_}"
 RESTRICT="binchecks"
diff --git a/sys-apps/man/man-1.6f-r4.ebuild b/sys-apps/man/man-1.6f-r4.ebuild
index a563849..9b996e1 100644
--- a/sys-apps/man/man-1.6f-r4.ebuild
+++ b/sys-apps/man/man-1.6f-r4.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="lzma nls"
 
 DEPEND="nls? ( sys-devel/gettext )"
diff --git a/sys-apps/mawk/mawk-1.3.4_p20100625.ebuild b/sys-apps/mawk/mawk-1.3.4_p20100625.ebuild
index 36ced36..a1f90ea 100644
--- a/sys-apps/mawk/mawk-1.3.4_p20100625.ebuild
+++ b/sys-apps/mawk/mawk-1.3.4_p20100625.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE=""
 
 S=${WORKDIR}/${MY_P}
diff --git a/sys-apps/memtester/memtester-4.2.2.ebuild b/sys-apps/memtester/memtester-4.2.2.ebuild
index b5eaa5e..857e3a3 100644
--- a/sys-apps/memtester/memtester-4.2.2.ebuild
+++ b/sys-apps/memtester/memtester-4.2.2.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="amd64 arm ia64 mips ppc ppc64 sparc x86"
 IUSE=""
 
 src_prepare() {
diff --git a/sys-apps/miscfiles/miscfiles-1.4.2-r1.ebuild b/sys-apps/miscfiles/miscfiles-1.4.2-r1.ebuild
index e24355d..83fa645 100644
--- a/sys-apps/miscfiles/miscfiles-1.4.2-r1.ebuild
+++ b/sys-apps/miscfiles/miscfiles-1.4.2-r1.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="GPL-2 unicode"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="minimal"
 # Collides with older versions/revisions
 RDEPEND="!<sys-freebsd/freebsd-share-7.2-r1"
diff --git a/sys-apps/module-init-tools/module-init-tools-3.16-r1.ebuild b/sys-apps/module-init-tools/module-init-tools-3.16-r1.ebuild
index 48166e3..3175dad 100644
--- a/sys-apps/module-init-tools/module-init-tools-3.16-r1.ebuild
+++ b/sys-apps/module-init-tools/module-init-tools-3.16-r1.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
 IUSE="static"
 RESTRICT="test"
 
diff --git a/sys-apps/net-tools/net-tools-1.60_p20110409135728.ebuild b/sys-apps/net-tools/net-tools-1.60_p20110409135728.ebuild
index e7e7db8..4b409f8 100644
--- a/sys-apps/net-tools/net-tools-1.60_p20110409135728.ebuild
+++ b/sys-apps/net-tools/net-tools-1.60_p20110409135728.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~x86-linux"
 IUSE="nls static"
 
 RDEPEND=""
diff --git a/sys-apps/pciutils/pciutils-3.1.10.ebuild b/sys-apps/pciutils/pciutils-3.1.10.ebuild
index a2ce476..014189f 100644
--- a/sys-apps/pciutils/pciutils-3.1.10.ebuild
+++ b/sys-apps/pciutils/pciutils-3.1.10.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="static-libs zlib"
 
 # Have the sub-libs in RDEPEND with [static-libs] since, logically,
diff --git a/sys-apps/pv/pv-1.3.4.ebuild b/sys-apps/pv/pv-1.3.4.ebuild
index 035db2d..16ffbb6 100644
--- a/sys-apps/pv/pv-1.3.4.ebuild
+++ b/sys-apps/pv/pv-1.3.4.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris ~x86-solaris"
 
 IUSE="nls"
 PV_LINGUAS="de fr pl pt"
diff --git a/sys-apps/sed/sed-4.2.1-r1.ebuild b/sys-apps/sed/sed-4.2.1-r1.ebuild
index cffb0a8..9c3a625 100644
--- a/sys-apps/sed/sed-4.2.1-r1.ebuild
+++ b/sys-apps/sed/sed-4.2.1-r1.ebuild
@@ -10,7 +10,7 @@
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="acl nls selinux static"
 
 RDEPEND="acl? ( virtual/acl )
diff --git a/sys-apps/smartmontools/smartmontools-5.42.ebuild b/sys-apps/smartmontools/smartmontools-5.42.ebuild
index 55e6cfb..454d012 100644
--- a/sys-apps/smartmontools/smartmontools-5.42.ebuild
+++ b/sys-apps/smartmontools/smartmontools-5.42.ebuild
@@ -12,7 +12,7 @@
 	SRC_URI=""
 else
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm hppa ia64 ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
 fi
 
 DESCRIPTION="Self-Monitoring, Analysis and Reporting Technology System (S.M.A.R.T.) monitoring tools"
diff --git a/sys-apps/texinfo/texinfo-4.13.ebuild b/sys-apps/texinfo/texinfo-4.13.ebuild
index 90c4ef6..ea48826 100644
--- a/sys-apps/texinfo/texinfo-4.13.ebuild
+++ b/sys-apps/texinfo/texinfo-4.13.ebuild
@@ -10,7 +10,7 @@
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
 IUSE="nls static"
 
 RDEPEND="!=app-text/tetex-2*
diff --git a/sys-apps/usbutils/usbutils-006.ebuild b/sys-apps/usbutils/usbutils-006.ebuild
index b34cdb2..9072c48 100644
--- a/sys-apps/usbutils/usbutils-006.ebuild
+++ b/sys-apps/usbutils/usbutils-006.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="python zlib"
 
 RDEPEND="virtual/libusb:1
diff --git a/sys-apps/util-linux/util-linux-2.21.2.ebuild b/sys-apps/util-linux/util-linux-2.21.2.ebuild
index a4a5794..9b39547 100644
--- a/sys-apps/util-linux/util-linux-2.21.2.ebuild
+++ b/sys-apps/util-linux/util-linux-2.21.2.ebuild
@@ -11,7 +11,7 @@
 	inherit git-2 autotools
 	#KEYWORDS=""
 else
-	KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 MY_PV=${PV/_/-}
diff --git a/sys-apps/which/which-2.20.ebuild b/sys-apps/which/which-2.20.ebuild
index 344dd1e..1f289ad 100644
--- a/sys-apps/which/which-2.20.ebuild
+++ b/sys-apps/which/which-2.20.ebuild
@@ -8,7 +8,7 @@
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 src_install() {
diff --git a/sys-auth/consolekit/consolekit-0.4.5.ebuild b/sys-auth/consolekit/consolekit-0.4.5.ebuild
index 97689a9..6be544c 100644
--- a/sys-auth/consolekit/consolekit-0.4.5.ebuild
+++ b/sys-auth/consolekit/consolekit-0.4.5.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
+KEYWORDS="alpha ~amd64 ~arm hppa ia64 ppc ppc64 sh sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
 IUSE="debug doc kernel_linux pam policykit test"
 
 RDEPEND=">=dev-libs/dbus-glib-0.88
diff --git a/sys-block/parted/parted-3.1.ebuild b/sys-block/parted/parted-3.1.ebuild
index 1fe14f0..d84714b 100644
--- a/sys-block/parted/parted-3.1.ebuild
+++ b/sys-block/parted/parted-3.1.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86"
 IUSE="+debug device-mapper nls readline selinux static-libs test"
 
 # specific version for gettext needed
diff --git a/sys-devel/autoconf-wrapper/autoconf-wrapper-10-r1.ebuild b/sys-devel/autoconf-wrapper/autoconf-wrapper-10-r1.ebuild
index f871b3e..c3e525f 100644
--- a/sys-devel/autoconf-wrapper/autoconf-wrapper-10-r1.ebuild
+++ b/sys-devel/autoconf-wrapper/autoconf-wrapper-10-r1.ebuild
@@ -10,7 +10,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 S=${WORKDIR}
diff --git a/sys-devel/autoconf/autoconf-2.13.ebuild b/sys-devel/autoconf/autoconf-2.13.ebuild
index c95339e..a6479f9 100644
--- a/sys-devel/autoconf/autoconf-2.13.ebuild
+++ b/sys-devel/autoconf/autoconf-2.13.ebuild
@@ -10,7 +10,7 @@
 
 LICENSE="GPL-2"
 SLOT="${PV:0:3}"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE=""
 
 DEPEND=">=sys-apps/texinfo-4.3
diff --git a/sys-devel/autoconf/autoconf-2.68.ebuild b/sys-devel/autoconf/autoconf-2.68.ebuild
index 5fb75de..34adec7 100644
--- a/sys-devel/autoconf/autoconf-2.68.ebuild
+++ b/sys-devel/autoconf/autoconf-2.68.ebuild
@@ -12,7 +12,7 @@
 else
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2
 		ftp://alpha.gnu.org/pub/gnu/${PN}/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+	KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
 fi
 
 DESCRIPTION="Used to create autoconfiguration files"
diff --git a/sys-devel/automake-wrapper/automake-wrapper-5.ebuild b/sys-devel/automake-wrapper/automake-wrapper-5.ebuild
index e6385a3..8af7443 100644
--- a/sys-devel/automake-wrapper/automake-wrapper-5.ebuild
+++ b/sys-devel/automake-wrapper/automake-wrapper-5.ebuild
@@ -10,7 +10,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh ~sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 S=${WORKDIR}
diff --git a/sys-devel/bc/bc-1.06.95.ebuild b/sys-devel/bc/bc-1.06.95.ebuild
index c8b0318..fa5fdeb 100644
--- a/sys-devel/bc/bc-1.06.95.ebuild
+++ b/sys-devel/bc/bc-1.06.95.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="libedit readline static"
 
 RDEPEND="readline? ( >=sys-libs/readline-4.1 >=sys-libs/ncurses-5.2 )
diff --git a/sys-devel/binutils-config/binutils-config-3-r3.ebuild b/sys-devel/binutils-config/binutils-config-3-r3.ebuild
index 25c41a5..a148c19 100644
--- a/sys-devel/binutils-config/binutils-config-3-r3.ebuild
+++ b/sys-devel/binutils-config/binutils-config-3-r3.ebuild
@@ -8,7 +8,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND="userland_GNU? ( !<sys-apps/findutils-4.2 )"
diff --git a/sys-devel/bison/bison-2.4.3.ebuild b/sys-devel/bison/bison-2.4.3.ebuild
index 6ac432a..4601d0f 100644
--- a/sys-devel/bison/bison-2.4.3.ebuild
+++ b/sys-devel/bison/bison-2.4.3.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="nls static"
 
 RDEPEND="sys-devel/m4"
diff --git a/sys-devel/flex/flex-2.5.35_p10.ebuild b/sys-devel/flex/flex-2.5.35_p10.ebuild
index 29a3336..3b2153f 100644
--- a/sys-devel/flex/flex-2.5.35_p10.ebuild
+++ b/sys-devel/flex/flex-2.5.35_p10.ebuild
@@ -19,7 +19,7 @@
 
 LICENSE="FLEX"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="nls static test"
 
 RDEPEND="sys-devel/m4"
diff --git a/sys-devel/gcc-config/gcc-config-1.7.3.ebuild b/sys-devel/gcc-config/gcc-config-1.7.3.ebuild
index 5008da8..60fd08e 100644
--- a/sys-devel/gcc-config/gcc-config-1.7.3.ebuild
+++ b/sys-devel/gcc-config/gcc-config-1.7.3.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE=""
 
 src_compile() {
diff --git a/sys-devel/gettext/gettext-0.18.1.1-r3.ebuild b/sys-devel/gettext/gettext-0.18.1.1-r3.ebuild
index fb0ac14..46bd1e3 100644
--- a/sys-devel/gettext/gettext-0.18.1.1-r3.ebuild
+++ b/sys-devel/gettext/gettext-0.18.1.1-r3.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="GPL-3 LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha ~amd64 ~arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc ~x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="acl doc emacs +git java nls +cxx openmp static-libs elibc_glibc"
 
 DEPEND="virtual/libiconv
diff --git a/sys-devel/gnuconfig/gnuconfig-20120818.ebuild b/sys-devel/gnuconfig/gnuconfig-20120818.ebuild
index 1d2eab7..82ed2e5 100644
--- a/sys-devel/gnuconfig/gnuconfig-20120818.ebuild
+++ b/sys-devel/gnuconfig/gnuconfig-20120818.ebuild
@@ -12,7 +12,7 @@
 	inherit git-2
 else
 	SRC_URI="mirror://gentoo/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="Updated config.sub and config.guess file from GNU"
diff --git a/sys-devel/libperl/libperl-5.10.1.ebuild b/sys-devel/libperl/libperl-5.10.1.ebuild
index b88d587..3f90c00 100644
--- a/sys-devel/libperl/libperl-5.10.1.ebuild
+++ b/sys-devel/libperl/libperl-5.10.1.ebuild
@@ -10,7 +10,7 @@
 
 LICENSE="|| ( Artistic GPL-1 GPL-2 GPL-3 )"
 SLOT="1"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE=""
 
 PDEPEND=">=dev-lang/perl-5.10.1"
diff --git a/sys-devel/libtool/libtool-2.4-r1.ebuild b/sys-devel/libtool/libtool-2.4-r1.ebuild
index 9ae2c9d..c7c0550 100644
--- a/sys-devel/libtool/libtool-2.4-r1.ebuild
+++ b/sys-devel/libtool/libtool-2.4-r1.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="test vanilla"
 
 RDEPEND="sys-devel/gnuconfig
diff --git a/sys-devel/m4/m4-1.4.15.ebuild b/sys-devel/m4/m4-1.4.15.ebuild
index 9d3f021..6ecd935 100644
--- a/sys-devel/m4/m4-1.4.15.ebuild
+++ b/sys-devel/m4/m4-1.4.15.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="examples"
 
 # remember: cannot dep on autoconf since it needs us
diff --git a/sys-devel/make/make-3.82-r1.ebuild b/sys-devel/make/make-3.82-r1.ebuild
index e939526..9bf55fb 100644
--- a/sys-devel/make/make-3.82-r1.ebuild
+++ b/sys-devel/make/make-3.82-r1.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="nls static"
 
 DEPEND="nls? ( sys-devel/gettext )"
diff --git a/sys-devel/patch/patch-2.6.1.ebuild b/sys-devel/patch/patch-2.6.1.ebuild
index eecb902..d056b65 100644
--- a/sys-devel/patch/patch-2.6.1.ebuild
+++ b/sys-devel/patch/patch-2.6.1.ebuild
@@ -10,7 +10,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="static test"
 
 RDEPEND=""
diff --git a/sys-devel/smatch/smatch-1.57-r1.ebuild b/sys-devel/smatch/smatch-1.57-r1.ebuild
index 8b5ac58..3a76754 100644
--- a/sys-devel/smatch/smatch-1.57-r1.ebuild
+++ b/sys-devel/smatch/smatch-1.57-r1.ebuild
@@ -22,7 +22,7 @@
 	# so we have to cache our own copy of the snapshot.
 	#SRC_URI="http://repo.or.cz/w/smatch.git/snapshot/${PV}.tar.gz -> ${P}.tar.gz"
 	SRC_URI="mirror://gentoo/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+	KEYWORDS="amd64 ~arm hppa ia64 ppc ppc64 s390 sh sparc ~x86"
 fi
 
 LICENSE="OSL-1.1"
diff --git a/sys-fs/avfs/avfs-1.0.1.ebuild b/sys-fs/avfs/avfs-1.0.1.ebuild
index b94736c..55eb6de 100644
--- a/sys-fs/avfs/avfs-1.0.1.ebuild
+++ b/sys-fs/avfs/avfs-1.0.1.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ppc ~ppc64 x86"
+KEYWORDS="alpha amd64 arm hppa ppc ppc64 x86"
 IUSE="static-libs +lzma"
 
 RDEPEND=">=sys-fs/fuse-2.4
diff --git a/sys-fs/dd-rescue/dd-rescue-1.28.ebuild b/sys-fs/dd-rescue/dd-rescue-1.28.ebuild
index 5d53907..19e15e6 100644
--- a/sys-fs/dd-rescue/dd-rescue-1.28.ebuild
+++ b/sys-fs/dd-rescue/dd-rescue-1.28.ebuild
@@ -15,7 +15,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 arm mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="static kernel_linux elibc_glibc"
 
 S=${WORKDIR}/${MY_PN}
diff --git a/sys-fs/dosfstools/dosfstools-3.0.9.ebuild b/sys-fs/dosfstools/dosfstools-3.0.9.ebuild
index 4d079af..4aab9b1 100644
--- a/sys-fs/dosfstools/dosfstools-3.0.9.ebuild
+++ b/sys-fs/dosfstools/dosfstools-3.0.9.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 RESTRICT="test" # there is no test target #239071
 
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.42.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.42.ebuild
index 00e7e01..173f515 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.42.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.42.ebuild
@@ -17,7 +17,7 @@
 
 LICENSE="GPL-2 BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 -x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 -x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint"
 IUSE="nls static-libs elibc_FreeBSD"
 
 RDEPEND="~sys-libs/${PN}-libs-${PV}
diff --git a/sys-fs/lvm2/lvm2-2.02.88.ebuild b/sys-fs/lvm2/lvm2-2.02.88.ebuild
index 539cf6f..32dbd9d 100644
--- a/sys-fs/lvm2/lvm2-2.02.88.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.88.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~x86-linux"
 
 IUSE="readline +static +static-libs clvm cman +lvm1 selinux"
 
diff --git a/sys-fs/mtd-utils/mtd-utils-1.4.8.ebuild b/sys-fs/mtd-utils/mtd-utils-1.4.8.ebuild
index c99aa57..2657361 100644
--- a/sys-fs/mtd-utils/mtd-utils-1.4.8.ebuild
+++ b/sys-fs/mtd-utils/mtd-utils-1.4.8.ebuild
@@ -20,7 +20,7 @@
 		MY_PV="${PV}-02ae0aac87576d07202a62d11294ea55b56f450b"
 		SRC_URI="mirror://gentoo/${PN}-snapshot-${MY_PV}.tar.xz"
 	fi
-	KEYWORDS="amd64 arm ~mips ppc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm mips ppc x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="MTD userspace tools (NFTL, JFFS2, NAND, FTL, UBI)"
diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.2.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.2.ebuild
index e545350..a1241be 100644
--- a/sys-fs/squashfs-tools/squashfs-tools-4.2.ebuild
+++ b/sys-fs/squashfs-tools/squashfs-tools-4.2.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-linux"
+KEYWORDS="alpha ~amd64 ~arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc ~x86 ~x86-linux"
 IUSE="+gzip +lzma lzo xattr"
 
 RDEPEND="
diff --git a/sys-fs/sshfs-fuse/sshfs-fuse-2.4.ebuild b/sys-fs/sshfs-fuse/sshfs-fuse-2.4.ebuild
index 2a20928..07ef07c 100644
--- a/sys-fs/sshfs-fuse/sshfs-fuse-2.4.ebuild
+++ b/sys-fs/sshfs-fuse/sshfs-fuse-2.4.ebuild
@@ -9,7 +9,7 @@
 HOMEPAGE="http://fuse.sourceforge.net/sshfs.html"
 
 LICENSE="GPL-2"
-KEYWORDS="amd64 arm ~hppa ~ppc ~ppc64 x86 ~x86-fbsd ~x86-linux"
+KEYWORDS="amd64 arm hppa ppc ppc64 x86 ~x86-fbsd ~x86-linux"
 SLOT="0"
 IUSE=""
 
diff --git a/sys-fs/udev/udev-171-r2.ebuild b/sys-fs/udev/udev-171-r2.ebuild
index aa0fc0a..0b44510 100644
--- a/sys-fs/udev/udev-171-r2.ebuild
+++ b/sys-fs/udev/udev-171-r2.ebuild
@@ -21,7 +21,7 @@
 
 if [[ ${PV} != "9999" ]]
 then
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-linux"
+	KEYWORDS="alpha ~amd64 ~arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc ~x86 ~x86-linux"
 	# please update testsys-tarball whenever udev-xxx/test/sys/ is changed
 	SRC_URI="mirror://kernel/linux/utils/kernel/hotplug/${P}.tar.bz2
 			 test? ( mirror://gentoo/${PN}-171-testsys.tar.bz2 )"
diff --git a/sys-kernel/linux-headers/linux-headers-3.4.ebuild b/sys-kernel/linux-headers/linux-headers-3.4.ebuild
index 9d72497..6a0c732 100644
--- a/sys-kernel/linux-headers/linux-headers-3.4.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-3.4.ebuild
@@ -13,7 +13,7 @@
 SRC_URI="mirror://gentoo/gentoo-headers-base-${PV}.tar.xz
 	${PATCH_VER:+mirror://gentoo/gentoo-headers-${PV}-${PATCH_VER}.tar.xz}"
 
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
 
 DEPEND="app-arch/xz-utils
 	dev-lang/perl"
diff --git a/sys-libs/cracklib/cracklib-2.8.13-r1.ebuild b/sys-libs/cracklib/cracklib-2.8.13-r1.ebuild
index 0f7a629..01b73a8 100644
--- a/sys-libs/cracklib/cracklib-2.8.13-r1.ebuild
+++ b/sys-libs/cracklib/cracklib-2.8.13-r1.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="CRACKLIB"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE="nls python"
 
 DEPEND="python? ( <dev-lang/python-3 )"
diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.ebuild b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.ebuild
index 7daf78a..4e07827 100644
--- a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.ebuild
+++ b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.ebuild
@@ -17,7 +17,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE="nls static-libs"
 
 RDEPEND="!sys-libs/com_err
diff --git a/sys-libs/gdbm/gdbm-1.9.1-r2.ebuild b/sys-libs/gdbm/gdbm-1.9.1-r2.ebuild
index 517384e..9dad893 100644
--- a/sys-libs/gdbm/gdbm-1.9.1-r2.ebuild
+++ b/sys-libs/gdbm/gdbm-1.9.1-r2.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-linux"
 IUSE="+berkdb exporter static-libs"
 
 EX_S="${WORKDIR}"/${EX_P}
diff --git a/sys-libs/libcap-ng/libcap-ng-0.6.6.ebuild b/sys-libs/libcap-ng/libcap-ng-0.6.6.ebuild
index 79ae6c7..223b933 100644
--- a/sys-libs/libcap-ng/libcap-ng-0.6.6.ebuild
+++ b/sys-libs/libcap-ng/libcap-ng-0.6.6.ebuild
@@ -15,7 +15,7 @@
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86"
 IUSE="python static-libs"
 
 RDEPEND="sys-apps/attr
diff --git a/sys-libs/libcap/libcap-2.17.ebuild b/sys-libs/libcap/libcap-2.17.ebuild
index 0d09172..f3ec666 100644
--- a/sys-libs/libcap/libcap-2.17.ebuild
+++ b/sys-libs/libcap/libcap-2.17.ebuild
@@ -10,7 +10,7 @@
 
 LICENSE="GPL-2 BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
 IUSE="pam"
 
 RDEPEND="sys-apps/attr
diff --git a/sys-libs/mtdev/mtdev-1.1.2.ebuild b/sys-libs/mtdev/mtdev-1.1.2.ebuild
index 4cc79bd..4fad05e 100644
--- a/sys-libs/mtdev/mtdev-1.1.2.ebuild
+++ b/sys-libs/mtdev/mtdev-1.1.2.ebuild
@@ -10,7 +10,7 @@
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sh sparc x86"
 IUSE="static-libs"
 
 DEPEND=">=sys-kernel/linux-headers-2.6.31"
diff --git a/sys-libs/ncurses/ncurses-5.9-r2.ebuild b/sys-libs/ncurses/ncurses-5.9-r2.ebuild
index d065e15..30c353c 100644
--- a/sys-libs/ncurses/ncurses-5.9-r2.ebuild
+++ b/sys-libs/ncurses/ncurses-5.9-r2.ebuild
@@ -14,7 +14,7 @@
 
 LICENSE="MIT"
 SLOT="5"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="ada +cxx debug doc gpm minimal profile static-libs tinfo trace unicode"
 
 DEPEND="gpm? ( sys-libs/gpm )"
diff --git a/sys-libs/pam/pam-1.1.5.ebuild b/sys-libs/pam/pam-1.1.5.ebuild
index 36ad658..9332dc1 100644
--- a/sys-libs/pam/pam-1.1.5.ebuild
+++ b/sys-libs/pam/pam-1.1.5.ebuild
@@ -17,7 +17,7 @@
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~ia64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~ia64-linux ~x86-linux"
 IUSE="cracklib nls elibc_FreeBSD selinux vim-syntax audit test elibc_glibc debug berkdb nis"
 
 RDEPEND="nls? ( virtual/libintl )
diff --git a/sys-libs/readline/readline-6.2_p1.ebuild b/sys-libs/readline/readline-6.2_p1.ebuild
index 028f7c3..641b43e 100644
--- a/sys-libs/readline/readline-6.2_p1.ebuild
+++ b/sys-libs/readline/readline-6.2_p1.ebuild
@@ -32,7 +32,7 @@
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=sys-libs/ncurses-5.2-r2"
diff --git a/sys-libs/slang/slang-2.2.2.ebuild b/sys-libs/slang/slang-2.2.2.ebuild
index a3473f3..2375ae8 100644
--- a/sys-libs/slang/slang-2.2.2.ebuild
+++ b/sys-libs/slang/slang-2.2.2.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="cjk pcre png readline zlib"
 
 RDEPEND="sys-libs/ncurses
diff --git a/sys-libs/zlib/zlib-1.2.7.ebuild b/sys-libs/zlib/zlib-1.2.7.ebuild
index 90655d4..edb4ee0 100644
--- a/sys-libs/zlib/zlib-1.2.7.ebuild
+++ b/sys-libs/zlib/zlib-1.2.7.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="minizip static-libs"
 
 DEPEND="minizip? ( ${AUTOTOOLS_DEPEND} )"
diff --git a/sys-process/audit/audit-2.1.3-r1.ebuild b/sys-process/audit/audit-2.1.3-r1.ebuild
index 38c812a..c638938 100644
--- a/sys-process/audit/audit-2.1.3-r1.ebuild
+++ b/sys-process/audit/audit-2.1.3-r1.ebuild
@@ -15,7 +15,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 hppa ia64 mips ppc ppc64 sparc x86"
 IUSE="ldap prelude python"
 # Testcases are pretty useless as they are built for RedHat users/groups and
 # kernels.
diff --git a/sys-process/htop/htop-1.0.2-r1.ebuild b/sys-process/htop/htop-1.0.2-r1.ebuild
index 89349c5..67775d4 100644
--- a/sys-process/htop/htop-1.0.2-r1.ebuild
+++ b/sys-process/htop/htop-1.0.2-r1.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="kernel_FreeBSD kernel_linux openvz unicode vserver"
 
 RDEPEND="sys-libs/ncurses[unicode?]"
diff --git a/sys-process/lsof/lsof-4.81-r2.ebuild b/sys-process/lsof/lsof-4.81-r2.ebuild
index b79d4cc..88d4d39 100644
--- a/sys-process/lsof/lsof-4.81-r2.ebuild
+++ b/sys-process/lsof/lsof-4.81-r2.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="lsof"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE="static selinux"
 
 DEPEND="selinux? ( sys-libs/libselinux )"
diff --git a/sys-process/lsof/lsof-4.82.ebuild b/sys-process/lsof/lsof-4.82.ebuild
index 60fed97..32ae21c 100644
--- a/sys-process/lsof/lsof-4.82.ebuild
+++ b/sys-process/lsof/lsof-4.82.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="lsof"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE="static selinux"
 
 DEPEND="selinux? ( sys-libs/libselinux )"
diff --git a/sys-process/procps/procps-3.3.4.ebuild b/sys-process/procps/procps-3.3.4.ebuild
index 715dfa6..7361124 100644
--- a/sys-process/procps/procps-3.3.4.ebuild
+++ b/sys-process/procps/procps-3.3.4.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~ia64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~ia64-linux ~x86-linux"
 IUSE="+ncurses static-libs unicode"
 
 RDEPEND="ncurses? ( >=sys-libs/ncurses-5.2-r2[unicode?] )"
diff --git a/sys-process/psmisc/psmisc-22.10.ebuild b/sys-process/psmisc/psmisc-22.10.ebuild
index 3a2b07e..29ef662 100644
--- a/sys-process/psmisc/psmisc-22.10.ebuild
+++ b/sys-process/psmisc/psmisc-22.10.ebuild
@@ -10,7 +10,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
 IUSE="ipv6 nls selinux X"
 
 RDEPEND=">=sys-libs/ncurses-5.2-r2
diff --git a/virtual/acl/acl-0.ebuild b/virtual/acl/acl-0.ebuild
index 9428d93..473019a 100644
--- a/virtual/acl/acl-0.ebuild
+++ b/virtual/acl/acl-0.ebuild
@@ -8,7 +8,7 @@
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux"
 IUSE=""
 
 DEPEND=""
diff --git a/virtual/emacs/emacs-23.ebuild b/virtual/emacs/emacs-23.ebuild
index 169f1b5..899e849 100644
--- a/virtual/emacs/emacs-23.ebuild
+++ b/virtual/emacs/emacs-23.ebuild
@@ -10,7 +10,7 @@
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=""
diff --git a/virtual/ffmpeg/ffmpeg-0.10.3.ebuild b/virtual/ffmpeg/ffmpeg-0.10.3.ebuild
index 6794705..db08a9a 100644
--- a/virtual/ffmpeg/ffmpeg-0.10.3.ebuild
+++ b/virtual/ffmpeg/ffmpeg-0.10.3.ebuild
@@ -10,7 +10,7 @@
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 IUSE="X +encode gsm jpeg2k mp3 sdl speex theora threads truetype vaapi vdpau x264"
 
 RDEPEND="
diff --git a/virtual/jpeg/jpeg-0.ebuild b/virtual/jpeg/jpeg-0.ebuild
index 020c403..2cc18dd 100644
--- a/virtual/jpeg/jpeg-0.ebuild
+++ b/virtual/jpeg/jpeg-0.ebuild
@@ -10,7 +10,7 @@
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND="|| ( media-libs/libjpeg-turbo:0[static-libs?] media-libs/jpeg:0[static-libs?] )"
diff --git a/virtual/krb5/krb5-0.ebuild b/virtual/krb5/krb5-0.ebuild
index ebdad3b..061f4fe 100644
--- a/virtual/krb5/krb5-0.ebuild
+++ b/virtual/krb5/krb5-0.ebuild
@@ -10,7 +10,7 @@
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 DEPEND=""
diff --git a/virtual/libc/libc-0.ebuild b/virtual/libc/libc-0.ebuild
index 4bff076..13e79fe 100644
--- a/virtual/libc/libc-0.ebuild
+++ b/virtual/libc/libc-0.ebuild
@@ -10,7 +10,7 @@
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=""
diff --git a/virtual/libffi/libffi-0.ebuild b/virtual/libffi/libffi-0.ebuild
index 8b4e64d..88d1ab8 100644
--- a/virtual/libffi/libffi-0.ebuild
+++ b/virtual/libffi/libffi-0.ebuild
@@ -8,7 +8,7 @@
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="dev-libs/libffi"
diff --git a/virtual/libusb/libusb-0.ebuild b/virtual/libusb/libusb-0.ebuild
index 347cc9a..a3e6400 100644
--- a/virtual/libusb/libusb-0.ebuild
+++ b/virtual/libusb/libusb-0.ebuild
@@ -10,7 +10,7 @@
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 
 DEPEND=""
diff --git a/virtual/libusb/libusb-1.ebuild b/virtual/libusb/libusb-1.ebuild
index 219dd81..d9fd07a 100644
--- a/virtual/libusb/libusb-1.ebuild
+++ b/virtual/libusb/libusb-1.ebuild
@@ -10,7 +10,7 @@
 
 LICENSE=""
 SLOT="1"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 
 DEPEND=""
diff --git a/virtual/logger/logger-0.ebuild b/virtual/logger/logger-0.ebuild
index a558b98..5695ba3 100644
--- a/virtual/logger/logger-0.ebuild
+++ b/virtual/logger/logger-0.ebuild
@@ -8,7 +8,7 @@
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=""
diff --git a/virtual/man/man-0.ebuild b/virtual/man/man-0.ebuild
index 449bb0d..242a91b 100644
--- a/virtual/man/man-0.ebuild
+++ b/virtual/man/man-0.ebuild
@@ -10,7 +10,7 @@
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=""
diff --git a/virtual/modutils/modutils-0.ebuild b/virtual/modutils/modutils-0.ebuild
index b2acf39..5cb2f41 100644
--- a/virtual/modutils/modutils-0.ebuild
+++ b/virtual/modutils/modutils-0.ebuild
@@ -10,7 +10,7 @@
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 DEPEND=""
diff --git a/virtual/mta/mta-0.ebuild b/virtual/mta/mta-0.ebuild
index a2f147f..6072e73 100644
--- a/virtual/mta/mta-0.ebuild
+++ b/virtual/mta/mta-0.ebuild
@@ -10,7 +10,7 @@
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-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"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~sparc-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=""
 
 DEPEND=""
diff --git a/virtual/os-headers/os-headers-0.ebuild b/virtual/os-headers/os-headers-0.ebuild
index 7f55af0..ace5d70 100644
--- a/virtual/os-headers/os-headers-0.ebuild
+++ b/virtual/os-headers/os-headers-0.ebuild
@@ -10,7 +10,7 @@
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=""
diff --git a/virtual/pager/pager-0.ebuild b/virtual/pager/pager-0.ebuild
index 5b5bac5..e17424a 100644
--- a/virtual/pager/pager-0.ebuild
+++ b/virtual/pager/pager-0.ebuild
@@ -8,7 +8,7 @@
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=""
diff --git a/virtual/pam/pam-0.ebuild b/virtual/pam/pam-0.ebuild
index 277d945..ffe22f1 100644
--- a/virtual/pam/pam-0.ebuild
+++ b/virtual/pam/pam-0.ebuild
@@ -10,7 +10,7 @@
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux"
 IUSE=""
 
 DEPEND=""
diff --git a/virtual/perl-Compress-Raw-Bzip2/perl-Compress-Raw-Bzip2-2.024.ebuild b/virtual/perl-Compress-Raw-Bzip2/perl-Compress-Raw-Bzip2-2.024.ebuild
index dc9d3b3..7d64add 100644
--- a/virtual/perl-Compress-Raw-Bzip2/perl-Compress-Raw-Bzip2-2.024.ebuild
+++ b/virtual/perl-Compress-Raw-Bzip2/perl-Compress-Raw-Bzip2-2.024.ebuild
@@ -8,7 +8,7 @@
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="|| ( ~dev-lang/perl-5.12.4 ~dev-lang/perl-5.12.3 ~dev-lang/perl-5.12.2 ~perl-core/Compress-Raw-Bzip2-${PV} )"
diff --git a/virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.024.ebuild b/virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.024.ebuild
index 75528ec..a87777d 100644
--- a/virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.024.ebuild
+++ b/virtual/perl-Compress-Raw-Zlib/perl-Compress-Raw-Zlib-2.024.ebuild
@@ -8,7 +8,7 @@
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="|| ( ~dev-lang/perl-5.12.4 ~dev-lang/perl-5.12.3 ~dev-lang/perl-5.12.2 ~perl-core/Compress-Raw-Zlib-${PV} )"
diff --git a/virtual/perl-ExtUtils-CBuilder/perl-ExtUtils-CBuilder-0.27.03.ebuild b/virtual/perl-ExtUtils-CBuilder/perl-ExtUtils-CBuilder-0.27.03.ebuild
index 3c6637b..3f8078c 100644
--- a/virtual/perl-ExtUtils-CBuilder/perl-ExtUtils-CBuilder-0.27.03.ebuild
+++ b/virtual/perl-ExtUtils-CBuilder/perl-ExtUtils-CBuilder-0.27.03.ebuild
@@ -8,7 +8,7 @@
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="~perl-core/ExtUtils-CBuilder-${PV}"
diff --git a/virtual/perl-ExtUtils-ParseXS/perl-ExtUtils-ParseXS-2.22.05.ebuild b/virtual/perl-ExtUtils-ParseXS/perl-ExtUtils-ParseXS-2.22.05.ebuild
index c65dfa6..04dac64 100644
--- a/virtual/perl-ExtUtils-ParseXS/perl-ExtUtils-ParseXS-2.22.05.ebuild
+++ b/virtual/perl-ExtUtils-ParseXS/perl-ExtUtils-ParseXS-2.22.05.ebuild
@@ -8,7 +8,7 @@
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="~perl-core/ExtUtils-ParseXS-${PV}"
diff --git a/virtual/perl-File-Spec/perl-File-Spec-3.31.ebuild b/virtual/perl-File-Spec/perl-File-Spec-3.31.ebuild
index a28d2a9..7447451 100644
--- a/virtual/perl-File-Spec/perl-File-Spec-3.31.ebuild
+++ b/virtual/perl-File-Spec/perl-File-Spec-3.31.ebuild
@@ -8,7 +8,7 @@
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~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"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k 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"
 
 IUSE=""
 DEPEND=""
diff --git a/virtual/perl-IO-Compress/perl-IO-Compress-2.024.ebuild b/virtual/perl-IO-Compress/perl-IO-Compress-2.024.ebuild
index cadf5d5..3a32f40 100644
--- a/virtual/perl-IO-Compress/perl-IO-Compress-2.024.ebuild
+++ b/virtual/perl-IO-Compress/perl-IO-Compress-2.024.ebuild
@@ -8,7 +8,7 @@
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="|| ( ~dev-lang/perl-5.12.4 ~dev-lang/perl-5.12.3 ~dev-lang/perl-5.12.2 ~perl-core/IO-Compress-${PV} )"
diff --git a/virtual/perl-IO-Zlib/perl-IO-Zlib-1.100.0-r1.ebuild b/virtual/perl-IO-Zlib/perl-IO-Zlib-1.100.0-r1.ebuild
index f8856eb..5dda39d 100644
--- a/virtual/perl-IO-Zlib/perl-IO-Zlib-1.100.0-r1.ebuild
+++ b/virtual/perl-IO-Zlib/perl-IO-Zlib-1.100.0-r1.ebuild
@@ -8,7 +8,7 @@
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="|| ( =dev-lang/perl-5.14* ~dev-lang/perl-5.12.4 ~dev-lang/perl-5.12.3 ~dev-lang/perl-5.12.2 ~perl-core/${PN#perl-}-${PV} )"
diff --git a/virtual/perl-MIME-Base64/perl-MIME-Base64-3.08.ebuild b/virtual/perl-MIME-Base64/perl-MIME-Base64-3.08.ebuild
index 3b3c798..28f1bf3 100644
--- a/virtual/perl-MIME-Base64/perl-MIME-Base64-3.08.ebuild
+++ b/virtual/perl-MIME-Base64/perl-MIME-Base64-3.08.ebuild
@@ -8,7 +8,7 @@
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=""
diff --git a/virtual/perl-Module-Build/perl-Module-Build-0.36.07.ebuild b/virtual/perl-Module-Build/perl-Module-Build-0.36.07.ebuild
index 3129436..457c9ee 100644
--- a/virtual/perl-Module-Build/perl-Module-Build-0.36.07.ebuild
+++ b/virtual/perl-Module-Build/perl-Module-Build-0.36.07.ebuild
@@ -8,7 +8,7 @@
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="~perl-core/Module-Build-${PV}"
diff --git a/virtual/perl-Package-Constants/perl-Package-Constants-0.20.0-r1.ebuild b/virtual/perl-Package-Constants/perl-Package-Constants-0.20.0-r1.ebuild
index 86156e7..95a48e2 100644
--- a/virtual/perl-Package-Constants/perl-Package-Constants-0.20.0-r1.ebuild
+++ b/virtual/perl-Package-Constants/perl-Package-Constants-0.20.0-r1.ebuild
@@ -8,7 +8,7 @@
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="|| ( =dev-lang/perl-5.14* ~dev-lang/perl-5.12.4 ~dev-lang/perl-5.12.3 ~dev-lang/perl-5.12.2 ~dev-lang/perl-5.10.1 ~perl-core/${PN#perl-}-${PV} )"
diff --git a/virtual/perl-Scalar-List-Utils/perl-Scalar-List-Utils-1.230.0-r1.ebuild b/virtual/perl-Scalar-List-Utils/perl-Scalar-List-Utils-1.230.0-r1.ebuild
index 26f4c0a..01174d2 100644
--- a/virtual/perl-Scalar-List-Utils/perl-Scalar-List-Utils-1.230.0-r1.ebuild
+++ b/virtual/perl-Scalar-List-Utils/perl-Scalar-List-Utils-1.230.0-r1.ebuild
@@ -8,7 +8,7 @@
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="|| ( =dev-lang/perl-5.14* ~perl-core/${PN#perl-}-${PV} )"
diff --git a/virtual/perl-Test-Harness/perl-Test-Harness-3.17.ebuild b/virtual/perl-Test-Harness/perl-Test-Harness-3.17.ebuild
index e9bb19e..16a6012 100644
--- a/virtual/perl-Test-Harness/perl-Test-Harness-3.17.ebuild
+++ b/virtual/perl-Test-Harness/perl-Test-Harness-3.17.ebuild
@@ -8,7 +8,7 @@
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=""
diff --git a/virtual/perl-Test-Simple/perl-Test-Simple-0.980.0-r1.ebuild b/virtual/perl-Test-Simple/perl-Test-Simple-0.980.0-r1.ebuild
index f54e3ca..90c08f3 100644
--- a/virtual/perl-Test-Simple/perl-Test-Simple-0.980.0-r1.ebuild
+++ b/virtual/perl-Test-Simple/perl-Test-Simple-0.980.0-r1.ebuild
@@ -8,7 +8,7 @@
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="|| ( =dev-lang/perl-5.14* ~perl-core/${PN#perl-}-${PV} )"
diff --git a/virtual/perl-digest-base/perl-digest-base-1.160.0-r1.ebuild b/virtual/perl-digest-base/perl-digest-base-1.160.0-r1.ebuild
index 9ec5e8a..9348c43 100644
--- a/virtual/perl-digest-base/perl-digest-base-1.160.0-r1.ebuild
+++ b/virtual/perl-digest-base/perl-digest-base-1.160.0-r1.ebuild
@@ -8,7 +8,7 @@
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="|| ( =dev-lang/perl-5.14* ~dev-lang/perl-5.12.4 ~dev-lang/perl-5.12.3 ~dev-lang/perl-5.12.2 ~dev-lang/perl-5.10.1 ~perl-core/${PN#perl-}-${PV} )"
diff --git a/virtual/pkgconfig/pkgconfig-0.ebuild b/virtual/pkgconfig/pkgconfig-0.ebuild
index 2b17403..2d1fdff 100644
--- a/virtual/pkgconfig/pkgconfig-0.ebuild
+++ b/virtual/pkgconfig/pkgconfig-0.ebuild
@@ -10,7 +10,7 @@
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="|| (
diff --git a/virtual/python-argparse/python-argparse-0.ebuild b/virtual/python-argparse/python-argparse-0.ebuild
index ca271ca..95ff45f 100644
--- a/virtual/python-argparse/python-argparse-0.ebuild
+++ b/virtual/python-argparse/python-argparse-0.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~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 ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k 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 ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 IUSE=""
 
 setup_globals() {
diff --git a/virtual/ttf-fonts/ttf-fonts-1.ebuild b/virtual/ttf-fonts/ttf-fonts-1.ebuild
index f5e9201..1c58139 100644
--- a/virtual/ttf-fonts/ttf-fonts-1.ebuild
+++ b/virtual/ttf-fonts/ttf-fonts-1.ebuild
@@ -8,7 +8,7 @@
 
 LICENSE=""
 SLOT="0"
-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 ~m68k-mint ~sparc-solaris ~x86-solaris"
+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 ~m68k-mint ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=""
diff --git a/virtual/udev/udev-171.ebuild b/virtual/udev/udev-171.ebuild
index 41348fd..42d62b5 100644
--- a/virtual/udev/udev-171.ebuild
+++ b/virtual/udev/udev-171.ebuild
@@ -10,7 +10,7 @@
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
 # USE flags kmod and static-libs are here dummy in purpose
 IUSE="gudev hwdb introspection keymap +kmod selinux static-libs"
 
diff --git a/virtual/yacc/yacc-0.ebuild b/virtual/yacc/yacc-0.ebuild
index 5d7ee8f..bb68b8d 100644
--- a/virtual/yacc/yacc-0.ebuild
+++ b/virtual/yacc/yacc-0.ebuild
@@ -8,7 +8,7 @@
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE=""
 
 DEPEND="|| ( sys-devel/bison dev-util/yacc )"
diff --git a/x11-apps/iceauth/iceauth-1.0.4.ebuild b/x11-apps/iceauth/iceauth-1.0.4.ebuild
index 26cc95c..384f244 100644
--- a/x11-apps/iceauth/iceauth-1.0.4.ebuild
+++ b/x11-apps/iceauth/iceauth-1.0.4.ebuild
@@ -8,7 +8,7 @@
 
 DESCRIPTION="ICE authority file utility"
 
-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 ~x86-solaris ~x86-winnt"
+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 ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="x11-libs/libICE"
diff --git a/x11-apps/mesa-progs/mesa-progs-8.0.1.ebuild b/x11-apps/mesa-progs/mesa-progs-8.0.1.ebuild
index 10ba02e..9d7cd6f 100644
--- a/x11-apps/mesa-progs/mesa-progs-8.0.1.ebuild
+++ b/x11-apps/mesa-progs/mesa-progs-8.0.1.ebuild
@@ -24,7 +24,7 @@
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="virtual/opengl"
diff --git a/x11-apps/mkfontdir/mkfontdir-1.0.6.ebuild b/x11-apps/mkfontdir/mkfontdir-1.0.6.ebuild
index 52811d3..5b4e12f 100644
--- a/x11-apps/mkfontdir/mkfontdir-1.0.6.ebuild
+++ b/x11-apps/mkfontdir/mkfontdir-1.0.6.ebuild
@@ -8,7 +8,7 @@
 
 DESCRIPTION="create an index of X font files in a directory"
 
-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 ~x64-solaris ~x86-solaris"
+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 ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="x11-apps/mkfontscale"
diff --git a/x11-apps/mkfontscale/mkfontscale-1.0.7.ebuild b/x11-apps/mkfontscale/mkfontscale-1.0.7.ebuild
index 444ed22..1cdbac6 100644
--- a/x11-apps/mkfontscale/mkfontscale-1.0.7.ebuild
+++ b/x11-apps/mkfontscale/mkfontscale-1.0.7.ebuild
@@ -6,7 +6,7 @@
 
 DESCRIPTION="create an index of scalable font files for X"
 
-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 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="x11-libs/libfontenc
diff --git a/x11-apps/rgb/rgb-1.0.4.ebuild b/x11-apps/rgb/rgb-1.0.4.ebuild
index 7db92c4..8a0a060 100644
--- a/x11-apps/rgb/rgb-1.0.4.ebuild
+++ b/x11-apps/rgb/rgb-1.0.4.ebuild
@@ -8,7 +8,7 @@
 
 DESCRIPTION="uncompile an rgb color-name database"
 
-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 ~x64-solaris ~x86-solaris ~x86-winnt"
+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 ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/x11-apps/setxkbmap/setxkbmap-1.2.0.ebuild b/x11-apps/setxkbmap/setxkbmap-1.2.0.ebuild
index 01524b8..8137bf9 100644
--- a/x11-apps/setxkbmap/setxkbmap-1.2.0.ebuild
+++ b/x11-apps/setxkbmap/setxkbmap-1.2.0.ebuild
@@ -8,7 +8,7 @@
 
 DESCRIPTION="Controls the keyboard layout of a running X server."
 
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 RDEPEND="x11-libs/libxkbfile
 	x11-libs/libX11"
diff --git a/x11-apps/xauth/xauth-1.0.6.ebuild b/x11-apps/xauth/xauth-1.0.6.ebuild
index 6bd2474..0281db8 100644
--- a/x11-apps/xauth/xauth-1.0.6.ebuild
+++ b/x11-apps/xauth/xauth-1.0.6.ebuild
@@ -8,7 +8,7 @@
 
 DESCRIPTION="X authority file utility"
 
-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 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="ipv6"
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-apps/xcursorgen/xcursorgen-1.0.4.ebuild b/x11-apps/xcursorgen/xcursorgen-1.0.4.ebuild
index 16ba1a3..301de49 100644
--- a/x11-apps/xcursorgen/xcursorgen-1.0.4.ebuild
+++ b/x11-apps/xcursorgen/xcursorgen-1.0.4.ebuild
@@ -8,7 +8,7 @@
 
 DESCRIPTION="create an X cursor file from a collection of PNG images"
 
-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 ~x86-fbsd"
 IUSE=""
 
 RDEPEND="media-libs/libpng
diff --git a/x11-apps/xdpyinfo/xdpyinfo-1.3.0.ebuild b/x11-apps/xdpyinfo/xdpyinfo-1.3.0.ebuild
index e6e9ec9..a23af07 100644
--- a/x11-apps/xdpyinfo/xdpyinfo-1.3.0.ebuild
+++ b/x11-apps/xdpyinfo/xdpyinfo-1.3.0.ebuild
@@ -6,7 +6,7 @@
 inherit xorg-2
 
 DESCRIPTION="Display information utility for X"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris ~x86-winnt"
 IUSE="dga dmx xinerama"
 
 RDEPEND="
diff --git a/x11-apps/xdriinfo/xdriinfo-1.0.4.ebuild b/x11-apps/xdriinfo/xdriinfo-1.0.4.ebuild
index e5e2739..48d520f 100644
--- a/x11-apps/xdriinfo/xdriinfo-1.0.4.ebuild
+++ b/x11-apps/xdriinfo/xdriinfo-1.0.4.ebuild
@@ -7,7 +7,7 @@
 
 DESCRIPTION="query configuration information of DRI drivers"
 
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sh sparc x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-apps/xev/xev-1.2.0.ebuild b/x11-apps/xev/xev-1.2.0.ebuild
index 94455a0..5ca7e12 100644
--- a/x11-apps/xev/xev-1.2.0.ebuild
+++ b/x11-apps/xev/xev-1.2.0.ebuild
@@ -8,7 +8,7 @@
 
 DESCRIPTION="print contents of X events"
 
-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 ~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 ~ia64-linux ~x86-linux ~x86-winnt"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-apps/xhost/xhost-1.0.4.ebuild b/x11-apps/xhost/xhost-1.0.4.ebuild
index 4f94994..7da2b5d 100644
--- a/x11-apps/xhost/xhost-1.0.4.ebuild
+++ b/x11-apps/xhost/xhost-1.0.4.ebuild
@@ -8,7 +8,7 @@
 
 DESCRIPTION="Controls host and/or user access to a running X server."
 
-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 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="ipv6"
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-apps/xinput/xinput-1.6.0.ebuild b/x11-apps/xinput/xinput-1.6.0.ebuild
index 369f69c..c3dd785 100644
--- a/x11-apps/xinput/xinput-1.6.0.ebuild
+++ b/x11-apps/xinput/xinput-1.6.0.ebuild
@@ -7,7 +7,7 @@
 
 DESCRIPTION="Utility to set XInput device parameters"
 
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=x11-libs/libX11-1.3
diff --git a/x11-apps/xkbcomp/xkbcomp-1.2.3.ebuild b/x11-apps/xkbcomp/xkbcomp-1.2.3.ebuild
index 83783e4..4235af3 100644
--- a/x11-apps/xkbcomp/xkbcomp-1.2.3.ebuild
+++ b/x11-apps/xkbcomp/xkbcomp-1.2.3.ebuild
@@ -7,7 +7,7 @@
 inherit xorg-2
 
 DESCRIPTION="compile XKB keyboard description"
-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 ~x86-solaris"
+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 ~x86-solaris"
 IUSE=""
 RDEPEND="x11-libs/libX11
 	x11-libs/libxkbfile"
diff --git a/x11-apps/xlsatoms/xlsatoms-1.1.0.ebuild b/x11-apps/xlsatoms/xlsatoms-1.1.0.ebuild
index 7feab5b..834e6a8 100644
--- a/x11-apps/xlsatoms/xlsatoms-1.1.0.ebuild
+++ b/x11-apps/xlsatoms/xlsatoms-1.1.0.ebuild
@@ -7,7 +7,7 @@
 inherit xorg-2
 
 DESCRIPTION="list interned atoms defined on server"
-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 ~x86-fbsd"
 IUSE=""
 
 RDEPEND="x11-libs/libxcb"
diff --git a/x11-apps/xlsclients/xlsclients-1.1.2.ebuild b/x11-apps/xlsclients/xlsclients-1.1.2.ebuild
index 0eadcf9..7a22995 100644
--- a/x11-apps/xlsclients/xlsclients-1.1.2.ebuild
+++ b/x11-apps/xlsclients/xlsclients-1.1.2.ebuild
@@ -7,7 +7,7 @@
 inherit xorg-2
 
 DESCRIPTION="X.Org xlsclients application"
-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 ~x86-fbsd"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-apps/xmodmap/xmodmap-1.0.5.ebuild b/x11-apps/xmodmap/xmodmap-1.0.5.ebuild
index 2877b24..3154bb2 100644
--- a/x11-apps/xmodmap/xmodmap-1.0.5.ebuild
+++ b/x11-apps/xmodmap/xmodmap-1.0.5.ebuild
@@ -8,7 +8,7 @@
 
 DESCRIPTION="utility for modifying keymaps and pointer button mappings in X"
 
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="x11-libs/libX11"
diff --git a/x11-apps/xprop/xprop-1.2.1.ebuild b/x11-apps/xprop/xprop-1.2.1.ebuild
index 11aeda5..590ca96 100644
--- a/x11-apps/xprop/xprop-1.2.1.ebuild
+++ b/x11-apps/xprop/xprop-1.2.1.ebuild
@@ -7,7 +7,7 @@
 
 DESCRIPTION="property displayer for X"
 
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="x11-libs/libX11"
diff --git a/x11-apps/xrandr/xrandr-1.3.5.ebuild b/x11-apps/xrandr/xrandr-1.3.5.ebuild
index bcaa80f..036c6a9 100644
--- a/x11-apps/xrandr/xrandr-1.3.5.ebuild
+++ b/x11-apps/xrandr/xrandr-1.3.5.ebuild
@@ -8,7 +8,7 @@
 
 DESCRIPTION="primitive command line interface to RandR extension"
 
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=x11-libs/libXrandr-1.3
diff --git a/x11-apps/xrdb/xrdb-1.0.9.ebuild b/x11-apps/xrdb/xrdb-1.0.9.ebuild
index da78080..ba90408 100644
--- a/x11-apps/xrdb/xrdb-1.0.9.ebuild
+++ b/x11-apps/xrdb/xrdb-1.0.9.ebuild
@@ -7,7 +7,7 @@
 inherit xorg-2
 
 DESCRIPTION="X server resource database utility"
-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 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="x11-libs/libXmu
diff --git a/x11-apps/xset/xset-1.2.2.ebuild b/x11-apps/xset/xset-1.2.2.ebuild
index 0f4af99..ee24e7f 100644
--- a/x11-apps/xset/xset-1.2.2.ebuild
+++ b/x11-apps/xset/xset-1.2.2.ebuild
@@ -8,7 +8,7 @@
 
 DESCRIPTION="X.Org xset application"
 
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-apps/xsetroot/xsetroot-1.1.0.ebuild b/x11-apps/xsetroot/xsetroot-1.1.0.ebuild
index 15591bb..edeb718 100644
--- a/x11-apps/xsetroot/xsetroot-1.1.0.ebuild
+++ b/x11-apps/xsetroot/xsetroot-1.1.0.ebuild
@@ -8,7 +8,7 @@
 
 DESCRIPTION="X.Org xsetroot application"
 
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 RDEPEND="x11-libs/libXmu
 	x11-libs/libX11
diff --git a/x11-apps/xwd/xwd-1.0.4.ebuild b/x11-apps/xwd/xwd-1.0.4.ebuild
index 2760bfc..bbb867a 100644
--- a/x11-apps/xwd/xwd-1.0.4.ebuild
+++ b/x11-apps/xwd/xwd-1.0.4.ebuild
@@ -8,7 +8,7 @@
 
 DESCRIPTION="dump an image of an X window"
 
-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 ~x86-fbsd"
 IUSE=""
 
 RDEPEND="x11-libs/libX11"
diff --git a/x11-apps/xwininfo/xwininfo-1.1.2.ebuild b/x11-apps/xwininfo/xwininfo-1.1.2.ebuild
index d911f67..3bf7ab4 100644
--- a/x11-apps/xwininfo/xwininfo-1.1.2.ebuild
+++ b/x11-apps/xwininfo/xwininfo-1.1.2.ebuild
@@ -8,7 +8,7 @@
 
 DESCRIPTION="window information utility for X"
 
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND=">=x11-libs/libxcb-1.6"
diff --git a/x11-drivers/xf86-input-keyboard/xf86-input-keyboard-1.6.0.ebuild b/x11-drivers/xf86-input-keyboard/xf86-input-keyboard-1.6.0.ebuild
index f355d80..bf2b223 100644
--- a/x11-drivers/xf86-input-keyboard/xf86-input-keyboard-1.6.0.ebuild
+++ b/x11-drivers/xf86-input-keyboard/xf86-input-keyboard-1.6.0.ebuild
@@ -7,7 +7,7 @@
 
 DESCRIPTION="Keyboard input driver"
 
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sh sparc x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=x11-base/xorg-server-1.6.3"
diff --git a/x11-drivers/xf86-input-mouse/xf86-input-mouse-1.7.1.ebuild b/x11-drivers/xf86-input-mouse/xf86-input-mouse-1.7.1.ebuild
index 4bd06d6..7dfbe29 100644
--- a/x11-drivers/xf86-input-mouse/xf86-input-mouse-1.7.1.ebuild
+++ b/x11-drivers/xf86-input-mouse/xf86-input-mouse-1.7.1.ebuild
@@ -7,7 +7,7 @@
 
 DESCRIPTION="X.Org driver for mouse input devices"
 
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sh sparc x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=x11-base/xorg-server-1.5.99.901"
diff --git a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.6.2.ebuild b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.6.2.ebuild
index 56d62db..8a09f18 100644
--- a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.6.2.ebuild
+++ b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.6.2.ebuild
@@ -9,7 +9,7 @@
 DESCRIPTION="Driver for Synaptics touchpads"
 HOMEPAGE="http://cgit.freedesktop.org/xorg/driver/xf86-input-synaptics/"
 
-KEYWORDS="amd64 arm ~mips ppc ppc64 x86"
+KEYWORDS="amd64 arm mips ppc ppc64 x86"
 IUSE=""
 
 RDEPEND="sys-libs/mtdev
diff --git a/x11-drivers/xf86-video-ati/xf86-video-ati-6.14.4.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-6.14.4.ebuild
index a6628bd..da7ed37 100644
--- a/x11-drivers/xf86-video-ati/xf86-video-ati-6.14.4.ebuild
+++ b/x11-drivers/xf86-video-ati/xf86-video-ati-6.14.4.ebuild
@@ -10,7 +10,7 @@
 
 DESCRIPTION="ATI video driver"
 
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=x11-libs/libdrm-2.4.31[video_cards_radeon]"
diff --git a/x11-drivers/xf86-video-fbdev/xf86-video-fbdev-0.4.1.ebuild b/x11-drivers/xf86-video-fbdev/xf86-video-fbdev-0.4.1.ebuild
index 692816e..d35cde4 100644
--- a/x11-drivers/xf86-video-fbdev/xf86-video-fbdev-0.4.1.ebuild
+++ b/x11-drivers/xf86-video-fbdev/xf86-video-fbdev-0.4.1.ebuild
@@ -9,7 +9,7 @@
 
 DESCRIPTION="video driver for framebuffer device"
 
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sh sparc x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=x11-base/xorg-server-1.0.99"
diff --git a/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.16_pre20120508.ebuild b/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.16_pre20120508.ebuild
index 05691aa..172ecca 100644
--- a/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.16_pre20120508.ebuild
+++ b/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.16_pre20120508.ebuild
@@ -11,7 +11,7 @@
 HOMEPAGE="http://nouveau.freedesktop.org/"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
-KEYWORDS="amd64 ppc ~ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE=""
 
 RDEPEND=">=x11-libs/libdrm-2.4.34[video_cards_nouveau]"
diff --git a/x11-libs/cairo/cairo-1.12.12.ebuild b/x11-libs/cairo/cairo-1.12.12.ebuild
index c237444..1933f6f 100644
--- a/x11-libs/cairo/cairo-1.12.12.ebuild
+++ b/x11-libs/cairo/cairo-1.12.12.ebuild
@@ -13,7 +13,7 @@
 	KEYWORDS=""
 else
 	SRC_URI="http://cairographics.org/releases/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A vector graphics library with cross-device output support"
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.22.1-r2.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.22.1-r2.ebuild
index f1e68a8..6b1b6cd 100644
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.22.1-r2.ebuild
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.22.1-r2.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="LGPL-2"
 SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 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 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"
 IUSE="+X debug doc +introspection jpeg jpeg2k svg tiff test"
 
 # librsvg blocker is for the new pixbuf loader API, you lose icons otherwise
diff --git a/x11-libs/gtk+/gtk+-2.18.7.ebuild b/x11-libs/gtk+/gtk+-2.18.7.ebuild
index 3555cc2..74fc6f5 100644
--- a/x11-libs/gtk+/gtk+-2.18.7.ebuild
+++ b/x11-libs/gtk+/gtk+-2.18.7.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="LGPL-2"
 SLOT="2"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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 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"
 IUSE="aqua cups debug doc jpeg jpeg2k tiff test vim-syntax xinerama"
 
 # FIXME: configure says >=xrandr-1.2.99 but remi tells me it's broken
diff --git a/x11-libs/libICE/libICE-1.0.7.ebuild b/x11-libs/libICE/libICE-1.0.7.ebuild
index 23fc01b..0649cbc 100644
--- a/x11-libs/libICE/libICE-1.0.7.ebuild
+++ b/x11-libs/libICE/libICE-1.0.7.ebuild
@@ -7,7 +7,7 @@
 
 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 ~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="doc ipv6"
 
 RDEPEND="x11-libs/xtrans
diff --git a/x11-libs/libSM/libSM-1.2.0.ebuild b/x11-libs/libSM/libSM-1.2.0.ebuild
index 8679a69..d8538bb 100644
--- a/x11-libs/libSM/libSM-1.2.0.ebuild
+++ b/x11-libs/libSM/libSM-1.2.0.ebuild
@@ -7,7 +7,7 @@
 
 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 ~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="doc ipv6 +uuid"
 
 RDEPEND=">=x11-libs/libICE-1.0.5
diff --git a/x11-libs/libX11/libX11-1.6.0.ebuild b/x11-libs/libX11/libX11-1.6.0.ebuild
index 365013c..ed5608c 100644
--- a/x11-libs/libX11/libX11-1.6.0.ebuild
+++ b/x11-libs/libX11/libX11-1.6.0.ebuild
@@ -12,7 +12,7 @@
 
 DESCRIPTION="X.Org X11 library"
 
-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 ~arm-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 ~arm-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.8.1
diff --git a/x11-libs/libXScrnSaver/libXScrnSaver-1.2.1.ebuild b/x11-libs/libXScrnSaver/libXScrnSaver-1.2.1.ebuild
index 2206206..43236b2 100644
--- a/x11-libs/libXScrnSaver/libXScrnSaver-1.2.1.ebuild
+++ b/x11-libs/libXScrnSaver/libXScrnSaver-1.2.1.ebuild
@@ -6,7 +6,7 @@
 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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-libs/libXau/libXau-1.0.6.ebuild b/x11-libs/libXau/libXau-1.0.6.ebuild
index a54271e..afc75a8 100644
--- a/x11-libs/libXau/libXau-1.0.6.ebuild
+++ b/x11-libs/libXau/libXau-1.0.6.ebuild
@@ -7,7 +7,7 @@
 
 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 ~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-1.0.9.ebuild b/x11-libs/libXaw/libXaw-1.0.9.ebuild
index ef95f66..0d65936 100644
--- a/x11-libs/libXaw/libXaw-1.0.9.ebuild
+++ b/x11-libs/libXaw/libXaw-1.0.9.ebuild
@@ -7,7 +7,7 @@
 
 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 ~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="doc"
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-libs/libXcursor/libXcursor-1.1.14.ebuild b/x11-libs/libXcursor/libXcursor-1.1.14.ebuild
index 29b5c47..6e9418c 100644
--- a/x11-libs/libXcursor/libXcursor-1.1.14.ebuild
+++ b/x11-libs/libXcursor/libXcursor-1.1.14.ebuild
@@ -9,7 +9,7 @@
 
 DESCRIPTION="X.Org Xcursor library"
 
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-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 ~arm-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-1.1.3.ebuild b/x11-libs/libXdamage/libXdamage-1.1.3.ebuild
index 9328bac..4d65c57 100644
--- a/x11-libs/libXdamage/libXdamage-1.1.3.ebuild
+++ b/x11-libs/libXdamage/libXdamage-1.1.3.ebuild
@@ -7,7 +7,7 @@
 
 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 ~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-1.1.0.ebuild b/x11-libs/libXdmcp/libXdmcp-1.1.0.ebuild
index 40b0f2f..11bba9c 100644
--- a/x11-libs/libXdmcp/libXdmcp-1.1.0.ebuild
+++ b/x11-libs/libXdmcp/libXdmcp-1.1.0.ebuild
@@ -7,7 +7,7 @@
 
 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 ~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="doc"
 
 RDEPEND="x11-proto/xproto"
diff --git a/x11-libs/libXext/libXext-1.3.2.ebuild b/x11-libs/libXext/libXext-1.3.2.ebuild
index f379d2f..9917e79 100644
--- a/x11-libs/libXext/libXext-1.3.2.ebuild
+++ b/x11-libs/libXext/libXext-1.3.2.ebuild
@@ -10,7 +10,7 @@
 
 DESCRIPTION="X.Org Xext library"
 
-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 ~arm-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 ~arm-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-5.0.1.ebuild b/x11-libs/libXfixes/libXfixes-5.0.1.ebuild
index ceaf6f5..996dd1d 100644
--- a/x11-libs/libXfixes/libXfixes-5.0.1.ebuild
+++ b/x11-libs/libXfixes/libXfixes-5.0.1.ebuild
@@ -9,7 +9,7 @@
 
 DESCRIPTION="X.Org Xfixes library"
 
-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 ~arm-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 ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-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-1.4.4.ebuild b/x11-libs/libXfont/libXfont-1.4.4.ebuild
index 06437fa..0f339d2 100644
--- a/x11-libs/libXfont/libXfont-1.4.4.ebuild
+++ b/x11-libs/libXfont/libXfont-1.4.4.ebuild
@@ -9,7 +9,7 @@
 
 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 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="ipv6"
 
 RDEPEND="x11-libs/xtrans
diff --git a/x11-libs/libXft/libXft-2.2.0.ebuild b/x11-libs/libXft/libXft-2.2.0.ebuild
index 27650f6..4a02805 100644
--- a/x11-libs/libXft/libXft-2.2.0.ebuild
+++ b/x11-libs/libXft/libXft-2.2.0.ebuild
@@ -7,7 +7,7 @@
 
 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 ~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-1.7.1.901.ebuild b/x11-libs/libXi/libXi-1.7.1.901.ebuild
index d02b259..9980fa7 100644
--- a/x11-libs/libXi/libXi-1.7.1.901.ebuild
+++ b/x11-libs/libXi/libXi-1.7.1.901.ebuild
@@ -9,7 +9,7 @@
 inherit xorg-2
 
 DESCRIPTION="X.Org Xi library"
-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 ~arm-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 ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-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.4.99.1
diff --git a/x11-libs/libXinerama/libXinerama-1.1.3.ebuild b/x11-libs/libXinerama/libXinerama-1.1.3.ebuild
index f94382d..68bab71 100644
--- a/x11-libs/libXinerama/libXinerama-1.1.3.ebuild
+++ b/x11-libs/libXinerama/libXinerama-1.1.3.ebuild
@@ -9,7 +9,7 @@
 
 DESCRIPTION="X.Org Xinerama library"
 
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-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 ~arm-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-1.1.0.ebuild b/x11-libs/libXmu/libXmu-1.1.0.ebuild
index 4ca1d74..18b0972 100644
--- a/x11-libs/libXmu/libXmu-1.1.0.ebuild
+++ b/x11-libs/libXmu/libXmu-1.1.0.ebuild
@@ -7,7 +7,7 @@
 
 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 ~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="doc ipv6"
 
 RDEPEND="x11-libs/libXt
diff --git a/x11-libs/libXpm/libXpm-3.5.9.ebuild b/x11-libs/libXpm/libXpm-3.5.9.ebuild
index 6d715b1..22cc2bc 100644
--- a/x11-libs/libXpm/libXpm-3.5.9.ebuild
+++ b/x11-libs/libXpm/libXpm-3.5.9.ebuild
@@ -7,7 +7,7 @@
 
 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 ~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-1.4.1.ebuild b/x11-libs/libXrandr/libXrandr-1.4.1.ebuild
index 1db12ab..4ac4728 100644
--- a/x11-libs/libXrandr/libXrandr-1.4.1.ebuild
+++ b/x11-libs/libXrandr/libXrandr-1.4.1.ebuild
@@ -9,7 +9,7 @@
 
 DESCRIPTION="X.Org Xrandr library"
 
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-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 ~arm-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-0.9.8.ebuild b/x11-libs/libXrender/libXrender-0.9.8.ebuild
index dbcd86d..ee2ebf6 100644
--- a/x11-libs/libXrender/libXrender-0.9.8.ebuild
+++ b/x11-libs/libXrender/libXrender-0.9.8.ebuild
@@ -9,7 +9,7 @@
 
 DESCRIPTION="X.Org Xrender library"
 
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-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/libXt/libXt-1.1.4.ebuild b/x11-libs/libXt/libXt-1.1.4.ebuild
index 11ce051..c3865fd 100644
--- a/x11-libs/libXt/libXt-1.1.4.ebuild
+++ b/x11-libs/libXt/libXt-1.1.4.ebuild
@@ -9,7 +9,7 @@
 
 DESCRIPTION="X.Org Xt library"
 
-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 ~arm-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 ~arm-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-1.2.0.ebuild b/x11-libs/libXtst/libXtst-1.2.0.ebuild
index f648970..de658e5 100644
--- a/x11-libs/libXtst/libXtst-1.2.0.ebuild
+++ b/x11-libs/libXtst/libXtst-1.2.0.ebuild
@@ -7,7 +7,7 @@
 
 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 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="doc"
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-libs/libXv/libXv-1.0.9.ebuild b/x11-libs/libXv/libXv-1.0.9.ebuild
index 88b1fe9..a6a3bd1 100644
--- a/x11-libs/libXv/libXv-1.0.9.ebuild
+++ b/x11-libs/libXv/libXv-1.0.9.ebuild
@@ -9,7 +9,7 @@
 
 DESCRIPTION="X.Org Xv library"
 
-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 ~arm-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 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-libs/libXvMC/libXvMC-1.0.8.ebuild b/x11-libs/libXvMC/libXvMC-1.0.8.ebuild
index 81fe882..1780e67 100644
--- a/x11-libs/libXvMC/libXvMC-1.0.8.ebuild
+++ b/x11-libs/libXvMC/libXvMC-1.0.8.ebuild
@@ -9,7 +9,7 @@
 
 DESCRIPTION="X.Org XvMC library"
 
-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"
+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/libXxf86vm/libXxf86vm-1.1.3.ebuild b/x11-libs/libXxf86vm/libXxf86vm-1.1.3.ebuild
index 65f3dbb..9dad9b9 100644
--- a/x11-libs/libXxf86vm/libXxf86vm-1.1.3.ebuild
+++ b/x11-libs/libXxf86vm/libXxf86vm-1.1.3.ebuild
@@ -9,7 +9,7 @@
 
 DESCRIPTION="X.Org Xxf86vm library"
 
-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 ~arm-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 ~arm-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/libfontenc/libfontenc-1.1.0.ebuild b/x11-libs/libfontenc/libfontenc-1.1.0.ebuild
index f697cd4..36758fd 100644
--- a/x11-libs/libfontenc/libfontenc-1.1.0.ebuild
+++ b/x11-libs/libfontenc/libfontenc-1.1.0.ebuild
@@ -7,7 +7,7 @@
 
 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 ~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/libvdpau/libvdpau-0.5.ebuild b/x11-libs/libvdpau/libvdpau-0.5.ebuild
index 2efa783..bb6ac9f 100644
--- a/x11-libs/libvdpau/libvdpau-0.5.ebuild
+++ b/x11-libs/libvdpau/libvdpau-0.5.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="doc dri"
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-libs/libxcb/libxcb-1.9.1.ebuild b/x11-libs/libxcb/libxcb-1.9.1.ebuild
index 976b98b..e8a1aa6 100644
--- a/x11-libs/libxcb/libxcb-1.9.1.ebuild
+++ b/x11-libs/libxcb/libxcb-1.9.1.ebuild
@@ -14,7 +14,7 @@
 [[ ${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 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="selinux xkb"
 
 RDEPEND="dev-libs/libpthread-stubs
diff --git a/x11-libs/libxkbfile/libxkbfile-1.0.7.ebuild b/x11-libs/libxkbfile/libxkbfile-1.0.7.ebuild
index 851fc5c..140cb31 100644
--- a/x11-libs/libxkbfile/libxkbfile-1.0.7.ebuild
+++ b/x11-libs/libxkbfile/libxkbfile-1.0.7.ebuild
@@ -7,7 +7,7 @@
 
 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 ~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 ~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/pixman/pixman-0.28.2.ebuild b/x11-libs/pixman/pixman-0.28.2.ebuild
index 5f8e5cb..09d82e6 100644
--- a/x11-libs/pixman/pixman-0.28.2.ebuild
+++ b/x11-libs/pixman/pixman-0.28.2.ebuild
@@ -8,7 +8,7 @@
 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 ~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"
+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 mmxext neon sse2"
 
 src_configure() {
diff --git a/x11-libs/xcb-util-image/xcb-util-image-0.3.8.ebuild b/x11-libs/xcb-util-image/xcb-util-image-0.3.8.ebuild
index 977ebe4..7e5f21f 100644
--- a/x11-libs/xcb-util-image/xcb-util-image-0.3.8.ebuild
+++ b/x11-libs/xcb-util-image/xcb-util-image-0.3.8.ebuild
@@ -15,7 +15,7 @@
 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 ~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-0.3.8.ebuild b/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.3.8.ebuild
index 8f312c3..cf5f9b7 100644
--- a/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.3.8.ebuild
+++ b/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.3.8.ebuild
@@ -15,7 +15,7 @@
 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 ~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-0.3.8.ebuild b/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.8.ebuild
index e1b86d5..072ca10 100644
--- a/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.8.ebuild
+++ b/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.8.ebuild
@@ -15,7 +15,7 @@
 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 ~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-0.3.8.ebuild b/x11-libs/xcb-util-wm/xcb-util-wm-0.3.8.ebuild
index b6014b4..f731785 100644
--- a/x11-libs/xcb-util-wm/xcb-util-wm-0.3.8.ebuild
+++ b/x11-libs/xcb-util-wm/xcb-util-wm-0.3.8.ebuild
@@ -15,7 +15,7 @@
 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 ~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-0.3.8.ebuild b/x11-libs/xcb-util/xcb-util-0.3.8.ebuild
index 01daca8..2f2b774 100644
--- a/x11-libs/xcb-util/xcb-util-0.3.8.ebuild
+++ b/x11-libs/xcb-util/xcb-util-0.3.8.ebuild
@@ -15,7 +15,7 @@
 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 ~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-1.2.6.ebuild b/x11-libs/xtrans/xtrans-1.2.6.ebuild
index 6a83b34..1e719e5 100644
--- a/x11-libs/xtrans/xtrans-1.2.6.ebuild
+++ b/x11-libs/xtrans/xtrans-1.2.6.ebuild
@@ -10,7 +10,7 @@
 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 ~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="doc"
 
 RDEPEND=""
diff --git a/x11-misc/makedepend/makedepend-1.0.3.ebuild b/x11-misc/makedepend/makedepend-1.0.3.ebuild
index 78ca9bd..21b66c4 100644
--- a/x11-misc/makedepend/makedepend-1.0.3.ebuild
+++ b/x11-misc/makedepend/makedepend-1.0.3.ebuild
@@ -7,7 +7,7 @@
 inherit xorg-2
 
 DESCRIPTION="create dependencies in makefiles"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x64-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 ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/x11-misc/read-edid/read-edid-1.4.2.ebuild b/x11-misc/read-edid/read-edid-1.4.2.ebuild
index 4e81237..266c0cf 100644
--- a/x11-misc/read-edid/read-edid-1.4.2.ebuild
+++ b/x11-misc/read-edid/read-edid-1.4.2.ebuild
@@ -8,7 +8,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ppc ~sparc x86"
+KEYWORDS="alpha amd64 ppc sparc x86"
 IUSE=""
 DEPEND=""
 RDEPEND=""
diff --git a/x11-misc/shared-mime-info/shared-mime-info-0.90.ebuild b/x11-misc/shared-mime-info/shared-mime-info-0.90.ebuild
index c57efa0..ec6e8bb 100644
--- a/x11-misc/shared-mime-info/shared-mime-info-0.90.ebuild
+++ b/x11-misc/shared-mime-info/shared-mime-info-0.90.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-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 ~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=""
 
 RDEPEND=">=dev-libs/glib-2.6:2
diff --git a/x11-misc/util-macros/util-macros-1.17.ebuild b/x11-misc/util-macros/util-macros-1.17.ebuild
index d7f4760..d8de8bc 100644
--- a/x11-misc/util-macros/util-macros-1.17.ebuild
+++ b/x11-misc/util-macros/util-macros-1.17.ebuild
@@ -8,7 +8,7 @@
 EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/util/macros"
 DESCRIPTION="X.Org autotools utility macros"
 
-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"
+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=""
diff --git a/x11-misc/x11vnc/x11vnc-0.9.13-r1.ebuild b/x11-misc/x11vnc/x11vnc-0.9.13-r1.ebuild
index 8ce82e2..5a0fefe 100644
--- a/x11-misc/x11vnc/x11vnc-0.9.13-r1.ebuild
+++ b/x11-misc/x11vnc/x11vnc-0.9.13-r1.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="avahi crypt fbcon +jpeg ssl system-libvncserver threads tk xinerama +zlib"
 
 RDEPEND="system-libvncserver? ( >=net-libs/libvncserver-0.9.7[threads=,jpeg=,zlib=] )
diff --git a/x11-misc/xbitmaps/xbitmaps-1.1.1.ebuild b/x11-misc/xbitmaps/xbitmaps-1.1.1.ebuild
index da34522..76ddf46 100644
--- a/x11-misc/xbitmaps/xbitmaps-1.1.1.ebuild
+++ b/x11-misc/xbitmaps/xbitmaps-1.1.1.ebuild
@@ -9,7 +9,7 @@
 inherit xorg-2
 
 DESCRIPTION="X.Org bitmaps data"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~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 ~ppc-aix ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND=""
diff --git a/x11-proto/bigreqsproto/bigreqsproto-1.1.1.ebuild b/x11-proto/bigreqsproto/bigreqsproto-1.1.1.ebuild
index 51dd665..79c8a53 100644
--- a/x11-proto/bigreqsproto/bigreqsproto-1.1.1.ebuild
+++ b/x11-proto/bigreqsproto/bigreqsproto-1.1.1.ebuild
@@ -7,7 +7,7 @@
 
 DESCRIPTION="X.Org BigReqs protocol headers"
 
-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"
+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"
 IUSE="doc"
 
 RDEPEND=""
diff --git a/x11-proto/compositeproto/compositeproto-0.4.2.ebuild b/x11-proto/compositeproto/compositeproto-0.4.2.ebuild
index 4c1d250..5b2bff6 100644
--- a/x11-proto/compositeproto/compositeproto-0.4.2.ebuild
+++ b/x11-proto/compositeproto/compositeproto-0.4.2.ebuild
@@ -7,7 +7,7 @@
 
 DESCRIPTION="X.Org Composite protocol headers"
 
-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 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/x11-proto/damageproto/damageproto-1.2.1.ebuild b/x11-proto/damageproto/damageproto-1.2.1.ebuild
index 9d7dd79..f7173fd 100644
--- a/x11-proto/damageproto/damageproto-1.2.1.ebuild
+++ b/x11-proto/damageproto/damageproto-1.2.1.ebuild
@@ -7,7 +7,7 @@
 
 DESCRIPTION="X.Org Damage protocol headers"
 
-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"
+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"
 IUSE=""
 
 RDEPEND=""
diff --git a/x11-proto/dri2proto/dri2proto-2.6.ebuild b/x11-proto/dri2proto/dri2proto-2.6.ebuild
index 390ce83..8fb0556 100644
--- a/x11-proto/dri2proto/dri2proto-2.6.ebuild
+++ b/x11-proto/dri2proto/dri2proto-2.6.ebuild
@@ -6,7 +6,7 @@
 
 DESCRIPTION="X.Org DRI2 protocol headers"
 
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 RDEPEND=""
 DEPEND="${RDEPEND}"
diff --git a/x11-proto/fixesproto/fixesproto-5.0.ebuild b/x11-proto/fixesproto/fixesproto-5.0.ebuild
index 500c715..420cf86 100644
--- a/x11-proto/fixesproto/fixesproto-5.0.ebuild
+++ b/x11-proto/fixesproto/fixesproto-5.0.ebuild
@@ -7,7 +7,7 @@
 
 DESCRIPTION="X.Org Fixes protocol headers"
 
-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 ~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-proto/xextproto-7.0.99.1"
diff --git a/x11-proto/fontsproto/fontsproto-2.1.1.ebuild b/x11-proto/fontsproto/fontsproto-2.1.1.ebuild
index 61ca3f7..e9ffc6d 100644
--- a/x11-proto/fontsproto/fontsproto-2.1.1.ebuild
+++ b/x11-proto/fontsproto/fontsproto-2.1.1.ebuild
@@ -7,7 +7,7 @@
 
 DESCRIPTION="X.Org Fonts protocol headers"
 
-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 ~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="doc"
 
 RDEPEND=""
diff --git a/x11-proto/glproto/glproto-1.4.14-r1.ebuild b/x11-proto/glproto/glproto-1.4.14-r1.ebuild
index caead6a..b710710 100644
--- a/x11-proto/glproto/glproto-1.4.14-r1.ebuild
+++ b/x11-proto/glproto/glproto-1.4.14-r1.ebuild
@@ -5,7 +5,7 @@
 EAPI=4
 inherit xorg-2
 DESCRIPTION="X.Org GL protocol headers"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~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 ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 LICENSE="SGI-B-2.0"
 IUSE=""
 
diff --git a/x11-proto/glproto/glproto-1.4.14.ebuild b/x11-proto/glproto/glproto-1.4.14.ebuild
index 45fb5c3..ac6401f 100644
--- a/x11-proto/glproto/glproto-1.4.14.ebuild
+++ b/x11-proto/glproto/glproto-1.4.14.ebuild
@@ -9,7 +9,7 @@
 
 DESCRIPTION="X.Org GL protocol headers"
 
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x64-freebsd ~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 ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 LICENSE="SGI-B-2.0"
 IUSE=""
 
diff --git a/x11-proto/inputproto/inputproto-2.3.ebuild b/x11-proto/inputproto/inputproto-2.3.ebuild
index cfcbabd..07efe11 100644
--- a/x11-proto/inputproto/inputproto-2.3.ebuild
+++ b/x11-proto/inputproto/inputproto-2.3.ebuild
@@ -9,7 +9,7 @@
 
 DESCRIPTION="X.Org Input protocol headers"
 
-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 ~arm-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 ~arm-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-proto/kbproto/kbproto-1.0.5.ebuild b/x11-proto/kbproto/kbproto-1.0.5.ebuild
index 37ed122..fe8978b 100644
--- a/x11-proto/kbproto/kbproto-1.0.5.ebuild
+++ b/x11-proto/kbproto/kbproto-1.0.5.ebuild
@@ -7,7 +7,7 @@
 
 DESCRIPTION="X.Org KB protocol headers"
 
-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 ~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=""
diff --git a/x11-proto/randrproto/randrproto-1.4.0-r1.ebuild b/x11-proto/randrproto/randrproto-1.4.0-r1.ebuild
index 641be4a..063f915 100644
--- a/x11-proto/randrproto/randrproto-1.4.0-r1.ebuild
+++ b/x11-proto/randrproto/randrproto-1.4.0-r1.ebuild
@@ -9,7 +9,7 @@
 
 DESCRIPTION="X.Org Randr protocol headers"
 
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-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 ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND=""
diff --git a/x11-proto/recordproto/recordproto-1.14.1.ebuild b/x11-proto/recordproto/recordproto-1.14.1.ebuild
index 2f4a8ec..cde0d04 100644
--- a/x11-proto/recordproto/recordproto-1.14.1.ebuild
+++ b/x11-proto/recordproto/recordproto-1.14.1.ebuild
@@ -7,7 +7,7 @@
 
 DESCRIPTION="X.Org Record protocol headers"
 
-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 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="doc"
 
 RDEPEND="!<x11-libs/libXtst-1.0.99.2"
diff --git a/x11-proto/renderproto/renderproto-0.11.1.ebuild b/x11-proto/renderproto/renderproto-0.11.1.ebuild
index bcb3beb..c80edf9 100644
--- a/x11-proto/renderproto/renderproto-0.11.1.ebuild
+++ b/x11-proto/renderproto/renderproto-0.11.1.ebuild
@@ -8,7 +8,7 @@
 
 DESCRIPTION="X.Org Render protocol headers"
 
-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 ~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=""
diff --git a/x11-proto/resourceproto/resourceproto-1.2.0.ebuild b/x11-proto/resourceproto/resourceproto-1.2.0.ebuild
index 7e002ed..1aef54c 100644
--- a/x11-proto/resourceproto/resourceproto-1.2.0.ebuild
+++ b/x11-proto/resourceproto/resourceproto-1.2.0.ebuild
@@ -7,7 +7,7 @@
 
 DESCRIPTION="X.Org Resource protocol headers"
 
-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 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/x11-proto/scrnsaverproto/scrnsaverproto-1.2.1.ebuild b/x11-proto/scrnsaverproto/scrnsaverproto-1.2.1.ebuild
index 5537a0d..765e1b9 100644
--- a/x11-proto/scrnsaverproto/scrnsaverproto-1.2.1.ebuild
+++ b/x11-proto/scrnsaverproto/scrnsaverproto-1.2.1.ebuild
@@ -7,7 +7,7 @@
 
 DESCRIPTION="X.Org ScrnSaver protocol headers"
 
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~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 ~ppc-aix ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc"
 
 RDEPEND="!<x11-libs/libXScrnSaver-1.2"
diff --git a/x11-proto/trapproto/trapproto-3.4.3.ebuild b/x11-proto/trapproto/trapproto-3.4.3.ebuild
index 1c68907..473e3af 100644
--- a/x11-proto/trapproto/trapproto-3.4.3.ebuild
+++ b/x11-proto/trapproto/trapproto-3.4.3.ebuild
@@ -9,7 +9,7 @@
 
 DESCRIPTION="X.Org Trap protocol headers"
 
-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 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 RDEPEND=""
 DEPEND="${RDEPEND}"
diff --git a/x11-proto/videoproto/videoproto-2.3.1.ebuild b/x11-proto/videoproto/videoproto-2.3.1.ebuild
index 3d0620a..2ec996c 100644
--- a/x11-proto/videoproto/videoproto-2.3.1.ebuild
+++ b/x11-proto/videoproto/videoproto-2.3.1.ebuild
@@ -8,7 +8,7 @@
 
 DESCRIPTION="X.Org Video protocol headers"
 
-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 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/x11-proto/xcmiscproto/xcmiscproto-1.2.1.ebuild b/x11-proto/xcmiscproto/xcmiscproto-1.2.1.ebuild
index e3d2b3a..584cdb9 100644
--- a/x11-proto/xcmiscproto/xcmiscproto-1.2.1.ebuild
+++ b/x11-proto/xcmiscproto/xcmiscproto-1.2.1.ebuild
@@ -7,7 +7,7 @@
 
 DESCRIPTION="X.Org XCMisc protocol headers"
 
-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"
+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"
 IUSE="doc"
 
 RDEPEND=""
diff --git a/x11-proto/xf86bigfontproto/xf86bigfontproto-1.2.0.ebuild b/x11-proto/xf86bigfontproto/xf86bigfontproto-1.2.0.ebuild
index 325d7ff..c02cba1 100644
--- a/x11-proto/xf86bigfontproto/xf86bigfontproto-1.2.0.ebuild
+++ b/x11-proto/xf86bigfontproto/xf86bigfontproto-1.2.0.ebuild
@@ -7,7 +7,7 @@
 
 DESCRIPTION="X.Org XF86BigFont protocol headers"
 
-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 ~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=""
 
 RDEPEND=""
diff --git a/x11-proto/xf86dgaproto/xf86dgaproto-2.1.ebuild b/x11-proto/xf86dgaproto/xf86dgaproto-2.1.ebuild
index c08297f..839db0a 100644
--- a/x11-proto/xf86dgaproto/xf86dgaproto-2.1.ebuild
+++ b/x11-proto/xf86dgaproto/xf86dgaproto-2.1.ebuild
@@ -6,7 +6,7 @@
 
 DESCRIPTION="X.Org XF86DGA protocol headers"
 
-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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 IUSE=""
 
 RDEPEND="!<x11-libs/libXxf86dga-1.0.99.1"
diff --git a/x11-proto/xf86driproto/xf86driproto-2.1.1.ebuild b/x11-proto/xf86driproto/xf86driproto-2.1.1.ebuild
index 80ab650..4ae54c0 100644
--- a/x11-proto/xf86driproto/xf86driproto-2.1.1.ebuild
+++ b/x11-proto/xf86driproto/xf86driproto-2.1.1.ebuild
@@ -8,7 +8,7 @@
 
 DESCRIPTION="X.Org XF86DRI protocol headers"
 
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x64-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 ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/x11-proto/xf86rushproto/xf86rushproto-1.1.2-r1.ebuild b/x11-proto/xf86rushproto/xf86rushproto-1.1.2-r1.ebuild
index ff7b02f..dab984e 100644
--- a/x11-proto/xf86rushproto/xf86rushproto-1.1.2-r1.ebuild
+++ b/x11-proto/xf86rushproto/xf86rushproto-1.1.2-r1.ebuild
@@ -7,7 +7,7 @@
 
 DESCRIPTION="X.Org XF86Rush protocol headers"
 
-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"
+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=""
diff --git a/x11-proto/xf86vidmodeproto/xf86vidmodeproto-2.3.1.ebuild b/x11-proto/xf86vidmodeproto/xf86vidmodeproto-2.3.1.ebuild
index 7845f03..a145166 100644
--- a/x11-proto/xf86vidmodeproto/xf86vidmodeproto-2.3.1.ebuild
+++ b/x11-proto/xf86vidmodeproto/xf86vidmodeproto-2.3.1.ebuild
@@ -8,7 +8,7 @@
 
 DESCRIPTION="X.Org XF86VidMode protocol headers"
 
-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 ~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/libXxf86vm-1.0.99.1"
diff --git a/x11-proto/xineramaproto/xineramaproto-1.2.1.ebuild b/x11-proto/xineramaproto/xineramaproto-1.2.1.ebuild
index ee85c7f..1bbab66 100644
--- a/x11-proto/xineramaproto/xineramaproto-1.2.1.ebuild
+++ b/x11-proto/xineramaproto/xineramaproto-1.2.1.ebuild
@@ -8,7 +8,7 @@
 
 DESCRIPTION="X.Org Xinerama protocol headers"
 
-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 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="!<x11-libs/libXinerama-1.0.99.1"
diff --git a/x11-proto/xproto/xproto-7.0.23-r1.ebuild b/x11-proto/xproto/xproto-7.0.23-r1.ebuild
index f551904..e498434 100644
--- a/x11-proto/xproto/xproto-7.0.23-r1.ebuild
+++ b/x11-proto/xproto/xproto-7.0.23-r1.ebuild
@@ -8,7 +8,7 @@
 inherit xorg-2
 
 DESCRIPTION="X.Org xproto protocol headers"
-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"
+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=""