diff --git a/games-action/0verkill/0verkill-0.16-r3.ebuild b/games-action/0verkill/0verkill-0.16-r3.ebuild
index 633abcca11bba..3c347dd0a14d9 100644
--- a/games-action/0verkill/0verkill-0.16-r3.ebuild
+++ b/games-action/0verkill/0verkill-0.16-r3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://artax.karlin.mff.cuni.cz/~brain/0verkill/release/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="X"
 
 DEPEND="X? ( x11-libs/libXpm )"
diff --git a/games-action/abuse/abuse-0.8.ebuild b/games-action/abuse/abuse-0.8.ebuild
index 32f01b02b9a9a..d56c20871b1b2 100644
--- a/games-action/abuse/abuse-0.8.ebuild
+++ b/games-action/abuse/abuse-0.8.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://abuse.zoy.org/raw-attachment/wiki/download/${P}.tar.gz"
 
 LICENSE="GPL-2 WTFPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND=">=media-libs/libsdl-1.1.6[sound,opengl,video]
diff --git a/games-action/accelerator3d/accelerator3d-0.1.1-r2.ebuild b/games-action/accelerator3d/accelerator3d-0.1.1-r2.ebuild
index 802b543b07547..89a2b11fe6974 100644
--- a/games-action/accelerator3d/accelerator3d-0.1.1-r2.ebuild
+++ b/games-action/accelerator3d/accelerator3d-0.1.1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/accelerator3d/accelerator-${PV}.tar.bz2"
 
 LICENSE="Artistic"
 SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 IUSE=""
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
diff --git a/games-action/armagetronad/armagetronad-0.2.8.3.3-r1.ebuild b/games-action/armagetronad/armagetronad-0.2.8.3.3-r1.ebuild
index ae1515f218f45..7aa64769890a6 100644
--- a/games-action/armagetronad/armagetronad-0.2.8.3.3-r1.ebuild
+++ b/games-action/armagetronad/armagetronad-0.2.8.3.3-r1.ebuild
@@ -10,7 +10,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/atanks/atanks-6.4.ebuild b/games-action/atanks/atanks-6.4.ebuild
index 11b365b2d6b02..50382f26af2c0 100644
--- a/games-action/atanks/atanks-6.4.ebuild
+++ b/games-action/atanks/atanks-6.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/atanks/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="media-libs/allegro:0[X]"
diff --git a/games-action/barrage/barrage-1.0.4.ebuild b/games-action/barrage/barrage-1.0.4.ebuild
index 0360dc6f83cb5..3b4694483f06b 100644
--- a/games-action/barrage/barrage-1.0.4.ebuild
+++ b/games-action/barrage/barrage-1.0.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/lgames/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND=">=media-libs/libsdl-1.2[sound,video]
diff --git a/games-action/battalion/battalion-1.4b.ebuild b/games-action/battalion/battalion-1.4b.ebuild
index cf70c1a02bf20..0ded9a00d39b9 100644
--- a/games-action/battalion/battalion-1.4b.ebuild
+++ b/games-action/battalion/battalion-1.4b.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://evlweb.eecs.uic.edu/aej/BATTALION/${PN}${PV}.tar.bz2"
 
 LICENSE="battalion HPND"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="~x86"
 IUSE=""
 
 DEPEND="virtual/opengl
diff --git a/games-action/beathazardultra/beathazardultra-20130308.ebuild b/games-action/beathazardultra/beathazardultra-20130308.ebuild
index 00a90ed3491c2..ae5c376da75ba 100644
--- a/games-action/beathazardultra/beathazardultra-20130308.ebuild
+++ b/games-action/beathazardultra/beathazardultra-20130308.ebuild
@@ -12,7 +12,7 @@ SRC_URI="beathazard-installer_03-08-13"
 
 LICENSE="all-rights-reserved"
 SLOT="0"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE="bundled-libs"
 RESTRICT="bindist fetch splitdebug"
 
diff --git a/games-action/bomberclone/bomberclone-0.11.8.ebuild b/games-action/bomberclone/bomberclone-0.11.8.ebuild
index 3752ded7ea433..3657b20ae130c 100644
--- a/games-action/bomberclone/bomberclone-0.11.8.ebuild
+++ b/games-action/bomberclone/bomberclone-0.11.8.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~mips ppc64 x86"
+KEYWORDS="~amd64 ~mips ~ppc64 ~x86"
 IUSE="X"
 
 DEPEND=">=media-libs/libsdl-1.1.0[video]
diff --git a/games-action/brutal-legend/brutal-legend-20130615-r1.ebuild b/games-action/brutal-legend/brutal-legend-20130615-r1.ebuild
index 5f4f6fae14b77..f9577bb7b1fdd 100644
--- a/games-action/brutal-legend/brutal-legend-20130615-r1.ebuild
+++ b/games-action/brutal-legend/brutal-legend-20130615-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="BrutalLegend-Linux-${TIMESTAMP}-setup.bin"
 
 LICENSE="all-rights-reserved"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 RESTRICT="bindist fetch splitdebug"
 
diff --git a/games-action/btanks/btanks-0.9.8083.ebuild b/games-action/btanks/btanks-0.9.8083.ebuild
index 9da95ffb8f305..6036ed703deaa 100644
--- a/games-action/btanks/btanks-0.9.8083.ebuild
+++ b/games-action/btanks/btanks-0.9.8083.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/btanks/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/lua-5.1:0
diff --git a/games-action/bzflag/bzflag-2.4.2-r1.ebuild b/games-action/bzflag/bzflag-2.4.2-r1.ebuild
index f1277cefe7c0c..20fd1e319fb0e 100644
--- a/games-action/bzflag/bzflag-2.4.2-r1.ebuild
+++ b/games-action/bzflag/bzflag-2.4.2-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="dedicated sdl"
 
 UIDEPEND="virtual/opengl
diff --git a/games-action/bzflag/bzflag-2.4.4.ebuild b/games-action/bzflag/bzflag-2.4.4.ebuild
index 09b86bbbfa0e6..eecc94e52f8f6 100644
--- a/games-action/bzflag/bzflag-2.4.4.ebuild
+++ b/games-action/bzflag/bzflag-2.4.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://download.bzflag.org/bzflag/source/${PV}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="dedicated upnp"
 
 UIDEPEND=""
diff --git a/games-action/chickens/chickens-0.2.4.ebuild b/games-action/chickens/chickens-0.2.4.ebuild
index b71e496fd44a4..1d7bbee21d0c9 100644
--- a/games-action/chickens/chickens-0.2.4.ebuild
+++ b/games-action/chickens/chickens-0.2.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.chickensforlinux.com/${MY_P}.tar.gz"
 
 LICENSE="all-rights-reserved"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 RESTRICT="mirror bindist"
 
diff --git a/games-action/chromium-bsu/chromium-bsu-0.9.15.1-r1.ebuild b/games-action/chromium-bsu/chromium-bsu-0.9.15.1-r1.ebuild
index 0970ffa552fc4..578f593bf3df1 100644
--- a/games-action/chromium-bsu/chromium-bsu-0.9.15.1-r1.ebuild
+++ b/games-action/chromium-bsu/chromium-bsu-0.9.15.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/chromium-bsu/${P}.tar.gz"
 
 LICENSE="Clarified-Artistic"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="mixer nls +sdl"
 
 RDEPEND="
diff --git a/games-action/clanbomber/clanbomber-2.1.1-r1.ebuild b/games-action/clanbomber/clanbomber-2.1.1-r1.ebuild
index 543c71912fa16..b6f4ba83831f7 100644
--- a/games-action/clanbomber/clanbomber-2.1.1-r1.ebuild
+++ b/games-action/clanbomber/clanbomber-2.1.1-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${P}.tar.lzma"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/games-action/d1x-rebirth/d1x-rebirth-0.58.1.ebuild b/games-action/d1x-rebirth/d1x-rebirth-0.58.1.ebuild
index c25d4a21555b4..11eadc467cb1b 100644
--- a/games-action/d1x-rebirth/d1x-rebirth-0.58.1.ebuild
+++ b/games-action/d1x-rebirth/d1x-rebirth-0.58.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="http://www.dxx-rebirth.com/download/dxx/${MY_P}.tar.gz
 
 LICENSE="D1X GPL-2 public-domain"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="cdinstall debug demo ipv6 l10n_de +music opengl opl3-musicpack sc55-musicpack"
 REQUIRED_USE="?? ( cdinstall demo )
 	?? ( opl3-musicpack sc55-musicpack )
diff --git a/games-action/d2x-rebirth/d2x-rebirth-0.58.1.ebuild b/games-action/d2x-rebirth/d2x-rebirth-0.58.1.ebuild
index aa6094854fad2..c5fbb76c050c2 100644
--- a/games-action/d2x-rebirth/d2x-rebirth-0.58.1.ebuild
+++ b/games-action/d2x-rebirth/d2x-rebirth-0.58.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/dxx-rebirth/dxx-rebirth/archive/0.58.1-d2x.tar.gz ->
 
 LICENSE="D1X GPL-2 public-domain"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="cdinstall debug demo ipv6 l10n_de +music opengl opl3-musicpack sc55-musicpack"
 REQUIRED_USE="?? ( opl3-musicpack sc55-musicpack )
 	opl3-musicpack? ( music )
diff --git a/games-action/deathchase3d/deathchase3d-0.9.ebuild b/games-action/deathchase3d/deathchase3d-0.9.ebuild
index 496d76710b65e..d0a00ed951871 100644
--- a/games-action/deathchase3d/deathchase3d-0.9.ebuild
+++ b/games-action/deathchase3d/deathchase3d-0.9.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.autismuk.freeserve.co.uk/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="media-libs/libsdl[video]"
diff --git a/games-action/descent1-demodata/descent1-demodata-1.4.ebuild b/games-action/descent1-demodata/descent1-demodata-1.4.ebuild
index 167e52526d8f3..7eaea0b829a80 100644
--- a/games-action/descent1-demodata/descent1-demodata-1.4.ebuild
+++ b/games-action/descent1-demodata/descent1-demodata-1.4.ebuild
@@ -17,7 +17,7 @@ SRC_URI="http://icculus.org/d2x/data/${DEMO}
 LICENSE="free-noncomm"
 
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/games-action/descent2-data/descent2-data-1.0.ebuild b/games-action/descent2-data/descent2-data-1.0.ebuild
index 5ab6aa099f748..b526c21382fe1 100644
--- a/games-action/descent2-data/descent2-data-1.0.ebuild
+++ b/games-action/descent2-data/descent2-data-1.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI=""
 # See readme.txt
 LICENSE="descent-data"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="videos"
 
 # d2x-0.2.5-r2 may include the CD data itself.
diff --git a/games-action/descent2-demodata/descent2-demodata-1.0.ebuild b/games-action/descent2-demodata/descent2-demodata-1.0.ebuild
index 14f1262250010..662e71d9e6870 100644
--- a/games-action/descent2-demodata/descent2-demodata-1.0.ebuild
+++ b/games-action/descent2-demodata/descent2-demodata-1.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="ftp://ftp.funet.fi/pub/msdos/games/interplay/${DEMO}
 # See README.TXT
 LICENSE="free-noncomm"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 # d2x-0.2.5-r2 may include the demo data itself
diff --git a/games-action/descent3-demo/descent3-demo-1.4.0a.ebuild b/games-action/descent3-demo/descent3-demo-1.4.0a.ebuild
index 5e6e949e73ae4..483524ddd2b69 100644
--- a/games-action/descent3-demo/descent3-demo-1.4.0a.ebuild
+++ b/games-action/descent3-demo/descent3-demo-1.4.0a.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://lokigames/loki_demos/${PN}.run"
 
 LICENSE="all-rights-reserved"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 RESTRICT="mirror bindist strip"
 
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 ba41d51096acd..db6ed285a1910 100644
--- a/games-action/extreme-tuxracer/extreme-tuxracer-0.7.2.ebuild
+++ b/games-action/extreme-tuxracer/extreme-tuxracer-0.7.2.ebuild
@@ -10,7 +10,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-action/fakk2/fakk2-1.02.ebuild b/games-action/fakk2/fakk2-1.02.ebuild
index 95ce1900918aa..514a904b6553f 100644
--- a/games-action/fakk2/fakk2-1.02.ebuild
+++ b/games-action/fakk2/fakk2-1.02.ebuild
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE="LOKI-EULA"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="~x86"
 IUSE="nocd"
 RESTRICT="strip"
 
diff --git a/games-action/formido/formido-1.0.1.ebuild b/games-action/formido/formido-1.0.1.ebuild
index 253ceae4c038d..e60df50ab70c1 100644
--- a/games-action/formido/formido-1.0.1.ebuild
+++ b/games-action/formido/formido-1.0.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://noe.falzon.free.fr/prog/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT=0
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="media-libs/libsdl[sound,video]
diff --git a/games-action/garden/garden-1.0.8-r1.ebuild b/games-action/garden/garden-1.0.8-r1.ebuild
index bed7869d2369f..409c1ad93d6a7 100644
--- a/games-action/garden/garden-1.0.8-r1.ebuild
+++ b/games-action/garden/garden-1.0.8-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="<media-libs/allegro-5"
diff --git a/games-action/garden/garden-1.0.9.ebuild b/games-action/garden/garden-1.0.9.ebuild
index ba6f212aed4d4..ebcda15b19aed 100644
--- a/games-action/garden/garden-1.0.9.ebuild
+++ b/games-action/garden/garden-1.0.9.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="<media-libs/allegro-5"
diff --git a/games-action/geki2-KXL/geki2-KXL-2.0.3-r2.ebuild b/games-action/geki2-KXL/geki2-KXL-2.0.3-r2.ebuild
index 37ea228f43c2f..05fcb51c9395b 100644
--- a/games-action/geki2-KXL/geki2-KXL-2.0.3-r2.ebuild
+++ b/games-action/geki2-KXL/geki2-KXL-2.0.3-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="dev-games/KXL"
diff --git a/games-action/geki3-KXL/geki3-KXL-1.0.3-r2.ebuild b/games-action/geki3-KXL/geki3-KXL-1.0.3-r2.ebuild
index 0dbc7cd1418b2..ea1a3b65174c5 100644
--- a/games-action/geki3-KXL/geki3-KXL-1.0.3-r2.ebuild
+++ b/games-action/geki3-KXL/geki3-KXL-1.0.3-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="dev-games/KXL"
diff --git a/games-action/gltron/gltron-0.70-r1.ebuild b/games-action/gltron/gltron-0.70-r1.ebuild
index ec112c045e75f..be041b2225345 100644
--- a/games-action/gltron/gltron-0.70-r1.ebuild
+++ b/games-action/gltron/gltron-0.70-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-source.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="virtual/opengl
diff --git a/games-action/heretic2-demo/heretic2-demo-1.06a.ebuild b/games-action/heretic2-demo/heretic2-demo-1.06a.ebuild
index d7c4210078da0..0db2fab523318 100644
--- a/games-action/heretic2-demo/heretic2-demo-1.06a.ebuild
+++ b/games-action/heretic2-demo/heretic2-demo-1.06a.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://lokigames/loki_demos/${PN}.run"
 
 LICENSE="LOKI-EULA"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 RESTRICT="strip"
 QA_TEXTRELS="${GAMES_PREFIX_OPT:1}/heretic2-demo/ref_glx.so"
diff --git a/games-action/heretic2/heretic2-1.06c-r1.ebuild b/games-action/heretic2/heretic2-1.06c-r1.ebuild
index 7d89ec0bbf324..dc1322e893551 100644
--- a/games-action/heretic2/heretic2-1.06c-r1.ebuild
+++ b/games-action/heretic2/heretic2-1.06c-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://lokigames/${PN}/${P/%?/b}-unified-x86.run
 
 LICENSE="LOKI-EULA"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 RESTRICT="strip"
 QA_TEXTRELS="${GAMES_PREFIX_OPT:1}/${PN}/base/*.so"
diff --git a/games-action/heroes/heroes-0.21-r1.ebuild b/games-action/heroes/heroes-0.21-r1.ebuild
index e2b70ac4f3d9d..01adf63ffa2b4 100644
--- a/games-action/heroes/heroes-0.21-r1.ebuild
+++ b/games-action/heroes/heroes-0.21-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="sdl nls ggi"
 RESTRICT="test"
 
diff --git a/games-action/hotline-miami/hotline-miami-1.0.9a_p20140221-r1.ebuild b/games-action/hotline-miami/hotline-miami-1.0.9a_p20140221-r1.ebuild
index d0b9108e6ac2f..1c718c57f2288 100644
--- a/games-action/hotline-miami/hotline-miami-1.0.9a_p20140221-r1.ebuild
+++ b/games-action/hotline-miami/hotline-miami-1.0.9a_p20140221-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="HotlineMiami_linux_1392944501.tar.gz"
 
 LICENSE="all-rights-reserved"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="bundled-libs +launcher"
 RESTRICT="bindist fetch splitdebug"
 
diff --git a/games-action/intrusion2/intrusion2-1.024.ebuild b/games-action/intrusion2/intrusion2-1.024.ebuild
index 3ebfb0a6acb10..69aae57e2d330 100644
--- a/games-action/intrusion2/intrusion2-1.024.ebuild
+++ b/games-action/intrusion2/intrusion2-1.024.ebuild
@@ -11,7 +11,7 @@ SRC_URI="intrusion2-${USELESS_ID}-bin"
 
 LICENSE="all-rights-reserved"
 SLOT="0"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE=""
 RESTRICT="bindist fetch"
 
diff --git a/games-action/koth/koth-0.8.0.ebuild b/games-action/koth/koth-0.8.0.ebuild
index 18d36d07d44ec..8e3f80d5d2999 100644
--- a/games-action/koth/koth-0.8.0.ebuild
+++ b/games-action/koth/koth-0.8.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://savannah.nongnu.org/download/${PN}/default.pkg/${PV}/${P}.tar.b
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND="media-libs/libggi"
diff --git a/games-action/lugaru/lugaru-20151204.ebuild b/games-action/lugaru/lugaru-20151204.ebuild
index 3944efc4601db..9b7d86629c3dc 100644
--- a/games-action/lugaru/lugaru-20151204.ebuild
+++ b/games-action/lugaru/lugaru-20151204.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2+ free-noncomm CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/games-action/luola/luola-1.3.2.ebuild b/games-action/luola/luola-1.3.2.ebuild
index 1b5ce9ad65b4e..21ced35bcc301 100644
--- a/games-action/luola/luola-1.3.2.ebuild
+++ b/games-action/luola/luola-1.3.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="media-libs/libsdl[X,sound,joystick,video]
diff --git a/games-action/maelstrom/maelstrom-3.0.6-r2.ebuild b/games-action/maelstrom/maelstrom-3.0.6-r2.ebuild
index 0e1fe8d3142f8..da72a7c262543 100644
--- a/games-action/maelstrom/maelstrom-3.0.6-r2.ebuild
+++ b/games-action/maelstrom/maelstrom-3.0.6-r2.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="An asteroids battle game"
 HOMEPAGE="http://www.libsdl.org/projects/Maelstrom/"
 SRC_URI="http://www.libsdl.org/projects/Maelstrom/src/${MY_P}.tar.gz"
 
-KEYWORDS="~alpha amd64 x86"
+KEYWORDS="~alpha ~amd64 ~x86"
 SLOT="0"
 LICENSE="GPL-2"
 IUSE=""
diff --git a/games-action/moon-buggy/moon-buggy-1.0.51.ebuild b/games-action/moon-buggy/moon-buggy-1.0.51.ebuild
index 33a0460dc8b8b..88e88d601ae5d 100644
--- a/games-action/moon-buggy/moon-buggy-1.0.51.ebuild
+++ b/games-action/moon-buggy/moon-buggy-1.0.51.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.seehuhn.de/data/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""
 
 RDEPEND="sys-libs/ncurses:0"
diff --git a/games-action/mutantstorm-demo/mutantstorm-demo-1.33.ebuild b/games-action/mutantstorm-demo/mutantstorm-demo-1.33.ebuild
index 8a8dcb8be6cac..615fd1cc9bd91 100644
--- a/games-action/mutantstorm-demo/mutantstorm-demo-1.33.ebuild
+++ b/games-action/mutantstorm-demo/mutantstorm-demo-1.33.ebuild
@@ -10,7 +10,7 @@ SRC_URI="ftp://ggdev-1.homelan.com/mutantstorm/MutantStormDemo_${PV/./_}.sh.bin"
 
 LICENSE="POMPOM"
 SLOT="0"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE=""
 RESTRICT="strip"
 
diff --git a/games-action/nighthawk/nighthawk-2.2.ebuild b/games-action/nighthawk/nighthawk-2.2.ebuild
index 718ad4382d1c7..8026a94ef776f 100644
--- a/games-action/nighthawk/nighthawk-2.2.ebuild
+++ b/games-action/nighthawk/nighthawk-2.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="ftp://metalab.unc.edu/pub/Linux/games/arcade/${P}-1.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="x11-libs/libXpm"
diff --git a/games-action/noiz2sa/noiz2sa-0.51a.ebuild b/games-action/noiz2sa/noiz2sa-0.51a.ebuild
index 83359c5159c53..c851dcfff4a4a 100644
--- a/games-action/noiz2sa/noiz2sa-0.51a.ebuild
+++ b/games-action/noiz2sa/noiz2sa-0.51a.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/noiz2sa/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="media-libs/sdl-mixer[vorbis]
diff --git a/games-action/openastromenace/openastromenace-1.3.2.ebuild b/games-action/openastromenace/openastromenace-1.3.2.ebuild
index 02e004964e593..128aae3a3dc96 100644
--- a/games-action/openastromenace/openastromenace-1.3.2.ebuild
+++ b/games-action/openastromenace/openastromenace-1.3.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/openastromenace/${PV}/astromenace-src-${PV}.tar.bz
 
 LICENSE="GPL-3 GPL-3+ CC-BY-SA-3.0 UbuntuFontLicense-1.0 OFL-1.1"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="virtual/opengl
diff --git a/games-action/openclonk/openclonk-7.0.ebuild b/games-action/openclonk/openclonk-7.0.ebuild
index da2e07fe36930..081848c692d27 100644
--- a/games-action/openclonk/openclonk-7.0.ebuild
+++ b/games-action/openclonk/openclonk-7.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.openclonk.org/builds/release/${PV}/openclonk-${PV}-src.tar.b
 
 LICENSE="BSD ISC CLONK-trademark LGPL-2.1 POSTGRESQL"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="dedicated doc"
 
 RDEPEND="
diff --git a/games-action/orbital-eunuchs-sniper/orbital-eunuchs-sniper-1.30.ebuild b/games-action/orbital-eunuchs-sniper/orbital-eunuchs-sniper-1.30.ebuild
index 6cc4e47b2220c..c17cf518f48cf 100644
--- a/games-action/orbital-eunuchs-sniper/orbital-eunuchs-sniper-1.30.ebuild
+++ b/games-action/orbital-eunuchs-sniper/orbital-eunuchs-sniper-1.30.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://filesingularity.timedoctor.org/${MY_P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="media-libs/libsdl[joystick,video]
diff --git a/games-action/phobiaii/phobiaii-1.1.ebuild b/games-action/phobiaii/phobiaii-1.1.ebuild
index 82d6f4d5b38af..d19b175771cdb 100644
--- a/games-action/phobiaii/phobiaii-1.1.ebuild
+++ b/games-action/phobiaii/phobiaii-1.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.lynxlabs.com/games/linuxphobia/${MY_P}-i386.tar.bz2"
 
 LICENSE="freedist"		#505612
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="sys-libs/lib-compat
diff --git a/games-action/powermanga/powermanga-0.91.ebuild b/games-action/powermanga/powermanga-0.91.ebuild
index 777d44c0a3e2a..8c1535908e0f9 100644
--- a/games-action/powermanga/powermanga-0.91.ebuild
+++ b/games-action/powermanga/powermanga-0.91.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://linux.tlk.fr/games/Powermanga/download/${P}.tgz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=media-libs/libsdl-1.2[sound,joystick,video]
diff --git a/games-action/powermanga/powermanga-0.93.1.ebuild b/games-action/powermanga/powermanga-0.93.1.ebuild
index 52aa04caee1a1..7a15863dd3cef 100644
--- a/games-action/powermanga/powermanga-0.93.1.ebuild
+++ b/games-action/powermanga/powermanga-0.93.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://linux.tlk.fr/games/Powermanga/download/${P}.tgz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=media-libs/libsdl-1.2[sound,joystick,video]
diff --git a/games-action/rafkill/rafkill-1.2.3.ebuild b/games-action/rafkill/rafkill-1.2.3.ebuild
index 9a8e4bc51e303..17fd4cdd455a8 100644
--- a/games-action/rafkill/rafkill-1.2.3.ebuild
+++ b/games-action/rafkill/rafkill-1.2.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/raptorv2/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="<media-libs/allegro-5
diff --git a/games-action/rrootage/rrootage-0.23a.ebuild b/games-action/rrootage/rrootage-0.23a.ebuild
index ace4ee1f53377..92e9bc6fefdfa 100644
--- a/games-action/rrootage/rrootage-0.23a.ebuild
+++ b/games-action/rrootage/rrootage-0.23a.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="virtual/opengl
diff --git a/games-action/rune/rune-1.07-r2.ebuild b/games-action/rune/rune-1.07-r2.ebuild
index 6a78e4c95db8b..1a1348b89aef2 100644
--- a/games-action/rune/rune-1.07-r2.ebuild
+++ b/games-action/rune/rune-1.07-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/rune-all-0.2.tar.bz2"
 
 LICENSE="LOKI-EULA"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 RESTRICT="strip"
 
diff --git a/games-action/shootingstar/shootingstar-1.2.0.ebuild b/games-action/shootingstar/shootingstar-1.2.0.ebuild
index 8e46a06ad764c..a0aa580eac985 100644
--- a/games-action/shootingstar/shootingstar-1.2.0.ebuild
+++ b/games-action/shootingstar/shootingstar-1.2.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="virtual/opengl
diff --git a/games-action/slune/slune-1.0.15-r1.ebuild b/games-action/slune/slune-1.0.15-r1.ebuild
index 3dc3e885cb03f..a6e9ecaf1c09f 100644
--- a/games-action/slune/slune-1.0.15-r1.ebuild
+++ b/games-action/slune/slune-1.0.15-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://download.gna.org/slune/Slune-${PV}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="virtual/opengl
diff --git a/games-action/snipes/snipes-1.0.4.ebuild b/games-action/snipes/snipes-1.0.4.ebuild
index e7acfa91955df..1ad7da5f6ca9c 100644
--- a/games-action/snipes/snipes-1.0.4.ebuild
+++ b/games-action/snipes/snipes-1.0.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://cyp.github.com/snipes/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="media-libs/libsdl[sound,video]"
diff --git a/games-action/solar2/solar2-1.10.ebuild b/games-action/solar2/solar2-1.10.ebuild
index d2490df9c0c79..b39d133c35578 100644
--- a/games-action/solar2/solar2-1.10.ebuild
+++ b/games-action/solar2/solar2-1.10.ebuild
@@ -18,7 +18,7 @@ SRC_URI="${GAMEBALL} ${ICONFILE}"
 
 LICENSE="all-rights-reserved"
 SLOT="0"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE="bundled-libs"
 RESTRICT="bindist fetch splitdebug"
 
diff --git a/games-action/spacearyarya-kxl/spacearyarya-kxl-1.0.2-r1.ebuild b/games-action/spacearyarya-kxl/spacearyarya-kxl-1.0.2-r1.ebuild
index 0c9b282210665..e517d2a266e73 100644
--- a/games-action/spacearyarya-kxl/spacearyarya-kxl-1.0.2-r1.ebuild
+++ b/games-action/spacearyarya-kxl/spacearyarya-kxl-1.0.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="dev-games/KXL"
diff --git a/games-action/spacetripper-demo/spacetripper-demo-1.ebuild b/games-action/spacetripper-demo/spacetripper-demo-1.ebuild
index 8ab3710656c6c..ddb517296a7a2 100644
--- a/games-action/spacetripper-demo/spacetripper-demo-1.ebuild
+++ b/games-action/spacetripper-demo/spacetripper-demo-1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.btinternet.com/~bongpig/${MY_P}.sh"
 
 LICENSE="POMPOM"
 SLOT="0"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE=""
 RESTRICT="strip"
 
diff --git a/games-action/super-hexagon/super-hexagon-20141027.ebuild b/games-action/super-hexagon/super-hexagon-20141027.ebuild
index dbd986011ba86..4998bfea0c811 100644
--- a/games-action/super-hexagon/super-hexagon-20141027.ebuild
+++ b/games-action/super-hexagon/super-hexagon-20141027.ebuild
@@ -14,7 +14,7 @@ SRC_URI="superhexagon-${PV:4:4}${PV:0:4}-bin"
 
 LICENSE="all-rights-reserved"
 SLOT="0"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE="bundled-libs"
 RESTRICT="bindist fetch splitdebug"
 
diff --git a/games-action/supertuxkart/supertuxkart-0.9.2.ebuild b/games-action/supertuxkart/supertuxkart-0.9.2.ebuild
index 05ff5a68fc1c0..3a6bb3ccb47af 100644
--- a/games-action/supertuxkart/supertuxkart-0.9.2.ebuild
+++ b/games-action/supertuxkart/supertuxkart-0.9.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/SuperTuxKart/${PV}/${P}-src.tar.xz
 
 LICENSE="GPL-2 GPL-3 CC-BY-SA-3.0 CC-BY-2.0 public-domain ZLIB"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="debug fribidi wiimote"
 
 # don't unbundle irrlicht and bullet
diff --git a/games-action/swordandsworcery/swordandsworcery-1.02.ebuild b/games-action/swordandsworcery/swordandsworcery-1.02.ebuild
index 6ea8534569b6a..7369ce107ba34 100644
--- a/games-action/swordandsworcery/swordandsworcery-1.02.ebuild
+++ b/games-action/swordandsworcery/swordandsworcery-1.02.ebuild
@@ -13,7 +13,7 @@ SRC_URI="${PN}_${PV}.tar.gz"
 
 LICENSE="CAPYBARA-EULA LGPL-3"
 SLOT="0"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE="bundled-libs"
 RESTRICT="bindist fetch splitdebug"
 
diff --git a/games-action/teeworlds/teeworlds-0.6.4.ebuild b/games-action/teeworlds/teeworlds-0.6.4.ebuild
index 4ffbb88a2c8ee..160ddb439d502 100644
--- a/games-action/teeworlds/teeworlds-0.6.4.ebuild
+++ b/games-action/teeworlds/teeworlds-0.6.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://downloads.teeworlds.com/${P}-src.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="debug dedicated"
 
 RDEPEND="
diff --git a/games-action/towbowl-tactics/towbowl-tactics-0.5.ebuild b/games-action/towbowl-tactics/towbowl-tactics-0.5.ebuild
index a940449a70646..68970fe0ac942 100644
--- a/games-action/towbowl-tactics/towbowl-tactics-0.5.ebuild
+++ b/games-action/towbowl-tactics/towbowl-tactics-0.5.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.towbowltactics.com/download/tbt.${PV}.src.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-libs/libxml2
diff --git a/games-action/transcend/transcend-0.3.ebuild b/games-action/transcend/transcend-0.3.ebuild
index 48c39da3facfb..fcc485b73893d 100644
--- a/games-action/transcend/transcend-0.3.ebuild
+++ b/games-action/transcend/transcend-0.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/Transcend_${PV}_UnixSource.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="x11-libs/libXmu
diff --git a/games-action/trine2/trine2-1.16-r1.ebuild b/games-action/trine2/trine2-1.16-r1.ebuild
index e80cc561e163c..83ead951316e6 100644
--- a/games-action/trine2/trine2-1.16-r1.ebuild
+++ b/games-action/trine2/trine2-1.16-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="${PN}_linux_installer.run"
 
 LICENSE="all-rights-reserved"
 SLOT="0"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE="bundled-libs +launcher"
 RESTRICT="fetch bindist splitdebug"
 
diff --git a/games-action/trosh/trosh-20.ebuild b/games-action/trosh/trosh-20.ebuild
index d151e8ebeb8e8..945b7883080a3 100644
--- a/games-action/trosh/trosh-20.ebuild
+++ b/games-action/trosh/trosh-20.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://stabyourself.net/dl.php?file=trosh/trosh-linux.zip -> ${P}.zip
 
 LICENSE="WTFPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND=">=games-engines/love-0.8.0
 	 media-libs/devil[png]"
diff --git a/games-action/tuxkart/tuxkart-0.4.0.ebuild b/games-action/tuxkart/tuxkart-0.4.0.ebuild
index bf20f3590ceaa..a3f8017fa6e8e 100644
--- a/games-action/tuxkart/tuxkart-0.4.0.ebuild
+++ b/games-action/tuxkart/tuxkart-0.4.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/tuxkart/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 x86"
+KEYWORDS="~alpha ~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=media-libs/plib-1.8.0
diff --git a/games-action/violetland/violetland-0.4.3-r1.ebuild b/games-action/violetland/violetland-0.4.3-r1.ebuild
index 0611b91d5ba7b..5067bd2caca58 100644
--- a/games-action/violetland/violetland-0.4.3-r1.ebuild
+++ b/games-action/violetland/violetland-0.4.3-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ooxi/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3 CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/games-action/wordwarvi/wordwarvi-1.00.ebuild b/games-action/wordwarvi/wordwarvi-1.00.ebuild
index 0e0dddb230e78..8711293cd3925 100644
--- a/games-action/wordwarvi/wordwarvi-1.00.ebuild
+++ b/games-action/wordwarvi/wordwarvi-1.00.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/wordwarvi/${P}.tar.gz"
 
 LICENSE="GPL-2 CC-BY-2.0 CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="portaudio"
 
 RDEPEND="x11-libs/gtk+:2
diff --git a/games-action/xblast/xblast-2.10.4.ebuild b/games-action/xblast/xblast-2.10.4.ebuild
index 318cd1e59465c..9684e67bb75ea 100644
--- a/games-action/xblast/xblast-2.10.4.ebuild
+++ b/games-action/xblast/xblast-2.10.4.ebuild
@@ -22,7 +22,7 @@ SRC_URI="mirror://sourceforge/xblast/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="x11-libs/libICE
diff --git a/games-action/xbomber/xbomber-101.ebuild b/games-action/xbomber/xbomber-101.ebuild
index ea3a93e6f871d..6181186ab8c67 100644
--- a/games-action/xbomber/xbomber-101.ebuild
+++ b/games-action/xbomber/xbomber-101.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.xdr.com/dash/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="x11-libs/libX11"
diff --git a/games-action/xpilot/xpilot-4.5.5.ebuild b/games-action/xpilot/xpilot-4.5.5.ebuild
index 578c69b90d88e..2c6cfca0d0a1a 100644
--- a/games-action/xpilot/xpilot-4.5.5.ebuild
+++ b/games-action/xpilot/xpilot-4.5.5.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/xpilotgame/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/games-arcade/abe/abe-1.1.ebuild b/games-arcade/abe/abe-1.1.ebuild
index d81fe0b77a512..78fcff1e13fa7 100644
--- a/games-arcade/abe/abe-1.1.ebuild
+++ b/games-arcade/abe/abe-1.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/abe/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND="media-libs/libsdl[sound,video]
diff --git a/games-arcade/afternoonstalker/afternoonstalker-1.1.5.ebuild b/games-arcade/afternoonstalker/afternoonstalker-1.1.5.ebuild
index 2c37dc41531d0..9f0422562b43d 100644
--- a/games-arcade/afternoonstalker/afternoonstalker-1.1.5.ebuild
+++ b/games-arcade/afternoonstalker/afternoonstalker-1.1.5.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://perso.b2b2c.ca/sarrazip/dev/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=dev-games/flatzebra-0.1.6"
diff --git a/games-arcade/alienwave/alienwave-0.3.0.ebuild b/games-arcade/alienwave/alienwave-0.3.0.ebuild
index 37cf7122bb954..c633e6d751cf8 100644
--- a/games-arcade/alienwave/alienwave-0.3.0.ebuild
+++ b/games-arcade/alienwave/alienwave-0.3.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.alessandropira.org/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND="sys-libs/ncurses:0"
diff --git a/games-arcade/alienwave/alienwave-0.4.0.ebuild b/games-arcade/alienwave/alienwave-0.4.0.ebuild
index 37cf7122bb954..c633e6d751cf8 100644
--- a/games-arcade/alienwave/alienwave-0.4.0.ebuild
+++ b/games-arcade/alienwave/alienwave-0.4.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.alessandropira.org/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND="sys-libs/ncurses:0"
diff --git a/games-arcade/amphetamine/amphetamine-0.8.10.ebuild b/games-arcade/amphetamine/amphetamine-0.8.10.ebuild
index 5f840d2aa448d..4955b35b0d953 100644
--- a/games-arcade/amphetamine/amphetamine-0.8.10.ebuild
+++ b/games-arcade/amphetamine/amphetamine-0.8.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://homepage.hispeed.ch/loehrer/amph/files/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND="media-libs/libsdl[sound,video]
diff --git a/games-arcade/aop/aop-0.6.ebuild b/games-arcade/aop/aop-0.6.ebuild
index db9c230bc2bb8..572546e8b1ed0 100644
--- a/games-arcade/aop/aop-0.6.ebuild
+++ b/games-arcade/aop/aop-0.6.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.raffi.at/code/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND="sys-libs/ncurses:0"
diff --git a/games-arcade/apricots/apricots-0.2.6-r1.ebuild b/games-arcade/apricots/apricots-0.2.6-r1.ebuild
index 0e9f2c3017bcc..a67017a31fa77 100644
--- a/games-arcade/apricots/apricots-0.2.6-r1.ebuild
+++ b/games-arcade/apricots/apricots-0.2.6-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.fishies.org.uk/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND="media-libs/libsdl[sound,video]
diff --git a/games-arcade/ascii-invaders/ascii-invaders-0.1b.ebuild b/games-arcade/ascii-invaders/ascii-invaders-0.1b.ebuild
index 57ef887ecc278..55e7238038028 100644
--- a/games-arcade/ascii-invaders/ascii-invaders-0.1b.ebuild
+++ b/games-arcade/ascii-invaders/ascii-invaders-0.1b.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/invaders${PV}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~mips ppc64 x86 ~x86-fbsd ~ppc-macos"
+KEYWORDS="~alpha ~amd64 ~mips ~ppc64 ~x86 ~x86-fbsd ~ppc-macos"
 IUSE=""
 
 RDEPEND="sys-libs/ncurses:0"
diff --git a/games-arcade/asteroid/asteroid-1.1.ebuild b/games-arcade/asteroid/asteroid-1.1.ebuild
index e3ebb65c47dd1..f3284e2aa1260 100644
--- a/games-arcade/asteroid/asteroid-1.1.ebuild
+++ b/games-arcade/asteroid/asteroid-1.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/chaoslizard/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND="virtual/opengl
diff --git a/games-arcade/balloonchase/balloonchase-0.9.6.ebuild b/games-arcade/balloonchase/balloonchase-0.9.6.ebuild
index 607d33f8c6db3..44e1c0eec9b40 100644
--- a/games-arcade/balloonchase/balloonchase-0.9.6.ebuild
+++ b/games-arcade/balloonchase/balloonchase-0.9.6.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://koti.mbnet.fi/makegho/c/bchase/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="media-libs/libsdl[video]"
diff --git a/games-arcade/barbarian-bin/barbarian-bin-1.01-r1.ebuild b/games-arcade/barbarian-bin/barbarian-bin-1.01-r1.ebuild
index 0dd2fc4d5ead0..555f99dd3acb4 100644
--- a/games-arcade/barbarian-bin/barbarian-bin-1.01-r1.ebuild
+++ b/games-arcade/barbarian-bin/barbarian-bin-1.01-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.pcpages.com/tomberrr/downloads/${MY_PN}${PV/./}_linux.zip"
 
 LICENSE="CC-BY-NC-ND-2.0"
 SLOT="0"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 RESTRICT="strip"
 IUSE=""
 
diff --git a/games-arcade/batrachians/batrachians-0.1.6.ebuild b/games-arcade/batrachians/batrachians-0.1.6.ebuild
index 4517fed93f6d9..3b40a81fe0596 100644
--- a/games-arcade/batrachians/batrachians-0.1.6.ebuild
+++ b/games-arcade/batrachians/batrachians-0.1.6.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://perso.b2b2c.ca/sarrazip/dev/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-games/flatzebra-0.1.5"
diff --git a/games-arcade/berusky/berusky-1.7.1.ebuild b/games-arcade/berusky/berusky-1.7.1.ebuild
index eddcbfa005b70..93f816e6bc876 100644
--- a/games-arcade/berusky/berusky-1.7.1.ebuild
+++ b/games-arcade/berusky/berusky-1.7.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.anakreon.cz/download/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="media-libs/libsdl[X,video]
diff --git a/games-arcade/betna/betna-0.9.7.ebuild b/games-arcade/betna/betna-0.9.7.ebuild
index 4671afc7fd470..5ec01c5aec8c1 100644
--- a/games-arcade/betna/betna-0.9.7.ebuild
+++ b/games-arcade/betna/betna-0.9.7.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://koti.mbnet.fi/makegho/c/betna/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND="media-libs/libsdl[video]"
diff --git a/games-arcade/blobby/blobby-0.9c.ebuild b/games-arcade/blobby/blobby-0.9c.ebuild
index 0c7fcb70144ff..8ab2d790983ea 100644
--- a/games-arcade/blobby/blobby-0.9c.ebuild
+++ b/games-arcade/blobby/blobby-0.9c.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}2-linux-${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-games/physfs-2[zip]
diff --git a/games-arcade/bloboats/bloboats-1.0.2.ebuild b/games-arcade/bloboats/bloboats-1.0.2.ebuild
index 579487f2cdf4a..0ab9c02f4416e 100644
--- a/games-arcade/bloboats/bloboats-1.0.2.ebuild
+++ b/games-arcade/bloboats/bloboats-1.0.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://mirror.kapsi.fi/bloboats.dy.fi/${P}.tar.gz"
 
 LICENSE="GPL-2 CC-Sampling-Plus-1.0"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="media-libs/libsdl[opengl,video]
diff --git a/games-arcade/blobwars/blobwars-2.00.ebuild b/games-arcade/blobwars/blobwars-2.00.ebuild
index 70c1e0d099234..c8e537631e83d 100644
--- a/games-arcade/blobwars/blobwars-2.00.ebuild
+++ b/games-arcade/blobwars/blobwars-2.00.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/blobwars/${P}.tar.gz"
 
 LICENSE="BSD CC-BY-SA-3.0 CC-BY-3.0 GPL-2 LGPL-2.1 fairuse public-domain"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/games-arcade/blockrage/blockrage-0.2.3.ebuild b/games-arcade/blockrage/blockrage-0.2.3.ebuild
index 11dc84a87fd43..62aa1d3692a6a 100644
--- a/games-arcade/blockrage/blockrage-0.2.3.ebuild
+++ b/games-arcade/blockrage/blockrage-0.2.3.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="media-libs/libsdl[video]"
diff --git a/games-arcade/bomns/bomns-0.99.2.ebuild b/games-arcade/bomns/bomns-0.99.2.ebuild
index 251ef5b34f5af..98b2d87716e95 100644
--- a/games-arcade/bomns/bomns-0.99.2.ebuild
+++ b/games-arcade/bomns/bomns-0.99.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/greenridge/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 IUSE="gtk editor"
 
 DEPEND="media-libs/libsdl[video]
diff --git a/games-arcade/briquolo/briquolo-0.5.7.ebuild b/games-arcade/briquolo/briquolo-0.5.7.ebuild
index 050c704fed626..07776ecc77350 100644
--- a/games-arcade/briquolo/briquolo-0.5.7.ebuild
+++ b/games-arcade/briquolo/briquolo-0.5.7.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://briquolo.free.fr/download/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="nls"
 
 RDEPEND="virtual/opengl
diff --git a/games-arcade/bub-n-bros/bub-n-bros-1.6.2.ebuild b/games-arcade/bub-n-bros/bub-n-bros-1.6.2.ebuild
index 158744ee2a959..a930f12a9b08a 100644
--- a/games-arcade/bub-n-bros/bub-n-bros-1.6.2.ebuild
+++ b/games-arcade/bub-n-bros/bub-n-bros-1.6.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT Artistic-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND="dev-python/pygame[${PYTHON_USEDEP}]
diff --git a/games-arcade/bumprace/bumprace-1.5.3.ebuild b/games-arcade/bumprace/bumprace-1.5.3.ebuild
index 690c8b9f4b40d..cd28a4e023c11 100644
--- a/games-arcade/bumprace/bumprace-1.5.3.ebuild
+++ b/games-arcade/bumprace/bumprace-1.5.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://user.cs.tu-berlin.de/~karlb/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="media-libs/libsdl[sound,video]
diff --git a/games-arcade/burgerspace/burgerspace-1.9.2.ebuild b/games-arcade/burgerspace/burgerspace-1.9.2.ebuild
index 6d7cb8cb9ea4a..6eb8eafc4737c 100644
--- a/games-arcade/burgerspace/burgerspace-1.9.2.ebuild
+++ b/games-arcade/burgerspace/burgerspace-1.9.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://perso.b2b2c.ca/sarrazip/dev/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 IUSE="network"
 RESTRICT="test"  # doesn't really test anything
 
diff --git a/games-arcade/cavezofphear/cavezofphear-0.5.1.ebuild b/games-arcade/cavezofphear/cavezofphear-0.5.1.ebuild
index 219ade4d45140..d8b152e2fbfe6 100644
--- a/games-arcade/cavezofphear/cavezofphear-0.5.1.ebuild
+++ b/games-arcade/cavezofphear/cavezofphear-0.5.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.x86.no/${PN}/${P/cavezof}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=sys-libs/ncurses-5:0"
diff --git a/games-arcade/cdogs-sdl/cdogs-sdl-0.4-r1.ebuild b/games-arcade/cdogs-sdl/cdogs-sdl-0.4-r1.ebuild
index 767d4b7de0630..04c64376691c0 100644
--- a/games-arcade/cdogs-sdl/cdogs-sdl-0.4-r1.ebuild
+++ b/games-arcade/cdogs-sdl/cdogs-sdl-0.4-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://icculus.org/cdogs-sdl/files/src/${P}.tar.bz2
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="media-libs/libsdl[video]
diff --git a/games-arcade/ceferino/ceferino-0.97.8-r1.ebuild b/games-arcade/ceferino/ceferino-0.97.8-r1.ebuild
index 6d1e89c00ce03..b4c9c5d4ba3a7 100644
--- a/games-arcade/ceferino/ceferino-0.97.8-r1.ebuild
+++ b/games-arcade/ceferino/ceferino-0.97.8-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://debian/pool/main/c/ceferino/${PN}_${PV}+svn37.orig.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="nls"
 
 RDEPEND=">=media-libs/libsdl-1.2[video]
diff --git a/games-arcade/ceferino/ceferino-0.97.8.ebuild b/games-arcade/ceferino/ceferino-0.97.8.ebuild
index bb2810b21e716..bc9454cb0f491 100644
--- a/games-arcade/ceferino/ceferino-0.97.8.ebuild
+++ b/games-arcade/ceferino/ceferino-0.97.8.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.loosersjuegos.com.ar/juegos/ceferino/descargas/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="nls"
 
 RDEPEND=">=media-libs/libsdl-1.2
diff --git a/games-arcade/circuslinux/circuslinux-1.0.3.ebuild b/games-arcade/circuslinux/circuslinux-1.0.3.ebuild
index 042fa47ffc38b..dbfb82dcd6457 100644
--- a/games-arcade/circuslinux/circuslinux-1.0.3.ebuild
+++ b/games-arcade/circuslinux/circuslinux-1.0.3.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.newbreedsoftware.com/circus-linux/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 x86"
+KEYWORDS="~alpha ~amd64 ~x86"
 IUSE=""
 
 DEPEND="media-libs/libsdl
diff --git a/games-arcade/cob/cob-0.9.ebuild b/games-arcade/cob/cob-0.9.ebuild
index a8af1488cc0af..7393dae66eeaf 100644
--- a/games-arcade/cob/cob-0.9.ebuild
+++ b/games-arcade/cob/cob-0.9.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.autismuk.freeserve.co.uk/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND="media-libs/libsdl[joystick,sound,video]"
diff --git a/games-arcade/commandergenius/commandergenius-1.8.3.ebuild b/games-arcade/commandergenius/commandergenius-1.8.3.ebuild
index fffce71ab38a1..435c937ccf640 100644
--- a/games-arcade/commandergenius/commandergenius-1.8.3.ebuild
+++ b/games-arcade/commandergenius/commandergenius-1.8.3.ebuild
@@ -12,7 +12,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/conveysdl/conveysdl-1.3.ebuild b/games-arcade/conveysdl/conveysdl-1.3.ebuild
index 7df9106d36cbd..53d4dd6d48b96 100644
--- a/games-arcade/conveysdl/conveysdl-1.3.ebuild
+++ b/games-arcade/conveysdl/conveysdl-1.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.cloudsprinter.com/software/conveysdl/${P/-/.}.tar"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND="media-libs/libsdl[sound,video]
diff --git a/games-arcade/cosmosmash/cosmosmash-1.4.7.ebuild b/games-arcade/cosmosmash/cosmosmash-1.4.7.ebuild
index d92de90e61bde..e2c11182dfce4 100644
--- a/games-arcade/cosmosmash/cosmosmash-1.4.7.ebuild
+++ b/games-arcade/cosmosmash/cosmosmash-1.4.7.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://perso.b2b2c.ca/sarrazip/dev/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 RESTRICT="test" # uses the sound card which portage user might not be available.
 
diff --git a/games-arcade/crack-attack/crack-attack-1.1.14-r1.ebuild b/games-arcade/crack-attack/crack-attack-1.1.14-r1.ebuild
index db179078ba7ab..b91f0af19a74d 100644
--- a/games-arcade/crack-attack/crack-attack-1.1.14-r1.ebuild
+++ b/games-arcade/crack-attack/crack-attack-1.1.14-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://savannah.nongnu.org/download/crack-attack/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm hppa x86"
+KEYWORDS="~amd64 ~arm ~hppa ~x86"
 IUSE="gtk sdl"
 
 RDEPEND="media-libs/freeglut
diff --git a/games-arcade/criticalmass/criticalmass-1.0.2.ebuild b/games-arcade/criticalmass/criticalmass-1.0.2.ebuild
index b3e5262bb5d1b..9306a54dd1459 100644
--- a/games-arcade/criticalmass/criticalmass-1.0.2.ebuild
+++ b/games-arcade/criticalmass/criticalmass-1.0.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/criticalmass/CriticalMass-${PV}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="media-libs/sdl-mixer
diff --git a/games-arcade/defendguin/defendguin-0.0.12.ebuild b/games-arcade/defendguin/defendguin-0.0.12.ebuild
index 1945b4c2f41b1..1dab751e0ae6e 100644
--- a/games-arcade/defendguin/defendguin-0.0.12.ebuild
+++ b/games-arcade/defendguin/defendguin-0.0.12.ebuild
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.tuxpaint.org/unix/x/${PN}/src/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND="media-libs/sdl-mixer[mod]
diff --git a/games-arcade/diameter/diameter-0.4.0.3-r2.ebuild b/games-arcade/diameter/diameter-0.4.0.3-r2.ebuild
index 6421dfd3c481c..1f7c45b1a67f2 100644
--- a/games-arcade/diameter/diameter-0.4.0.3-r2.ebuild
+++ b/games-arcade/diameter/diameter-0.4.0.3-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/gamediameter/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/games-arcade/digger/digger-20140423.ebuild b/games-arcade/digger/digger-20140423.ebuild
index 22c26861b43fb..729b2a2bfed18 100644
--- a/games-arcade/digger/digger-20140423.ebuild
+++ b/games-arcade/digger/digger-20140423.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd"
 
 DEPEND="media-libs/libsdl[X,video]
 	x11-libs/libX11"
diff --git a/games-arcade/dynamitejack/dynamitejack-1.0.23-r1.ebuild b/games-arcade/dynamitejack/dynamitejack-1.0.23-r1.ebuild
index c0f60aad93b70..580c082224c1c 100644
--- a/games-arcade/dynamitejack/dynamitejack-1.0.23-r1.ebuild
+++ b/games-arcade/dynamitejack/dynamitejack-1.0.23-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="${P}.tgz"
 
 LICENSE="all-rights-reserved"
 SLOT="0"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE=""
 RESTRICT="bindist fetch splitdebug"
 
diff --git a/games-arcade/emilia-pinball/emilia-pinball-0.3.1-r1.ebuild b/games-arcade/emilia-pinball/emilia-pinball-0.3.1-r1.ebuild
index db5a8bedbe6b8..519b304f6840e 100644
--- a/games-arcade/emilia-pinball/emilia-pinball-0.3.1-r1.ebuild
+++ b/games-arcade/emilia-pinball/emilia-pinball-0.3.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/pinball/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 # Drop the libtool dep once libltdl goes stable.
diff --git a/games-arcade/epiar/epiar-0.5-r1.ebuild b/games-arcade/epiar/epiar-0.5-r1.ebuild
index c4f796d7729a0..7ddbc3d9c6688 100644
--- a/games-arcade/epiar/epiar-0.5-r1.ebuild
+++ b/games-arcade/epiar/epiar-0.5-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/epiar/${P}.0-src.zip"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="x86 ~x86-fbsd"
+KEYWORDS="~x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND="media-libs/libsdl[video]
diff --git a/games-arcade/excido/excido-0.1.5c-r2.ebuild b/games-arcade/excido/excido-0.1.5c-r2.ebuild
index d87e0a4a853da..9f307bcec04cc 100644
--- a/games-arcade/excido/excido-0.1.5c-r2.ebuild
+++ b/games-arcade/excido/excido-0.1.5c-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://icculus.org/excido/${P}-src.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="dev-games/physfs
diff --git a/games-arcade/fishsupper/fishsupper-0.1.6.ebuild b/games-arcade/fishsupper/fishsupper-0.1.6.ebuild
index f8bd06bcde9a5..afde34992919c 100644
--- a/games-arcade/fishsupper/fishsupper-0.1.6.ebuild
+++ b/games-arcade/fishsupper/fishsupper-0.1.6.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="CC-BY-SA-2.5 GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="media-libs/libsdl[sound,video,opengl,X]
diff --git a/games-arcade/frozen-bubble/frozen-bubble-2.2.1_beta1.ebuild b/games-arcade/frozen-bubble/frozen-bubble-2.2.1_beta1.ebuild
index 168b5bd24e047..e6a4b39557a45 100644
--- a/games-arcade/frozen-bubble/frozen-bubble-2.2.1_beta1.ebuild
+++ b/games-arcade/frozen-bubble/frozen-bubble-2.2.1_beta1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.frozen-bubble.org/data/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/perl-5.12
diff --git a/games-arcade/funnyboat/funnyboat-1.5-r1.ebuild b/games-arcade/funnyboat/funnyboat-1.5-r1.ebuild
index a4ed12d27ef9f..fca880216fc69 100644
--- a/games-arcade/funnyboat/funnyboat-1.5-r1.ebuild
+++ b/games-arcade/funnyboat/funnyboat-1.5-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip"
 
 LICENSE="GPL-2 MIT"
 SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/games-arcade/gav/gav-0.9.0.ebuild b/games-arcade/gav/gav-0.9.0.ebuild
index e42cbb3d42a54..058dbaf64bc12 100644
--- a/games-arcade/gav/gav-0.9.0.ebuild
+++ b/games-arcade/gav/gav-0.9.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/gav/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND="media-libs/sdl-image[jpeg,png]
diff --git a/games-arcade/gish-demo/gish-demo-1.6.ebuild b/games-arcade/gish-demo/gish-demo-1.6.ebuild
index ac350e9c04004..2a1952d0872c2 100644
--- a/games-arcade/gish-demo/gish-demo-1.6.ebuild
+++ b/games-arcade/gish-demo/gish-demo-1.6.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://s159260531.onlinehome.us/demos/gishdemo.tar.gz -> ${P}.tar.gz"
 
 LICENSE="all-rights-reserved"
 SLOT="0"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE=""
 RESTRICT="mirror bindist strip"
 QA_PREBUILT="${GAMES_PREFIX_OPT:1}/${PN}/gish"
diff --git a/games-arcade/gnake/gnake-0.94b.ebuild b/games-arcade/gnake/gnake-0.94b.ebuild
index 6ebda89f169c7..e1e5ccf4a42e3 100644
--- a/games-arcade/gnake/gnake-0.94b.ebuild
+++ b/games-arcade/gnake/gnake-0.94b.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/Gnake.${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND="sys-libs/ncurses:0"
diff --git a/games-arcade/gnujump/gnujump-1.0.8.ebuild b/games-arcade/gnujump/gnujump-1.0.8.ebuild
index 6f45b769dfa88..5232fcb51fe6e 100644
--- a/games-arcade/gnujump/gnujump-1.0.8.ebuild
+++ b/games-arcade/gnujump/gnujump-1.0.8.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="media-libs/libsdl[sound,video]
diff --git a/games-arcade/grande-KXL/grande-KXL-0.6.ebuild b/games-arcade/grande-KXL/grande-KXL-0.6.ebuild
index cbedf272e5c42..f13d1d105e173 100644
--- a/games-arcade/grande-KXL/grande-KXL-0.6.ebuild
+++ b/games-arcade/grande-KXL/grande-KXL-0.6.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="dev-games/KXL"
diff --git a/games-arcade/gunocide2ex/gunocide2ex-1.0.ebuild b/games-arcade/gunocide2ex/gunocide2ex-1.0.ebuild
index 74e8ee391f853..6b208fb284eb5 100644
--- a/games-arcade/gunocide2ex/gunocide2ex-1.0.ebuild
+++ b/games-arcade/gunocide2ex/gunocide2ex-1.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/g2ex/g2ex-setup.run"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ~x86-fbsd"
+KEYWORDS="~x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND="media-libs/libsdl[video]
diff --git a/games-arcade/holotz-castle/holotz-castle-1.3.14.ebuild b/games-arcade/holotz-castle/holotz-castle-1.3.14.ebuild
index fc6a09fa56792..e6c3106134bba 100644
--- a/games-arcade/holotz-castle/holotz-castle-1.3.14.ebuild
+++ b/games-arcade/holotz-castle/holotz-castle-1.3.14.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.mainreactor.net/holotzcastle/download/${P}-src.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="virtual/opengl
diff --git a/games-arcade/insaneodyssey/insaneodyssey-000311.ebuild b/games-arcade/insaneodyssey/insaneodyssey-000311.ebuild
index 74763f4692e3a..ad16a4bd5c1a6 100644
--- a/games-arcade/insaneodyssey/insaneodyssey-000311.ebuild
+++ b/games-arcade/insaneodyssey/insaneodyssey-000311.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/io${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="media-libs/libsdl[sound,video]
diff --git a/games-arcade/jardinains/jardinains-2.0-r1.ebuild b/games-arcade/jardinains/jardinains-2.0-r1.ebuild
index 76bd9aa512d22..e98d0da5f03b2 100644
--- a/games-arcade/jardinains/jardinains-2.0-r1.ebuild
+++ b/games-arcade/jardinains/jardinains-2.0-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/JN2_1_FREE_LIN.tar.gz"
 
 LICENSE="jardinains"
 SLOT="0"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE=""
 RESTRICT="strip"
 QA_EXECSTACK="${GAMES_PREFIX_OPT:1}/jardinains/jardinains"
diff --git a/games-arcade/jumpnbump/jumpnbump-1.50-r1.ebuild b/games-arcade/jumpnbump/jumpnbump-1.50-r1.ebuild
index 45e4ce433bcc3..e6ee225519b9b 100644
--- a/games-arcade/jumpnbump/jumpnbump-1.50-r1.ebuild
+++ b/games-arcade/jumpnbump/jumpnbump-1.50-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="X fbcon kde svga tk +music"
 
 DEPEND="
diff --git a/games-arcade/jvgs/jvgs-0.5.ebuild b/games-arcade/jvgs/jvgs-0.5.ebuild
index e621f1b451925..7fc533e52a0f2 100644
--- a/games-arcade/jvgs/jvgs-0.5.ebuild
+++ b/games-arcade/jvgs/jvgs-0.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/jvgs/${P}-src.tar.gz"
 
 LICENSE="WTFPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="virtual/opengl
diff --git a/games-arcade/kajaani-kombat/kajaani-kombat-0.7.ebuild b/games-arcade/kajaani-kombat/kajaani-kombat-0.7.ebuild
index 60bdb6bdabb1e..c0d0f15e78c3e 100644
--- a/games-arcade/kajaani-kombat/kajaani-kombat-0.7.ebuild
+++ b/games-arcade/kajaani-kombat/kajaani-kombat-0.7.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://kombat.kajaani.net/dl/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND="media-libs/libsdl[sound,video]
diff --git a/games-arcade/kobodeluxe/kobodeluxe-0.5.1.ebuild b/games-arcade/kobodeluxe/kobodeluxe-0.5.1.ebuild
index ad4d253f8b60d..26695f44115fb 100644
--- a/games-arcade/kobodeluxe/kobodeluxe-0.5.1.ebuild
+++ b/games-arcade/kobodeluxe/kobodeluxe-0.5.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.olofson.net/kobodl/download/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ppc64 x86"
+KEYWORDS="~alpha ~amd64 ~ppc64 ~x86"
 IUSE="opengl"
 
 DEPEND="media-libs/libsdl
diff --git a/games-arcade/komi/komi-1.04.ebuild b/games-arcade/komi/komi-1.04.ebuild
index 3d4472a48c26a..00fa29a72ff49 100644
--- a/games-arcade/komi/komi-1.04.ebuild
+++ b/games-arcade/komi/komi-1.04.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/komi/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="media-libs/libsdl[video]
diff --git a/games-arcade/late/late-0.1.0.ebuild b/games-arcade/late/late-0.1.0.ebuild
index 3dd5bba084e79..0cca3772f0b84 100644
--- a/games-arcade/late/late-0.1.0.ebuild
+++ b/games-arcade/late/late-0.1.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/late/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="media-libs/libsdl[video]
diff --git a/games-arcade/lbreakout/lbreakout-010315.ebuild b/games-arcade/lbreakout/lbreakout-010315.ebuild
index 536e479de6abd..fe1d2fbcc2ce3 100644
--- a/games-arcade/lbreakout/lbreakout-010315.ebuild
+++ b/games-arcade/lbreakout/lbreakout-010315.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/lgames/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND=">=media-libs/libsdl-1.1.5"
diff --git a/games-arcade/lbreakout2/lbreakout2-2.6.4.ebuild b/games-arcade/lbreakout2/lbreakout2-2.6.4.ebuild
index 8d9ccf79a233c..4e346d2e48a2a 100644
--- a/games-arcade/lbreakout2/lbreakout2-2.6.4.ebuild
+++ b/games-arcade/lbreakout2/lbreakout2-2.6.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI=" mirror://sourceforge/lgames/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 IUSE="nls themes"
 
 RDEPEND="media-libs/libpng:0
diff --git a/games-arcade/lbreakout2/lbreakout2-2.6.5.ebuild b/games-arcade/lbreakout2/lbreakout2-2.6.5.ebuild
index 5b6c7ae115e90..d64fc73c8fc9f 100644
--- a/games-arcade/lbreakout2/lbreakout2-2.6.5.ebuild
+++ b/games-arcade/lbreakout2/lbreakout2-2.6.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI=" mirror://sourceforge/lgames/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 IUSE="nls themes"
 
 RDEPEND="media-libs/libpng:0
diff --git a/games-arcade/marbleblast-demo/marbleblast-demo-1.3.ebuild b/games-arcade/marbleblast-demo/marbleblast-demo-1.3.ebuild
index cdce620fd6dca..2d408f8c7fece 100644
--- a/games-arcade/marbleblast-demo/marbleblast-demo-1.3.ebuild
+++ b/games-arcade/marbleblast-demo/marbleblast-demo-1.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="ftp://ggdev-1.homelan.com/marbleblast/MarbleBlastDemo-${PV}.sh.bin"
 
 LICENSE="MARBLEBLAST"
 SLOT="0"
-KEYWORDS="-* ~amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE=""
 RESTRICT="strip"
 
diff --git a/games-arcade/marbleblastgold-demo/marbleblastgold-demo-1.4.1.ebuild b/games-arcade/marbleblastgold-demo/marbleblastgold-demo-1.4.1.ebuild
index 165d13b1b9618..db76c45ef6a08 100644
--- a/games-arcade/marbleblastgold-demo/marbleblastgold-demo-1.4.1.ebuild
+++ b/games-arcade/marbleblastgold-demo/marbleblastgold-demo-1.4.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="ftp://ggdev-1.homelan.com/marbleblastgold/MarbleBlastGoldDemo-${PV}.sh.
 
 LICENSE="MARBLEBLAST"
 SLOT="0"
-KEYWORDS="-* ~amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE=""
 RESTRICT="strip"
 
diff --git a/games-arcade/methane/methane-1.5.1.ebuild b/games-arcade/methane/methane-1.5.1.ebuild
index 92ace93c3b7a8..5eb599ba67690 100644
--- a/games-arcade/methane/methane-1.5.1.ebuild
+++ b/games-arcade/methane/methane-1.5.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-games/clanlib:2.3[opengl,mikmod]"
diff --git a/games-arcade/missile/missile-1.0.1.ebuild b/games-arcade/missile/missile-1.0.1.ebuild
index a4cbf3b64fb2c..1b7653b64b3c1 100644
--- a/games-arcade/missile/missile-1.0.1.ebuild
+++ b/games-arcade/missile/missile-1.0.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 x86"
+KEYWORDS="~alpha ~amd64 ~x86"
 IUSE=""
 
 DEPEND="media-libs/libsdl[sound,video]
diff --git a/games-arcade/moleinvasion/moleinvasion-0.4-r1.ebuild b/games-arcade/moleinvasion/moleinvasion-0.4-r1.ebuild
index a11b05e9024b5..f9946b1c1eba9 100644
--- a/games-arcade/moleinvasion/moleinvasion-0.4-r1.ebuild
+++ b/games-arcade/moleinvasion/moleinvasion-0.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://download.tuxfamily.org/minvasion/packages/MoleInvasion-${PV}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="music"
 
 DEPEND="media-libs/libsdl[opengl,video]
diff --git a/games-arcade/monkey-bubble/monkey-bubble-0.4.0.ebuild b/games-arcade/monkey-bubble/monkey-bubble-0.4.0.ebuild
index 8b93bc24393e7..1810f05165fa7 100644
--- a/games-arcade/monkey-bubble/monkey-bubble-0.4.0.ebuild
+++ b/games-arcade/monkey-bubble/monkey-bubble-0.4.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://home.gna.org/monkeybubble/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="x11-libs/gtk+:2
diff --git a/games-arcade/monster-masher/monster-masher-1.8.1-r2.ebuild b/games-arcade/monster-masher/monster-masher-1.8.1-r2.ebuild
index ce823f3c0bf2e..e851818b384f2 100644
--- a/games-arcade/monster-masher/monster-masher-1.8.1-r2.ebuild
+++ b/games-arcade/monster-masher/monster-masher-1.8.1-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://people.iola.dk/olau/monster-masher/source/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND="
diff --git a/games-arcade/mrrescue/mrrescue-1.02b.ebuild b/games-arcade/mrrescue/mrrescue-1.02b.ebuild
index bcb7e9d2cd5c9..f4128a98d2d4a 100644
--- a/games-arcade/mrrescue/mrrescue-1.02b.ebuild
+++ b/games-arcade/mrrescue/mrrescue-1.02b.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/SimonLarsen/mrrescue/releases/download/v${PV}/${P}-l
 
 LICENSE="CC-BY-SA-3.0 MIT ZLIB"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="games-engines/love:0"
diff --git a/games-arcade/netris/netris-0.52-r1.ebuild b/games-arcade/netris/netris-0.52-r1.ebuild
index 5da075018d1f8..0052d3ee208aa 100644
--- a/games-arcade/netris/netris-0.52-r1.ebuild
+++ b/games-arcade/netris/netris-0.52-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.netris.org/pub/netris/${P}.tar.gz
 
 LICENSE='GPL-2'
 SLOT=0
-KEYWORDS="amd64 ~mips x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~mips ~x86 ~x86-fbsd"
 IUSE=''
 
 DEPEND='sys-libs/ncurses:0='
diff --git a/games-arcade/nibbles/nibbles-0.0.4.ebuild b/games-arcade/nibbles/nibbles-0.0.4.ebuild
index 17a8a3911cfc2..fe523f359b3d8 100644
--- a/games-arcade/nibbles/nibbles-0.0.4.ebuild
+++ b/games-arcade/nibbles/nibbles-0.0.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.earth.li/projectpurple/files/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd ~x86-linux ~ppc-macos"
 IUSE=""
 
 DEPEND="sys-libs/ncurses:0"
diff --git a/games-arcade/ninvaders/ninvaders-0.1.1.ebuild b/games-arcade/ninvaders/ninvaders-0.1.1.ebuild
index c697e148494e1..401662d5f691a 100644
--- a/games-arcade/ninvaders/ninvaders-0.1.1.ebuild
+++ b/games-arcade/ninvaders/ninvaders-0.1.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/ninvaders/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND="sys-libs/ncurses:0"
diff --git a/games-arcade/njam/njam-1.25.ebuild b/games-arcade/njam/njam-1.25.ebuild
index 2636456656c21..35681f65d97dc 100644
--- a/games-arcade/njam/njam-1.25.ebuild
+++ b/games-arcade/njam/njam-1.25.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/njam/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="media-libs/sdl-mixer
diff --git a/games-arcade/notpacman/notpacman-1.0.4.ebuild b/games-arcade/notpacman/notpacman-1.0.4.ebuild
index ff681fbfca7fe..e2332a41368ee 100644
--- a/games-arcade/notpacman/notpacman-1.0.4.ebuild
+++ b/games-arcade/notpacman/notpacman-1.0.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://stabyourself.net/dl.php?file=notpacman-1004/notpacman-linux.zip
 
 LICENSE="WTFPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 
 LVSLOT="0.7"
 RDEPEND=">=games-engines/love-0.7.2:${LVSLOT}
diff --git a/games-arcade/nottetris2/nottetris2-1.ebuild b/games-arcade/nottetris2/nottetris2-1.ebuild
index e4f26a331e584..583f8cae86337 100644
--- a/games-arcade/nottetris2/nottetris2-1.ebuild
+++ b/games-arcade/nottetris2/nottetris2-1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://stabyourself.net/dl.php?file=nottetris2/nottetris2-linux.zip ->
 
 LICENSE="CC-BY-NC-SA-3.0"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 
 LVSLOT="0.7"
 RDEPEND=">=games-engines/love-0.7.2:${LVSLOT}
diff --git a/games-arcade/openbubbles/openbubbles-1.2.ebuild b/games-arcade/openbubbles/openbubbles-1.2.ebuild
index 8a488abb5ab7a..69515aa06555b 100644
--- a/games-arcade/openbubbles/openbubbles-1.2.ebuild
+++ b/games-arcade/openbubbles/openbubbles-1.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://web.archive.org/web/20101126190910/http://www.freewebs.com/lasi
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~hppa x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~hppa ~x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND="media-libs/libsdl[sound,video]
diff --git a/games-arcade/openmortal/openmortal-0.7-r1.ebuild b/games-arcade/openmortal/openmortal-0.7-r1.ebuild
index 0a6084b0f6bc7..8d5a71e70a97f 100644
--- a/games-arcade/openmortal/openmortal-0.7-r1.ebuild
+++ b/games-arcade/openmortal/openmortal-0.7-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="media-libs/libsdl[video]
diff --git a/games-arcade/opensonic/opensonic-0.1.4-r1.ebuild b/games-arcade/opensonic/opensonic-0.1.4-r1.ebuild
index c280414e4a590..95eb7ebac18a1 100644
--- a/games-arcade/opensonic/opensonic-0.1.4-r1.ebuild
+++ b/games-arcade/opensonic/opensonic-0.1.4-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://sourceforge.net/projects/opensnc/files/Open%20Sonic/${PV}/opens
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 RESTRICT="mirror" # unsure about legality of graphics
 
diff --git a/games-arcade/orthorobot/orthorobot-0.ebuild b/games-arcade/orthorobot/orthorobot-0.ebuild
index 2697ae2a71e66..193b753c5c025 100644
--- a/games-arcade/orthorobot/orthorobot-0.ebuild
+++ b/games-arcade/orthorobot/orthorobot-0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://stabyourself.net/dl.php?file=${PN}/${PN}-source.zip -> ${P}.zip"
 
 LICENSE="CC-BY-NC-ND-3.0"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND=">=games-engines/love-0.8.0"
 DEPEND="${RDEPEND}
diff --git a/games-arcade/pachi/pachi-1.0.ebuild b/games-arcade/pachi/pachi-1.0.ebuild
index ad13b6da3c1ce..f1cc4a2b7bbf7 100644
--- a/games-arcade/pachi/pachi-1.0.ebuild
+++ b/games-arcade/pachi/pachi-1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="media-libs/libsdl[joystick,sound,video]
diff --git a/games-arcade/pacmanarena/pacmanarena-0.15.ebuild b/games-arcade/pacmanarena/pacmanarena-0.15.ebuild
index 9341cfad3a10b..92044a7d9a589 100644
--- a/games-arcade/pacmanarena/pacmanarena-0.15.ebuild
+++ b/games-arcade/pacmanarena/pacmanarena-0.15.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/pacman-arena-${PV}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 x86"
+KEYWORDS="~alpha ~amd64 ~x86"
 IUSE=""
 
 RDEPEND="virtual/opengl
diff --git a/games-arcade/penguin-command/penguin-command-1.6.11.ebuild b/games-arcade/penguin-command/penguin-command-1.6.11.ebuild
index 8546aecadfee4..7a44530273f4c 100644
--- a/games-arcade/penguin-command/penguin-command-1.6.11.ebuild
+++ b/games-arcade/penguin-command/penguin-command-1.6.11.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="media-libs/libsdl[sound,joystick,video]
diff --git a/games-arcade/pengupop/pengupop-2.2.5.ebuild b/games-arcade/pengupop/pengupop-2.2.5.ebuild
index a3ac3f9cfb899..c90b8970431f4 100644
--- a/games-arcade/pengupop/pengupop-2.2.5.ebuild
+++ b/games-arcade/pengupop/pengupop-2.2.5.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="media-libs/libsdl[sound,video]
diff --git a/games-arcade/performous/performous-1.1.ebuild b/games-arcade/performous/performous-1.1.ebuild
index 931d2970e34a3..e7eefe5ef0ab0 100644
--- a/games-arcade/performous/performous-1.1.ebuild
+++ b/games-arcade/performous/performous-1.1.ebuild
@@ -26,7 +26,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:2
diff --git a/games-arcade/primateplunge/primateplunge-1.1-r1.ebuild b/games-arcade/primateplunge/primateplunge-1.1-r1.ebuild
index 211d2a7caa24c..6ae5589fd4171 100644
--- a/games-arcade/primateplunge/primateplunge-1.1-r1.ebuild
+++ b/games-arcade/primateplunge/primateplunge-1.1-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.aelius.com/${PN}/${P}.tar.gz"
 
 LICENSE="Primate-Plunge"
 SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 IUSE=""
 RESTRICT="mirror bindist" #465850
 
diff --git a/games-arcade/pycadia/pycadia-0.5.1.ebuild b/games-arcade/pycadia/pycadia-0.5.1.ebuild
index a99279a58d492..2c00e9799aa79 100644
--- a/games-arcade/pycadia/pycadia-0.5.1.ebuild
+++ b/games-arcade/pycadia/pycadia-0.5.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.anti-particle.com/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND=">=dev-python/pygame-1.5.5
diff --git a/games-arcade/pydance-songs/pydance-songs-20040410.ebuild b/games-arcade/pydance-songs/pydance-songs-20040410.ebuild
index c43ac0bb038e2..1e07dca124715 100644
--- a/games-arcade/pydance-songs/pydance-songs-20040410.ebuild
+++ b/games-arcade/pydance-songs/pydance-songs-20040410.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 S=${WORKDIR}
diff --git a/games-arcade/pydance/pydance-1.1.0.ebuild b/games-arcade/pydance/pydance-1.1.0.ebuild
index 7be999cdfc954..aa64aa98212bf 100644
--- a/games-arcade/pydance/pydance-1.1.0.ebuild
+++ b/games-arcade/pydance/pydance-1.1.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.icculus.org/pyddr/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="dev-python/pygame
diff --git a/games-arcade/retrobattle/retrobattle-1.0.0.ebuild b/games-arcade/retrobattle/retrobattle-1.0.0.ebuild
index eed0252ed1e1a..08d9cc1ccf351 100644
--- a/games-arcade/retrobattle/retrobattle-1.0.0.ebuild
+++ b/games-arcade/retrobattle/retrobattle-1.0.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://remar.se/andreas/retrobattle/files/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 # test is incomplete
 RESTRICT="test"
diff --git a/games-arcade/ri-li/ri-li-2.0.1.ebuild b/games-arcade/ri-li/ri-li-2.0.1.ebuild
index 5775c8a852500..b978172bb74a1 100644
--- a/games-arcade/ri-li/ri-li-2.0.1.ebuild
+++ b/games-arcade/ri-li/ri-li-2.0.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/ri-li/Ri-li-${PV}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="media-libs/libsdl[sound,video]
diff --git a/games-arcade/rockdodger/rockdodger-0.6.0a-r1.ebuild b/games-arcade/rockdodger/rockdodger-0.6.0a-r1.ebuild
index 5bca59c55cf2c..1938ead0b1544 100644
--- a/games-arcade/rockdodger/rockdodger-0.6.0a-r1.ebuild
+++ b/games-arcade/rockdodger/rockdodger-0.6.0a-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/spacerocks/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND="media-libs/libsdl[sound,video]
diff --git a/games-arcade/rocksndiamonds/rocksndiamonds-3.3.1.2.ebuild b/games-arcade/rocksndiamonds/rocksndiamonds-3.3.1.2.ebuild
index 79b78f435a0d6..509d8487cc0db 100644
--- a/games-arcade/rocksndiamonds/rocksndiamonds-3.3.1.2.ebuild
+++ b/games-arcade/rocksndiamonds/rocksndiamonds-3.3.1.2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="http://www.artsoft.org/RELEASES/unix/rocksndiamonds/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="X sdl"
 
 RDEPEND="X? ( x11-libs/libX11 )
diff --git a/games-arcade/sable/sable-1.0.ebuild b/games-arcade/sable/sable-1.0.ebuild
index f896973fa965c..acffef5fd3737 100644
--- a/games-arcade/sable/sable-1.0.ebuild
+++ b/games-arcade/sable/sable-1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}-src.tgz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="virtual/opengl
diff --git a/games-arcade/sdb/sdb-1.0.2.ebuild b/games-arcade/sdb/sdb-1.0.2.ebuild
index 697c33a4ae701..7e136c19bb0ea 100644
--- a/games-arcade/sdb/sdb-1.0.2.ebuild
+++ b/games-arcade/sdb/sdb-1.0.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://gcsociety.sp.cs.cmu.edu/~frenzy/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="virtual/opengl
diff --git a/games-arcade/sdl-sopwith/sdl-sopwith-1.7.5-r1.ebuild b/games-arcade/sdl-sopwith/sdl-sopwith-1.7.5-r1.ebuild
index d45ce17acc69e..b6d2a802bccbb 100644
--- a/games-arcade/sdl-sopwith/sdl-sopwith-1.7.5-r1.ebuild
+++ b/games-arcade/sdl-sopwith/sdl-sopwith-1.7.5-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND=">=media-libs/libsdl-1.1.3[video]"
diff --git a/games-arcade/sdlroids/sdlroids-1.3.4-r3.ebuild b/games-arcade/sdlroids/sdlroids-1.3.4-r3.ebuild
index df5f525ccf44f..51c927585219a 100644
--- a/games-arcade/sdlroids/sdlroids-1.3.4-r3.ebuild
+++ b/games-arcade/sdlroids/sdlroids-1.3.4-r3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/sdlroids/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND="media-libs/libsdl
diff --git a/games-arcade/sdlsasteroids/sdlsasteroids-3.0.1.ebuild b/games-arcade/sdlsasteroids/sdlsasteroids-3.0.1.ebuild
index b313805f5fe56..4417f38e12651 100644
--- a/games-arcade/sdlsasteroids/sdlsasteroids-3.0.1.ebuild
+++ b/games-arcade/sdlsasteroids/sdlsasteroids-3.0.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/sdlsas/SDLSasteroids-${PV}.tar.gz"
 
 LICENSE="GPL-2 freedist"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="virtual/opengl
diff --git a/games-arcade/skystreets/skystreets-0.2.4.ebuild b/games-arcade/skystreets/skystreets-0.2.4.ebuild
index cc87f25d87116..405cb2fa532b2 100644
--- a/games-arcade/skystreets/skystreets-0.2.4.ebuild
+++ b/games-arcade/skystreets/skystreets-0.2.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="OSL-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 x86"
+KEYWORDS="~alpha ~amd64 ~x86"
 IUSE=""
 
 DEPEND="virtual/opengl
diff --git a/games-arcade/slimevolley/slimevolley-2.4.2.ebuild b/games-arcade/slimevolley/slimevolley-2.4.2.ebuild
index 4e1de9bd48347..b1fba98cb0403 100644
--- a/games-arcade/slimevolley/slimevolley-2.4.2.ebuild
+++ b/games-arcade/slimevolley/slimevolley-2.4.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://downloads.tuxfamily.org/slime/v242/${PN}_${PV}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="net"
 
 RDEPEND="media-libs/libsdl[X,sound,video]
diff --git a/games-arcade/snake3d/snake3d-0.9.ebuild b/games-arcade/snake3d/snake3d-0.9.ebuild
index bfa44607f886d..17a9653d23f45 100644
--- a/games-arcade/snake3d/snake3d-0.9.ebuild
+++ b/games-arcade/snake3d/snake3d-0.9.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/worms3d/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="media-libs/sdl-net
diff --git a/games-arcade/solarwolf/solarwolf-1.5.ebuild b/games-arcade/solarwolf/solarwolf-1.5.ebuild
index 05453edbe16f4..b96deec76cec7 100644
--- a/games-arcade/solarwolf/solarwolf-1.5.ebuild
+++ b/games-arcade/solarwolf/solarwolf-1.5.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.pygame.org/shredwheat/solarwolf/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~x86"
 IUSE=""
 
 RDEPEND=">=dev-python/pygame-1.5.6
diff --git a/games-arcade/spacerider/spacerider-0.13.ebuild b/games-arcade/spacerider/spacerider-0.13.ebuild
index 80263900b2a46..6ac81d1fbcc1d 100644
--- a/games-arcade/spacerider/spacerider-0.13.ebuild
+++ b/games-arcade/spacerider/spacerider-0.13.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2" # stupid php script
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="media-libs/libsdl[sound,video]
diff --git a/games-arcade/spout/spout-1.3.ebuild b/games-arcade/spout/spout-1.3.ebuild
index 88a62b79e0410..28793d0d0e1cb 100644
--- a/games-arcade/spout/spout-1.3.ebuild
+++ b/games-arcade/spout/spout-1.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://rohanpm.net/files/old/${MY_P}.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="x86 ~x86-fbsd"
+KEYWORDS="~x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND=">=media-libs/libsdl-1.2.6"
diff --git a/games-arcade/stardork/stardork-0.7.ebuild b/games-arcade/stardork/stardork-0.7.ebuild
index 876f95c1b1eb3..05aea19da6621 100644
--- a/games-arcade/stardork/stardork-0.7.ebuild
+++ b/games-arcade/stardork/stardork-0.7.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/stardork/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND="sys-libs/ncurses:0"
diff --git a/games-arcade/supertransball2/supertransball2-1.5.ebuild b/games-arcade/supertransball2/supertransball2-1.5.ebuild
index 7db0bff2c801e..3ceb2f40f7284 100644
--- a/games-arcade/supertransball2/supertransball2-1.5.ebuild
+++ b/games-arcade/supertransball2/supertransball2-1.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://braingames.bugreport.nl/stransball2/${FILE}.zip
 	mirror://debian/pool/main/s/${PN}/${DEBIAN_PATCH}.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ~x86-fbsd"
+KEYWORDS="~x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND="media-libs/libsdl[sound,video]
diff --git a/games-arcade/supertux/supertux-0.4.0.ebuild b/games-arcade/supertux/supertux-0.4.0.ebuild
index 10bed6d64195b..2cc03158032f9 100644
--- a/games-arcade/supertux/supertux-0.4.0.ebuild
+++ b/games-arcade/supertux/supertux-0.4.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/SuperTux/${PN}/releases/download/v${PV}/${P}.tar.bz2
 
 LICENSE="GPL-2+ GPL-3+ ZLIB MIT CC-BY-SA-2.0 CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="debug"
 
 RDEPEND="dev-games/physfs
diff --git a/games-arcade/syobon/syobon-1.0.1.ebuild b/games-arcade/syobon/syobon-1.0.1.ebuild
index 46d14da04294c..22da9ffef96be 100644
--- a/games-arcade/syobon/syobon-1.0.1.ebuild
+++ b/games-arcade/syobon/syobon-1.0.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://download.zapek.com/software/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="media-libs/libsdl[sound,video,joystick]
diff --git a/games-arcade/tecnoballz/tecnoballz-0.92.ebuild b/games-arcade/tecnoballz/tecnoballz-0.92.ebuild
index 9ac9105bdc1a7..3ece75e8838e1 100644
--- a/games-arcade/tecnoballz/tecnoballz-0.92.ebuild
+++ b/games-arcade/tecnoballz/tecnoballz-0.92.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://linux.tlk.fr/games/TecnoballZ/download/${P}.tgz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="media-libs/libsdl
diff --git a/games-arcade/thinktanks-demo/thinktanks-demo-1.1-r2.ebuild b/games-arcade/thinktanks-demo/thinktanks-demo-1.1-r2.ebuild
index 91a27a19860d5..107f42f946375 100644
--- a/games-arcade/thinktanks-demo/thinktanks-demo-1.1-r2.ebuild
+++ b/games-arcade/thinktanks-demo/thinktanks-demo-1.1-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="ftp://ggdev-1.homelan.com/thinktanks/ThinkTanksDemo_v${PV}.sh.bin"
 
 LICENSE="THINKTANKS"
 SLOT="0"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE=""
 RESTRICT="strip"
 
diff --git a/games-arcade/tomatoes/tomatoes-1.55-r2.ebuild b/games-arcade/tomatoes/tomatoes-1.55-r2.ebuild
index d2e7cc8911fae..dd5658f861bfb 100644
--- a/games-arcade/tomatoes/tomatoes-1.55-r2.ebuild
+++ b/games-arcade/tomatoes/tomatoes-1.55-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/tomatoes/tomatoes-linux-src-${PV}.tar.bz2
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="virtual/opengl
diff --git a/games-arcade/trailblazer/trailblazer-0.9.ebuild b/games-arcade/trailblazer/trailblazer-0.9.ebuild
index 590b24997fca4..5638d0339bc10 100644
--- a/games-arcade/trailblazer/trailblazer-0.9.ebuild
+++ b/games-arcade/trailblazer/trailblazer-0.9.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.autismuk.freeserve.co.uk/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND=">=media-libs/libsdl-1.2.7[video]"
diff --git a/games-arcade/triplexinvaders/triplexinvaders-1.08.ebuild b/games-arcade/triplexinvaders/triplexinvaders-1.08.ebuild
index 89704df75b561..d6b539da1fa24 100644
--- a/games-arcade/triplexinvaders/triplexinvaders-1.08.ebuild
+++ b/games-arcade/triplexinvaders/triplexinvaders-1.08.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://acm.jhu.edu/~arthur/invaders/${P}.zip"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="app-arch/unzip"
diff --git a/games-arcade/tuxdash/tuxdash-0.8-r1.ebuild b/games-arcade/tuxdash/tuxdash-0.8-r1.ebuild
index 07b0d8695885e..77af519447565 100644
--- a/games-arcade/tuxdash/tuxdash-0.8-r1.ebuild
+++ b/games-arcade/tuxdash/tuxdash-0.8-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.tuxdash.de/ressources/downloads/${PN}_src_${PV}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND="
diff --git a/games-arcade/tuxpuck/tuxpuck-0.8.2-r1.ebuild b/games-arcade/tuxpuck/tuxpuck-0.8.2-r1.ebuild
index 567cf9f95789f..db5f2d7e5e27c 100644
--- a/games-arcade/tuxpuck/tuxpuck-0.8.2-r1.ebuild
+++ b/games-arcade/tuxpuck/tuxpuck-0.8.2-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://home.no.net/munsuun/tuxpuck/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND="media-libs/libsdl
diff --git a/games-arcade/vor/vor-0.5.5.ebuild b/games-arcade/vor/vor-0.5.5.ebuild
index 5b80f78776958..89c7e57495cec 100644
--- a/games-arcade/vor/vor-0.5.5.ebuild
+++ b/games-arcade/vor/vor-0.5.5.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://qualdan.com/vor/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="media-libs/libsdl[sound,video]
diff --git a/games-arcade/watermelons/watermelons-1.1.1-r1.ebuild b/games-arcade/watermelons/watermelons-1.1.1-r1.ebuild
index 62a0453270df0..72fec90aec30d 100644
--- a/games-arcade/watermelons/watermelons-1.1.1-r1.ebuild
+++ b/games-arcade/watermelons/watermelons-1.1.1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://gentoo/${MY_PN}-${PV}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND="dev-python/pygame[${PYTHON_USEDEP}]
diff --git a/games-arcade/whichwayisup/whichwayisup-0.7.9-r1.ebuild b/games-arcade/whichwayisup/whichwayisup-0.7.9-r1.ebuild
index f4ce149bc76f3..80b637d2416de 100644
--- a/games-arcade/whichwayisup/whichwayisup-0.7.9-r1.ebuild
+++ b/games-arcade/whichwayisup/whichwayisup-0.7.9-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://hectigo.net/puskutraktori/whichwayisup/${MY_P}.zip"
 
 LICENSE="GPL-2 CC-BY-3.0"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-python/pygame[${PYTHON_USEDEP}]
diff --git a/games-arcade/wop/wop-0.4.3-r1.ebuild b/games-arcade/wop/wop-0.4.3-r1.ebuild
index 9f6811a6fbec2..53ecf8c0e4688 100644
--- a/games-arcade/wop/wop-0.4.3-r1.ebuild
+++ b/games-arcade/wop/wop-0.4.3-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://wormsofprey.org/download/${P}-src.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND="media-libs/libsdl
diff --git a/games-arcade/xbill/xbill-2.1-r2.ebuild b/games-arcade/xbill/xbill-2.1-r2.ebuild
index 8d5c88a606410..1152f2caca38d 100644
--- a/games-arcade/xbill/xbill-2.1-r2.ebuild
+++ b/games-arcade/xbill/xbill-2.1-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.xbill.org/download/${P}.tar.gz"
 
 LICENSE="GPL-1"
 SLOT="0"
-KEYWORDS="alpha amd64 x86"
+KEYWORDS="~alpha ~amd64 ~x86"
 IUSE="gtk"
 
 RDEPEND="gtk? ( x11-libs/gtk+:2 )
diff --git a/games-arcade/xbubble/xbubble-0.5.8.ebuild b/games-arcade/xbubble/xbubble-0.5.8.ebuild
index ca7f8d8933a7c..b884d4631f128 100644
--- a/games-arcade/xbubble/xbubble-0.5.8.ebuild
+++ b/games-arcade/xbubble/xbubble-0.5.8.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.ibiblio.org/pub/mirrors/gnu/ftp/savannah/files/${PN}/${P}.ta
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 x86"
+KEYWORDS="~alpha ~amd64 ~x86"
 IUSE="nls"
 
 RDEPEND="x11-libs/libX11
diff --git a/games-arcade/xevil/xevil-2.02_p2-r1.ebuild b/games-arcade/xevil/xevil-2.02_p2-r1.ebuild
index 9fdb5af4ce835..71b2f1c6fee3a 100644
--- a/games-arcade/xevil/xevil-2.02_p2-r1.ebuild
+++ b/games-arcade/xevil/xevil-2.02_p2-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.xevil.com/download/stable/xevilsrc${MY_PV}.zip
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="~x86"
 IUSE=""
 
 RDEPEND="x11-libs/libXpm"
diff --git a/games-arcade/xgalaga/xgalaga-2.1.1.0.ebuild b/games-arcade/xgalaga/xgalaga-2.1.1.0.ebuild
index 9e8d1129aaa8f..4c95fe631558a 100644
--- a/games-arcade/xgalaga/xgalaga-2.1.1.0.ebuild
+++ b/games-arcade/xgalaga/xgalaga-2.1.1.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 x86"
+KEYWORDS="~alpha ~amd64 ~x86"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/games-arcade/xjump/xjump-2.7.5.ebuild b/games-arcade/xjump/xjump-2.7.5.ebuild
index 8e504c202fbb8..8577fa4fc6227 100644
--- a/games-arcade/xjump/xjump-2.7.5.ebuild
+++ b/games-arcade/xjump/xjump-2.7.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://debian/pool/main/x/${PN}/${PN}_${PV}.orig.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/games-arcade/xrick/xrick-021212-r1.ebuild b/games-arcade/xrick/xrick-021212-r1.ebuild
index ac919e5ea3004..4feeada9b791c 100644
--- a/games-arcade/xrick/xrick-021212-r1.ebuild
+++ b/games-arcade/xrick/xrick-021212-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.bigorno.net/xrick/${P}.tgz"
 
 LICENSE="GPL-1+ xrick"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd"
 IUSE=""
 RESTRICT="mirror bindist" # bug #149097
 
diff --git a/games-arcade/xscavenger/xscavenger-1.4.4.ebuild b/games-arcade/xscavenger/xscavenger-1.4.4.ebuild
index b74e97733192a..df9546d9b01a9 100644
--- a/games-arcade/xscavenger/xscavenger-1.4.4.ebuild
+++ b/games-arcade/xscavenger/xscavenger-1.4.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.xdr.com/dash/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="x11-libs/libXext"
diff --git a/games-arcade/xsfcave/xsfcave-0.5.ebuild b/games-arcade/xsfcave/xsfcave-0.5.ebuild
index cf6813ccaf620..c0359f9443484 100644
--- a/games-arcade/xsfcave/xsfcave-0.5.ebuild
+++ b/games-arcade/xsfcave/xsfcave-0.5.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/scrap/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND="x11-libs/libXext
diff --git a/games-arcade/xtux/xtux-20030306.ebuild b/games-arcade/xtux/xtux-20030306.ebuild
index 90585ab963bc4..05bed79f0c8ff 100644
--- a/games-arcade/xtux/xtux-20030306.ebuild
+++ b/games-arcade/xtux/xtux-20030306.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/xtux/xtux-src-${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="x11-libs/libXpm"
diff --git a/games-arcade/yarsrevenge/yarsrevenge-0.99.ebuild b/games-arcade/yarsrevenge/yarsrevenge-0.99.ebuild
index 620e3b51a1cdb..76607474077f5 100644
--- a/games-arcade/yarsrevenge/yarsrevenge-0.99.ebuild
+++ b/games-arcade/yarsrevenge/yarsrevenge-0.99.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.autismuk.freeserve.co.uk/yar-${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND="media-libs/libsdl[sound,joystick,video]"
diff --git a/games-board/ace/ace-1.4.ebuild b/games-board/ace/ace-1.4.ebuild
index 608aa0ebcb57b..d2fa81bdbb8ac 100644
--- a/games-board/ace/ace-1.4.ebuild
+++ b/games-board/ace/ace-1.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.delorie.com/store/ace/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/games-board/ascal/ascal-0.1.1.ebuild b/games-board/ascal/ascal-0.1.1.ebuild
index df8d1b0728121..53b899da69c2f 100644
--- a/games-board/ascal/ascal-0.1.1.ebuild
+++ b/games-board/ascal/ascal-0.1.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/ascal/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-cpp/libgnomecanvasmm
diff --git a/games-board/atakks/atakks-1.0.ebuild b/games-board/atakks/atakks-1.0.ebuild
index e9a32e93687f5..5ae17670225c6 100644
--- a/games-board/atakks/atakks-1.0.ebuild
+++ b/games-board/atakks/atakks-1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="media-libs/libsdl:0"
diff --git a/games-board/awale/awale-1.5.ebuild b/games-board/awale/awale-1.5.ebuild
index 555b28d61a922..3c34764cb370c 100644
--- a/games-board/awale/awale-1.5.ebuild
+++ b/games-board/awale/awale-1.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="${SRC_URI} https://dev.gentoo.org/~hasufell/distfiles/${P}-no-autorecon
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="tk"
 
 RDEPEND="tk? ( dev-lang/tcl:0= dev-lang/tk:0= )"
diff --git a/games-board/biloba/biloba-0.9.3.ebuild b/games-board/biloba/biloba-0.9.3.ebuild
index 1530f11a9d327..7e3cfec927a47 100644
--- a/games-board/biloba/biloba-0.9.3.ebuild
+++ b/games-board/biloba/biloba-0.9.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/biloba/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="media-libs/libsdl:0[X,video,sound]
diff --git a/games-board/blokish/blokish-0.9.4-r2.ebuild b/games-board/blokish/blokish-0.9.4-r2.ebuild
index 1622bdf831303..8122c9ad492bf 100644
--- a/games-board/blokish/blokish-0.9.4-r2.ebuild
+++ b/games-board/blokish/blokish-0.9.4-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/blokish/${MY_P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
diff --git a/games-board/camato/camato-0.7.4.ebuild b/games-board/camato/camato-0.7.4.ebuild
index 5fdc6066f241f..fe407ceffaecf 100644
--- a/games-board/camato/camato-0.7.4.ebuild
+++ b/games-board/camato/camato-0.7.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://yusei.ragondux.com/files/gnocatan/${PN}-${MY_PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="dev-ruby/ruby-gtk2"
diff --git a/games-board/capicity/capicity-1.0.ebuild b/games-board/capicity/capicity-1.0.ebuild
index 4bf09d1fec7d1..7c882f99db7f2 100644
--- a/games-board/capicity/capicity-1.0.ebuild
+++ b/games-board/capicity/capicity-1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="dedicated? ( mirror://sourceforge/project/capitalism/Capi%20City/${PV}/
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="dedicated"
 
 RDEPEND="
diff --git a/games-board/ccgo/ccgo-0.3.6.5.ebuild b/games-board/ccgo/ccgo-0.3.6.5.ebuild
index a90e312ccab2d..bc9893756249e 100644
--- a/games-board/ccgo/ccgo-0.3.6.5.ebuild
+++ b/games-board/ccgo/ccgo-0.3.6.5.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://ccdw.org/~cjj/prog/ccgo/src/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="nls"
 
 RDEPEND=">=dev-cpp/gtkmm-2.4:2.4
diff --git a/games-board/cgoban/cgoban-1.9.14-r1.ebuild b/games-board/cgoban/cgoban-1.9.14-r1.ebuild
index 6b70adb83fa68..b13fd7182161b 100644
--- a/games-board/cgoban/cgoban-1.9.14-r1.ebuild
+++ b/games-board/cgoban/cgoban-1.9.14-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/cgoban1/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/games-board/cgoban2/cgoban2-2.6.12.ebuild b/games-board/cgoban2/cgoban2-2.6.12.ebuild
index bfb63ad45b94a..4b71abb1785fc 100644
--- a/games-board/cgoban2/cgoban2-2.6.12.ebuild
+++ b/games-board/cgoban2/cgoban2-2.6.12.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/cgoban-unix-${PV}.tar.bz2"
 
 LICENSE="freedist"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=virtual/jre-1.3"
diff --git a/games-board/chessx/chessx-1.3.2.ebuild b/games-board/chessx/chessx-1.3.2.ebuild
index 6237a2a9b91e7..fad3fcd3591dd 100644
--- a/games-board/chessx/chessx-1.3.2.ebuild
+++ b/games-board/chessx/chessx-1.3.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://sourceforge.net/projects/chessx/files/chessx/${PV}/${P}.tgz"
 
 LICENSE="GPL-2+ LGPL-2+ LGPL-2.1+ ZLIB"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-qt/qtprintsupport:5
diff --git a/games-board/chessx/chessx-1.4.0.ebuild b/games-board/chessx/chessx-1.4.0.ebuild
index a4f742e5a2e25..2aa020e3cb3c3 100644
--- a/games-board/chessx/chessx-1.4.0.ebuild
+++ b/games-board/chessx/chessx-1.4.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://sourceforge.net/projects/chessx/files/chessx/${PV}/${P}.tgz"
 
 LICENSE="GPL-2+ LGPL-2+ LGPL-2.1+ ZLIB"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-qt/qtprintsupport:5
diff --git a/games-board/cockatrice/cockatrice-20160506.ebuild b/games-board/cockatrice/cockatrice-20160506.ebuild
index 63135952d5769..77506df94f54d 100644
--- a/games-board/cockatrice/cockatrice-20160506.ebuild
+++ b/games-board/cockatrice/cockatrice-20160506.ebuild
@@ -13,7 +13,7 @@ S=${WORKDIR}/"Cockatrice-2016-05-06-Release"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="dedicated server"
 
 DEPEND="
diff --git a/games-board/crafty/crafty-24.1.ebuild b/games-board/crafty/crafty-24.1.ebuild
index f3805181aae99..60d9bbb5d605b 100644
--- a/games-board/crafty/crafty-24.1.ebuild
+++ b/games-board/crafty/crafty-24.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.craftychess.com/${P}.zip
 
 LICENSE="crafty"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="no-opts"
 RESTRICT="test"
 
diff --git a/games-board/domination/domination-1.1.1.6.ebuild b/games-board/domination/domination-1.1.1.6.ebuild
index 079a500bb6563..cdf684e5c90c6 100644
--- a/games-board/domination/domination-1.1.1.6.ebuild
+++ b/games-board/domination/domination-1.1.1.6.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/domination/Domination_${PV}.zip"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=virtual/jre-1.5"
diff --git a/games-board/eboard/eboard-1.1.1-r1.ebuild b/games-board/eboard/eboard-1.1.1-r1.ebuild
index 72dbb6b13fa36..edd02031e2da7 100644
--- a/games-board/eboard/eboard-1.1.1-r1.ebuild
+++ b/games-board/eboard/eboard-1.1.1-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="nls"
 
 RDEPEND="x11-libs/gtk+:2
diff --git a/games-board/freedoko/freedoko-0.7.13-r1.ebuild b/games-board/freedoko/freedoko-0.7.13-r1.ebuild
index 494756a99e350..0009bf6b40ca2 100644
--- a/games-board/freedoko/freedoko-0.7.13-r1.ebuild
+++ b/games-board/freedoko/freedoko-0.7.13-r1.ebuild
@@ -22,7 +22,7 @@ SRC_URI="mirror://sourceforge/free-doko/FreeDoko_${PV}.src.zip
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+xskatcards +gnomecards +kdecards +openclipartcards +pysolcards +backgrounds net"
 
 RDEPEND="net? ( net-libs/gnet dev-libs/glib:2 )
diff --git a/games-board/freedoko/freedoko-0.7.14.ebuild b/games-board/freedoko/freedoko-0.7.14.ebuild
index 4cdcf53176681..dc3aa13e93282 100644
--- a/games-board/freedoko/freedoko-0.7.14.ebuild
+++ b/games-board/freedoko/freedoko-0.7.14.ebuild
@@ -22,7 +22,7 @@ SRC_URI="mirror://sourceforge/free-doko/FreeDoko_${PV}.src.zip
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+xskatcards +gnomecards +kdecards +openclipartcards +pysolcards +backgrounds net"
 
 RDEPEND="net? ( net-libs/gnet dev-libs/glib:2 )
diff --git a/games-board/fruit/fruit-2.1.ebuild b/games-board/fruit/fruit-2.1.ebuild
index db7aa8211ead6..89ebd40ca879e 100644
--- a/games-board/fruit/fruit-2.1.ebuild
+++ b/games-board/fruit/fruit-2.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://arctrix.com/nas/${PN}/${MY_P}.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/games-board/gmchess/gmchess-0.29.6-r1.ebuild b/games-board/gmchess/gmchess-0.29.6-r1.ebuild
index 915470a4b0bbd..c4e14867a0441 100644
--- a/games-board/gmchess/gmchess-0.29.6-r1.ebuild
+++ b/games-board/gmchess/gmchess-0.29.6-r1.ebuild
@@ -11,7 +11,7 @@ RESTRICT="test"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="dev-cpp/gtkmm:2.4"
diff --git a/games-board/gnome-hearts/gnome-hearts-0.3.1-r2.ebuild b/games-board/gnome-hearts/gnome-hearts-0.3.1-r2.ebuild
index 16b766f6f0ca8..c325614f353e8 100644
--- a/games-board/gnome-hearts/gnome-hearts-0.3.1-r2.ebuild
+++ b/games-board/gnome-hearts/gnome-hearts-0.3.1-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.jejik.com/files/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+ FDL-1.2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/games-board/gnome-mastermind/gnome-mastermind-0.3.1-r1.ebuild b/games-board/gnome-mastermind/gnome-mastermind-0.3.1-r1.ebuild
index 87d5c7c155272..039169b2f57ba 100644
--- a/games-board/gnome-mastermind/gnome-mastermind-0.3.1-r1.ebuild
+++ b/games-board/gnome-mastermind/gnome-mastermind-0.3.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://download.gna.org/gnome-mastermind/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/games-board/gnono/gnono-1.9.1.ebuild b/games-board/gnono/gnono-1.9.1.ebuild
index eee6e7653027a..cccc6ed258ddf 100644
--- a/games-board/gnono/gnono-1.9.1.ebuild
+++ b/games-board/gnono/gnono-1.9.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="gnome-base/libgnomeui
diff --git a/games-board/gnubg/gnubg-1.04.000.ebuild b/games-board/gnubg/gnubg-1.04.000.ebuild
index fea69dc985631..ea1495bb51f4c 100644
--- a/games-board/gnubg/gnubg-1.04.000.ebuild
+++ b/games-board/gnubg/gnubg-1.04.000.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://gnubg.org/media/sources/${PN}-release-${PV}-sources.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc64 x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~x86-fbsd"
 IUSE="cpu_flags_x86_avx gtk opengl python sqlite cpu_flags_x86_sse cpu_flags_x86_sse2 threads"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/games-board/gnubg/gnubg-1.05.000.ebuild b/games-board/gnubg/gnubg-1.05.000.ebuild
index c4c4d3e64d402..769f4b0d44128 100644
--- a/games-board/gnubg/gnubg-1.05.000.ebuild
+++ b/games-board/gnubg/gnubg-1.05.000.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://gnubg.org/media/sources/${PN}-release-${PV}-sources.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc64 x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~x86-fbsd"
 IUSE="cpu_flags_x86_avx gtk opengl python sqlite cpu_flags_x86_sse cpu_flags_x86_sse2 threads"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/games-board/gnuchess-book/gnuchess-book-1.02-r1.ebuild b/games-board/gnuchess-book/gnuchess-book-1.02-r1.ebuild
index a3f652498ec7c..47e9b358322c8 100644
--- a/games-board/gnuchess-book/gnuchess-book-1.02-r1.ebuild
+++ b/games-board/gnuchess-book/gnuchess-book-1.02-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/chess/book_${PV}.pgn.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 RESTRICT="userpriv" # bug #112898
 
diff --git a/games-board/gnushogi/gnushogi-1.4.1.ebuild b/games-board/gnushogi/gnushogi-1.4.1.ebuild
index 90c9e8b536dc6..ed415090870de 100644
--- a/games-board/gnushogi/gnushogi-1.4.1.ebuild
+++ b/games-board/gnushogi/gnushogi-1.4.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="X"
 
 RDEPEND="sys-libs/ncurses:0
diff --git a/games-board/goatee-gtk/goatee-gtk-0.3.1.1.ebuild b/games-board/goatee-gtk/goatee-gtk-0.3.1.1.ebuild
index 3bf1d5f007daa..101cd3e9609a0 100644
--- a/games-board/goatee-gtk/goatee-gtk-0.3.1.1.ebuild
+++ b/games-board/goatee-gtk/goatee-gtk-0.3.1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="AGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-games/goatee-0.3:=[profile?] <dev-games/goatee-0.4:=[profile?]
diff --git a/games-board/goatee-gtk/goatee-gtk-0.3.1.ebuild b/games-board/goatee-gtk/goatee-gtk-0.3.1.ebuild
index 19ccb766dd9d9..c58adea91aba2 100644
--- a/games-board/goatee-gtk/goatee-gtk-0.3.1.ebuild
+++ b/games-board/goatee-gtk/goatee-gtk-0.3.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="AGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-games/goatee-0.3:=[profile?] <dev-games/goatee-0.4:=[profile?]
diff --git a/games-board/grhino/grhino-0.16.1.ebuild b/games-board/grhino/grhino-0.16.1.ebuild
index c7360a686cd93..3c596afe771af 100644
--- a/games-board/grhino/grhino-0.16.1.ebuild
+++ b/games-board/grhino/grhino-0.16.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/rhino/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="gnome gtp nls"
 
 RDEPEND="gnome? ( =gnome-base/libgnomeui-2* )
diff --git a/games-board/gtkatlantic/gtkatlantic-0.6.1.ebuild b/games-board/gtkatlantic/gtkatlantic-0.6.1.ebuild
index bd81579b520c0..e75cbe847f6e1 100644
--- a/games-board/gtkatlantic/gtkatlantic-0.6.1.ebuild
+++ b/games-board/gtkatlantic/gtkatlantic-0.6.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://download.tuxfamily.org/gtkatlantic/downloads/v0.6/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="x11-libs/gtk+:3
diff --git a/games-board/gtkboard/gtkboard-0.11_pre0.ebuild b/games-board/gtkboard/gtkboard-0.11_pre0.ebuild
index d58f7799a2724..b098c8eb6e1f5 100644
--- a/games-board/gtkboard/gtkboard-0.11_pre0.ebuild
+++ b/games-board/gtkboard/gtkboard-0.11_pre0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="gnome"
 
 RDEPEND="x11-libs/gtk+:2
diff --git a/games-board/hexxagon/hexxagon-1.0.2.ebuild b/games-board/hexxagon/hexxagon-1.0.2.ebuild
index f124724d17079..9242faaaafaaa 100644
--- a/games-board/hexxagon/hexxagon-1.0.2.ebuild
+++ b/games-board/hexxagon/hexxagon-1.0.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.nesqi.se/download/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-cpp/glibmm:2
diff --git a/games-board/holdingnuts/holdingnuts-0.0.5-r1.ebuild b/games-board/holdingnuts/holdingnuts-0.0.5-r1.ebuild
index 43adabfbe09f4..837ec8100e26e 100644
--- a/games-board/holdingnuts/holdingnuts-0.0.5-r1.ebuild
+++ b/games-board/holdingnuts/holdingnuts-0.0.5-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://downloads.sourceforge.net/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="alsa debug dedicated"
 
 RDEPEND="
diff --git a/games-board/kcheckers/kcheckers-0.8.1.ebuild b/games-board/kcheckers/kcheckers-0.8.1.ebuild
index e331db6da3804..b60a1b6d3e97f 100644
--- a/games-board/kcheckers/kcheckers-0.8.1.ebuild
+++ b/games-board/kcheckers/kcheckers-0.8.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""
 
 DEPEND="dev-qt/qtgui:4"
diff --git a/games-board/mah-jong/mah-jong-1.14.ebuild b/games-board/mah-jong/mah-jong-1.14.ebuild
index d838ff353c8bd..b1313077874ff 100644
--- a/games-board/mah-jong/mah-jong-1.14.ebuild
+++ b/games-board/mah-jong/mah-jong-1.14.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://mahjong.julianbradfield.org/Source/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="x11-libs/gtk+:2"
diff --git a/games-board/maitretarot/maitretarot-0.1.98.ebuild b/games-board/maitretarot/maitretarot-0.1.98.ebuild
index b7a22eea2e231..cf67100bdb2b1 100644
--- a/games-board/maitretarot/maitretarot-0.1.98.ebuild
+++ b/games-board/maitretarot/maitretarot-0.1.98.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://savannah.nongnu.org/download/maitretarot/${PN}.pkg/${PV}/${P}.t
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="dev-libs/glib:2
diff --git a/games-board/megamek/megamek-0.34.10.ebuild b/games-board/megamek/megamek-0.34.10.ebuild
index 8c6f95dc5ae47..aaa9996f3475f 100644
--- a/games-board/megamek/megamek-0.34.10.ebuild
+++ b/games-board/megamek/megamek-0.34.10.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/MegaMek-v${PV}.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.5
diff --git a/games-board/mt_dolphin_ia/mt_dolphin_ia-0.1.98.ebuild b/games-board/mt_dolphin_ia/mt_dolphin_ia-0.1.98.ebuild
index d715bdc754009..52dfd614ed74d 100644
--- a/games-board/mt_dolphin_ia/mt_dolphin_ia-0.1.98.ebuild
+++ b/games-board/mt_dolphin_ia/mt_dolphin_ia-0.1.98.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://savannah.nongnu.org/download/maitretarot/${PN}.pkg/${PV}/${P}.t
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="dev-libs/glib:2
diff --git a/games-board/mt_gtk_client/mt_gtk_client-0.1.98.ebuild b/games-board/mt_gtk_client/mt_gtk_client-0.1.98.ebuild
index 093f7001ab986..790bfd48f4abd 100644
--- a/games-board/mt_gtk_client/mt_gtk_client-0.1.98.ebuild
+++ b/games-board/mt_gtk_client/mt_gtk_client-0.1.98.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://savannah.nongnu.org/download/maitretarot/${PN}.pkg/${PV}/${P}.t
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="gnome"
 
 DEPEND="dev-libs/glib:2
diff --git a/games-board/mt_ncurses_client/mt_ncurses_client-0.1.98.ebuild b/games-board/mt_ncurses_client/mt_ncurses_client-0.1.98.ebuild
index 414819c4e5058..143092a54a02d 100644
--- a/games-board/mt_ncurses_client/mt_ncurses_client-0.1.98.ebuild
+++ b/games-board/mt_ncurses_client/mt_ncurses_client-0.1.98.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://savannah.nongnu.org/download/maitretarot/${PN}.pkg/${PV}/${P}.t
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="dev-libs/glib:2
diff --git a/games-board/natch/natch-2.4.ebuild b/games-board/natch/natch-2.4.ebuild
index 384c9c52935d8..339ec9e124148 100644
--- a/games-board/natch/natch-2.4.ebuild
+++ b/games-board/natch/natch-2.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://natch.free.fr/Natch/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="sys-libs/ncurses:0"
diff --git a/games-board/openyahtzee/openyahtzee-1.9.2.ebuild b/games-board/openyahtzee/openyahtzee-1.9.2.ebuild
index 26e39498a63e6..80fa5cca44088 100644
--- a/games-board/openyahtzee/openyahtzee-1.9.2.ebuild
+++ b/games-board/openyahtzee/openyahtzee-1.9.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/openyahtzee/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="x11-libs/wxGTK:${WX_GTK_VER}[X]"
diff --git a/games-board/pasang-emas/pasang-emas-3.1.0.ebuild b/games-board/pasang-emas/pasang-emas-3.1.0.ebuild
index 76499c6610d1d..9f5ac72ed9578 100644
--- a/games-board/pasang-emas/pasang-emas-3.1.0.ebuild
+++ b/games-board/pasang-emas/pasang-emas-3.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="extras nls"
 
 RDEPEND="app-text/gnome-doc-utils
diff --git a/games-board/peg-e/peg-e-1.1.2.ebuild b/games-board/peg-e/peg-e-1.1.2.ebuild
index 4d5d3db11a41b..3beffdac24537 100644
--- a/games-board/peg-e/peg-e-1.1.2.ebuild
+++ b/games-board/peg-e/peg-e-1.1.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://gottcode.org/peg-e/${P}-src.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-qt/qtcore:4
diff --git a/games-board/phalanx/phalanx-22.ebuild b/games-board/phalanx/phalanx-22.ebuild
index 226039bb6957a..8d2354125e88a 100644
--- a/games-board/phalanx/phalanx-22.ebuild
+++ b/games-board/phalanx/phalanx-22.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/phalanx/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 S=${WORKDIR}/${MY_P}
diff --git a/games-board/pioneers/pioneers-15.3.ebuild b/games-board/pioneers/pioneers-15.3.ebuild
index a809417fb4768..b5b45c34c98cf 100644
--- a/games-board/pioneers/pioneers-15.3.ebuild
+++ b/games-board/pioneers/pioneers-15.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/pio/${P}.tar.gz"
 
 LICENSE="GPL-2 CC-BY-SA-4.0"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="dedicated help nls"
 
 # dev-util/gob only for autoreconf
diff --git a/games-board/pokerth/pokerth-1.1.1-r2.ebuild b/games-board/pokerth/pokerth-1.1.1-r2.ebuild
index be20d0fd206f4..e0f3c1cf65f9c 100644
--- a/games-board/pokerth/pokerth-1.1.1-r2.ebuild
+++ b/games-board/pokerth/pokerth-1.1.1-r2.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/pouetchess/pouetchess-0.2.0-r1.ebuild b/games-board/pouetchess/pouetchess-0.2.0-r1.ebuild
index 4884eee6c8752..b1f2c9b55f112 100644
--- a/games-board/pouetchess/pouetchess-0.2.0-r1.ebuild
+++ b/games-board/pouetchess/pouetchess-0.2.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}_src_${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="debug"
 
 DEPEND="media-libs/libsdl:0[opengl,video]
diff --git a/games-board/pychess/pychess-0.12.4.ebuild b/games-board/pychess/pychess-0.12.4.ebuild
index bb680cdab1bce..f5fe564732544 100644
--- a/games-board/pychess/pychess-0.12.4.ebuild
+++ b/games-board/pychess/pychess-0.12.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://pychess.org/download/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="gstreamer"
 
 DEPEND="
diff --git a/games-board/pysolfc/pysolfc-2.0-r3.ebuild b/games-board/pysolfc/pysolfc-2.0-r3.ebuild
index a69e85aef5fb2..cee03df7c4353 100644
--- a/games-board/pysolfc/pysolfc-2.0-r3.ebuild
+++ b/games-board/pysolfc/pysolfc-2.0-r3.ebuild
@@ -19,7 +19,7 @@ SRC_URI="${SOL_URI}/${MY_PN}-${PV}.tar.bz2
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="extra-cardsets minimal +sound"
 
 S=${WORKDIR}/${MY_PN}-${PV}
diff --git a/games-board/qcheckers/qcheckers-20091230.ebuild b/games-board/qcheckers/qcheckers-20091230.ebuild
index af64695bd5efd..cec645af21133 100644
--- a/games-board/qcheckers/qcheckers-20091230.ebuild
+++ b/games-board/qcheckers/qcheckers-20091230.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://qcheckers.googlecode.com/files/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="dev-qt/qtgui:4"
diff --git a/games-board/qgo/qgo-1.5.4_p20100322.ebuild b/games-board/qgo/qgo-1.5.4_p20100322.ebuild
index e0a6618cbb4ab..d537c62c9bb40 100644
--- a/games-board/qgo/qgo-1.5.4_p20100322.ebuild
+++ b/games-board/qgo/qgo-1.5.4_p20100322.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="media-libs/alsa-lib
diff --git a/games-board/scid/scid-4.6.2.ebuild b/games-board/scid/scid-4.6.2.ebuild
index 4b8cca9bacacb..56e6964e35025 100644
--- a/games-board/scid/scid-4.6.2.ebuild
+++ b/games-board/scid/scid-4.6.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/scid/${P}.zip
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 CDEPEND="dev-lang/tk:0
diff --git a/games-board/simsu/simsu-1.2.3.ebuild b/games-board/simsu/simsu-1.2.3.ebuild
index 24b8b48f4e662..4b3ba25c84662 100644
--- a/games-board/simsu/simsu-1.2.3.ebuild
+++ b/games-board/simsu/simsu-1.2.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://gottcode.org/${PN}/${P}-src.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="dev-qt/qtgui:4"
diff --git a/games-board/sirius/sirius-0.8.0-r1.ebuild b/games-board/sirius/sirius-0.8.0-r1.ebuild
index add049d669bd0..c04568e02b57a 100644
--- a/games-board/sirius/sirius-0.8.0-r1.ebuild
+++ b/games-board/sirius/sirius-0.8.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://sirius.bitvis.nu/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="nls"
 
 RDEPEND="
diff --git a/games-board/sjeng/sjeng-11.2-r1.ebuild b/games-board/sjeng/sjeng-11.2-r1.ebuild
index a30b6c65ce4b1..4a7cd0e31acee 100644
--- a/games-board/sjeng/sjeng-11.2-r1.ebuild
+++ b/games-board/sjeng/sjeng-11.2-r1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="http://sjeng.sourceforge.net/"
 SRC_URI="mirror://sourceforge/sjeng/Sjeng-Free-${PV}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 SLOT="0"
 IUSE=""
 
diff --git a/games-board/spider/spider-1.2_p4-r1.ebuild b/games-board/spider/spider-1.2_p4-r1.ebuild
index a72ab1a8b0bd0..c20901755c68d 100644
--- a/games-board/spider/spider-1.2_p4-r1.ebuild
+++ b/games-board/spider/spider-1.2_p4-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://debian/pool/main/s/spider/${MY_P}.orig.tar.gz
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="athena"
 
 RDEPEND="x11-libs/libXext
diff --git a/games-board/teg/teg-0.11.2.ebuild b/games-board/teg/teg-0.11.2.ebuild
index 7f9c8dc09f6cf..c4525b381adc4 100644
--- a/games-board/teg/teg-0.11.2.ebuild
+++ b/games-board/teg/teg-0.11.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/teg/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="nls"
 
 RDEPEND="dev-libs/glib:2
diff --git a/games-board/tetzle/tetzle-2.0.3.ebuild b/games-board/tetzle/tetzle-2.0.3.ebuild
index c69db906bb143..6539368bf9138 100644
--- a/games-board/tetzle/tetzle-2.0.3.ebuild
+++ b/games-board/tetzle/tetzle-2.0.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://gottcode.org/${PN}/${P}-src.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND=">=dev-qt/qtgui-4.7:4
diff --git a/games-board/xboard/xboard-4.8.0.ebuild b/games-board/xboard/xboard-4.8.0.ebuild
index eb69503058543..b47374a2dadb6 100644
--- a/games-board/xboard/xboard-4.8.0.ebuild
+++ b/games-board/xboard/xboard-4.8.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/xboard/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="Xaw3d +default-font gtk nls zippy"
 RESTRICT="test" #124112
 
diff --git a/games-board/xfreecell/xfreecell-1.0.5b-r1.ebuild b/games-board/xfreecell/xfreecell-1.0.5b-r1.ebuild
index 6eabdd37d74d4..491d3910b26a3 100644
--- a/games-board/xfreecell/xfreecell-1.0.5b-r1.ebuild
+++ b/games-board/xfreecell/xfreecell-1.0.5b-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www2.giganet.net/~nakayama/${P}.tgz
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND="media-fonts/font-misc-misc
diff --git a/games-board/xfreecell/xfreecell-1.0.5b.ebuild b/games-board/xfreecell/xfreecell-1.0.5b.ebuild
index d519a590a4fab..185f420eac12a 100644
--- a/games-board/xfreecell/xfreecell-1.0.5b.ebuild
+++ b/games-board/xfreecell/xfreecell-1.0.5b.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www2.giganet.net/~nakayama/${P}.tgz
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND="x11-libs/libXext
diff --git a/games-board/xgammon/xgammon-0.98.ebuild b/games-board/xgammon/xgammon-0.98.ebuild
index 9af77aea982a7..e5bbb608e6e85 100644
--- a/games-board/xgammon/xgammon-0.98.ebuild
+++ b/games-board/xgammon/xgammon-0.98.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://fawn.unibw-hamburg.de/steuer/xgammon/Downloads/${P}a.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="x11-libs/libXaw"
diff --git a/games-board/xmahjongg/xmahjongg-3.7.ebuild b/games-board/xmahjongg/xmahjongg-3.7.ebuild
index cf2350f21fbe4..3344c7892288f 100644
--- a/games-board/xmahjongg/xmahjongg-3.7.ebuild
+++ b/games-board/xmahjongg/xmahjongg-3.7.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.lcdf.org/xmahjongg/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~mips x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~mips ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="x11-libs/libX11"
diff --git a/games-board/xmille/xmille-2.0-r2.ebuild b/games-board/xmille/xmille-2.0-r2.ebuild
index 3ae28b808d8ae..7405836d743f4 100644
--- a/games-board/xmille/xmille-2.0-r2.ebuild
+++ b/games-board/xmille/xmille-2.0-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://debian/pool/main/x/xmille/${PN}_${PV}.orig.tar.gz
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="x11-libs/libXext"
diff --git a/games-board/xscrabble/xscrabble-2.10-r1.ebuild b/games-board/xscrabble/xscrabble-2.10-r1.ebuild
index f6336b78388ed..96d6d50b6b772 100644
--- a/games-board/xscrabble/xscrabble-2.10-r1.ebuild
+++ b/games-board/xscrabble/xscrabble-2.10-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.ac-grenoble.fr/ge/educational_games/${P}.tgz
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="l10n_fr"
 
 RDEPEND="x11-libs/libXaw
diff --git a/games-board/xskat/xskat-4.0.ebuild b/games-board/xskat/xskat-4.0.ebuild
index 5b900f5d9e12c..d38d75c811061 100644
--- a/games-board/xskat/xskat-4.0.ebuild
+++ b/games-board/xskat/xskat-4.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.xskat.de/${P}.tar.gz"
 
 LICENSE="freedist"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/games-emulation/advancemame/advancemame-1.2.ebuild b/games-emulation/advancemame/advancemame-1.2.ebuild
index d0002597fec5d..970717cff4727 100644
--- a/games-emulation/advancemame/advancemame-1.2.ebuild
+++ b/games-emulation/advancemame/advancemame-1.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/advancemame/${P}.tar.gz"
 
 LICENSE="GPL-2 XMAME"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="alsa fbcon oss truetype"
 
 # sdl is required (bug #158417)
diff --git a/games-emulation/advancemenu/advancemenu-2.7.ebuild b/games-emulation/advancemenu/advancemenu-2.7.ebuild
index 92229ef3ef35e..52e1f2e5ecd92 100644
--- a/games-emulation/advancemenu/advancemenu-2.7.ebuild
+++ b/games-emulation/advancemenu/advancemenu-2.7.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/advancemame/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="alsa debug fbcon ncurses oss sdl slang truetype"
 
 RDEPEND="dev-libs/expat
diff --git a/games-emulation/advancescan/advancescan-1.16-r1.ebuild b/games-emulation/advancescan/advancescan-1.16-r1.ebuild
index 0422576279bf8..46c0c1379bcba 100644
--- a/games-emulation/advancescan/advancescan-1.16-r1.ebuild
+++ b/games-emulation/advancescan/advancescan-1.16-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/advancemame/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="dev-libs/expat
diff --git a/games-emulation/atari800/atari800-3.1.0.ebuild b/games-emulation/atari800/atari800-3.1.0.ebuild
index d225ee4ea3ec4..662b234ea3054 100644
--- a/games-emulation/atari800/atari800-3.1.0.ebuild
+++ b/games-emulation/atari800/atari800-3.1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="ncurses oss opengl readline +sdl +sound"
 
 NOTSDL_DEPS="
diff --git a/games-emulation/daphne/daphne-1.0.ebuild b/games-emulation/daphne/daphne-1.0.ebuild
index 871b5b4ac8a12..ce1a8f457df6f 100644
--- a/games-emulation/daphne/daphne-1.0.ebuild
+++ b/games-emulation/daphne/daphne-1.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.daphne-emu.com/download/${P}-src.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="media-libs/libogg
diff --git a/games-emulation/dboxfe/dboxfe-0.1.3.ebuild b/games-emulation/dboxfe/dboxfe-0.1.3.ebuild
index d42ef91145912..df98260026321 100644
--- a/games-emulation/dboxfe/dboxfe-0.1.3.ebuild
+++ b/games-emulation/dboxfe/dboxfe-0.1.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/dboxfe.berlios/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="dev-qt/qtgui:4
diff --git a/games-emulation/desmume/desmume-0.9.11-r1.ebuild b/games-emulation/desmume/desmume-0.9.11-r1.ebuild
index 4d12d0a2225a4..cddcc940a3145 100644
--- a/games-emulation/desmume/desmume-0.9.11-r1.ebuild
+++ b/games-emulation/desmume/desmume-0.9.11-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/desmume/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=x11-libs/gtk+-2.8.0:2
diff --git a/games-emulation/dgen-sdl/dgen-sdl-1.33.ebuild b/games-emulation/dgen-sdl/dgen-sdl-1.33.ebuild
index 2f8e6bcab81aa..34b23d178d9e6 100644
--- a/games-emulation/dgen-sdl/dgen-sdl-1.33.ebuild
+++ b/games-emulation/dgen-sdl/dgen-sdl-1.33.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/dgen/files/${P}.tar.gz"
 
 LICENSE="dgen-sdl BSD BSD-2 free-noncomm LGPL-2.1+ GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="joystick opengl"
 
 RDEPEND="media-libs/libsdl[joystick?,opengl?]
diff --git a/games-emulation/dolphin/dolphin-5.0.ebuild b/games-emulation/dolphin/dolphin-5.0.ebuild
index 66b0fe9c7dab7..04b0200909994 100644
--- a/games-emulation/dolphin/dolphin-5.0.ebuild
+++ b/games-emulation/dolphin/dolphin-5.0.ebuild
@@ -10,7 +10,7 @@ WX_GTK_VER="3.0"
 inherit cmake-utils eutils l10n pax-utils toolchain-funcs versionator wxwidgets
 
 SRC_URI="https://github.com/${PN}-emu/${PN}/archive/${PV}.zip -> ${P}.zip"
-KEYWORDS="amd64"
+KEYWORDS="~amd64"
 
 DESCRIPTION="Gamecube and Wii game emulator"
 HOMEPAGE="https://www.dolphin-emu.org/"
diff --git a/games-emulation/emutos/emutos-0.9.3.ebuild b/games-emulation/emutos/emutos-0.9.3.ebuild
index 5f79914539c96..5df0220e50813 100644
--- a/games-emulation/emutos/emutos-0.9.3.ebuild
+++ b/games-emulation/emutos/emutos-0.9.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/emutos/emutos-src-0.9.3.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/games-emulation/emutos/emutos-0.9.4.ebuild b/games-emulation/emutos/emutos-0.9.4.ebuild
index 5f79914539c96..5df0220e50813 100644
--- a/games-emulation/emutos/emutos-0.9.4.ebuild
+++ b/games-emulation/emutos/emutos-0.9.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/emutos/emutos-src-0.9.3.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/games-emulation/fakenes/fakenes-0.5.8-r2.ebuild b/games-emulation/fakenes/fakenes-0.5.8-r2.ebuild
index 99c01a284fe6a..eafa57d654f16 100644
--- a/games-emulation/fakenes/fakenes-0.5.8-r2.ebuild
+++ b/games-emulation/fakenes/fakenes-0.5.8-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/fakenes/${P}.tar.bz2"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="openal opengl zlib"
 
 RDEPEND=">=media-libs/allegro-4.4.1.1:0[opengl?]
diff --git a/games-emulation/fbzx/fbzx-2.10.0.ebuild b/games-emulation/fbzx/fbzx-2.10.0.ebuild
index 105a1fc627d50..eb9cce0a10f4b 100644
--- a/games-emulation/fbzx/fbzx-2.10.0.ebuild
+++ b/games-emulation/fbzx/fbzx-2.10.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.rastersoft.com/descargas/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="media-libs/libsdl[video]
diff --git a/games-emulation/fbzx/fbzx-3.0.0.ebuild b/games-emulation/fbzx/fbzx-3.0.0.ebuild
index 257a97eb17749..2707058d60d28 100644
--- a/games-emulation/fbzx/fbzx-3.0.0.ebuild
+++ b/games-emulation/fbzx/fbzx-3.0.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/rastersoft/fbzx/archive/3.0.0.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="media-libs/libsdl[video]
diff --git a/games-emulation/fceux/fceux-2.2.2-r1.ebuild b/games-emulation/fceux/fceux-2.2.2-r1.ebuild
index 74031cc29a933..6d6128d997ae8 100644
--- a/games-emulation/fceux/fceux-2.2.2-r1.ebuild
+++ b/games-emulation/fceux/fceux-2.2.2-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/fceultra/${P}.src.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="gtk logo +lua +opengl"
 
 DEPEND="lua? ( dev-lang/lua:0 )
diff --git a/games-emulation/gambatte/gambatte-0.5.0_p20131102.ebuild b/games-emulation/gambatte/gambatte-0.5.0_p20131102.ebuild
index 5881cbd1ec782..48dec7caf06ef 100644
--- a/games-emulation/gambatte/gambatte-0.5.0_p20131102.ebuild
+++ b/games-emulation/gambatte/gambatte-0.5.0_p20131102.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~hasufell/distfiles/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="qt4 +sdl"
 REQUIRED_USE="|| ( qt4 sdl )"
 
diff --git a/games-emulation/gcube/gcube-0.4-r1.ebuild b/games-emulation/gcube/gcube-0.4-r1.ebuild
index 20e4ff5d43588..e55675696db25 100644
--- a/games-emulation/gcube/gcube-0.4-r1.ebuild
+++ b/games-emulation/gcube/gcube-0.4-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://gcube.exemu.net/downloads/${P}-src.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="virtual/opengl
diff --git a/games-emulation/generator/generator-0.35_p4.ebuild b/games-emulation/generator/generator-0.35_p4.ebuild
index 1cda1f3e23e0e..e77ec243163cf 100644
--- a/games-emulation/generator/generator-0.35_p4.ebuild
+++ b/games-emulation/generator/generator-0.35_p4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.squish.net/generator/cbiere/generator/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+sdlaudio"
 
 DEPEND="virtual/jpeg:0
diff --git a/games-emulation/gens/gens-2.15.5.ebuild b/games-emulation/gens/gens-2.15.5.ebuild
index d683b43a9aa22..9d936ba15a39c 100644
--- a/games-emulation/gens/gens-2.15.5.ebuild
+++ b/games-emulation/gens/gens-2.15.5.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/gens/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="~x86"
 IUSE=""
 
 RDEPEND="virtual/opengl
diff --git a/games-emulation/gfceux/gfceux-2.1.1-r1.ebuild b/games-emulation/gfceux/gfceux-2.1.1-r1.ebuild
index b8cb65bb1707e..faf11fdaf183a 100644
--- a/games-emulation/gfceux/gfceux-2.1.1-r1.ebuild
+++ b/games-emulation/gfceux/gfceux-2.1.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/fceultra/fceux-${PV}.src.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="dev-python/pygtk"
diff --git a/games-emulation/gngb/gngb-20060309.ebuild b/games-emulation/gngb/gngb-20060309.ebuild
index 0b7b91bdb6e72..d54b529dd2f77 100644
--- a/games-emulation/gngb/gngb-20060309.ebuild
+++ b/games-emulation/gngb/gngb-20060309.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://m.peponas.free.fr/gngb/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="opengl"
 
 DEPEND="media-libs/libsdl[sound,joystick,video]
diff --git a/games-emulation/gngeo/gngeo-0.8.ebuild b/games-emulation/gngeo/gngeo-0.8.ebuild
index ab65329605ddf..1d34ff20ab766 100644
--- a/games-emulation/gngeo/gngeo-0.8.ebuild
+++ b/games-emulation/gngeo/gngeo-0.8.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://gngeo.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="virtual/opengl
diff --git a/games-emulation/gnuboy/gnuboy-1.0.3-r1.ebuild b/games-emulation/gnuboy/gnuboy-1.0.3-r1.ebuild
index bf9075ce8b7d0..86111def6f70c 100644
--- a/games-emulation/gnuboy/gnuboy-1.0.3-r1.ebuild
+++ b/games-emulation/gnuboy/gnuboy-1.0.3-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="X sdl"
 
 RDEPEND="sdl? ( media-libs/libsdl )
diff --git a/games-emulation/gxmame/gxmame-0.35_beta2.ebuild b/games-emulation/gxmame/gxmame-0.35_beta2.ebuild
index d52519f5043fb..58080b9433815 100644
--- a/games-emulation/gxmame/gxmame-0.35_beta2.ebuild
+++ b/games-emulation/gxmame/gxmame-0.35_beta2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/gxmame/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="nls joystick"
 
 RDEPEND="dev-libs/expat
diff --git a/games-emulation/hatari/hatari-1.8.0.ebuild b/games-emulation/hatari/hatari-1.8.0.ebuild
index 50898e87d78dd..0ec9601e18350 100644
--- a/games-emulation/hatari/hatari-1.8.0.ebuild
+++ b/games-emulation/hatari/hatari-1.8.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://download.tuxfamily.org/hatari/${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/games-emulation/higan/higan-094.ebuild b/games-emulation/higan/higan-094.ebuild
index ed1be748a7081..ec815cc3da6fd 100644
--- a/games-emulation/higan/higan-094.ebuild
+++ b/games-emulation/higan/higan-094.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://byuu.org/files/${MY_P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="ao +alsa openal opengl oss profile_accuracy +profile_balanced profile_performance pulseaudio qt4 +sdl udev xv"
 REQUIRED_USE="|| ( ao openal alsa pulseaudio oss )
 	|| ( xv opengl sdl )
diff --git a/games-emulation/hugo/hugo-2.12.ebuild b/games-emulation/hugo/hugo-2.12.ebuild
index fcb43d30707c1..86bcffd6e4568 100644
--- a/games-emulation/hugo/hugo-2.12.ebuild
+++ b/games-emulation/hugo/hugo-2.12.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.zeograd.com/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="~x86"
 IUSE=""
 
 RDEPEND="x11-libs/gtk+:2
diff --git a/games-emulation/kigb/kigb-2.02.ebuild b/games-emulation/kigb/kigb-2.02.ebuild
index 565a69cb2abf3..bbccc19ef4649 100644
--- a/games-emulation/kigb/kigb-2.02.ebuild
+++ b/games-emulation/kigb/kigb-2.02.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://kigb.emuunlim.com/${PN}_lin.tar.gz"
 
 LICENSE="all-rights-reserved"
 SLOT="0"
-KEYWORDS="-* x86"
+KEYWORDS="-* ~x86"
 IUSE=""
 RESTRICT="mirror bindist strip"
 
diff --git a/games-emulation/mamory/mamory-0.2.25.ebuild b/games-emulation/mamory/mamory-0.2.25.ebuild
index 315a0cd93ba7e..fbf75c2d3d00b 100644
--- a/games-emulation/mamory/mamory-0.2.25.ebuild
+++ b/games-emulation/mamory/mamory-0.2.25.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="dev-libs/expat"
diff --git a/games-emulation/mastergear-bin/mastergear-bin-2.0.ebuild b/games-emulation/mastergear-bin/mastergear-bin-2.0.ebuild
index 6c332bc0abe77..768fde9f3d920 100644
--- a/games-emulation/mastergear-bin/mastergear-bin-2.0.ebuild
+++ b/games-emulation/mastergear-bin/mastergear-bin-2.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://fms.komkon.org/MG/MG${PV/\./}-Linux-80x86-bin.tar.Z"
 
 LICENSE="all-rights-reserved"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="~x86"
 IUSE=""
 RESTRICT="mirror bindist strip"
 
diff --git a/games-emulation/mednafen/mednafen-0.9.41.ebuild b/games-emulation/mednafen/mednafen-0.9.41.ebuild
index 197526339d1be..cdd8cfd9aa668 100644
--- a/games-emulation/mednafen/mednafen-0.9.41.ebuild
+++ b/games-emulation/mednafen/mednafen-0.9.41.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://mednafen.github.io/releases/files/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="alsa altivec cjk debugger jack nls pax_kernel"
 
 RDEPEND="
diff --git a/games-emulation/mednaffe/mednaffe-0.8.ebuild b/games-emulation/mednaffe/mednaffe-0.8.ebuild
index e7bac87f3a941..921f899357cff 100644
--- a/games-emulation/mednaffe/mednaffe-0.8.ebuild
+++ b/games-emulation/mednaffe/mednaffe-0.8.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/AmatCoder/mednaffe/archive/v$PV.zip -> ${P}.zip"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="app-arch/unzip
diff --git a/games-emulation/mekanix/mekanix-070.ebuild b/games-emulation/mekanix/mekanix-070.ebuild
index b8cf9d7930f17..9a23b55bc54e8 100644
--- a/games-emulation/mekanix/mekanix-070.ebuild
+++ b/games-emulation/mekanix/mekanix-070.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.smspower.org/meka/releases/${PN}${PV}.tgz"
 
 LICENSE="mekanix"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="~x86"
 RESTRICT="strip"
 IUSE=""
 
diff --git a/games-emulation/mgba/mgba-0.5.2.ebuild b/games-emulation/mgba/mgba-0.5.2.ebuild
index be3429d13af35..042cf1dd13fcf 100644
--- a/games-emulation/mgba/mgba-0.5.2.ebuild
+++ b/games-emulation/mgba/mgba-0.5.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}-emu/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="ffmpeg imagemagick opengl qt5 +sdl"
 REQUIRED_USE="|| ( qt5 sdl )
 		qt5? ( opengl )"
diff --git a/games-emulation/mupen64plus/mupen64plus-1.5-r1.ebuild b/games-emulation/mupen64plus/mupen64plus-1.5-r1.ebuild
index 39f6ad6955453..cda3eb2b2121d 100644
--- a/games-emulation/mupen64plus/mupen64plus-1.5-r1.ebuild
+++ b/games-emulation/mupen64plus/mupen64plus-1.5-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://mupen64plus.googlecode.com/files/${MY_P}.tar.gz mirror://gentoo
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+gtk libsamplerate lirc qt4 cpu_flags_x86_sse"
 
 # GTK+ is currently required by plugins even if no GUI support is enabled
diff --git a/games-emulation/mupen64plus/mupen64plus-1.5-r2.ebuild b/games-emulation/mupen64plus/mupen64plus-1.5-r2.ebuild
index df6269c467c9c..da9baaa2206da 100644
--- a/games-emulation/mupen64plus/mupen64plus-1.5-r2.ebuild
+++ b/games-emulation/mupen64plus/mupen64plus-1.5-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://mupen64plus.googlecode.com/files/${MY_P}.tar.gz mirror://gentoo
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+gtk libsamplerate lirc qt4 cpu_flags_x86_sse"
 
 # GTK+ is currently required by plugins even if no GUI support is enabled
diff --git a/games-emulation/nestopia/nestopia-1.47_p20170105.ebuild b/games-emulation/nestopia/nestopia-1.47_p20170105.ebuild
index c5ba1600cf4ec..932f8edc7412b 100644
--- a/games-emulation/nestopia/nestopia-1.47_p20170105.ebuild
+++ b/games-emulation/nestopia/nestopia-1.47_p20170105.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	inherit vcs-snapshot
 	SRC_URI="https://github.com/rdanbrook/${PN}/archive/d7fae2aff1a93eac997d2b480652a1d068a2b6cf.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="GPL-2+"
diff --git a/games-emulation/nestra/nestra-0.66-r2.ebuild b/games-emulation/nestra/nestra-0.66-r2.ebuild
index 2db0bbd43e37d..0dabb4e9895fc 100644
--- a/games-emulation/nestra/nestra-0.66-r2.ebuild
+++ b/games-emulation/nestra/nestra-0.66-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://nestra.linuxgames.com/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="x11-libs/libX11[abi_x86_32(-)]"
diff --git a/games-emulation/openmsx/openmsx-0.9.1.ebuild b/games-emulation/openmsx/openmsx-0.9.1.ebuild
index ac768cd0c9f2a..db68c3dbc64db 100644
--- a/games-emulation/openmsx/openmsx-0.9.1.ebuild
+++ b/games-emulation/openmsx/openmsx-0.9.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/games-emulation/pcsx2/pcsx2-1.4.0.ebuild b/games-emulation/pcsx2/pcsx2-1.4.0.ebuild
index cfd1606f91af6..5ce65187a04cd 100644
--- a/games-emulation/pcsx2/pcsx2-1.4.0.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.4.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/PCSX2/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/games-emulation/raine/raine-0.51.9.ebuild b/games-emulation/raine/raine-0.51.9.ebuild
index 0775fcb5f3dd1..5aaef97c6506e 100644
--- a/games-emulation/raine/raine-0.51.9.ebuild
+++ b/games-emulation/raine/raine-0.51.9.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://rainemu.swishparty.co.uk/html/archive/raines-${PV}.tar.bz2"
 
 LICENSE="Artistic"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="~x86"
 IUSE=""
 
 RDEPEND="dev-cpp/muParser
diff --git a/games-emulation/sdlmame/sdlmame-0.168.ebuild b/games-emulation/sdlmame/sdlmame-0.168.ebuild
index 8a068399e3387..6597a482a9a0b 100644
--- a/games-emulation/sdlmame/sdlmame-0.168.ebuild
+++ b/games-emulation/sdlmame/sdlmame-0.168.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/mamedev/mame/releases/download/mame${MY_PV}/mame${MY
 
 LICENSE="XMAME"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="X alsa +arcade debug +mess opengl tools"
 REQUIRED_USE="|| ( arcade mess )
 		debug? ( X )"
diff --git a/games-emulation/snes9x/snes9x-1.53.ebuild b/games-emulation/snes9x/snes9x-1.53.ebuild
index ac5a1659915fb..900716e81c40a 100644
--- a/games-emulation/snes9x/snes9x-1.53.ebuild
+++ b/games-emulation/snes9x/snes9x-1.53.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://snes9x-gtk.googlecode.com/files/${P}-src.tar.bz2"
 
 LICENSE="Snes9x GPL-2 GPL-2+ LGPL-2.1 LGPL-2.1+ ISC MIT ZLIB Info-ZIP"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd"
 IUSE="alsa debug gtk joystick multilib netplay nls opengl oss png pulseaudio portaudio +xv +xrandr zlib"
 RESTRICT="bindist"
 
diff --git a/games-emulation/snes9x/snes9x-1.54.1.ebuild b/games-emulation/snes9x/snes9x-1.54.1.ebuild
index ecaef4861cd09..f7531d383ac57 100644
--- a/games-emulation/snes9x/snes9x-1.54.1.ebuild
+++ b/games-emulation/snes9x/snes9x-1.54.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/snes9xgit/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Snes9x GPL-2 GPL-2+ LGPL-2.1 LGPL-2.1+ ISC MIT ZLIB Info-ZIP"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd"
 IUSE="alsa debug gtk joystick multilib netplay nls opengl oss png pulseaudio portaudio +xv +xrandr"
 RESTRICT="bindist"
 
diff --git a/games-emulation/stella/stella-4.0.ebuild b/games-emulation/stella/stella-4.0.ebuild
index 4aa58c7a86fcf..5cf6b70c7e9ec 100644
--- a/games-emulation/stella/stella-4.0.ebuild
+++ b/games-emulation/stella/stella-4.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/stella/${P}-src.tar.gz"
 
 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-emulation/stella/stella-4.7.2.ebuild b/games-emulation/stella/stella-4.7.2.ebuild
index 579227b6bde86..fdad7813c4b1b 100644
--- a/games-emulation/stella/stella-4.7.2.ebuild
+++ b/games-emulation/stella/stella-4.7.2.ebuild
@@ -10,7 +10,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-emulation/vbam/vbam-2.0.0_beta2_pre1507-r1.ebuild b/games-emulation/vbam/vbam-2.0.0_beta2_pre1507-r1.ebuild
index 01bfef42b685f..bbde021dba3e5 100644
--- a/games-emulation/vbam/vbam-2.0.0_beta2_pre1507-r1.ebuild
+++ b/games-emulation/vbam/vbam-2.0.0_beta2_pre1507-r1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit subversion
 else
 	SRC_URI="https://dev.gentoo.org/~radhermit/distfiles/${MY_P}.tar.xz"
-	KEYWORDS="amd64 x86"
+	KEYWORDS="~amd64 ~x86"
 
 	# upstream patches
 	SRC_URI+=" https://github.com/visualboyadvance-m/visualboyadvance-m/commit/3f3c3859c1c5f92937bef5d3398a37605e9c16ec.patch -> ${PN}-2.0.0_pre1507-ffmpeg3_defines.patch"
diff --git a/games-emulation/vgba/vgba-4.8.ebuild b/games-emulation/vgba/vgba-4.8.ebuild
index cf96bf33965d7..8b599b4ca912f 100644
--- a/games-emulation/vgba/vgba-4.8.ebuild
+++ b/games-emulation/vgba/vgba-4.8.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://fms.komkon.org/VGBA/VGBA${PV/.}-Linux-Ubuntu-bin.tgz"
 
 LICENSE="VGBA"
 SLOT="0"
-KEYWORDS="-* x86"
+KEYWORDS="-* ~x86"
 RESTRICT="strip"
 IUSE=""
 
diff --git a/games-emulation/virtualjaguar/virtualjaguar-2.1.2-r2.ebuild b/games-emulation/virtualjaguar/virtualjaguar-2.1.2-r2.ebuild
index 6d56a0c0fc753..d4d53cd4f1c9b 100644
--- a/games-emulation/virtualjaguar/virtualjaguar-2.1.2-r2.ebuild
+++ b/games-emulation/virtualjaguar/virtualjaguar-2.1.2-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.icculus.org/virtualjaguar/tarballs/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/games-emulation/xe/xe-2.16.2.ebuild b/games-emulation/xe/xe-2.16.2.ebuild
index cf19f2060a1cd..05e925ca9283e 100644
--- a/games-emulation/xe/xe-2.16.2.ebuild
+++ b/games-emulation/xe/xe-2.16.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="amd64? ( http://www.xe-emulator.com/files/${PN}-x86-64-bin.${PV}.tar.bz
 
 LICENSE="all-rights-reserved"
 SLOT="0"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE=""
 RESTRICT="mirror bindist strip"
 
diff --git a/games-emulation/yabause/yabause-0.9.14.ebuild b/games-emulation/yabause/yabause-0.9.14.ebuild
index 57559da8b5b6f..b13959e8a4a0b 100644
--- a/games-emulation/yabause/yabause-0.9.14.ebuild
+++ b/games-emulation/yabause/yabause-0.9.14.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="openal opengl pic qt5 sdl"
 
 # x11-libs/libXrandr is an automagic dep
diff --git a/games-emulation/zinc/zinc-1.1.ebuild b/games-emulation/zinc/zinc-1.1.ebuild
index a6e2dcfb8a372..c690819ab4609 100644
--- a/games-emulation/zinc/zinc-1.1.ebuild
+++ b/games-emulation/zinc/zinc-1.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://caesar.logiqx.com/zips/emus/linux/zinc_linux/${P//[-.]/}-lnx.tar
 
 LICENSE="freedist"
 SLOT="0"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE=""
 RESTRICT="strip"
 QA_PREBUILT="${GAMES_PREFIX_OPT:1}/bin/zinc /usr/lib*/*.so"
diff --git a/games-emulation/zsnes/zsnes-1.51-r4.ebuild b/games-emulation/zsnes/zsnes-1.51-r4.ebuild
index 64f551b5bcc33..9f5ce6ababe5a 100644
--- a/games-emulation/zsnes/zsnes-1.51-r4.ebuild
+++ b/games-emulation/zsnes/zsnes-1.51-r4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/zsnes/${PN}${PV//./}src.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* amd64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="ao custom-cflags +debug opengl pax_kernel png"
 
 RDEPEND="
diff --git a/games-engines/frobtads/frobtads-1.2.2.ebuild b/games-engines/frobtads/frobtads-1.2.2.ebuild
index af7561faf323a..f9c7a71ece4ec 100644
--- a/games-engines/frobtads/frobtads-1.2.2.ebuild
+++ b/games-engines/frobtads/frobtads-1.2.2.ebuild
@@ -10,7 +10,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/frobtads/frobtads-1.2.3.ebuild b/games-engines/frobtads/frobtads-1.2.3.ebuild
index c1eb578a9623d..48b95cdf23d06 100644
--- a/games-engines/frobtads/frobtads-1.2.3.ebuild
+++ b/games-engines/frobtads/frobtads-1.2.3.ebuild
@@ -10,7 +10,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/frotz/frotz-2.43.ebuild b/games-engines/frotz/frotz-2.43.ebuild
index 3ad31ea944a1f..dc566030f3d18 100644
--- a/games-engines/frotz/frotz-2.43.ebuild
+++ b/games-engines/frotz/frotz-2.43.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.ifarchive.org/if-archive/infocom/interpreters/frotz/${P}.tar
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="alsa oss"
 
 DEPEND="sys-libs/ncurses:0
diff --git a/games-engines/gargoyle/gargoyle-2011.1.ebuild b/games-engines/gargoyle/gargoyle-2011.1.ebuild
index 8a9815363d334..640adac5fa7ed 100644
--- a/games-engines/gargoyle/gargoyle-2011.1.ebuild
+++ b/games-engines/gargoyle/gargoyle-2011.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://garglk.googlecode.com/files/${P}-sources.zip"
 
 LICENSE="BSD GPL-2 MIT Hugo Glulxe"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/games-engines/gemrb/gemrb-0.8.3-r1.ebuild b/games-engines/gemrb/gemrb-0.8.3-r1.ebuild
index f12df7fc9958e..6ec09ffb52785 100644
--- a/games-engines/gemrb/gemrb-0.8.3-r1.ebuild
+++ b/games-engines/gemrb/gemrb-0.8.3-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/gemrb/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/games-engines/gemrb/gemrb-0.8.3.ebuild b/games-engines/gemrb/gemrb-0.8.3.ebuild
index b7ba53323a6f7..4a5e9901c6335 100644
--- a/games-engines/gemrb/gemrb-0.8.3.ebuild
+++ b/games-engines/gemrb/gemrb-0.8.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/gemrb/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="media-libs/freetype
diff --git a/games-engines/love/love-0.7.2-r1.ebuild b/games-engines/love/love-0.7.2-r1.ebuild
index 114a603372525..eeb49f5034c42 100644
--- a/games-engines/love/love-0.7.2-r1.ebuild
+++ b/games-engines/love/love-0.7.2-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.bitbucket.org/rude/${PN}/downloads/${P}-linux-src.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0.7"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-games/physfs
diff --git a/games-engines/love/love-0.8.0.ebuild b/games-engines/love/love-0.8.0.ebuild
index 2d8f8f824c4ef..4f4937e078cea 100644
--- a/games-engines/love/love-0.8.0.ebuild
+++ b/games-engines/love/love-0.8.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999* ]]; then
 	KEYWORDS=""
 else
 	SRC_URI="https://www.bitbucket.org/rude/${PN}/downloads/${P}-linux-src.tar.gz"
-	KEYWORDS="amd64 ~arm x86"
+	KEYWORDS="~amd64 ~arm ~x86"
 fi
 
 DESCRIPTION="A framework for 2D games in Lua"
diff --git a/games-engines/nazghul/nazghul-0.7.1.ebuild b/games-engines/nazghul/nazghul-0.7.1.ebuild
index cc55f517635cd..e9365293417c0 100644
--- a/games-engines/nazghul/nazghul-0.7.1.ebuild
+++ b/games-engines/nazghul/nazghul-0.7.1.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="media-libs/libpng:0
diff --git a/games-engines/odamex/odamex-0.7.0.ebuild b/games-engines/odamex/odamex-0.7.0.ebuild
index 552df25f75a1a..9dbda85d5fc46 100644
--- a/games-engines/odamex/odamex-0.7.0.ebuild
+++ b/games-engines/odamex/odamex-0.7.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/Odamex/${PV}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="dedicated +odalaunch master portmidi server"
 
 RDEPEND="
diff --git a/games-engines/openxcom/openxcom-1.0.0.ebuild b/games-engines/openxcom/openxcom-1.0.0.ebuild
index d4edc5bb5a120..d45753ee281ec 100644
--- a/games-engines/openxcom/openxcom-1.0.0.ebuild
+++ b/games-engines/openxcom/openxcom-1.0.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/SupSuper/OpenXcom/archive/v1.0.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-3 CC-BY-SA-4.0"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc"
 
 RDEPEND=">=dev-cpp/yaml-cpp-0.5.1
diff --git a/games-engines/qtads/qtads-2.1.7.ebuild b/games-engines/qtads/qtads-2.1.7.ebuild
index 4ace1e8c18f4d..b256007bc6523 100644
--- a/games-engines/qtads/qtads-2.1.7.ebuild
+++ b/games-engines/qtads/qtads-2.1.7.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/qtads/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="media-libs/libsdl[sound]
diff --git a/games-engines/renpy/renpy-6.17.7.ebuild b/games-engines/renpy/renpy-6.17.7.ebuild
index adc56df50743c..879493b46d11c 100644
--- a/games-engines/renpy/renpy-6.17.7.ebuild
+++ b/games-engines/renpy/renpy-6.17.7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.renpy.org/dl/${PV}/${P}-source.tar.bz2"
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
 MYSLOT=$(delete_all_version_separators ${SLOT})
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="development doc examples"
 REQUIRED_USE="examples? ( development )"
 
diff --git a/games-engines/renpy/renpy-6.99.12.4-r3.ebuild b/games-engines/renpy/renpy-6.99.12.4-r3.ebuild
index 27a1a8b3f14e8..ccf21fbcc9cd5 100644
--- a/games-engines/renpy/renpy-6.99.12.4-r3.ebuild
+++ b/games-engines/renpy/renpy-6.99.12.4-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.renpy.org/dl/${PV}/${P}-source.tar.bz2"
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
 MYSLOT=$(delete_all_version_separators ${SLOT})
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="development doc examples"
 REQUIRED_USE="examples? ( development )"
 
diff --git a/games-engines/residualvm/residualvm-0.2.1.ebuild b/games-engines/residualvm/residualvm-0.2.1.ebuild
index 7686d028847b4..ffed45e37513e 100644
--- a/games-engines/residualvm/residualvm-0.2.1.ebuild
+++ b/games-engines/residualvm/residualvm-0.2.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-sources.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 # TODO: fix dynamic plugin support
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 5b6030e119656..3ce3b2b19242c 100644
--- a/games-engines/scummvm-tools/scummvm-tools-1.8.0.ebuild
+++ b/games-engines/scummvm-tools/scummvm-tools-1.8.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://scummvm.org/frs/scummvm-tools/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~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 da40623b9a307..4edb099d8009b 100644
--- a/games-engines/scummvm/scummvm-1.8.0.ebuild
+++ b/games-engines/scummvm/scummvm-1.8.0.ebuild
@@ -10,7 +10,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 ppc64 x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~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-engines/solarus/solarus-1.3.1.ebuild b/games-engines/solarus/solarus-1.3.1.ebuild
index 7bb433c004210..54eea7cef952b 100644
--- a/games-engines/solarus/solarus-1.3.1.ebuild
+++ b/games-engines/solarus/solarus-1.3.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.zelda-solarus.com/downloads/${PN}/${P}-src.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc luajit"
 
 RDEPEND="
diff --git a/games-engines/stratagus/stratagus-2.3.0.ebuild b/games-engines/stratagus/stratagus-2.3.0.ebuild
index 2a348cef1ad11..cea036b23b008 100644
--- a/games-engines/stratagus/stratagus-2.3.0.ebuild
+++ b/games-engines/stratagus/stratagus-2.3.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://launchpad.net/stratagus/trunk/2.3/+download/stratagus_${PV}.ori
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="bzip2 debug doc fluidsynth mikmod mng theora vorbis"
 
 RDEPEND="dev-db/sqlite:3
diff --git a/games-engines/xzip/xzip-1.8.2-r2.ebuild b/games-engines/xzip/xzip-1.8.2-r2.ebuild
index 483f97d45481d..6bfb7bb0ab00e 100644
--- a/games-engines/xzip/xzip-1.8.2-r2.ebuild
+++ b/games-engines/xzip/xzip-1.8.2-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.eblong.com/zarf/ftp/xzip182.tar.Z"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 RESTRICT="test"
 
diff --git a/games-engines/zoom/zoom-1.1.5.ebuild b/games-engines/zoom/zoom-1.1.5.ebuild
index 86eccbace5d82..54e067e13be72 100644
--- a/games-engines/zoom/zoom-1.1.5.ebuild
+++ b/games-engines/zoom/zoom-1.1.5.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.logicalshift.co.uk/unix/zoom/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="x11-libs/libSM
diff --git a/games-fps/aaquake2/aaquake2-0.1.ebuild b/games-fps/aaquake2/aaquake2-0.1.ebuild
index 302eb4ad067f4..a7aa57c721bdb 100644
--- a/games-fps/aaquake2/aaquake2-0.1.ebuild
+++ b/games-fps/aaquake2/aaquake2-0.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://idsoftware/source/q2source-3.21.zip
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="~x86"
 IUSE=""
 
 RDEPEND="media-libs/aalib"
diff --git a/games-fps/aaut/aaut-1.ebuild b/games-fps/aaut/aaut-1.ebuild
index e2824ffb32d85..acde5a8582fbf 100644
--- a/games-fps/aaut/aaut-1.ebuild
+++ b/games-fps/aaut/aaut-1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="http://icculus.org/~chunky/ut/aaut/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="~x86"
 IUSE=""
 
 RDEPEND="|| (
diff --git a/games-fps/alephone-infinity/alephone-infinity-20080622.ebuild b/games-fps/alephone-infinity/alephone-infinity-20080622.ebuild
index 2d624e7e9fe8b..46cd7a3b526d2 100644
--- a/games-fps/alephone-infinity/alephone-infinity-20080622.ebuild
+++ b/games-fps/alephone-infinity/alephone-infinity-20080622.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://files3.bungie.org/trilogy/MarathonInfinity.zip
 
 LICENSE="bungie-marathon"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 RESTRICT="mirror"
 
diff --git a/games-fps/alephone/alephone-20150620.ebuild b/games-fps/alephone/alephone-20150620.ebuild
index c7b76c3a9b97f..9dd8d699b34c3 100644
--- a/games-fps/alephone/alephone-20150620.ebuild
+++ b/games-fps/alephone/alephone-20150620.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Aleph-One-Marathon/alephone/releases/download/releas
 
 LICENSE="GPL-3+ BitstreamVera OFL-1.1"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="alsa curl ffmpeg mad mpeg sndfile speex vorbis"
 
 RDEPEND="media-libs/sdl-net
diff --git a/games-fps/alienarena/alienarena-20130827.ebuild b/games-fps/alienarena/alienarena-20130827.ebuild
index 4406027c14aa4..8072a2ce4f472 100644
--- a/games-fps/alienarena/alienarena-20130827.ebuild
+++ b/games-fps/alienarena/alienarena-20130827.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://icculus.org/alienarena/Files/${MY_PN}-linux${PV}.tar.gz
 
 LICENSE="GPL-2 free-noncomm"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="dedicated +dga +vidmode +zlib"
 
 UIRDEPEND="virtual/jpeg:0
diff --git a/games-fps/avp/avp-20150214.ebuild b/games-fps/avp/avp-20150214.ebuild
index e65a4044530a9..83482ba83d8bf 100644
--- a/games-fps/avp/avp-20150214.ebuild
+++ b/games-fps/avp/avp-20150214.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.icculus.org/avp/files/${P}.tar.gz"
 
 LICENSE="AvP"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="media-libs/openal
diff --git a/games-fps/blackshades/blackshades-20070723.ebuild b/games-fps/blackshades/blackshades-20070723.ebuild
index 7e976e7317909..81b5623a319b7 100644
--- a/games-fps/blackshades/blackshades-20070723.ebuild
+++ b/games-fps/blackshades/blackshades-20070723.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://filesingularity.timedoctor.org/Textures.tar.bz2
 
 LICENSE="blackshades"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="virtual/opengl
diff --git a/games-fps/darkplaces/darkplaces-20140513.ebuild b/games-fps/darkplaces/darkplaces-20140513.ebuild
index b203f597fc6ac..1e154b7074f7f 100644
--- a/games-fps/darkplaces/darkplaces-20140513.ebuild
+++ b/games-fps/darkplaces/darkplaces-20140513.ebuild
@@ -21,7 +21,7 @@ SRC_URI="http://icculus.org/twilight/${PN}/files/${MY_ENGINE}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="alsa cdinstall cdsound debug dedicated demo lights opengl oss sdl textures"
 
 UIRDEPEND="virtual/jpeg:0
diff --git a/games-fps/doom-data/doom-data-1-r1.ebuild b/games-fps/doom-data/doom-data-1-r1.ebuild
index eed178d54e5c7..0161c5e201961 100644
--- a/games-fps/doom-data/doom-data-1-r1.ebuild
+++ b/games-fps/doom-data/doom-data-1-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gentoo/doom1.wad.bz2"
 
 LICENSE="freedist"
 SLOT="0"
-KEYWORDS="amd64 arm x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="doomsday"
 
 DEPEND="doomsday? ( games-fps/doomsday )
diff --git a/games-fps/doom3-cdoom/doom3-cdoom-1.3.1.ebuild b/games-fps/doom3-cdoom/doom3-cdoom-1.3.1.ebuild
index fa3ecba51d473..06268279c5ebb 100644
--- a/games-fps/doom3-cdoom/doom3-cdoom-1.3.1.ebuild
+++ b/games-fps/doom3-cdoom/doom3-cdoom-1.3.1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.moddb.com/mods/classic-doom-3"
 SRC_URI="classic_doom_3_${PV//.}.zip"
 
 LICENSE="GameFront"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="dedicated opengl"
 RESTRICT="fetch bindist"
 
diff --git a/games-fps/doom3-chextrek/doom3-chextrek-0.52.ebuild b/games-fps/doom3-chextrek/doom3-chextrek-0.52.ebuild
index c986239abed2a..959c85e219582 100644
--- a/games-fps/doom3-chextrek/doom3-chextrek-0.52.ebuild
+++ b/games-fps/doom3-chextrek/doom3-chextrek-0.52.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.moddb.com/mods/chex-trek-beyond-the-quest"
 SRC_URI="chextrek_beta_${PV/.}.zip"
 
 LICENSE="GameFront"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="dedicated opengl"
 RESTRICT="fetch bindist"
 
diff --git a/games-fps/doom3-data/doom3-data-1.1.1282-r1.ebuild b/games-fps/doom3-data/doom3-data-1.1.1282-r1.ebuild
index 922b0a5fedc72..cdb2aea6ab45d 100644
--- a/games-fps/doom3-data/doom3-data-1.1.1282-r1.ebuild
+++ b/games-fps/doom3-data/doom3-data-1.1.1282-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE="DOOM3"
 SLOT="0"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE=""
 
 RDEPEND="games-fps/doom3"
diff --git a/games-fps/doom3-ducttape/doom3-ducttape-0007.ebuild b/games-fps/doom3-ducttape/doom3-ducttape-0007.ebuild
index b27109952b193..4553ae0e3326a 100644
--- a/games-fps/doom3-ducttape/doom3-ducttape-0007.ebuild
+++ b/games-fps/doom3-ducttape/doom3-ducttape-0007.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://ducttape.glenmurphy.com/"
 SRC_URI="http://ducttape.glenmurphy.com/ducttape${PV}.zip"
 
 LICENSE="freedist"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="dedicated opengl"
 
 src_unpack() {
diff --git a/games-fps/doom3-eventhorizon/doom3-eventhorizon-1.3.ebuild b/games-fps/doom3-eventhorizon/doom3-eventhorizon-1.3.ebuild
index e87f1150f6e64..add5755175921 100644
--- a/games-fps/doom3-eventhorizon/doom3-eventhorizon-1.3.ebuild
+++ b/games-fps/doom3-eventhorizon/doom3-eventhorizon-1.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.gamefront.com/files/10716974"
 SRC_URI="event_horizon_xv_${PV}.zip"
 
 LICENSE="all-rights-reserved"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="dedicated opengl"
 RESTRICT="fetch mirror"
 
diff --git a/games-fps/doom3-hellcampaign/doom3-hellcampaign-1-r1.ebuild b/games-fps/doom3-hellcampaign/doom3-hellcampaign-1-r1.ebuild
index 8e39f9e2fa7b5..80c4babebdecd 100644
--- a/games-fps/doom3-hellcampaign/doom3-hellcampaign-1-r1.ebuild
+++ b/games-fps/doom3-hellcampaign/doom3-hellcampaign-1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="sp_hc_final.zip
 	hardcorehellcampaign_patch.zip"
 
 LICENSE="GameFront"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="dedicated opengl"
 RESTRICT="fetch bindist"
 
diff --git a/games-fps/doom3-inhell/doom3-inhell-1.1-r1.ebuild b/games-fps/doom3-inhell/doom3-inhell-1.1-r1.ebuild
index aa3b9d99ee333..bdd54df23fba6 100644
--- a/games-fps/doom3-inhell/doom3-inhell-1.1-r1.ebuild
+++ b/games-fps/doom3-inhell/doom3-inhell-1.1-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.doomerland.de.vu/"
 SRC_URI="in_hell_v${PV/.}.zip"
 
 LICENSE="GameFront"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="dedicated opengl"
 RESTRICT="fetch bindist"
 
diff --git a/games-fps/doom3-lms/doom3-lms-4.ebuild b/games-fps/doom3-lms/doom3-lms-4.ebuild
index 96e4e6f85b4d0..1abc7dc0026b5 100644
--- a/games-fps/doom3-lms/doom3-lms-4.ebuild
+++ b/games-fps/doom3-lms/doom3-lms-4.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://doom3coop.com/"
 SRC_URI="LastManStandingCoop4Multiplatform.zip"
 
 LICENSE="GameFront"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="dedicated opengl"
 RESTRICT="fetch bindist"
 
diff --git a/games-fps/doom3-mitm/doom3-mitm-20070129.ebuild b/games-fps/doom3-mitm/doom3-mitm-20070129.ebuild
index 08253af74d750..7b38c2520cbdb 100644
--- a/games-fps/doom3-mitm/doom3-mitm-20070129.ebuild
+++ b/games-fps/doom3-mitm/doom3-mitm-20070129.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.jimwilkie.co.uk/mitm/"
 SRC_URI="MakeItToMorning1-6.zip"
 
 LICENSE="all-rights-reserved"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 RESTRICT="fetch"
 
diff --git a/games-fps/doom3-roe/doom3-roe-1.ebuild b/games-fps/doom3-roe/doom3-roe-1.ebuild
index 3519afb5a081f..1c8c05a0b84de 100644
--- a/games-fps/doom3-roe/doom3-roe-1.ebuild
+++ b/games-fps/doom3-roe/doom3-roe-1.ebuild
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE="DOOM3"
 SLOT="0"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE=""
 RESTRICT="strip"
 
diff --git a/games-fps/doomsday-resources/doomsday-resources-1.01-r1.ebuild b/games-fps/doomsday-resources/doomsday-resources-1.01-r1.ebuild
index 08af23f98d6ec..62564bfa40012 100644
--- a/games-fps/doomsday-resources/doomsday-resources-1.01-r1.ebuild
+++ b/games-fps/doomsday-resources/doomsday-resources-1.01-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/deng/jdoom-resource-pack-${PV}.zip
 
 LICENSE="free-noncomm"		#505636
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=games-fps/doomsday-1.9.8"
diff --git a/games-fps/doomsday/doomsday-1.15.8.ebuild b/games-fps/doomsday/doomsday-1.15.8.ebuild
index abe5ae54c3ee1..c2cadea8b2511 100644
--- a/games-fps/doomsday/doomsday-1.15.8.ebuild
+++ b/games-fps/doomsday/doomsday-1.15.8.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/deng/Doomsday%20Engine/${PV}/${PN}-stable-${PV}.ta
 
 LICENSE="GPL-3+ LGPL-3+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="dedicated fluidsynth openal snowberry +doom demo freedoom heretic hexen resources tools"
 # we need python at build time, so
 # snowberry? ( ${PYTHON_REQUIRED_USE} )
diff --git a/games-fps/duke3d-data/duke3d-data-1.0-r3.ebuild b/games-fps/duke3d-data/duke3d-data-1.0-r3.ebuild
index cd74a277bde98..ad7eb38e4f0e5 100644
--- a/games-fps/duke3d-data/duke3d-data-1.0-r3.ebuild
+++ b/games-fps/duke3d-data/duke3d-data-1.0-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="gog? ( ${GOG_FILE} )"
 
 LICENSE="DUKE3D gog? ( GOG-EULA )"
 SLOT="0"
-KEYWORDS="amd64 hppa x86"
+KEYWORDS="~amd64 ~hppa ~x86"
 IUSE="gog"
 REQUIRED_USE="^^ ( cdinstall gog )"
 RESTRICT="mirror bindist gog? ( fetch )"
diff --git a/games-fps/duke3d-demodata/duke3d-demodata-1.3.ebuild b/games-fps/duke3d-demodata/duke3d-demodata-1.3.ebuild
index 5374a6dda7885..dbe45f7cb3f2a 100644
--- a/games-fps/duke3d-demodata/duke3d-demodata-1.3.ebuild
+++ b/games-fps/duke3d-demodata/duke3d-demodata-1.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.3drealms.com/share/3dduke13.zip"
 
 LICENSE="DUKE3D"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="app-arch/unzip"
diff --git a/games-fps/duke3d/duke3d-20040817-r2.ebuild b/games-fps/duke3d/duke3d-20040817-r2.ebuild
index 01ee62481cdd0..e75632b67acc2 100644
--- a/games-fps/duke3d/duke3d-20040817-r2.ebuild
+++ b/games-fps/duke3d/duke3d-20040817-r2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="hppa x86"
+KEYWORDS="~hppa ~x86"
 IUSE="demo pic perl opengl"
 
 RDEPEND="media-libs/libsdl
diff --git a/games-fps/eduke32/eduke32-20131119.4169.ebuild b/games-fps/eduke32/eduke32-20131119.4169.ebuild
index 92044333b4de5..a5884e14d059d 100644
--- a/games-fps/eduke32/eduke32-20131119.4169.ebuild
+++ b/games-fps/eduke32/eduke32-20131119.4169.ebuild
@@ -32,7 +32,7 @@ SRC_URI="http://dukeworld.duke4.net/eduke32/synthesis/${MY_PV}-${MY_BUILD}/${PN}
 
 LICENSE="GPL-2 BUILDLIC textures? ( hrp_art )"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="cdinstall debug demo gtk offensive +opengl opl-musicpack +png samples sc55-musicpack +server textures tools +vpx"
 REQUIRED_USE="?? ( opl-musicpack sc55-musicpack )"
 
diff --git a/games-fps/enemy-territory-etpro/enemy-territory-etpro-3.2.6-r1.ebuild b/games-fps/enemy-territory-etpro/enemy-territory-etpro-3.2.6-r1.ebuild
index 2ffe2cd61eb42..d86355ef13538 100644
--- a/games-fps/enemy-territory-etpro/enemy-territory-etpro-3.2.6-r1.ebuild
+++ b/games-fps/enemy-territory-etpro/enemy-territory-etpro-3.2.6-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://bani.anime.net/etpro/etpro-${PV//./_}.zip
 	http://www.enemyterritory.sk/files/etpro-${PV//./_}.zip"
 
 LICENSE="all-rights-reserved"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="dedicated opengl"
 
 QA_PREBUILT="${INS_DIR:1}/${MOD_DIR}/*so"
diff --git a/games-fps/enemy-territory-truecombat/enemy-territory-truecombat-0.49b.ebuild b/games-fps/enemy-territory-truecombat/enemy-territory-truecombat-0.49b.ebuild
index 6d4d7c38c4ec6..ec5f4920f7120 100644
--- a/games-fps/enemy-territory-truecombat/enemy-territory-truecombat-0.49b.ebuild
+++ b/games-fps/enemy-territory-truecombat/enemy-territory-truecombat-0.49b.ebuild
@@ -18,7 +18,7 @@ SRC_URI="http://dragons-perch.net/tce/tcetest049.zip
 	http://dragons-perch.net/tce/tce${MY_PV}_all_os_fixed.zip"
 
 LICENSE="freedist"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="dedicated opengl"
 
 RDEPEND="~virtual/libstdc++-3.3"
diff --git a/games-fps/enemy-territory/enemy-territory-2.60b-r1.ebuild b/games-fps/enemy-territory/enemy-territory-2.60b-r1.ebuild
index 62ea2448f19ef..0f2d212e04525 100644
--- a/games-fps/enemy-territory/enemy-territory-2.60b-r1.ebuild
+++ b/games-fps/enemy-territory/enemy-territory-2.60b-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://3dgamers/wolfensteinet/et-linux-2.60.x86.run
 
 LICENSE="RTCW-ETEULA"
 SLOT="0"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE="dedicated"
 RESTRICT="mirror strip"
 
diff --git a/games-fps/etqw-bin/etqw-bin-1.5-r1.ebuild b/games-fps/etqw-bin/etqw-bin-1.5-r1.ebuild
index 9312c3b33f717..8270e50c21ee1 100644
--- a/games-fps/etqw-bin/etqw-bin-1.5-r1.ebuild
+++ b/games-fps/etqw-bin/etqw-bin-1.5-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.i3d.net/Games/Enemy%20Territory%20Quake%20Wars/Patches/ETQW-c
 
 LICENSE="ETQW"
 SLOT="0"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE="cdinstall"
 RESTRICT="strip"
 
diff --git a/games-fps/etqw-data/etqw-data-1.0.ebuild b/games-fps/etqw-data/etqw-data-1.0.ebuild
index fc2868595b432..37737ed0d091b 100644
--- a/games-fps/etqw-data/etqw-data-1.0.ebuild
+++ b/games-fps/etqw-data/etqw-data-1.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE="ETQW"
 SLOT="0"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE="videos"
 
 S=${WORKDIR}
diff --git a/games-fps/freedoom/freedoom-0.10.1.ebuild b/games-fps/freedoom/freedoom-0.10.1.ebuild
index 48aaf46cff14c..4fdffa8813eb4 100644
--- a/games-fps/freedoom/freedoom-0.10.1.ebuild
+++ b/games-fps/freedoom/freedoom-0.10.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/freedoom/freedoom/releases/download/v${PV}/freedoom-
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""
 
 DEPEND="app-arch/unzip"
diff --git a/games-fps/freedoom/freedoom-0.7.ebuild b/games-fps/freedoom/freedoom-0.7.ebuild
index 33ff0b3f0ea3a..5f2da28d90c6a 100644
--- a/games-fps/freedoom/freedoom-0.7.ebuild
+++ b/games-fps/freedoom/freedoom-0.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://nongnu/freedoom/freedoom-iwad/shareware/freedoom-demo-${PV}.zi
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""
 
 DEPEND="app-arch/unzip"
diff --git a/games-fps/glxquake-bin/glxquake-bin-0-r2.ebuild b/games-fps/glxquake-bin/glxquake-bin-0-r2.ebuild
index 5b7ec6390df8f..16ffdde57574b 100644
--- a/games-fps/glxquake-bin/glxquake-bin-0-r2.ebuild
+++ b/games-fps/glxquake-bin/glxquake-bin-0-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.wh-hms.uni-ulm.de/~mfcn/shared/glxquake/glxquake.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 RESTRICT="strip"
 IUSE=""
 
diff --git a/games-fps/industri/industri-1.01.ebuild b/games-fps/industri/industri-1.01.ebuild
index afffb89d9410f..40e991008542b 100644
--- a/games-fps/industri/industri-1.01.ebuild
+++ b/games-fps/industri/industri-1.01.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/industri/industri_BIN-${PV}-src.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="~x86"
 IUSE="cdinstall"
 
 RDEPEND="virtual/opengl
diff --git a/games-fps/legends/legends-0.4.1.43-r1.ebuild b/games-fps/legends/legends-0.4.1.43-r1.ebuild
index 2cff4a3ec2fa2..d1ebb6eda69fd 100644
--- a/games-fps/legends/legends-0.4.1.43-r1.ebuild
+++ b/games-fps/legends/legends-0.4.1.43-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://legendsthegame.net/files/${MY_P}.run
 
 LICENSE="Legends LGPL-2.1+"
 SLOT="0"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE="+dedicated"
 RESTRICT="strip"
 
diff --git a/games-fps/lsdldoom/lsdldoom-1.5.ebuild b/games-fps/lsdldoom/lsdldoom-1.5.ebuild
index 8856b85ae3a88..805a8dfc2d87c 100644
--- a/games-fps/lsdldoom/lsdldoom-1.5.ebuild
+++ b/games-fps/lsdldoom/lsdldoom-1.5.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://jesshaas.com/lsdldoom/src/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="arm x86"
+KEYWORDS="~arm ~x86"
 IUSE="+net +shareware freedoom"
 
 DEPEND="media-libs/libsdl[video]
diff --git a/games-fps/nexuiz/nexuiz-2.5.2.ebuild b/games-fps/nexuiz/nexuiz-2.5.2.ebuild
index 868069a685674..b6c6bc30b09a2 100644
--- a/games-fps/nexuiz/nexuiz-2.5.2.ebuild
+++ b/games-fps/nexuiz/nexuiz-2.5.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="alsa dedicated maps opengl sdl"
 
 # no headers for libpng needed
diff --git a/games-fps/openarena/openarena-0.8.8.ebuild b/games-fps/openarena/openarena-0.8.8.ebuild
index 023db096e5ad8..f35c2fbe563e9 100644
--- a/games-fps/openarena/openarena-0.8.8.ebuild
+++ b/games-fps/openarena/openarena-0.8.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/oarena/${P}.zip
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+curl +openal +vorbis"
 
 RDEPEND="virtual/opengl
diff --git a/games-fps/postal2/postal2-1409.2-r2.ebuild b/games-fps/postal2/postal2-1409.2-r2.ebuild
index ac2313659529a..f0ee7ff50e1ce 100644
--- a/games-fps/postal2/postal2-1409.2-r2.ebuild
+++ b/games-fps/postal2/postal2-1409.2-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://updatefiles.linuxgamepublishing.com/${PN}/${P/%?/1}.run
 
 LICENSE="postal2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 RESTRICT="strip"
 
diff --git a/games-fps/postal2mp-demo/postal2mp-demo-1409.ebuild b/games-fps/postal2mp-demo/postal2mp-demo-1409.ebuild
index c803d36bfff53..d01d21b14e0bc 100644
--- a/games-fps/postal2mp-demo/postal2mp-demo-1409.ebuild
+++ b/games-fps/postal2mp-demo/postal2mp-demo-1409.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://treefort.icculus.org/postal2/Postal2STP-FreeMP-linux.tar.bz2
 
 LICENSE="postal2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 RESTRICT="mirror strip"
 
diff --git a/games-fps/prboom/prboom-2.5.0.ebuild b/games-fps/prboom/prboom-2.5.0.ebuild
index c5e44d420eef1..89b2de060de42 100644
--- a/games-fps/prboom/prboom-2.5.0.ebuild
+++ b/games-fps/prboom/prboom-2.5.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""
 
 DEPEND="media-libs/libsdl[joystick,video]
diff --git a/games-fps/quake1-data/quake1-data-2.40.ebuild b/games-fps/quake1-data/quake1-data-2.40.ebuild
index bb3a40e46345f..b5b088ccdbbb3 100644
--- a/games-fps/quake1-data/quake1-data-2.40.ebuild
+++ b/games-fps/quake1-data/quake1-data-2.40.ebuild
@@ -15,7 +15,7 @@ SRC_URI=""
 
 LICENSE="all-rights-reserved"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="app-arch/lha"
diff --git a/games-fps/quake1-demodata/quake1-demodata-1.06.ebuild b/games-fps/quake1-demodata/quake1-demodata-1.06.ebuild
index d1348f05b8ab5..82589d35c576f 100644
--- a/games-fps/quake1-demodata/quake1-demodata-1.06.ebuild
+++ b/games-fps/quake1-demodata/quake1-demodata-1.06.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://idsoftware/${MY_PN}/${MY_PN}${MY_PV}.zip"
 # See licinfo.txt
 LICENSE="quake1-demodata"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="symlink"
 
 RDEPEND=""
diff --git a/games-fps/quake1-killer/quake1-killer-2.2z.ebuild b/games-fps/quake1-killer/quake1-killer-2.2z.ebuild
index 67957bae46ccd..a496cf4feff71 100644
--- a/games-fps/quake1-killer/quake1-killer-2.2z.ebuild
+++ b/games-fps/quake1-killer/quake1-killer-2.2z.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.gamers.org/pub/idgames2/quakec/compilations/kqp220z.zip
 
 LICENSE="quake1-killer"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/games-fps/quake1-rally/quake1-rally-1.2.ebuild b/games-fps/quake1-rally/quake1-rally-1.2.ebuild
index 315426ed3f7dd..d35159fa497a0 100644
--- a/games-fps/quake1-rally/quake1-rally-1.2.ebuild
+++ b/games-fps/quake1-rally/quake1-rally-1.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://ehall.freeshell.org/quake/qr12.zip
 
 LICENSE="all-rights-reserved"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 RESTRICT="mirror bindist"
 
diff --git a/games-fps/quake1-teamfortress/quake1-teamfortress-2.9.ebuild b/games-fps/quake1-teamfortress/quake1-teamfortress-2.9.ebuild
index 9e659763e5a98..f712f354b145f 100644
--- a/games-fps/quake1-teamfortress/quake1-teamfortress-2.9.ebuild
+++ b/games-fps/quake1-teamfortress/quake1-teamfortress-2.9.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/tf28.zip
 
 LICENSE="quake1-teamfortress"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/games-fps/quake1-textures/quake1-textures-20050820.ebuild b/games-fps/quake1-textures/quake1-textures-20050820.ebuild
index b96d164e00116..b030e4a207420 100644
--- a/games-fps/quake1-textures/quake1-textures-20050820.ebuild
+++ b/games-fps/quake1-textures/quake1-textures-20050820.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://facelift.quakedev.com/download/${MY_SKINS}
 
 LICENSE="quake1-textures"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/games-fps/quake2-data/quake2-data-3.20.ebuild b/games-fps/quake2-data/quake2-data-3.20.ebuild
index 08ed81faab7dd..0a8b671417b7a 100644
--- a/games-fps/quake2-data/quake2-data-3.20.ebuild
+++ b/games-fps/quake2-data/quake2-data-3.20.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://idsoftware/quake2/q2-${PV}-x86-full-ctf.exe"
 
 LICENSE="Q2EULA"
 SLOT="0"
-KEYWORDS="~alpha amd64 x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~x86 ~x86-fbsd"
 IUSE="videos"
 
 DEPEND="app-arch/unzip"
diff --git a/games-fps/quake2-demodata/quake2-demodata-3.14.ebuild b/games-fps/quake2-demodata/quake2-demodata-3.14.ebuild
index da3488c250439..03f9521ff9f08 100644
--- a/games-fps/quake2-demodata/quake2-demodata-3.14.ebuild
+++ b/games-fps/quake2-demodata/quake2-demodata-3.14.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://idsoftware/${MY_PN}/${FILE}"
 # See license.txt - it's a bit different to Q2EULA in Portage
 LICENSE="quake2-demodata"
 SLOT="0"
-KEYWORDS="~alpha amd64 x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~x86 ~x86-fbsd"
 IUSE="symlink"
 
 RDEPEND=""
diff --git a/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild b/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild
index 04bd7037c7f13..7d8220b1af0f8 100644
--- a/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild
+++ b/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://icculus.org/quake2/files/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 IUSE="aalib alsa cdinstall dedicated demo ipv6 joystick opengl qmax rogue sdl X xatrix"
 
 UIDEPEND="aalib? ( media-libs/aalib )
diff --git a/games-fps/quake3-alliance/quake3-alliance-3.3-r1.ebuild b/games-fps/quake3-alliance/quake3-alliance-3.3-r1.ebuild
index 2ba01e103168f..730bbf5f5b7ff 100644
--- a/games-fps/quake3-alliance/quake3-alliance-3.3-r1.ebuild
+++ b/games-fps/quake3-alliance/quake3-alliance-3.3-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://quakeunity/modifications/alliance/alliance30.zip
 	http://www.superkeff.net/mods/mods/alliance/alliance30-33.zip"
 
 LICENSE="freedist"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="dedicated opengl"
 
 src_prepare() {
diff --git a/games-fps/quake3-alternatefire/quake3-alternatefire-2.0-r1.ebuild b/games-fps/quake3-alternatefire/quake3-alternatefire-2.0-r1.ebuild
index d5e4e58ddcc5e..d0d7066df6a7d 100644
--- a/games-fps/quake3-alternatefire/quake3-alternatefire-2.0-r1.ebuild
+++ b/games-fps/quake3-alternatefire/quake3-alternatefire-2.0-r1.ebuild
@@ -13,5 +13,5 @@ SRC_URI="mirror://quakeunity/modifications/alternatefire/alternatefire-${PV}.zip
 
 LICENSE="freedist"
 
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="dedicated opengl"
diff --git a/games-fps/quake3-bfp/quake3-bfp-1.2-r1.ebuild b/games-fps/quake3-bfp/quake3-bfp-1.2-r1.ebuild
index 59e6be36e6752..cc5bc4ee8ddec 100644
--- a/games-fps/quake3-bfp/quake3-bfp-1.2-r1.ebuild
+++ b/games-fps/quake3-bfp/quake3-bfp-1.2-r1.ebuild
@@ -13,5 +13,5 @@ HOMEPAGE="http://www.moddb.com/mods/bid-for-power"
 SRC_URI="mirror://quakeunity/modifications/bidforpower/bidforpower${PV/./-}.zip"
 
 LICENSE="freedist"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="dedicated opengl"
diff --git a/games-fps/quake3-bin/quake3-bin-1.32c-r2.ebuild b/games-fps/quake3-bin/quake3-bin-1.32c-r2.ebuild
index debf5443b976c..e8b0f6c18fafa 100644
--- a/games-fps/quake3-bin/quake3-bin-1.32c-r2.ebuild
+++ b/games-fps/quake3-bin/quake3-bin-1.32c-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://idsoftware/quake3/linux/linuxq3apoint-1.32b-3.x86.run
 
 LICENSE="Q3AEULA GPL-2" #gpl for init script bug #425942
 SLOT="0"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE="cdinstall dedicated teamarena"
 RESTRICT="strip"
 
diff --git a/games-fps/quake3-cpma/quake3-cpma-1.48.ebuild b/games-fps/quake3-cpma/quake3-cpma-1.48.ebuild
index 78808886c95fb..91092175ebe1b 100644
--- a/games-fps/quake3-cpma/quake3-cpma-1.48.ebuild
+++ b/games-fps/quake3-cpma/quake3-cpma-1.48.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://packages.vstone.eu/quake3/install/cpma${PV//.}-nomaps.zip
 	http://packages.vstone.eu/quake3/install/cpma-mappack-full.zip"
 
 LICENSE="all-rights-reserved"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="dedicated opengl"
 
 src_prepare() {
diff --git a/games-fps/quake3-data/quake3-data-1.32b.ebuild b/games-fps/quake3-data/quake3-data-1.32b.ebuild
index c6fdf94e9c8e0..bc98a7d7c2e56 100644
--- a/games-fps/quake3-data/quake3-data-1.32b.ebuild
+++ b/games-fps/quake3-data/quake3-data-1.32b.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://idsoftware/quake3/linux/linuxq3apoint-${PV}-3.x86.run"
 
 LICENSE="Q3AEULA"
 SLOT="0"
-KEYWORDS="~alpha amd64 x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~x86 ~x86-fbsd"
 IUSE=""
 
 S=${WORKDIR}
diff --git a/games-fps/quake3-defrag/quake3-defrag-1.91.21.ebuild b/games-fps/quake3-defrag/quake3-defrag-1.91.21.ebuild
index 55e6be2cf6527..aeac35425a751 100644
--- a/games-fps/quake3-defrag/quake3-defrag-1.91.21.ebuild
+++ b/games-fps/quake3-defrag/quake3-defrag-1.91.21.ebuild
@@ -24,7 +24,7 @@ SRC_URI="http://q3defrag.org/files/defrag/defrag_${PV}.zip
 	http://www.german-defrag.de/files/defrag/defragpak11.zip"
 
 LICENSE="freedist"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="dedicated opengl"
 
 src_unpack() {
diff --git a/games-fps/quake3-demo/quake3-demo-1.11-r1.ebuild b/games-fps/quake3-demo/quake3-demo-1.11-r1.ebuild
index 6096e3f9f8ce7..6d37eb9904675 100644
--- a/games-fps/quake3-demo/quake3-demo-1.11-r1.ebuild
+++ b/games-fps/quake3-demo/quake3-demo-1.11-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://idsoftware/quake3/linux/linuxq3ademo-${PV}-6.x86.gz.sh
 
 LICENSE="Q3AEULA"
 SLOT="0"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE="dedicated"
 RESTRICT="strip"
 
diff --git a/games-fps/quake3-excessiveplus/quake3-excessiveplus-2.3.ebuild b/games-fps/quake3-excessiveplus/quake3-excessiveplus-2.3.ebuild
index 4ebf2a5101a2f..735d31c171cb6 100644
--- a/games-fps/quake3-excessiveplus/quake3-excessiveplus-2.3.ebuild
+++ b/games-fps/quake3-excessiveplus/quake3-excessiveplus-2.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.excessiveplus.net/"
 SRC_URI="http://www.excessiveplus.net/files/release/xp-${PV}.zip"
 
 LICENSE="all-rights-reserved"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="dedicated opengl"
 
 src_prepare() {
diff --git a/games-fps/quake3-lrctf/quake3-lrctf-1.1.ebuild b/games-fps/quake3-lrctf/quake3-lrctf-1.1.ebuild
index d2d64197a6806..8ac9cdec512ab 100644
--- a/games-fps/quake3-lrctf/quake3-lrctf-1.1.ebuild
+++ b/games-fps/quake3-lrctf/quake3-lrctf-1.1.ebuild
@@ -12,5 +12,5 @@ HOMEPAGE="http://www.lrctf.com/"
 SRC_URI="http://lrctf.com/release/LRCTF_Q3A_v${PV}_full.zip"
 
 LICENSE="LRCTF"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="dedicated opengl"
diff --git a/games-fps/quake3-matrix/quake3-matrix-2.4_beta-r1.ebuild b/games-fps/quake3-matrix/quake3-matrix-2.4_beta-r1.ebuild
index 2a5f1e35177a3..2a05080d57fe2 100644
--- a/games-fps/quake3-matrix/quake3-matrix-2.4_beta-r1.ebuild
+++ b/games-fps/quake3-matrix/quake3-matrix-2.4_beta-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.moddb.com/mods/matrix-quake-3"
 SRC_URI="mirror://quakeunity/modifications/matrix24.zip"
 
 LICENSE="freedist"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="dedicated opengl"
 
 src_unpack() {
diff --git a/games-fps/quake3-nsco/quake3-nsco-1.93-r1.ebuild b/games-fps/quake3-nsco/quake3-nsco-1.93-r1.ebuild
index 51e7235fb1595..0d80eb2dfe045 100644
--- a/games-fps/quake3-nsco/quake3-nsco-1.93-r1.ebuild
+++ b/games-fps/quake3-nsco/quake3-nsco-1.93-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://quakeunity/modifications/navyseals/nsco_beta19.zip
 	mirror://quakeunity/modifications/navyseals/nsco_beta193upd.zip"
 
 LICENSE="freedist"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="dedicated opengl"
 RESTRICT="strip mirror"
 
diff --git a/games-fps/quake3-osp/quake3-osp-1.03a-r1.ebuild b/games-fps/quake3-osp/quake3-osp-1.03a-r1.ebuild
index f6497aa5beb63..f7620d7bea89f 100644
--- a/games-fps/quake3-osp/quake3-osp-1.03a-r1.ebuild
+++ b/games-fps/quake3-osp/quake3-osp-1.03a-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.orangesmoothie.org/"
 SRC_URI="http://osp.dget.cc/orangesmoothie/downloads/osp-Quake3-${PV}_full.zip"
 
 LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="dedicated opengl"
 
 src_prepare() {
diff --git a/games-fps/quake3-ra3/quake3-ra3-1.76-r1.ebuild b/games-fps/quake3-ra3/quake3-ra3-1.76-r1.ebuild
index 4375d81c406f5..b3664702039c6 100644
--- a/games-fps/quake3-ra3/quake3-ra3-1.76-r1.ebuild
+++ b/games-fps/quake3-ra3/quake3-ra3-1.76-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.moddb.com/mods/rocket-arena-3"
 SRC_URI="mirror://quakeunity/modifications/rocketarena3/ra3${PV/.}.zip"
 
 LICENSE="freedist"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="dedicated opengl"
 
 QA_PREBUILT="${INS_DIR:1}/${MOD_DIR}/*so"
diff --git a/games-fps/quake3-reaction/quake3-reaction-3.2.ebuild b/games-fps/quake3-reaction/quake3-reaction-3.2.ebuild
index f46a287fbdb60..e5ca16d89d4f6 100644
--- a/games-fps/quake3-reaction/quake3-reaction-3.2.ebuild
+++ b/games-fps/quake3-reaction/quake3-reaction-3.2.ebuild
@@ -16,5 +16,5 @@ SRC_URI="
 	"
 
 LICENSE="all-rights-reserved"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="dedicated opengl"
diff --git a/games-fps/quake3-ruinhunters/quake3-ruinhunters-1.0a-r1.ebuild b/games-fps/quake3-ruinhunters/quake3-ruinhunters-1.0a-r1.ebuild
index 8f70b9b2feac6..4964206061fb8 100644
--- a/games-fps/quake3-ruinhunters/quake3-ruinhunters-1.0a-r1.ebuild
+++ b/games-fps/quake3-ruinhunters/quake3-ruinhunters-1.0a-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 	mirror://quakeunity/modifications/ruinhunters/ruin_hunters_v10a_patch.zip"
 
 LICENSE="freedist"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="dedicated opengl"
 
 src_prepare() {
diff --git a/games-fps/quake3-teamarena/quake3-teamarena-1.32b.ebuild b/games-fps/quake3-teamarena/quake3-teamarena-1.32b.ebuild
index e367be487f0ad..738b50da2116f 100644
--- a/games-fps/quake3-teamarena/quake3-teamarena-1.32b.ebuild
+++ b/games-fps/quake3-teamarena/quake3-teamarena-1.32b.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://idsoftware/quake3/linux/linuxq3apoint-${PV}-3.x86.run"
 
 LICENSE="Q3AEULA"
 SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND="|| (
diff --git a/games-fps/quake3-threewave/quake3-threewave-1.7-r1.ebuild b/games-fps/quake3-threewave/quake3-threewave-1.7-r1.ebuild
index 7c39ce1c556d5..c5ea539aae0b6 100644
--- a/games-fps/quake3-threewave/quake3-threewave-1.7-r1.ebuild
+++ b/games-fps/quake3-threewave/quake3-threewave-1.7-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://quakeunity/modifications/threewavectf/threewave_16_full.zip
 	mirror://quakeunity/modifications/threewavectf/threewave_17_update.zip"
 
 LICENSE="freedist"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="dedicated opengl"
 
 src_unpack() {
diff --git a/games-fps/quake3/quake3-1.36-r1.ebuild b/games-fps/quake3/quake3-1.36-r1.ebuild
index 0f1ede92b5d79..d2ce233ab1853 100644
--- a/games-fps/quake3/quake3-1.36-r1.ebuild
+++ b/games-fps/quake3/quake3-1.36-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://ioquake3.org/files/${MY_PV}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 # "smp" is omitted, because currently it does not work.
 IUSE="dedicated opengl teamarena +openal curl vorbis voice mumble"
 
diff --git a/games-fps/quake4-bin/quake4-bin-1.4.2-r1.ebuild b/games-fps/quake4-bin/quake4-bin-1.4.2-r1.ebuild
index 46165b2bef2b9..dc0663f1a30f5 100644
--- a/games-fps/quake4-bin/quake4-bin-1.4.2-r1.ebuild
+++ b/games-fps/quake4-bin/quake4-bin-1.4.2-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://idsoftware/quake4/linux/quake4-linux-${PV}.x86.run"
 
 LICENSE="QUAKE4"
 SLOT="0"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE="cdinstall dedicated l10n_cs l10n_fr l10n_it l10n_pl l10n_ru"
 RESTRICT="strip"
 
diff --git a/games-fps/quake4-data/quake4-data-1.0.2147.12.ebuild b/games-fps/quake4-data/quake4-data-1.0.2147.12.ebuild
index 62cfd11dd1dec..a4675a6b575f7 100644
--- a/games-fps/quake4-data/quake4-data-1.0.2147.12.ebuild
+++ b/games-fps/quake4-data/quake4-data-1.0.2147.12.ebuild
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE="QUAKE4"
 SLOT="0"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE=""
 RESTRICT="strip"
 
diff --git a/games-fps/quakeforge/quakeforge-0.7.2.ebuild b/games-fps/quakeforge/quakeforge-0.7.2.ebuild
index 383ba93f8e94a..1b72873e44ff1 100644
--- a/games-fps/quakeforge/quakeforge-0.7.2.ebuild
+++ b/games-fps/quakeforge/quakeforge-0.7.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/quake/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="cdinstall debug fbcon flac sdl X ncurses png vorbis zlib ipv6 xv dga alsa oss xdg wildmidi"
 RESTRICT="userpriv"
 
diff --git a/games-fps/red-blue-quake2/red-blue-quake2-0.1.ebuild b/games-fps/red-blue-quake2/red-blue-quake2-0.1.ebuild
index 5b4150c6250e3..678376ddc67f0 100644
--- a/games-fps/red-blue-quake2/red-blue-quake2-0.1.ebuild
+++ b/games-fps/red-blue-quake2/red-blue-quake2-0.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://idsoftware/source/q2source-3.21.zip
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="~x86"
 IUSE=""
 
 RDEPEND="x11-libs/libX11"
diff --git a/games-fps/rott/rott-1.1.2.ebuild b/games-fps/rott/rott-1.1.2.ebuild
index 89a28ab64800e..69fec0a0f4351 100644
--- a/games-fps/rott/rott-1.1.2.ebuild
+++ b/games-fps/rott/rott-1.1.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.icculus.org/rott/releases/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="demo"
 
 RDEPEND="media-libs/libsdl[sound,joystick,video]
diff --git a/games-fps/rtcwmp-demo/rtcwmp-demo-1.1-r1.ebuild b/games-fps/rtcwmp-demo/rtcwmp-demo-1.1-r1.ebuild
index ea27e64a53f75..0f2f14c65092a 100644
--- a/games-fps/rtcwmp-demo/rtcwmp-demo-1.1-r1.ebuild
+++ b/games-fps/rtcwmp-demo/rtcwmp-demo-1.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://idsoftware/wolf/linux/old/${MY_P}
 
 LICENSE="RTCW GPL-2" # gpl for init script bug #425946
 SLOT="0"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE="dedicated"
 RESTRICT="strip mirror"
 
diff --git a/games-fps/rtcwsp-demo/rtcwsp-demo-1.1b-r1.ebuild b/games-fps/rtcwsp-demo/rtcwsp-demo-1.1b-r1.ebuild
index 642b5c127a6f7..1899f46a66e09 100644
--- a/games-fps/rtcwsp-demo/rtcwsp-demo-1.1b-r1.ebuild
+++ b/games-fps/rtcwsp-demo/rtcwsp-demo-1.1b-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://idsoftware/wolf/linux/old/${MY_P}
 
 LICENSE="RTCW"
 SLOT="0"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE=""
 RESTRICT="strip mirror"
 
diff --git a/games-fps/sauerbraten/sauerbraten-2013.02.03.ebuild b/games-fps/sauerbraten/sauerbraten-2013.02.03.ebuild
index 2954fb16c8591..edfb69774e329 100644
--- a/games-fps/sauerbraten/sauerbraten-2013.02.03.ebuild
+++ b/games-fps/sauerbraten/sauerbraten-2013.02.03.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/sauerbraten/sauerbraten/2013_02_03/sauerbraten_${P
 
 LICENSE="ZLIB freedist"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="debug dedicated server"
 
 RDEPEND="
diff --git a/games-fps/soldieroffortune-demo/soldieroffortune-demo-0.57-r1.ebuild b/games-fps/soldieroffortune-demo/soldieroffortune-demo-0.57-r1.ebuild
index 5a3b9c6f4cb77..91362dc074429 100644
--- a/games-fps/soldieroffortune-demo/soldieroffortune-demo-0.57-r1.ebuild
+++ b/games-fps/soldieroffortune-demo/soldieroffortune-demo-0.57-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://lokigames/loki_demos/${MY_PN}.run"
 
 LICENSE="LOKI-EULA"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 RESTRICT="strip"
 
diff --git a/games-fps/soldieroffortune/soldieroffortune-1.06a-r1.ebuild b/games-fps/soldieroffortune/soldieroffortune-1.06a-r1.ebuild
index 2d9af482ccd50..a9cfb2fbe14c9 100644
--- a/games-fps/soldieroffortune/soldieroffortune-1.06a-r1.ebuild
+++ b/games-fps/soldieroffortune/soldieroffortune-1.06a-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://lokigames/sof/sof-${PV}-cdrom-x86.run"
 
 LICENSE="LOKI-EULA"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 RESTRICT="strip"
 IUSE=""
 
diff --git a/games-fps/tenebrae/tenebrae-1.04.ebuild b/games-fps/tenebrae/tenebrae-1.04.ebuild
index 7e023b4d833ad..f01beaf82a8bb 100644
--- a/games-fps/tenebrae/tenebrae-1.04.ebuild
+++ b/games-fps/tenebrae/tenebrae-1.04.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/tenebrae/tenebraedata.zip
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="~x86"
 IUSE=""
 
 RDEPEND="virtual/opengl
diff --git a/games-fps/transfusion-bin/transfusion-bin-1.01.ebuild b/games-fps/transfusion-bin/transfusion-bin-1.01.ebuild
index 3395261e4df04..9836fd5cf2a1b 100644
--- a/games-fps/transfusion-bin/transfusion-bin-1.01.ebuild
+++ b/games-fps/transfusion-bin/transfusion-bin-1.01.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/blood/${MY_PN}-1.0-linux.i386.zip
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* x86"
+KEYWORDS="-* ~x86"
 IUSE=""
 RESTRICT="strip"
 
diff --git a/games-fps/tribes2/tribes2-25034.ebuild b/games-fps/tribes2/tribes2-25034.ebuild
index e387698b404ac..817ede1c3913c 100644
--- a/games-fps/tribes2/tribes2-25034.ebuild
+++ b/games-fps/tribes2/tribes2-25034.ebuild
@@ -14,7 +14,7 @@ SLOT="0"
 # This package is broken and doesn't patch right on AMD64.  I've not taken the
 # time to try to figure it out but this definitely needs to stay -amd64 until
 # someone does fix the patching.
-KEYWORDS="-amd64 x86"
+KEYWORDS="-amd64 ~x86"
 IUSE=""
 RESTRICT="mirror strip"
 
diff --git a/games-fps/turtlearena/turtlearena-0.6.1.ebuild b/games-fps/turtlearena/turtlearena-0.6.1.ebuild
index 66eade36d51c0..be8e13d5e5d62 100644
--- a/games-fps/turtlearena/turtlearena-0.6.1.ebuild
+++ b/games-fps/turtlearena/turtlearena-0.6.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://turtlearena.googlecode.com/files/${MY_P}-0-src.tar.bz2
 
 LICENSE="GPL-2+ CC-BY-SA-3.0 mplus-fonts lcc"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+curl debug dedicated mumble openal server theora voice vorbis"
 
 RDEPEND="
diff --git a/games-fps/unreal-tournament-bonuspacks/unreal-tournament-bonuspacks-436.ebuild b/games-fps/unreal-tournament-bonuspacks/unreal-tournament-bonuspacks-436.ebuild
index cbb7e58f90d57..bbc8edb8a3fe8 100644
--- a/games-fps/unreal-tournament-bonuspacks/unreal-tournament-bonuspacks-436.ebuild
+++ b/games-fps/unreal-tournament-bonuspacks/unreal-tournament-bonuspacks-436.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://www.ut-files.com/Patches/utbonuspack4.zip -> UTBonusPack4.zip"
 
 LICENSE="all-rights-reserved"
 SLOT="0"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE=""
 RESTRICT="mirror bindist"
 
diff --git a/games-fps/unreal-tournament-goty/unreal-tournament-goty-436.ebuild b/games-fps/unreal-tournament-goty/unreal-tournament-goty-436.ebuild
index 5bf39103557ac..c45cae2d95410 100644
--- a/games-fps/unreal-tournament-goty/unreal-tournament-goty-436.ebuild
+++ b/games-fps/unreal-tournament-goty/unreal-tournament-goty-436.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.ut-files.com/Patches/ut-install-${PV}-GOTY.run
 
 LICENSE="all-rights-reserved"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="~x86"
 IUSE="3dfx S3TC nls opengl"
 RESTRICT="mirror bindist"
 
diff --git a/games-fps/unreal-tournament-goty/unreal-tournament-goty-451.ebuild b/games-fps/unreal-tournament-goty/unreal-tournament-goty-451.ebuild
index 9856c273bd53d..f61422fa334b4 100644
--- a/games-fps/unreal-tournament-goty/unreal-tournament-goty-451.ebuild
+++ b/games-fps/unreal-tournament-goty/unreal-tournament-goty-451.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.ut-files.com/Patches/ut-install-436-GOTY.run
 
 LICENSE="all-rights-reserved"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="3dfx S3TC nls opengl"
 RESTRICT="mirror bindist"
 
diff --git a/games-fps/unreal-tournament-strikeforce/unreal-tournament-strikeforce-1.81.ebuild b/games-fps/unreal-tournament-strikeforce/unreal-tournament-strikeforce-1.81.ebuild
index 8f3c6baa0b06d..34337e207484e 100644
--- a/games-fps/unreal-tournament-strikeforce/unreal-tournament-strikeforce-1.81.ebuild
+++ b/games-fps/unreal-tournament-strikeforce/unreal-tournament-strikeforce-1.81.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gentoo/sf_180_server_files.tar.gz
 
 LICENSE="unreal-tournament-strikeforce"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="~x86"
 IUSE=""
 RESTRICT="bindist"
 
diff --git a/games-fps/unreal-tournament/unreal-tournament-451.ebuild b/games-fps/unreal-tournament/unreal-tournament-451.ebuild
index 03ab6d2ed3b5a..d5b0e7f883421 100644
--- a/games-fps/unreal-tournament/unreal-tournament-451.ebuild
+++ b/games-fps/unreal-tournament/unreal-tournament-451.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.ut-files.com/Patches/ut-install-436.run
 
 LICENSE="all-rights-reserved"
 SLOT="0"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE="3dfx opengl"
 RESTRICT="mirror bindist"
 
diff --git a/games-fps/urbanterror-data/urbanterror-data-4.3.2.ebuild b/games-fps/urbanterror-data/urbanterror-data-4.3.2.ebuild
index f59bac91531f2..5b0059e6f3ce4 100644
--- a/games-fps/urbanterror-data/urbanterror-data-4.3.2.ebuild
+++ b/games-fps/urbanterror-data/urbanterror-data-4.3.2.ebuild
@@ -26,7 +26,7 @@ unset MY_CTR
 
 LICENSE="Q3AEULA-20000111 urbanterror-4.2-maps"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 DEPEND="app-arch/unzip"
 
 S="${WORKDIR}/${MY_PN}43"
diff --git a/games-fps/urbanterror/urbanterror-4.3.2_p20170426.ebuild b/games-fps/urbanterror/urbanterror-4.3.2_p20170426.ebuild
index eaf4a41e7db6c..522657485a43b 100644
--- a/games-fps/urbanterror/urbanterror-4.3.2_p20170426.ebuild
+++ b/games-fps/urbanterror/urbanterror-4.3.2_p20170426.ebuild
@@ -15,7 +15,7 @@ else
 	COMMIT_ID="60b17a27ecaa30bffc44114cb94df82af7febfdd"
 	SRC_URI="https://github.com/mickael9/ioq3/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/ioq3-${COMMIT_ID}"
-	KEYWORDS="amd64 x86"
+	KEYWORDS="~amd64 ~x86"
 
 fi
 
diff --git a/games-fps/ut2003-bonuspack-cm/ut2003-bonuspack-cm-1.ebuild b/games-fps/ut2003-bonuspack-cm/ut2003-bonuspack-cm-1.ebuild
index 938b6bcdc0a6c..14ac3f422cddc 100644
--- a/games-fps/ut2003-bonuspack-cm/ut2003-bonuspack-cm-1.ebuild
+++ b/games-fps/ut2003-bonuspack-cm/ut2003-bonuspack-cm-1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://ut.rushbase.net/beyondunreal/mods/cbp2003.zip"
 
 LICENSE="ut2003"
 SLOT="1"
-KEYWORDS="x86"
+KEYWORDS="~x86"
 RESTRICT="mirror strip"
 
 RDEPEND="games-fps/ut2003"
diff --git a/games-fps/ut2003-bonuspack-de/ut2003-bonuspack-de-1.ebuild b/games-fps/ut2003-bonuspack-de/ut2003-bonuspack-de-1.ebuild
index 1676ed6199958..8483dfeb4837a 100644
--- a/games-fps/ut2003-bonuspack-de/ut2003-bonuspack-de-1.ebuild
+++ b/games-fps/ut2003-bonuspack-de/ut2003-bonuspack-de-1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://ftp.student.utwente.nl/pub/games/UT2003/BonusPack/${MY_P}"
 
 LICENSE="ut2003"
 SLOT="1"
-KEYWORDS="x86"
+KEYWORDS="~x86"
 IUSE=""
 RESTRICT="mirror strip"
 
diff --git a/games-fps/ut2003-bonuspack-epic/ut2003-bonuspack-epic-1.ebuild b/games-fps/ut2003-bonuspack-epic/ut2003-bonuspack-epic-1.ebuild
index 08c1832a65fa2..2309f8e075266 100644
--- a/games-fps/ut2003-bonuspack-epic/ut2003-bonuspack-epic-1.ebuild
+++ b/games-fps/ut2003-bonuspack-epic/ut2003-bonuspack-epic-1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://ftp.student.utwente.nl/pub/games/UT2003/BonusPack/UT2003-epicbon
 
 LICENSE="ut2003"
 SLOT="1"
-KEYWORDS="x86"
+KEYWORDS="~x86"
 IUSE=""
 RESTRICT="strip"
 
diff --git a/games-fps/ut2003-data/ut2003-data-2107.ebuild b/games-fps/ut2003-data/ut2003-data-2107.ebuild
index f10d61c8f4551..ccd587855cef0 100644
--- a/games-fps/ut2003-data/ut2003-data-2107.ebuild
+++ b/games-fps/ut2003-data/ut2003-data-2107.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://download.factoryunreal.com/mirror/UT2003CrashFix.zip"
 
 LICENSE="ut2003"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 RESTRICT="strip"
 
diff --git a/games-fps/ut2003-demo/ut2003-demo-2206-r3.ebuild b/games-fps/ut2003-demo/ut2003-demo-2206-r3.ebuild
index 912bd67da1ec3..317f0d5235e73 100644
--- a/games-fps/ut2003-demo/ut2003-demo-2206-r3.ebuild
+++ b/games-fps/ut2003-demo/ut2003-demo-2206-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://unreal.epicgames.com/linux/ut2003/ut2003demo-lnx-${PV}.sh.bin
 
 LICENSE="ut2003-demo"
 SLOT="0"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE=""
 RESTRICT="strip"
 
diff --git a/games-fps/ut2003/ut2003-2225-r4.ebuild b/games-fps/ut2003/ut2003-2225-r4.ebuild
index bb23d7e85c247..9c9c1483ac4e8 100644
--- a/games-fps/ut2003/ut2003-2225-r4.ebuild
+++ b/games-fps/ut2003/ut2003-2225-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.infogrames.net/misc/ut2003/ut2003lnx_patch2225.tar.tar"
 
 LICENSE="ut2003"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="dedicated"
 RESTRICT="strip"
 
diff --git a/games-fps/ut2004-action/ut2004-action-1.ebuild b/games-fps/ut2004-action/ut2004-action-1.ebuild
index ec8aee3b309d6..e498223b9d780 100644
--- a/games-fps/ut2004-action/ut2004-action-1.ebuild
+++ b/games-fps/ut2004-action/ut2004-action-1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.moddb.com/mods/action-unreal-tournament/addons/action-unrea
 SRC_URI="https://ut.rushbase.net/beyondunreal/mods/aut-r1-msuc.zip"
 
 LICENSE="freedist"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="dedicated opengl"
 
 src_unpack() {
diff --git a/games-fps/ut2004-airbuccaneers/ut2004-airbuccaneers-1.6-r2.ebuild b/games-fps/ut2004-airbuccaneers/ut2004-airbuccaneers-1.6-r2.ebuild
index 315244a7176b3..e8d5876647873 100644
--- a/games-fps/ut2004-airbuccaneers/ut2004-airbuccaneers-1.6-r2.ebuild
+++ b/games-fps/ut2004-airbuccaneers/ut2004-airbuccaneers-1.6-r2.ebuild
@@ -14,5 +14,5 @@ HOMEPAGE="http://www.ludocraft.com/entertainment/airbuccaneers-mod/"
 SRC_URI="http://bin.ludocraft.com/files/airbuccaneers_mod_1_6_zipinstall_with_info.zip"
 
 LICENSE="freedist"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="dedicated opengl"
diff --git a/games-fps/ut2004-bonuspack-cbp1/ut2004-bonuspack-cbp1-1-r2.ebuild b/games-fps/ut2004-bonuspack-cbp1/ut2004-bonuspack-cbp1-1-r2.ebuild
index 3eaec6c130889..2752d506b0442 100644
--- a/games-fps/ut2004-bonuspack-cbp1/ut2004-bonuspack-cbp1-1-r2.ebuild
+++ b/games-fps/ut2004-bonuspack-cbp1/ut2004-bonuspack-cbp1-1-r2.ebuild
@@ -13,5 +13,5 @@ SRC_URI="http://downloads.unrealadmin.org/UT2004/BonusPack/cbp1.zip
 	http://files.volved.com/qsr/ut2004_map_packs/cbp1.zip"
 
 LICENSE="freedist"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/games-fps/ut2004-bonuspack-cbp2/ut2004-bonuspack-cbp2-1-r2.ebuild b/games-fps/ut2004-bonuspack-cbp2/ut2004-bonuspack-cbp2-1-r2.ebuild
index cce8b1905ea38..c5fc28cbe82a1 100644
--- a/games-fps/ut2004-bonuspack-cbp2/ut2004-bonuspack-cbp2-1-r2.ebuild
+++ b/games-fps/ut2004-bonuspack-cbp2/ut2004-bonuspack-cbp2-1-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://ut.rushbase.net/beyondunreal/official/ut2004/cbp2-volume1_zip.z
 	https://ut.rushbase.net/beyondunreal/official/ut2004/cbp2-volume2_zip.zip"
 
 LICENSE="freedist"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="games-fps/ut2004-bonuspack-cbp1
diff --git a/games-fps/ut2004-bonuspack-ece/ut2004-bonuspack-ece-1-r3.ebuild b/games-fps/ut2004-bonuspack-ece/ut2004-bonuspack-ece-1-r3.ebuild
index 58563c8924d39..e5ebe2ab3b90f 100644
--- a/games-fps/ut2004-bonuspack-ece/ut2004-bonuspack-ece-1-r3.ebuild
+++ b/games-fps/ut2004-bonuspack-ece/ut2004-bonuspack-ece-1-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://ut2004.ut-files.com/BonusPacks/${MY_P}
 	http://unrealmassdestruction.com/downloads/ut2k4/essentials/UT2004-ONSBonusMapPack.zip"
 
 LICENSE="ut2003"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 src_unpack() {
diff --git a/games-fps/ut2004-bonuspack-mega/ut2004-bonuspack-mega-1-r2.ebuild b/games-fps/ut2004-bonuspack-mega/ut2004-bonuspack-mega-1-r2.ebuild
index ec2133acbd5a6..807f91c6bf042 100644
--- a/games-fps/ut2004-bonuspack-mega/ut2004-bonuspack-mega-1-r2.ebuild
+++ b/games-fps/ut2004-bonuspack-mega/ut2004-bonuspack-mega-1-r2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.unrealtournament2004.com/"
 SRC_URI="http://ut2004.ut-files.com/BonusPacks/${MY_P}"
 
 LICENSE="ut2003"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 src_prepare() {
diff --git a/games-fps/ut2004-cor/ut2004-cor-1.01-r1.ebuild b/games-fps/ut2004-cor/ut2004-cor-1.01-r1.ebuild
index 5c8c4887a8c97..35d2fd6559669 100644
--- a/games-fps/ut2004-cor/ut2004-cor-1.01-r1.ebuild
+++ b/games-fps/ut2004-cor/ut2004-cor-1.01-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://ut.rushbase.net/beyondunreal/mods/cor_beta_v1.0.zip
 	https://ut.rushbase.net/beyondunreal/mods/cor_patch_b1_to_b101.zip"
 
 LICENSE="freedist"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="dedicated opengl"
 
 src_prepare() {
diff --git a/games-fps/ut2004-crossfire/ut2004-crossfire-1.95.ebuild b/games-fps/ut2004-crossfire/ut2004-crossfire-1.95.ebuild
index 9cb62e7a45b32..52d8a5e9ed13c 100644
--- a/games-fps/ut2004-crossfire/ut2004-crossfire-1.95.ebuild
+++ b/games-fps/ut2004-crossfire/ut2004-crossfire-1.95.ebuild
@@ -15,7 +15,7 @@ SRC_URI="ftp://files.tnc-clan.de/TOCrossfire/client/TOCrossfire_beta_${PV}_full.
 
 # See Help/EULA.txt
 LICENSE="free-noncomm"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="dedicated opengl"
 
 src_unpack() {
diff --git a/games-fps/ut2004-data/ut2004-data-3186-r4.ebuild b/games-fps/ut2004-data/ut2004-data-3186-r4.ebuild
index d8cf9883ed626..7c761a8f98735 100644
--- a/games-fps/ut2004-data/ut2004-data-3186-r4.ebuild
+++ b/games-fps/ut2004-data/ut2004-data-3186-r4.ebuild
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE="ut2003"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="games-util/uz2unpack
diff --git a/games-fps/ut2004-deathball/ut2004-deathball-2.4w.ebuild b/games-fps/ut2004-deathball/ut2004-deathball-2.4w.ebuild
index ea47ebeb0f73a..bd51db1c6c897 100644
--- a/games-fps/ut2004-deathball/ut2004-deathball-2.4w.ebuild
+++ b/games-fps/ut2004-deathball/ut2004-deathball-2.4w.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.deathball.net/"
 SRC_URI="http://www.deathball.net/downloads/deathball${PV/.}.zip"
 
 LICENSE="freedist"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="dedicated opengl"
 
 src_prepare() {
diff --git a/games-fps/ut2004-demo/ut2004-demo-3334.ebuild b/games-fps/ut2004-demo/ut2004-demo-3334.ebuild
index c9f009b33945d..53cca08e3d834 100644
--- a/games-fps/ut2004-demo/ut2004-demo-3334.ebuild
+++ b/games-fps/ut2004-demo/ut2004-demo-3334.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${MY_P}"
 
 LICENSE="ut2003-demo"
 SLOT="0"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 RESTRICT="strip"
 IUSE=""
 
diff --git a/games-fps/ut2004-fragops/ut2004-fragops-2.20.ebuild b/games-fps/ut2004-fragops/ut2004-fragops-2.20.ebuild
index ba96776500979..5a03592d0ac30 100644
--- a/games-fps/ut2004-fragops/ut2004-fragops-2.20.ebuild
+++ b/games-fps/ut2004-fragops/ut2004-fragops-2.20.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.moddb.com/mods/fragops"
 SRC_URI="https://ut.rushbase.net/beyondunreal/mods/fragops_v220_fulllmw.zip"
 
 LICENSE="freedist"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="dedicated opengl"
 
 src_prepare() {
diff --git a/games-fps/ut2004-hamsterbash/ut2004-hamsterbash-1.ebuild b/games-fps/ut2004-hamsterbash/ut2004-hamsterbash-1.ebuild
index 83f0d55acbfbf..4d51041af583b 100644
--- a/games-fps/ut2004-hamsterbash/ut2004-hamsterbash-1.ebuild
+++ b/games-fps/ut2004-hamsterbash/ut2004-hamsterbash-1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.moddb.com/mods/hamsterbash"
 SRC_URI="HamsterBashFinal.zip"
 
 LICENSE="freedist"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="dedicated opengl"
 RESTRICT="fetch"
 
diff --git a/games-fps/ut2004-muralis/ut2004-muralis-1.15.ebuild b/games-fps/ut2004-muralis/ut2004-muralis-1.15.ebuild
index e74ac3fd04f97..5421b560b22ea 100644
--- a/games-fps/ut2004-muralis/ut2004-muralis-1.15.ebuild
+++ b/games-fps/ut2004-muralis/ut2004-muralis-1.15.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.moddb.com/mods/muralis"
 SRC_URI="https://ut.rushbase.net/beyondunreal/mods/muralis-v${PV}-zip.zip"
 
 LICENSE="freedist"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="dedicated opengl"
 
 src_prepare() {
diff --git a/games-fps/ut2004-strikeforce/ut2004-strikeforce-4.1.ebuild b/games-fps/ut2004-strikeforce/ut2004-strikeforce-4.1.ebuild
index f0db68c41f691..a5b1fc4d134bb 100644
--- a/games-fps/ut2004-strikeforce/ut2004-strikeforce-4.1.ebuild
+++ b/games-fps/ut2004-strikeforce/ut2004-strikeforce-4.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.moddb.com/mods/strike-force-2004"
 SRC_URI="https://ut.rushbase.net/beyondunreal/mods/strikeforce-ce-v${PV}.zip"
 
 LICENSE="freedist"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="dedicated opengl"
 
 src_prepare() {
diff --git a/games-fps/ut2004-troopers/ut2004-troopers-6.0.ebuild b/games-fps/ut2004-troopers/ut2004-troopers-6.0.ebuild
index 70a6ee5a11c3f..96e978ee4f1bd 100644
--- a/games-fps/ut2004-troopers/ut2004-troopers-6.0.ebuild
+++ b/games-fps/ut2004-troopers/ut2004-troopers-6.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.moddb.com/mods/troopers-dawn-of-destiny/"
 SRC_URI="troopersversion${PV/.}zip.zip"
 
 LICENSE="freedist"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="dedicated opengl"
 RESTRICT="fetch"
 
diff --git a/games-fps/ut2004-unwheel/ut2004-unwheel-0_beta5.ebuild b/games-fps/ut2004-unwheel/ut2004-unwheel-0_beta5.ebuild
index 0e44cbece4c6b..4c2ed07a2bd96 100644
--- a/games-fps/ut2004-unwheel/ut2004-unwheel-0_beta5.ebuild
+++ b/games-fps/ut2004-unwheel/ut2004-unwheel-0_beta5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="unwheel_r5.zip
 	unwheelcbpvol1.zip"
 
 LICENSE="GameFront"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="dedicated opengl"
 RESTRICT="fetch bindist"
 
diff --git a/games-fps/ut2004/ut2004-3369.3-r1.ebuild b/games-fps/ut2004/ut2004-3369.3-r1.ebuild
index e86886c0dc687..7d02f16bfb4f0 100644
--- a/games-fps/ut2004/ut2004-3369.3-r1.ebuild
+++ b/games-fps/ut2004/ut2004-3369.3-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="ut2003"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="dedicated opengl"
 RESTRICT="mirror strip"
 
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 a881bbb8f18f3..a283a3db5f79a 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
@@ -14,7 +14,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-fps/wolfgl/wolfgl-0.93-r1.ebuild b/games-fps/wolfgl/wolfgl-0.93-r1.ebuild
index abda49629276f..915e9356fb81e 100644
--- a/games-fps/wolfgl/wolfgl-0.93-r1.ebuild
+++ b/games-fps/wolfgl/wolfgl-0.93-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://gentoo/${P}.tbz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="~x86"
 IUSE=""
 
 RDEPEND="virtual/opengl"
diff --git a/games-fps/worldofpadman/worldofpadman-1.6.ebuild b/games-fps/worldofpadman/worldofpadman-1.6.ebuild
index fb2f804a8cf6a..0599fd6175912 100644
--- a/games-fps/worldofpadman/worldofpadman-1.6.ebuild
+++ b/games-fps/worldofpadman/worldofpadman-1.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/wop-1.5-unified.zip
 
 LICENSE="GPL-2 worldofpadman"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+curl dedicated maps +openal +theora +vorbis"
 
 RDEPEND="sys-libs/zlib
diff --git a/games-fps/xonotic/xonotic-0.8.1.ebuild b/games-fps/xonotic/xonotic-0.8.1.ebuild
index cddaab04527ee..d8977b5a0e327 100644
--- a/games-fps/xonotic/xonotic-0.8.1.ebuild
+++ b/games-fps/xonotic/xonotic-0.8.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://dl.xonotic.org/${P}.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="alsa debug dedicated doc ode sdl"
 
 UIRDEPEND="
diff --git a/games-kids/childsplay/childsplay-0.90.2-r1.ebuild b/games-kids/childsplay/childsplay-0.90.2-r1.ebuild
index 06e8eef6c7e03..3c535ad41d940 100644
--- a/games-kids/childsplay/childsplay-0.90.2-r1.ebuild
+++ b/games-kids/childsplay/childsplay-0.90.2-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/childsplay/${P}.tgz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="${PYTHON_DEPS}
diff --git a/games-kids/crayon-physics/crayon-physics-55.ebuild b/games-kids/crayon-physics/crayon-physics-55.ebuild
index 88321c83ccb3c..14274b092f4bc 100644
--- a/games-kids/crayon-physics/crayon-physics-55.ebuild
+++ b/games-kids/crayon-physics/crayon-physics-55.ebuild
@@ -10,7 +10,7 @@ SRC_URI="crayon_physics_deluxe-linux-release${PV}.tar.gz"
 
 LICENSE="CRAYON-PHYSICS"
 SLOT="0"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE="bundled-libs"
 RESTRICT="bindist fetch splitdebug"
 
diff --git a/games-kids/cubetest/cubetest-0.9.4.ebuild b/games-kids/cubetest/cubetest-0.9.4.ebuild
index 9348d2ae3a312..22280c026c456 100644
--- a/games-kids/cubetest/cubetest-0.9.4.ebuild
+++ b/games-kids/cubetest/cubetest-0.9.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.vandenoever.info/software/cubetest/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-qt/qtgui:4
diff --git a/games-kids/gcompris/gcompris-14.12.ebuild b/games-kids/gcompris/gcompris-14.12.ebuild
index b95de7939c347..0300906a4ca48 100644
--- a/games-kids/gcompris/gcompris-14.12.ebuild
+++ b/games-kids/gcompris/gcompris-14.12.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://gcompris.net/download/${P}.tar.bz2"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="gstreamer"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/games-kids/gcompris/gcompris-15.10.ebuild b/games-kids/gcompris/gcompris-15.10.ebuild
index b95de7939c347..0300906a4ca48 100644
--- a/games-kids/gcompris/gcompris-15.10.ebuild
+++ b/games-kids/gcompris/gcompris-15.10.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://gcompris.net/download/${P}.tar.bz2"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="gstreamer"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/games-kids/gmult/gmult-8.0.ebuild b/games-kids/gmult/gmult-8.0.ebuild
index 5ac585e8f6915..a9fff5d730e4c 100644
--- a/games-kids/gmult/gmult-8.0.ebuild
+++ b/games-kids/gmult/gmult-8.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://launchpad.net/gmult/trunk/${PV}/+download/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-libs/glib:2
diff --git a/games-kids/lletters/lletters-0.1.95-r2.ebuild b/games-kids/lletters/lletters-0.1.95-r2.ebuild
index 7686b15eba19e..2e603f20b90c4 100644
--- a/games-kids/lletters/lletters-0.1.95-r2.ebuild
+++ b/games-kids/lletters/lletters-0.1.95-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://debian/pool/main/l/${PN}/${PN}_${PV}+gtk2.orig.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="nls"
 
 RDEPEND="x11-libs/gtk+:2
diff --git a/games-kids/memonix/memonix-1.6.ebuild b/games-kids/memonix/memonix-1.6.ebuild
index c4c3f16bd778e..d7ab208ab1ed1 100644
--- a/games-kids/memonix/memonix-1.6.ebuild
+++ b/games-kids/memonix/memonix-1.6.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.viewizard.com/download/${PN}_${PV}_src.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="media-libs/libsdl:0[sound,opengl,video,X]
diff --git a/games-kids/pytraffic/pytraffic-2.5.4-r1.ebuild b/games-kids/pytraffic/pytraffic-2.5.4-r1.ebuild
index 6aa5f4fb10e22..9e196a33ebcd1 100644
--- a/games-kids/pytraffic/pytraffic-2.5.4-r1.ebuild
+++ b/games-kids/pytraffic/pytraffic-2.5.4-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://alpha.uhasselt.be/Research/Algebra/Members/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="media-libs/libsdl:0[sound]
diff --git a/games-kids/tuxmath/tuxmath-2.0.1.ebuild b/games-kids/tuxmath/tuxmath-2.0.1.ebuild
index 14fff16c5530f..b320a0d34d35f 100644
--- a/games-kids/tuxmath/tuxmath-2.0.1.ebuild
+++ b/games-kids/tuxmath/tuxmath-2.0.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/tuxmath/${MY_PN}-${PV}.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-kids/tuxmath/tuxmath-2.0.3.ebuild b/games-kids/tuxmath/tuxmath-2.0.3.ebuild
index daf6850076bad..26ad239154cf9 100644
--- a/games-kids/tuxmath/tuxmath-2.0.3.ebuild
+++ b/games-kids/tuxmath/tuxmath-2.0.3.ebuild
@@ -11,7 +11,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-kids/tuxmathscrabble/tuxmathscrabble-0.8.1.ebuild b/games-kids/tuxmathscrabble/tuxmathscrabble-0.8.1.ebuild
index 422b77992538a..3350be9a34bca 100644
--- a/games-kids/tuxmathscrabble/tuxmathscrabble-0.8.1.ebuild
+++ b/games-kids/tuxmathscrabble/tuxmathscrabble-0.8.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/asymptopia/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 CDEPEND="${PYTHON_DEPS}
diff --git a/games-kids/tuxtype/tuxtype-1.8.1.ebuild b/games-kids/tuxtype/tuxtype-1.8.1.ebuild
index 8fe64f5427203..1c0c734242d83 100644
--- a/games-kids/tuxtype/tuxtype-1.8.1.ebuild
+++ b/games-kids/tuxtype/tuxtype-1.8.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://alioth.debian.org/frs/download.php/3270/tuxtype_w_fonts-${PV}.ta
 
 LICENSE="GPL-2 OFL-1.1"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="svg"
 
 DEPEND="media-libs/libsdl[video]
diff --git a/games-misc/OilWar/OilWar-1.2.1-r1.ebuild b/games-misc/OilWar/OilWar-1.2.1-r1.ebuild
index d60a26732fec9..c5356e90a69f5 100644
--- a/games-misc/OilWar/OilWar-1.2.1-r1.ebuild
+++ b/games-misc/OilWar/OilWar-1.2.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="media-libs/libsdl[video]
diff --git a/games-misc/asr-manpages/asr-manpages-1.3_rc6.ebuild b/games-misc/asr-manpages/asr-manpages-1.3_rc6.ebuild
index 4e73aaa62dd9c..8fc9e8fae48fc 100644
--- a/games-misc/asr-manpages/asr-manpages-1.3_rc6.ebuild
+++ b/games-misc/asr-manpages/asr-manpages-1.3_rc6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://debian/pool/main/a/asr-manpages/${MY_P}.orig.tar.gz
 
 LICENSE="freedist" #465704
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa m68k ~mips ppc64 s390 sh x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86"
 IUSE=""
 
 RDEPEND="virtual/man"
diff --git a/games-misc/bsd-games/bsd-games-2.17-r5.ebuild b/games-misc/bsd-games/bsd-games-2.17-r5.ebuild
index bead3a2573b5e..cefeb7976f5b5 100644
--- a/games-misc/bsd-games/bsd-games-2.17-r5.ebuild
+++ b/games-misc/bsd-games/bsd-games-2.17-r5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="ftp://metalab.unc.edu/pub/Linux/games/${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 x86"
+KEYWORDS="~alpha ~amd64 ~x86"
 IUSE=""
 
 RDEPEND="!games-misc/wtf
diff --git a/games-misc/bsod/bsod-0.1.ebuild b/games-misc/bsod/bsod-0.1.ebuild
index 5e4b5424a0cca..e8ef4f8cf1ea8 100644
--- a/games-misc/bsod/bsod-0.1.ebuild
+++ b/games-misc/bsod/bsod-0.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.vanheusden.com/${PN}/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="sys-libs/ncurses:0"
 DEPEND="
diff --git a/games-misc/c++robots/c++robots-0.ebuild b/games-misc/c++robots/c++robots-0.ebuild
index 689367f88d532..1c0374c26c82d 100644
--- a/games-misc/c++robots/c++robots-0.ebuild
+++ b/games-misc/c++robots/c++robots-0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.gamerz.net/c++robots/c++robots.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="~x86"
 IUSE="static"
 
 S=${WORKDIR}/${PN}
diff --git a/games-misc/cowsay/cowsay-3.03-r2.ebuild b/games-misc/cowsay/cowsay-3.03-r2.ebuild
index c81db91dee610..88e195c614d69 100644
--- a/games-misc/cowsay/cowsay-3.03-r2.ebuild
+++ b/games-misc/cowsay/cowsay-3.03-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.nog.net/~tony/warez/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ~mips ppc64 x86 ~x86-fbsd ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc64 ~x86 ~x86-fbsd ~x64-solaris"
 IUSE=""
 
 RDEPEND=">=dev-lang/perl-5"
diff --git a/games-misc/dont-starve/dont-starve-2.ebuild b/games-misc/dont-starve/dont-starve-2.ebuild
index 74272a3a69905..767bfa07e2822 100644
--- a/games-misc/dont-starve/dont-starve-2.ebuild
+++ b/games-misc/dont-starve/dont-starve-2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="amd64? ( dontstarve_x64_july21.tar.gz )
 
 LICENSE="all-rights-reserved"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 RESTRICT="fetch bindist splitdebug"
 
diff --git a/games-misc/exult-sound/exult-sound-0.ebuild b/games-misc/exult-sound/exult-sound-0.ebuild
index c4c109f56feb5..da4b29d8393dd 100644
--- a/games-misc/exult-sound/exult-sound-0.ebuild
+++ b/games-misc/exult-sound/exult-sound-0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/exult/U7MusicOGG_1of2.zip
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="!<games-engines/exult-9999"
diff --git a/games-misc/fortune-mod-all/fortune-mod-all-1.ebuild b/games-misc/fortune-mod-all/fortune-mod-all-1.ebuild
index 69011ca726947..60f96ec71b1e8 100644
--- a/games-misc/fortune-mod-all/fortune-mod-all-1.ebuild
+++ b/games-misc/fortune-mod-all/fortune-mod-all-1.ebuild
@@ -7,7 +7,7 @@ HOMEPAGE="https://www.gentoo.org/"
 
 LICENSE="metapackage"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa m68k ~mips ppc64 s390 sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="l10n_cs l10n_de l10n_it l10n_sk offensive"
 
 RDEPEND="games-misc/fortune-mod
diff --git a/games-misc/fortune-mod-at-linux/fortune-mod-at-linux-20030120.ebuild b/games-misc/fortune-mod-at-linux/fortune-mod-at-linux-20030120.ebuild
index 85b85377381b1..aafe0ebc1cb59 100644
--- a/games-misc/fortune-mod-at-linux/fortune-mod-at-linux-20030120.ebuild
+++ b/games-misc/fortune-mod-at-linux/fortune-mod-at-linux-20030120.ebuild
@@ -8,7 +8,7 @@ SRC_URI="mirror://sourceforge/fortune-mod-fvl/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa m68k ~mips ppc64 s390 sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="unicode"
 
 RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-bofh-excuses/fortune-mod-bofh-excuses-1.2.ebuild b/games-misc/fortune-mod-bofh-excuses/fortune-mod-bofh-excuses-1.2.ebuild
index 3fea8d3b7fe95..c0c4b55593e24 100644
--- a/games-misc/fortune-mod-bofh-excuses/fortune-mod-bofh-excuses-1.2.ebuild
+++ b/games-misc/fortune-mod-bofh-excuses/fortune-mod-bofh-excuses-1.2.ebuild
@@ -7,7 +7,7 @@ SRC_URI="http://www.stlim.net/downloads/fortune-bofh-excuses-${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa m68k ~mips ppc64 s390 sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-calvin/fortune-mod-calvin-0.1.1.ebuild b/games-misc/fortune-mod-calvin/fortune-mod-calvin-0.1.1.ebuild
index c95de6da7c517..0f5d68d05c4d5 100644
--- a/games-misc/fortune-mod-calvin/fortune-mod-calvin-0.1.1.ebuild
+++ b/games-misc/fortune-mod-calvin/fortune-mod-calvin-0.1.1.ebuild
@@ -7,7 +7,7 @@ SRC_URI="http://www.netmeister.org/apps/${P}.tar.gz"
 
 LICENSE="fairuse"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa m68k ~mips ppc64 s390 sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-chucknorris/fortune-mod-chucknorris-0.1.ebuild b/games-misc/fortune-mod-chucknorris/fortune-mod-chucknorris-0.1.ebuild
index 47fdb26a6688a..9b0047b41bd88 100644
--- a/games-misc/fortune-mod-chucknorris/fortune-mod-chucknorris-0.1.ebuild
+++ b/games-misc/fortune-mod-chucknorris/fortune-mod-chucknorris-0.1.ebuild
@@ -7,7 +7,7 @@ SRC_URI="http://www.k-lug.org/~kessler/chucknorris.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa m68k ~mips ppc64 s390 sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-cs/fortune-mod-cs-1.6.9.ebuild b/games-misc/fortune-mod-cs/fortune-mod-cs-1.6.9.ebuild
index e74c3ce9beb3b..1220f03cb6661 100644
--- a/games-misc/fortune-mod-cs/fortune-mod-cs-1.6.9.ebuild
+++ b/games-misc/fortune-mod-cs/fortune-mod-cs-1.6.9.ebuild
@@ -7,7 +7,7 @@ SRC_URI="http://ftp.fi.muni.cz/pub/linux/people/zdenek_pytela/${P/-mod/}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa m68k ~mips ppc64 s390 sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="unicode"
 
 RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-debilneho/fortune-mod-debilneho-0.1.ebuild b/games-misc/fortune-mod-debilneho/fortune-mod-debilneho-0.1.ebuild
index 1d57a2e62a6d8..643e6c1c7f1b8 100644
--- a/games-misc/fortune-mod-debilneho/fortune-mod-debilneho-0.1.ebuild
+++ b/games-misc/fortune-mod-debilneho/fortune-mod-debilneho-0.1.ebuild
@@ -8,7 +8,7 @@ SRC_URI="http://megac.info/fortune-debilneho.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa m68k ~mips ppc64 s390 sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-dubya/fortune-mod-dubya-20050118.ebuild b/games-misc/fortune-mod-dubya/fortune-mod-dubya-20050118.ebuild
index 99fe5ed83c965..dfac38b3eb4b0 100644
--- a/games-misc/fortune-mod-dubya/fortune-mod-dubya-20050118.ebuild
+++ b/games-misc/fortune-mod-dubya/fortune-mod-dubya-20050118.ebuild
@@ -7,7 +7,7 @@ SRC_URI="http://seiler.us/wiki/images/8/8c/Dubya-${PV}.tar.gz"
 
 LICENSE="fairuse"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa m68k ~mips ppc64 s390 sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-dune/fortune-mod-dune-2.0.1.ebuild b/games-misc/fortune-mod-dune/fortune-mod-dune-2.0.1.ebuild
index 668e82d39c443..e04c791318e25 100644
--- a/games-misc/fortune-mod-dune/fortune-mod-dune-2.0.1.ebuild
+++ b/games-misc/fortune-mod-dune/fortune-mod-dune-2.0.1.ebuild
@@ -8,7 +8,7 @@ SRC_URI="http://dune.s31.pl/${MY_P}.tar.gz"
 
 LICENSE="free-noncomm"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa m68k ~mips ppc64 s390 sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-familyguy/fortune-mod-familyguy-0.2.ebuild b/games-misc/fortune-mod-familyguy/fortune-mod-familyguy-0.2.ebuild
index 0fa3aa4f9434c..382fa9261d8bc 100644
--- a/games-misc/fortune-mod-familyguy/fortune-mod-familyguy-0.2.ebuild
+++ b/games-misc/fortune-mod-familyguy/fortune-mod-familyguy-0.2.ebuild
@@ -7,7 +7,7 @@ SRC_URI="http://jon.oberheide.org/familyguy/${P}.tar.gz"
 
 LICENSE="fairuse"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa m68k ~mips ppc64 s390 sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-firefly/fortune-mod-firefly-2.1.1.ebuild b/games-misc/fortune-mod-firefly/fortune-mod-firefly-2.1.1.ebuild
index b4a370e299147..b94f3f66f8a0a 100644
--- a/games-misc/fortune-mod-firefly/fortune-mod-firefly-2.1.1.ebuild
+++ b/games-misc/fortune-mod-firefly/fortune-mod-firefly-2.1.1.ebuild
@@ -7,7 +7,7 @@ SRC_URI="http://www.daughtersoftiresias.org/progs/firefly/${P/mod-}.tar.bz2"
 
 LICENSE="fairuse"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa m68k ~mips ppc64 s390 sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
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 82409850ec983..d4ff0f261e4ba 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
@@ -12,7 +12,7 @@ SRC_URI="http://downloads.nanolx.org/fortunes-flashrider/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 DEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-futurama/fortune-mod-futurama-0.2.ebuild b/games-misc/fortune-mod-futurama/fortune-mod-futurama-0.2.ebuild
index 8ac7308419987..793134dd8d295 100644
--- a/games-misc/fortune-mod-futurama/fortune-mod-futurama-0.2.ebuild
+++ b/games-misc/fortune-mod-futurama/fortune-mod-futurama-0.2.ebuild
@@ -7,7 +7,7 @@ SRC_URI="http://www.netmeister.org/apps/${P}.tar.gz"
 
 LICENSE="fairuse"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa m68k ~mips ppc64 s390 sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-fvl/fortune-mod-fvl-20030120.ebuild b/games-misc/fortune-mod-fvl/fortune-mod-fvl-20030120.ebuild
index 0eb5b57d4ad3f..d3c0931121ffb 100644
--- a/games-misc/fortune-mod-fvl/fortune-mod-fvl-20030120.ebuild
+++ b/games-misc/fortune-mod-fvl/fortune-mod-fvl-20030120.ebuild
@@ -7,7 +7,7 @@ SRC_URI="mirror://sourceforge/fortune-mod-fvl/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa m68k ~mips ppc64 s390 sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-gentoo-dev/fortune-mod-gentoo-dev-20061115.ebuild b/games-misc/fortune-mod-gentoo-dev/fortune-mod-gentoo-dev-20061115.ebuild
index 869788b3dfd81..ffb08e2070f30 100644
--- a/games-misc/fortune-mod-gentoo-dev/fortune-mod-gentoo-dev-20061115.ebuild
+++ b/games-misc/fortune-mod-gentoo-dev/fortune-mod-gentoo-dev-20061115.ebuild
@@ -7,7 +7,7 @@ SRC_URI="http://ircd.oppresses.us/~avenj/files/gentoo-dev-${PV}.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa m68k ~mips ppc64 s390 sh x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-gentoo-dev/fortune-mod-gentoo-dev-20090306.ebuild b/games-misc/fortune-mod-gentoo-dev/fortune-mod-gentoo-dev-20090306.ebuild
index 0e4f4ac1eed40..3b875114f8e84 100644
--- a/games-misc/fortune-mod-gentoo-dev/fortune-mod-gentoo-dev-20090306.ebuild
+++ b/games-misc/fortune-mod-gentoo-dev/fortune-mod-gentoo-dev-20090306.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${MY_P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa m68k ~mips ppc64 s390 sh x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd"
 IUSE="offensive"
 
 RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-gentoo-forums/fortune-mod-gentoo-forums-20041207.ebuild b/games-misc/fortune-mod-gentoo-forums/fortune-mod-gentoo-forums-20041207.ebuild
index 3c36701f9f51f..347e3bfa5814c 100644
--- a/games-misc/fortune-mod-gentoo-forums/fortune-mod-gentoo-forums-20041207.ebuild
+++ b/games-misc/fortune-mod-gentoo-forums/fortune-mod-gentoo-forums-20041207.ebuild
@@ -8,7 +8,7 @@ SRC_URI="mirror://gentoo/gentoo-forums-${PV}.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa m68k ~mips ppc64 s390 sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="offensive"
 
 DEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-gentoo-ru/fortune-mod-gentoo-ru-0.25.ebuild b/games-misc/fortune-mod-gentoo-ru/fortune-mod-gentoo-ru-0.25.ebuild
index 08a2859f46e50..feddb8333f006 100644
--- a/games-misc/fortune-mod-gentoo-ru/fortune-mod-gentoo-ru-0.25.ebuild
+++ b/games-misc/fortune-mod-gentoo-ru/fortune-mod-gentoo-ru-0.25.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://slepnoga.googlecode.com/files/gentoo-ru-${PV}.gz
 
 LICENSE="fairuse"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-gentoo-ru/fortune-mod-gentoo-ru-0.26.ebuild b/games-misc/fortune-mod-gentoo-ru/fortune-mod-gentoo-ru-0.26.ebuild
index ba8aa2589f790..acbe34fb6f11f 100644
--- a/games-misc/fortune-mod-gentoo-ru/fortune-mod-gentoo-ru-0.26.ebuild
+++ b/games-misc/fortune-mod-gentoo-ru/fortune-mod-gentoo-ru-0.26.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://slepnoga.googlecode.com/files/gentoo-ru-${PV}.gz
 
 LICENSE="fairuse"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-hitchhiker/fortune-mod-hitchhiker-0.1.ebuild b/games-misc/fortune-mod-hitchhiker/fortune-mod-hitchhiker-0.1.ebuild
index 7206c60540acc..e753b7e0b5e8f 100644
--- a/games-misc/fortune-mod-hitchhiker/fortune-mod-hitchhiker-0.1.ebuild
+++ b/games-misc/fortune-mod-hitchhiker/fortune-mod-hitchhiker-0.1.ebuild
@@ -8,7 +8,7 @@ SRC_URI="http://www.splitbrain.org/_media/projects/fortunes/${MY_P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa m68k ~mips ppc64 s390 sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 RESTRICT="mirror"
 
diff --git a/games-misc/fortune-mod-homer/fortune-mod-homer-0.1.ebuild b/games-misc/fortune-mod-homer/fortune-mod-homer-0.1.ebuild
index 1880907fc0c52..5b085cdb28939 100644
--- a/games-misc/fortune-mod-homer/fortune-mod-homer-0.1.ebuild
+++ b/games-misc/fortune-mod-homer/fortune-mod-homer-0.1.ebuild
@@ -7,7 +7,7 @@ SRC_URI="http://www.cs.indiana.edu/~crcarter/homer/homer-quotes.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa m68k ~mips ppc64 s390 sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-humorixfortunes/fortune-mod-humorixfortunes-1.4-r1.ebuild b/games-misc/fortune-mod-humorixfortunes/fortune-mod-humorixfortunes-1.4-r1.ebuild
index 8c2beb615fbfb..a0cc2416f640c 100644
--- a/games-misc/fortune-mod-humorixfortunes/fortune-mod-humorixfortunes-1.4-r1.ebuild
+++ b/games-misc/fortune-mod-humorixfortunes/fortune-mod-humorixfortunes-1.4-r1.ebuild
@@ -8,7 +8,7 @@ SRC_URI="http://humorix.org/downloads/${MY_P}.tar.gz"
 
 LICENSE="freedist fairuse"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa m68k ~mips ppc64 s390 sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-it/fortune-mod-it-1.99.ebuild b/games-misc/fortune-mod-it/fortune-mod-it-1.99.ebuild
index eaeb6e7745d7e..b07a391496a07 100644
--- a/games-misc/fortune-mod-it/fortune-mod-it-1.99.ebuild
+++ b/games-misc/fortune-mod-it/fortune-mod-it-1.99.ebuild
@@ -7,7 +7,7 @@ SRC_URI="http://www.fortune-it.net/download/fortune-it-${PVR}.tar.gz"
 
 LICENSE="freedist"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa m68k ~mips ppc64 s390 sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="offensive"
 
 DEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-kernelcookies/fortune-mod-kernelcookies-9.ebuild b/games-misc/fortune-mod-kernelcookies/fortune-mod-kernelcookies-9.ebuild
index 7f43cf165d4e3..04315959a031f 100644
--- a/games-misc/fortune-mod-kernelcookies/fortune-mod-kernelcookies-9.ebuild
+++ b/games-misc/fortune-mod-kernelcookies/fortune-mod-kernelcookies-9.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.schwarzvogel.de/pkgs/kernelcookies-${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa m68k ~mips ppc64 s390 sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="offensive"
 
 DEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-mormon/fortune-mod-mormon-1.1.0.ebuild b/games-misc/fortune-mod-mormon/fortune-mod-mormon-1.1.0.ebuild
index 240d8acb43262..12e97acd49c53 100644
--- a/games-misc/fortune-mod-mormon/fortune-mod-mormon-1.1.0.ebuild
+++ b/games-misc/fortune-mod-mormon/fortune-mod-mormon-1.1.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/mormon/${P}.tar.bz2"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~mips ppc64 s390 sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/games-misc/fortune-mod-norbert-tretkowski/fortune-mod-norbert-tretkowski-20030120.ebuild b/games-misc/fortune-mod-norbert-tretkowski/fortune-mod-norbert-tretkowski-20030120.ebuild
index 1025b68fa266f..5d2e9d7a668f7 100644
--- a/games-misc/fortune-mod-norbert-tretkowski/fortune-mod-norbert-tretkowski-20030120.ebuild
+++ b/games-misc/fortune-mod-norbert-tretkowski/fortune-mod-norbert-tretkowski-20030120.ebuild
@@ -8,7 +8,7 @@ SRC_URI="mirror://sourceforge/fortune-mod-fvl/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa m68k ~mips ppc64 s390 sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-osfortune/fortune-mod-osfortune-1.ebuild b/games-misc/fortune-mod-osfortune/fortune-mod-osfortune-1.ebuild
index 1d5dec3033467..03380a46e8273 100644
--- a/games-misc/fortune-mod-osfortune/fortune-mod-osfortune-1.ebuild
+++ b/games-misc/fortune-mod-osfortune/fortune-mod-osfortune-1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.dibona.com/opensources/osfortune.tar.gz"
 
 LICENSE="GPL-1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa m68k ~mips ppc64 s390 sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 DEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-powerpuff/fortune-mod-powerpuff-0.3.ebuild b/games-misc/fortune-mod-powerpuff/fortune-mod-powerpuff-0.3.ebuild
index 865437049a518..5600d8997bc32 100644
--- a/games-misc/fortune-mod-powerpuff/fortune-mod-powerpuff-0.3.ebuild
+++ b/games-misc/fortune-mod-powerpuff/fortune-mod-powerpuff-0.3.ebuild
@@ -8,7 +8,7 @@ SRC_URI="http://eelco.is.a.rootboy.net/fortunecookies/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa m68k ~mips ppc64 s390 sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-pqf/fortune-mod-pqf-6.0.ebuild b/games-misc/fortune-mod-pqf/fortune-mod-pqf-6.0.ebuild
index b0820c22be493..0a320edcec9ba 100644
--- a/games-misc/fortune-mod-pqf/fortune-mod-pqf-6.0.ebuild
+++ b/games-misc/fortune-mod-pqf/fortune-mod-pqf-6.0.ebuild
@@ -7,7 +7,7 @@ SRC_URI="http://www.ie.lspace.org/ftp-lspace/words/pqf/pqf-${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa m68k ~mips ppc64 s390 sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 DEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-rss/fortune-mod-rss-20030120.ebuild b/games-misc/fortune-mod-rss/fortune-mod-rss-20030120.ebuild
index 068d9a7f58fd1..950ccee21fb76 100644
--- a/games-misc/fortune-mod-rss/fortune-mod-rss-20030120.ebuild
+++ b/games-misc/fortune-mod-rss/fortune-mod-rss-20030120.ebuild
@@ -7,7 +7,7 @@ SRC_URI="mirror://sourceforge/fortune-mod-fvl/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa m68k ~mips ppc64 s390 sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-scriptures/fortune-mod-scriptures-1.1.0.ebuild b/games-misc/fortune-mod-scriptures/fortune-mod-scriptures-1.1.0.ebuild
index c718e0dba0477..91b61e840cd79 100644
--- a/games-misc/fortune-mod-scriptures/fortune-mod-scriptures-1.1.0.ebuild
+++ b/games-misc/fortune-mod-scriptures/fortune-mod-scriptures-1.1.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/mormon/${P}.tar.bz2"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~mips ppc64 s390 sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-simpsons-chalkboard/fortune-mod-simpsons-chalkboard-0.1.ebuild b/games-misc/fortune-mod-simpsons-chalkboard/fortune-mod-simpsons-chalkboard-0.1.ebuild
index db8cb6cf0006f..75446351df913 100644
--- a/games-misc/fortune-mod-simpsons-chalkboard/fortune-mod-simpsons-chalkboard-0.1.ebuild
+++ b/games-misc/fortune-mod-simpsons-chalkboard/fortune-mod-simpsons-chalkboard-0.1.ebuild
@@ -8,7 +8,7 @@ SRC_URI="http://www.splitbrain.org/_media/projects/fortunes/${MY_P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa m68k ~mips ppc64 s390 sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 RESTRICT="mirror"
 
diff --git a/games-misc/fortune-mod-slackware/fortune-mod-slackware-1.15.ebuild b/games-misc/fortune-mod-slackware/fortune-mod-slackware-1.15.ebuild
index 571a30bbeae38..9267430dc24c3 100644
--- a/games-misc/fortune-mod-slackware/fortune-mod-slackware-1.15.ebuild
+++ b/games-misc/fortune-mod-slackware/fortune-mod-slackware-1.15.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://fauxascii.com/linux/data/${MY_PN}-${PV}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa m68k ~mips ppc64 s390 sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="offensive"
 
 RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-smac/fortune-mod-smac-0.1.ebuild b/games-misc/fortune-mod-smac/fortune-mod-smac-0.1.ebuild
index 0d927cc43e7c9..c340b98c41703 100644
--- a/games-misc/fortune-mod-smac/fortune-mod-smac-0.1.ebuild
+++ b/games-misc/fortune-mod-smac/fortune-mod-smac-0.1.ebuild
@@ -7,7 +7,7 @@ SRC_URI="http://progsoc.org/~curious/files/${P}.tar.gz"
 
 LICENSE="fairuse"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa m68k ~mips ppc64 s390 sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-sp-fortunes/fortune-mod-sp-fortunes-0.2.ebuild b/games-misc/fortune-mod-sp-fortunes/fortune-mod-sp-fortunes-0.2.ebuild
index 0a40d36ab2cba..840658b4e82b6 100644
--- a/games-misc/fortune-mod-sp-fortunes/fortune-mod-sp-fortunes-0.2.ebuild
+++ b/games-misc/fortune-mod-sp-fortunes/fortune-mod-sp-fortunes-0.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://eelco.is.a.rootboy.net/fortunecookies/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa m68k ~mips ppc64 s390 sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-starwars/fortune-mod-starwars-0.1.ebuild b/games-misc/fortune-mod-starwars/fortune-mod-starwars-0.1.ebuild
index 4765401e8157a..885df4c6d17d8 100644
--- a/games-misc/fortune-mod-starwars/fortune-mod-starwars-0.1.ebuild
+++ b/games-misc/fortune-mod-starwars/fortune-mod-starwars-0.1.ebuild
@@ -8,7 +8,7 @@ SRC_URI="http://www.splitbrain.org/_media/projects/fortunes/${MY_P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa m68k ~mips ppc64 s390 sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 RESTRICT="mirror"
 
diff --git a/games-misc/fortune-mod-strangelove/fortune-mod-strangelove-20041203.ebuild b/games-misc/fortune-mod-strangelove/fortune-mod-strangelove-20041203.ebuild
index 80f288426871b..844e7cec64e86 100644
--- a/games-misc/fortune-mod-strangelove/fortune-mod-strangelove-20041203.ebuild
+++ b/games-misc/fortune-mod-strangelove/fortune-mod-strangelove-20041203.ebuild
@@ -7,7 +7,7 @@ SRC_URI="http://seiler.us/wiki/images/4/48/Strangelove_${PV}.tar.gz"
 
 LICENSE="fairuse"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa m68k ~mips ppc64 s390 sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-tao/fortune-mod-tao-1.ebuild b/games-misc/fortune-mod-tao/fortune-mod-tao-1.ebuild
index b6d59d2a00c92..8311be7d4c7f4 100644
--- a/games-misc/fortune-mod-tao/fortune-mod-tao-1.ebuild
+++ b/games-misc/fortune-mod-tao/fortune-mod-tao-1.ebuild
@@ -8,7 +8,7 @@ SRC_URI="mirror://gentoo/${MY_PN}.tar.gz"
 
 LICENSE="GPL-1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa m68k ~mips ppc64 s390 sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-taow/fortune-mod-taow-1.0.ebuild b/games-misc/fortune-mod-taow/fortune-mod-taow-1.0.ebuild
index 51f62d305a9ce..6402491505c22 100644
--- a/games-misc/fortune-mod-taow/fortune-mod-taow-1.0.ebuild
+++ b/games-misc/fortune-mod-taow/fortune-mod-taow-1.0.ebuild
@@ -8,7 +8,7 @@ SRC_URI="http://www.de-brauwer.be/wastebasket/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-thomas-ogrisegg/fortune-mod-thomas-ogrisegg-20030120.ebuild b/games-misc/fortune-mod-thomas-ogrisegg/fortune-mod-thomas-ogrisegg-20030120.ebuild
index c2d542746fe40..3b755b3fa7c74 100644
--- a/games-misc/fortune-mod-thomas-ogrisegg/fortune-mod-thomas-ogrisegg-20030120.ebuild
+++ b/games-misc/fortune-mod-thomas-ogrisegg/fortune-mod-thomas-ogrisegg-20030120.ebuild
@@ -8,7 +8,7 @@ SRC_URI="mirror://sourceforge/fortune-mod-fvl/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa m68k ~mips ppc64 s390 sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-woody-allen-it/fortune-mod-woody-allen-it-0.1.ebuild b/games-misc/fortune-mod-woody-allen-it/fortune-mod-woody-allen-it-0.1.ebuild
index 095abfbcd0919..ab50d4f84cc49 100644
--- a/games-misc/fortune-mod-woody-allen-it/fortune-mod-woody-allen-it-0.1.ebuild
+++ b/games-misc/fortune-mod-woody-allen-it/fortune-mod-woody-allen-it-0.1.ebuild
@@ -7,7 +7,7 @@ SRC_URI="http://utenti.lycos.it/gutter/${PN}/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-zx-error/fortune-mod-zx-error-1.0.ebuild b/games-misc/fortune-mod-zx-error/fortune-mod-zx-error-1.0.ebuild
index 42bf865d68a92..a42f1c7e58f64 100644
--- a/games-misc/fortune-mod-zx-error/fortune-mod-zx-error-1.0.ebuild
+++ b/games-misc/fortune-mod-zx-error/fortune-mod-zx-error-1.0.ebuild
@@ -8,7 +8,7 @@ SRC_URI="http://korpus.juls.savba.sk/~garabik/software/fortunes-zx-error/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa m68k ~mips ppc64 s390 sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/funny-manpages/funny-manpages-1.3_rc5-r1.ebuild b/games-misc/funny-manpages/funny-manpages-1.3_rc5-r1.ebuild
index 59969cfc12e2d..99e6253cf923c 100644
--- a/games-misc/funny-manpages/funny-manpages-1.3_rc5-r1.ebuild
+++ b/games-misc/funny-manpages/funny-manpages-1.3_rc5-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://debian/pool/main/f/funny-manpages/${MY_P}.orig.tar.gz
 
 LICENSE="freedist" #465704
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa m68k ~mips ppc64 s390 sh x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86"
 IUSE=""
 
 RDEPEND="virtual/man"
diff --git a/games-misc/gBhed/gBhed-0.17.ebuild b/games-misc/gBhed/gBhed-0.17.ebuild
index 43e3fcde7569f..40bcc510a867a 100644
--- a/games-misc/gBhed/gBhed-0.17.ebuild
+++ b/games-misc/gBhed/gBhed-0.17.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://liquidchile.net/software/gbhed/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="gtk"
 
 DEPEND="gtk? ( x11-libs/gtk+:2 )"
diff --git a/games-misc/ggencoder/ggencoder-0.91a.ebuild b/games-misc/ggencoder/ggencoder-0.91a.ebuild
index bf3c5dd4464cd..b0c5645188764 100644
--- a/games-misc/ggencoder/ggencoder-0.91a.ebuild
+++ b/games-misc/ggencoder/ggencoder-0.91a.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://games.technoplaza.net/ggencoder/qt/history/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc"
 
 DEPEND="dev-qt/qtcore:4
diff --git a/games-misc/gtklife/gtklife-5.1.ebuild b/games-misc/gtklife/gtklife-5.1.ebuild
index 00f859feb4d7e..851a1c3da951e 100644
--- a/games-misc/gtklife/gtklife-5.1.ebuild
+++ b/games-misc/gtklife/gtklife-5.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://ironphoenix.org/tril/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 hppa x86"
+KEYWORDS="~amd64 ~hppa ~x86"
 IUSE=""
 
 RDEPEND="x11-libs/gtk+:2
diff --git a/games-misc/katawa-shoujo/katawa-shoujo-1.3.ebuild b/games-misc/katawa-shoujo/katawa-shoujo-1.3.ebuild
index 984acbf1ba205..3cd733bcd7ab7 100644
--- a/games-misc/katawa-shoujo/katawa-shoujo-1.3.ebuild
+++ b/games-misc/katawa-shoujo/katawa-shoujo-1.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://dl.katawa-shoujo.com/gold_1.3/%5b4ls%5d_katawa_shoujo_1.3-%5blin
 LICENSE="CC-BY-NC-ND-3.0
 	!system-renpy? ( MIT PSF-2 LGPL-2.1 || ( FTL GPL-2+ ) IJG libpng ZLIB BZIP2 )"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc +system-renpy"
 
 RDEPEND="system-renpy? ( games-engines/renpy )"
diff --git a/games-misc/little-inferno/little-inferno-20130509.ebuild b/games-misc/little-inferno/little-inferno-20130509.ebuild
index 69641bbad2b29..8461d56709433 100644
--- a/games-misc/little-inferno/little-inferno-20130509.ebuild
+++ b/games-misc/little-inferno/little-inferno-20130509.ebuild
@@ -10,7 +10,7 @@ SRC_URI="LittleInferno-${PV}.sh"
 
 LICENSE="Gameplay-Group-EULA"
 SLOT="0"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE="bundled-libs"
 RESTRICT="bindist fetch bundled-libs? ( splitdebug )"
 
diff --git a/games-misc/lucidlife/lucidlife-0.9.2.ebuild b/games-misc/lucidlife/lucidlife-0.9.2.ebuild
index 7e1b20dc55fb2..cac06669cec13 100644
--- a/games-misc/lucidlife/lucidlife-0.9.2.ebuild
+++ b/games-misc/lucidlife/lucidlife-0.9.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="x11-libs/gtk+:2"
diff --git a/games-misc/nyancat/nyancat-1.2.1.ebuild b/games-misc/nyancat/nyancat-1.2.1.ebuild
index 3966fcba0fb20..fea71fa4716de 100644
--- a/games-misc/nyancat/nyancat-1.2.1.ebuild
+++ b/games-misc/nyancat/nyancat-1.2.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/klange/nyancat/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 src_compile() {
diff --git a/games-misc/opengfx/opengfx-0.5.3.ebuild b/games-misc/opengfx/opengfx-0.5.3.ebuild
index e3bb8604796a2..7b19973c7ae55 100644
--- a/games-misc/opengfx/opengfx-0.5.3.ebuild
+++ b/games-misc/opengfx/opengfx-0.5.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://bundles.openttdcoop.org/opengfx/releases/${PV}/${P}-source.tar.x
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""
 RESTRICT="test" # nml version affects the checksums that the test uses (bug #451444)
 
diff --git a/games-misc/opengfx/opengfx-0.5.4.ebuild b/games-misc/opengfx/opengfx-0.5.4.ebuild
index 16570eeb25694..7544640c1a499 100644
--- a/games-misc/opengfx/opengfx-0.5.4.ebuild
+++ b/games-misc/opengfx/opengfx-0.5.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://bundles.openttdcoop.org/opengfx/releases/${PV}/${P}-source.tar.x
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""
 RESTRICT="test" # nml version affects the checksums that the test uses (bug #451444)
 
diff --git a/games-misc/openmsx/openmsx-0.3.1-r1.ebuild b/games-misc/openmsx/openmsx-0.3.1-r1.ebuild
index c528622044f10..a4f2f948fb409 100644
--- a/games-misc/openmsx/openmsx-0.3.1-r1.ebuild
+++ b/games-misc/openmsx/openmsx-0.3.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://bundles.openttdcoop.org/openmsx/releases/${PV}/${P}-source.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="${PYTHON_DEPS}"
diff --git a/games-misc/opensfx/opensfx-0.2.3.ebuild b/games-misc/opensfx/opensfx-0.2.3.ebuild
index ad4a74cb0a471..ebf6d240bfd8d 100644
--- a/games-misc/opensfx/opensfx-0.2.3.ebuild
+++ b/games-misc/opensfx/opensfx-0.2.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://bundles.openttdcoop.org/${PN}/releases/${P}-source.tar.gz"
 
 LICENSE="CC-Sampling-Plus-1.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc64 x86"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="games-util/catcodec"
diff --git a/games-misc/papers-please/papers-please-1.1.65.ebuild b/games-misc/papers-please/papers-please-1.1.65.ebuild
index e0fc25621887d..fc553bd4d136f 100644
--- a/games-misc/papers-please/papers-please-1.1.65.ebuild
+++ b/games-misc/papers-please/papers-please-1.1.65.ebuild
@@ -11,7 +11,7 @@ SRC_URI="papers-please_${PV}_i386.tar.gz"
 
 LICENSE="PAPERS-PLEASE"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 RESTRICT="fetch bindist"
 
diff --git a/games-misc/qlife/qlife-1.1.ebuild b/games-misc/qlife/qlife-1.1.ebuild
index 41d2c04494ea3..7fec658ac3459 100644
--- a/games-misc/qlife/qlife-1.1.ebuild
+++ b/games-misc/qlife/qlife-1.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://open-maker.tuxfamily.org/blog/public/${PN}_linux.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="dev-qt/qtgui:4"
diff --git a/games-misc/rfksay/rfksay-0.1.ebuild b/games-misc/rfksay/rfksay-0.1.ebuild
index 0ecfd8585f0da..b16ff45bc2669 100644
--- a/games-misc/rfksay/rfksay-0.1.ebuild
+++ b/games-misc/rfksay/rfksay-0.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${PN}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="dev-lang/perl"
diff --git a/games-misc/robotfindskitten/robotfindskitten-2.7182818.701.ebuild b/games-misc/robotfindskitten/robotfindskitten-2.7182818.701.ebuild
index 77be155004e51..b20701e3d16a0 100644
--- a/games-misc/robotfindskitten/robotfindskitten-2.7182818.701.ebuild
+++ b/games-misc/robotfindskitten/robotfindskitten-2.7182818.701.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/rfk/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="sys-libs/ncurses:0"
diff --git a/games-misc/sdljoytest/sdljoytest-11102003.ebuild b/games-misc/sdljoytest/sdljoytest-11102003.ebuild
index 32e18fb1100fe..905eb1487338d 100644
--- a/games-misc/sdljoytest/sdljoytest-11102003.ebuild
+++ b/games-misc/sdljoytest/sdljoytest-11102003.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/sdljoytest/SDLJoytest-GL-${PV}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="media-libs/libsdl[joystick,opengl,video]
diff --git a/games-misc/sex/sex-1.0.ebuild b/games-misc/sex/sex-1.0.ebuild
index 5f808d8028449..40de7b2b5f8b2 100644
--- a/games-misc/sex/sex-1.0.ebuild
+++ b/games-misc/sex/sex-1.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://spatula.net/software/sex/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 src_prepare() {
diff --git a/games-misc/typespeed/typespeed-0.6.5.ebuild b/games-misc/typespeed/typespeed-0.6.5.ebuild
index 6d4d167216c98..c920053621fa2 100644
--- a/games-misc/typespeed/typespeed-0.6.5.ebuild
+++ b/games-misc/typespeed/typespeed-0.6.5.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~ppc64 x86"
+KEYWORDS="~alpha ~amd64 ~ppc64 ~x86"
 IUSE="nls"
 
 RDEPEND="sys-libs/ncurses:0
diff --git a/games-misc/wtf/wtf-20090924.ebuild b/games-misc/wtf/wtf-20090924.ebuild
index 4db72b43021cb..ca02243d6a14f 100644
--- a/games-misc/wtf/wtf-20090924.ebuild
+++ b/games-misc/wtf/wtf-20090924.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://dev.gentooexperimental.org/~darkside/distfiles/${PN}/${P}.tar.bz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa m68k ~mips ppc64 s390 sh x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="!games-misc/bsd-games"
diff --git a/games-misc/wumpus/wumpus-1.4.ebuild b/games-misc/wumpus/wumpus-1.4.ebuild
index a6243bc7b23fc..3412e91d51d6c 100644
--- a/games-misc/wumpus/wumpus-1.4.ebuild
+++ b/games-misc/wumpus/wumpus-1.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-release-1-6/src/games/wump/wump.
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="sys-apps/less"
diff --git a/games-misc/xcowsay/xcowsay-1.3.ebuild b/games-misc/xcowsay/xcowsay-1.3.ebuild
index 84cdb41847314..2557c54c1e237 100644
--- a/games-misc/xcowsay/xcowsay-1.3.ebuild
+++ b/games-misc/xcowsay/xcowsay-1.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.nickg.me.uk/files/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="dbus fortune"
 
 RDEPEND="dbus? ( sys-apps/dbus )
diff --git a/games-misc/xcruiser/xcruiser-0.30.ebuild b/games-misc/xcruiser/xcruiser-0.30.ebuild
index 5a3d756f4436c..39c16beb9489c 100644
--- a/games-misc/xcruiser/xcruiser-0.30.ebuild
+++ b/games-misc/xcruiser/xcruiser-0.30.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 RESTRICT="test"
 
diff --git a/games-misc/xpenguins/xpenguins-2.2-r1.ebuild b/games-misc/xpenguins/xpenguins-2.2-r1.ebuild
index b2f8fd840c062..e2951212d85bb 100644
--- a/games-misc/xpenguins/xpenguins-2.2-r1.ebuild
+++ b/games-misc/xpenguins/xpenguins-2.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://xpenguins.seul.org/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 x86"
+KEYWORDS="~alpha ~amd64 ~x86"
 IUSE=""
 
 RDEPEND="x11-libs/libXpm"
diff --git a/games-misc/yadex/yadex-1.7.0.ebuild b/games-misc/yadex/yadex-1.7.0.ebuild
index 9e37df3ce0d75..306f0a38eae56 100644
--- a/games-misc/yadex/yadex-1.7.0.ebuild
+++ b/games-misc/yadex/yadex-1.7.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.teaser.fr/~amajorel/yadex/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="~x86"
 IUSE=""
 RESTRICT="test"
 
diff --git a/games-mud/circlemud/circlemud-3.1.ebuild b/games-mud/circlemud/circlemud-3.1.ebuild
index 2a6e48db02ecd..a0b3a10589f90 100644
--- a/games-mud/circlemud/circlemud-3.1.ebuild
+++ b/games-mud/circlemud/circlemud-3.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.circlemud.org/pub/CircleMUD/3.x/circle-${PV}.tar.bz2"
 
 LICENSE="circlemud"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="dev-libs/openssl:0="
diff --git a/games-mud/crystal/crystal-0.2.4.ebuild b/games-mud/crystal/crystal-0.2.4.ebuild
index 2417cd3804963..b27b5652dcbc0 100644
--- a/games-mud/crystal/crystal-0.2.4.ebuild
+++ b/games-mud/crystal/crystal-0.2.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.evilmagic.org/dist/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="sys-libs/zlib
diff --git a/games-mud/gmudix/gmudix-1.0.ebuild b/games-mud/gmudix/gmudix-1.0.ebuild
index 022c13460dccc..88c3e7e0a10e2 100644
--- a/games-mud/gmudix/gmudix-1.0.ebuild
+++ b/games-mud/gmudix/gmudix-1.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://dw.nl.eu.org/gmudix/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="x11-libs/gtk+:2"
diff --git a/games-mud/gnome-mud/gnome-mud-0.11.2-r2.ebuild b/games-mud/gnome-mud/gnome-mud-0.11.2-r2.ebuild
index d8bafca919dc9..ce78f6bb826ce 100644
--- a/games-mud/gnome-mud/gnome-mud-0.11.2-r2.ebuild
+++ b/games-mud/gnome-mud/gnome-mud-0.11.2-r2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/GnomeMud"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 IUSE="gstreamer"
 
 RDEPEND="virtual/libintl
diff --git a/games-mud/kildclient/kildclient-3.0.1.ebuild b/games-mud/kildclient/kildclient-3.0.1.ebuild
index f2e3c07fd8063..8c37dabc8df39 100644
--- a/games-mud/kildclient/kildclient-3.0.1.ebuild
+++ b/games-mud/kildclient/kildclient-3.0.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/kildclient/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc gnutls spell"
 
 RDEPEND="x11-libs/gtk+:3
diff --git a/games-mud/kmuddy/kmuddy-1.0.1-r3.ebuild b/games-mud/kmuddy/kmuddy-1.0.1-r3.ebuild
index 4ea881b9c1298..a1ceff0715d54 100644
--- a/games-mud/kmuddy/kmuddy-1.0.1-r3.ebuild
+++ b/games-mud/kmuddy/kmuddy-1.0.1-r3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://www.kmuddy.com/releases/stable/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="4"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="debug"
 
 DOC=( AUTHORS README CHANGELOG Scripting-HOWTO TODO DESIGN )
diff --git a/games-mud/lyntin/lyntin-4.2-r1.ebuild b/games-mud/lyntin/lyntin-4.2-r1.ebuild
index a8dbc53db9472..7fc27d7b4b0eb 100644
--- a/games-mud/lyntin/lyntin-4.2-r1.ebuild
+++ b/games-mud/lyntin/lyntin-4.2-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/lyntin/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="tk"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/games-mud/mudix/mudix-4.3-r1.ebuild b/games-mud/mudix/mudix-4.3-r1.ebuild
index 99e3b6e6ad3b7..e2115f4a30434 100644
--- a/games-mud/mudix/mudix-4.3-r1.ebuild
+++ b/games-mud/mudix/mudix-4.3-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://dw.nl.eu.org/mudix/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="sys-libs/ncurses:0"
diff --git a/games-mud/powwow/powwow-1.2.16.ebuild b/games-mud/powwow/powwow-1.2.16.ebuild
index cc9cb18cef38f..3100c59383cf5 100644
--- a/games-mud/powwow/powwow-1.2.16.ebuild
+++ b/games-mud/powwow/powwow-1.2.16.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://hoopajoo.net/static/projects/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="sys-libs/ncurses:0"
diff --git a/games-mud/tf/tf-50_beta8-r2.ebuild b/games-mud/tf/tf-50_beta8-r2.ebuild
index 306701bd4feb7..1009fb07dc039 100644
--- a/games-mud/tf/tf-50_beta8-r2.ebuild
+++ b/games-mud/tf/tf-50_beta8-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+atcp debug doc +gmcp ipv6 +option102 ssl"
 
 RDEPEND="
diff --git a/games-mud/tintin/tintin-2.01.1.ebuild b/games-mud/tintin/tintin-2.01.1.ebuild
index 61f4ca58c860f..ddefc59fbb1c4 100644
--- a/games-mud/tintin/tintin-2.01.1.ebuild
+++ b/games-mud/tintin/tintin-2.01.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/tintin/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="sys-libs/zlib
diff --git a/games-mud/tkmoo/tkmoo-0.3.32.ebuild b/games-mud/tkmoo/tkmoo-0.3.32.ebuild
index e22acae926059..09257d1589392 100644
--- a/games-mud/tkmoo/tkmoo-0.3.32.ebuild
+++ b/games-mud/tkmoo/tkmoo-0.3.32.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.awns.com/tkMOO-light/Source/${MY_P}.tar.gz"
 
 LICENSE="tkMOO"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/games-mud/trebuchet/trebuchet-1.075.ebuild b/games-mud/trebuchet/trebuchet-1.075.ebuild
index 7f5e90eae3372..b06007a67d272 100644
--- a/games-mud/trebuchet/trebuchet-1.075.ebuild
+++ b/games-mud/trebuchet/trebuchet-1.075.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/trebuchet/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 RESTRICT="test"
 
diff --git a/games-puzzle/4stattack/4stattack-2.1.4.ebuild b/games-puzzle/4stattack/4stattack-2.1.4.ebuild
index 1d178a21445b1..a076f4776e586 100644
--- a/games-puzzle/4stattack/4stattack-2.1.4.ebuild
+++ b/games-puzzle/4stattack/4stattack-2.1.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/forcedattack/4stAttack-${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 hppa x86"
+KEYWORDS="~amd64 ~hppa ~x86"
 IUSE=""
 
 DEPEND=""
diff --git a/games-puzzle/amoebax/amoebax-0.2.1.ebuild b/games-puzzle/amoebax/amoebax-0.2.1.ebuild
index 2d9537adeacb8..687f1d8f90570 100644
--- a/games-puzzle/amoebax/amoebax-0.2.1.ebuild
+++ b/games-puzzle/amoebax/amoebax-0.2.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.emma-soft.com/games/amoebax/download/${P}.tar.bz2"
 
 LICENSE="FreeArt GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="media-libs/libsdl[sound,joystick,video]
diff --git a/games-puzzle/anagramarama/anagramarama-0.2.ebuild b/games-puzzle/anagramarama/anagramarama-0.2.ebuild
index 06434cfe81a2e..5dc26f04662d1 100644
--- a/games-puzzle/anagramarama/anagramarama-0.2.ebuild
+++ b/games-puzzle/anagramarama/anagramarama-0.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.omega.clara.net/anagramarama/dist/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND=">=media-libs/libsdl-1.2
diff --git a/games-puzzle/angrydd/angrydd-1.0.1-r1.ebuild b/games-puzzle/angrydd/angrydd-1.0.1-r1.ebuild
index 7438662e6bfbc..6e2173c76467e 100644
--- a/games-puzzle/angrydd/angrydd-1.0.1-r1.ebuild
+++ b/games-puzzle/angrydd/angrydd-1.0.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.sacredchao.net/~piman/angrydd/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="dev-python/pygame[${PYTHON_USEDEP}]
diff --git a/games-puzzle/arrows/arrows-0.6.ebuild b/games-puzzle/arrows/arrows-0.6.ebuild
index 1ca985a2b41cf..33023848a4c72 100644
--- a/games-puzzle/arrows/arrows-0.6.ebuild
+++ b/games-puzzle/arrows/arrows-0.6.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://noreason.ca/data/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=x11-libs/gtk+-2.4:2"
diff --git a/games-puzzle/atomix/atomix-3.18.0.ebuild b/games-puzzle/atomix/atomix-3.18.0.ebuild
index acdfbc769ddfa..c3a9cbc8b2fde 100644
--- a/games-puzzle/atomix/atomix-3.18.0.ebuild
+++ b/games-puzzle/atomix/atomix-3.18.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="http://ftp.gnome.org/pub/GNOME/sources/atomix/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/games-puzzle/bastet/bastet-0.43.ebuild b/games-puzzle/bastet/bastet-0.43.ebuild
index 653e57aecb6a2..c395170fbcbe4 100644
--- a/games-puzzle/bastet/bastet-0.43.ebuild
+++ b/games-puzzle/bastet/bastet-0.43.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://fph.altervista.org/prog/files/${P}.tgz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="sys-libs/ncurses:0
diff --git a/games-puzzle/biniax2/biniax2-1.30.ebuild b/games-puzzle/biniax2/biniax2-1.30.ebuild
index 52ea37ca80a8e..8c89af60317aa 100644
--- a/games-puzzle/biniax2/biniax2-1.30.ebuild
+++ b/games-puzzle/biniax2/biniax2-1.30.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://mordred.dir.bg/biniax/${P}-fullsrc.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="media-libs/libsdl
diff --git a/games-puzzle/braincurses/braincurses-0.5b.ebuild b/games-puzzle/braincurses/braincurses-0.5b.ebuild
index cc858a7222228..b29db61b473db 100644
--- a/games-puzzle/braincurses/braincurses-0.5b.ebuild
+++ b/games-puzzle/braincurses/braincurses-0.5b.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/braincurses/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 DEPEND=""
diff --git a/games-puzzle/brainparty/brainparty-0.61.ebuild b/games-puzzle/brainparty/brainparty-0.61.ebuild
index 9cc441ad80e82..ec75d548eb035 100644
--- a/games-puzzle/brainparty/brainparty-0.61.ebuild
+++ b/games-puzzle/brainparty/brainparty-0.61.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://launchpad.net/brainparty/trunk/${PV}/+download/${PN}${PV}.tar.g
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="media-libs/libsdl[sound,opengl,video]
diff --git a/games-puzzle/brainworkshop/brainworkshop-4.8.4.ebuild b/games-puzzle/brainworkshop/brainworkshop-4.8.4.ebuild
index 89dc8c4dc3fe9..e454d7dd34484 100644
--- a/games-puzzle/brainworkshop/brainworkshop-4.8.4.ebuild
+++ b/games-puzzle/brainworkshop/brainworkshop-4.8.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/brainworkshop/${P}.zip"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/games-puzzle/bubble-chains/bubble-chains-0.1.1.ebuild b/games-puzzle/bubble-chains/bubble-chains-0.1.1.ebuild
index 5b992e8b9f2f4..71eb17a7bb699 100644
--- a/games-puzzle/bubble-chains/bubble-chains-0.1.1.ebuild
+++ b/games-puzzle/bubble-chains/bubble-chains-0.1.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://${PN}.sintegrial.com/files/${MY_P}.7z"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="x11-libs/libXrandr
diff --git a/games-puzzle/colorcode/colorcode-0.8.5.ebuild b/games-puzzle/colorcode/colorcode-0.8.5.ebuild
index bbe2bfc802901..c304b720483c8 100644
--- a/games-puzzle/colorcode/colorcode-0.8.5.ebuild
+++ b/games-puzzle/colorcode/colorcode-0.8.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://${PN}.laebisch.com/download/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/games-puzzle/concentration/concentration-1.2-r1.ebuild b/games-puzzle/concentration/concentration-1.2-r1.ebuild
index 533a80a7169e0..1aa804b6b341c 100644
--- a/games-puzzle/concentration/concentration-1.2-r1.ebuild
+++ b/games-puzzle/concentration/concentration-1.2-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="media-libs/libsdl[sound,video]
diff --git a/games-puzzle/connectagram/connectagram-1.2.1.ebuild b/games-puzzle/connectagram/connectagram-1.2.1.ebuild
index b573fb6499219..a3cf9d1c896b9 100644
--- a/games-puzzle/connectagram/connectagram-1.2.1.ebuild
+++ b/games-puzzle/connectagram/connectagram-1.2.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://gottcode.org/${PN}/${P}-src.tar.bz2"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-qt/qtcore-5.2:5
diff --git a/games-puzzle/construo/construo-0.2.2.ebuild b/games-puzzle/construo/construo-0.2.2.ebuild
index f5c416209446e..d74b179844e6f 100644
--- a/games-puzzle/construo/construo-0.2.2.ebuild
+++ b/games-puzzle/construo/construo-0.2.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://freesoftware.fsf.org/download/construo/construo.pkg/${PV}/${P}.t
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="virtual/opengl
diff --git a/games-puzzle/cutemaze/cutemaze-1.2.0.ebuild b/games-puzzle/cutemaze/cutemaze-1.2.0.ebuild
index 67b7329e92c74..668129d73bab9 100644
--- a/games-puzzle/cutemaze/cutemaze-1.2.0.ebuild
+++ b/games-puzzle/cutemaze/cutemaze-1.2.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://gottcode.org/${PN}/${P}-src.tar.bz2"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/games-puzzle/cuyo/cuyo-2.1.1.ebuild b/games-puzzle/cuyo/cuyo-2.1.1.ebuild
index 8acab44bef37b..3469a41670fb6 100644
--- a/games-puzzle/cuyo/cuyo-2.1.1.ebuild
+++ b/games-puzzle/cuyo/cuyo-2.1.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://savannah.nongnu.org/download/cuyo/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+music"
 
 DEPEND="sys-libs/zlib
diff --git a/games-puzzle/einstein/einstein-2.0.ebuild b/games-puzzle/einstein/einstein-2.0.ebuild
index 62c0a767bab74..a689cf7dc9f55 100644
--- a/games-puzzle/einstein/einstein-2.0.ebuild
+++ b/games-puzzle/einstein/einstein-2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}-src.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="media-libs/libsdl[sound,video]
diff --git a/games-puzzle/enigma/enigma-1.21-r2.ebuild b/games-puzzle/enigma/enigma-1.21-r2.ebuild
index af0c5543f041c..c9b2e6c38ed03 100644
--- a/games-puzzle/enigma/enigma-1.21-r2.ebuild
+++ b/games-puzzle/enigma/enigma-1.21-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/enigma-game/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="nls"
 
 COMMON_DEPS="media-libs/sdl-ttf
diff --git a/games-puzzle/ensemblist/ensemblist-040126.ebuild b/games-puzzle/ensemblist/ensemblist-040126.ebuild
index 02d3e0595c1ff..559fa92b60349 100644
--- a/games-puzzle/ensemblist/ensemblist-040126.ebuild
+++ b/games-puzzle/ensemblist/ensemblist-040126.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://savannah.nongnu.org/download/ensemblist/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="~x86"
 IUSE=""
 
 DEPEND="media-libs/freeglut
diff --git a/games-puzzle/fbg/fbg-0.9-r1.ebuild b/games-puzzle/fbg/fbg-0.9-r1.ebuild
index 6e6611bb6d6a1..e516d714b0d65 100644
--- a/games-puzzle/fbg/fbg-0.9-r1.ebuild
+++ b/games-puzzle/fbg/fbg-0.9-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/fbg/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="virtual/opengl
diff --git a/games-puzzle/fish-fillets/fish-fillets-1.0.1.ebuild b/games-puzzle/fish-fillets/fish-fillets-1.0.1.ebuild
index a196f095993ca..fec0213902dd5 100644
--- a/games-puzzle/fish-fillets/fish-fillets-1.0.1.ebuild
+++ b/games-puzzle/fish-fillets/fish-fillets-1.0.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/fillets/fillets-ng-${PV}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=media-libs/libsdl-1.2[sound,video]
diff --git a/games-puzzle/flobopuyo/flobopuyo-0.20-r1.ebuild b/games-puzzle/flobopuyo/flobopuyo-0.20-r1.ebuild
index cfaf261a7bec2..93dbd923bb862 100644
--- a/games-puzzle/flobopuyo/flobopuyo-0.20-r1.ebuild
+++ b/games-puzzle/flobopuyo/flobopuyo-0.20-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.ios-software.com/flobopuyo/${P}.tgz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 IUSE="opengl"
 
 DEPEND="media-libs/libsdl
diff --git a/games-puzzle/freesweep/freesweep-0.92.ebuild b/games-puzzle/freesweep/freesweep-0.92.ebuild
index b9a78ed5c0618..711e5c61c6faf 100644
--- a/games-puzzle/freesweep/freesweep-0.92.ebuild
+++ b/games-puzzle/freesweep/freesweep-0.92.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.upl.cs.wisc.edu/~hartmann/sweep/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86 ~ppc-macos"
+KEYWORDS="~amd64 ~x86 ~ppc-macos"
 
 RDEPEND="sys-libs/ncurses:0"
 DEPEND="${RDEPEND}
diff --git a/games-puzzle/galaxis/galaxis-1.8.ebuild b/games-puzzle/galaxis/galaxis-1.8.ebuild
index 5496729a8f132..12bd540ec67d9 100644
--- a/games-puzzle/galaxis/galaxis-1.8.ebuild
+++ b/games-puzzle/galaxis/galaxis-1.8.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.catb.org/~esr/galaxis/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 DEPEND=">=sys-libs/ncurses-5.3:0"
diff --git a/games-puzzle/gemdropx/gemdropx-0.9-r1.ebuild b/games-puzzle/gemdropx/gemdropx-0.9-r1.ebuild
index d25caa2d89f92..b7e04a7574c17 100644
--- a/games-puzzle/gemdropx/gemdropx-0.9-r1.ebuild
+++ b/games-puzzle/gemdropx/gemdropx-0.9-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.sonic.net/pub/users/nbs/unix/x/gemdropx/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND=">=media-libs/libsdl-1.2.3-r1[joystick,video]
diff --git a/games-puzzle/gfifteen/gfifteen-1.0.3.ebuild b/games-puzzle/gfifteen/gfifteen-1.0.3.ebuild
index 69d83dc728f11..25f254cd55486 100644
--- a/games-puzzle/gfifteen/gfifteen-1.0.3.ebuild
+++ b/games-puzzle/gfifteen/gfifteen-1.0.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://frigidcode.com/code/gfifteen/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="x11-libs/gtk+:3"
diff --git a/games-puzzle/glightoff/glightoff-1.0.0-r1.ebuild b/games-puzzle/glightoff/glightoff-1.0.0-r1.ebuild
index 6eaba0d97d5fc..5a209fa62cf13 100644
--- a/games-puzzle/glightoff/glightoff-1.0.0-r1.ebuild
+++ b/games-puzzle/glightoff/glightoff-1.0.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/games-puzzle/gnudoku/gnudoku-0.93.ebuild b/games-puzzle/gnudoku/gnudoku-0.93.ebuild
index 6e17e6575db79..b4bbd4305682b 100644
--- a/games-puzzle/gnudoku/gnudoku-0.93.ebuild
+++ b/games-puzzle/gnudoku/gnudoku-0.93.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.icculus.org/~jcspray/GNUDoku/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 RESTRICT="test"
 
diff --git a/games-puzzle/gnurobbo/gnurobbo-0.66.ebuild b/games-puzzle/gnurobbo/gnurobbo-0.66.ebuild
index 5f2da4041d8ce..b3b59d5f3fc6a 100644
--- a/games-puzzle/gnurobbo/gnurobbo-0.66.ebuild
+++ b/games-puzzle/gnurobbo/gnurobbo-0.66.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/gnurobbo/${P}-source.tar.gz"
 
 LICENSE="GPL-2 BitstreamVera"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="media-libs/libsdl[sound,video,joystick]
diff --git a/games-puzzle/gottet/gottet-1.1.3.ebuild b/games-puzzle/gottet/gottet-1.1.3.ebuild
index 3a021646c64cb..0d7f78f4b41dd 100644
--- a/games-puzzle/gottet/gottet-1.1.3.ebuild
+++ b/games-puzzle/gottet/gottet-1.1.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gottcode.org/${PN}/${P}-src.tar.bz2"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/games-puzzle/greedy/greedy-0.2.0-r1.ebuild b/games-puzzle/greedy/greedy-0.2.0-r1.ebuild
index c3d6eaec2d2f1..dffb899aebff8 100644
--- a/games-puzzle/greedy/greedy-0.2.0-r1.ebuild
+++ b/games-puzzle/greedy/greedy-0.2.0-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.kotinet.com/juhamattin/linux/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND="sys-libs/ncurses:0"
diff --git a/games-puzzle/groundhog/groundhog-1.4.ebuild b/games-puzzle/groundhog/groundhog-1.4.ebuild
index 80751062f67ec..0682e563376e5 100644
--- a/games-puzzle/groundhog/groundhog-1.4.ebuild
+++ b/games-puzzle/groundhog/groundhog-1.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://home-2.consunet.nl/~cb007736/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="nls"
 
 RDEPEND="x11-libs/gtk+:2
diff --git a/games-puzzle/gtetrinet/gtetrinet-0.7.11-r3.ebuild b/games-puzzle/gtetrinet/gtetrinet-0.7.11-r3.ebuild
index 31961715876d6..44052954303d2 100644
--- a/games-puzzle/gtetrinet/gtetrinet-0.7.11-r3.ebuild
+++ b/games-puzzle/gtetrinet/gtetrinet-0.7.11-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="${SRC_URI}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="nls ipv6"
 
 RDEPEND="
diff --git a/games-puzzle/gtkballs/gtkballs-3.1.5-r1.ebuild b/games-puzzle/gtkballs/gtkballs-3.1.5-r1.ebuild
index b1205f49d813d..8e7c4cdd73d88 100644
--- a/games-puzzle/gtkballs/gtkballs-3.1.5-r1.ebuild
+++ b/games-puzzle/gtkballs/gtkballs-3.1.5-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://gtkballs.antex.ru/dist/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="nls"
 
 RDEPEND="x11-libs/gtk+:2
diff --git a/games-puzzle/gweled/gweled-0.9.1-r1.ebuild b/games-puzzle/gweled/gweled-0.9.1-r1.ebuild
index 6c7f5048c7021..514d95cea8357 100644
--- a/games-puzzle/gweled/gweled-0.9.1-r1.ebuild
+++ b/games-puzzle/gweled/gweled-0.9.1-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://launchpad.net/gweled/trunk/${PV}/+download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="x11-libs/gtk+:2
diff --git a/games-puzzle/hangman/hangman-0.9.2.ebuild b/games-puzzle/hangman/hangman-0.9.2.ebuild
index 9c6bf0d7696d1..468a996b6fa2d 100644
--- a/games-puzzle/hangman/hangman-0.9.2.ebuild
+++ b/games-puzzle/hangman/hangman-0.9.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.shiftygames.com/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="!games-misc/bsd-games
diff --git a/games-puzzle/hexalate/hexalate-1.1.0.ebuild b/games-puzzle/hexalate/hexalate-1.1.0.ebuild
index c63526bdb5691..60757fbc48157 100644
--- a/games-puzzle/hexalate/hexalate-1.1.0.ebuild
+++ b/games-puzzle/hexalate/hexalate-1.1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gottcode.org/${PN}/${P}-src.tar.bz2"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/games-puzzle/hexamine/hexamine-0.2.1.ebuild b/games-puzzle/hexamine/hexamine-0.2.1.ebuild
index e80eb0a10503e..0551f1e713adb 100644
--- a/games-puzzle/hexamine/hexamine-0.2.1.ebuild
+++ b/games-puzzle/hexamine/hexamine-0.2.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/hexamine/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-python/pygame
diff --git a/games-puzzle/hoh-bin/hoh-bin-1.01.ebuild b/games-puzzle/hoh-bin/hoh-bin-1.01.ebuild
index c19c360f68af4..ad681b47a18e5 100644
--- a/games-puzzle/hoh-bin/hoh-bin-1.01.ebuild
+++ b/games-puzzle/hoh-bin/hoh-bin-1.01.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://retrospec.sgn.net/download.php?id=63\&path=games/hoh/bin/hohlin-
 
 LICENSE="free-noncomm"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 RESTRICT="strip"
 
diff --git a/games-puzzle/icebreaker/icebreaker-1.9.6.ebuild b/games-puzzle/icebreaker/icebreaker-1.9.6.ebuild
index 5ea007c9d8629..449e0864f6262 100644
--- a/games-puzzle/icebreaker/icebreaker-1.9.6.ebuild
+++ b/games-puzzle/icebreaker/icebreaker-1.9.6.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.mattdm.org/${PN}/1.9.x/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="media-libs/libsdl[video]
diff --git a/games-puzzle/jag/jag-0.3.2.ebuild b/games-puzzle/jag/jag-0.3.2.ebuild
index 83cb6b370c236..e4eff536e4143 100644
--- a/games-puzzle/jag/jag-0.3.2.ebuild
+++ b/games-puzzle/jag/jag-0.3.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://jag.xlabsoft.com/files/${P}-src.zip
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="editor"
 
 RDEPEND="dev-qt/qtcore:4
diff --git a/games-puzzle/jools/jools-0.20-r2.ebuild b/games-puzzle/jools/jools-0.20-r2.ebuild
index f761986f112ae..21bb3113dafd2 100644
--- a/games-puzzle/jools/jools-0.20-r2.ebuild
+++ b/games-puzzle/jools/jools-0.20-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://pessimization.com/software/jools/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="dev-python/pygame[${PYTHON_USEDEP}]
diff --git a/games-puzzle/larry/larry-1-r1.ebuild b/games-puzzle/larry/larry-1-r1.ebuild
index 95bdd1f2aed5d..ce80803c9680d 100644
--- a/games-puzzle/larry/larry-1-r1.ebuild
+++ b/games-puzzle/larry/larry-1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="LarryReloadedLinux.tar.gz"
 
 LICENSE="all-rights-reserved"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 RESTRICT="bindist fetch splitdebug"
 
diff --git a/games-puzzle/lmarbles/lmarbles-1.0.8.ebuild b/games-puzzle/lmarbles/lmarbles-1.0.8.ebuild
index b17c5eb514622..59381278471ac 100644
--- a/games-puzzle/lmarbles/lmarbles-1.0.8.ebuild
+++ b/games-puzzle/lmarbles/lmarbles-1.0.8.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/lgames/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="media-libs/libsdl[video]
diff --git a/games-puzzle/lpairs/lpairs-1.0.4.ebuild b/games-puzzle/lpairs/lpairs-1.0.4.ebuild
index f5169a3488fc1..054dd29a9f4aa 100644
--- a/games-puzzle/lpairs/lpairs-1.0.4.ebuild
+++ b/games-puzzle/lpairs/lpairs-1.0.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/lgames/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="nls sound"
 
 RDEPEND="media-libs/libsdl[sound?,video]
diff --git a/games-puzzle/ltris/ltris-1.0.19.ebuild b/games-puzzle/ltris/ltris-1.0.19.ebuild
index c25d935e5457e..439782b6b4966 100644
--- a/games-puzzle/ltris/ltris-1.0.19.ebuild
+++ b/games-puzzle/ltris/ltris-1.0.19.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/lgames/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="nls"
 
 RDEPEND="media-libs/libsdl[video]
diff --git a/games-puzzle/magiccube4d/magiccube4d-2.2.ebuild b/games-puzzle/magiccube4d/magiccube4d-2.2.ebuild
index 0c262918fd476..7d4287d447bdb 100644
--- a/games-puzzle/magiccube4d/magiccube4d-2.2.ebuild
+++ b/games-puzzle/magiccube4d/magiccube4d-2.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.superliminal.com/cube/mc4d-src-${MY_PV}.tgz"
 
 LICENSE="free-noncomm"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="x11-libs/libXaw"
diff --git a/games-puzzle/meandmyshadow/meandmyshadow-0.4.ebuild b/games-puzzle/meandmyshadow/meandmyshadow-0.4.ebuild
index a8c524a6b377f..fc86ad6a51224 100644
--- a/games-puzzle/meandmyshadow/meandmyshadow-0.4.ebuild
+++ b/games-puzzle/meandmyshadow/meandmyshadow-0.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/meandmyshadow/${PV}/${P}-src.tar.gz"
 
 LICENSE="GPL-3 OFL-1.1 CC-BY-SA-2.5"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="opengl"
 
 DEPEND="media-libs/libsdl[sound,video,X]
diff --git a/games-puzzle/mindless/mindless-1.6.ebuild b/games-puzzle/mindless/mindless-1.6.ebuild
index cb080963b9e28..6e89425c80792 100644
--- a/games-puzzle/mindless/mindless-1.6.ebuild
+++ b/games-puzzle/mindless/mindless-1.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/mindless/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 RESTRICT="mirror" # for the card database
 
diff --git a/games-puzzle/mirrormagic/mirrormagic-2.0.2-r1.ebuild b/games-puzzle/mirrormagic/mirrormagic-2.0.2-r1.ebuild
index acc743eb9cbd1..88a24e7a64e54 100644
--- a/games-puzzle/mirrormagic/mirrormagic-2.0.2-r1.ebuild
+++ b/games-puzzle/mirrormagic/mirrormagic-2.0.2-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.artsoft.org/RELEASES/unix/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="sdl"
 
 RDEPEND="!sdl? ( x11-libs/libX11 )
diff --git a/games-puzzle/monsterz/monsterz-0.7.1-r3.ebuild b/games-puzzle/monsterz/monsterz-0.7.1-r3.ebuild
index 7086b507fb099..e8e78eba86380 100644
--- a/games-puzzle/monsterz/monsterz-0.7.1-r3.ebuild
+++ b/games-puzzle/monsterz/monsterz-0.7.1-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://sam.zoy.org/projects/monsterz/${P}.tar.gz"
 
 LICENSE="GPL-1+ LGPL-2+ WTFPL-2"
 SLOT="0"
-KEYWORDS="amd64 hppa x86"
+KEYWORDS="~amd64 ~hppa ~x86"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/games-puzzle/mures/mures-0.5.ebuild b/games-puzzle/mures/mures-0.5.ebuild
index 7cf4abc7896da..783959263d8a2 100644
--- a/games-puzzle/mures/mures-0.5.ebuild
+++ b/games-puzzle/mures/mures-0.5.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/mures/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="opengl"
 
 DEPEND="media-libs/libsdl
diff --git a/games-puzzle/neverball/neverball-1.6.0.ebuild b/games-puzzle/neverball/neverball-1.6.0.ebuild
index 4466cbdedcf40..28d7120de14b6 100644
--- a/games-puzzle/neverball/neverball-1.6.0.ebuild
+++ b/games-puzzle/neverball/neverball-1.6.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://neverball.org/${P}.tar.gz"
 
 LICENSE="GPL-2+ IJG"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="nls"
 RESTRICT="test"
 
diff --git a/games-puzzle/ngstar/ngstar-2.1.8-r2.ebuild b/games-puzzle/ngstar/ngstar-2.1.8-r2.ebuild
index 0176fcfa2eab0..c22226a39d5a4 100644
--- a/games-puzzle/ngstar/ngstar-2.1.8-r2.ebuild
+++ b/games-puzzle/ngstar/ngstar-2.1.8-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo//${P}-src.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="sys-libs/ncurses:0
diff --git a/games-puzzle/nightsky/nightsky-20111222.ebuild b/games-puzzle/nightsky/nightsky-20111222.ebuild
index e662c94e7dabc..aebfa6393e065 100644
--- a/games-puzzle/nightsky/nightsky-20111222.ebuild
+++ b/games-puzzle/nightsky/nightsky-20111222.ebuild
@@ -11,7 +11,7 @@ SRC_URI="nightskyhd-linux-1324519044.tar.gz"
 
 LICENSE="all-rights-reserved"
 SLOT="0"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE="bundled-libs"
 RESTRICT="bindist fetch splitdebug"
 
diff --git a/games-puzzle/pathological/pathological-1.1.3-r3.ebuild b/games-puzzle/pathological/pathological-1.1.3-r3.ebuild
index 7d829c07ed802..88e3d609d04c1 100644
--- a/games-puzzle/pathological/pathological-1.1.3-r3.ebuild
+++ b/games-puzzle/pathological/pathological-1.1.3-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/games-puzzle/pauker/pauker-1.8.ebuild b/games-puzzle/pauker/pauker-1.8.ebuild
index 8a9d34a94d329..af0161d502ee4 100644
--- a/games-puzzle/pauker/pauker-1.8.ebuild
+++ b/games-puzzle/pauker/pauker-1.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/pauker/${P}.src.jar"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 COMMON_DEP="dev-java/browserlauncher2:1.0
diff --git a/games-puzzle/penguzzle/penguzzle-1.0-r1.ebuild b/games-puzzle/penguzzle/penguzzle-1.0-r1.ebuild
index c8b350a1c9fda..7dfc3716a0cd6 100644
--- a/games-puzzle/penguzzle/penguzzle-1.0-r1.ebuild
+++ b/games-puzzle/penguzzle/penguzzle-1.0-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.naskita.com/linux/${PN}/${PN}.zip"
 
 LICENSE="penguzzle"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-lang/tk
diff --git a/games-puzzle/picpuz/picpuz-2.5.ebuild b/games-puzzle/picpuz/picpuz-2.5.ebuild
index 3a4fe2400ea90..5d20e42bd953e 100644
--- a/games-puzzle/picpuz/picpuz-2.5.ebuild
+++ b/games-puzzle/picpuz/picpuz-2.5.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://kornelix.squarespace.com/storage/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="x11-libs/gtk+:3"
diff --git a/games-puzzle/pingus/pingus-0.7.6.ebuild b/games-puzzle/pingus/pingus-0.7.6.ebuild
index 7ae79d15e5a09..f5f3d77af9fe6 100644
--- a/games-puzzle/pingus/pingus-0.7.6.ebuild
+++ b/games-puzzle/pingus/pingus-0.7.6.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://pingus.googlecode.com/files/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="opengl music"
 
 RDEPEND="media-libs/libsdl[joystick,opengl?,video]
diff --git a/games-puzzle/pipepanic/pipepanic-0.1.3.ebuild b/games-puzzle/pipepanic/pipepanic-0.1.3.ebuild
index 30c1bebabaee5..0ccc9171bcdf5 100644
--- a/games-puzzle/pipepanic/pipepanic-0.1.3.ebuild
+++ b/games-puzzle/pipepanic/pipepanic-0.1.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.users.waitrose.com/~thunor/pipepanic/dload/${P}-source.tar.g
 
 LICENSE="GPL-2 FreeArt"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="media-libs/libsdl[video]"
diff --git a/games-puzzle/pipewalker/pipewalker-0.9.4.ebuild b/games-puzzle/pipewalker/pipewalker-0.9.4.ebuild
index 391fd745aa3c6..f0b06ab7c7b56 100644
--- a/games-puzzle/pipewalker/pipewalker-0.9.4.ebuild
+++ b/games-puzzle/pipewalker/pipewalker-0.9.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/pipewalker/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="media-libs/libsdl[opengl,video]
diff --git a/games-puzzle/quadra/quadra-1.2.0.ebuild b/games-puzzle/quadra/quadra-1.2.0.ebuild
index f1633a7eb7aeb..6d62e04484e25 100644
--- a/games-puzzle/quadra/quadra-1.2.0.ebuild
+++ b/games-puzzle/quadra/quadra-1.2.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://quadra.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/games-puzzle/rezerwar/rezerwar-0.4.2.ebuild b/games-puzzle/rezerwar/rezerwar-0.4.2.ebuild
index ca6c981355e65..ec7c6c3447a81 100644
--- a/games-puzzle/rezerwar/rezerwar-0.4.2.ebuild
+++ b/games-puzzle/rezerwar/rezerwar-0.4.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://tamentis.com/projects/rezerwar/files/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="media-libs/libsdl[sound,joystick,video]
diff --git a/games-puzzle/scramble/scramble-0.9.5.ebuild b/games-puzzle/scramble/scramble-0.9.5.ebuild
index eb727787db448..04c3496512b20 100644
--- a/games-puzzle/scramble/scramble-0.9.5.ebuild
+++ b/games-puzzle/scramble/scramble-0.9.5.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.shiftygames.com/scramble/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND=">=media-libs/libsdl-1.2[sound,video]
diff --git a/games-puzzle/sdl-jewels/sdl-jewels-1.1.1.ebuild b/games-puzzle/sdl-jewels/sdl-jewels-1.1.1.ebuild
index eae86f8bc7809..98377fdd0a725 100644
--- a/games-puzzle/sdl-jewels/sdl-jewels-1.1.1.ebuild
+++ b/games-puzzle/sdl-jewels/sdl-jewels-1.1.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.linuxmotors.com/gljewel/downloads/SDL_jewels-${PV}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 RESTRICT="test"
 
diff --git a/games-puzzle/seatris/seatris-0.0.14.ebuild b/games-puzzle/seatris/seatris-0.0.14.ebuild
index 19c5e07f08228..30d84fd4afed0 100644
--- a/games-puzzle/seatris/seatris-0.0.14.ebuild
+++ b/games-puzzle/seatris/seatris-0.0.14.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.earth.li/projectpurple/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 
 RDEPEND="sys-libs/ncurses"
 DEPEND="${DEPEND}
diff --git a/games-puzzle/sgt-puzzles/sgt-puzzles-20170314.ebuild b/games-puzzle/sgt-puzzles/sgt-puzzles-20170314.ebuild
index ccbdc036d624e..a042e7b602794 100644
--- a/games-puzzle/sgt-puzzles/sgt-puzzles-20170314.ebuild
+++ b/games-puzzle/sgt-puzzles/sgt-puzzles-20170314.ebuild
@@ -15,7 +15,7 @@ else
 	MAGIC=eedea41
 	SRC_URI="https://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${PV}.${MAGIC}.tar.gz"
 	S=${WORKDIR}/puzzles-${PV}.${MAGIC}
-	KEYWORDS="amd64 x86"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 DESCRIPTION="Simon Tatham's Portable Puzzle Collection"
diff --git a/games-puzzle/shaaft/shaaft-0.5.0.ebuild b/games-puzzle/shaaft/shaaft-0.5.0.ebuild
index ac936664c2bb7..04d75ab84441d 100644
--- a/games-puzzle/shaaft/shaaft-0.5.0.ebuild
+++ b/games-puzzle/shaaft/shaaft-0.5.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/criticalmass/${P/s/S}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="virtual/opengl
diff --git a/games-puzzle/skoosh/skoosh-2.5.0-r1.ebuild b/games-puzzle/skoosh/skoosh-2.5.0-r1.ebuild
index 7c253aa834426..04f48cd4ecca4 100644
--- a/games-puzzle/skoosh/skoosh-2.5.0-r1.ebuild
+++ b/games-puzzle/skoosh/skoosh-2.5.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://homepages.ihug.co.nz/~trmusson/stuff/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="nls"
 
 RDEPEND="
diff --git a/games-puzzle/splice/splice-20121120.ebuild b/games-puzzle/splice/splice-20121120.ebuild
index bdd0623bddffd..cd9f3346db97d 100644
--- a/games-puzzle/splice/splice-20121120.ebuild
+++ b/games-puzzle/splice/splice-20121120.ebuild
@@ -14,7 +14,7 @@ SRC_URI="splice-linux-1353389454.tar.gz"
 
 LICENSE="all-rights-reserved"
 SLOT="0"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE=""
 RESTRICT="bindist fetch splitdebug"
 
diff --git a/games-puzzle/tanglet/tanglet-1.3.1.ebuild b/games-puzzle/tanglet/tanglet-1.3.1.ebuild
index 93d45133ff1d6..b640740df693f 100644
--- a/games-puzzle/tanglet/tanglet-1.3.1.ebuild
+++ b/games-puzzle/tanglet/tanglet-1.3.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://gottcode.org/${PN}/${P}-src.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="sys-libs/zlib
diff --git a/games-puzzle/tetrinet/tetrinet-0.11.ebuild b/games-puzzle/tetrinet/tetrinet-0.11.ebuild
index 8dbd03ce0c4d0..684b07a7833d1 100644
--- a/games-puzzle/tetrinet/tetrinet-0.11.ebuild
+++ b/games-puzzle/tetrinet/tetrinet-0.11.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://tetrinet.or.cz/download/${P}.tar.bz2"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="ipv6"
 
 RDEPEND=">=sys-libs/ncurses-5:0"
diff --git a/games-puzzle/textmaze/textmaze-1.2.ebuild b/games-puzzle/textmaze/textmaze-1.2.ebuild
index 46d3ca9b22ea9..27d3c275ccccd 100644
--- a/games-puzzle/textmaze/textmaze-1.2.ebuild
+++ b/games-puzzle/textmaze/textmaze-1.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.robobunny.com/projects/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-perl/Curses"
diff --git a/games-puzzle/tint/tint-0.03b.ebuild b/games-puzzle/tint/tint-0.03b.ebuild
index 779ef88c96d33..da85ff697b2bb 100644
--- a/games-puzzle/tint/tint-0.03b.ebuild
+++ b/games-puzzle/tint/tint-0.03b.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://oasis.frogfoot.net/code/tint/download/${PV}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND=">=sys-libs/ncurses-5.4-r1:0"
diff --git a/games-puzzle/tiny-and-big/tiny-and-big-1.4.1.ebuild b/games-puzzle/tiny-and-big/tiny-and-big-1.4.1.ebuild
index e73c0193d97ad..aea1846bd3c1a 100644
--- a/games-puzzle/tiny-and-big/tiny-and-big-1.4.1.ebuild
+++ b/games-puzzle/tiny-and-big/tiny-and-big-1.4.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="tinyandbig_grandpasleftovers-retail-linux-${PV}_1370968537.tar.bz2"
 
 LICENSE="all-rights-reserved"
 SLOT="0"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE="bundled-libs"
 RESTRICT="bindist fetch bundled-libs? ( splitdebug )"
 
diff --git a/games-puzzle/tod/tod-0.ebuild b/games-puzzle/tod/tod-0.ebuild
index 17121aad8296a..eeb59a66aa221 100644
--- a/games-puzzle/tod/tod-0.ebuild
+++ b/games-puzzle/tod/tod-0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.pineight.com/pc/win${PN}.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="media-libs/allegro:0[X]"
diff --git a/games-puzzle/tong/tong-1.2.ebuild b/games-puzzle/tong/tong-1.2.ebuild
index 9df9c40eef39b..9ca7ebcb55bee 100644
--- a/games-puzzle/tong/tong-1.2.ebuild
+++ b/games-puzzle/tong/tong-1.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.nongnu.org/tong/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="media-libs/libsdl[sound,joystick,video]
diff --git a/games-puzzle/toppler/toppler-1.1.6.ebuild b/games-puzzle/toppler/toppler-1.1.6.ebuild
index 7b0f248370214..311b799d69ce2 100644
--- a/games-puzzle/toppler/toppler-1.1.6.ebuild
+++ b/games-puzzle/toppler/toppler-1.1.6.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/toppler/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="nls"
 
 RDEPEND="media-libs/libsdl[video]
diff --git a/games-puzzle/torrent/torrent-0.8.2.ebuild b/games-puzzle/torrent/torrent-0.8.2.ebuild
index ca645a95b5959..c6b01b28bac8b 100644
--- a/games-puzzle/torrent/torrent-0.8.2.ebuild
+++ b/games-puzzle/torrent/torrent-0.8.2.ebuild
@@ -8,7 +8,7 @@ DESCRIPTION="Match rising tiles to score as many points as possible before the t
 HOMEPAGE="http://www.shiftygames.com/torrent/torrent.html"
 SRC_URI="http://www.shiftygames.com/torrent/${P}.tar.gz"
 
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
diff --git a/games-puzzle/triptych-demo/triptych-demo-0.ebuild b/games-puzzle/triptych-demo/triptych-demo-0.ebuild
index 7f9c192fd0efe..fcf9d969a487f 100644
--- a/games-puzzle/triptych-demo/triptych-demo-0.ebuild
+++ b/games-puzzle/triptych-demo/triptych-demo-0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://s159260531.onlinehome.us/demos/triptych.tar.gz"
 
 LICENSE="all-rights-reserved"
 SLOT="0"
-KEYWORDS="-* x86"
+KEYWORDS="-* ~x86"
 IUSE=""
 RESTRICT="mirror bindist strip"
 
diff --git a/games-puzzle/twindistress/twindistress-1.1.0.ebuild b/games-puzzle/twindistress/twindistress-1.1.0.ebuild
index ef170aadb82ca..cdc2969857507 100644
--- a/games-puzzle/twindistress/twindistress-1.1.0.ebuild
+++ b/games-puzzle/twindistress/twindistress-1.1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/twind/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="media-libs/libsdl[video]
diff --git a/games-puzzle/wakkabox/wakkabox-1.1.0.ebuild b/games-puzzle/wakkabox/wakkabox-1.1.0.ebuild
index c3536395bdbf1..44b16ff42ace0 100644
--- a/games-puzzle/wakkabox/wakkabox-1.1.0.ebuild
+++ b/games-puzzle/wakkabox/wakkabox-1.1.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://kenn.frap.net/wakkabox/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="~x86"
 IUSE=""
 
 DEPEND=">=media-libs/libsdl-1.0.1"
diff --git a/games-puzzle/wizznic/wizznic-306.ebuild b/games-puzzle/wizznic/wizznic-306.ebuild
index fbf0c09b34500..13480d8831b59 100644
--- a/games-puzzle/wizznic/wizznic-306.ebuild
+++ b/games-puzzle/wizznic/wizznic-306.ebuild
@@ -10,7 +10,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-puzzle/wizznic/wizznic-369.ebuild b/games-puzzle/wizznic/wizznic-369.ebuild
index be178a8463369..1b4906e0f35c5 100644
--- a/games-puzzle/wizznic/wizznic-369.ebuild
+++ b/games-puzzle/wizznic/wizznic-369.ebuild
@@ -10,7 +10,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-puzzle/wmpuzzle/wmpuzzle-0.5.2.ebuild b/games-puzzle/wmpuzzle/wmpuzzle-0.5.2.ebuild
index ce0f7e1d992e0..9d414ea4500b6 100644
--- a/games-puzzle/wmpuzzle/wmpuzzle-0.5.2.ebuild
+++ b/games-puzzle/wmpuzzle/wmpuzzle-0.5.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://people.debian.org/~godisch/wmpuzzle/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/games-puzzle/world-of-goo-demo/world-of-goo-demo-1.41-r1.ebuild b/games-puzzle/world-of-goo-demo/world-of-goo-demo-1.41-r1.ebuild
index cabfdd297efe2..1d4185bd9b4ef 100644
--- a/games-puzzle/world-of-goo-demo/world-of-goo-demo-1.41-r1.ebuild
+++ b/games-puzzle/world-of-goo-demo/world-of-goo-demo-1.41-r1.ebuild
@@ -17,7 +17,7 @@ fi
 
 LICENSE="2dboy-EULA"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 RESTRICT="fetch strip"
 
diff --git a/games-puzzle/world-of-goo/world-of-goo-1.41-r1.ebuild b/games-puzzle/world-of-goo/world-of-goo-1.41-r1.ebuild
index cb73e6244b4d8..b941fe96f8d3c 100644
--- a/games-puzzle/world-of-goo/world-of-goo-1.41-r1.ebuild
+++ b/games-puzzle/world-of-goo/world-of-goo-1.41-r1.ebuild
@@ -17,7 +17,7 @@ fi
 
 LICENSE="2dboy-EULA"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 RESTRICT="fetch strip"
 
diff --git a/games-puzzle/xblockout/xblockout-1.1.6.ebuild b/games-puzzle/xblockout/xblockout-1.1.6.ebuild
index a2d04f528c414..bbb076fd9603a 100644
--- a/games-puzzle/xblockout/xblockout-1.1.6.ebuild
+++ b/games-puzzle/xblockout/xblockout-1.1.6.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://perso.univ-lyon1.fr/thierry.excoffier/XBL/xbl-${PV}.tar.gz"
 
 LICENSE="GPL-1"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/games-puzzle/xbomb/xbomb-2.2b.ebuild b/games-puzzle/xbomb/xbomb-2.2b.ebuild
index 9391ceb6455b2..488c4de4bd503 100644
--- a/games-puzzle/xbomb/xbomb-2.2b.ebuild
+++ b/games-puzzle/xbomb/xbomb-2.2b.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.gedanken.org.uk/software/xbomb/download/${P}.tgz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="x11-libs/libXaw"
diff --git a/games-puzzle/xlogical/xlogical-1.0.7.ebuild b/games-puzzle/xlogical/xlogical-1.0.7.ebuild
index b458c13e81eb6..ea6857857a7d9 100644
--- a/games-puzzle/xlogical/xlogical-1.0.7.ebuild
+++ b/games-puzzle/xlogical/xlogical-1.0.7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://changeling.ixionstudios.com/xlogical/downloads/${MY_P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="alt_gfx"
 
 RDEPEND="media-libs/libsdl[sound,video]
diff --git a/games-puzzle/xpired/xpired-1.22.ebuild b/games-puzzle/xpired/xpired-1.22.ebuild
index 2c1622689198d..8c27e559e7537 100644
--- a/games-puzzle/xpired/xpired-1.22.ebuild
+++ b/games-puzzle/xpired/xpired-1.22.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/xpired/${P}-linux_source.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="media-libs/sdl-gfx
diff --git a/games-puzzle/xtris/xtris-1.15.ebuild b/games-puzzle/xtris/xtris-1.15.ebuild
index 6d07bb9f00ff3..cec22aef2e451 100644
--- a/games-puzzle/xtris/xtris-1.15.ebuild
+++ b/games-puzzle/xtris/xtris-1.15.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.iagora.com/~espel/xtris/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="x11-libs/libX11"
diff --git a/games-puzzle/xwelltris/xwelltris-1.0.1.ebuild b/games-puzzle/xwelltris/xwelltris-1.0.1.ebuild
index 356cf57dc20d9..eb2e02cbf21de 100644
--- a/games-puzzle/xwelltris/xwelltris-1.0.1.ebuild
+++ b/games-puzzle/xwelltris/xwelltris-1.0.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://xnc.jinr.ru/xwelltris/src/${P}.src.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="media-libs/libsdl[video]
diff --git a/games-puzzle/xye/xye-0.12.2.ebuild b/games-puzzle/xye/xye-0.12.2.ebuild
index 826aa6152c33e..ed474f1232437 100644
--- a/games-puzzle/xye/xye-0.12.2.ebuild
+++ b/games-puzzle/xye/xye-0.12.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/xye/${P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/games-puzzle/zaz/zaz-1.0.0.ebuild b/games-puzzle/zaz/zaz-1.0.0.ebuild
index b5d985d25b3fb..002808730c0ea 100644
--- a/games-puzzle/zaz/zaz-1.0.0.ebuild
+++ b/games-puzzle/zaz/zaz-1.0.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/zaz/${P}.tar.bz2"
 
 LICENSE="GPL-3 GPL-3+ CC-BY-SA-3.0 OFL"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="nls"
 
 RDEPEND="virtual/opengl
diff --git a/games-roguelike/FTL/FTL-1.5.13.ebuild b/games-roguelike/FTL/FTL-1.5.13.ebuild
index 7af82e11915fe..ab2bc9ddb3464 100644
--- a/games-roguelike/FTL/FTL-1.5.13.ebuild
+++ b/games-roguelike/FTL/FTL-1.5.13.ebuild
@@ -11,7 +11,7 @@ SRC_URI="FTL.${PV}.tar.gz"
 
 LICENSE="all-rights-reserved Boost-1.0 free-noncomm MIT bundled-libs? ( FTL LGPL-2.1 ZLIB libpng )"
 SLOT="0"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE="bundled-libs"
 RESTRICT="fetch bindist splitdebug"
 
diff --git a/games-roguelike/adom/adom-1.1.1-r1.ebuild b/games-roguelike/adom/adom-1.1.1-r1.ebuild
index bf9c4ed20b12f..594a56c07ebe1 100644
--- a/games-roguelike/adom/adom-1.1.1-r1.ebuild
+++ b/games-roguelike/adom/adom-1.1.1-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.adom.de/adom/download/linux/${P//.}-elf.tar.gz"
 
 LICENSE="adom"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 RESTRICT="strip" #bug #137340
 QA_FLAGS_IGNORED="${GAMES_PREFIX_OPT:1}/bin/adom"
diff --git a/games-roguelike/angband/angband-4.0.4.ebuild b/games-roguelike/angband/angband-4.0.4.ebuild
index 4a599eafd08b1..b0ff1088a5304 100644
--- a/games-roguelike/angband/angband-4.0.4.ebuild
+++ b/games-roguelike/angband/angband-4.0.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://rephial.org/downloads/${MAJOR_PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="ncurses sdl +sound X"
 
 RDEPEND="X? ( x11-libs/libX11 )
diff --git a/games-roguelike/angband/angband-4.0.5.ebuild b/games-roguelike/angband/angband-4.0.5.ebuild
index 433844d7bfc8c..dca11093371c4 100644
--- a/games-roguelike/angband/angband-4.0.5.ebuild
+++ b/games-roguelike/angband/angband-4.0.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://rephial.org/downloads/${MAJOR_PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="ncurses sdl +sound X"
 
 RDEPEND="X? ( x11-libs/libX11 )
diff --git a/games-roguelike/crossfire-client/crossfire-client-1.71.0-r1.ebuild b/games-roguelike/crossfire-client/crossfire-client-1.71.0-r1.ebuild
index 092aa3bb809b7..3520a9a193dc7 100644
--- a/games-roguelike/crossfire-client/crossfire-client-1.71.0-r1.ebuild
+++ b/games-roguelike/crossfire-client/crossfire-client-1.71.0-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/crossfire/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="lua opengl sdl sound"
 
 RDEPEND="
diff --git a/games-roguelike/hengband/hengband-1.6.2-r1.ebuild b/games-roguelike/hengband/hengband-1.6.2-r1.ebuild
index 8a4ef4846c0ef..8559444d70751 100644
--- a/games-roguelike/hengband/hengband-1.6.2-r1.ebuild
+++ b/games-roguelike/hengband/hengband-1.6.2-r1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="http://hengband.sourceforge.jp/en/"
 SRC_URI="mirror://sourceforge.jp/hengband/10331/${P}.tar.bz2
 	mirror://gentoo/${P}-mispellings.patch.gz"
 
-KEYWORDS="x86 ~x86-fbsd"
+KEYWORDS="~x86 ~x86-fbsd"
 LICENSE="Moria"
 SLOT="0"
 IUSE="X l10n_ja"
diff --git a/games-roguelike/moria/moria-5.5.2.ebuild b/games-roguelike/moria/moria-5.5.2.ebuild
index d67bd7105e5bd..e135a2f7d915c 100644
--- a/games-roguelike/moria/moria-5.5.2.ebuild
+++ b/games-roguelike/moria/moria-5.5.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="ftp://ftp.greyhelm.com/pub/Games/Moria/source/um${PV}.tar.Z
 
 LICENSE="Moria"
 SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=sys-libs/ncurses-5:0"
diff --git a/games-roguelike/powder/powder-117.ebuild b/games-roguelike/powder/powder-117.ebuild
index 17e4215cd4f1b..f833b72180af8 100644
--- a/games-roguelike/powder/powder-117.ebuild
+++ b/games-roguelike/powder/powder-117.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.zincland.com/powder/release/${MY_P}.tar.gz"
 
 LICENSE="CC-Sampling-Plus-1.0"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="media-libs/libsdl[video]"
diff --git a/games-roguelike/rogue/rogue-5.4.4.ebuild b/games-roguelike/rogue/rogue-5.4.4.ebuild
index 502c98aec9522..d82f677b11046 100644
--- a/games-roguelike/rogue/rogue-5.4.4.ebuild
+++ b/games-roguelike/rogue/rogue-5.4.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://rogue.rogueforge.net/files/rogue5.4/${MY_P}-src.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="sys-libs/ncurses[-tinfo]"
diff --git a/games-roguelike/scourge/scourge-0.21.1-r1.ebuild b/games-roguelike/scourge/scourge-0.21.1-r1.ebuild
index b0b6aa2a6784c..6f23afbb41966 100644
--- a/games-roguelike/scourge/scourge-0.21.1-r1.ebuild
+++ b/games-roguelike/scourge/scourge-0.21.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.src.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
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 49e0cb857b5fe..b7128188ed4b5 100644
--- a/games-roguelike/stone-soup/stone-soup-0.16.2.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.16.2.ebuild
@@ -21,7 +21,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-roguelike/tome/tome-2.3.5.ebuild b/games-roguelike/tome/tome-2.3.5.ebuild
index 083f741eca37a..cdb3c58fefd56 100644
--- a/games-roguelike/tome/tome-2.3.5.ebuild
+++ b/games-roguelike/tome/tome-2.3.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://t-o-m-e.net/dl/src/tome-${MY_PV}-src.tar.bz2"
 
 LICENSE="Moria"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="X Xaw3d gtk sdl"
 
 RDEPEND=">=sys-libs/ncurses-5:0
diff --git a/games-roguelike/tomenet/tomenet-4.6.1a.ebuild b/games-roguelike/tomenet/tomenet-4.6.1a.ebuild
index 7225249f1f5bf..77c8c0b8e3f67 100644
--- a/games-roguelike/tomenet/tomenet-4.6.1a.ebuild
+++ b/games-roguelike/tomenet/tomenet-4.6.1a.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.tomenet.eu/downloads/${P}.tar.bz2"
 
 LICENSE="Moria"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="dedicated server +sound X"
 
 RDEPEND="sys-libs/ncurses:0
diff --git a/games-roguelike/wrogue/wrogue-0.8.0b.ebuild b/games-roguelike/wrogue/wrogue-0.8.0b.ebuild
index dbd31f479baad..72da1117d112c 100644
--- a/games-roguelike/wrogue/wrogue-0.8.0b.ebuild
+++ b/games-roguelike/wrogue/wrogue-0.8.0b.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${P}.zip"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="media-libs/libsdl[video]"
diff --git a/games-roguelike/zangband/zangband-2.7.4c.ebuild b/games-roguelike/zangband/zangband-2.7.4c.ebuild
index cb64681194449..dbc6bc7e6b935 100644
--- a/games-roguelike/zangband/zangband-2.7.4c.ebuild
+++ b/games-roguelike/zangband/zangband-2.7.4c.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.sunet.se/pub/games/Angband/Variant/ZAngband/${P}.tar.gz"
 
 LICENSE="Moria"
 SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 IUSE="tk"
 
 RDEPEND="
diff --git a/games-rpg/adonthell/adonthell-0.3.5-r1.ebuild b/games-rpg/adonthell/adonthell-0.3.5-r1.ebuild
index d535d9fddbd12..a313135ed51af 100644
--- a/games-rpg/adonthell/adonthell-0.3.5-r1.ebuild
+++ b/games-rpg/adonthell/adonthell-0.3.5-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://savannah.nongnu.org/download/${PN}/${PN}-src-${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc nls"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/games-rpg/arx-fatalis-data/arx-fatalis-data-1.21-r2.ebuild b/games-rpg/arx-fatalis-data/arx-fatalis-data-1.21-r2.ebuild
index 0920e723236e7..41f3d8d12f770 100644
--- a/games-rpg/arx-fatalis-data/arx-fatalis-data-1.21-r2.ebuild
+++ b/games-rpg/arx-fatalis-data/arx-fatalis-data-1.21-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="cdinstall? ( http://download.zenimax.com/arxfatalis/patches/1.21/ArxFat
 
 LICENSE="cdinstall? ( ArxFatalis-EULA-JoWooD ) gog? ( GOG-EULA )"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="gog"
 REQUIRED_USE="^^ ( cdinstall gog )"
 RESTRICT="binchecks mirror gog? ( fetch )"
diff --git a/games-rpg/arx-fatalis-data/arx-fatalis-data-1.21-r3.ebuild b/games-rpg/arx-fatalis-data/arx-fatalis-data-1.21-r3.ebuild
index f14ea22a6a394..dce1853fc98b1 100644
--- a/games-rpg/arx-fatalis-data/arx-fatalis-data-1.21-r3.ebuild
+++ b/games-rpg/arx-fatalis-data/arx-fatalis-data-1.21-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="cdinstall? ( http://download.zenimax.com/arxfatalis/patches/1.21/ArxFat
 
 LICENSE="cdinstall? ( ArxFatalis-EULA-JoWooD ) gog? ( GOG-EULA )"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="gog"
 REQUIRED_USE="^^ ( cdinstall gog )"
 RESTRICT="binchecks mirror gog? ( fetch )"
diff --git a/games-rpg/arx-fatalis-demo/arx-fatalis-demo-0.ebuild b/games-rpg/arx-fatalis-demo/arx-fatalis-demo-0.ebuild
index 3c62337cee7de..b3c07e2abd36a 100644
--- a/games-rpg/arx-fatalis-demo/arx-fatalis-demo-0.ebuild
+++ b/games-rpg/arx-fatalis-demo/arx-fatalis-demo-0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="arx_demo_english.zip"
 
 LICENSE="ArxFatalisDemo"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 RESTRICT="fetch"
 
diff --git a/games-rpg/arx-libertatis/arx-libertatis-1.1.2.ebuild b/games-rpg/arx-libertatis/arx-libertatis-1.1.2.ebuild
index 47176fee29ca9..a8df744d10295 100644
--- a/games-rpg/arx-libertatis/arx-libertatis-1.1.2.ebuild
+++ b/games-rpg/arx-libertatis/arx-libertatis-1.1.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/arx/${P}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="c++0x debug +unity-build crash-reporter static tools"
 
 COMMON_DEPEND="
diff --git a/games-rpg/avadon/avadon-1.0.4.ebuild b/games-rpg/avadon/avadon-1.0.4.ebuild
index aa2ea9313f40a..02402a4db16bf 100644
--- a/games-rpg/avadon/avadon-1.0.4.ebuild
+++ b/games-rpg/avadon/avadon-1.0.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="avadon-black-fortress_${PV}_all.run"
 
 LICENSE="all-rights-reserved"
 SLOT="0"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE=""
 RESTRICT="fetch bindist"
 
diff --git a/games-rpg/bass/bass-1.2-r1.ebuild b/games-rpg/bass/bass-1.2-r1.ebuild
index 0b7cc6e16c9e2..ead1fc387cd8f 100644
--- a/games-rpg/bass/bass-1.2-r1.ebuild
+++ b/games-rpg/bass/bass-1.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/scummvm/bass-cd-${PV}.zip
 
 LICENSE="bass"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=games-engines/scummvm-0.5.0"
diff --git a/games-rpg/bastion/bastion-20120620-r1.ebuild b/games-rpg/bastion/bastion-20120620-r1.ebuild
index 4e8eb6a973e5e..d7f001068b71d 100644
--- a/games-rpg/bastion/bastion-20120620-r1.ebuild
+++ b/games-rpg/bastion/bastion-20120620-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="Bastion-HIB-${TIMESTAMP}.sh"
 
 LICENSE="all-rights-reserved"
 SLOT="0"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE=""
 RESTRICT="bindist fetch splitdebug"
 
diff --git a/games-rpg/daimonin-client/daimonin-client-0.10.5.ebuild b/games-rpg/daimonin-client/daimonin-client-0.10.5.ebuild
index 70df84a875156..484da8219d569 100644
--- a/games-rpg/daimonin-client/daimonin-client-0.10.5.ebuild
+++ b/games-rpg/daimonin-client/daimonin-client-0.10.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://daimonin.svn.sourceforge.net/viewvc/daimonin/main/client/?view=t
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="music debug"
 
 RDEPEND="media-libs/libsdl[sound,video]
diff --git a/games-rpg/dear-esther/dear-esther-20130608.ebuild b/games-rpg/dear-esther/dear-esther-20130608.ebuild
index 2f04d25cf5037..a7d2c696ccffe 100644
--- a/games-rpg/dear-esther/dear-esther-20130608.ebuild
+++ b/games-rpg/dear-esther/dear-esther-20130608.ebuild
@@ -13,7 +13,7 @@ SRC_URI="dearesther-linux-${TIMESTAMP}-bin"
 
 LICENSE="all-rights-reserved"
 SLOT="0"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE=""
 RESTRICT="bindist fetch splitdebug"
 
diff --git a/games-rpg/draci-historie/draci-historie-2012.ebuild b/games-rpg/draci-historie/draci-historie-2012.ebuild
index e2795d58bf68a..4b04995622b43 100644
--- a/games-rpg/draci-historie/draci-historie-2012.ebuild
+++ b/games-rpg/draci-historie/draci-historie-2012.ebuild
@@ -15,7 +15,7 @@ SRC_URI="l10n_cs? ( ${BASE_URL}-cz-${PV}.zip )
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="l10n_cs l10n_de l10n_en l10n_pl"
 
 RDEPEND=">=games-engines/scummvm-1.1"
diff --git a/games-rpg/dragonhunt/dragonhunt-3.56-r1.ebuild b/games-rpg/dragonhunt/dragonhunt-3.56-r1.ebuild
index 0b72e9a1340e7..a75bc878dfd01 100644
--- a/games-rpg/dragonhunt/dragonhunt-3.56-r1.ebuild
+++ b/games-rpg/dragonhunt/dragonhunt-3.56-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://emhsoft.com/dh/${MY_P}.tar.gz"
 
 LICENSE="GPL-2 CC-SA-1.0"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/games-rpg/drascula/drascula-1.0-r2.ebuild b/games-rpg/drascula/drascula-1.0-r2.ebuild
index fe3c8eacc995b..e8fcaed673bc7 100644
--- a/games-rpg/drascula/drascula-1.0-r2.ebuild
+++ b/games-rpg/drascula/drascula-1.0-r2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="mirror://sourceforge/scummvm/drascula-${PV}.zip
 
 LICENSE="drascula"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="l10n_es l10n_de l10n_fr l10n_it +sound"
 RESTRICT="mirror"
 
diff --git a/games-rpg/dreamweb/dreamweb-1.1.ebuild b/games-rpg/dreamweb/dreamweb-1.1.ebuild
index 58a817f7980cd..60c9c8118bf07 100644
--- a/games-rpg/dreamweb/dreamweb-1.1.ebuild
+++ b/games-rpg/dreamweb/dreamweb-1.1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="doc? ( mirror://sourceforge/scummvm/${PN}-manuals-en-highres.zip )
 
 LICENSE="Dreamweb"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc l10n_de l10n_en l10n_en-GB l10n_es l10n_fr l10n_it"
 
 RDEPEND=">=games-engines/scummvm-1.7[flac]"
diff --git a/games-rpg/egoboo/egoboo-2.8.1.ebuild b/games-rpg/egoboo/egoboo-2.8.1.ebuild
index c5e80cc1a359e..e2fef4314146f 100644
--- a/games-rpg/egoboo/egoboo-2.8.1.ebuild
+++ b/games-rpg/egoboo/egoboo-2.8.1.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="virtual/opengl
diff --git a/games-rpg/eschalon-book-1-demo/eschalon-book-1-demo-106.ebuild b/games-rpg/eschalon-book-1-demo/eschalon-book-1-demo-106.ebuild
index ba00e2e78151c..cd1c283174f41 100644
--- a/games-rpg/eschalon-book-1-demo/eschalon-book-1-demo-106.ebuild
+++ b/games-rpg/eschalon-book-1-demo/eschalon-book-1-demo-106.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dev.gentoo.org/~calchan/distfiles/${P}.tar.gz"
 
 LICENSE="eschalon-book-1-demo"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 RESTRICT="strip"
 QA_PREBUILT="${GAMES_PREFIX_OPT:1}/${PN}/Eschalon Book I Demo"
diff --git a/games-rpg/freedink-data/freedink-data-1.08.20140901.ebuild b/games-rpg/freedink-data/freedink-data-1.08.20140901.ebuild
index 5c32f121e4b53..4ba62c136c218 100644
--- a/games-rpg/freedink-data/freedink-data-1.08.20140901.ebuild
+++ b/games-rpg/freedink-data/freedink-data-1.08.20140901.ebuild
@@ -19,7 +19,7 @@ LICENSE="ZLIB
 	OAL-1.0.1
 	public-domain"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 src_install() {
diff --git a/games-rpg/freedink/freedink-108.4.ebuild b/games-rpg/freedink/freedink-108.4.ebuild
index f626f37d95ab4..f9fb99c364f53 100644
--- a/games-rpg/freedink/freedink-108.4.ebuild
+++ b/games-rpg/freedink/freedink-108.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/freedink/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/games-rpg/freedroid/freedroid-1.0.2.ebuild b/games-rpg/freedroid/freedroid-1.0.2.ebuild
index 689d07965419f..47052c9ec8c9e 100644
--- a/games-rpg/freedroid/freedroid-1.0.2.ebuild
+++ b/games-rpg/freedroid/freedroid-1.0.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/freedroid/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="media-libs/libsdl[joystick,sound,video]
diff --git a/games-rpg/freedroidrpg/freedroidrpg-0.16.ebuild b/games-rpg/freedroidrpg/freedroidrpg-0.16.ebuild
index 5d4b7de19ba24..a3b8bceea46e5 100644
--- a/games-rpg/freedroidrpg/freedroidrpg-0.16.ebuild
+++ b/games-rpg/freedroidrpg/freedroidrpg-0.16.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.osuosl.org/pub/freedroid/freedroidRPG-${PV}//freedroidRPG-${P
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="nls opengl sound"
 
 RDEPEND="media-libs/libsdl[opengl?,sound?,video]
diff --git a/games-rpg/grimrock/grimrock-20130515.ebuild b/games-rpg/grimrock/grimrock-20130515.ebuild
index 564e6f04474c0..ad48b03d9a654 100644
--- a/games-rpg/grimrock/grimrock-20130515.ebuild
+++ b/games-rpg/grimrock/grimrock-20130515.ebuild
@@ -12,7 +12,7 @@ SRC_URI="LegendOfGrimrock-Linux-${TIMESTAMP}.sh"
 
 SLOT="0"
 LICENSE="all-rights-reserved"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE="bundled-libs"
 RESTRICT="fetch bindist splitdebug"
 
diff --git a/games-rpg/gwiz/gwiz-0.8.ebuild b/games-rpg/gwiz/gwiz-0.8.ebuild
index ddd60d95f8661..6f519611b7a58 100644
--- a/games-rpg/gwiz/gwiz-0.8.ebuild
+++ b/games-rpg/gwiz/gwiz-0.8.ebuild
@@ -8,7 +8,7 @@ DESCRIPTION="clone of old-school Wizardry(tm) games by SirTech"
 HOMEPAGE="http://icculus.org/gwiz/"
 SRC_URI="http://icculus.org/gwiz/${P}.tar.bz2"
 
-KEYWORDS="~alpha amd64 x86"
+KEYWORDS="~alpha ~amd64 ~x86"
 SLOT="0"
 LICENSE="GPL-2"
 IUSE=""
diff --git a/games-rpg/kqlives/kqlives-0.99.ebuild b/games-rpg/kqlives/kqlives-0.99.ebuild
index 63bd756be5c57..d5f9a5095292c 100644
--- a/games-rpg/kqlives/kqlives-0.99.ebuild
+++ b/games-rpg/kqlives/kqlives-0.99.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="cheats nls"
 
 RDEPEND=">=x11-libs/gtk+-2.8:2
diff --git a/games-rpg/lure/lure-1.1.ebuild b/games-rpg/lure/lure-1.1.ebuild
index d44387746e5f4..4c243f2e4ed60 100644
--- a/games-rpg/lure/lure-1.1.ebuild
+++ b/games-rpg/lure/lure-1.1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="lure"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 LANGS_IUSE="linguas_en linguas_es linguas_de linguas_fr linguas_it"
 IUSE=${LANGS_IUSE}
 RESTRICT="mirror"
diff --git a/games-rpg/manaplus/manaplus-1.7.10.14.ebuild b/games-rpg/manaplus/manaplus-1.7.10.14.ebuild
index 26dc7ca27dd25..2d5897b5d6f16 100644
--- a/games-rpg/manaplus/manaplus-1.7.10.14.ebuild
+++ b/games-rpg/manaplus/manaplus-1.7.10.14.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/ManaPlus/ManaPlus.git"
 else
 	SRC_URI="http://download.evolonline.org/manaplus/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 x86"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="GPL-2+"
diff --git a/games-rpg/openglad/openglad-0.98.ebuild b/games-rpg/openglad/openglad-0.98.ebuild
index 2501658088af5..78be6f583557c 100644
--- a/games-rpg/openglad/openglad-0.98.ebuild
+++ b/games-rpg/openglad/openglad-0.98.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/snowstorm/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="media-libs/sdl-mixer
diff --git a/games-rpg/pcgen/pcgen-6.04.01.ebuild b/games-rpg/pcgen/pcgen-6.04.01.ebuild
index 3bd6d680ec22a..5397e7f9deaf5 100644
--- a/games-rpg/pcgen/pcgen-6.04.01.ebuild
+++ b/games-rpg/pcgen/pcgen-6.04.01.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/pcgen/${P}-full.zip"
 
 LICENSE="LGPL-2.1 OGL-1.0a"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=virtual/jre-1.6"
diff --git a/games-rpg/penumbra-collection/penumbra-collection-1.1.ebuild b/games-rpg/penumbra-collection/penumbra-collection-1.1.ebuild
index 642d9b4d44ed6..d6c6f3aef0a0e 100644
--- a/games-rpg/penumbra-collection/penumbra-collection-1.1.ebuild
+++ b/games-rpg/penumbra-collection/penumbra-collection-1.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="${MY_PN}-${PV}.sh"
 
 LICENSE="PENUMBRA-COLLECTION"
 SLOT="0"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE=""
 RESTRICT="fetch"
 
diff --git a/games-rpg/queen/queen-1.ebuild b/games-rpg/queen/queen-1.ebuild
index 0823cf56a4ea5..2452604f87fd8 100644
--- a/games-rpg/queen/queen-1.ebuild
+++ b/games-rpg/queen/queen-1.ebuild
@@ -36,7 +36,7 @@ SRC_URI="
 
 LICENSE="queen"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="mp3 l10n_de +l10n_en l10n_fr l10n_he l10n_it"
 REQUIRED_USE="|| ( l10n_de l10n_en l10n_fr l10n_he l10n_it )"
 
diff --git a/games-rpg/soltys/soltys-1.0-r1.ebuild b/games-rpg/soltys/soltys-1.0-r1.ebuild
index eca84feee1a04..1a8baca43ff0a 100644
--- a/games-rpg/soltys/soltys-1.0-r1.ebuild
+++ b/games-rpg/soltys/soltys-1.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="l10n_en? ( mirror://sourceforge/scummvm/${PN}-en-v${PV}.zip )
 
 LICENSE="Soltys"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="l10n_en l10n_es l10n_pl"
 
 RDEPEND=">=games-engines/scummvm-1.5"
diff --git a/games-rpg/sumwars/sumwars-0.5.8.ebuild b/games-rpg/sumwars/sumwars-0.5.8.ebuild
index 562f16e5fe305..1dc20aae9a65c 100644
--- a/games-rpg/sumwars/sumwars-0.5.8.ebuild
+++ b/games-rpg/sumwars/sumwars-0.5.8.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/sumwars/${P//_/-}-src.tar.bz2"
 
 LICENSE="GPL-3 CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+tools debug"
 
 LANGS="de en it pl pt ru uk"
diff --git a/games-rpg/to-the-moon/to-the-moon-0.ebuild b/games-rpg/to-the-moon/to-the-moon-0.ebuild
index 2a2197ed25e66..1dd770bbee388 100644
--- a/games-rpg/to-the-moon/to-the-moon-0.ebuild
+++ b/games-rpg/to-the-moon/to-the-moon-0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="${MY_PN}_linux_1389114090.sh"
 
 LICENSE="all-rights-reserved bundled-libs? ( LGPL-2 LGPL-2.1 ZLIB )"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="bundled-libs"
 RESTRICT="fetch bindist splitdebug"
 
diff --git a/games-rpg/twclone/twclone-0.14.ebuild b/games-rpg/twclone/twclone-0.14.ebuild
index 36b7d7a1f33c0..93d301e66c4eb 100644
--- a/games-rpg/twclone/twclone-0.14.ebuild
+++ b/games-rpg/twclone/twclone-0.14.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/twclone/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 S=${WORKDIR}/${MY_P}
diff --git a/games-rpg/vendetta-online-bin/vendetta-online-bin-1.8.296.ebuild b/games-rpg/vendetta-online-bin/vendetta-online-bin-1.8.296.ebuild
index a8039ca9257a4..ccee718020a96 100644
--- a/games-rpg/vendetta-online-bin/vendetta-online-bin-1.8.296.ebuild
+++ b/games-rpg/vendetta-online-bin/vendetta-online-bin-1.8.296.ebuild
@@ -17,7 +17,7 @@ SRC_URI="amd64? (
 
 LICENSE="guild"
 SLOT="0"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE=""
 RESTRICT="mirror strip"
 
diff --git a/games-rpg/wastesedge/wastesedge-0.3.5.ebuild b/games-rpg/wastesedge/wastesedge-0.3.5.ebuild
index 03434dcc8f9e7..59c0608b60c34 100644
--- a/games-rpg/wastesedge/wastesedge-0.3.5.ebuild
+++ b/games-rpg/wastesedge/wastesedge-0.3.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://savannah.nongnu.org/download/adonthell/${PN}-src-${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="nls"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="userpriv"
diff --git a/games-rpg/xu4/xu4-0.9.ebuild b/games-rpg/xu4/xu4-0.9.ebuild
index 3822179cfa590..23b0ee38d53ef 100644
--- a/games-rpg/xu4/xu4-0.9.ebuild
+++ b/games-rpg/xu4/xu4-0.9.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/xu4/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-libs/libxml2
diff --git a/games-rpg/zsdx/zsdx-1.9.0.ebuild b/games-rpg/zsdx/zsdx-1.9.0.ebuild
index 03d8adc566db2..f77a8c06fcca1 100644
--- a/games-rpg/zsdx/zsdx-1.9.0.ebuild
+++ b/games-rpg/zsdx/zsdx-1.9.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.zelda-solarus.com/downloads/${PN}/${P}.tar.gz"
 
 LICENSE="all-rights-reserved CC-BY-SA-3.0 GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 RESTRICT="mirror"
 
diff --git a/games-rpg/zsxd/zsxd-1.9.0.ebuild b/games-rpg/zsxd/zsxd-1.9.0.ebuild
index cef44d509ffa5..b62e432d6eb3d 100644
--- a/games-rpg/zsxd/zsxd-1.9.0.ebuild
+++ b/games-rpg/zsxd/zsxd-1.9.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.zelda-solarus.com/downloads/${PN}/${P}.tar.gz"
 
 LICENSE="all-rights-reserved CC-BY-SA-3.0 GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 RESTRICT="mirror bindist"
 
diff --git a/games-server/bf1942-lnxded/bf1942-lnxded-1.61.ebuild b/games-server/bf1942-lnxded/bf1942-lnxded-1.61.ebuild
index 5c6279f3d6748..0414a6ed94887 100644
--- a/games-server/bf1942-lnxded/bf1942-lnxded-1.61.ebuild
+++ b/games-server/bf1942-lnxded/bf1942-lnxded-1.61.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://ftp.games.skynet.be/pub/misc/${PN/-/_}-1.6-rc2.run
 
 LICENSE="bf1942-lnxded"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="~x86"
 IUSE=""
 RESTRICT="mirror bindist strip"
 
diff --git a/games-server/crossfire-server/crossfire-server-1.70.0.ebuild b/games-server/crossfire-server/crossfire-server-1.70.0.ebuild
index d546578ef5204..333b59465afe6 100644
--- a/games-server/crossfire-server/crossfire-server-1.70.0.ebuild
+++ b/games-server/crossfire-server/crossfire-server-1.70.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/crossfire/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="X"
 RESTRICT="test"
 
diff --git a/games-server/crossfire-server/crossfire-server-1.71.0.ebuild b/games-server/crossfire-server/crossfire-server-1.71.0.ebuild
index 9e5bb4601b808..ef6c64bacda76 100644
--- a/games-server/crossfire-server/crossfire-server-1.71.0.ebuild
+++ b/games-server/crossfire-server/crossfire-server-1.71.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/crossfire/${PN}/${PV}/${MY_P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="X"
 RESTRICT="test"
 
diff --git a/games-server/cyphesis/cyphesis-0.6.2.ebuild b/games-server/cyphesis/cyphesis-0.6.2.ebuild
index b4f87c6790b8f..a4b65f8e29698 100644
--- a/games-server/cyphesis/cyphesis-0.6.2.ebuild
+++ b/games-server/cyphesis/cyphesis-0.6.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/worldforge/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="test"
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 04c81fb580a34..e5057dbcc911a 100644
--- a/games-server/mednafen-server/mednafen-server-0.5.2.ebuild
+++ b/games-server/mednafen-server/mednafen-server-0.5.2.ebuild
@@ -10,7 +10,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-server/monopd/monopd-0.10.2.ebuild b/games-server/monopd/monopd-0.10.2.ebuild
index ac01e57a358d4..52b5d85872d2b 100644
--- a/games-server/monopd/monopd-0.10.2.ebuild
+++ b/games-server/monopd/monopd-0.10.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://download.tuxfamily.org/gtkatlantic/monopd/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="systemd"
 
 RDEPEND="systemd? ( sys-apps/systemd )"
diff --git a/games-server/nwn-ded/nwn-ded-1.69.ebuild b/games-server/nwn-ded/nwn-ded-1.69.ebuild
index ae6785044a9b2..98c5d1e245512 100644
--- a/games-server/nwn-ded/nwn-ded-1.69.ebuild
+++ b/games-server/nwn-ded/nwn-ded-1.69.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://files.bioware.com/neverwinternights/updates/windows/server/NWNDe
 
 LICENSE="NWN-EULA"
 SLOT="0"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE="${LANGUAGES}"
 RESTRICT="mirror strip"
 
diff --git a/games-server/pvpgn/pvpgn-1.8.5-r1.ebuild b/games-server/pvpgn/pvpgn-1.8.5-r1.ebuild
index c89556047e783..2ec880c5c21c6 100644
--- a/games-server/pvpgn/pvpgn-1.8.5-r1.ebuild
+++ b/games-server/pvpgn/pvpgn-1.8.5-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/pvpgn.berlios/${PN}-${PV/_/}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="mysql postgres"
 
 DEPEND="mysql? ( virtual/mysql )
diff --git a/games-server/ut2003-ded/ut2003-ded-2225-r2.ebuild b/games-server/ut2003-ded/ut2003-ded-2225-r2.ebuild
index e7a3b70feba45..6ed8f2d43974a 100644
--- a/games-server/ut2003-ded/ut2003-ded-2225-r2.ebuild
+++ b/games-server/ut2003-ded/ut2003-ded-2225-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.agaland.it/misc/ut2003/ut2003-lnxded-${PV}.tar.bz2
 
 LICENSE="ut2003"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 RESTRICT="mirror strip"
 IUSE=""
 
diff --git a/games-server/ut2004-ded/ut2004-ded-3369.3-r1.ebuild b/games-server/ut2004-ded/ut2004-ded-3369.3-r1.ebuild
index ebb5c1253b601..218fe1616d96f 100644
--- a/games-server/ut2004-ded/ut2004-ded-3369.3-r1.ebuild
+++ b/games-server/ut2004-ded/ut2004-ded-3369.3-r1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="mirror://3dgamers/unrealtourn2k4/${BONUSPACK_P}
 
 LICENSE="ut2003"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 RESTRICT="mirror strip"
 
diff --git a/games-simulation/bcs-demo/bcs-demo-1.3.ebuild b/games-simulation/bcs-demo/bcs-demo-1.3.ebuild
index 572f724956280..a32348e402f8c 100644
--- a/games-simulation/bcs-demo/bcs-demo-1.3.ebuild
+++ b/games-simulation/bcs-demo/bcs-demo-1.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ggdev-1.homelan.com/bcs/bcsdemo_v${PV/./_}.sh.bin
 
 LICENSE="BCS"
 SLOT="0"
-KEYWORDS="-* ~amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE=""
 RESTRICT="strip"
 
diff --git a/games-simulation/cannonsmash/cannonsmash-0.6.6.ebuild b/games-simulation/cannonsmash/cannonsmash-0.6.6.ebuild
index 689ff819dff46..35d4eb916f4fe 100644
--- a/games-simulation/cannonsmash/cannonsmash-0.6.6.ebuild
+++ b/games-simulation/cannonsmash/cannonsmash-0.6.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/csmash-${PV}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="vorbis nls"
 
 RDEPEND="virtual/opengl
diff --git a/games-simulation/crashtest/crashtest-1.1.ebuild b/games-simulation/crashtest/crashtest-1.1.ebuild
index d8dc29b604c53..b7e62943228e4 100644
--- a/games-simulation/crashtest/crashtest-1.1.ebuild
+++ b/games-simulation/crashtest/crashtest-1.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.stolk.org/crashtest/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/games-simulation/dangerdeep/dangerdeep-0.3.0.ebuild b/games-simulation/dangerdeep/dangerdeep-0.3.0.ebuild
index 8534a69307142..44122c119cf3c 100644
--- a/games-simulation/dangerdeep/dangerdeep-0.3.0.ebuild
+++ b/games-simulation/dangerdeep/dangerdeep-0.3.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 
 LICENSE="GPL-2 CC-BY-NC-ND-2.0"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="cpu_flags_x86_sse debug"
 
 RDEPEND="virtual/opengl
diff --git a/games-simulation/flightgear-data/flightgear-data-2016.4.4.ebuild b/games-simulation/flightgear-data/flightgear-data-2016.4.4.ebuild
index b62a3ff22450e..f835ef53253b4 100644
--- a/games-simulation/flightgear-data/flightgear-data-2016.4.4.ebuild
+++ b/games-simulation/flightgear-data/flightgear-data-2016.4.4.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/flightgear/FlightGear-${PV}-data.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 # data files split to separate package since 2.10.0
diff --git a/games-simulation/flightgear/flightgear-2016.4.4.ebuild b/games-simulation/flightgear/flightgear-2016.4.4.ebuild
index 27b7a3f6366b0..b469de2eab7c1 100644
--- a/games-simulation/flightgear/flightgear-2016.4.4.ebuild
+++ b/games-simulation/flightgear/flightgear-2016.4.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/flightgear/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="dbus debug examples qt5 test +udev +utils vim-syntax"
 
 # zlib is some strange auto-dep from simgear
diff --git a/games-simulation/gl117/gl117-1.3.2.ebuild b/games-simulation/gl117/gl117-1.3.2.ebuild
index 6225adb3ebfa0..e5be14559c19f 100644
--- a/games-simulation/gl117/gl117-1.3.2.ebuild
+++ b/games-simulation/gl117/gl117-1.3.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/gl-117/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="media-libs/libsdl[sound,joystick,opengl,video]
diff --git a/games-simulation/lincity-ng/lincity-ng-2.0.ebuild b/games-simulation/lincity-ng/lincity-ng-2.0.ebuild
index 23fc4c1cd3e5b..5da88e889d4c3 100644
--- a/games-simulation/lincity-ng/lincity-ng-2.0.ebuild
+++ b/games-simulation/lincity-ng/lincity-ng-2.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/lincity-ng.berlios/${P}.tar.bz2"
 
 LICENSE="GPL-2 BitstreamVera"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 RESTRICT=mirror
 
diff --git a/games-simulation/lincity/lincity-1.13.1.ebuild b/games-simulation/lincity/lincity-1.13.1.ebuild
index 96430e5e40d92..1c53af6fe7401 100644
--- a/games-simulation/lincity/lincity-1.13.1.ebuild
+++ b/games-simulation/lincity/lincity-1.13.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/lincity/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="nls"
 
 # dep fix (bug #82318)
diff --git a/games-simulation/micropolis/micropolis-1.0.ebuild b/games-simulation/micropolis/micropolis-1.0.ebuild
index 8bbcfaa349d1c..f5b1a4e42d2ea 100644
--- a/games-simulation/micropolis/micropolis-1.0.ebuild
+++ b/games-simulation/micropolis/micropolis-1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.donhopkins.com/home/micropolis/${PN}-activity-source.tgz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/games-simulation/openttd/openttd-1.7.1-r1.ebuild b/games-simulation/openttd/openttd-1.7.1-r1.ebuild
index db191da82343c..f24302009a47d 100644
--- a/games-simulation/openttd/openttd-1.7.1-r1.ebuild
+++ b/games-simulation/openttd/openttd-1.7.1-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://binaries.openttd.org/releases/${PV}/${P}-source.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="~amd64 ~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-simulation/pmars-sdl/pmars-sdl-0.9.2e.ebuild b/games-simulation/pmars-sdl/pmars-sdl-0.9.2e.ebuild
index 95d0aced75e8f..2df3782e39159 100644
--- a/games-simulation/pmars-sdl/pmars-sdl-0.9.2e.ebuild
+++ b/games-simulation/pmars-sdl/pmars-sdl-0.9.2e.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://corewar.co.uk/pihlaja/pmars-sdl/${MY_P}.tar.gz"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="sdl X"
 
 DEPEND="sdl? ( x11-libs/libX11 media-libs/libsdl[video] )
diff --git a/games-simulation/searchandrescue/searchandrescue-1.5.0.ebuild b/games-simulation/searchandrescue/searchandrescue-1.5.0.ebuild
index 3a3bce9c7d636..44f8cd19d0e61 100644
--- a/games-simulation/searchandrescue/searchandrescue-1.5.0.ebuild
+++ b/games-simulation/searchandrescue/searchandrescue-1.5.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/searchandrescue/${MY_PN}-${PV}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="x11-libs/libXxf86vm
diff --git a/games-simulation/senken/senken-0.3.0.ebuild b/games-simulation/senken/senken-0.3.0.ebuild
index bea48ae52864c..37203deab1ec4 100644
--- a/games-simulation/senken/senken-0.3.0.ebuild
+++ b/games-simulation/senken/senken-0.3.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="nls"
 
 RDEPEND="x11-libs/gtk+:2
diff --git a/games-simulation/simutrans/simutrans-0.120.0.1.ebuild b/games-simulation/simutrans/simutrans-0.120.0.1.ebuild
index 2ab54c24a91c7..f0f43bffbd70a 100644
--- a/games-simulation/simutrans/simutrans-0.120.0.1.ebuild
+++ b/games-simulation/simutrans/simutrans-0.120.0.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/simutrans/simutrans-src-${MY_PV}.zip
 
 LICENSE="Artistic"
 SLOT="0"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE=""
 
 RDEPEND="media-libs/libsdl[sound,video]
diff --git a/games-simulation/singularity/singularity-0.30c-r1.ebuild b/games-simulation/singularity/singularity-0.30c-r1.ebuild
index d680a1d5674a1..74baaef276265 100644
--- a/games-simulation/singularity/singularity-0.30c-r1.ebuild
+++ b/games-simulation/singularity/singularity-0.30c-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://endgame-singularity.googlecode.com/files/${P}-src.tar.gz
 
 LICENSE="GPL-2 CC-BY-SA-2.5"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+music"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/games-sports/billardgl/billardgl-1.75-r1.ebuild b/games-sports/billardgl/billardgl-1.75-r1.ebuild
index 97221d90724d9..f81de86a60846 100644
--- a/games-sports/billardgl/billardgl-1.75-r1.ebuild
+++ b/games-sports/billardgl/billardgl-1.75-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/BillardGL-${PV}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="x11-libs/libXi
diff --git a/games-sports/bygfoot/bygfoot-2.3.2.ebuild b/games-sports/bygfoot/bygfoot-2.3.2.ebuild
index 8ab9549209670..22516f584250b 100644
--- a/games-sports/bygfoot/bygfoot-2.3.2.ebuild
+++ b/games-sports/bygfoot/bygfoot-2.3.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="x11-libs/gtk+:2
diff --git a/games-sports/dustrac/dustrac-1.11.0.ebuild b/games-sports/dustrac/dustrac-1.11.0.ebuild
index e8d008cc7d05a..323788bc1e694 100644
--- a/games-sports/dustrac/dustrac-1.11.0.ebuild
+++ b/games-sports/dustrac/dustrac-1.11.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/dustrac/${P}.tar.gz"
 
 LICENSE="GPL-3+ CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/games-sports/foobillard/foobillard-3.0a.ebuild b/games-sports/foobillard/foobillard-3.0a.ebuild
index b3da787d3868b..e68d118c80275 100644
--- a/games-sports/foobillard/foobillard-3.0a.ebuild
+++ b/games-sports/foobillard/foobillard-3.0a.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 IUSE="sdl video_cards_nvidia"
 
 DEPEND="x11-libs/libXaw
diff --git a/games-sports/gracer/gracer-0.1.5.ebuild b/games-sports/gracer/gracer-0.1.5.ebuild
index cc64aa4d108e7..1f891301fa754 100644
--- a/games-sports/gracer/gracer-0.1.5.ebuild
+++ b/games-sports/gracer/gracer-0.1.5.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/gracer/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="joystick"
 
 DEPEND="
diff --git a/games-sports/miniracer/miniracer-1.04.ebuild b/games-sports/miniracer/miniracer-1.04.ebuild
index d7e2bf28549ee..968191ca946a3 100644
--- a/games-sports/miniracer/miniracer-1.04.ebuild
+++ b/games-sports/miniracer/miniracer-1.04.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="~x86"
 IUSE=""
 
 RDEPEND="virtual/opengl
diff --git a/games-sports/ski/ski-6.8.ebuild b/games-sports/ski/ski-6.8.ebuild
index 40f73a07266c5..0de22227d5a5f 100644
--- a/games-sports/ski/ski-6.8.ebuild
+++ b/games-sports/ski/ski-6.8.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.catb.org/~esr/ski/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/games-sports/ski/ski-6.9.ebuild b/games-sports/ski/ski-6.9.ebuild
index 40f73a07266c5..0de22227d5a5f 100644
--- a/games-sports/ski/ski-6.9.ebuild
+++ b/games-sports/ski/ski-6.9.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.catb.org/~esr/ski/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/games-sports/speed-dreams/speed-dreams-1.4.0.ebuild b/games-sports/speed-dreams/speed-dreams-1.4.0.ebuild
index ae1445e44a4b7..4b60f6cb08e5f 100644
--- a/games-sports/speed-dreams/speed-dreams-1.4.0.ebuild
+++ b/games-sports/speed-dreams/speed-dreams-1.4.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/speed-dreams/${P}-r2307-src.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="xrandr"
 
 RDEPEND="virtual/opengl
diff --git a/games-sports/stormbaancoureur/stormbaancoureur-2.1.6.ebuild b/games-sports/stormbaancoureur/stormbaancoureur-2.1.6.ebuild
index 48dc4c8b0c871..6bb608abfe8aa 100644
--- a/games-sports/stormbaancoureur/stormbaancoureur-2.1.6.ebuild
+++ b/games-sports/stormbaancoureur/stormbaancoureur-2.1.6.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.stolk.org/stormbaancoureur/download/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="virtual/opengl
diff --git a/games-sports/torcs/torcs-1.3.6.ebuild b/games-sports/torcs/torcs-1.3.6.ebuild
index c371698335551..76fef73dc271b 100644
--- a/games-sports/torcs/torcs-1.3.6.ebuild
+++ b/games-sports/torcs/torcs-1.3.6.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/torcs/${P}.tar.bz2"
 
 LICENSE="GPL-2 FreeArt"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="media-libs/freealut
diff --git a/games-sports/trigger/trigger-0.6.1-r1.ebuild b/games-sports/trigger/trigger-0.6.1-r1.ebuild
index 08b3404df78b5..0b60839199719 100644
--- a/games-sports/trigger/trigger-0.6.1-r1.ebuild
+++ b/games-sports/trigger/trigger-0.6.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/games-sports/trophy/trophy-2.0.3.ebuild b/games-sports/trophy/trophy-2.0.3.ebuild
index ac5132cd97428..1840e486d7f17 100644
--- a/games-sports/trophy/trophy-2.0.3.ebuild
+++ b/games-sports/trophy/trophy-2.0.3.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=""
 
 RDEPEND="dev-games/clanlib:0.8[opengl]"
diff --git a/games-sports/ultimatestunts/ultimatestunts-0.7.7.ebuild b/games-sports/ultimatestunts/ultimatestunts-0.7.7.ebuild
index 1e850e8150bda..f7e2b476b04d1 100644
--- a/games-sports/ultimatestunts/ultimatestunts-0.7.7.ebuild
+++ b/games-sports/ultimatestunts/ultimatestunts-0.7.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/ultimatestunts/${MY_P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="nls"
 
 RDEPEND="media-libs/libsdl[joystick,opengl,video]
diff --git a/games-sports/vdrift/vdrift-20120722.ebuild b/games-sports/vdrift/vdrift-20120722.ebuild
index 316f904278a16..c863bdfbb2caf 100644
--- a/games-sports/vdrift/vdrift-20120722.ebuild
+++ b/games-sports/vdrift/vdrift-20120722.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2
 
 LICENSE="GPL-3 ZLIB LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="app-arch/libarchive
diff --git a/games-sports/xmoto/xmoto-0.5.11.ebuild b/games-sports/xmoto/xmoto-0.5.11.ebuild
index 99e74c4c20980..b347b156d2658 100644
--- a/games-sports/xmoto/xmoto-0.5.11.ebuild
+++ b/games-sports/xmoto/xmoto-0.5.11.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://download.tuxfamily.org/xmoto/xmoto/${PV}/${P}-src.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="editor nls"
 
 RDEPEND="
diff --git a/games-strategy/asc/asc-2.6.0.0-r1.ebuild b/games-strategy/asc/asc-2.6.0.0-r1.ebuild
index b70bbe1c2dccf..7287ddeffb638 100644
--- a/games-strategy/asc/asc-2.6.0.0-r1.ebuild
+++ b/games-strategy/asc/asc-2.6.0.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/asc-hq/${P}.tar.bz2
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="app-arch/bzip2
diff --git a/games-strategy/boswars/boswars-2.7-r1.ebuild b/games-strategy/boswars/boswars-2.7-r1.ebuild
index 288762f4a41af..efb5eec49d6b3 100644
--- a/games-strategy/boswars/boswars-2.7-r1.ebuild
+++ b/games-strategy/boswars/boswars-2.7-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.boswars.org/dist/releases/${P}-src.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-lang/lua:0
diff --git a/games-strategy/crimson/crimson-0.5.3.ebuild b/games-strategy/crimson/crimson-0.5.3.ebuild
index 2099e319409ac..0cec24d6a0500 100644
--- a/games-strategy/crimson/crimson-0.5.3.ebuild
+++ b/games-strategy/crimson/crimson-0.5.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://crimson.seul.org/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="test zlib"
 
 RDEPEND="media-libs/libsdl[sound,video]
diff --git a/games-strategy/darwinia-demo/darwinia-demo-1.3.0.ebuild b/games-strategy/darwinia-demo/darwinia-demo-1.3.0.ebuild
index 95969fa371bbd..92f6d6bdf9675 100644
--- a/games-strategy/darwinia-demo/darwinia-demo-1.3.0.ebuild
+++ b/games-strategy/darwinia-demo/darwinia-demo-1.3.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.introversion.co.uk/darwinia/downloads/${PN}2-${PV}.sh"
 
 LICENSE="Introversion"
 SLOT="0"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE=""
 RESTRICT="mirror strip"
 
diff --git a/games-strategy/darwinia/darwinia-1.3.0.ebuild b/games-strategy/darwinia/darwinia-1.3.0.ebuild
index 330b8760ffe07..fe29e39ebf0f4 100644
--- a/games-strategy/darwinia/darwinia-1.3.0.ebuild
+++ b/games-strategy/darwinia/darwinia-1.3.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.introversion.co.uk/darwinia/downloads/${PN}-full-${PV}.sh"
 
 LICENSE="Introversion"
 SLOT="0"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE=""
 RESTRICT="mirror strip"
 
diff --git a/games-strategy/dopewars/dopewars-1.5.12-r2.ebuild b/games-strategy/dopewars/dopewars-1.5.12-r2.ebuild
index 8f146a04be38b..ca73bb9543a7b 100644
--- a/games-strategy/dopewars/dopewars-1.5.12-r2.ebuild
+++ b/games-strategy/dopewars/dopewars-1.5.12-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/dopewars/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="nls ncurses gtk gnome sdl"
 
 RDEPEND="ncurses? ( >=sys-libs/ncurses-5.2:0 )
diff --git a/games-strategy/dunelegacy/dunelegacy-0.96.3.ebuild b/games-strategy/dunelegacy/dunelegacy-0.96.3.ebuild
index 53ca22069a6fb..ee94d40caa606 100644
--- a/games-strategy/dunelegacy/dunelegacy-0.96.3.ebuild
+++ b/games-strategy/dunelegacy/dunelegacy-0.96.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="${SRC_URI} https://dev.gentoo.org/~hasufell/distfiles/${P}-no-autorecon
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="+alsa pulseaudio"
 
 RDEPEND="media-libs/libsdl[X,alsa?,sound,pulseaudio?,video]
diff --git a/games-strategy/freeciv/freeciv-2.5.6.ebuild b/games-strategy/freeciv/freeciv-2.5.6.ebuild
index 4ff97a11daafd..c408d24ee0081 100644
--- a/games-strategy/freeciv/freeciv-2.5.6.ebuild
+++ b/games-strategy/freeciv/freeciv-2.5.6.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/freeciv/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="auth aimodules dedicated +gtk ipv6 mapimg modpack mysql nls qt5 readline sdl +server +sound sqlite system-lua"
 
 # postgres isn't yet really supported by upstream
diff --git a/games-strategy/freecol/freecol-0.11.5.ebuild b/games-strategy/freecol/freecol-0.11.5.ebuild
index 39fc167677725..8f3f1a83ee1e7 100644
--- a/games-strategy/freecol/freecol-0.11.5.ebuild
+++ b/games-strategy/freecol/freecol-0.11.5.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 COMMON_DEP="dev-java/jsr173
diff --git a/games-strategy/freecol/freecol-0.11.6.ebuild b/games-strategy/freecol/freecol-0.11.6.ebuild
index 0fd3df020aa7a..8d7df3ab2726d 100644
--- a/games-strategy/freecol/freecol-0.11.6.ebuild
+++ b/games-strategy/freecol/freecol-0.11.6.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 COMMON_DEP="dev-java/jsr173
diff --git a/games-strategy/freesynd/freesynd-0.7.1.ebuild b/games-strategy/freesynd/freesynd-0.7.1.ebuild
index ec26a73395b27..6f9ce26e3669b 100644
--- a/games-strategy/freesynd/freesynd-0.7.1.ebuild
+++ b/games-strategy/freesynd/freesynd-0.7.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="debug devtools"
 
 RDEPEND="media-libs/libogg
diff --git a/games-strategy/galaxyhack/galaxyhack-1.74.ebuild b/games-strategy/galaxyhack/galaxyhack-1.74.ebuild
index f36cf0ed70b2b..68d0a57a06f88 100644
--- a/games-strategy/galaxyhack/galaxyhack-1.74.ebuild
+++ b/games-strategy/galaxyhack/galaxyhack-1.74.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
 
 LICENSE="GPL-2 galaxyhack"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="media-libs/libsdl[video]
diff --git a/games-strategy/glob2/glob2-0.9.4.4-r1.ebuild b/games-strategy/glob2/glob2-0.9.4.4-r1.ebuild
index 3017798e40f66..2268ae605173e 100644
--- a/games-strategy/glob2/glob2-0.9.4.4-r1.ebuild
+++ b/games-strategy/glob2/glob2-0.9.4.4-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://nongnu/glob2/${PV:0:5}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/games-strategy/gwp/gwp-0.4.0-r3.ebuild b/games-strategy/gwp/gwp-0.4.0-r3.ebuild
index b70ca42037dfb..f9a4fa2274392 100644
--- a/games-strategy/gwp/gwp-0.4.0-r3.ebuild
+++ b/games-strategy/gwp/gwp-0.4.0-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://gwp.lunix.com.ar/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="nls opengl python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/games-strategy/hedgewars/hedgewars-0.9.22-r1.ebuild b/games-strategy/hedgewars/hedgewars-0.9.22-r1.ebuild
index 09cb7e297c093..f3951c5a717e9 100644
--- a/games-strategy/hedgewars/hedgewars-0.9.22-r1.ebuild
+++ b/games-strategy/hedgewars/hedgewars-0.9.22-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="http://www.hedgewars.org/download/releases/${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/heroes3/heroes3-1.3.1a-r2.ebuild b/games-strategy/heroes3/heroes3-1.3.1a-r2.ebuild
index 2459ec99fb7ba..29250b27a1f9c 100644
--- a/games-strategy/heroes3/heroes3-1.3.1a-r2.ebuild
+++ b/games-strategy/heroes3/heroes3-1.3.1a-r2.ebuild
@@ -38,7 +38,7 @@ LICENSE="LOKI-EULA"
 SLOT="0"
 IUSE="nocd maps music sounds videos"
 #linguas_en linguas_es linguas_pl linguas_de"
-KEYWORDS="~amd64 x86"
+KEYWORDS="~amd64 ~x86"
 RESTRICT="strip"
 
 DEPEND="=dev-util/xdelta-1*
diff --git a/games-strategy/ja2-stracciatella-data/ja2-stracciatella-data-1.ebuild b/games-strategy/ja2-stracciatella-data/ja2-stracciatella-data-1.ebuild
index 2be69ceaae8d7..f25285d689391 100644
--- a/games-strategy/ja2-stracciatella-data/ja2-stracciatella-data-1.ebuild
+++ b/games-strategy/ja2-stracciatella-data/ja2-stracciatella-data-1.ebuild
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE="SIR-TECH"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="app-arch/unshield"
diff --git a/games-strategy/ja2-stracciatella/ja2-stracciatella-0.12.1_p7072.ebuild b/games-strategy/ja2-stracciatella/ja2-stracciatella-0.12.1_p7072.ebuild
index 17c62c2450c12..ee606b9cafda2 100644
--- a/games-strategy/ja2-stracciatella/ja2-stracciatella-0.12.1_p7072.ebuild
+++ b/games-strategy/ja2-stracciatella/ja2-stracciatella-0.12.1_p7072.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~hasufell/distfiles/${P}.tar.xz
 
 LICENSE="SFI-SCLA"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="cdinstall editor zlib"
 
 DEPEND="media-libs/libsdl[X,sound,video]
diff --git a/games-strategy/knights-demo/knights-demo-1.32-r1.ebuild b/games-strategy/knights-demo/knights-demo-1.32-r1.ebuild
index c1e7ebafcd6f8..b9d0fc04f438f 100644
--- a/games-strategy/knights-demo/knights-demo-1.32-r1.ebuild
+++ b/games-strategy/knights-demo/knights-demo-1.32-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.run"
 
 LICENSE="knights-demo"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="~x86"
 IUSE=""
 RESTRICT="strip"
 
diff --git a/games-strategy/lgeneral/lgeneral-1.3.1-r1.ebuild b/games-strategy/lgeneral/lgeneral-1.3.1-r1.ebuild
index 81a9c01d4a502..2cbe4796f69bd 100644
--- a/games-strategy/lgeneral/lgeneral-1.3.1-r1.ebuild
+++ b/games-strategy/lgeneral/lgeneral-1.3.1-r1.ebuild
@@ -13,7 +13,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/lgeneral/lgeneral-1.3.1.ebuild b/games-strategy/lgeneral/lgeneral-1.3.1.ebuild
index 94d29b6e4309c..b92b57d13ab71 100644
--- a/games-strategy/lgeneral/lgeneral-1.3.1.ebuild
+++ b/games-strategy/lgeneral/lgeneral-1.3.1.ebuild
@@ -13,7 +13,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/lightyears/lightyears-1.4-r1.ebuild b/games-strategy/lightyears/lightyears-1.4-r1.ebuild
index 3cf4e047ec210..2215ab7dc4a05 100644
--- a/games-strategy/lightyears/lightyears-1.4-r1.ebuild
+++ b/games-strategy/lightyears/lightyears-1.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.jwhitham.org/20kly/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="dev-python/pygame[${PYTHON_USEDEP}]
diff --git a/games-strategy/liquidwar/liquidwar-5.6.4-r1.ebuild b/games-strategy/liquidwar/liquidwar-5.6.4-r1.ebuild
index 86976443a054e..bfbb51bdca17f 100644
--- a/games-strategy/liquidwar/liquidwar-5.6.4-r1.ebuild
+++ b/games-strategy/liquidwar/liquidwar-5.6.4-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://savannah.nongnu.org/download/liquidwar/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="nls"
 RESTRICT="test"
 
diff --git a/games-strategy/liquidwar6/liquidwar6-0.4.3681-r1.ebuild b/games-strategy/liquidwar6/liquidwar6-0.4.3681-r1.ebuild
index 8caf4976f559b..c5881059e602e 100644
--- a/games-strategy/liquidwar6/liquidwar6-0.4.3681-r1.ebuild
+++ b/games-strategy/liquidwar6/liquidwar6-0.4.3681-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://www.ufoot.org/download/liquidwar/v6/${MY_PV}/${MY_P}.tar.gz
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc gles2 gtk libcaca +maps nls +ogg openmp readline test"
 
 # yes, cunit is rdep
diff --git a/games-strategy/majesty-demo/majesty-demo-1.0.0.ebuild b/games-strategy/majesty-demo/majesty-demo-1.0.0.ebuild
index a42e63e970629..e39f1e1a7f979 100644
--- a/games-strategy/majesty-demo/majesty-demo-1.0.0.ebuild
+++ b/games-strategy/majesty-demo/majesty-demo-1.0.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://ftp2.za.freebsd.org/pub/FreeBSD/ports/distfiles/majesty_demo.run
 
 LICENSE="MAJESTY-DEMO"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 RESTRICT="bindist strip"
 
diff --git a/games-strategy/maxr/maxr-0.2.8.ebuild b/games-strategy/maxr/maxr-0.2.8.ebuild
index df795ec201860..b183ec9420f94 100644
--- a/games-strategy/maxr/maxr-0.2.8.ebuild
+++ b/games-strategy/maxr/maxr-0.2.8.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.maxr.org/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2 FDL-1.2+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="media-libs/libsdl[video]
diff --git a/games-strategy/megaglest-data/megaglest-data-3.11.1.ebuild b/games-strategy/megaglest-data/megaglest-data-3.11.1.ebuild
index 961bbe9ace1db..c10fa689e2235 100644
--- a/games-strategy/megaglest-data/megaglest-data-3.11.1.ebuild
+++ b/games-strategy/megaglest-data/megaglest-data-3.11.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/MegaGlest/megaglest-data/releases/download/${PV}/meg
 
 LICENSE="CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc"
 
 DOCS=( docs/AUTHORS.data.txt docs/CHANGELOG.txt docs/README.txt )
diff --git a/games-strategy/megaglest/megaglest-3.11.1-r1.ebuild b/games-strategy/megaglest/megaglest-3.11.1-r1.ebuild
index 870c3e1b35667..ef99043c0a340 100644
--- a/games-strategy/megaglest/megaglest-3.11.1-r1.ebuild
+++ b/games-strategy/megaglest/megaglest-3.11.1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/MegaGlest/megaglest-source/releases/download/${PV}/m
 
 LICENSE="GPL-3 BitstreamVera"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="debug +editor fribidi cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 static +streflop +tools +unicode wxuniversal +model-viewer videos"
 
 RDEPEND="
diff --git a/games-strategy/mindrover-demo/mindrover-demo-1.07b.ebuild b/games-strategy/mindrover-demo/mindrover-demo-1.07b.ebuild
index 02d2a39403b0f..c41f3c1267075 100644
--- a/games-strategy/mindrover-demo/mindrover-demo-1.07b.ebuild
+++ b/games-strategy/mindrover-demo/mindrover-demo-1.07b.ebuild
@@ -11,7 +11,7 @@ SRC_URI=" http://demos.linuxgamepublishing.com/mindrover/${MY_P}"
 
 LICENSE="all-rights-reserved GPL-2+"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="~x86"
 IUSE=""
 RESTRICT="mirror bindist strip"
 
diff --git a/games-strategy/naev/naev-0.6.0.ebuild b/games-strategy/naev/naev-0.6.0.ebuild
index 5e395ae9d539b..c773a0276eaed 100644
--- a/games-strategy/naev/naev-0.6.0.ebuild
+++ b/games-strategy/naev/naev-0.6.0.ebuild
@@ -11,7 +11,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/naev/naev-0.6.1.ebuild b/games-strategy/naev/naev-0.6.1.ebuild
index dd85200d36c6a..35e6898d296bb 100644
--- a/games-strategy/naev/naev-0.6.1.ebuild
+++ b/games-strategy/naev/naev-0.6.1.ebuild
@@ -11,7 +11,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/netherearth/netherearth-0.52.ebuild b/games-strategy/netherearth/netherearth-0.52.ebuild
index 7c054852615f0..5fc80fe0afb0f 100644
--- a/games-strategy/netherearth/netherearth-0.52.ebuild
+++ b/games-strategy/netherearth/netherearth-0.52.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.braingames.getput.com/nether/sources.zip
 
 LICENSE="all-rights-reserved"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="~x86"
 IUSE=""
 RESTRICT="mirror bindist"
 
diff --git a/games-strategy/netpanzer/netpanzer-0.8.2.ebuild b/games-strategy/netpanzer/netpanzer-0.8.2.ebuild
index 4667cc74d26e4..9a70ba26b16fb 100644
--- a/games-strategy/netpanzer/netpanzer-0.8.2.ebuild
+++ b/games-strategy/netpanzer/netpanzer-0.8.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/netpanzer.berlios/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="~x86"
 IUSE="dedicated"
 
 RDEPEND="dedicated? ( app-misc/screen )
diff --git a/games-strategy/openra/openra-20140722-r1.ebuild b/games-strategy/openra/openra-20140722-r1.ebuild
index 108a2e057d850..12927c2ef6bb1 100644
--- a/games-strategy/openra/openra-20140722-r1.ebuild
+++ b/games-strategy/openra/openra-20140722-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/OpenRA/OpenRA/tarball/release-${PV} -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="tools"
 
 QA_PREBUILT="$(games_get_libdir)/openra/liblua*"
diff --git a/games-strategy/openra/openra-20141029-r2.ebuild b/games-strategy/openra/openra-20141029-r2.ebuild
index 5a40946f69342..9c2afbc5770c7 100644
--- a/games-strategy/openra/openra-20141029-r2.ebuild
+++ b/games-strategy/openra/openra-20141029-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/OpenRA/OpenRA/tarball/release-${PV} -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 QA_PREBUILT="$(games_get_libdir)/openra/liblua*"
diff --git a/games-strategy/outerspace/outerspace-0.5.68.ebuild b/games-strategy/outerspace/outerspace-0.5.68.ebuild
index 91e73afb61fc6..1fcc38fc07a5b 100644
--- a/games-strategy/outerspace/outerspace-0.5.68.ebuild
+++ b/games-strategy/outerspace/outerspace-0.5.68.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/ospace/Client/${PV}/Outer%20Space-${PV}.tar.gz ->
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-python/pygame-1.7"
diff --git a/games-strategy/s25rttr/s25rttr-0.8.1-r2.ebuild b/games-strategy/s25rttr/s25rttr-0.8.1-r2.ebuild
index ccc3e61cc799d..52de4ccf0b7c4 100644
--- a/games-strategy/s25rttr/s25rttr-0.8.1-r2.ebuild
+++ b/games-strategy/s25rttr/s25rttr-0.8.1-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~hasufell/distfiles/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="debug"
 
 RDEPEND="app-arch/bzip2
diff --git a/games-strategy/scorched3d/scorched3d-44-r1.ebuild b/games-strategy/scorched3d/scorched3d-44-r1.ebuild
index eb5af707e1892..86fb388a544a1 100644
--- a/games-strategy/scorched3d/scorched3d-44-r1.ebuild
+++ b/games-strategy/scorched3d/scorched3d-44-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/scorched3d/Scorched3D-${PV}-src.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="dedicated mysql"
 
 RDEPEND="media-libs/libsdl[video]
diff --git a/games-strategy/scorched3d/scorched3d-44-r2.ebuild b/games-strategy/scorched3d/scorched3d-44-r2.ebuild
index 0d3eca269aff5..6cd098e970d6f 100644
--- a/games-strategy/scorched3d/scorched3d-44-r2.ebuild
+++ b/games-strategy/scorched3d/scorched3d-44-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/scorched3d/Scorched3D-${PV}-src.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="dedicated mysql"
 
 RDEPEND="
diff --git a/games-strategy/seven-kingdoms/seven-kingdoms-2.14.4.ebuild b/games-strategy/seven-kingdoms/seven-kingdoms-2.14.4.ebuild
index b82832b94681d..40b532976f666 100644
--- a/games-strategy/seven-kingdoms/seven-kingdoms-2.14.4.ebuild
+++ b/games-strategy/seven-kingdoms/seven-kingdoms-2.14.4.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/skfans/${MY_PN}-source-${PV}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="network"
 
 DEPEND="media-libs/libsdl[X,video]
diff --git a/games-strategy/tornado/tornado-1.4.ebuild b/games-strategy/tornado/tornado-1.4.ebuild
index 7260172348eb8..0c6638176e975 100644
--- a/games-strategy/tornado/tornado-1.4.ebuild
+++ b/games-strategy/tornado/tornado-1.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://kiza.kcore.de/software/tornado/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND=""
diff --git a/games-strategy/triplea/triplea-1.8.0.9.ebuild b/games-strategy/triplea/triplea-1.8.0.9.ebuild
index fd2f2c4b4b6e5..108ac60a4c73c 100644
--- a/games-strategy/triplea/triplea-1.8.0.9.ebuild
+++ b/games-strategy/triplea/triplea-1.8.0.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/triplea/${PN}_${MY_PV}_source_code_only.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 RESTRICT="test" # Needs X11 maybe use virtualx.eclass
 
diff --git a/games-strategy/ufo-ai/ufo-ai-2.4.ebuild b/games-strategy/ufo-ai/ufo-ai-2.4.ebuild
index 47d4e1fa6df96..57907a66571c3 100644
--- a/games-strategy/ufo-ai/ufo-ai-2.4.ebuild
+++ b/games-strategy/ufo-ai/ufo-ai-2.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/ufoai/${MY_P}-source.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="debug dedicated editor"
 
 # Dependencies and more instructions can be found here:
diff --git a/games-strategy/uqm/uqm-0.7.0-r3.ebuild b/games-strategy/uqm/uqm-0.7.0-r3.ebuild
index eabe7f64c52a8..0d0264e8f7a64 100644
--- a/games-strategy/uqm/uqm-0.7.0-r3.ebuild
+++ b/games-strategy/uqm/uqm-0.7.0-r3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/sc2/${P}-source.tgz
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="music opengl remix voice"
 
 RDEPEND="media-libs/libmikmod
diff --git a/games-strategy/wargus-data/wargus-data-0.ebuild b/games-strategy/wargus-data/wargus-data-0.ebuild
index 1a3b4866fca9d..6e64f009ed148 100644
--- a/games-strategy/wargus-data/wargus-data-0.ebuild
+++ b/games-strategy/wargus-data/wargus-data-0.ebuild
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE="all-rights-reserved"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 # wargus is needed for wartool (bug #578340)
diff --git a/games-strategy/wargus/wargus-2.3.0.ebuild b/games-strategy/wargus/wargus-2.3.0.ebuild
index 284be824d4f7a..d86fdccacc361 100644
--- a/games-strategy/wargus/wargus-2.3.0.ebuild
+++ b/games-strategy/wargus/wargus-2.3.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://launchpad.net/${PN}/trunk/2.3/+download/${PN}_${PV}.orig.tar.gz
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="=games-engines/stratagus-${PV}*[theora]
diff --git a/games-strategy/warmux/warmux-11.04.1-r1.ebuild b/games-strategy/warmux/warmux-11.04.1-r1.ebuild
index aa4a05d49b72f..c62645eee1283 100644
--- a/games-strategy/warmux/warmux-11.04.1-r1.ebuild
+++ b/games-strategy/warmux/warmux-11.04.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://download.gna.org/warmux/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="debug nls unicode"
 
 RDEPEND="
diff --git a/games-strategy/warzone2100/warzone2100-3.2.3.ebuild b/games-strategy/warzone2100/warzone2100-3.2.3.ebuild
index 67f3e717b5df8..5a36f73a05190 100644
--- a/games-strategy/warzone2100/warzone2100-3.2.3.ebuild
+++ b/games-strategy/warzone2100/warzone2100-3.2.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI+=" https://github.com/Warzone2100/warzone2100/commit/ef37bca38289f4f79c6
 
 LICENSE="GPL-2+ CC-BY-SA-3.0 public-domain"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 # upstream requested debug support
 IUSE="debug nls sdl videos"
 
diff --git a/games-strategy/wesnoth/wesnoth-1.12.5.ebuild b/games-strategy/wesnoth/wesnoth-1.12.5.ebuild
index e2434dbe0a4d8..3c5d8cf3cf086 100644
--- a/games-strategy/wesnoth/wesnoth-1.12.5.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.12.5.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/wesnoth/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd"
 IUSE="dbus dedicated doc fribidi nls server"
 
 RDEPEND=">=media-libs/libsdl-1.2.7:0[joystick,video,X]
diff --git a/games-strategy/wesnoth/wesnoth-1.12.6.ebuild b/games-strategy/wesnoth/wesnoth-1.12.6.ebuild
index e2434dbe0a4d8..3c5d8cf3cf086 100644
--- a/games-strategy/wesnoth/wesnoth-1.12.6.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.12.6.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/wesnoth/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd"
 IUSE="dbus dedicated doc fribidi nls server"
 
 RDEPEND=">=media-libs/libsdl-1.2.7:0[joystick,video,X]
diff --git a/games-strategy/widelands/widelands-0.18-r1.ebuild b/games-strategy/widelands/widelands-0.18-r1.ebuild
index 4f8154f9a1da6..adee0947e0bc6 100644
--- a/games-strategy/widelands/widelands-0.18-r1.ebuild
+++ b/games-strategy/widelands/widelands-0.18-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://launchpad.net/widelands/${MY_PV}/build-$(get_version_component_
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/games-strategy/xbattleai/xbattleai-1.2.2-r1.ebuild b/games-strategy/xbattleai/xbattleai-1.2.2-r1.ebuild
index 536c92a0439d6..9fc6c59286286 100644
--- a/games-strategy/xbattleai/xbattleai-1.2.2-r1.ebuild
+++ b/games-strategy/xbattleai/xbattleai-1.2.2-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://inf.ug.edu.pl/~piotao/xbattle/mirror/www.lysator.liu.se/XBattle
 
 LICENSE="xbattle"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 # Since this uses similar code and the same binary name as the original XBattle,
diff --git a/games-util/antimicro/antimicro-2.20.2.ebuild b/games-util/antimicro/antimicro-2.20.2.ebuild
index e847d89f734e4..c720d534fceeb 100644
--- a/games-util/antimicro/antimicro-2.20.2.ebuild
+++ b/games-util/antimicro/antimicro-2.20.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/Ryochan7/antimicro/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
 	dev-qt/qtcore:5
diff --git a/games-util/biounzip/biounzip-1.1a.ebuild b/games-util/biounzip/biounzip-1.1a.ebuild
index f664c6d9bf148..8864926d80343 100644
--- a/games-util/biounzip/biounzip-1.1a.ebuild
+++ b/games-util/biounzip/biounzip-1.1a.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/biounzip/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="sys-libs/zlib"
diff --git a/games-util/catcodec/catcodec-1.0.3.ebuild b/games-util/catcodec/catcodec-1.0.3.ebuild
index e16ad8a4d9f0d..19f06e049559a 100644
--- a/games-util/catcodec/catcodec-1.0.3.ebuild
+++ b/games-util/catcodec/catcodec-1.0.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://binaries.openttd.org/extra/catcodec/${PV}/${P}-source.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc64 x86"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
 IUSE=""
 
 src_prepare() {
diff --git a/games-util/datutil/datutil-2.46.ebuild b/games-util/datutil/datutil-2.46.ebuild
index 6c3b8059294b6..acf880241a001 100644
--- a/games-util/datutil/datutil-2.46.ebuild
+++ b/games-util/datutil/datutil-2.46.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.logiqx.com/Tools/DatUtil/dutil${PV//.}.zip
 
 LICENSE="all-rights-reserved"
 SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 IUSE=""
 RESTRICT="mirror bindist"
 
diff --git a/games-util/deutex/deutex-4.4.0.ebuild b/games-util/deutex/deutex-4.4.0.ebuild
index bad39df7b9b70..9ef3310f618d7 100644
--- a/games-util/deutex/deutex-4.4.0.ebuild
+++ b/games-util/deutex/deutex-4.4.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.teaser.fr/~amajorel/deutex/${P}.tar.gz"
 
 LICENSE="GPL-2+ LGPL-2+ HPND"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/games-util/dfarc/dfarc-3.12.ebuild b/games-util/dfarc/dfarc-3.12.ebuild
index 44accf8c3690d..b290c3a959d14 100644
--- a/games-util/dfarc/dfarc-3.12.ebuild
+++ b/games-util/dfarc/dfarc-3.12.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/freedink/${P}.tar.gz"
 
 LICENSE="GPL-3 BZIP2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="nls"
 
 RDEPEND="
diff --git a/games-util/dzip/dzip-2.9-r3.ebuild b/games-util/dzip/dzip-2.9-r3.ebuild
index ded35f14665d9..a58b74eb99b25 100644
--- a/games-util/dzip/dzip-2.9-r3.ebuild
+++ b/games-util/dzip/dzip-2.9-r3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://speeddemosarchive.com/dzip/dz${PV/./}src.zip"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="app-arch/unzip"
 RDEPEND=""
diff --git a/games-util/etswitch/etswitch-0.1.14.ebuild b/games-util/etswitch/etswitch-0.1.14.ebuild
index 0b179daf30aa3..7d15b2027814b 100644
--- a/games-util/etswitch/etswitch-0.1.14.ebuild
+++ b/games-util/etswitch/etswitch-0.1.14.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://hem.bredband.net/b400150/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="x11-libs/libXpm
diff --git a/games-util/fteqcc/fteqcc-2501.ebuild b/games-util/fteqcc/fteqcc-2501.ebuild
index 5fd9c7e2f5c33..c03aa1ac4ee1e 100644
--- a/games-util/fteqcc/fteqcc-2501.ebuild
+++ b/games-util/fteqcc/fteqcc-2501.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/fteqw/qclibsrc${PV}.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 RESTRICT="test"
 
diff --git a/games-util/gamepick/gamepick-0.35.ebuild b/games-util/gamepick/gamepick-0.35.ebuild
index c1cf48431545b..8363fa083f3b4 100644
--- a/games-util/gamepick/gamepick-0.35.ebuild
+++ b/games-util/gamepick/gamepick-0.35.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.rillion.net/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="x11-libs/gtk+:2"
diff --git a/games-util/glbsp/glbsp-2.24.ebuild b/games-util/glbsp/glbsp-2.24.ebuild
index 718f03a2911f7..e6c982167ae05 100644
--- a/games-util/glbsp/glbsp-2.24.ebuild
+++ b/games-util/glbsp/glbsp-2.24.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/glbsp/${PN}_src_${MY_PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="fltk"
 
 DEPEND="fltk? ( x11-libs/fltk:1 )"
diff --git a/games-util/grfcodec/grfcodec-6.0.5.ebuild b/games-util/grfcodec/grfcodec-6.0.5.ebuild
index d0c27b0c80e57..9d29d1e632ba8 100644
--- a/games-util/grfcodec/grfcodec-6.0.5.ebuild
+++ b/games-util/grfcodec/grfcodec-6.0.5.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="http://dev.openttdcoop.org/projects/grfcodec"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc64 x86"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
 IUSE=""
 
 [[ -n ${SCM} ]] && S=${WORKDIR}/${PN}
diff --git a/games-util/grfcodec/grfcodec-6.0.6.ebuild b/games-util/grfcodec/grfcodec-6.0.6.ebuild
index 58ce0e2db8d0d..b63971bba94fd 100644
--- a/games-util/grfcodec/grfcodec-6.0.6.ebuild
+++ b/games-util/grfcodec/grfcodec-6.0.6.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="http://dev.openttdcoop.org/projects/grfcodec"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc64 x86"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND="media-libs/libpng:0"
diff --git a/games-util/gslist/gslist-0.8.11a.ebuild b/games-util/gslist/gslist-0.8.11a.ebuild
index 669d0050e0cd7..e9cc99077f2b2 100644
--- a/games-util/gslist/gslist-0.8.11a.ebuild
+++ b/games-util/gslist/gslist-0.8.11a.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${P}.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~hppa x86"
+KEYWORDS="~amd64 ~hppa ~x86"
 IUSE="web"
 
 RDEPEND="dev-libs/geoip"
diff --git a/games-util/higan-purify/higan-purify-03.ebuild b/games-util/higan-purify/higan-purify-03.ebuild
index f3877e42d767a..e383d0cfc5cfe 100644
--- a/games-util/higan-purify/higan-purify-03.ebuild
+++ b/games-util/higan-purify/higan-purify-03.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://higan.googlecode.com/files/${MY_P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="qt4"
 
 RDEPEND="
diff --git a/games-util/joystick/joystick-1.4.8.ebuild b/games-util/joystick/joystick-1.4.8.ebuild
index 2532b6e24de00..16f14148a0ead 100644
--- a/games-util/joystick/joystick-1.4.8.ebuild
+++ b/games-util/joystick/joystick-1.4.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/linuxconsole/files/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="sdl"
 
 DEPEND="sdl? ( media-libs/libsdl:0[video] )
diff --git a/games-util/joystick/joystick-1.5.1.ebuild b/games-util/joystick/joystick-1.5.1.ebuild
index 603c1dcad8bc2..4fce88c7f1e27 100644
--- a/games-util/joystick/joystick-1.5.1.ebuild
+++ b/games-util/joystick/joystick-1.5.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/linuxconsole/files/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="sdl udev"
 
 DEPEND="sdl? ( media-libs/libsdl:0[video] )
diff --git a/games-util/linux-wbfs-manager/linux-wbfs-manager-0.1.12.ebuild b/games-util/linux-wbfs-manager/linux-wbfs-manager-0.1.12.ebuild
index c7a78635c82de..ac70b1fc110dd 100644
--- a/games-util/linux-wbfs-manager/linux-wbfs-manager-0.1.12.ebuild
+++ b/games-util/linux-wbfs-manager/linux-wbfs-manager-0.1.12.ebuild
@@ -10,7 +10,7 @@ if [[ "${PV}" == "9999" ]]; then
 else
 	inherit toolchain-funcs
 	SRC_URI="https://linux-wbfs-manager.googlecode.com/files/${P}.tar.gz"
-	KEYWORDS="amd64 x86"
+	KEYWORDS="~amd64 ~x86"
 fi;
 
 DESCRIPTION="WBFS manager for Linux using GTK+"
diff --git a/games-util/loki_patch/loki_patch-20091105.ebuild b/games-util/loki_patch/loki_patch-20091105.ebuild
index db42e7b1435b2..b3084027a98d9 100644
--- a/games-util/loki_patch/loki_patch-20091105.ebuild
+++ b/games-util/loki_patch/loki_patch-20091105.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-util/xdelta:0
diff --git a/games-util/lutris/lutris-0.3.6.3.ebuild b/games-util/lutris/lutris-0.3.6.3.ebuild
index 6655a1a3de688..391ecd58bad0f 100644
--- a/games-util/lutris/lutris-0.3.6.3.ebuild
+++ b/games-util/lutris/lutris-0.3.6.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://lutris.net/releases/${PN}_${PV}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-python/pygobject:3[${PYTHON_USEDEP}]
diff --git a/games-util/nml/nml-0.4.2-r1.ebuild b/games-util/nml/nml-0.4.2-r1.ebuild
index f19bb0301b3a0..0ebe009136c83 100644
--- a/games-util/nml/nml-0.4.2-r1.ebuild
+++ b/games-util/nml/nml-0.4.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://bundles.openttdcoop.org/nml/releases/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="~amd64 ~arm ~x86"
 
 RDEPEND="dev-python/pillow[zlib,${PYTHON_USEDEP}]
 	dev-python/ply[${PYTHON_USEDEP}]"
diff --git a/games-util/nml/nml-0.4.4-r1.ebuild b/games-util/nml/nml-0.4.4-r1.ebuild
index f4f87cd85805d..81b58fd04e336 100644
--- a/games-util/nml/nml-0.4.4-r1.ebuild
+++ b/games-util/nml/nml-0.4.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://bundles.openttdcoop.org/nml/releases/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="~amd64 ~arm ~x86"
 
 RDEPEND="dev-python/pillow[zlib,${PYTHON_USEDEP}]
 	dev-python/ply[${PYTHON_USEDEP}]"
diff --git a/games-util/nml/nml-0.4.4.ebuild b/games-util/nml/nml-0.4.4.ebuild
index d9b1989141091..81e7dd260ed9f 100644
--- a/games-util/nml/nml-0.4.4.ebuild
+++ b/games-util/nml/nml-0.4.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://bundles.openttdcoop.org/nml/releases/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="~amd64 ~arm ~x86"
 
 RDEPEND="dev-python/pillow[zlib,${PYTHON_USEDEP}]
 	dev-python/ply[${PYTHON_USEDEP}]"
diff --git a/games-util/pogo-manager-bin/pogo-manager-bin-0.1.6.ebuild b/games-util/pogo-manager-bin/pogo-manager-bin-0.1.6.ebuild
index a58f94b841426..90679eeb287be 100644
--- a/games-util/pogo-manager-bin/pogo-manager-bin-0.1.6.ebuild
+++ b/games-util/pogo-manager-bin/pogo-manager-bin-0.1.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Wolfsblvt/BlossomsPokemonGoManager/releases/download
 
 LICENSE="CC-BY-NC-SA-4.0"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="|| ( dev-java/oracle-jdk-bin:1.8[javafx] dev-java/oracle-jre-bin:1.8[javafx] )"
diff --git a/games-util/qjoypad/qjoypad-4.1.0.ebuild b/games-util/qjoypad/qjoypad-4.1.0.ebuild
index a029b7f0c0246..5b05d7cec0d40 100644
--- a/games-util/qjoypad/qjoypad-4.1.0.ebuild
+++ b/games-util/qjoypad/qjoypad-4.1.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/qjoypad/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/games-util/ucon64/ucon64-2.0.0.ebuild b/games-util/ucon64/ucon64-2.0.0.ebuild
index b8875263099dd..694c0f57261b0 100644
--- a/games-util/ucon64/ucon64-2.0.0.ebuild
+++ b/games-util/ucon64/ucon64-2.0.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/ucon64/${P}-src.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/games-util/uglygs/uglygs-0_rc11.ebuild b/games-util/uglygs/uglygs-0_rc11.ebuild
index 80ef89b4d64ee..8ce6738b693e7 100644
--- a/games-util/uglygs/uglygs-0_rc11.ebuild
+++ b/games-util/uglygs/uglygs-0_rc11.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.uglypunk.com/uglygs/current/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha hppa x86"
+KEYWORDS="~alpha ~hppa ~x86"
 IUSE=""
 
 DEPEND="net-analyzer/rrdtool[graph]
diff --git a/games-util/umodpack/umodpack-0.5_beta16-r2.ebuild b/games-util/umodpack/umodpack-0.5_beta16-r2.ebuild
index e95a8468e0861..772fe6487292c 100644
--- a/games-util/umodpack/umodpack-0.5_beta16-r2.ebuild
+++ b/games-util/umodpack/umodpack-0.5_beta16-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${MY_P}-allinone.tar.gz"
 
 LICENSE="Artistic"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="tk"
 
 DEPEND="virtual/perl-IO-Compress
diff --git a/games-util/uz2unpack/uz2unpack-0.1.ebuild b/games-util/uz2unpack/uz2unpack-0.1.ebuild
index c82230aa1692b..494df27d5a68b 100644
--- a/games-util/uz2unpack/uz2unpack-0.1.ebuild
+++ b/games-util/uz2unpack/uz2unpack-0.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 
 DEPEND="sys-libs/zlib"
 RDEPEND=${DEPEND}
diff --git a/games-util/vispatch/vispatch-1.4.6.ebuild b/games-util/vispatch/vispatch-1.4.6.ebuild
index 3de60f78a3068..1bb5067893ac2 100644
--- a/games-util/vispatch/vispatch-1.4.6.ebuild
+++ b/games-util/vispatch/vispatch-1.4.6.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/vispatch/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 S=${WORKDIR}/${P}/source
diff --git a/games-util/wiiload/wiiload-0.5.ebuild b/games-util/wiiload/wiiload-0.5.ebuild
index 3648fc97947bb..43aa072d0fb70 100644
--- a/games-util/wiiload/wiiload-0.5.ebuild
+++ b/games-util/wiiload/wiiload-0.5.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 src_compile() {
diff --git a/games-util/wit/wit-2.40a.ebuild b/games-util/wit/wit-2.40a.ebuild
index cb5a55fdabdc3..d7c5615c3c1c8 100644
--- a/games-util/wit/wit-2.40a.ebuild
+++ b/games-util/wit/wit-2.40a.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~radhermit/distfiles/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+fuse +zlib"
 
 RDEPEND="
diff --git a/games-util/wxchtdecoder/wxchtdecoder-1.5a-r1.ebuild b/games-util/wxchtdecoder/wxchtdecoder-1.5a-r1.ebuild
index adaa68ec3e1f0..0a8fbabae6b4a 100644
--- a/games-util/wxchtdecoder/wxchtdecoder-1.5a-r1.ebuild
+++ b/games-util/wxchtdecoder/wxchtdecoder-1.5a-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="x11-libs/wxGTK:${WX_GTK_VER}[X]"
diff --git a/games-util/xboxdrv/xboxdrv-0.8.8.ebuild b/games-util/xboxdrv/xboxdrv-0.8.8.ebuild
index 0e0a20838083b..ba30a6e341847 100644
--- a/games-util/xboxdrv/xboxdrv-0.8.8.ebuild
+++ b/games-util/xboxdrv/xboxdrv-0.8.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://pingus.seul.org/~grumbel/xboxdrv/${MY_P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="dev-libs/boost:=
 	dev-libs/dbus-glib:=
diff --git a/games-util/xboxgw/xboxgw-1.082.ebuild b/games-util/xboxgw/xboxgw-1.082.ebuild
index 5443a5c841100..ef0a637ca80ab 100644
--- a/games-util/xboxgw/xboxgw-1.082.ebuild
+++ b/games-util/xboxgw/xboxgw-1.082.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.xboxgw.com/rel/dist2.1/tarballs/i386/${XBOXGW_P}.tgz
 
 LICENSE="freedist"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 QA_PREBUILT="opt/${PN}/lib/libhmdb.so
diff --git a/games-util/xgame-gtk2/xgame-gtk2-2.0.2.ebuild b/games-util/xgame-gtk2/xgame-gtk2-2.0.2.ebuild
index 9cea8b5490d20..afeae89385657 100644
--- a/games-util/xgame-gtk2/xgame-gtk2-2.0.2.ebuild
+++ b/games-util/xgame-gtk2/xgame-gtk2-2.0.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://downloads.tlhiv.com/xgame/${PF}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-lang/perl
diff --git a/games-util/xgame/xgame-1.7.1.ebuild b/games-util/xgame/xgame-1.7.1.ebuild
index af4e243fff87c..dd1e1220b4677 100644
--- a/games-util/xgame/xgame-1.7.1.ebuild
+++ b/games-util/xgame/xgame-1.7.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://downloads.tlhiv.com/xgame/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND=
diff --git a/games-util/xgamer/xgamer-0.6.2.ebuild b/games-util/xgamer/xgamer-0.6.2.ebuild
index 934e387ae00ca..ab29f4ccbd52a 100644
--- a/games-util/xgamer/xgamer-0.6.2.ebuild
+++ b/games-util/xgamer/xgamer-0.6.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://xgamer.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/perl-5.10
diff --git a/games-util/xqf/xqf-1.0.6.2.ebuild b/games-util/xqf/xqf-1.0.6.2.ebuild
index 53cac19c7ad09..5ea89476375ac 100644
--- a/games-util/xqf/xqf-1.0.6.2.ebuild
+++ b/games-util/xqf/xqf-1.0.6.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/XQF/xqf/archive/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 hppa x86"
+KEYWORDS="~amd64 ~hppa ~x86"
 IUSE="bzip2 geoip nls"
 
 RDEPEND="x11-libs/gtk+:2