Merge updates from master

author: Repository QA checks <repo-qa-checks@gentoo.org> 2016-06-25 20:22:15 +0000
committer: Repository QA checks <repo-qa-checks@gentoo.org> 2016-06-25 20:22:15 +0000
commit: 3405e2002aca3292f7892d8b0ae8693f36388d84 (patch)
tree: 89910324a998d095f4cad7b1856fdb80c10e254e
parent: 2016-06-25 20:02:15 UTC (diff)
parent: mail-mta/exim: x86 stable wrt bug #585212 (diff)
download: gentoo-3405e2002aca3292f7892d8b0ae8693f36388d84.tar.gz
gentoo-3405e2002aca3292f7892d8b0ae8693f36388d84.tar.bz2
gentoo-3405e2002aca3292f7892d8b0ae8693f36388d84.zip
285 files changed, 287 insertions, 287 deletions
diff --git a/app-admin/ansible/ansible-1.9.6.ebuild b/app-admin/ansible/ansible-1.9.6.ebuild
index 78fe2eaac8d9..0822e4ad50d3 100644
--- a/app-admin/ansible/ansible-1.9.6.ebuild
+++ b/app-admin/ansible/ansible-1.9.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~x64-macos"
+KEYWORDS="amd64 x86 ~x64-macos"
 IUSE="test"
 
 RDEPEND="
diff --git a/app-admin/emacs-updater/emacs-updater-1.15.ebuild b/app-admin/emacs-updater/emacs-updater-1.15.ebuild
index 0ff9de5dc573..bd9d7698b733 100644
--- a/app-admin/emacs-updater/emacs-updater-1.15.ebuild
+++ b/app-admin/emacs-updater/emacs-updater-1.15.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
 
 LICENSE="GPL-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 ~x64-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 ~x64-macos ~x86-macos"
 
 DEPEND="|| ( sys-apps/util-linux app-misc/getopt )"
 RDEPEND="${DEPEND}
diff --git a/app-admin/keepassx/keepassx-2.0.2.ebuild b/app-admin/keepassx/keepassx-2.0.2.ebuild
index a47d31ea8aa4..4ec4363269d1 100644
--- a/app-admin/keepassx/keepassx-2.0.2.ebuild
+++ b/app-admin/keepassx/keepassx-2.0.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.keepassx.org/releases/${PV}/${P}.tar.gz"
 
 LICENSE="|| ( GPL-2 GPL-3 ) BSD GPL-2 LGPL-2.1 LGPL-3+ CC0-1.0 public-domain || ( LGPL-2.1 GPL-3 )"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 DEPEND="
diff --git a/app-admin/monit/monit-5.17.1.ebuild b/app-admin/monit/monit-5.17.1.ebuild
index 637c00f254c9..3b708512d894 100644
--- a/app-admin/monit/monit-5.17.1.ebuild
+++ b/app-admin/monit/monit-5.17.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://mmonit.com/monit/dist/${P}.tar.gz"
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux"
 IUSE="libressl pam ssl"
 
 RDEPEND="
diff --git a/app-admin/puppetdb/puppetdb-4.0.2.ebuild b/app-admin/puppetdb/puppetdb-4.0.2.ebuild
index 39e8d8f33a3a..ff235d67b550 100644
--- a/app-admin/puppetdb/puppetdb-4.0.2.ebuild
+++ b/app-admin/puppetdb/puppetdb-4.0.2.ebuild
@@ -14,7 +14,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
 # will need the same keywords as puppet
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND+=">=virtual/jdk-1.7.0"
 DEPEND+=""
diff --git a/app-admin/python-updater/python-updater-0.14.ebuild b/app-admin/python-updater/python-updater-0.14.ebuild
index 97e7b1205f8b..c8b266716f05 100644
--- a/app-admin/python-updater/python-updater-0.14.ebuild
+++ b/app-admin/python-updater/python-updater-0.14.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="git://anongit.gentoo.org/proj/python-updater.git"
 else
 	SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm ~arm64 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 ~arm64 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"
 fi
 
 LICENSE="GPL-2"
diff --git a/app-admin/syslog-ng/syslog-ng-3.7.3.ebuild b/app-admin/syslog-ng/syslog-ng-3.7.3.ebuild
index f13f6b4b53b0..31f2e1c5deb2 100644
--- a/app-admin/syslog-ng/syslog-ng-3.7.3.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.7.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
 IUSE="amqp caps dbi geoip ipv6 json libressl mongodb pacct python redis smtp spoof-source systemd tcpd"
 RESTRICT="test"
 
diff --git a/app-admin/testdisk/testdisk-7.0-r3.ebuild b/app-admin/testdisk/testdisk-7.0-r3.ebuild
index 09e41998596c..4c1eff58e3d9 100644
--- a/app-admin/testdisk/testdisk-7.0-r3.ebuild
+++ b/app-admin/testdisk/testdisk-7.0-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.cgsecurity.org/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~ppc x86"
 IUSE="ewf jpeg ntfs reiserfs static qt4"
 
 REQUIRED_USE="static? ( !qt4 )"
diff --git a/app-admin/tripwire/tripwire-2.4.3.1.ebuild b/app-admin/tripwire/tripwire-2.4.3.1.ebuild
index d3a756379a21..0f36d529b45c 100644
--- a/app-admin/tripwire/tripwire-2.4.3.1.ebuild
+++ b/app-admin/tripwire/tripwire-2.4.3.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/Tripwire/tripwire-open-source/archive/${PV}.tar.gz -
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
 IUSE="libressl ssl static +tools"
 
 DEPEND="sys-devel/automake
diff --git a/app-admin/ulogd/ulogd-2.0.5_p20160205.ebuild b/app-admin/ulogd/ulogd-2.0.5_p20160205.ebuild
index 2e6d24e0691d..30076ab4eadd 100644
--- a/app-admin/ulogd/ulogd-2.0.5_p20160205.ebuild
+++ b/app-admin/ulogd/ulogd-2.0.5_p20160205.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://git.netfilter.org/${PN}2/snapshot/${COMMIT_ID}.tar.gz -> ${P}.t
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ~ppc ~x86"
+KEYWORDS="amd64 ~ia64 ~ppc x86"
 IUSE="dbi doc json mysql nfacct +nfct +nflog pcap postgres sqlite -ulog"
 
 RDEPEND="
diff --git a/app-antivirus/clamav/clamav-0.99.ebuild b/app-antivirus/clamav/clamav-0.99.ebuild
index b4253878b714..2be417959576 100644
--- a/app-antivirus/clamav/clamav-0.99.ebuild
+++ b/app-antivirus/clamav/clamav-0.99.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="bzip2 clamdtop iconv ipv6 libressl milter metadata-analysis-api selinux static-libs uclibc"
 
 CDEPEND="bzip2? ( app-arch/bzip2 )
diff --git a/app-arch/lrzip/lrzip-0.621.ebuild b/app-arch/lrzip/lrzip-0.621.ebuild
index 3ef4df2580b2..a575634ca0fe 100644
--- a/app-arch/lrzip/lrzip-0.621.ebuild
+++ b/app-arch/lrzip/lrzip-0.621.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://ck.kolivas.org/apps/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND="dev-libs/lzo
diff --git a/app-arch/lziprecover/lziprecover-1.17.ebuild b/app-arch/lziprecover/lziprecover-1.17.ebuild
index 22834d7923bf..80c1eefb40d1 100644
--- a/app-arch/lziprecover/lziprecover-1.17.ebuild
+++ b/app-arch/lziprecover/lziprecover-1.17.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.nongnu.org/lzip/lziprecover.html"
 SRC_URI="http://download.savannah.gnu.org/releases-noredirect/lzip/${PN}/${P/_/-}.tar.gz"
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 S="${WORKDIR}/${P/_/-}"
diff --git a/app-backup/dar/dar-2.4.20.ebuild b/app-backup/dar/dar-2.4.20.ebuild
index e22dcc1b45a9..f0ed4bec0e13 100644
--- a/app-backup/dar/dar-2.4.20.ebuild
+++ b/app-backup/dar/dar-2.4.20.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/dar/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~ppc ~sparc x86 ~amd64-linux"
 IUSE="acl dar32 dar64 doc gcrypt lzo nls static static-libs"
 
 RESTRICT="test" # need to be run as root
diff --git a/app-benchmarks/bonnie++/bonnie++-1.97-r1.ebuild b/app-benchmarks/bonnie++/bonnie++-1.97-r1.ebuild
index c224b6ea9598..9e50f097cfd2 100644
--- a/app-benchmarks/bonnie++/bonnie++-1.97-r1.ebuild
+++ b/app-benchmarks/bonnie++/bonnie++-1.97-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.coker.com.au/bonnie++/experimental/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE="debug"
 
 S="${WORKDIR}/${P}.1"
diff --git a/app-benchmarks/jmeter/jmeter-2.0.1-r6.ebuild b/app-benchmarks/jmeter/jmeter-2.0.1-r6.ebuild
index dc9d348d9c86..9d9b3b759726 100644
--- a/app-benchmarks/jmeter/jmeter-2.0.1-r6.ebuild
+++ b/app-benchmarks/jmeter/jmeter-2.0.1-r6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/jakarta/jmeter/source/jakarta-${P}_src.tgz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="beanshell"
 
diff --git a/app-cdr/cdlabelgen/cdlabelgen-4.1.0.ebuild b/app-cdr/cdlabelgen/cdlabelgen-4.1.0.ebuild
index fb9973df81a6..146043fe2931 100644
--- a/app-cdr/cdlabelgen/cdlabelgen-4.1.0.ebuild
+++ b/app-cdr/cdlabelgen/cdlabelgen-4.1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.aczoom.com/pub/tools/${P}.tgz"
 
 LICENSE="aczoom"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~sparc x86"
 IUSE=""
 
 RDEPEND="dev-lang/perl"
diff --git a/app-cdr/cdrtools/cdrtools-3.02_alpha06.ebuild b/app-cdr/cdrtools/cdrtools-3.02_alpha06.ebuild
index 72de3d804cf6..3608ee09bfe8 100644
--- a/app-cdr/cdrtools/cdrtools-3.02_alpha06.ebuild
+++ b/app-cdr/cdrtools/cdrtools-3.02_alpha06.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/$([[ -z ${PV/*_alpha*} ]] && echo 'alpha')/$
 
 LICENSE="GPL-2 LGPL-2.1 CDDL-Schily"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="acl caps nls unicode"
 
 RDEPEND="acl? ( virtual/acl )
diff --git a/app-cdr/gtkcdlabel/gtkcdlabel-1.14-r1.ebuild b/app-cdr/gtkcdlabel/gtkcdlabel-1.14-r1.ebuild
index a7a0282c8a0c..b4386117ec62 100644
--- a/app-cdr/gtkcdlabel/gtkcdlabel-1.14-r1.ebuild
+++ b/app-cdr/gtkcdlabel/gtkcdlabel-1.14-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~sparc x86"
 IUSE=""
 
 DEPEND="${PYTHON_DEPS}
diff --git a/app-crypt/stoken/stoken-0.90.ebuild b/app-crypt/stoken/stoken-0.90.ebuild
index 48c7ad8f3f2f..45b9016db2bb 100644
--- a/app-crypt/stoken/stoken-0.90.ebuild
+++ b/app-crypt/stoken/stoken-0.90.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/cernekee/${PN}/archive/v${PV}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE="gtk"
 
 RDEPEND="
diff --git a/app-crypt/xca/xca-1.3.2.ebuild b/app-crypt/xca/xca-1.3.2.ebuild
index 4452a3ade97b..9718780ebd6f 100644
--- a/app-crypt/xca/xca-1.3.2.ebuild
+++ b/app-crypt/xca/xca-1.3.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="bindist"
 
 RDEPEND=">=dev-libs/openssl-0.9.8:*[bindist=]
diff --git a/app-emacs/ess/ess-15.09.2.ebuild b/app-emacs/ess/ess-15.09.2.ebuild
index f5da2760fa1d..4ad18643fad2 100644
--- a/app-emacs/ess/ess-15.09.2.ebuild
+++ b/app-emacs/ess/ess-15.09.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://ess.r-project.org/downloads/ess/${MY_P}.tgz"
 
 LICENSE="GPL-2+ GPL-3+ Texinfo-manual"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~x86-macos"
 
 DEPEND="app-text/texi2html
 	virtual/latex-base"
diff --git a/app-emulation/free42/free42-1.5.7.ebuild b/app-emulation/free42/free42-1.5.7.ebuild
index 87aadb6938a5..64e5733fbaaf 100644
--- a/app-emulation/free42/free42-1.5.7.ebuild
+++ b/app-emulation/free42/free42-1.5.7.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="alsa"
 
 DEPEND="dev-libs/atk
diff --git a/app-emulation/wine/wine-1.8.2.ebuild b/app-emulation/wine/wine-1.8.2.ebuild
index 7b61b8599ef1..64a4bc515f55 100644
--- a/app-emulation/wine/wine-1.8.2.ebuild
+++ b/app-emulation/wine/wine-1.8.2.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MAJOR_V=$(get_version_component_range 1-2)
 	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}/${P}.tar.bz2"
-	KEYWORDS="-* amd64 ~x86 ~x86-fbsd"
+	KEYWORDS="-* amd64 x86 ~x86-fbsd"
 fi
 
 GV="2.40"
diff --git a/app-eselect/eselect-python/eselect-python-20140125-r1.ebuild b/app-eselect/eselect-python/eselect-python-20140125-r1.ebuild
index 5413bc0a1706..34f355ab18b0 100644
--- a/app-eselect/eselect-python/eselect-python-20140125-r1.ebuild
+++ b/app-eselect/eselect-python/eselect-python-20140125-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "99999999" ]] ; then
 else
 	SRC_URI="mirror://gentoo/${P}.tar.bz2
 		https://dev.gentoo.org/~floppym/dist/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm ~arm64 ~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 ~arm64 ~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"
 fi
 
 DESCRIPTION="Eselect module for management of multiple Python versions"
diff --git a/app-i18n/scim-hangul/scim-hangul-0.4.0.ebuild b/app-i18n/scim-hangul/scim-hangul-0.4.0.ebuild
index dbe58e0202dd..68e7bb369c7a 100644
--- a/app-i18n/scim-hangul/scim-hangul-0.4.0.ebuild
+++ b/app-i18n/scim-hangul/scim-hangul-0.4.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/scim/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="nls"
 
 RDEPEND="|| ( >=app-i18n/scim-0.99.8 >=app-i18n/scim-cvs-0.99.8 )
diff --git a/app-i18n/tomoe/tomoe-0.6.0-r2.ebuild b/app-i18n/tomoe/tomoe-0.6.0-r2.ebuild
index 1be99073c6b2..7617563ddd61 100644
--- a/app-i18n/tomoe/tomoe-0.6.0-r2.ebuild
+++ b/app-i18n/tomoe/tomoe-0.6.0-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/tomoe/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc hyperestraier mysql ruby python static-libs subversion"
 
 RDEPEND=">=dev-libs/glib-2.4
diff --git a/app-misc/media-player-info/media-player-info-22.ebuild b/app-misc/media-player-info/media-player-info-22.ebuild
index cdc3fb16f765..66ac5fb40daa 100644
--- a/app-misc/media-player-info/media-player-info-22.ebuild
+++ b/app-misc/media-player-info/media-player-info-22.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86"
 IUSE=""
 
 # https://cgit.freedesktop.org/media-player-info/commit/?id=d83dd01a0a1df6198ee08954da1c033b88a1004b
diff --git a/app-misc/pax-utils/pax-utils-1.1.6.ebuild b/app-misc/pax-utils/pax-utils-1.1.6.ebuild
index 9ae82259c0b1..9b412a09e1af 100644
--- a/app-misc/pax-utils/pax-utils-1.1.6.ebuild
+++ b/app-misc/pax-utils/pax-utils-1.1.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="caps debug python seccomp"
 
 RDEPEND="caps? ( >=sys-libs/libcap-2.24 )
diff --git a/app-misc/rox-filer/rox-filer-2.11.ebuild b/app-misc/rox-filer/rox-filer-2.11.ebuild
index 2580a95e6752..2d37d7517cc1 100644
--- a/app-misc/rox-filer/rox-filer-2.11.ebuild
+++ b/app-misc/rox-filer/rox-filer-2.11.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/rox/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 COMMON_DEPEND="dev-lang/perl
diff --git a/app-misc/vifm/vifm-0.8.1a.ebuild b/app-misc/vifm/vifm-0.8.1a.ebuild
index c01550ff3ba8..5c69cc7f79e0 100644
--- a/app-misc/vifm/vifm-0.8.1a.ebuild
+++ b/app-misc/vifm/vifm-0.8.1a.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/vifm/${PF}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~s390 ~x86"
+KEYWORDS="amd64 ~ppc ~s390 x86"
 IUSE="X developer +extended-keys gtk +magic vim vim-syntax"
 
 DEPEND="
diff --git a/app-office/scribus/scribus-1.4.6.ebuild b/app-office/scribus/scribus-1.4.6.ebuild
index e164b14eb3b4..01b33b619734 100644
--- a/app-office/scribus/scribus-1.4.6.ebuild
+++ b/app-office/scribus/scribus-1.4.6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~sparc x86"
 IUSE="cairo debug examples hunspell +minimal +pdf scripts templates tk"
 
 # a=$(ls resources/translations/po/scribus.*ts | sed -e 's:\.: :g' | awk '{print $2}'); echo ${a}
diff --git a/app-pda/gtkpod/gtkpod-2.1.5.ebuild b/app-pda/gtkpod/gtkpod-2.1.5.ebuild
index ae6768050f6c..ccba0391c04e 100644
--- a/app-pda/gtkpod/gtkpod-2.1.5.ebuild
+++ b/app-pda/gtkpod/gtkpod-2.1.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2 FDL-1.2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="aac clutter curl cdr flac gstreamer mp3 vorbis"
 REQUIRED_USE="cdr? ( gstreamer )"
diff --git a/app-portage/eix/eix-0.31.7-r1.ebuild b/app-portage/eix/eix-0.31.7-r1.ebuild
index d4c4de445221..951a10543d4b 100644
--- a/app-portage/eix/eix-0.31.7-r1.ebuild
+++ b/app-portage/eix/eix-0.31.7-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~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 ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~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"
 IUSE="debug +dep doc nls optimization +required-use security strong-optimization strong-security sqlite swap-remote tools"
 
 BOTHDEPEND="sqlite? ( >=dev-db/sqlite-3 )
diff --git a/app-portage/euscan/euscan-0.1.1-r1.ebuild b/app-portage/euscan/euscan-0.1.1-r1.ebuild
index ad9be0c4bb0b..5a5b97a38f2b 100644
--- a/app-portage/euscan/euscan-0.1.1-r1.ebuild
+++ b/app-portage/euscan/euscan-0.1.1-r1.ebuild
@@ -17,7 +17,7 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
 
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
 DEPEND="sys-apps/portage[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}
diff --git a/app-shells/fish/fish-2.2.0.ebuild b/app-shells/fish/fish-2.2.0.ebuild
index 0344da26cc9c..f58abc2b1810 100644
--- a/app-shells/fish/fish-2.2.0.ebuild
+++ b/app-shells/fish/fish-2.2.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://fishshell.com/files/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="X"
 
 DEPEND="sys-libs/ncurses
diff --git a/app-shells/ksh/ksh-93.20140625.ebuild b/app-shells/ksh/ksh-93.20140625.ebuild
index a40bec9c5a06..7487bf2ebb80 100644
--- a/app-shells/ksh/ksh-93.20140625.ebuild
+++ b/app-shells/ksh/ksh-93.20140625.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://dev.gentoo.org/~floppym/distfiles/INIT.${KSH_PV}.tgz
 
 LICENSE="CPL-1.0 EPL-1.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="!app-shells/pdksh"
diff --git a/app-text/apvlv/apvlv-0.1.5-r1.ebuild b/app-text/apvlv/apvlv-0.1.5-r1.ebuild
index 6cb1648af4a1..a65bf3231d6a 100644
--- a/app-text/apvlv/apvlv-0.1.5-r1.ebuild
+++ b/app-text/apvlv/apvlv-0.1.5-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/naihe2010/apvlv/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug djvu"
 
 RDEPEND="
diff --git a/app-text/asciidoc/asciidoc-8.6.9-r2.ebuild b/app-text/asciidoc/asciidoc-8.6.9-r2.ebuild
index 1500c794d238..8ef0b50751a6 100644
--- a/app-text/asciidoc/asciidoc-8.6.9-r2.ebuild
+++ b/app-text/asciidoc/asciidoc-8.6.9-r2.ebuild
@@ -11,7 +11,7 @@ inherit readme.gentoo python-single-r1
 DESCRIPTION="AsciiDoc is a plain text human readable/writable document format"
 HOMEPAGE="http://asciidoc.org/"
 SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.gz"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-text/jabref-bin/jabref-bin-3.2.ebuild b/app-text/jabref-bin/jabref-bin-3.2.ebuild
index a0697bdae81a..1689acd45a39 100644
--- a/app-text/jabref-bin/jabref-bin-3.2.ebuild
+++ b/app-text/jabref-bin/jabref-bin-3.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/jabref/JabRef-${MY_PV}.jar"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="|| ( >=virtual/jre-1.8 >=virtual/jdk-1.8 )"
 
diff --git a/app-text/libebook/libebook-0.1.2-r1.ebuild b/app-text/libebook/libebook-0.1.2-r1.ebuild
index 124e93e4dfe4..ac516acf21ce 100644
--- a/app-text/libebook/libebook-0.1.2-r1.ebuild
+++ b/app-text/libebook/libebook-0.1.2-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="doc test"
 
 RDEPEND="
diff --git a/app-text/po4a/po4a-0.45-r3.ebuild b/app-text/po4a/po4a-0.45-r3.ebuild
index 6b0a9c349f6d..90cbd8fc376e 100644
--- a/app-text/po4a/po4a-0.45-r3.ebuild
+++ b/app-text/po4a/po4a-0.45-r3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://debian/pool/main/p/po4a/${PN}_${PV}.orig.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="dev-perl/SGMLSpm
diff --git a/app-text/sdcv/sdcv-0.5.0_beta2.ebuild b/app-text/sdcv/sdcv-0.5.0_beta2.ebuild
index acf402f684ab..e3e8bb748310 100644
--- a/app-text/sdcv/sdcv-0.5.0_beta2.ebuild
+++ b/app-text/sdcv/sdcv-0.5.0_beta2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_PF}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="nls"
 
 RDEPEND="sys-libs/zlib
diff --git a/app-text/txt2tags/txt2tags-2.6-r1.ebuild b/app-text/txt2tags/txt2tags-2.6-r1.ebuild
index da89e6fa6372..b2b8bed81632 100644
--- a/app-text/txt2tags/txt2tags-2.6-r1.ebuild
+++ b/app-text/txt2tags/txt2tags-2.6-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://${PN}.googlecode.com/files/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
 IUSE="emacs tk vim-syntax"
 
 DEPEND="${PYTHON_DEPS}
diff --git a/app-text/xchm/xchm-1.23-r1.ebuild b/app-text/xchm/xchm-1.23-r1.ebuild
index e3322f118fdd..2ebcf1dd2d6e 100644
--- a/app-text/xchm/xchm-1.23-r1.ebuild
+++ b/app-text/xchm/xchm-1.23-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/xchm/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 
 IUSE=""
 DEPEND=">=dev-libs/chmlib-0.36
diff --git a/dev-cpp/asio/asio-1.4.8-r1.ebuild b/dev-cpp/asio/asio-1.4.8-r1.ebuild
index 9781e5a3ab0a..f9b44ebd34a2 100644
--- a/dev-cpp/asio/asio-1.4.8-r1.ebuild
+++ b/dev-cpp/asio/asio-1.4.8-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="Boost-1.0"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="doc examples ssl test"
 
 RDEPEND="ssl? ( dev-libs/openssl )
diff --git a/dev-cpp/tree/tree-2.81.ebuild b/dev-cpp/tree/tree-2.81.ebuild
index 3049fdcf1189..ab255039fa7c 100644
--- a/dev-cpp/tree/tree-2.81.ebuild
+++ b/dev-cpp/tree/tree-2.81.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.aei.mpg.de/~peekas/tree/${P}.tar.gz"
 
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="doc"
 
 S="${S}"/src
diff --git a/dev-db/pgagent/pgagent-3.4.0-r1.ebuild b/dev-db/pgagent/pgagent-3.4.0-r1.ebuild
index 33bb6eb84ac0..60a7f6ba55f7 100644
--- a/dev-db/pgagent/pgagent-3.4.0-r1.ebuild
+++ b/dev-db/pgagent/pgagent-3.4.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit cmake-utils eutils wxwidgets
 
 MY_PN=${PN/a/A}
 
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DESCRIPTION="${MY_PN} is a job scheduler for PostgreSQL"
 HOMEPAGE="http://www.pgadmin.org/download/pgagent.php"
diff --git a/dev-games/cegui/cegui-0.8.7.ebuild b/dev-games/cegui/cegui-0.8.7.ebuild
index 3b1b2c854b8e..a5ed55f903e1 100644
--- a/dev-games/cegui/cegui-0.8.7.ebuild
+++ b/dev-games/cegui/cegui-0.8.7.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/crayzedsgui/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 -ppc ~x86"
+KEYWORDS="amd64 -ppc x86"
 IUSE="bidi debug devil doc freeimage expat irrlicht lua ogre opengl pcre python static-libs tinyxml truetype xerces-c +xml zip"
 REQUIRED_USE="|| ( expat tinyxml xerces-c xml )
 	${PYTHON_REQUIRED_USE}" # bug 362223
diff --git a/dev-games/newton/newton-3.13.ebuild b/dev-games/newton/newton-3.13.ebuild
index 2c0d0b7f1be5..e174b438c67d 100644
--- a/dev-games/newton/newton-3.13.ebuild
+++ b/dev-games/newton/newton-3.13.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/MADEAPPS/newton-dynamics/archive/${P}.zip"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-lang/blassic/blassic-0.10.3.ebuild b/dev-lang/blassic/blassic-0.10.3.ebuild
index ff081a9de249..1dde1460ba59 100644
--- a/dev-lang/blassic/blassic-0.10.3.ebuild
+++ b/dev-lang/blassic/blassic-0.10.3.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="http://blassic.net"
 SRC_URI="http://blassic.net/bin/${P}.tgz"
 
 LICENSE="GPL-2+"
-KEYWORDS="amd64 ~hppa ~ppc ~x86 ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~hppa ~ppc x86 ~x86-linux ~ppc-macos ~x86-macos"
 SLOT="0"
 IUSE="X"
 
diff --git a/dev-lang/clojure/clojure-1.8.0.ebuild b/dev-lang/clojure/clojure-1.8.0.ebuild
index 4e3a65e13ff2..8c7a2702b751 100644
--- a/dev-lang/clojure/clojure-1.8.0.ebuild
+++ b/dev-lang/clojure/clojure-1.8.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/clojure/clojure/tarball/${P} -> ${P}.tar.gz"
 
 LICENSE="EPL-1.0 Apache-2.0 BSD"
 SLOT="1.8"
-KEYWORDS="amd64 ~x86 ~x86-linux"
+KEYWORDS="amd64 x86 ~x86-linux"
 IUSE=""
 RESTRICT="test" # patches welcome to fix the test
 
diff --git a/dev-lang/erlang/erlang-18.3.ebuild b/dev-lang/erlang/erlang-18.3.ebuild
index b1d5b70b7155..031d5c1f3d5b 100644
--- a/dev-lang/erlang/erlang-18.3.ebuild
+++ b/dev-lang/erlang/erlang-18.3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="http://www.erlang.org/download/otp_src_${PV}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE="compat-ethread doc emacs halfword hipe java kpoll libressl odbc smp sctp ssl systemd tk wxwidgets"
 
 RDEPEND="
diff --git a/dev-lang/nasm/nasm-2.12.01.ebuild b/dev-lang/nasm/nasm-2.12.01.ebuild
index df9d219f1da0..e371cf4501d9 100644
--- a/dev-lang/nasm/nasm-2.12.01.ebuild
+++ b/dev-lang/nasm/nasm-2.12.01.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.nasm.us/pub/nasm/releasebuilds/${PV/_}/${P/_}.tar.xz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~ia64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="doc"
 
 DEPEND="dev-lang/perl
diff --git a/dev-libs/UTF8Strings/UTF8Strings-1.14.2.ebuild b/dev-libs/UTF8Strings/UTF8Strings-1.14.2.ebuild
index a28428ee7c1f..1d612755a932 100644
--- a/dev-libs/UTF8Strings/UTF8Strings-1.14.2.ebuild
+++ b/dev-libs/UTF8Strings/UTF8Strings-1.14.2.ebuild
@@ -11,5 +11,5 @@ HOMEPAGE="http://grigory.info/${PN}.About.html"
 SRC_URI="http://grigory.info/distfiles/${P}.tar.bz2"
 
 LICENSE="GPL-3"
-KEYWORDS="amd64 ~mips ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~mips x86 ~amd64-linux ~x86-linux"
 SLOT="0"
diff --git a/dev-libs/beecrypt/beecrypt-4.2.1-r3.ebuild b/dev-libs/beecrypt/beecrypt-4.2.1-r3.ebuild
index d110189a8087..8a1bdaa58023 100644
--- a/dev-libs/beecrypt/beecrypt-4.2.1-r3.ebuild
+++ b/dev-libs/beecrypt/beecrypt-4.2.1-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/beecrypt/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos"
 IUSE="+threads java cxx python static-libs doc"
 
 COMMONDEPEND="!<app-arch/rpm-4.2.1
diff --git a/dev-libs/elfutils/elfutils-0.166.ebuild b/dev-libs/elfutils/elfutils-0.166.ebuild
index 2ce5e57fa21c..786a95706807 100644
--- a/dev-libs/elfutils/elfutils-0.166.ebuild
+++ b/dev-libs/elfutils/elfutils-0.166.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://fedorahosted.org/releases/e/l/${PN}/${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-2-with-exceptions"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="bzip2 lzma nls static-libs test +threads +utils"
 
 # This pkg does not actually seem to compile currently in a uClibc
diff --git a/dev-libs/libffi/libffi-3.2.1.ebuild b/dev-libs/libffi/libffi-3.2.1.ebuild
index fdf643fba829..439a49c73a80 100644
--- a/dev-libs/libffi/libffi-3.2.1.ebuild
+++ b/dev-libs/libffi/libffi-3.2.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://sourceware.org/pub/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 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"
+KEYWORDS="alpha amd64 arm ~arm64 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"
 IUSE="debug pax_kernel static-libs test"
 
 RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r1
diff --git a/dev-libs/librevenge/librevenge-0.0.4.ebuild b/dev-libs/librevenge/librevenge-0.0.4.ebuild
index becb1aed406f..ab8cb2668c98 100644
--- a/dev-libs/librevenge/librevenge-0.0.4.ebuild
+++ b/dev-libs/librevenge/librevenge-0.0.4.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]] ; then
 	KEYWORDS=""
 else
 	SRC_URI="http://sf.net/projects/libwpd/files/${PN}/${P}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ~ppc64 ~x86 ~x86-fbsd"
+	KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ~ppc64 x86 ~x86-fbsd"
 fi
 
 LICENSE="|| ( MPL-2.0 LGPL-2.1 )"
diff --git a/dev-libs/nss/nss-3.23.ebuild b/dev-libs/nss/nss-3.23.ebuild
index 2a63269eb795..8638f73aa8ca 100644
--- a/dev-libs/nss/nss-3.23.ebuild
+++ b/dev-libs/nss/nss-3.23.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/$
 
 LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cacert +nss-pem utils"
 CDEPEND=">=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
 	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/qtkeychain/qtkeychain-0.6.2.ebuild b/dev-libs/qtkeychain/qtkeychain-0.6.2.ebuild
index b4dc2ca8dcd3..241d96b7abed 100644
--- a/dev-libs/qtkeychain/qtkeychain-0.6.2.ebuild
+++ b/dev-libs/qtkeychain/qtkeychain-0.6.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/frankosterfeld/${PN}/archive/v${PV}.tar.gz -> ${P}.t
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+qt4 qt5"
 
 REQUIRED_USE="|| ( qt4 qt5 )"
diff --git a/dev-libs/ustr/ustr-1.0.4-r8.ebuild b/dev-libs/ustr/ustr-1.0.4-r8.ebuild
index 920b3d0c98d4..963be706a6e3 100644
--- a/dev-libs/ustr/ustr-1.0.4-r8.ebuild
+++ b/dev-libs/ustr/ustr-1.0.4-r8.ebuild
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.and.org/pub/james/ustr/${PV}/${P}.tar.bz2"
 
 LICENSE="|| ( BSD-2 MIT LGPL-2 )"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~mips ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 IUSE="static-libs ustr-import"
 
 DOCS=(ChangeLog README README-DEVELOPERS AUTHORS NEWS TODO)
diff --git a/dev-lisp/asdf/asdf-3.1.5.ebuild b/dev-lisp/asdf/asdf-3.1.5.ebuild
index b7f90ee24eef..67803837a61c 100644
--- a/dev-lisp/asdf/asdf-3.1.5.ebuild
+++ b/dev-lisp/asdf/asdf-3.1.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://common-lisp.net/project/${PN}/archives/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="amd64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="doc"
 
 SLOT="0/${PVR}"
diff --git a/dev-lisp/uiop/uiop-3.1.5.ebuild b/dev-lisp/uiop/uiop-3.1.5.ebuild
index 77ff3563304c..69f94e1483b8 100644
--- a/dev-lisp/uiop/uiop-3.1.5.ebuild
+++ b/dev-lisp/uiop/uiop-3.1.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://common-lisp.net/project/asdf/archives/asdf-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="amd64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="~dev-lisp/asdf-${PV}"
diff --git a/dev-perl/Compress-Bzip2/Compress-Bzip2-2.220.0.ebuild b/dev-perl/Compress-Bzip2/Compress-Bzip2-2.220.0.ebuild
index f270e6c89ec9..9eb99e05cb39 100644
--- a/dev-perl/Compress-Bzip2/Compress-Bzip2-2.220.0.ebuild
+++ b/dev-perl/Compress-Bzip2/Compress-Bzip2-2.220.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Interface to Bzip2 compression library"
 
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ~mips ~sparc ~x86 ~ppc-aix"
+KEYWORDS="amd64 ~ia64 ~mips ~sparc x86 ~ppc-aix"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Const-Fast/Const-Fast-0.14.0-r1.ebuild b/dev-perl/Const-Fast/Const-Fast-0.14.0-r1.ebuild
index f5c1648f1fca..c9f884d48367 100644
--- a/dev-perl/Const-Fast/Const-Fast-0.14.0-r1.ebuild
+++ b/dev-perl/Const-Fast/Const-Fast-0.14.0-r1.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Facility for creating read-only scalars, arrays, and hashes"
 
 SLOT="0"
-KEYWORDS="amd64 arm ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~ppc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Mail-Box/Mail-Box-2.118.0.ebuild b/dev-perl/Mail-Box/Mail-Box-2.118.0.ebuild
index c8d3881ff37b..e6a7a70a3671 100644
--- a/dev-perl/Mail-Box/Mail-Box-2.118.0.ebuild
+++ b/dev-perl/Mail-Box/Mail-Box-2.118.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Mail folder manager and MUA backend"
 
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Math-Random/Math-Random-0.720.0.ebuild b/dev-perl/Math-Random/Math-Random-0.720.0.ebuild
index e01173914453..22af1fc8ae94 100644
--- a/dev-perl/Math-Random/Math-Random-0.720.0.ebuild
+++ b/dev-perl/Math-Random/Math-Random-0.720.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Random Number Generators"
 
 LICENSE="( || ( Artistic GPL-2 ) ) public-domain"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 SRC_TEST="do"
diff --git a/dev-perl/Module-Install-AuthorTests/Module-Install-AuthorTests-0.2.0.ebuild b/dev-perl/Module-Install-AuthorTests/Module-Install-AuthorTests-0.2.0.ebuild
index 9be3b11ceb96..c0e91589cbe5 100644
--- a/dev-perl/Module-Install-AuthorTests/Module-Install-AuthorTests-0.2.0.ebuild
+++ b/dev-perl/Module-Install-AuthorTests/Module-Install-AuthorTests-0.2.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Designate tests only run by module authors"
 
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Module-Starter/Module-Starter-1.710.0.ebuild b/dev-perl/Module-Starter/Module-Starter-1.710.0.ebuild
index 47c10e8c0609..a04a04536441 100644
--- a/dev-perl/Module-Starter/Module-Starter-1.710.0.ebuild
+++ b/dev-perl/Module-Starter/Module-Starter-1.710.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="A simple starter kit for any module"
 
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Net-DBus/Net-DBus-1.1.0.ebuild b/dev-perl/Net-DBus/Net-DBus-1.1.0.ebuild
index 3d29fb1077be..e74fcc160307 100644
--- a/dev-perl/Net-DBus/Net-DBus-1.1.0.ebuild
+++ b/dev-perl/Net-DBus/Net-DBus-1.1.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Perl extension for the DBus message system"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~sparc x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Net-Patricia/Net-Patricia-1.220.0.ebuild b/dev-perl/Net-Patricia/Net-Patricia-1.220.0.ebuild
index f5e12614594b..46824424b3ca 100644
--- a/dev-perl/Net-Patricia/Net-Patricia-1.220.0.ebuild
+++ b/dev-perl/Net-Patricia/Net-Patricia-1.220.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Patricia Trie perl module for fast IP address lookups"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="ipv6"
 
 RDEPEND="dev-perl/Net-CIDR-Lite
diff --git a/dev-perl/Net-SSLeay/Net-SSLeay-1.720.0-r1.ebuild b/dev-perl/Net-SSLeay/Net-SSLeay-1.720.0-r1.ebuild
index 46b7ee731c23..b74207c0764b 100644
--- a/dev-perl/Net-SSLeay/Net-SSLeay-1.720.0-r1.ebuild
+++ b/dev-perl/Net-SSLeay/Net-SSLeay-1.720.0-r1.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Perl extension for using OpenSSL"
 
 LICENSE="openssl"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~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"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~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"
 IUSE="libressl test minimal examples"
 
 RDEPEND="
diff --git a/dev-perl/NetAddr-IP/NetAddr-IP-4.78.0.ebuild b/dev-perl/NetAddr-IP/NetAddr-IP-4.78.0.ebuild
index 270bb8e13cff..3cc7b4dfe145 100644
--- a/dev-perl/NetAddr-IP/NetAddr-IP-4.78.0.ebuild
+++ b/dev-perl/NetAddr-IP/NetAddr-IP-4.78.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Manipulation and operations on IP addresses"
 
 SLOT="0"
 LICENSE="|| ( Artistic GPL-2 )"
-KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
 IUSE="ipv6"
 
 RDEPEND="ipv6? ( dev-perl/Socket6 )"
diff --git a/dev-perl/Object-Realize-Later/Object-Realize-Later-0.190.0.ebuild b/dev-perl/Object-Realize-Later/Object-Realize-Later-0.190.0.ebuild
index 906c7c6c2dbf..e0927ca1ce78 100644
--- a/dev-perl/Object-Realize-Later/Object-Realize-Later-0.190.0.ebuild
+++ b/dev-perl/Object-Realize-Later/Object-Realize-Later-0.190.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Delayed creation of objects"
 
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/OpenGL/OpenGL-0.670.400.ebuild b/dev-perl/OpenGL/OpenGL-0.670.400.ebuild
index 6aec392d2072..cd5c370f9a53 100644
--- a/dev-perl/OpenGL/OpenGL-0.670.400.ebuild
+++ b/dev-perl/OpenGL/OpenGL-0.670.400.ebuild
@@ -12,7 +12,7 @@ inherit perl-module eutils
 DESCRIPTION="Perl interface providing graphics display using OpenGL"
 
 SLOT="0"
-KEYWORDS="amd64 arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 RDEPEND="
diff --git a/dev-perl/POE/POE-1.367.ebuild b/dev-perl/POE/POE-1.367.ebuild
index c0bd07363a83..9625c9ff010f 100644
--- a/dev-perl/POE/POE-1.367.ebuild
+++ b/dev-perl/POE/POE-1.367.ebuild
@@ -12,7 +12,7 @@ inherit perl-module
 DESCRIPTION="A framework for creating multitasking programs in Perl"
 
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="ipv6 libwww ncurses tk test"
 
 RDEPEND="
diff --git a/dev-perl/PadWalker/PadWalker-2.200.0.ebuild b/dev-perl/PadWalker/PadWalker-2.200.0.ebuild
index dce96b057dca..4130076fabcf 100644
--- a/dev-perl/PadWalker/PadWalker-2.200.0.ebuild
+++ b/dev-perl/PadWalker/PadWalker-2.200.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="play with other peoples' lexical variables"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 DEPEND="virtual/perl-ExtUtils-MakeMaker"
diff --git a/dev-perl/Pango/Pango-1.227.0.ebuild b/dev-perl/Pango/Pango-1.227.0.ebuild
index a3f657b56988..b51665d2b28d 100644
--- a/dev-perl/Pango/Pango-1.227.0.ebuild
+++ b/dev-perl/Pango/Pango-1.227.0.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Layout and render international text"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples test minimal"
 
 RDEPEND="
diff --git a/dev-perl/Params-Validate/Params-Validate-1.220.0.ebuild b/dev-perl/Params-Validate/Params-Validate-1.220.0.ebuild
index 0dae200f28ae..77c6ff3ccbc8 100644
--- a/dev-perl/Params-Validate/Params-Validate-1.220.0.ebuild
+++ b/dev-perl/Params-Validate/Params-Validate-1.220.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Flexible system for validation of method/function call parameters"
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Perl-Critic/Perl-Critic-1.123.ebuild b/dev-perl/Perl-Critic/Perl-Critic-1.123.ebuild
index 26330fa87670..19db0610a798 100644
--- a/dev-perl/Perl-Critic/Perl-Critic-1.123.ebuild
+++ b/dev-perl/Perl-Critic/Perl-Critic-1.123.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Critique Perl source code for best-practices"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 IUSE="test"
 
 RDEPEND=">=dev-perl/Module-Pluggable-3.1
diff --git a/dev-perl/PerlIO-Layers/PerlIO-Layers-0.11.0.ebuild b/dev-perl/PerlIO-Layers/PerlIO-Layers-0.11.0.ebuild
index cad04da1a8b6..c0975bb39403 100644
--- a/dev-perl/PerlIO-Layers/PerlIO-Layers-0.11.0.ebuild
+++ b/dev-perl/PerlIO-Layers/PerlIO-Layers-0.11.0.ebuild
@@ -12,7 +12,7 @@ inherit perl-module
 DESCRIPTION="Querying your filehandle's capabilities"
 
 SLOT="0"
-KEYWORDS="amd64 arm ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~ppc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 # needs List::Util
diff --git a/dev-perl/PerlIO-gzip/PerlIO-gzip-0.190.0.ebuild b/dev-perl/PerlIO-gzip/PerlIO-gzip-0.190.0.ebuild
index 1177d3d4b165..64bea54b6069 100644
--- a/dev-perl/PerlIO-gzip/PerlIO-gzip-0.190.0.ebuild
+++ b/dev-perl/PerlIO-gzip/PerlIO-gzip-0.190.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="PerlIO layer to gzip/gunzip"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 DEPEND="sys-libs/zlib"
diff --git a/dev-perl/Plucene/Plucene-1.250.0-r2.ebuild b/dev-perl/Plucene/Plucene-1.250.0-r2.ebuild
index 0122df8f1a98..a82e39d78e11 100644
--- a/dev-perl/Plucene/Plucene-1.250.0-r2.ebuild
+++ b/dev-perl/Plucene/Plucene-1.250.0-r2.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Plucene - the Perl lucene port"
 
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Proc-ProcessTable/Proc-ProcessTable-0.530.0.ebuild b/dev-perl/Proc-ProcessTable/Proc-ProcessTable-0.530.0.ebuild
index d63dc4b8c6b4..6349ca95da22 100644
--- a/dev-perl/Proc-ProcessTable/Proc-ProcessTable-0.530.0.ebuild
+++ b/dev-perl/Proc-ProcessTable/Proc-ProcessTable-0.530.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Unix process table information"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE="examples"
 
 PATCHES=(
diff --git a/dev-perl/RPC-XML/RPC-XML-0.790.0.ebuild b/dev-perl/RPC-XML/RPC-XML-0.790.0.ebuild
index 14a7bafdd3ed..18b5226cc5f6 100644
--- a/dev-perl/RPC-XML/RPC-XML-0.790.0.ebuild
+++ b/dev-perl/RPC-XML/RPC-XML-0.790.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="An implementation of XML-RPC"
 
 SLOT="0"
 LICENSE="|| ( Artistic-2 LGPL-2.1 )"
-KEYWORDS="amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
 IUSE="test"
 
 SRC_TEST="do"
diff --git a/dev-perl/SQL-Abstract/SQL-Abstract-1.810.0.ebuild b/dev-perl/SQL-Abstract/SQL-Abstract-1.810.0.ebuild
index ea5e971dca15..22b7f2e66727 100644
--- a/dev-perl/SQL-Abstract/SQL-Abstract-1.810.0.ebuild
+++ b/dev-perl/SQL-Abstract/SQL-Abstract-1.810.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Generate SQL from Perl data structures"
 
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86 ~ppc-aix ~ppc-macos ~x86-solaris"
+KEYWORDS="amd64 ~ppc x86 ~ppc-aix ~ppc-macos ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/SVG/SVG-2.640.0.ebuild b/dev-perl/SVG/SVG-2.640.0.ebuild
index 57ee76ddae7a..090d6ea9b570 100644
--- a/dev-perl/SVG/SVG-2.640.0.ebuild
+++ b/dev-perl/SVG/SVG-2.640.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Perl extension for generating Scalable Vector Graphics (SVG) documents"
 
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Scope-Guard/Scope-Guard-0.210.0.ebuild b/dev-perl/Scope-Guard/Scope-Guard-0.210.0.ebuild
index 968c0e203735..befc4ab5f766 100644
--- a/dev-perl/Scope-Guard/Scope-Guard-0.210.0.ebuild
+++ b/dev-perl/Scope-Guard/Scope-Guard-0.210.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Lexically scoped resource management"
 
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86 ~ppc-aix ~x86-solaris"
+KEYWORDS="amd64 ~ppc x86 ~ppc-aix ~x86-solaris"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-perl/Search-Xapian/Search-Xapian-1.2.23.0.ebuild b/dev-perl/Search-Xapian/Search-Xapian-1.2.23.0.ebuild
index e9961ca1f3d3..9de78d1b8b8e 100644
--- a/dev-perl/Search-Xapian/Search-Xapian-1.2.23.0.ebuild
+++ b/dev-perl/Search-Xapian/Search-Xapian-1.2.23.0.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Perl XS frontend to the Xapian C++ search library"
 
 LICENSE="|| ( Artistic GPL-1 GPL-2 GPL-3 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE="examples"
 
 RDEPEND="dev-libs/xapian:0/1.2.22
diff --git a/dev-perl/Set-Object/Set-Object-1.350.0.ebuild b/dev-perl/Set-Object/Set-Object-1.350.0.ebuild
index 1939c240d19f..3788c258ec39 100644
--- a/dev-perl/Set-Object/Set-Object-1.350.0.ebuild
+++ b/dev-perl/Set-Object/Set-Object-1.350.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="set of objects and strings"
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ~x86"
+KEYWORDS="amd64 ~hppa ~ppc x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Shell/Shell-0.730.0.ebuild b/dev-perl/Shell/Shell-0.730.0.ebuild
index 5549cd823983..de4c59bd5b44 100644
--- a/dev-perl/Shell/Shell-0.730.0.ebuild
+++ b/dev-perl/Shell/Shell-0.730.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Run shell commands transparently within perl"
 
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 RDEPEND="virtual/perl-File-Spec"
diff --git a/dev-perl/Socket6/Socket6-0.270.0.ebuild b/dev-perl/Socket6/Socket6-0.270.0.ebuild
index 0a84233bfd3f..383d5b299cfe 100644
--- a/dev-perl/Socket6/Socket6-0.270.0.ebuild
+++ b/dev-perl/Socket6/Socket6-0.270.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="IPv6 related part of the C socket.h defines and structure manipulat
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 SRC_TEST="do"
diff --git a/dev-perl/Statistics-Descriptive/Statistics-Descriptive-3.61.200.ebuild b/dev-perl/Statistics-Descriptive/Statistics-Descriptive-3.61.200.ebuild
index 4f1c8020de49..fcf340fe4dd3 100644
--- a/dev-perl/Statistics-Descriptive/Statistics-Descriptive-3.61.200.ebuild
+++ b/dev-perl/Statistics-Descriptive/Statistics-Descriptive-3.61.200.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Module of basic descriptive statistical functions"
 
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="test examples"
 
 RDEPEND="
diff --git a/dev-perl/String-CRC32/String-CRC32-1.500.0.ebuild b/dev-perl/String-CRC32/String-CRC32-1.500.0.ebuild
index 889162562fe4..75186782552f 100644
--- a/dev-perl/String-CRC32/String-CRC32-1.500.0.ebuild
+++ b/dev-perl/String-CRC32/String-CRC32-1.500.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Perl interface for cyclic redundancy check generation"
 
 LICENSE="public-domain"
 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 ~x64-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 ~x64-macos ~x86-macos"
 IUSE=""
 
 SRC_TEST=do
diff --git a/dev-perl/Sub-Identify/Sub-Identify-0.120.0.ebuild b/dev-perl/Sub-Identify/Sub-Identify-0.120.0.ebuild
index ef24bfb65c45..0b6913c5f01b 100644
--- a/dev-perl/Sub-Identify/Sub-Identify-0.120.0.ebuild
+++ b/dev-perl/Sub-Identify/Sub-Identify-0.120.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Retrieve names of code references"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Sys-MemInfo/Sys-MemInfo-0.980.0.ebuild b/dev-perl/Sys-MemInfo/Sys-MemInfo-0.980.0.ebuild
index 0ea28713effb..a1d024c7ac61 100644
--- a/dev-perl/Sys-MemInfo/Sys-MemInfo-0.980.0.ebuild
+++ b/dev-perl/Sys-MemInfo/Sys-MemInfo-0.980.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Memory informations"
 
 LICENSE="LGPL-2.1 ${LICENSE}"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~hppa ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 IUSE=""
 
 SRC_TEST=do
diff --git a/dev-perl/Term-ReadLine-Gnu/Term-ReadLine-Gnu-1.310.0.ebuild b/dev-perl/Term-ReadLine-Gnu/Term-ReadLine-Gnu-1.310.0.ebuild
index 1b3356c93612..315cddce65c5 100644
--- a/dev-perl/Term-ReadLine-Gnu/Term-ReadLine-Gnu-1.310.0.ebuild
+++ b/dev-perl/Term-ReadLine-Gnu/Term-ReadLine-Gnu-1.310.0.ebuild
@@ -12,7 +12,7 @@ inherit perl-module
 DESCRIPTION="GNU Readline XS library wrapper"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~sparc x86"
 IUSE=""
 
 RDEPEND=">=sys-libs/readline-6.2:0="
diff --git a/dev-perl/TermReadKey/TermReadKey-2.330.0.ebuild b/dev-perl/TermReadKey/TermReadKey-2.330.0.ebuild
index f120a368a4d0..6c0a78782a7a 100644
--- a/dev-perl/TermReadKey/TermReadKey-2.330.0.ebuild
+++ b/dev-perl/TermReadKey/TermReadKey-2.330.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Change terminal modes, and perform non-blocking reads"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="virtual/perl-ExtUtils-MakeMaker"
diff --git a/dev-perl/Test-Base/Test-Base-0.880.0.ebuild b/dev-perl/Test-Base/Test-Base-0.880.0.ebuild
index b62cf7ff9b5e..a0415512ca0e 100644
--- a/dev-perl/Test-Base/Test-Base-0.880.0.ebuild
+++ b/dev-perl/Test-Base/Test-Base-0.880.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="A Data Driven Testing Framework"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~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 ~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="test"
 
 RDEPEND="
diff --git a/dev-perl/Test-Command/Test-Command-0.110.0.ebuild b/dev-perl/Test-Command/Test-Command-0.110.0.ebuild
index 70005fceccd6..44e1cc12df1c 100644
--- a/dev-perl/Test-Command/Test-Command-0.110.0.ebuild
+++ b/dev-perl/Test-Command/Test-Command-0.110.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Test routines for external commands"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 ~arm ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/Test-Differences/Test-Differences-0.640.0.ebuild b/dev-perl/Test-Differences/Test-Differences-0.640.0.ebuild
index 283a3db8fa79..c488931c507d 100644
--- a/dev-perl/Test-Differences/Test-Differences-0.640.0.ebuild
+++ b/dev-perl/Test-Differences/Test-Differences-0.640.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Test strings and data structures and show differences if not ok"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="alpha amd64 ~arm ~hppa ~ppc ~ppc64 x86"
 IUSE="test"
 PERL_RM_FILES=(
 	"t/boilerplate.t"
diff --git a/dev-perl/Test-DistManifest/Test-DistManifest-1.14.0.ebuild b/dev-perl/Test-DistManifest/Test-DistManifest-1.14.0.ebuild
index 14328cd51d0a..a8d7fcbdc01d 100644
--- a/dev-perl/Test-DistManifest/Test-DistManifest-1.14.0.ebuild
+++ b/dev-perl/Test-DistManifest/Test-DistManifest-1.14.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Author test that validates a package MANIFEST"
 
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Test-LongString/Test-LongString-0.170.0.ebuild b/dev-perl/Test-LongString/Test-LongString-0.170.0.ebuild
index ac84a6643cc9..77bbfd5f01ce 100644
--- a/dev-perl/Test-LongString/Test-LongString-0.170.0.ebuild
+++ b/dev-perl/Test-LongString/Test-LongString-0.170.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="A library to test long strings"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="test"
 
 RDEPEND="virtual/perl-Test-Simple"
diff --git a/dev-perl/Test-Memory-Cycle/Test-Memory-Cycle-1.60.0.ebuild b/dev-perl/Test-Memory-Cycle/Test-Memory-Cycle-1.60.0.ebuild
index 77e1c4c6db69..38d548e6d4f6 100644
--- a/dev-perl/Test-Memory-Cycle/Test-Memory-Cycle-1.60.0.ebuild
+++ b/dev-perl/Test-Memory-Cycle/Test-Memory-Cycle-1.60.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Check for memory leaks and circular memory references"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/Test-MockObject/Test-MockObject-1.201.505.270.ebuild b/dev-perl/Test-MockObject/Test-MockObject-1.201.505.270.ebuild
index 70a057933558..86519ee2528d 100644
--- a/dev-perl/Test-MockObject/Test-MockObject-1.201.505.270.ebuild
+++ b/dev-perl/Test-MockObject/Test-MockObject-1.201.505.270.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Perl extension for emulating troublesome interfaces"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~x86 ~ppc-aix"
+KEYWORDS="amd64 ~arm ~ppc x86 ~ppc-aix"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Test-Number-Delta/Test-Number-Delta-1.60.0.ebuild b/dev-perl/Test-Number-Delta/Test-Number-Delta-1.60.0.ebuild
index 232a4f752e70..7091af7437b4 100644
--- a/dev-perl/Test-Number-Delta/Test-Number-Delta-1.60.0.ebuild
+++ b/dev-perl/Test-Number-Delta/Test-Number-Delta-1.60.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Compare the difference between numbers against a given tolerance"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 
 IUSE="test minimal"
 RDEPEND="
diff --git a/dev-perl/Test-Requires/Test-Requires-0.100.0.ebuild b/dev-perl/Test-Requires/Test-Requires-0.100.0.ebuild
index 9b7b90b80095..52570e6cecea 100644
--- a/dev-perl/Test-Requires/Test-Requires-0.100.0.ebuild
+++ b/dev-perl/Test-Requires/Test-Requires-0.100.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Checks to see if the module can be loaded"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=virtual/perl-Test-Simple-0.470.0"
diff --git a/dev-perl/Test-Script/Test-Script-1.100.0.ebuild b/dev-perl/Test-Script/Test-Script-1.100.0.ebuild
index 9f082a89a0c6..1dbb85ed1147 100644
--- a/dev-perl/Test-Script/Test-Script-1.100.0.ebuild
+++ b/dev-perl/Test-Script/Test-Script-1.100.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Cross-platform basic tests for scripts"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/Test-SharedFork/Test-SharedFork-0.350.0.ebuild b/dev-perl/Test-SharedFork/Test-SharedFork-0.350.0.ebuild
index a10c8efc1316..ea8e259777ec 100644
--- a/dev-perl/Test-SharedFork/Test-SharedFork-0.350.0.ebuild
+++ b/dev-perl/Test-SharedFork/Test-SharedFork-0.350.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="fork test"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Test-Spec/Test-Spec-0.510.0.ebuild b/dev-perl/Test-Spec/Test-Spec-0.510.0.ebuild
index a337d60a8329..75a037244851 100644
--- a/dev-perl/Test-Spec/Test-Spec-0.510.0.ebuild
+++ b/dev-perl/Test-Spec/Test-Spec-0.510.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION='Write tests in a declarative specification style'
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/Test-Warn/Test-Warn-0.300.0-r1.ebuild b/dev-perl/Test-Warn/Test-Warn-0.300.0-r1.ebuild
index 521e706bfdf5..66e22f34c8eb 100644
--- a/dev-perl/Test-Warn/Test-Warn-0.300.0-r1.ebuild
+++ b/dev-perl/Test-Warn/Test-Warn-0.300.0-r1.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Perl extension to test methods for warnings"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 
 IUSE="test"
 
diff --git a/dev-perl/Text-Diff/Text-Diff-1.440.0.ebuild b/dev-perl/Text-Diff/Text-Diff-1.440.0.ebuild
index 1dc762e73618..3077ec19ec9c 100644
--- a/dev-perl/Text-Diff/Text-Diff-1.440.0.ebuild
+++ b/dev-perl/Text-Diff/Text-Diff-1.440.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Perform diffs on files and record sets"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-php/pecl-imagick/pecl-imagick-3.4.1.ebuild b/dev-php/pecl-imagick/pecl-imagick-3.4.1.ebuild
index 07373eb89a29..1db4f53c5426 100644
--- a/dev-php/pecl-imagick/pecl-imagick-3.4.1.ebuild
+++ b/dev-php/pecl-imagick/pecl-imagick-3.4.1.ebuild
@@ -10,7 +10,7 @@ USE_PHP="php5-5 php5-6 php7-0"
 
 inherit php-ext-pecl-r2
 
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DESCRIPTION="PHP wrapper for the ImageMagick library"
 LICENSE="PHP-3.01"
diff --git a/dev-python/cffi/cffi-1.5.2.ebuild b/dev-python/cffi/cffi-1.5.2.ebuild
index 957d1e37e050..961bf517e2a9 100644
--- a/dev-python/cffi/cffi-1.5.2.ebuild
+++ b/dev-python/cffi/cffi-1.5.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 arm arm64 ~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"
+KEYWORDS="alpha amd64 arm arm64 ~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"
 IUSE="doc test"
 
 RDEPEND="
diff --git a/dev-python/glance_store/glance_store-0.9.2.ebuild b/dev-python/glance_store/glance_store-0.9.2.ebuild
index 69b52c6d6e6c..592121e3fc47 100644
--- a/dev-python/glance_store/glance_store-0.9.2.ebuild
+++ b/dev-python/glance_store/glance_store-0.9.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="+cinder +swift"
 
 CDEPEND=">=dev-python/pbr-1.3[${PYTHON_USEDEP}]"
diff --git a/dev-python/lxml/lxml-3.5.0.ebuild b/dev-python/lxml/lxml-3.5.0.ebuild
index 64901bc4acfe..98494b7c6ac2 100644
--- a/dev-python/lxml/lxml-3.5.0.ebuild
+++ b/dev-python/lxml/lxml-3.5.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD ElementTree GPL-2 PSF-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples +threads test"
 
 # Note: lib{xml2,xslt} are used as C libraries, not Python modules.
diff --git a/dev-python/pretty-yaml/pretty-yaml-15.6.3.ebuild b/dev-python/pretty-yaml/pretty-yaml-15.6.3.ebuild
index 2c7fc9b06036..81058ec4a0a8 100644
--- a/dev-python/pretty-yaml/pretty-yaml-15.6.3.ebuild
+++ b/dev-python/pretty-yaml/pretty-yaml-15.6.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="WTFPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~x86"
+KEYWORDS="amd64 arm x86"
 IUSE="test"
 
 RDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
diff --git a/dev-python/pycups/pycups-1.9.73.ebuild b/dev-python/pycups/pycups-1.9.73.ebuild
index f9892822c4ac..987cf2c547c2 100644
--- a/dev-python/pycups/pycups-1.9.73.ebuild
+++ b/dev-python/pycups/pycups-1.9.73.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://cyberelk.net/tim/data/pycups/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86"
 SLOT="0"
 IUSE="doc examples"
 
diff --git a/dev-python/pygal/pygal-2.1.1.ebuild b/dev-python/pygal/pygal-2.1.1.ebuild
index f51b00d4b137..66f1a7403c36 100644
--- a/dev-python/pygal/pygal-2.1.1.ebuild
+++ b/dev-python/pygal/pygal-2.1.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest/pytest-2.8.7.ebuild b/dev-python/pytest/pytest-2.8.7.ebuild
index c022d54e908f..7833f8fa9320 100644
--- a/dev-python/pytest/pytest-2.8.7.ebuild
+++ b/dev-python/pytest/pytest-2.8.7.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc test"
 
 # When bumping, please check setup.py for the proper py version
diff --git a/dev-python/python-glanceclient/python-glanceclient-1.1.1.ebuild b/dev-python/python-glanceclient/python-glanceclient-1.1.1.ebuild
index 97afe6611a0d..de48ad893c1a 100644
--- a/dev-python/python-glanceclient/python-glanceclient-1.1.1.ebuild
+++ b/dev-python/python-glanceclient/python-glanceclient-1.1.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 REQUIRED_USE="test? ( doc )"
 
diff --git a/dev-python/python-musicbrainz-ngs/python-musicbrainz-ngs-0.6.ebuild b/dev-python/python-musicbrainz-ngs/python-musicbrainz-ngs-0.6.ebuild
index 2941ec8a22a1..ff043762c574 100644
--- a/dev-python/python-musicbrainz-ngs/python-musicbrainz-ngs-0.6.ebuild
+++ b/dev-python/python-musicbrainz-ngs/python-musicbrainz-ngs-0.6.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/alastair/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_PN}$
 
 LICENSE="BSD-2 ISC"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc examples test"
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-python/tinycss/tinycss-0.3.ebuild b/dev-python/tinycss/tinycss-0.3.ebuild
index 5921bfb4254e..423b1dcb9520 100644
--- a/dev-python/tinycss/tinycss-0.3.ebuild
+++ b/dev-python/tinycss/tinycss-0.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]"
diff --git a/dev-python/wheel/wheel-0.29.0.ebuild b/dev-python/wheel/wheel-0.29.0.ebuild
index 7e7403795579..4a1e69bc8226 100644
--- a/dev-python/wheel/wheel-0.29.0.ebuild
+++ b/dev-python/wheel/wheel-0.29.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
 IUSE="doc test"
 
 RDEPEND="dev-python/jsonschema[${PYTHON_USEDEP}]"
diff --git a/dev-python/xcffib/xcffib-0.4.0.ebuild b/dev-python/xcffib/xcffib-0.4.0.ebuild
index cc367b8c899c..ace74873d298 100644
--- a/dev-python/xcffib/xcffib-0.4.0.ebuild
+++ b/dev-python/xcffib/xcffib-0.4.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/tych0/xcffib"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 COMMON_DEPEND="x11-libs/libxcb"
diff --git a/dev-ruby/eventmachine/eventmachine-1.0.9.1.ebuild b/dev-ruby/eventmachine/eventmachine-1.0.9.1.ebuild
index be953b465afa..3bb4ecdf6593 100644
--- a/dev-ruby/eventmachine/eventmachine-1.0.9.1.ebuild
+++ b/dev-ruby/eventmachine/eventmachine-1.0.9.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="http://rubyeventmachine.com"
 
 LICENSE="|| ( GPL-2 Ruby )"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="${DEPEND}
diff --git a/dev-ruby/httpclient/httpclient-2.7.1.ebuild b/dev-ruby/httpclient/httpclient-2.7.1.ebuild
index 7aa52b2bfd85..a6312e715aba 100644
--- a/dev-ruby/httpclient/httpclient-2.7.1.ebuild
+++ b/dev-ruby/httpclient/httpclient-2.7.1.ebuild
@@ -24,7 +24,7 @@ SRC_URI="https://github.com/nahi/httpclient/archive/v${PV}.tar.gz -> ${P}.tgz"
 LICENSE="Ruby"
 SLOT="0"
 
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="${RDEPEND}
diff --git a/dev-ruby/metaclass/metaclass-0.0.4.ebuild b/dev-ruby/metaclass/metaclass-0.0.4.ebuild
index fdb2e2e02343..54cfde979d6d 100644
--- a/dev-ruby/metaclass/metaclass-0.0.4.ebuild
+++ b/dev-ruby/metaclass/metaclass-0.0.4.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/floehopper/metaclass"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~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 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/netrc/netrc-0.11.0.ebuild b/dev-ruby/netrc/netrc-0.11.0.ebuild
index a3ea2e073e43..936ee84886ae 100644
--- a/dev-ruby/netrc/netrc-0.11.0.ebuild
+++ b/dev-ruby/netrc/netrc-0.11.0.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="This library reads and writes .netrc files"
 HOMEPAGE="https://github.com/geemus/netrc"
 LICENSE="MIT"
 
-KEYWORDS="amd64 ~x86 ~arm"
+KEYWORDS="amd64 ~arm x86"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/puppetdb-termini/puppetdb-termini-3.2.3.ebuild b/dev-ruby/puppetdb-termini/puppetdb-termini-3.2.3.ebuild
index 5f316ffe9053..cd52617d1397 100644
--- a/dev-ruby/puppetdb-termini/puppetdb-termini-3.2.3.ebuild
+++ b/dev-ruby/puppetdb-termini/puppetdb-termini-3.2.3.ebuild
@@ -16,7 +16,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
 # will need the same keywords as puppet
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 
 RDEPEND+=""
 DEPEND+=""
diff --git a/dev-ruby/ruby-shadow/ruby-shadow-2.5.0.ebuild b/dev-ruby/ruby-shadow/ruby-shadow-2.5.0.ebuild
index 26b8c6ac3fe0..9e678c271b89 100644
--- a/dev-ruby/ruby-shadow/ruby-shadow-2.5.0.ebuild
+++ b/dev-ruby/ruby-shadow/ruby-shadow-2.5.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/apalmblad/ruby-shadow http://ttsky.net"
 
 LICENSE="Ruby"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~hppa ~ppc ~sparc x86"
 IUSE=""
 
 each_ruby_configure() {
diff --git a/dev-ruby/serialport/serialport-1.3.1.ebuild b/dev-ruby/serialport/serialport-1.3.1.ebuild
index 688e634eb9b2..f958a02c9470 100644
--- a/dev-ruby/serialport/serialport-1.3.1.ebuild
+++ b/dev-ruby/serialport/serialport-1.3.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="http://rubyforge.org/projects/ruby-serialport/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/text/text-1.3.1.ebuild b/dev-ruby/text/text-1.3.1.ebuild
index 07206d19ae2b..8525203c9e6e 100644
--- a/dev-ruby/text/text-1.3.1.ebuild
+++ b/dev-ruby/text/text-1.3.1.ebuild
@@ -16,5 +16,5 @@ HOMEPAGE="https://github.com/threedaymonk/text"
 LICENSE="MIT"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE=""
diff --git a/dev-ruby/tzinfo/tzinfo-0.3.44.ebuild b/dev-ruby/tzinfo/tzinfo-0.3.44.ebuild
index f9885230ac4b..f451a03976b4 100644
--- a/dev-ruby/tzinfo/tzinfo-0.3.44.ebuild
+++ b/dev-ruby/tzinfo/tzinfo-0.3.44.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="http://tzinfo.github.io/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~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 ~ppc ~ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-scheme/guile/guile-1.8.8-r2.ebuild b/dev-scheme/guile/guile-1.8.8-r2.ebuild
index 528b4ffad319..7a30420a865d 100644
--- a/dev-scheme/guile/guile-1.8.8-r2.ebuild
+++ b/dev-scheme/guile/guile-1.8.8-r2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/guile/"
 SRC_URI="mirror://gnu/guile/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug debug-freelist debug-malloc +deprecated discouraged emacs networking nls readline +regex +threads"
 
 RESTRICT="!regex? ( test )"
diff --git a/dev-scheme/racket/racket-6.0.1.ebuild b/dev-scheme/racket/racket-6.0.1.ebuild
index 66269f099366..e4af1fc485a1 100644
--- a/dev-scheme/racket/racket-6.0.1.ebuild
+++ b/dev-scheme/racket/racket-6.0.1.ebuild
@@ -17,7 +17,7 @@ EGIT_REPO_URI="git://git.racket-lang.org/plt.git"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="doc +futures +jit minimal +places +threads +X"
 REQUIRED_USE="futures? ( jit )"
 
diff --git a/dev-util/android-tools/android-tools-5.1.1_p13.ebuild b/dev-util/android-tools/android-tools-5.1.1_p13.ebuild
index 74a5e88bef27..9708ad4f95d7 100644
--- a/dev-util/android-tools/android-tools-5.1.1_p13.ebuild
+++ b/dev-util/android-tools/android-tools-5.1.1_p13.ebuild
@@ -21,7 +21,7 @@ mirror://gentoo/${MY_P}-f2fs-tools.tar.gz"
 # The entire source code is Apache-2.0, except for fastboot which is BSD-2.
 LICENSE="Apache-2.0 BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~arm-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~arm-linux ~x86-linux"
 IUSE="libressl"
 
 RDEPEND="sys-libs/zlib:=
diff --git a/dev-util/cmocka/cmocka-1.0.1.ebuild b/dev-util/cmocka/cmocka-1.0.1.ebuild
index cfdb12b75bff..8b92d178b15d 100644
--- a/dev-util/cmocka/cmocka-1.0.1.ebuild
+++ b/dev-util/cmocka/cmocka-1.0.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://cmocka.org/files/1.0/${P}.tar.xz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="doc static-libs test"
 
 DEPEND="
diff --git a/dev-util/geany-plugins/geany-plugins-1.25.ebuild b/dev-util/geany-plugins/geany-plugins-1.25.ebuild
index 3c035322a1cd..c3a5d8dafc0d 100644
--- a/dev-util/geany-plugins/geany-plugins-1.25.ebuild
+++ b/dev-util/geany-plugins/geany-plugins-1.25.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://plugins.geany.org/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ~ppc ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 arm ia64 ~ppc ppc64 ~sparc x86"
 IUSE="+autoclose +automark +commander ctags debugger +defineformat devhelp enchant git gpg gtkspell lua markdown multiterm nls +overview python scope soup webkit"
 
 LINGUAS="be ca da de es fr gl ja pt pt_BR ru tr zh_CN"
diff --git a/dev-util/geany/geany-1.25.ebuild b/dev-util/geany/geany-1.25.ebuild
index 2750413bbd59..6e1735a12cb1 100644
--- a/dev-util/geany/geany-1.25.ebuild
+++ b/dev-util/geany/geany-1.25.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://download.geany.org/${P}.tar.bz2"
 
 LICENSE="GPL-2+ HPND"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="gtk3 +vte"
 
 RDEPEND=">=dev-libs/glib-2.28:2
diff --git a/dev-util/pycharm-community/pycharm-community-2016.1.3.ebuild b/dev-util/pycharm-community/pycharm-community-2016.1.3.ebuild
index 488018b93447..b0b68904ae5f 100644
--- a/dev-util/pycharm-community/pycharm-community-2016.1.3.ebuild
+++ b/dev-util/pycharm-community/pycharm-community-2016.1.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
 
 LICENSE="Apache-2.0 BSD CDDL MIT-with-advertising"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=">=virtual/jre-1.8"
diff --git a/dev-util/pycharm-professional/pycharm-professional-2016.1.3.ebuild b/dev-util/pycharm-professional/pycharm-professional-2016.1.3.ebuild
index a357a748b72e..4a3696f327f4 100644
--- a/dev-util/pycharm-professional/pycharm-professional-2016.1.3.ebuild
+++ b/dev-util/pycharm-professional/pycharm-professional-2016.1.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
 
 LICENSE="PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=">=virtual/jre-1.8
diff --git a/dev-util/xxdiff/xxdiff-4.0_beta1_p20110426-r1.ebuild b/dev-util/xxdiff/xxdiff-4.0_beta1_p20110426-r1.ebuild
index 37c3d5e57dc6..d49672cca0b7 100644
--- a/dev-util/xxdiff/xxdiff-4.0_beta1_p20110426-r1.ebuild
+++ b/dev-util/xxdiff/xxdiff-4.0_beta1_p20110426-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="dev-qt/qtgui:4"
diff --git a/dev-vcs/fossil/fossil-1.34.ebuild b/dev-vcs/fossil/fossil-1.34.ebuild
index 449a589db1a0..05f03aeaccce 100644
--- a/dev-vcs/fossil/fossil-1.34.ebuild
+++ b/dev-vcs/fossil/fossil-1.34.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.fossil-scm.org/download/${MY_P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug fusefs json legacy-mv-rm miniz sqlite +ssl static tcl th1-docs th1-hooks"
 
 DEPEND="
diff --git a/dev-vcs/hg-git/hg-git-0.8.5.ebuild b/dev-vcs/hg-git/hg-git-0.8.5.ebuild
index a2fb0226d7f3..251c58096af8 100644
--- a/dev-vcs/hg-git/hg-git-0.8.5.ebuild
+++ b/dev-vcs/hg-git/hg-git-0.8.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-vcs/hgsubversion/hgsubversion-1.8.5.ebuild b/dev-vcs/hgsubversion/hgsubversion-1.8.5.ebuild
index ef0410e4a6f4..028e0cecc3d4 100644
--- a/dev-vcs/hgsubversion/hgsubversion-1.8.5.ebuild
+++ b/dev-vcs/hgsubversion/hgsubversion-1.8.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="amd64 x86 ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="test"
 
 # although any ref absent in the source, tests fail badly with >=mercurial-2.8.1
diff --git a/dev-vcs/rapidsvn/rapidsvn-0.12.1-r3.ebuild b/dev-vcs/rapidsvn/rapidsvn-0.12.1-r3.ebuild
index 495c1268bccc..9f290c88700b 100644
--- a/dev-vcs/rapidsvn/rapidsvn-0.12.1-r3.ebuild
+++ b/dev-vcs/rapidsvn/rapidsvn-0.12.1-r3.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="GPL-2 LGPL-2.1 FDL-1.2"
 SLOT="0"
-KEYWORDS="amd64 arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc static-libs"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-vcs/tortoisehg/tortoisehg-3.7.3.ebuild b/dev-vcs/tortoisehg/tortoisehg-3.7.3.ebuild
index b4f15a8483e0..195946d8c75d 100644
--- a/dev-vcs/tortoisehg/tortoisehg-3.7.3.ebuild
+++ b/dev-vcs/tortoisehg/tortoisehg-3.7.3.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1 eutils
 
 if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="amd64 ~x86"
+	KEYWORDS="amd64 x86"
 	SRC_URI="https://www.bitbucket.org/${PN}/targz/downloads/${P}.tar.gz"
 	HG_DEPEND=">=dev-vcs/mercurial-3.6 <dev-vcs/mercurial-3.8"
 else
diff --git a/games-action/armagetronad/armagetronad-0.2.8.3.3.ebuild b/games-action/armagetronad/armagetronad-0.2.8.3.3.ebuild
index 1dfa5ff825a8..fedfd81359d7 100644
--- a/games-action/armagetronad/armagetronad-0.2.8.3.3.ebuild
+++ b/games-action/armagetronad/armagetronad-0.2.8.3.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://launchpad.net/armagetronad/${PV:0:5}/${PV:0:7}.x/+download/arma
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="dedicated sound"
 
 RDEPEND="
diff --git a/games-action/extreme-tuxracer/extreme-tuxracer-0.7.2.ebuild b/games-action/extreme-tuxracer/extreme-tuxracer-0.7.2.ebuild
index 32dde7b7c29f..e72f5e687b94 100644
--- a/games-action/extreme-tuxracer/extreme-tuxracer-0.7.2.ebuild
+++ b/games-action/extreme-tuxracer/extreme-tuxracer-0.7.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/extremetuxracer/etr-${PV/_/}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="virtual/opengl
diff --git a/games-arcade/commandergenius/commandergenius-1.8.3.ebuild b/games-arcade/commandergenius/commandergenius-1.8.3.ebuild
index dcfac7b08d94..4b159fdb6c9f 100644
--- a/games-arcade/commandergenius/commandergenius-1.8.3.ebuild
+++ b/games-arcade/commandergenius/commandergenius-1.8.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/gerstrong/Commander-Genius/archive/v${PV//./}release
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="opengl tremor"
 RESTRICT="mirror" # contains keen files, but we do not install them
 
diff --git a/games-arcade/lbreakout2/lbreakout2-2.6.5.ebuild b/games-arcade/lbreakout2/lbreakout2-2.6.5.ebuild
index 7be07f94818b..70460e3ab094 100644
--- a/games-arcade/lbreakout2/lbreakout2-2.6.5.ebuild
+++ b/games-arcade/lbreakout2/lbreakout2-2.6.5.ebuild
@@ -16,7 +16,7 @@ SRC_URI=" mirror://sourceforge/lgames/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
 IUSE="nls themes"
 
 RDEPEND="media-libs/libpng:0
diff --git a/games-arcade/performous/performous-1.1.ebuild b/games-arcade/performous/performous-1.1.ebuild
index 681763c2eb39..ff56b5d6afe9 100644
--- a/games-arcade/performous/performous-1.1.ebuild
+++ b/games-arcade/performous/performous-1.1.ebuild
@@ -27,7 +27,7 @@ LICENSE="GPL-2
 		CC-BY-NC-ND-2.5
 	)"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="midi songs tools webcam"
 
 RDEPEND="dev-cpp/glibmm
diff --git a/games-board/freedoko/freedoko-0.7.14.ebuild b/games-board/freedoko/freedoko-0.7.14.ebuild
index 4e444c2cf507..d21aa601c231 100644
--- a/games-board/freedoko/freedoko-0.7.14.ebuild
+++ b/games-board/freedoko/freedoko-0.7.14.ebuild
@@ -23,7 +23,7 @@ SRC_URI="mirror://sourceforge/free-doko/FreeDoko_${PV}.src.zip
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="+xskatcards +gnomecards +kdecards +openclipartcards +pysolcards +backgrounds net"
 
 RDEPEND="net? ( net-libs/gnet dev-libs/glib:2 )
diff --git a/games-board/pokerth/pokerth-1.1.1-r1.ebuild b/games-board/pokerth/pokerth-1.1.1-r1.ebuild
index 54b8748c7a9c..965e246768ef 100644
--- a/games-board/pokerth/pokerth-1.1.1-r1.ebuild
+++ b/games-board/pokerth/pokerth-1.1.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/pokerth/${MY_P}.tar.bz2"
 
 LICENSE="AGPL-3 GPL-1 GPL-2 GPL-3 BitstreamVera public-domain"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="dedicated"
 
 RDEPEND="dev-db/sqlite:3
diff --git a/games-board/pychess/pychess-0.12.3.ebuild b/games-board/pychess/pychess-0.12.3.ebuild
index 12d5474ec6ea..d0e4e50a10d9 100644
--- a/games-board/pychess/pychess-0.12.3.ebuild
+++ b/games-board/pychess/pychess-0.12.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://pychess.org/download/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="gstreamer"
 
 DEPEND="dev-python/librsvg-python
diff --git a/games-emulation/fbzx/fbzx-3.0.0.ebuild b/games-emulation/fbzx/fbzx-3.0.0.ebuild
index d0fcdaf98a65..eecd21649550 100644
--- a/games-emulation/fbzx/fbzx-3.0.0.ebuild
+++ b/games-emulation/fbzx/fbzx-3.0.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/rastersoft/fbzx/archive/3.0.0.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 
 RDEPEND="media-libs/libsdl[video]
diff --git a/games-emulation/stella/stella-4.7.2.ebuild b/games-emulation/stella/stella-4.7.2.ebuild
index 96c5315ad1d1..769d56c5b3d5 100644
--- a/games-emulation/stella/stella-4.7.2.ebuild
+++ b/games-emulation/stella/stella-4.7.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/stella/${P}-src.tar.xz"
 
 LICENSE="GPL-2+ BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="joystick"
 
 DEPEND="media-libs/libsdl2[joystick?,opengl,video]
diff --git a/games-engines/frobtads/frobtads-1.2.3.ebuild b/games-engines/frobtads/frobtads-1.2.3.ebuild
index 419681399805..ae4c7fba5b2f 100644
--- a/games-engines/frobtads/frobtads-1.2.3.ebuild
+++ b/games-engines/frobtads/frobtads-1.2.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.tads.org/frobtads/${P}.tar.gz"
 
 LICENSE="TADS2 TADS3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug tads2compiler tads3compiler"
 
 RESTRICT="!tads3compiler? ( test )"
diff --git a/games-engines/scummvm-tools/scummvm-tools-1.8.0.ebuild b/games-engines/scummvm-tools/scummvm-tools-1.8.0.ebuild
index 33f2d868a6bf..48fd4a0339aa 100644
--- a/games-engines/scummvm-tools/scummvm-tools-1.8.0.ebuild
+++ b/games-engines/scummvm-tools/scummvm-tools-1.8.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://scummvm.org/frs/scummvm-tools/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd"
 IUSE="flac iconv mad png vorbis"
 RESTRICT="test" # some tests require external files
 
diff --git a/games-engines/scummvm/scummvm-1.8.0.ebuild b/games-engines/scummvm/scummvm-1.8.0.ebuild
index 9f46a6c44da0..3e06db9d4d6f 100644
--- a/games-engines/scummvm/scummvm-1.8.0.ebuild
+++ b/games-engines/scummvm/scummvm-1.8.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://scummvm.org/frs/scummvm/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2+ LGPL-2.1 BSD GPL-3-with-font-exception"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd"
 IUSE="aac alsa debug flac fluidsynth jpeg mpeg2 mp3 opengl png theora truetype unsupported vorbis zlib"
 RESTRICT="test"  # it only looks like there's a test there #77507
 
diff --git a/games-fps/freedoom/freedoom-0.10.1.ebuild b/games-fps/freedoom/freedoom-0.10.1.ebuild
index da383262d64c..ef6ac3a1f710 100644
--- a/games-fps/freedoom/freedoom-0.10.1.ebuild
+++ b/games-fps/freedoom/freedoom-0.10.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/freedoom/freedoom/releases/download/v${PV}/freedoom-
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~ppc x86"
 IUSE=""
 
 DEPEND="app-arch/unzip"
diff --git a/games-fps/warsow-community-map-pack/warsow-community-map-pack-01.ebuild b/games-fps/warsow-community-map-pack/warsow-community-map-pack-01.ebuild
index abf0ed17f68b..359643902303 100644
--- a/games-fps/warsow-community-map-pack/warsow-community-map-pack-01.ebuild
+++ b/games-fps/warsow-community-map-pack/warsow-community-map-pack-01.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://update.warsow.net/mirror/${MY_P}.zip"
 
 LICENSE="freedist"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND=""
diff --git a/games-kids/tuxmath/tuxmath-2.0.3.ebuild b/games-kids/tuxmath/tuxmath-2.0.3.ebuild
index f0c43fe71ff6..112dd4057d49 100644
--- a/games-kids/tuxmath/tuxmath-2.0.3.ebuild
+++ b/games-kids/tuxmath/tuxmath-2.0.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://debian/pool/main/t/${PN}/${PN}_${PV}.orig.tar.gz"
 
 LICENSE="GPL-2 OFL-1.1"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="nls svg"
 
 RDEPEND="dev-games/t4k-common[svg?]
diff --git a/games-misc/fortune-mod-flashrider/fortune-mod-flashrider-1.10.ebuild b/games-misc/fortune-mod-flashrider/fortune-mod-flashrider-1.10.ebuild
index 4b541cf3141e..c59f8279a55a 100644
--- a/games-misc/fortune-mod-flashrider/fortune-mod-flashrider-1.10.ebuild
+++ b/games-misc/fortune-mod-flashrider/fortune-mod-flashrider-1.10.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://downloads.nanolx.org/fortunes-flashrider/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="amd64 x86 ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 DEPEND="games-misc/fortune-mod"
diff --git a/games-misc/opengfx/opengfx-0.5.4.ebuild b/games-misc/opengfx/opengfx-0.5.4.ebuild
index 2a42ab7ec023..fe6680eeb888 100644
--- a/games-misc/opengfx/opengfx-0.5.4.ebuild
+++ b/games-misc/opengfx/opengfx-0.5.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://bundles.openttdcoop.org/opengfx/releases/${PV}/${P}-source.tar.x
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~ppc x86"
 IUSE=""
 RESTRICT="test" # nml version affects the checksums that the test uses (bug #451444)
 
diff --git a/games-puzzle/sgt-puzzles/sgt-puzzles-20160315.ebuild b/games-puzzle/sgt-puzzles/sgt-puzzles-20160315.ebuild
index 368406f34ac0..2f0b4cb1b547 100644
--- a/games-puzzle/sgt-puzzles/sgt-puzzles-20160315.ebuild
+++ b/games-puzzle/sgt-puzzles/sgt-puzzles-20160315.ebuild
@@ -15,7 +15,7 @@ else
 	MAGIC=c0bc13c
 	SRC_URI="http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${PV}.${MAGIC}.tar.gz"
 	S=${WORKDIR}/puzzles-${PV}.${MAGIC}
-	KEYWORDS="amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 GENTOO_ICONS="20160315"
diff --git a/games-puzzle/wizznic/wizznic-369.ebuild b/games-puzzle/wizznic/wizznic-369.ebuild
index fbf55dd6add8..0cb0a513dd20 100644
--- a/games-puzzle/wizznic/wizznic-369.ebuild
+++ b/games-puzzle/wizznic/wizznic-369.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/wizznic/Wizznic_src_build_${PV}.tar.bz2"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="media-libs/libsdl[sound,joystick,opengl,video]
diff --git a/games-roguelike/stone-soup/stone-soup-0.16.2.ebuild b/games-roguelike/stone-soup/stone-soup-0.16.2.ebuild
index 759856cd3b67..ca6e7edbab2f 100644
--- a/games-roguelike/stone-soup/stone-soup-0.16.2.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.16.2.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://crawl.develz.org/release/stone_soup-${PV}.tar.xz
 # MIT: json.cc/json.h, some .js files in webserver/static/scripts/contrib/
 LICENSE="GPL-2 BSD BSD-2 public-domain CC0-1.0 MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug luajit ncurses test +tiles"
 # test is broken
 # see https://crawl.develz.org/mantis/view.php?id=6121
diff --git a/games-rpg/manaplus/manaplus-1.6.3.26.ebuild b/games-rpg/manaplus/manaplus-1.6.3.26.ebuild
index 76f113278391..2ea177319813 100644
--- a/games-rpg/manaplus/manaplus-1.6.3.26.ebuild
+++ b/games-rpg/manaplus/manaplus-1.6.3.26.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://download.evolonline.org/manaplus/download/${PV}/manaplus-${PV}.t
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="nls opengl"
 
 RDEPEND="
diff --git a/games-server/mednafen-server/mednafen-server-0.5.2.ebuild b/games-server/mednafen-server/mednafen-server-0.5.2.ebuild
index 4a2d77616557..a4af452d7f43 100644
--- a/games-server/mednafen-server/mednafen-server-0.5.2.ebuild
+++ b/games-server/mednafen-server/mednafen-server-0.5.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://mednafen.fobby.net/releases/files/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/games-simulation/openttd/openttd-1.6.0.ebuild b/games-simulation/openttd/openttd-1.6.0.ebuild
index f6c37ae8abf9..debc52b9ea6b 100644
--- a/games-simulation/openttd/openttd-1.6.0.ebuild
+++ b/games-simulation/openttd/openttd-1.6.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://binaries.openttd.org/releases/${PV}/${P}-source.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="aplaymidi debug dedicated iconv icu lzo +openmedia +png cpu_flags_x86_sse +timidity +truetype zlib"
 RESTRICT="test" # needs a graphics set in order to test
 
diff --git a/games-strategy/endless-sky/endless-sky-0.8.11-r1.ebuild b/games-strategy/endless-sky/endless-sky-0.8.11-r1.ebuild
index ad2b51958b39..8b8d0e274ca2 100644
--- a/games-strategy/endless-sky/endless-sky-0.8.11-r1.ebuild
+++ b/games-strategy/endless-sky/endless-sky-0.8.11-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/endless-sky/endless-sky/archive/v${PV}.tar.gz -> ${P
 
 LICENSE="CC-BY-SA-4.0 CC-BY-SA-3.0 GPL-3+ public-domain"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="media-libs/glew
 	media-libs/libsdl2
diff --git a/games-strategy/hedgewars/hedgewars-0.9.22-r1.ebuild b/games-strategy/hedgewars/hedgewars-0.9.22-r1.ebuild
index 9cd1df14ad96..8c44378bdd58 100644
--- a/games-strategy/hedgewars/hedgewars-0.9.22-r1.ebuild
+++ b/games-strategy/hedgewars/hedgewars-0.9.22-r1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="http://download.gna.org/hedgewars/${MY_P}.tar.bz2
 
 LICENSE="GPL-2 Apache-2.0 FDL-1.3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 QA_FLAGS_IGNORED=${GAMES_BINDIR}/hwengine # pascal sucks
 QA_PRESTRIPPED=${GAMES_BINDIR}/hwengine # pascal sucks
diff --git a/games-strategy/lgeneral/lgeneral-1.3.1-r1.ebuild b/games-strategy/lgeneral/lgeneral-1.3.1-r1.ebuild
index 94beba24c502..31e149affeec 100644
--- a/games-strategy/lgeneral/lgeneral-1.3.1-r1.ebuild
+++ b/games-strategy/lgeneral/lgeneral-1.3.1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="nls"
 
 RDEPEND="media-libs/libsdl[sound,video]
diff --git a/games-strategy/naev/naev-0.6.1.ebuild b/games-strategy/naev/naev-0.6.1.ebuild
index 142d09e1d10c..ff748a58f38d 100644
--- a/games-strategy/naev/naev-0.6.1.ebuild
+++ b/games-strategy/naev/naev-0.6.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/naev/${P}.tar.bz2
 
 LICENSE="GPL-2 GPL-3 public-domain CC-BY-3.0 CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug +mixer +openal"
 
 RDEPEND="media-libs/libsdl2[X,sound,video]
diff --git a/games-strategy/uqm/uqm-0.7.0-r3.ebuild b/games-strategy/uqm/uqm-0.7.0-r3.ebuild
index a2836af8de93..01e6e1bcff03 100644
--- a/games-strategy/uqm/uqm-0.7.0-r3.ebuild
+++ b/games-strategy/uqm/uqm-0.7.0-r3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/sc2/${P}-source.tgz
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="music opengl remix voice"
 
 RDEPEND="media-libs/libmikmod
diff --git a/games-strategy/warzone2100/warzone2100-3.1.5.ebuild b/games-strategy/warzone2100/warzone2100-3.1.5.ebuild
index bb9cc314e422..60d7327c1c54 100644
--- a/games-strategy/warzone2100/warzone2100-3.1.5.ebuild
+++ b/games-strategy/warzone2100/warzone2100-3.1.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/warzone2100/${P}.tar.xz
 
 LICENSE="GPL-2+ CC-BY-SA-3.0 public-domain"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 # upstream requested debug support
 IUSE="debug nls qt4 videos"
 
diff --git a/games-strategy/widelands/widelands-0.18.ebuild b/games-strategy/widelands/widelands-0.18.ebuild
index c0fe2cee9181..ece7b5be7d2d 100644
--- a/games-strategy/widelands/widelands-0.18.ebuild
+++ b/games-strategy/widelands/widelands-0.18.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://launchpad.net/widelands/${MY_PV}/build-$(get_version_component_
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 
 DEPEND="dev-lang/lua:0
diff --git a/games-util/grfcodec/grfcodec-6.0.5.ebuild b/games-util/grfcodec/grfcodec-6.0.5.ebuild
index 99601aaf6254..a8a59ed9d5cd 100644
--- a/games-util/grfcodec/grfcodec-6.0.5.ebuild
+++ b/games-util/grfcodec/grfcodec-6.0.5.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="http://dev.openttdcoop.org/projects/grfcodec"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
 IUSE=""
 
 [[ -n ${SCM} ]] && S=${WORKDIR}/${PN}
diff --git a/games-util/joystick/joystick-1.5.1.ebuild b/games-util/joystick/joystick-1.5.1.ebuild
index e20849144e32..36c4768d850a 100644
--- a/games-util/joystick/joystick-1.5.1.ebuild
+++ b/games-util/joystick/joystick-1.5.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/linuxconsole/files/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~ppc x86"
 IUSE="sdl udev"
 
 DEPEND="sdl? ( media-libs/libsdl:0[video] )
diff --git a/games-util/nml/nml-0.4.4.ebuild b/games-util/nml/nml-0.4.4.ebuild
index 29fb03753ada..6bbfe7951a91 100644
--- a/games-util/nml/nml-0.4.4.ebuild
+++ b/games-util/nml/nml-0.4.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://bundles.openttdcoop.org/nml/releases/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~ppc x86"
 
 RDEPEND="dev-python/pillow[zlib,${PYTHON_USEDEP}]
 	dev-python/ply[${PYTHON_USEDEP}]"
diff --git a/lxde-base/lxmenu-data/lxmenu-data-0.1.4.ebuild b/lxde-base/lxmenu-data/lxmenu-data-0.1.4.ebuild
index 5b67be18ad15..7cc7ecee9295 100644
--- a/lxde-base/lxmenu-data/lxmenu-data-0.1.4.ebuild
+++ b/lxde-base/lxmenu-data/lxmenu-data-0.1.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ppc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ppc x86 ~amd64-linux ~arm-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=""
diff --git a/mail-filter/maildrop/maildrop-2.8.3.ebuild b/mail-filter/maildrop/maildrop-2.8.3.ebuild
index 169d2fab106f..55edb28517f4 100644
--- a/mail-filter/maildrop/maildrop-2.8.3.ebuild
+++ b/mail-filter/maildrop/maildrop-2.8.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.courier-mta.org/maildrop/"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
 IUSE="berkdb debug dovecot fam gdbm ldap mysql postgres static-libs authlib +tools trashquota"
 
 CDEPEND="!mail-mta/courier
diff --git a/mail-mta/exim/exim-4.87.ebuild b/mail-mta/exim/exim-4.87.ebuild
index 427c023b8d2e..b1852b9cef8f 100644
--- a/mail-mta/exim/exim-4.87.ebuild
+++ b/mail-mta/exim/exim-4.87.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="http://www.exim.org/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="alpha amd64 ~arm ~hppa ~ppc ~ppc64 x86"
 
 COMMON_DEPEND=">=sys-apps/sed-4.0.5
 	>=sys-libs/db-3.2:=
diff --git a/mail-mta/postfix/postfix-3.1.0.ebuild b/mail-mta/postfix/postfix-3.1.0.ebuild
index 65709be79683..67c504a83d2e 100644
--- a/mail-mta/postfix/postfix-3.1.0.ebuild
+++ b/mail-mta/postfix/postfix-3.1.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="${MY_URI}/${MY_SRC}.tar.gz"
 
 LICENSE="IBM"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd"
 IUSE="+berkdb cdb doc dovecot-sasl +eai hardened ldap ldap-bind libressl lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl"
 
 DEPEND=">=dev-libs/libpcre-3.4
diff --git a/media-gfx/cairosvg/cairosvg-1.0.7.ebuild b/media-gfx/cairosvg/cairosvg-1.0.7.ebuild
index a8e8a7463464..d189cd354291 100644
--- a/media-gfx/cairosvg/cairosvg-1.0.7.ebuild
+++ b/media-gfx/cairosvg/cairosvg-1.0.7.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]
 	dev-python/pycairo[${PYTHON_USEDEP}]
diff --git a/media-gfx/gphotofs/gphotofs-0.5.ebuild b/media-gfx/gphotofs/gphotofs-0.5.ebuild
index 93dc06670110..42c0ace4356f 100644
--- a/media-gfx/gphotofs/gphotofs-0.5.ebuild
+++ b/media-gfx/gphotofs/gphotofs-0.5.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/gphoto/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=">=media-libs/libgphoto2-2.5.0
diff --git a/media-gfx/povray/povray-3.7.0.0-r1.ebuild b/media-gfx/povray/povray-3.7.0.0-r1.ebuild
index c37f65582fdb..69b46450f8a8 100644
--- a/media-gfx/povray/povray-3.7.0.0-r1.ebuild
+++ b/media-gfx/povray/povray-3.7.0.0-r1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/POV-Ray/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug +io-restrictions openexr static-libs tiff X"
 
 DEPEND="
diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.21-r2.ebuild b/media-gfx/tuxpaint/tuxpaint-0.9.21-r2.ebuild
index 1e9f40a7d08b..e8bd0f2ea354 100644
--- a/media-gfx/tuxpaint/tuxpaint-0.9.21-r2.ebuild
+++ b/media-gfx/tuxpaint/tuxpaint-0.9.21-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 
 IUSE="nls"
 
diff --git a/media-libs/gexiv2/gexiv2-0.10.3.ebuild b/media-libs/gexiv2/gexiv2-0.10.3.ebuild
index e6f7c35c2082..9f1ba08be943 100644
--- a/media-libs/gexiv2/gexiv2-0.10.3.ebuild
+++ b/media-libs/gexiv2/gexiv2-0.10.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://gnome/sources/${PN}/${MY_PV}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="introspection python static-libs"
 
 REQUIRED_USE="python? ( introspection ${PYTHON_REQUIRED_USE} )"
diff --git a/media-libs/libdvbpsi/libdvbpsi-1.3.0-r1.ebuild b/media-libs/libdvbpsi/libdvbpsi-1.3.0-r1.ebuild
index c0b7d5336cd7..ea893e70fb42 100644
--- a/media-libs/libdvbpsi/libdvbpsi-1.3.0-r1.ebuild
+++ b/media-libs/libdvbpsi/libdvbpsi-1.3.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://download.videolan.org/pub/${PN}/${PV}/${P}.tar.bz2"
 LICENSE="LGPL-2.1"
 # Sublot == libdvbpsi.so major
 SLOT="0/10"
-KEYWORDS="alpha amd64 arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="doc static-libs"
 
 RDEPEND=""
diff --git a/media-libs/libgpod/libgpod-0.8.3-r1.ebuild b/media-libs/libgpod/libgpod-0.8.3-r1.ebuild
index 3a857314b0c9..fb7f6e6104a3 100644
--- a/media-libs/libgpod/libgpod-0.8.3-r1.ebuild
+++ b/media-libs/libgpod/libgpod-0.8.3-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/gtkpod/${P}.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="+gtk python +udev ios mono static-libs"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/media-libs/libmtp/libmtp-1.1.11.ebuild b/media-libs/libmtp/libmtp-1.1.11.ebuild
index 66d22f3f1a62..ebb2e37b897e 100644
--- a/media-libs/libmtp/libmtp-1.1.11.ebuild
+++ b/media-libs/libmtp/libmtp-1.1.11.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]]; then
 	inherit autotools git-r3
 else
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
+	KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 DESCRIPTION="An implementation of Microsoft's Media Transfer Protocol (MTP)"
diff --git a/media-libs/libxmi/libxmi-1.3.ebuild b/media-libs/libxmi/libxmi-1.3.ebuild
index e47c3f8b7887..2749d9887e7d 100644
--- a/media-libs/libxmi/libxmi-1.3.ebuild
+++ b/media-libs/libxmi/libxmi-1.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 DEPEND="!<=media-libs/plotutils-2.6"
diff --git a/media-libs/mutagen/mutagen-1.31.ebuild b/media-libs/mutagen/mutagen-1.31.ebuild
index 010ceb63053a..b765e016324d 100644
--- a/media-libs/mutagen/mutagen-1.31.ebuild
+++ b/media-libs/mutagen/mutagen-1.31.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://bitbucket.org/lazka/${PN}/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-interix ~amd64-linux ~x86-linux"
 IUSE="doc test"
 
 # TODO: Missing support for >=dev-python/eyeD3-0.7 API
diff --git a/media-libs/plotutils/plotutils-2.6-r1.ebuild b/media-libs/plotutils/plotutils-2.6-r1.ebuild
index a6b1e02129fa..a4c570187aa4 100644
--- a/media-libs/plotutils/plotutils-2.6-r1.ebuild
+++ b/media-libs/plotutils/plotutils-2.6-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/plotutils/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="+png static-libs X"
 
 DEPEND="
diff --git a/media-libs/raul/raul-0.8.0-r1.ebuild b/media-libs/raul/raul-0.8.0-r1.ebuild
index edb3edabc8e9..e450d688f7e7 100644
--- a/media-libs/raul/raul-0.8.0-r1.ebuild
+++ b/media-libs/raul/raul-0.8.0-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug doc test"
 
 RDEPEND="dev-libs/boost
diff --git a/media-libs/sdl2-ttf/sdl2-ttf-2.0.14.ebuild b/media-libs/sdl2-ttf/sdl2-ttf-2.0.14.ebuild
index 3bd7f7ee16ba..41f249dcc303 100644
--- a/media-libs/sdl2-ttf/sdl2-ttf-2.0.14.ebuild
+++ b/media-libs/sdl2-ttf/sdl2-ttf-2.0.14.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.libsdl.org/projects/SDL_ttf/release/${MY_P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="static-libs X"
 
 RDEPEND="X? ( >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] )
diff --git a/media-sound/aacgain/aacgain-1.9.ebuild b/media-sound/aacgain/aacgain-1.9.ebuild
index 1492c83f3692..d349015c45bf 100644
--- a/media-sound/aacgain/aacgain-1.9.ebuild
+++ b/media-sound/aacgain/aacgain-1.9.ebuild
@@ -19,7 +19,7 @@ SRC_URI="http://sbriesen.de/gentoo/distfiles/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/media-sound/apetag/apetag-1.12.ebuild b/media-sound/apetag/apetag-1.12.ebuild
index 42a6b5818f1c..97c2acb844d3 100644
--- a/media-sound/apetag/apetag-1.12.ebuild
+++ b/media-sound/apetag/apetag-1.12.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://muth.org/Robert/Apetag/${PN}.${PV}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 x86"
 IUSE=""
 
 S=${WORKDIR}/Apetag
diff --git a/media-sound/cmus/cmus-2.7.1.ebuild b/media-sound/cmus/cmus-2.7.1.ebuild
index 80a7740c90c0..9b3aabbcfe53 100644
--- a/media-sound/cmus/cmus-2.7.1.ebuild
+++ b/media-sound/cmus/cmus-2.7.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/cmus/cmus/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="aac alsa ao cue cdio cddb discid debug examples +flac jack libsamplerate
 	+mad mikmod modplug mp4 musepack opus oss pidgin pulseaudio tremor +unicode
 	+vorbis wavpack wma"
diff --git a/media-sound/exaile/exaile-3.4.5.ebuild b/media-sound/exaile/exaile-3.4.5.ebuild
index 77c1a2da12dc..2bc7060e1e3e 100644
--- a/media-sound/exaile/exaile-3.4.5.ebuild
+++ b/media-sound/exaile/exaile-3.4.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2 GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~sparc x86"
 IUSE="cddb libnotify nls"
 
 RDEPEND="dev-python/dbus-python
diff --git a/media-sound/mpg123/mpg123-1.22.4.ebuild b/media-sound/mpg123/mpg123-1.22.4.ebuild
index 14b5f07535d7..9542e918bed1 100644
--- a/media-sound/mpg123/mpg123-1.22.4.ebuild
+++ b/media-sound/mpg123/mpg123-1.22.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.mpg123.org/download/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~sparc ~x86 ~amd64-fbsd ~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 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext alsa altivec coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse"
 
 # No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs.
diff --git a/media-sound/mpg321/mpg321-0.3.2.ebuild b/media-sound/mpg321/mpg321-0.3.2.ebuild
index 557cf1bf0428..d6d9d897052b 100644
--- a/media-sound/mpg321/mpg321-0.3.2.ebuild
+++ b/media-sound/mpg321/mpg321-0.3.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P/-/_}.orig.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="alsa ipv6"
 
 RDEPEND="app-eselect/eselect-mpg123
diff --git a/media-sound/ncmpcpp/ncmpcpp-0.7.4.ebuild b/media-sound/ncmpcpp/ncmpcpp-0.7.4.ebuild
index 8d00357f160f..31bb3d0fc181 100644
--- a/media-sound/ncmpcpp/ncmpcpp-0.7.4.ebuild
+++ b/media-sound/ncmpcpp/ncmpcpp-0.7.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://ncmpcpp.rybczak.net/stable/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm hppa ~ppc ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm hppa ~ppc ppc64 ~sparc x86"
 IUSE="clock curl outputs taglib unicode visualizer"
 
 RDEPEND="
diff --git a/media-sound/tagtool/tagtool-0.12.3-r1.ebuild b/media-sound/tagtool/tagtool-0.12.3-r1.ebuild
index 51316c2a7f29..46844820a8f8 100644
--- a/media-sound/tagtool/tagtool-0.12.3-r1.ebuild
+++ b/media-sound/tagtool/tagtool-0.12.3-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~sparc x86"
 IUSE="mp3 +vorbis"
 REQUIRED_USE="|| ( mp3 vorbis )"
 
diff --git a/media-sound/tapiir/tapiir-0.7.3.ebuild b/media-sound/tapiir/tapiir-0.7.3.ebuild
index 6f8e5c6cec66..deb09ac38d4c 100644
--- a/media-sound/tapiir/tapiir-0.7.3.ebuild
+++ b/media-sound/tapiir/tapiir-0.7.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.resorama.com/maarten/files/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~sparc x86"
 
 RDEPEND="
 	media-sound/jack-audio-connection-kit
diff --git a/media-sound/timemachine/timemachine-0.3.3-r1.ebuild b/media-sound/timemachine/timemachine-0.3.3-r1.ebuild
index aefb8d9d0cbc..defaa45397b5 100644
--- a/media-sound/timemachine/timemachine-0.3.3-r1.ebuild
+++ b/media-sound/timemachine/timemachine-0.3.3-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://plugin.org.uk/timemachine/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="lash"
 
 RDEPEND=">=media-sound/jack-audio-connection-kit-0.80
diff --git a/media-tv/freevo/freevo-1.9.0-r1.ebuild b/media-tv/freevo/freevo-1.9.0-r1.ebuild
index 1a7823f67eee..e224414b726a 100644
--- a/media-tv/freevo/freevo-1.9.0-r1.ebuild
+++ b/media-tv/freevo/freevo-1.9.0-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="cdparanoia doc dvd encode fbcon flac gphoto2 jpeg lame lirc matrox mixer nls tv vorbis xine X"
 
 RDEPEND="
diff --git a/media-video/qx11grab/qx11grab-0.4.12.ebuild b/media-video/qx11grab/qx11grab-0.4.12.ebuild
index c5cfce4a34ad..39b2df9fd487 100644
--- a/media-video/qx11grab/qx11grab-0.4.12.ebuild
+++ b/media-video/qx11grab/qx11grab-0.4.12.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://qx11grab.hjcms.de/downloads/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="libav kde opengl pulseaudio"
 
 RDEPEND="
diff --git a/media-video/tovid/tovid-0.35.2.ebuild b/media-video/tovid/tovid-0.35.2.ebuild
index 31fa597b3eb7..74ce3c181ef9 100644
--- a/media-video/tovid/tovid-0.35.2.ebuild
+++ b/media-video/tovid/tovid-0.35.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/tovid-suite/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="app-cdr/dvd+rw-tools
diff --git a/net-analyzer/echoping/echoping-6.0.2_p434-r2.ebuild b/net-analyzer/echoping/echoping-6.0.2_p434-r2.ebuild
index 3250fad76109..0d26cdb1e18d 100644
--- a/net-analyzer/echoping/echoping-6.0.2_p434-r2.ebuild
+++ b/net-analyzer/echoping/echoping-6.0.2_p434-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~jer/${P}.tar.gz"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~x86"
+KEYWORDS="amd64 ~hppa x86"
 IUSE="gnutls http icp idn priority smtp ssl tos postgres ldap"
 RESTRICT="test"
 
diff --git a/net-analyzer/icinga2/icinga2-2.4.4-r1.ebuild b/net-analyzer/icinga2/icinga2-2.4.4-r1.ebuild
index c3fe2bac7e80..fcb077510f3e 100644
--- a/net-analyzer/icinga2/icinga2-2.4.4-r1.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.4.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="+mysql postgres classicui console lto mail minimal nano-syntax +plugins studio +vim-syntax"
 
 CDEPEND="
diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.1.2.ebuild b/net-analyzer/monitoring-plugins/monitoring-plugins-2.1.2.ebuild
index db066ece3a0c..fc95268d8201 100644
--- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.1.2.ebuild
+++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.1.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.monitoring-plugins.org/download/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="gnutls ipv6 ldap libressl mysql dns fping game postgres samba snmp ssh +ssl"
 
 # Most of the plugins use automagic dependencies, i.e. the plugin will
diff --git a/net-analyzer/nmap/nmap-7.12.ebuild b/net-analyzer/nmap/nmap-7.12.ebuild
index c3a0d284564b..618cc52490f5 100644
--- a/net-analyzer/nmap/nmap-7.12.ebuild
+++ b/net-analyzer/nmap/nmap-7.12.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 IUSE="ipv6 libressl +nse system-lua ncat ndiff nls nmap-update nping ssl zenmap"
 NMAP_LINGUAS=( de fr hi hr it ja pl pt_BR ru zh )
diff --git a/net-analyzer/tcpflow/tcpflow-1.4.5_p1-r1.ebuild b/net-analyzer/tcpflow/tcpflow-1.4.5_p1-r1.ebuild
index 2212b02ac356..89f518e17fc6 100644
--- a/net-analyzer/tcpflow/tcpflow-1.4.5_p1-r1.ebuild
+++ b/net-analyzer/tcpflow/tcpflow-1.4.5_p1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 "
 
 LICENSE="GPL-3"
-KEYWORDS="amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 SLOT="0"
 IUSE="cairo test"
 
diff --git a/net-analyzer/vnstat/vnstat-1.15.ebuild b/net-analyzer/vnstat/vnstat-1.15.ebuild
index 9d51a3fedcbb..561cf73821f3 100644
--- a/net-analyzer/vnstat/vnstat-1.15.ebuild
+++ b/net-analyzer/vnstat/vnstat-1.15.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://humdi.net/vnstat/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm hppa ~ppc ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm hppa ~ppc ppc64 ~sparc x86"
 IUSE="gd selinux test"
 
 COMMON_DEPEND="
diff --git a/net-dns/avahi/avahi-0.6.32.ebuild b/net-dns/avahi/avahi-0.6.32.ebuild
index 5a51ac274b36..8ba13b5c2b12 100644
--- a/net-dns/avahi/avahi-0.6.32.ebuild
+++ b/net-dns/avahi/avahi-0.6.32.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${P}"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 arm ~hppa ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE="autoipd bookmarks dbus doc gdbm gtk gtk3 howl-compat +introspection ipv6 kernel_linux mdnsresponder-compat mono nls python qt4 selinux test utils"
 
 REQUIRED_USE="
diff --git a/net-firewall/shorewall/shorewall-5.0.7.2.ebuild b/net-firewall/shorewall/shorewall-5.0.7.2.ebuild
index fc4b95222139..4c00ee69187e 100644
--- a/net-firewall/shorewall/shorewall-5.0.7.2.ebuild
+++ b/net-firewall/shorewall/shorewall-5.0.7.2.ebuild
@@ -67,7 +67,7 @@ if [[ ${MY_PV} = *-Beta* ]] || [[ ${MY_PV} = *-RC* ]]; then
 	unset _tmp_last_index
 	unset _tmp_suffix
 else
-	KEYWORDS="alpha amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="alpha amd64 ~hppa ~ppc ~ppc64 ~sparc x86"
 fi
 
 SRC_URI="
diff --git a/net-irc/ngircd/ngircd-23-r1.ebuild b/net-irc/ngircd/ngircd-23-r1.ebuild
index ab0870ceff8b..5a5333c958d9 100644
--- a/net-irc/ngircd/ngircd-23-r1.ebuild
+++ b/net-irc/ngircd/ngircd-23-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://ngircd.barton.de/pub/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~x64-macos"
+KEYWORDS="amd64 x86 ~x64-macos"
 IUSE="debug gnutls iconv ident ipv6 libressl pam ssl tcpd zlib"
 
 RDEPEND="
diff --git a/net-irc/weechat/weechat-1.4-r1.ebuild b/net-irc/weechat/weechat-1.4-r1.ebuild
index dc50ae1d26a9..46fb7c2f5eb7 100644
--- a/net-irc/weechat/weechat-1.4-r1.ebuild
+++ b/net-irc/weechat/weechat-1.4-r1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/weechat/weechat.git"
 else
 	SRC_URI="https://weechat.org/files/src/${P}.tar.bz2"
-	KEYWORDS="amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="Portable and multi-interface IRC client"
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.49.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.49.ebuild
index 8df138641fac..0a135c28969f 100644
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.49.ebuild
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.49.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/12"
-KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE="epoll messages ssl static-libs test"
 
 RDEPEND="ssl? (
diff --git a/net-libs/libproxy/libproxy-0.4.13-r1.ebuild b/net-libs/libproxy/libproxy-0.4.13-r1.ebuild
index 186e40638044..77df876d7749 100644
--- a/net-libs/libproxy/libproxy-0.4.13-r1.ebuild
+++ b/net-libs/libproxy/libproxy-0.4.13-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/libproxy/libproxy/archive/${PV}.tar.gz -> ${P}.tar.g
 LICENSE="LGPL-2.1+"
 SLOT="0"
 
-KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 IUSE="gnome kde mono networkmanager perl python spidermonkey test webkit"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/net-libs/nghttp2/nghttp2-1.10.0.ebuild b/net-libs/nghttp2/nghttp2-1.10.0.ebuild
index ad63699e6563..a5aa6f338f76 100644
--- a/net-libs/nghttp2/nghttp2-1.10.0.ebuild
+++ b/net-libs/nghttp2/nghttp2-1.10.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/tatsuhiro-t/nghttp2/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86"
+	KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86"
 fi
 
 DESCRIPTION="HTTP/2 C Library"
diff --git a/net-libs/zeromq/zeromq-4.1.4.ebuild b/net-libs/zeromq/zeromq-4.1.4.ebuild
index d7c60eba314a..4ad08e36692b 100644
--- a/net-libs/zeromq/zeromq-4.1.4.ebuild
+++ b/net-libs/zeromq/zeromq-4.1.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://download.zeromq.org/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0/5"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="pgm static-libs test"
 
 RDEPEND="
diff --git a/net-misc/chrony/chrony-2.3.ebuild b/net-misc/chrony/chrony-2.3.ebuild
index 483017f892b0..433a0788275d 100644
--- a/net-misc/chrony/chrony-2.3.ebuild
+++ b/net-misc/chrony/chrony-2.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="~alpha amd64 ~arm hppa ~mips ~ppc ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm hppa ~mips ~ppc ppc64 ~sparc x86"
 IUSE="caps +cmdmon ipv6 libedit +ntp +phc +pps readline +refclock +rtc selinux +adns"
 REQUIRED_USE="
 	?? ( libedit readline )
diff --git a/net-misc/geoipupdate/geoipupdate-2.2.2.ebuild b/net-misc/geoipupdate/geoipupdate-2.2.2.ebuild
index fa173e94597d..d7b9048c3a11 100644
--- a/net-misc/geoipupdate/geoipupdate-2.2.2.ebuild
+++ b/net-misc/geoipupdate/geoipupdate-2.2.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/maxmind/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND="
diff --git a/net-misc/memcached/memcached-1.4.25.ebuild b/net-misc/memcached/memcached-1.4.25.ebuild
index 9ec2607b1213..3b26be61dabc 100644
--- a/net-misc/memcached/memcached-1.4.25.ebuild
+++ b/net-misc/memcached/memcached-1.4.25.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.memcached.org/files/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~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"
+KEYWORDS="alpha amd64 arm ~arm64 ~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"
 IUSE="test slabs-reassign debug sasl selinux" # hugetlbfs later
 
 RDEPEND=">=dev-libs/libevent-1.4
diff --git a/net-misc/radvd/radvd-2.12.ebuild b/net-misc/radvd/radvd-2.12.ebuild
index 0ee029e0e27b..69ed9d89402a 100644
--- a/net-misc/radvd/radvd-2.12.ebuild
+++ b/net-misc/radvd/radvd-2.12.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://v6web.litech.org/radvd/dist/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~ppc ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~ppc ~sparc x86 ~x86-fbsd"
 IUSE="kernel_FreeBSD selinux test"
 
 CDEPEND="dev-libs/libdaemon"
diff --git a/net-misc/radvd/radvd-2.13.ebuild b/net-misc/radvd/radvd-2.13.ebuild
index 0ee029e0e27b..69ed9d89402a 100644
--- a/net-misc/radvd/radvd-2.13.ebuild
+++ b/net-misc/radvd/radvd-2.13.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://v6web.litech.org/radvd/dist/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~ppc ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~ppc ~sparc x86 ~x86-fbsd"
 IUSE="kernel_FreeBSD selinux test"
 
 CDEPEND="dev-libs/libdaemon"
diff --git a/net-misc/tlsdate/tlsdate-0.0.13.ebuild b/net-misc/tlsdate/tlsdate-0.0.13.ebuild
index e72247c7ab79..1fb4cc88136d 100644
--- a/net-misc/tlsdate/tlsdate-0.0.13.ebuild
+++ b/net-misc/tlsdate/tlsdate-0.0.13.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/ioerror/tlsdate/tarball/${P} -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~s390 ~sh ~sparc ~x86"
+KEYWORDS="amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~s390 ~sh ~sparc x86"
 IUSE="dbus +seccomp static-libs"
 
 DEPEND="dev-libs/openssl
diff --git a/net-misc/unison/unison-2.48.3.ebuild b/net-misc/unison/unison-2.48.3.ebuild
index 200e18d1a15f..309bcefacfa0 100644
--- a/net-misc/unison/unison-2.48.3.ebuild
+++ b/net-misc/unison/unison-2.48.3.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Two-way cross-platform file synchronizer"
 HOMEPAGE="http://www.cis.upenn.edu/~bcpierce/unison/"
 LICENSE="GPL-2"
 SLOT="$(get_version_component_range 1-2 ${PV})"
-KEYWORDS="amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 
 # ocaml version so we are sure it has ocamlopt use flag
 DEPEND=">=dev-lang/ocaml-3.10.2[ocamlopt?]
diff --git a/net-misc/wicd/wicd-1.7.4-r1.ebuild b/net-misc/wicd/wicd-1.7.4-r1.ebuild
index 3b624f0d644c..6e9473ff3da4 100644
--- a/net-misc/wicd/wicd-1.7.4-r1.ebuild
+++ b/net-misc/wicd/wicd-1.7.4-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://launchpad.net/wicd/1.7/${PV}/+download/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~mips ~ppc ~ppc64 x86"
 IUSE="doc X ambiance +gtk ioctl libnotify mac4lin ncurses nls +pm-utils gnome-shell"
 
 DEPEND="nls? ( dev-python/Babel[${PYTHON_USEDEP}] )"
diff --git a/net-nntp/pan/pan-0.139-r2.ebuild b/net-nntp/pan/pan-0.139-r2.ebuild
index 2a0abb887d41..89c33a04d9f6 100644
--- a/net-nntp/pan/pan-0.139-r2.ebuild
+++ b/net-nntp/pan/pan-0.139-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://pan.rebelbase.com/download/releases/${PV}/source/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="dbus gnome-keyring libnotify spell ssl"
 
 RDEPEND=">=dev-libs/glib-2.26:2
diff --git a/net-print/cups/cups-2.1.3-r1.ebuild b/net-print/cups/cups-2.1.3-r1.ebuild
index 580cf2eaf822..6ec85bfa216b 100644
--- a/net-print/cups/cups-2.1.3-r1.ebuild
+++ b/net-print/cups/cups-2.1.3-r1.ebuild
@@ -23,7 +23,7 @@ if [[ ${PV} == *9999 ]]; then
 	fi
 else
 	SRC_URI="http://www.cups.org/software/${MY_PV}/${MY_P}-source.tar.bz2"
-	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~m68k-mint"
+	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~m68k-mint"
 fi
 
 DESCRIPTION="The Common Unix Printing System"
diff --git a/net-print/hplip/hplip-3.16.3.ebuild b/net-print/hplip/hplip-3.16.3.ebuild
index 559da9521f53..37d5aaf1012f 100644
--- a/net-print/hplip/hplip-3.16.3.ebuild
+++ b/net-print/hplip/hplip-3.16.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/hplip/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm ~ppc ~ppc64 x86"
 
 IUSE="doc fax +hpcups hpijs kde libnotify -libusb0 minimal parport policykit qt4 scanner snmp static-ppds X"
 
diff --git a/net-voip/vidyodesktop/vidyodesktop-3.6.3.017.ebuild b/net-voip/vidyodesktop/vidyodesktop-3.6.3.017.ebuild
index 1af3fcd16307..d82d65d060e9 100644
--- a/net-voip/vidyodesktop/vidyodesktop-3.6.3.017.ebuild
+++ b/net-voip/vidyodesktop/vidyodesktop-3.6.3.017.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 LICENSE="Vidyo-EULA"
 SLOT="0"
 RESTRICT="mirror strip"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 S="${WORKDIR}"
diff --git a/net-wireless/bluez/bluez-5.39.ebuild b/net-wireless/bluez/bluez-5.39.ebuild
index e6bebe0380d6..cb0a2c26a064 100644
--- a/net-wireless/bluez/bluez-5.39.ebuild
+++ b/net-wireless/bluez/bluez-5.39.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.xz"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0/3"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~mips ~ppc ~ppc64 x86"
 
 IUSE="cups doc debug deprecated extra-tools experimental +obex +readline selinux systemd test test-programs +udev"
 REQUIRED_USE="
diff --git a/sci-geosciences/mtkbabel/mtkbabel-0.8.3.1-r1.ebuild b/sci-geosciences/mtkbabel/mtkbabel-0.8.3.1-r1.ebuild
index 74e23c4f7dbb..02dc74674433 100644
--- a/sci-geosciences/mtkbabel/mtkbabel-0.8.3.1-r1.ebuild
+++ b/sci-geosciences/mtkbabel/mtkbabel-0.8.3.1-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND=""
diff --git a/sci-libs/ccfits/ccfits-2.4.ebuild b/sci-libs/ccfits/ccfits-2.4.ebuild
index 2664f4cf65a4..1854ee89b426 100644
--- a/sci-libs/ccfits/ccfits-2.4.ebuild
+++ b/sci-libs/ccfits/ccfits-2.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="${HOMEPAGE}/${MYP}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc static-libs"
 
 RDEPEND=">=sci-libs/cfitsio-3.080"
diff --git a/sci-libs/gsl/gsl-1.16.ebuild b/sci-libs/gsl/gsl-1.16.ebuild
index 639a78e60473..e484805d3d9b 100644
--- a/sci-libs/gsl/gsl-1.16.ebuild
+++ b/sci-libs/gsl/gsl-1.16.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~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 ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="cblas-external static-libs"
 
 RDEPEND="cblas-external? ( virtual/cblas )"
diff --git a/sci-mathematics/gimps/gimps-28.9.ebuild b/sci-mathematics/gimps/gimps-28.9.ebuild
index 5fdf7f01f8d3..6e0d02e2586c 100644
--- a/sci-mathematics/gimps/gimps-28.9.ebuild
+++ b/sci-mathematics/gimps/gimps-28.9.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 SLOT="0"
 LICENSE="GIMPS"
-KEYWORDS="-* amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 IUSE=""
 
 # Since there are no statically linked binaries for this version of mprime,
diff --git a/sci-mathematics/ginac/ginac-1.6.6.ebuild b/sci-mathematics/ginac/ginac-1.6.6.ebuild
index cc7c6e020fe1..581a96d1c652 100644
--- a/sci-mathematics/ginac/ginac-1.6.6.ebuild
+++ b/sci-mathematics/ginac/ginac-1.6.6.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.ginac.de/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
 IUSE="doc static-libs"
 
 RDEPEND=">=sci-libs/cln-1.2.2"
diff --git a/sci-mathematics/normaliz/normaliz-3.1.1.ebuild b/sci-mathematics/normaliz/normaliz-3.1.1.ebuild
index 6ea3d83bbbf6..fc9076e93342 100644
--- a/sci-mathematics/normaliz/normaliz-3.1.1.ebuild
+++ b/sci-mathematics/normaliz/normaliz-3.1.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.normaliz.uni-osnabrueck.de/wp-content/uploads/2016/04/Norma
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="doc extras openmp"
 
 RDEPEND="dev-libs/gmp[cxx]"
diff --git a/sci-visualization/epix/epix-1.2.11-r1.ebuild b/sci-visualization/epix/epix-1.2.11-r1.ebuild
index f970d0ecd4cf..915bb2eb76bf 100644
--- a/sci-visualization/epix/epix-1.2.11-r1.ebuild
+++ b/sci-visualization/epix/epix-1.2.11-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://mathcs.holycross.edu/~ahwang/epix/${P}_withpdf.tar.bz2"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
 IUSE="doc emacs examples"
 
 DEPEND="
diff --git a/sys-apps/hdparm/hdparm-9.48.ebuild b/sys-apps/hdparm/hdparm-9.48.ebuild
index 0daf2371e817..7b6739f227a6 100644
--- a/sys-apps/hdparm/hdparm-9.48.ebuild
+++ b/sys-apps/hdparm/hdparm-9.48.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/hdparm/${P}.tar.gz"
 
 LICENSE="BSD GPL-2" # GPL-2 only
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="static"
 
 src_prepare() {
diff --git a/sys-apps/irqbalance/irqbalance-1.0.9-r1.ebuild b/sys-apps/irqbalance/irqbalance-1.0.9-r1.ebuild
index 770221cb0cd2..a37e0cc97b6f 100644
--- a/sys-apps/irqbalance/irqbalance-1.0.9-r1.ebuild
+++ b/sys-apps/irqbalance/irqbalance-1.0.9-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/Irqbalance/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="caps +numa selinux"
 
 CDEPEND="dev-libs/glib:2
diff --git a/sys-apps/kmod/kmod-22.ebuild b/sys-apps/kmod/kmod-22.ebuild
index 4343bb2abd38..052547a69614 100644
--- a/sys-apps/kmod/kmod-22.ebuild
+++ b/sys-apps/kmod/kmod-22.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999* ]]; then
 	inherit autotools git-2
 else
 	SRC_URI="mirror://kernel/linux/utils/kernel/kmod/${P}.tar.xz"
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86"
 	inherit libtool
 fi
 
diff --git a/sys-apps/pcsc-lite/pcsc-lite-1.8.16-r1.ebuild b/sys-apps/pcsc-lite/pcsc-lite-1.8.16-r1.ebuild
index d5f89a41cd31..9c227414c8c5 100644
--- a/sys-apps/pcsc-lite/pcsc-lite-1.8.16-r1.ebuild
+++ b/sys-apps/pcsc-lite/pcsc-lite-1.8.16-r1.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}"
 # upstream.
 LICENSE="BSD ISC MIT GPL-3+ GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 # This is called libusb so that it doesn't fool people in thinking that
 # it is _required_ for USB support. Otherwise they'll disable udev and
diff --git a/sys-apps/sdparm/sdparm-1.10.ebuild b/sys-apps/sdparm/sdparm-1.10.ebuild
index f3cd73a9a0bf..7dbe560350d3 100644
--- a/sys-apps/sdparm/sdparm-1.10.ebuild
+++ b/sys-apps/sdparm/sdparm-1.10.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://sg.danny.cz/sg/p/${P}.tgz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
 IUSE=""
 
 # Older releases contain a conflicting sas_disk_blink
diff --git a/sys-apps/sg3_utils/sg3_utils-1.42.ebuild b/sys-apps/sg3_utils/sg3_utils-1.42.ebuild
index e0356d1279f3..ac835ed17328 100644
--- a/sys-apps/sg3_utils/sg3_utils-1.42.ebuild
+++ b/sys-apps/sg3_utils/sg3_utils-1.42.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://sg.danny.cz/sg/p/${P}.tgz"
 
 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="static-libs"
 
 DEPEND="sys-devel/libtool"
diff --git a/sys-apps/sysvinit/sysvinit-2.88-r9.ebuild b/sys-apps/sysvinit/sysvinit-2.88-r9.ebuild
index 777b81dc2627..2f98fb675e52 100644
--- a/sys-apps/sysvinit/sysvinit-2.88-r9.ebuild
+++ b/sys-apps/sysvinit/sysvinit-2.88-r9.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}dsf.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86"
 IUSE="selinux ibm static kernel_FreeBSD"
 
 CDEPEND="
diff --git a/sys-block/megactl/megactl-0.4.1-r2.ebuild b/sys-block/megactl/megactl-0.4.1-r2.ebuild
index 6a710b1fe2d8..531aaa4e86ae 100644
--- a/sys-block/megactl/megactl-0.4.1-r2.ebuild
+++ b/sys-block/megactl/megactl-0.4.1-r2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://sourceforge.net/projects/megactl/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}.patch
diff --git a/sys-block/tgt/tgt-1.0.63.ebuild b/sys-block/tgt/tgt-1.0.63.ebuild
index 69a7e1e9e7bd..74e549b44547 100644
--- a/sys-block/tgt/tgt-1.0.63.ebuild
+++ b/sys-block/tgt/tgt-1.0.63.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/fujita/tgt/tarball/v${PV} -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="fcoe fcp ibmvio infiniband rbd"
 
 CDEPEND="dev-perl/Config-General
diff --git a/sys-boot/plymouth/plymouth-0.9.2.ebuild b/sys-boot/plymouth/plymouth-0.9.2.ebuild
index e11b51b3a48b..877a54735214 100644
--- a/sys-boot/plymouth/plymouth-0.9.2.ebuild
+++ b/sys-boot/plymouth/plymouth-0.9.2.ebuild
@@ -23,7 +23,7 @@ HOMEPAGE="https://cgit.freedesktop.org/plymouth/"
 LICENSE="GPL-2"
 SLOT="0"
 [[ ${PV} == 9999 ]] || \
-KEYWORDS="alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="debug gdm +gtk +libkms +pango static-libs"
 
 CDEPEND="
diff --git a/sys-cluster/cinder/cinder-7.0.2.ebuild b/sys-cluster/cinder/cinder-7.0.2.ebuild
index 5180547ff964..15d4a4eb6765 100644
--- a/sys-cluster/cinder/cinder-7.0.2.ebuild
+++ b/sys-cluster/cinder/cinder-7.0.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+api +scheduler +volume iscsi lvm mysql +memcached postgres sqlite test"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
 
diff --git a/sys-devel/bison/bison-3.0.4-r1.ebuild b/sys-devel/bison/bison-3.0.4-r1.ebuild
index 64f982b35279..b8debe7c8091 100644
--- a/sys-devel/bison/bison-3.0.4-r1.ebuild
+++ b/sys-devel/bison/bison-3.0.4-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 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"
+KEYWORDS="alpha amd64 arm ~arm64 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"
 IUSE="examples nls static test"
 
 RDEPEND=">=sys-devel/m4-1.4.16"
diff --git a/sys-fs/btrfs-progs/btrfs-progs-4.4.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-4.4.1.ebuild
index 634be3db54a9..2e30873ceff3 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-4.4.1.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-4.4.1.ebuild
@@ -10,7 +10,7 @@ libbtrfs_soname=0
 
 if [[ ${PV} != 9999 ]]; then
 	MY_PV=v${PV}
-	KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 	SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz"
 	S="${WORKDIR}"/${PN}-${MY_PV}
 else
diff --git a/sys-fs/loop-aes/loop-aes-3.7h.ebuild b/sys-fs/loop-aes/loop-aes-3.7h.ebuild
index f2ca16acae8a..04fb1d5f6a5a 100644
--- a/sys-fs/loop-aes/loop-aes-3.7h.ebuild
+++ b/sys-fs/loop-aes/loop-aes-3.7h.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~sparc x86"
 IUSE="cpu_flags_x86_aes extra-ciphers keyscrub cpu_flags_x86_padlock"
 
 DEPEND="app-crypt/loop-aes-losetup"
diff --git a/sys-fs/udftools/udftools-1.1.ebuild b/sys-fs/udftools/udftools-1.1.ebuild
index d8620a881987..2dca73c49f99 100644
--- a/sys-fs/udftools/udftools-1.1.ebuild
+++ b/sys-fs/udftools/udftools-1.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/pali/udftools/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="sys-libs/readline:0="
diff --git a/sys-fs/udisks/udisks-2.1.7.ebuild b/sys-fs/udisks/udisks-2.1.7.ebuild
index 04703e938c2f..ffe989051d36 100644
--- a/sys-fs/udisks/udisks-2.1.7.ebuild
+++ b/sys-fs/udisks/udisks-2.1.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://udisks.freedesktop.org/releases/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="alpha amd64 arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="alpha amd64 arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86"
 IUSE="acl debug cryptsetup +gptfdisk +introspection selinux systemd"
 
 COMMON_DEPEND="
diff --git a/sys-fs/xfsdump/xfsdump-3.1.6.ebuild b/sys-fs/xfsdump/xfsdump-3.1.6.ebuild
index 64ee60033420..b5054a2e0274 100644
--- a/sys-fs/xfsdump/xfsdump-3.1.6.ebuild
+++ b/sys-fs/xfsdump/xfsdump-3.1.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="ftp://oss.sgi.com/projects/xfs/cmd_tars/${P}.tar.gz
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ~ppc ppc64 -sparc ~x86"
+KEYWORDS="alpha amd64 hppa ia64 ~mips ~ppc ppc64 -sparc x86"
 IUSE="nls"
 
 RDEPEND="sys-fs/e2fsprogs
diff --git a/sys-fs/xfsprogs/xfsprogs-4.5.0.ebuild b/sys-fs/xfsprogs/xfsprogs-4.5.0.ebuild
index 4b590e5a8ca9..cdcc310a729e 100644
--- a/sys-fs/xfsprogs/xfsprogs-4.5.0.ebuild
+++ b/sys-fs/xfsprogs/xfsprogs-4.5.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="ftp://oss.sgi.com/projects/xfs/cmd_tars/${P}.tar.gz
 
 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="libedit nls readline static static-libs"
 REQUIRED_USE="static? ( static-libs )"
 
diff --git a/sys-kernel/genkernel-next/genkernel-next-64.ebuild b/sys-kernel/genkernel-next/genkernel-next-64.ebuild
index bd0f3bfb9b8f..9769c12faa06 100644
--- a/sys-kernel/genkernel-next/genkernel-next-64.ebuild
+++ b/sys-kernel/genkernel-next/genkernel-next-64.ebuild
@@ -7,7 +7,7 @@ EAPI=6
 if [[ "${PV}" != "9999" ]]; then
 	SRC_URI="https://github.com/Sabayon/genkernel-next/archive/v${PV}.tar.gz -> ${PV}.tar.gz"
 	RESTRICT="mirror"
-	KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 x86"
 else
 	EGIT_REPO_URI="git://github.com/Sabayon/genkernel-next.git"
 	inherit git-2
diff --git a/sys-kernel/linux-firmware/linux-firmware-20160331.ebuild b/sys-kernel/linux-firmware/linux-firmware-20160331.ebuild
index 7e06d3a6177e..e8b325c96deb 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20160331.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20160331.ebuild
@@ -9,10 +9,10 @@ if [[ ${PV} == 99999999* ]]; then
 	inherit git-2
 	SRC_URI=""
 	EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/firmware/${PN}.git"
-	KEYWORDS="alpha amd64 arm"
+	KEYWORDS="alpha amd64 arm x86"
 else
 	SRC_URI="mirror://gentoo/${P}.tar.xz"
-	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
 fi
 
 DESCRIPTION="Linux firmware files"
diff --git a/sys-kernel/openvz-sources/openvz-sources-2.6.32.111.12.ebuild b/sys-kernel/openvz-sources/openvz-sources-2.6.32.111.12.ebuild
index 39ac1f5fb403..d77ef2b08d1e 100644
--- a/sys-kernel/openvz-sources/openvz-sources-2.6.32.111.12.ebuild
+++ b/sys-kernel/openvz-sources/openvz-sources-2.6.32.111.12.ebuild
@@ -31,7 +31,7 @@ K_DEBLOB_AVAILABLE=0
 inherit kernel-2
 #detect_version
 
-KEYWORDS="amd64 ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~ppc64 ~sparc x86"
 IUSE=""
 
 DESCRIPTION="Kernel sources with OpenVZ patchset"
diff --git a/sys-power/apcupsd/apcupsd-3.14.13.ebuild b/sys-power/apcupsd/apcupsd-3.14.13.ebuild
index fe9716cc6412..da8d62b586c4 100644
--- a/sys-power/apcupsd/apcupsd-3.14.13.ebuild
+++ b/sys-power/apcupsd/apcupsd-3.14.13.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/apcupsd/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ~ppc x86 ~x86-fbsd"
 IUSE="snmp +usb cgi nls gnome kernel_linux"
 
 DEPEND="
diff --git a/sys-power/pmtools/pmtools-20110323-r1.ebuild b/sys-power/pmtools/pmtools-20110323-r1.ebuild
index 356a19945953..94a0e5d16a4d 100644
--- a/sys-power/pmtools/pmtools-20110323-r1.ebuild
+++ b/sys-power/pmtools/pmtools-20110323-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/anyc/pmtools/tarball/${PV} -> ${P}.tar.gz"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc"
 DEPEND=""
 RDEPEND="${DEPEND}
diff --git a/sys-power/upower/upower-0.99.4.ebuild b/sys-power/upower/upower-0.99.4.ebuild
index ac30b8a39ef8..1458240f4017 100644
--- a/sys-power/upower/upower-0.99.4.ebuild
+++ b/sys-power/upower/upower-0.99.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://${PN}.freedesktop.org/releases/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0/3" # based on SONAME of libupower-glib.so
-KEYWORDS="alpha amd64 arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 
 # gtk-doc files are not available as prebuilt in the tarball
 IUSE="doc +introspection ios kernel_FreeBSD kernel_linux selinux"
diff --git a/sys-process/audit/audit-2.4.3-r1.ebuild b/sys-process/audit/audit-2.4.3-r1.ebuild
index 593c794afaf4..05477318c10c 100644
--- a/sys-process/audit/audit-2.4.3-r1.ebuild
+++ b/sys-process/audit/audit-2.4.3-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://people.redhat.com/sgrubb/audit/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
 IUSE="ldap python"
 # Testcases are pretty useless as they are built for RedHat users/groups and
 # kernels.
diff --git a/www-apache/mpm_itk/mpm_itk-2.4.7_p4-r1.ebuild b/www-apache/mpm_itk/mpm_itk-2.4.7_p4-r1.ebuild
index d60cd05f9bb3..2a879285a76f 100644
--- a/www-apache/mpm_itk/mpm_itk-2.4.7_p4-r1.ebuild
+++ b/www-apache/mpm_itk/mpm_itk-2.4.7_p4-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://mpm-itk.sesse.net/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_P}"
diff --git a/www-apps/icingaweb2/icingaweb2-2.2.0.ebuild b/www-apps/icingaweb2/icingaweb2-2.2.0.ebuild
index ab7e157ffd3f..f1a53841e871 100644
--- a/www-apps/icingaweb2/icingaweb2-2.2.0.ebuild
+++ b/www-apps/icingaweb2/icingaweb2-2.2.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://codeload.github.com/Icinga/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="apache2 ldap mysql nginx postgres"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND=">=net-analyzer/icinga2-2.1.1
 		|| (
diff --git a/x11-libs/cairo/cairo-1.14.6.ebuild b/x11-libs/cairo/cairo-1.14.6.ebuild
index 063e546306ec..11b72a8438e3 100644
--- a/x11-libs/cairo/cairo-1.14.6.ebuild
+++ b/x11-libs/cairo/cairo-1.14.6.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="http://cairographics.org/releases/${P}.tar.xz"
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~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 ~arm64 hppa ~ia64 ~m68k ~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/motif/motif-2.3.5.ebuild b/x11-libs/motif/motif-2.3.5.ebuild
index 67a1f5286d15..7b97eb4f31ac 100644
--- a/x11-libs/motif/motif-2.3.5.ebuild
+++ b/x11-libs/motif/motif-2.3.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/project/motif/Motif%20${PV}%20Source%20Code/${P}.t
 
 LICENSE="LGPL-2.1+ MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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 ~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="examples jpeg +motif22-compatibility png static-libs unicode xft"
 
 RDEPEND="abi_x86_32? ( !app-emulation/emul-linux-x86-motif[-abi_x86_32(-)] )
diff --git a/x11-libs/wxGTK/wxGTK-3.0.2.0-r2.ebuild b/x11-libs/wxGTK/wxGTK-3.0.2.0-r2.ebuild
index 6f8346387ad0..579da7885e09 100644
--- a/x11-libs/wxGTK/wxGTK-3.0.2.0-r2.ebuild
+++ b/x11-libs/wxGTK/wxGTK-3.0.2.0-r2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://wxwidgets.org/"
 SRC_URI="mirror://sourceforge/wxpython/wxPython-src-${PV}.tar.bz2
 	doc? ( mirror://sourceforge/wxpython/wxPython-docs-${PV}.tar.bz2 )"
 
-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"
+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"
 IUSE="+X aqua doc debug gstreamer libnotify opengl sdl tiff webkit"
 
 SLOT="3.0"
diff --git a/x11-misc/dunst/dunst-1.1.0.ebuild b/x11-misc/dunst/dunst-1.1.0.ebuild
index 929dbe0b2247..87e6ad3c5088 100644
--- a/x11-misc/dunst/dunst-1.1.0.ebuild
+++ b/x11-misc/dunst/dunst-1.1.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.knopwob.org/public/dunst-release/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="dunstify"
 
 CDEPEND="
diff --git a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.1-r1.ebuild b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.1-r1.ebuild
index fb66728afc8c..522f242dd3dc 100644
--- a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.1-r1.ebuild
+++ b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.1-r1.ebuild
@@ -14,7 +14,7 @@ https://dev.gentoo.org/~hwoarang/distfiles/lightdm-gentoo-patch-2.tar.gz )"
 LICENSE="GPL-3 LGPL-3
 	branding? ( CC-BY-3.0 )"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
 IUSE="ayatana branding"
 
 COMMON_DEPEND="ayatana? ( dev-libs/libindicator:3 )
diff --git a/x11-misc/lightdm/lightdm-1.16.7.ebuild b/x11-misc/lightdm/lightdm-1.16.7.ebuild
index 3eeee0caa150..6f401dda9a18 100644
--- a/x11-misc/lightdm/lightdm-1.16.7.ebuild
+++ b/x11-misc/lightdm/lightdm-1.16.7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://launchpad.net/${PN}/${TRUNK_VERSION}/${PV}/+download/${P}.tar.x
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
 IUSE="audit +gtk +introspection kde qt4 qt5 +gnome"
 REQUIRED_USE="|| ( gtk kde )"
 
diff --git a/x11-misc/virtualgl/virtualgl-2.4.1-r3.ebuild b/x11-misc/virtualgl/virtualgl-2.4.1-r3.ebuild
index 06e7617b47f5..0b29737e94aa 100644
--- a/x11-misc/virtualgl/virtualgl-2.4.1-r3.ebuild
+++ b/x11-misc/virtualgl/virtualgl-2.4.1-r3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/files/${PV}/${MY_P}.tar.gz"
 
 SLOT="0"
 LICENSE="LGPL-2.1 wxWinLL-3.1 FLTK"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="libressl ssl"
 
 RDEPEND="
diff --git a/x11-misc/xosview/xosview-1.17.ebuild b/x11-misc/xosview/xosview-1.17.ebuild
index f0e0c243420f..a9f870fa1b24 100644
--- a/x11-misc/xosview/xosview-1.17.ebuild
+++ b/x11-misc/xosview/xosview-1.17.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.pogo.org.uk/~mark/${PN}/releases/${P}.tar.gz"
 
 LICENSE="GPL-2 BSD"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ppc64 x86"
 IUSE="suid"
 
 COMMON_DEPS="x11-libs/libX11
diff --git a/x11-wm/dwm/dwm-6.1.ebuild b/x11-wm/dwm/dwm-6.1.ebuild
index ff13dcd16165..fec5dea7e592 100644
--- a/x11-wm/dwm/dwm-6.1.ebuild
+++ b/x11-wm/dwm/dwm-6.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://dl.suckless.org/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd"
 IUSE="xinerama"
 
 RDEPEND="
diff --git a/x11-wm/openbox/openbox-3.6.1.ebuild b/x11-wm/openbox/openbox-3.6.1.ebuild
index 682e286466b0..eadcf3456af5 100644
--- a/x11-wm/openbox/openbox-3.6.1.ebuild
+++ b/x11-wm/openbox/openbox-3.6.1.ebuild
@@ -14,12 +14,12 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="git://git.openbox.org/dana/openbox"
 	SRC_URI="branding? (
 	https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"
-	KEYWORDS="alpha arm"
+	KEYWORDS="alpha arm x86"
 
 else
 	SRC_URI="http://openbox.org/dist/openbox/${P}.tar.gz
 	branding? ( https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"
-	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~arm-linux ~x86-linux"
+	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~arm-linux ~x86-linux"
 fi
 
 LICENSE="GPL-2"
diff --git a/xfce-extra/xfce4-vala/xfce4-vala-4.10.3-r2.ebuild b/xfce-extra/xfce4-vala/xfce4-vala-4.10.3-r2.ebuild
index 38cd3db509bc..77f295951c33 100644
--- a/xfce-extra/xfce4-vala/xfce4-vala-4.10.3-r2.ebuild
+++ b/xfce-extra/xfce4-vala/xfce4-vala-4.10.3-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://xfce/src/bindings/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="$(vala_depend)
author	Repository QA checks <repo-qa-checks@gentoo.org>	2016-06-25 20:22:15 +0000
committer	Repository QA checks <repo-qa-checks@gentoo.org>	2016-06-25 20:22:15 +0000
commit	3405e2002aca3292f7892d8b0ae8693f36388d84 (patch)
tree	89910324a998d095f4cad7b1856fdb80c10e254e
parent	2016-06-25 20:02:15 UTC (diff)
parent	mail-mta/exim: x86 stable wrt bug #585212 (diff)
download	gentoo-3405e2002aca3292f7892d8b0ae8693f36388d84.tar.gz gentoo-3405e2002aca3292f7892d8b0ae8693f36388d84.tar.bz2 gentoo-3405e2002aca3292f7892d8b0ae8693f36388d84.zip