From: Sergei Trofimovich <slyfox@gentoo.org>
Date: Mon, 13 Apr 2020 19:56:01 +0000 (+0100)
Subject: */*: destabilize dev-lang/ghc for all arches
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3d8a56a490892199abc775af31e2b94840cfe404;p=gentoo.git

*/*: destabilize dev-lang/ghc for all arches

dev-lang/ghc is a fast-moving target without much of stable
API across major GHC releases. This makes stabilization process
a fragile process.

The change moves all haskell revdeps to pure ~arch. There are
not many outside dev-haskell/*:
- app-emulation/ganeti
- app-text/pandoc
- dev-util/bustle
- dev-util/shellcheck
- dev-vcs/darcs
- x11-wm/xmonad/xmonad

Existing stable haskell users are recommended to keyword
used packages and all of dev-haskell/* to ease upgrades.

Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
---

diff --git a/app-admin/haskell-updater/haskell-updater-1.2.10.ebuild b/app-admin/haskell-updater/haskell-updater-1.2.10.ebuild
index 7d492d95c457..0ca325522f80 100644
--- a/app-admin/haskell-updater/haskell-updater-1.2.10.ebuild
+++ b/app-admin/haskell-updater/haskell-updater-1.2.10.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=dev-lang/ghc-6.12.1"
diff --git a/app-admin/haskell-updater/haskell-updater-1.2.9.ebuild b/app-admin/haskell-updater/haskell-updater-1.2.9.ebuild
index 7d492d95c457..0ca325522f80 100644
--- a/app-admin/haskell-updater/haskell-updater-1.2.9.ebuild
+++ b/app-admin/haskell-updater/haskell-updater-1.2.9.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=dev-lang/ghc-6.12.1"
diff --git a/app-admin/haskell-updater/haskell-updater-1.3.1.ebuild b/app-admin/haskell-updater/haskell-updater-1.3.1.ebuild
index 5de926a7721b..680c8dd7f70e 100644
--- a/app-admin/haskell-updater/haskell-updater-1.3.1.ebuild
+++ b/app-admin/haskell-updater/haskell-updater-1.3.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=dev-lang/ghc-6.12.1"
diff --git a/app-emulation/ganeti-instance-debootstrap/ganeti-instance-debootstrap-0.11-r1.ebuild b/app-emulation/ganeti-instance-debootstrap/ganeti-instance-debootstrap-0.11-r1.ebuild
index d164143bdc9a..dac122fc12ab 100644
--- a/app-emulation/ganeti-instance-debootstrap/ganeti-instance-debootstrap-0.11-r1.ebuild
+++ b/app-emulation/ganeti-instance-debootstrap/ganeti-instance-debootstrap-0.11-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://ganeti.googlecode.com/files/ganeti-instance-debootstrap-${PV}.t
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND=""
diff --git a/app-emulation/ganeti-instance-debootstrap/ganeti-instance-debootstrap-0.16.ebuild b/app-emulation/ganeti-instance-debootstrap/ganeti-instance-debootstrap-0.16.ebuild
index 29e713715a4c..b4859961ac2e 100644
--- a/app-emulation/ganeti-instance-debootstrap/ganeti-instance-debootstrap-0.16.ebuild
+++ b/app-emulation/ganeti-instance-debootstrap/ganeti-instance-debootstrap-0.16.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://downloads.ganeti.org/instance-debootstrap/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
 	${DEPEND}
diff --git a/app-emulation/ganeti-instance-image/ganeti-instance-image-0.6-r2.ebuild b/app-emulation/ganeti-instance-image/ganeti-instance-image-0.6-r2.ebuild
index 45a28c15d3cb..1cb4bb0a4467 100644
--- a/app-emulation/ganeti-instance-image/ganeti-instance-image-0.6-r2.ebuild
+++ b/app-emulation/ganeti-instance-image/ganeti-instance-image-0.6-r2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="http://code.osuosl.org/projects/ganeti-image"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND=""
diff --git a/app-emulation/ganeti-instance-image/ganeti-instance-image-0.6.ebuild b/app-emulation/ganeti-instance-image/ganeti-instance-image-0.6.ebuild
index e621e1ec228e..111a33276b5f 100644
--- a/app-emulation/ganeti-instance-image/ganeti-instance-image-0.6.ebuild
+++ b/app-emulation/ganeti-instance-image/ganeti-instance-image-0.6.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="http://code.osuosl.org/projects/ganeti-image"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND=""
diff --git a/app-emulation/ganeti/ganeti-2.15.2-r9.ebuild b/app-emulation/ganeti/ganeti-2.15.2-r9.ebuild
index 8b8fe0676e4e..385e68848589 100644
--- a/app-emulation/ganeti/ganeti-2.15.2-r9.ebuild
+++ b/app-emulation/ganeti/ganeti-2.15.2-r9.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 	http://downloads.ganeti.org/releases/${SERIES}/${MY_P}.tar.gz
 	mirror://debian/pool/main/g/ganeti-${SERIES}/ganeti-${SERIES}_${PV}-${DEBIAN_PATCH}.debian.tar.xz
 "
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 PATCHES=(
 	"${FILESDIR}"/ganeti-2.15-use-balloon-device.patch
 	"${WORKDIR}"/debian/patches/do-not-backup-export-dir.patch
diff --git a/app-text/pandoc/pandoc-1.15.0.6.ebuild b/app-text/pandoc/pandoc-1.15.0.6.ebuild
index e29385e81779..ab46a0b6e0c9 100644
--- a/app-text/pandoc/pandoc-1.15.0.6.ebuild
+++ b/app-text/pandoc/pandoc-1.15.0.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="embed-data-files +https +network-uri trypandoc"
 
 RESTRICT=test # likes to break on highlighting-kate update
diff --git a/app-text/pandoc/pandoc-1.19.2.1-r1.ebuild b/app-text/pandoc/pandoc-1.19.2.1-r1.ebuild
index f3ba9bcf09e7..e34f74eeaafb 100644
--- a/app-text/pandoc/pandoc-1.19.2.1-r1.ebuild
+++ b/app-text/pandoc/pandoc-1.19.2.1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="embed-data-files +https +network-uri trypandoc weigh-pandoc"
 
 RDEPEND=">=dev-haskell/aeson-0.7.0.5:=[profile?] <dev-haskell/aeson-1.2:=[profile?]
diff --git a/dev-games/goatee/goatee-0.3.0.ebuild b/dev-games/goatee/goatee-0.3.0.ebuild
index 49c782e9eb7e..d24620363722 100644
--- a/dev-games/goatee/goatee-0.3.0.ebuild
+++ b/dev-games/goatee/goatee-0.3.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="AGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
diff --git a/dev-games/goatee/goatee-0.3.1.2.ebuild b/dev-games/goatee/goatee-0.3.1.2.ebuild
index 29c57774fa08..6524456fa39e 100644
--- a/dev-games/goatee/goatee-0.3.1.2.ebuild
+++ b/dev-games/goatee/goatee-0.3.1.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="AGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
diff --git a/dev-haskell/adjunctions/adjunctions-4.2.2.ebuild b/dev-haskell/adjunctions/adjunctions-4.2.2.ebuild
index 7311f01290d7..ec4669ca9c0e 100644
--- a/dev-haskell/adjunctions/adjunctions-4.2.2.ebuild
+++ b/dev-haskell/adjunctions/adjunctions-4.2.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?]
diff --git a/dev-haskell/adjunctions/adjunctions-4.3.ebuild b/dev-haskell/adjunctions/adjunctions-4.3.ebuild
index a5fb4cf92a97..7d6d1da0c844 100644
--- a/dev-haskell/adjunctions/adjunctions-4.3.ebuild
+++ b/dev-haskell/adjunctions/adjunctions-4.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?]
diff --git a/dev-haskell/aeson-pretty/aeson-pretty-0.7.1.ebuild b/dev-haskell/aeson-pretty/aeson-pretty-0.7.1.ebuild
index d6fcf2c633b6..16cd9f8ef3ea 100644
--- a/dev-haskell/aeson-pretty/aeson-pretty-0.7.1.ebuild
+++ b/dev-haskell/aeson-pretty/aeson-pretty-0.7.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="lib-only"
 
 RDEPEND=">=dev-haskell/aeson-0.6:=[profile?]
diff --git a/dev-haskell/aeson-pretty/aeson-pretty-0.8.2.ebuild b/dev-haskell/aeson-pretty/aeson-pretty-0.8.2.ebuild
index 9bf331c9da17..1bd4653f52f1 100644
--- a/dev-haskell/aeson-pretty/aeson-pretty-0.8.2.ebuild
+++ b/dev-haskell/aeson-pretty/aeson-pretty-0.8.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="lib-only"
 
 RDEPEND=">=dev-haskell/aeson-0.7:=[profile?]
diff --git a/dev-haskell/aeson-qq/aeson-qq-0.7.4.ebuild b/dev-haskell/aeson-qq/aeson-qq-0.7.4.ebuild
index a27bf490db42..1ca2f1bb4ce9 100644
--- a/dev-haskell/aeson-qq/aeson-qq-0.7.4.ebuild
+++ b/dev-haskell/aeson-qq/aeson-qq-0.7.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/aeson-0.6:=[profile?]
diff --git a/dev-haskell/aeson/aeson-0.6.2.1.ebuild b/dev-haskell/aeson/aeson-0.6.2.1.ebuild
index 8ab4945a4a7b..4497b45385f6 100644
--- a/dev-haskell/aeson/aeson-0.6.2.1.ebuild
+++ b/dev-haskell/aeson/aeson-0.6.2.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/attoparsec-0.8.6.1:=[profile?]
diff --git a/dev-haskell/aeson/aeson-0.7.0.6.ebuild b/dev-haskell/aeson/aeson-0.7.0.6.ebuild
index 48a19b8b3703..764ae3414fb2 100644
--- a/dev-haskell/aeson/aeson-0.7.0.6.ebuild
+++ b/dev-haskell/aeson/aeson-0.7.0.6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/attoparsec-0.11.3.4:=[profile?]
diff --git a/dev-haskell/aeson/aeson-0.9.0.1.ebuild b/dev-haskell/aeson/aeson-0.9.0.1.ebuild
index 1c5ef4c26cc6..8e312c3bb82d 100644
--- a/dev-haskell/aeson/aeson-0.9.0.1.ebuild
+++ b/dev-haskell/aeson/aeson-0.9.0.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/attoparsec-0.13.0.0:=[profile?]
diff --git a/dev-haskell/aeson/aeson-1.0.2.1.ebuild b/dev-haskell/aeson/aeson-1.0.2.1.ebuild
index 74a0903a06a4..344aade92cdc 100644
--- a/dev-haskell/aeson/aeson-1.0.2.1.ebuild
+++ b/dev-haskell/aeson/aeson-1.0.2.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/attoparsec-0.13.0.1:=[profile?]
diff --git a/dev-haskell/alex/alex-3.1.3.ebuild b/dev-haskell/alex/alex-3.1.3.ebuild
index 8606dd00338b..ecb4f498acb3 100644
--- a/dev-haskell/alex/alex-3.1.3.ebuild
+++ b/dev-haskell/alex/alex-3.1.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="doc"
 
 RDEPEND=""
diff --git a/dev-haskell/alex/alex-3.1.7.ebuild b/dev-haskell/alex/alex-3.1.7.ebuild
index eee9e489717b..60d1f2726f74 100644
--- a/dev-haskell/alex/alex-3.1.7.ebuild
+++ b/dev-haskell/alex/alex-3.1.7.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="doc"
 
 RDEPEND=">=dev-haskell/quickcheck-2:2=
diff --git a/dev-haskell/alsa-core/alsa-core-0.5.0.1-r2.ebuild b/dev-haskell/alsa-core/alsa-core-0.5.0.1-r2.ebuild
index 389746ba5f35..47eb45f464c0 100644
--- a/dev-haskell/alsa-core/alsa-core-0.5.0.1-r2.ebuild
+++ b/dev-haskell/alsa-core/alsa-core-0.5.0.1-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/extensible-exceptions-0.1.1:=[profile?]
diff --git a/dev-haskell/alsa-mixer/alsa-mixer-0.2.0.2.ebuild b/dev-haskell/alsa-mixer/alsa-mixer-0.2.0.2.ebuild
index 5acca24128a6..f8bdc7633943 100644
--- a/dev-haskell/alsa-mixer/alsa-mixer-0.2.0.2.ebuild
+++ b/dev-haskell/alsa-mixer/alsa-mixer-0.2.0.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/alsa-core-0.5:=[profile?] <dev-haskell/alsa-core-0.6:=[profile?]
diff --git a/dev-haskell/ansi-terminal/ansi-terminal-0.6.2.1.ebuild b/dev-haskell/ansi-terminal/ansi-terminal-0.6.2.1.ebuild
index c5c6e9c6edf1..826ff0871595 100644
--- a/dev-haskell/ansi-terminal/ansi-terminal-0.6.2.1.ebuild
+++ b/dev-haskell/ansi-terminal/ansi-terminal-0.6.2.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="example"
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/ansi-wl-pprint/ansi-wl-pprint-0.6.7.1.ebuild b/dev-haskell/ansi-wl-pprint/ansi-wl-pprint-0.6.7.1.ebuild
index f8c84f36a37b..cffe59786c6c 100644
--- a/dev-haskell/ansi-wl-pprint/ansi-wl-pprint-0.6.7.1.ebuild
+++ b/dev-haskell/ansi-wl-pprint/ansi-wl-pprint-0.6.7.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="example"
 
 RDEPEND=">=dev-haskell/ansi-terminal-0.4.0:=[profile?] <dev-haskell/ansi-terminal-0.7:=[profile?]
diff --git a/dev-haskell/ansi-wl-pprint/ansi-wl-pprint-0.6.7.3.ebuild b/dev-haskell/ansi-wl-pprint/ansi-wl-pprint-0.6.7.3.ebuild
index d55784ece9f4..718adc6237b7 100644
--- a/dev-haskell/ansi-wl-pprint/ansi-wl-pprint-0.6.7.3.ebuild
+++ b/dev-haskell/ansi-wl-pprint/ansi-wl-pprint-0.6.7.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="example"
 
 RDEPEND=">=dev-haskell/ansi-terminal-0.4.0:=[profile?] <dev-haskell/ansi-terminal-0.7:=[profile?]
diff --git a/dev-haskell/appar/appar-0.1.4.ebuild b/dev-haskell/appar/appar-0.1.4.ebuild
index bde42b7e25ee..53cae80fd042 100644
--- a/dev-haskell/appar/appar-0.1.4.ebuild
+++ b/dev-haskell/appar/appar-0.1.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.10.4:="
diff --git a/dev-haskell/asn1-data/asn1-data-0.7.2.ebuild b/dev-haskell/asn1-data/asn1-data-0.7.2.ebuild
index 9c0552dcaae7..b0b445edcae0 100644
--- a/dev-haskell/asn1-data/asn1-data-0.7.2.ebuild
+++ b/dev-haskell/asn1-data/asn1-data-0.7.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/cereal:=[profile?]
diff --git a/dev-haskell/asn1-encoding/asn1-encoding-0.9.0.ebuild b/dev-haskell/asn1-encoding/asn1-encoding-0.9.0.ebuild
index 730f2b0997cb..ad70a428d48f 100644
--- a/dev-haskell/asn1-encoding/asn1-encoding-0.9.0.ebuild
+++ b/dev-haskell/asn1-encoding/asn1-encoding-0.9.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/asn1-types-0.3.0:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?]
diff --git a/dev-haskell/asn1-parse/asn1-parse-0.9.1.ebuild b/dev-haskell/asn1-parse/asn1-parse-0.9.1.ebuild
index 14751c37dce8..6a61113e5c3e 100644
--- a/dev-haskell/asn1-parse/asn1-parse-0.9.1.ebuild
+++ b/dev-haskell/asn1-parse/asn1-parse-0.9.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/asn1-encoding-0.9:=[profile?]
diff --git a/dev-haskell/asn1-types/asn1-types-0.2.0.ebuild b/dev-haskell/asn1-types/asn1-types-0.2.0.ebuild
index a25973f56137..1a71982ebaa9 100644
--- a/dev-haskell/asn1-types/asn1-types-0.2.0.ebuild
+++ b/dev-haskell/asn1-types/asn1-types-0.2.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.12.1:="
diff --git a/dev-haskell/asn1-types/asn1-types-0.3.0.ebuild b/dev-haskell/asn1-types/asn1-types-0.3.0.ebuild
index f45ba488e648..2743f9fcf58d 100644
--- a/dev-haskell/asn1-types/asn1-types-0.3.0.ebuild
+++ b/dev-haskell/asn1-types/asn1-types-0.3.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/hourglass:=[profile?]
diff --git a/dev-haskell/async/async-2.0.1.4.ebuild b/dev-haskell/async/async-2.0.1.4.ebuild
index 58d1d69cb3f0..f3cba8bfc171 100644
--- a/dev-haskell/async/async-2.0.1.4.ebuild
+++ b/dev-haskell/async/async-2.0.1.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/stm-2.2:=[profile?]
diff --git a/dev-haskell/attoparsec-enumerator/attoparsec-enumerator-0.3.4.ebuild b/dev-haskell/attoparsec-enumerator/attoparsec-enumerator-0.3.4.ebuild
index c4a26c14df6f..27b6b385987c 100644
--- a/dev-haskell/attoparsec-enumerator/attoparsec-enumerator-0.3.4.ebuild
+++ b/dev-haskell/attoparsec-enumerator/attoparsec-enumerator-0.3.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
diff --git a/dev-haskell/attoparsec/attoparsec-0.10.4.0.ebuild b/dev-haskell/attoparsec/attoparsec-0.10.4.0.ebuild
index 3cfcfea78789..f577ca17ae25 100644
--- a/dev-haskell/attoparsec/attoparsec-0.10.4.0.ebuild
+++ b/dev-haskell/attoparsec/attoparsec-0.10.4.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/text-0.11.1.5:=[profile?]
diff --git a/dev-haskell/attoparsec/attoparsec-0.11.2.1.ebuild b/dev-haskell/attoparsec/attoparsec-0.11.2.1.ebuild
index f2fe19817fc0..02e15680c43c 100644
--- a/dev-haskell/attoparsec/attoparsec-0.11.2.1.ebuild
+++ b/dev-haskell/attoparsec/attoparsec-0.11.2.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/scientific-0.2:=[profile?]
diff --git a/dev-haskell/attoparsec/attoparsec-0.13.0.1.ebuild b/dev-haskell/attoparsec/attoparsec-0.13.0.1.ebuild
index 11a30d2403f8..647f2842da87 100644
--- a/dev-haskell/attoparsec/attoparsec-0.13.0.1.ebuild
+++ b/dev-haskell/attoparsec/attoparsec-0.13.0.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/scientific-0.3.1:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
diff --git a/dev-haskell/auto-update/auto-update-0.1.2.2.ebuild b/dev-haskell/auto-update/auto-update-0.1.2.2.ebuild
index e339eb1a4d17..c34667bd42bf 100644
--- a/dev-haskell/auto-update/auto-update-0.1.2.2.ebuild
+++ b/dev-haskell/auto-update/auto-update-0.1.2.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/base-compat/base-compat-0.2.1.ebuild b/dev-haskell/base-compat/base-compat-0.2.1.ebuild
index fc9f30b4229e..e798a243c6f5 100644
--- a/dev-haskell/base-compat/base-compat-0.2.1.ebuild
+++ b/dev-haskell/base-compat/base-compat-0.2.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.10.4:="
diff --git a/dev-haskell/base-compat/base-compat-0.4.2.ebuild b/dev-haskell/base-compat/base-compat-0.4.2.ebuild
index 261eb398b6cf..de6977130a8a 100644
--- a/dev-haskell/base-compat/base-compat-0.4.2.ebuild
+++ b/dev-haskell/base-compat/base-compat-0.4.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/errorcall-eq-instance:=[profile?]
diff --git a/dev-haskell/base-compat/base-compat-0.9.1.ebuild b/dev-haskell/base-compat/base-compat-0.9.1.ebuild
index 3429649c222e..c00dfc85cec9 100644
--- a/dev-haskell/base-compat/base-compat-0.9.1.ebuild
+++ b/dev-haskell/base-compat/base-compat-0.9.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/base-orphans/base-orphans-0.3.2.ebuild b/dev-haskell/base-orphans/base-orphans-0.3.2.ebuild
index f490a425b14c..6a58930e985b 100644
--- a/dev-haskell/base-orphans/base-orphans-0.3.2.ebuild
+++ b/dev-haskell/base-orphans/base-orphans-0.3.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/base-orphans/base-orphans-0.5.4.ebuild b/dev-haskell/base-orphans/base-orphans-0.5.4.ebuild
index f3f17f61e260..015bf719a80e 100644
--- a/dev-haskell/base-orphans/base-orphans-0.5.4.ebuild
+++ b/dev-haskell/base-orphans/base-orphans-0.5.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/base-unicode-symbols/base-unicode-symbols-0.2.2.4.ebuild b/dev-haskell/base-unicode-symbols/base-unicode-symbols-0.2.2.4.ebuild
index fa4653cac886..80206a556c08 100644
--- a/dev-haskell/base-unicode-symbols/base-unicode-symbols-0.2.2.4.ebuild
+++ b/dev-haskell/base-unicode-symbols/base-unicode-symbols-0.2.2.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86 ~amd64-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.10.4:="
diff --git a/dev-haskell/base16-bytestring/base16-bytestring-0.1.1.6.ebuild b/dev-haskell/base16-bytestring/base16-bytestring-0.1.1.6.ebuild
index 2f8666adccb0..1edae186f55f 100644
--- a/dev-haskell/base16-bytestring/base16-bytestring-0.1.1.6.ebuild
+++ b/dev-haskell/base16-bytestring/base16-bytestring-0.1.1.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.10.4:=
diff --git a/dev-haskell/base64-bytestring/base64-bytestring-1.0.0.1.ebuild b/dev-haskell/base64-bytestring/base64-bytestring-1.0.0.1.ebuild
index 289468ae47e8..ac47f9b4cad0 100644
--- a/dev-haskell/base64-bytestring/base64-bytestring-1.0.0.1.ebuild
+++ b/dev-haskell/base64-bytestring/base64-bytestring-1.0.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.10.4:="
diff --git a/dev-haskell/bifunctors/bifunctors-4.2.1.ebuild b/dev-haskell/bifunctors/bifunctors-4.2.1.ebuild
index fe60d77e7dd3..3dfd5d93cee6 100644
--- a/dev-haskell/bifunctors/bifunctors-4.2.1.ebuild
+++ b/dev-haskell/bifunctors/bifunctors-4.2.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-5:=[profile?]
diff --git a/dev-haskell/bifunctors/bifunctors-5.4.1.ebuild b/dev-haskell/bifunctors/bifunctors-5.4.1.ebuild
index 4e95c19d03a3..8459127a001c 100644
--- a/dev-haskell/bifunctors/bifunctors-5.4.1.ebuild
+++ b/dev-haskell/bifunctors/bifunctors-5.4.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+semigroups +tagged"
 
 RDEPEND=">=dev-haskell/base-orphans-0.5.2:=[profile?] <dev-haskell/base-orphans-1:=[profile?]
diff --git a/dev-haskell/bifunctors/bifunctors-5.ebuild b/dev-haskell/bifunctors/bifunctors-5.ebuild
index 85b2a029d16f..4dd74522332e 100644
--- a/dev-haskell/bifunctors/bifunctors-5.ebuild
+++ b/dev-haskell/bifunctors/bifunctors-5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+semigroups +tagged"
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/binary/binary-0.5.1.1.ebuild b/dev-haskell/binary/binary-0.5.1.1.ebuild
index a100a7a3d227..115fb14878f1 100644
--- a/dev-haskell/binary/binary-0.5.1.1.ebuild
+++ b/dev-haskell/binary/binary-0.5.1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.10.4:="
diff --git a/dev-haskell/binary/binary-0.7.1.0.ebuild b/dev-haskell/binary/binary-0.7.1.0.ebuild
index 4f8fc5e1b09b..61986fe80b5c 100644
--- a/dev-haskell/binary/binary-0.7.1.0.ebuild
+++ b/dev-haskell/binary/binary-0.7.1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.10.4:="
diff --git a/dev-haskell/binary/binary-0.7.6.1.ebuild b/dev-haskell/binary/binary-0.7.6.1.ebuild
index a4b39009cd8d..eef90ef28ec6 100644
--- a/dev-haskell/binary/binary-0.7.6.1.ebuild
+++ b/dev-haskell/binary/binary-0.7.6.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RESTRICT=test # binary[test]->test-framework->text->xml->binary
diff --git a/dev-haskell/blaze-builder-conduit/blaze-builder-conduit-1.0.0.ebuild b/dev-haskell/blaze-builder-conduit/blaze-builder-conduit-1.0.0.ebuild
index e0b55fda9175..0ae0b62ba559 100644
--- a/dev-haskell/blaze-builder-conduit/blaze-builder-conduit-1.0.0.ebuild
+++ b/dev-haskell/blaze-builder-conduit/blaze-builder-conduit-1.0.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/blaze-builder-0.2.1.4:=[profile?]
diff --git a/dev-haskell/blaze-builder-conduit/blaze-builder-conduit-1.1.0.ebuild b/dev-haskell/blaze-builder-conduit/blaze-builder-conduit-1.1.0.ebuild
index 58922c42b773..cf4d2a9afeeb 100644
--- a/dev-haskell/blaze-builder-conduit/blaze-builder-conduit-1.1.0.ebuild
+++ b/dev-haskell/blaze-builder-conduit/blaze-builder-conduit-1.1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/conduit-1.1:=[profile?]
diff --git a/dev-haskell/blaze-builder-enumerator/blaze-builder-enumerator-0.2.1.0-r1.ebuild b/dev-haskell/blaze-builder-enumerator/blaze-builder-enumerator-0.2.1.0-r1.ebuild
index 93840647cdcd..ce61963948f5 100644
--- a/dev-haskell/blaze-builder-enumerator/blaze-builder-enumerator-0.2.1.0-r1.ebuild
+++ b/dev-haskell/blaze-builder-enumerator/blaze-builder-enumerator-0.2.1.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+newbuilder"
 
 RDEPEND=">=dev-haskell/enumerator-0.4.3.1:=[profile?] <dev-haskell/enumerator-0.5:=[profile?]
diff --git a/dev-haskell/blaze-builder-enumerator/blaze-builder-enumerator-0.2.1.0.ebuild b/dev-haskell/blaze-builder-enumerator/blaze-builder-enumerator-0.2.1.0.ebuild
index e65c6cd79764..eef49c0e0f54 100644
--- a/dev-haskell/blaze-builder-enumerator/blaze-builder-enumerator-0.2.1.0.ebuild
+++ b/dev-haskell/blaze-builder-enumerator/blaze-builder-enumerator-0.2.1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+newbuilder"
 
 RDEPEND=">=dev-haskell/enumerator-0.4.3.1:=[profile?] <dev-haskell/enumerator-0.5:=[profile?]
diff --git a/dev-haskell/blaze-builder/blaze-builder-0.3.3.2.ebuild b/dev-haskell/blaze-builder/blaze-builder-0.3.3.2.ebuild
index f673a9532142..8671dd34e049 100644
--- a/dev-haskell/blaze-builder/blaze-builder-0.3.3.2.ebuild
+++ b/dev-haskell/blaze-builder/blaze-builder-0.3.3.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.2:=[profile?]
diff --git a/dev-haskell/blaze-builder/blaze-builder-0.4.0.1.ebuild b/dev-haskell/blaze-builder/blaze-builder-0.4.0.1.ebuild
index 715ae697d32b..8ebea2208ae3 100644
--- a/dev-haskell/blaze-builder/blaze-builder-0.4.0.1.ebuild
+++ b/dev-haskell/blaze-builder/blaze-builder-0.4.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/bytestring-builder:=[profile?]
diff --git a/dev-haskell/blaze-html/blaze-html-0.6.1.2.ebuild b/dev-haskell/blaze-html/blaze-html-0.6.1.2.ebuild
index ae0417253ebd..d4be1d37df14 100644
--- a/dev-haskell/blaze-html/blaze-html-0.6.1.2.ebuild
+++ b/dev-haskell/blaze-html/blaze-html-0.6.1.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/blaze-builder-0.2:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?]
diff --git a/dev-haskell/blaze-html/blaze-html-0.8.1.1.ebuild b/dev-haskell/blaze-html/blaze-html-0.8.1.1.ebuild
index 2d9c61d54346..d107a950834d 100644
--- a/dev-haskell/blaze-html/blaze-html-0.8.1.1.ebuild
+++ b/dev-haskell/blaze-html/blaze-html-0.8.1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/blaze-builder-0.3:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
diff --git a/dev-haskell/blaze-html/blaze-html-0.8.1.2.ebuild b/dev-haskell/blaze-html/blaze-html-0.8.1.2.ebuild
index f7cfa43d2692..d0974b28d103 100644
--- a/dev-haskell/blaze-html/blaze-html-0.8.1.2.ebuild
+++ b/dev-haskell/blaze-html/blaze-html-0.8.1.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/blaze-builder-0.3:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
diff --git a/dev-haskell/blaze-markup/blaze-markup-0.5.2.1.ebuild b/dev-haskell/blaze-markup/blaze-markup-0.5.2.1.ebuild
index 537db1aea952..5a3ccbdeb3df 100644
--- a/dev-haskell/blaze-markup/blaze-markup-0.5.2.1.ebuild
+++ b/dev-haskell/blaze-markup/blaze-markup-0.5.2.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/blaze-builder-0.2:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?]
diff --git a/dev-haskell/blaze-markup/blaze-markup-0.7.0.3.ebuild b/dev-haskell/blaze-markup/blaze-markup-0.7.0.3.ebuild
index ae56658f9f47..6b30d1224c2d 100644
--- a/dev-haskell/blaze-markup/blaze-markup-0.7.0.3.ebuild
+++ b/dev-haskell/blaze-markup/blaze-markup-0.7.0.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/blaze-builder-0.3:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
diff --git a/dev-haskell/blaze-markup/blaze-markup-0.7.1.0.ebuild b/dev-haskell/blaze-markup/blaze-markup-0.7.1.0.ebuild
index f81448d9a39d..23bd4d49d8a3 100644
--- a/dev-haskell/blaze-markup/blaze-markup-0.7.1.0.ebuild
+++ b/dev-haskell/blaze-markup/blaze-markup-0.7.1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/blaze-builder-0.3:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
diff --git a/dev-haskell/byteable/byteable-0.1.1.ebuild b/dev-haskell/byteable/byteable-0.1.1.ebuild
index 967764d1e108..96b40f8d68f1 100644
--- a/dev-haskell/byteable/byteable-0.1.1.ebuild
+++ b/dev-haskell/byteable/byteable-0.1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.10.4:="
diff --git a/dev-haskell/byteorder/byteorder-1.0.4.ebuild b/dev-haskell/byteorder/byteorder-1.0.4.ebuild
index 5ee0b8ffa0f7..e54facf0fe9b 100644
--- a/dev-haskell/byteorder/byteorder-1.0.4.ebuild
+++ b/dev-haskell/byteorder/byteorder-1.0.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.10.4:="
diff --git a/dev-haskell/bytestring-builder/bytestring-builder-0.10.6.0.0.ebuild b/dev-haskell/bytestring-builder/bytestring-builder-0.10.6.0.0.ebuild
index 7c6cb59f65aa..ef198863bfba 100644
--- a/dev-haskell/bytestring-builder/bytestring-builder-0.10.6.0.0.ebuild
+++ b/dev-haskell/bytestring-builder/bytestring-builder-0.10.6.0.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/bytestring-handle/bytestring-handle-0.1.0.4.ebuild b/dev-haskell/bytestring-handle/bytestring-handle-0.1.0.4.ebuild
index ab5cab969a8c..7df11c7bd3ac 100644
--- a/dev-haskell/bytestring-handle/bytestring-handle-0.1.0.4.ebuild
+++ b/dev-haskell/bytestring-handle/bytestring-handle-0.1.0.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/bytestring-mmap/bytestring-mmap-0.2.2-r1.ebuild b/dev-haskell/bytestring-mmap/bytestring-mmap-0.2.2-r1.ebuild
index d8f3d5975974..5a263f0f5147 100644
--- a/dev-haskell/bytestring-mmap/bytestring-mmap-0.2.2-r1.ebuild
+++ b/dev-haskell/bytestring-mmap/bytestring-mmap-0.2.2-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.10.4:=
diff --git a/dev-haskell/c2hs/c2hs-0.16.4.ebuild b/dev-haskell/c2hs/c2hs-0.16.4.ebuild
index 1899890112fc..c11cab9918ea 100644
--- a/dev-haskell/c2hs/c2hs-0.16.4.ebuild
+++ b/dev-haskell/c2hs/c2hs-0.16.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="doc"
 
 DEPEND=">=dev-lang/ghc-6.10.4
diff --git a/dev-haskell/c2hs/c2hs-0.16.5.ebuild b/dev-haskell/c2hs/c2hs-0.16.5.ebuild
index 24ee18e7e9a5..14584f769269 100644
--- a/dev-haskell/c2hs/c2hs-0.16.5.ebuild
+++ b/dev-haskell/c2hs/c2hs-0.16.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="doc"
 
 DEPEND=">=dev-lang/ghc-6.10.4
diff --git a/dev-haskell/c2hs/c2hs-0.27.1.ebuild b/dev-haskell/c2hs/c2hs-0.27.1.ebuild
index 88854fd1cc4f..7f709c6c5e34 100644
--- a/dev-haskell/c2hs/c2hs-0.27.1.ebuild
+++ b/dev-haskell/c2hs/c2hs-0.27.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="regression"
 
 RDEPEND="dev-haskell/dlist:=
diff --git a/dev-haskell/cabal-doctest/cabal-doctest-1.ebuild b/dev-haskell/cabal-doctest/cabal-doctest-1.ebuild
index b73975c85901..af885956ec14 100644
--- a/dev-haskell/cabal-doctest/cabal-doctest-1.ebuild
+++ b/dev-haskell/cabal-doctest/cabal-doctest-1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/cabal-1.10:=[profile?] <dev-haskell/cabal-2.1:=[profile?]
diff --git a/dev-haskell/cabal-install/cabal-install-1.18.1.0.ebuild b/dev-haskell/cabal-install/cabal-install-1.18.1.0.ebuild
index c7b44167628d..3d5bb3fd736e 100644
--- a/dev-haskell/cabal-install/cabal-install-1.18.1.0.ebuild
+++ b/dev-haskell/cabal-install/cabal-install-1.18.1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="+noprefs"
 
 RDEPEND=""
diff --git a/dev-haskell/cabal-install/cabal-install-1.22.7.0.ebuild b/dev-haskell/cabal-install/cabal-install-1.22.7.0.ebuild
index 881cfc752655..a05e119c7789 100644
--- a/dev-haskell/cabal-install/cabal-install-1.22.7.0.ebuild
+++ b/dev-haskell/cabal-install/cabal-install-1.22.7.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="+network-uri +noprefs"
 
 RESTRICT=test # missing files
diff --git a/dev-haskell/cabal-install/cabal-install-1.24.0.2.ebuild b/dev-haskell/cabal-install/cabal-install-1.24.0.2.ebuild
index be2dee7e46f5..4f5904e2ff96 100644
--- a/dev-haskell/cabal-install/cabal-install-1.24.0.2.ebuild
+++ b/dev-haskell/cabal-install/cabal-install-1.24.0.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+network-uri +noprefs"
 
 RESTRICT=test
diff --git a/dev-haskell/cabal/cabal-1.18.1.2.ebuild b/dev-haskell/cabal/cabal-1.18.1.2.ebuild
index 6fb3926b32af..7b5fb50c2b8f 100644
--- a/dev-haskell/cabal/cabal-1.18.1.2.ebuild
+++ b/dev-haskell/cabal/cabal-1.18.1.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.12.1:="
diff --git a/dev-haskell/cabal/cabal-1.18.1.5.ebuild b/dev-haskell/cabal/cabal-1.18.1.5.ebuild
index aa81f311a6c9..4c5522cc3814 100644
--- a/dev-haskell/cabal/cabal-1.18.1.5.ebuild
+++ b/dev-haskell/cabal/cabal-1.18.1.5.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RESTRICT=test # circular depend: cabal[test]->quickcheck[test]->cabal
diff --git a/dev-haskell/cabal/cabal-1.22.8.0.ebuild b/dev-haskell/cabal/cabal-1.22.8.0.ebuild
index 021ce86ff27f..e080e92bf4af 100644
--- a/dev-haskell/cabal/cabal-1.22.8.0.ebuild
+++ b/dev-haskell/cabal/cabal-1.22.8.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RESTRICT=test
diff --git a/dev-haskell/cabal/cabal-1.24.2.0.ebuild b/dev-haskell/cabal/cabal-1.24.2.0.ebuild
index ed66a2ff55b8..12c57fd2ed94 100644
--- a/dev-haskell/cabal/cabal-1.24.2.0.ebuild
+++ b/dev-haskell/cabal/cabal-1.24.2.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RESTRICT=test # circular dependencies
diff --git a/dev-haskell/cairo/cairo-0.12.5.3.ebuild b/dev-haskell/cairo/cairo-0.12.5.3.ebuild
index 3d8ed9d78cfa..f4f290e437f8 100644
--- a/dev-haskell/cairo/cairo-0.12.5.3.ebuild
+++ b/dev-haskell/cairo/cairo-0.12.5.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="+pdf +postscript +svg"
 
 RDEPEND="dev-haskell/mtl:=[profile?]
diff --git a/dev-haskell/cairo/cairo-0.13.1.1.ebuild b/dev-haskell/cairo/cairo-0.13.1.1.ebuild
index 0f3a6d9355d5..ee9d51cde121 100644
--- a/dev-haskell/cairo/cairo-0.13.1.1.ebuild
+++ b/dev-haskell/cairo/cairo-0.13.1.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="+pdf +postscript +svg"
 
 RDEPEND="dev-haskell/mtl:=[profile?]
diff --git a/dev-haskell/cairo/cairo-0.13.3.1.ebuild b/dev-haskell/cairo/cairo-0.13.3.1.ebuild
index 69dfb1fc98e6..177e4eb19d06 100644
--- a/dev-haskell/cairo/cairo-0.13.3.1.ebuild
+++ b/dev-haskell/cairo/cairo-0.13.3.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="+pdf +postscript +svg"
 
 RDEPEND="dev-haskell/mtl:=[profile?]
diff --git a/dev-haskell/case-insensitive/case-insensitive-1.0.0.2-r1.ebuild b/dev-haskell/case-insensitive/case-insensitive-1.0.0.2-r1.ebuild
index 2bf507c4011e..5e9ca276d36e 100644
--- a/dev-haskell/case-insensitive/case-insensitive-1.0.0.2-r1.ebuild
+++ b/dev-haskell/case-insensitive/case-insensitive-1.0.0.2-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/hashable-1.0:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
diff --git a/dev-haskell/case-insensitive/case-insensitive-1.2.0.5.ebuild b/dev-haskell/case-insensitive/case-insensitive-1.2.0.5.ebuild
index a1c00965fb06..84b545530c04 100644
--- a/dev-haskell/case-insensitive/case-insensitive-1.2.0.5.ebuild
+++ b/dev-haskell/case-insensitive/case-insensitive-1.2.0.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/hashable-1.0:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
diff --git a/dev-haskell/case-insensitive/case-insensitive-1.2.0.7.ebuild b/dev-haskell/case-insensitive/case-insensitive-1.2.0.7.ebuild
index 1bae4e210c9a..a4f73f6fc262 100644
--- a/dev-haskell/case-insensitive/case-insensitive-1.2.0.7.ebuild
+++ b/dev-haskell/case-insensitive/case-insensitive-1.2.0.7.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/hashable-1.0:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
diff --git a/dev-haskell/cereal/cereal-0.3.5.2.ebuild b/dev-haskell/cereal/cereal-0.3.5.2.ebuild
index 87e4af15652f..34a62d8729a2 100644
--- a/dev-haskell/cereal/cereal-0.3.5.2.ebuild
+++ b/dev-haskell/cereal/cereal-0.3.5.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.10.4:="
diff --git a/dev-haskell/cereal/cereal-0.4.0.1.ebuild b/dev-haskell/cereal/cereal-0.4.0.1.ebuild
index 94b9dd89196b..6e20fbf180a1 100644
--- a/dev-haskell/cereal/cereal-0.4.0.1.ebuild
+++ b/dev-haskell/cereal/cereal-0.4.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.10.4:=
diff --git a/dev-haskell/cereal/cereal-0.4.1.1.ebuild b/dev-haskell/cereal/cereal-0.4.1.1.ebuild
index f9d7bd176d1e..0424261ac2ad 100644
--- a/dev-haskell/cereal/cereal-0.4.1.1.ebuild
+++ b/dev-haskell/cereal/cereal-0.4.1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-haskell/certificate/certificate-1.3.9.ebuild b/dev-haskell/certificate/certificate-1.3.9.ebuild
index e5678e1be608..50aa562eef6f 100644
--- a/dev-haskell/certificate/certificate-1.3.9.ebuild
+++ b/dev-haskell/certificate/certificate-1.3.9.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="executable test"
 RESTRICT="test" # due missing tests
 
diff --git a/dev-haskell/cgi/cgi-3001.1.8.3.ebuild b/dev-haskell/cgi/cgi-3001.1.8.3.ebuild
index 34470cc81126..40f588e48132 100644
--- a/dev-haskell/cgi/cgi-3001.1.8.3.ebuild
+++ b/dev-haskell/cgi/cgi-3001.1.8.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/extensible-exceptions:=[profile?]
diff --git a/dev-haskell/cgi/cgi-3001.1.8.4.ebuild b/dev-haskell/cgi/cgi-3001.1.8.4.ebuild
index 92e50d6b21e0..9250639c7e07 100644
--- a/dev-haskell/cgi/cgi-3001.1.8.4.ebuild
+++ b/dev-haskell/cgi/cgi-3001.1.8.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="+extensible-exceptions-in-base"
 
 RDEPEND="dev-haskell/monadcatchio-mtl:=[profile?]
diff --git a/dev-haskell/cgi/cgi-3001.2.2.2.ebuild b/dev-haskell/cgi/cgi-3001.2.2.2.ebuild
index 2bd72fc88d06..ae1193e4fcbd 100644
--- a/dev-haskell/cgi/cgi-3001.2.2.2.ebuild
+++ b/dev-haskell/cgi/cgi-3001.2.2.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="+network-uri"
 
 RDEPEND="<dev-haskell/exceptions-0.9:=[profile?]
diff --git a/dev-haskell/chasingbottoms/chasingbottoms-1.3.0.11-r1.ebuild b/dev-haskell/chasingbottoms/chasingbottoms-1.3.0.11-r1.ebuild
index 1927479404d6..0c9961ace0a2 100644
--- a/dev-haskell/chasingbottoms/chasingbottoms-1.3.0.11-r1.ebuild
+++ b/dev-haskell/chasingbottoms/chasingbottoms-1.3.0.11-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RESTRICT=test # takes a lot
diff --git a/dev-haskell/chasingbottoms/chasingbottoms-1.3.1.2.ebuild b/dev-haskell/chasingbottoms/chasingbottoms-1.3.1.2.ebuild
index 369c06cd4b67..9491fb244515 100644
--- a/dev-haskell/chasingbottoms/chasingbottoms-1.3.1.2.ebuild
+++ b/dev-haskell/chasingbottoms/chasingbottoms-1.3.1.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
diff --git a/dev-haskell/chell-quickcheck/chell-quickcheck-0.2.5-r1.ebuild b/dev-haskell/chell-quickcheck/chell-quickcheck-0.2.5-r1.ebuild
index 2ee07f6418c2..0c6ece31943a 100644
--- a/dev-haskell/chell-quickcheck/chell-quickcheck-0.2.5-r1.ebuild
+++ b/dev-haskell/chell-quickcheck/chell-quickcheck-0.2.5-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/chell-0.3:=[profile?] <dev-haskell/chell-0.5:=[profile?]
diff --git a/dev-haskell/chell-quickcheck/chell-quickcheck-0.2.5.ebuild b/dev-haskell/chell-quickcheck/chell-quickcheck-0.2.5.ebuild
index df674c0bbb01..c7077cca2059 100644
--- a/dev-haskell/chell-quickcheck/chell-quickcheck-0.2.5.ebuild
+++ b/dev-haskell/chell-quickcheck/chell-quickcheck-0.2.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/chell-0.3:=[profile?] <dev-haskell/chell-0.5:=[profile?]
diff --git a/dev-haskell/chell/chell-0.4.0.1.ebuild b/dev-haskell/chell/chell-0.4.0.1.ebuild
index 09e082783432..6c5c6970be05 100644
--- a/dev-haskell/chell/chell-0.4.0.1.ebuild
+++ b/dev-haskell/chell/chell-0.4.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="+color-output"
 
 RDEPEND=">=dev-haskell/options-1.0:=[profile?] <dev-haskell/options-2.0:=[profile?]
diff --git a/dev-haskell/cipher-aes/cipher-aes-0.2.5.ebuild b/dev-haskell/cipher-aes/cipher-aes-0.2.5.ebuild
index 613f7aaea48c..d36c0eae5d57 100644
--- a/dev-haskell/cipher-aes/cipher-aes-0.2.5.ebuild
+++ b/dev-haskell/cipher-aes/cipher-aes-0.2.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/byteable:=[profile?]
diff --git a/dev-haskell/cipher-des/cipher-des-0.0.6.ebuild b/dev-haskell/cipher-des/cipher-des-0.0.6.ebuild
index cdde0e69767b..29d6d770a2e1 100644
--- a/dev-haskell/cipher-des/cipher-des-0.0.6.ebuild
+++ b/dev-haskell/cipher-des/cipher-des-0.0.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/byteable:=[profile?]
diff --git a/dev-haskell/cipher-rc4/cipher-rc4-0.1.4.ebuild b/dev-haskell/cipher-rc4/cipher-rc4-0.1.4.ebuild
index ead19812f79a..d75de3ee2005 100644
--- a/dev-haskell/cipher-rc4/cipher-rc4-0.1.4.ebuild
+++ b/dev-haskell/cipher-rc4/cipher-rc4-0.1.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/byteable:=[profile?]
diff --git a/dev-haskell/clock/clock-0.7.2.ebuild b/dev-haskell/clock/clock-0.7.2.ebuild
index 7d59c0a392ce..ee39489573f7 100644
--- a/dev-haskell/clock/clock-0.7.2.ebuild
+++ b/dev-haskell/clock/clock-0.7.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RESTRICT=test # circular depend: tasty->clock[test]->tasty
diff --git a/dev-haskell/cmark/cmark-0.4.0.1.ebuild b/dev-haskell/cmark/cmark-0.4.0.1.ebuild
index 277d5e275ec3..5ee4921b3acc 100644
--- a/dev-haskell/cmark/cmark-0.4.0.1.ebuild
+++ b/dev-haskell/cmark/cmark-0.4.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
diff --git a/dev-haskell/cmark/cmark-0.5.6.ebuild b/dev-haskell/cmark/cmark-0.5.6.ebuild
index 02193b3fb50f..746d622583f3 100644
--- a/dev-haskell/cmark/cmark-0.5.6.ebuild
+++ b/dev-haskell/cmark/cmark-0.5.6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+system-cmark"
 
 RDEPEND=">=dev-haskell/text-1.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
diff --git a/dev-haskell/cmdargs/cmdargs-0.10.7.ebuild b/dev-haskell/cmdargs/cmdargs-0.10.7.ebuild
index 2263e832a94e..e6397b9d5d3f 100644
--- a/dev-haskell/cmdargs/cmdargs-0.10.7.ebuild
+++ b/dev-haskell/cmdargs/cmdargs-0.10.7.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+quotation testprog"
 
 RDEPEND=">=dev-haskell/transformers-0.2:=[profile?]
diff --git a/dev-haskell/cmdlib/cmdlib-0.3.5-r1.ebuild b/dev-haskell/cmdlib/cmdlib-0.3.5-r1.ebuild
index a7a239fe186d..3192667edfb4 100644
--- a/dev-haskell/cmdlib/cmdlib-0.3.5-r1.ebuild
+++ b/dev-haskell/cmdlib/cmdlib-0.3.5-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/mtl-2:=[profile?]
diff --git a/dev-haskell/cmdlib/cmdlib-0.3.6.ebuild b/dev-haskell/cmdlib/cmdlib-0.3.6.ebuild
index 62cb3ff9ea07..e97fa53d982b 100644
--- a/dev-haskell/cmdlib/cmdlib-0.3.6.ebuild
+++ b/dev-haskell/cmdlib/cmdlib-0.3.6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/mtl-2:=[profile?]
diff --git a/dev-haskell/code-page/code-page-0.1.1.ebuild b/dev-haskell/code-page/code-page-0.1.1.ebuild
index 1e1acfa73810..889ccfd86514 100644
--- a/dev-haskell/code-page/code-page-0.1.1.ebuild
+++ b/dev-haskell/code-page/code-page-0.1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/colour/colour-2.3.3-r1.ebuild b/dev-haskell/colour/colour-2.3.3-r1.ebuild
index 009379cbae80..5b47b2dd0cde 100644
--- a/dev-haskell/colour/colour-2.3.3-r1.ebuild
+++ b/dev-haskell/colour/colour-2.3.3-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.10.4:="
diff --git a/dev-haskell/comonad/comonad-4.2.7.2.ebuild b/dev-haskell/comonad/comonad-4.2.7.2.ebuild
index fd9f2ce3ed98..07a6c22f150f 100644
--- a/dev-haskell/comonad/comonad-4.2.7.2.ebuild
+++ b/dev-haskell/comonad/comonad-4.2.7.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+containers +contravariant +distributive +test-doctests"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-haskell/comonad/comonad-5.ebuild b/dev-haskell/comonad/comonad-5.ebuild
index 9903125e4a29..848465e4775e 100644
--- a/dev-haskell/comonad/comonad-5.ebuild
+++ b/dev-haskell/comonad/comonad-5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+containers +contravariant +distributive +test-doctests"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-haskell/concurrent-extra/concurrent-extra-0.7.0.10.ebuild b/dev-haskell/concurrent-extra/concurrent-extra-0.7.0.10.ebuild
index e5f7d4125f42..f4d13217d944 100644
--- a/dev-haskell/concurrent-extra/concurrent-extra-0.7.0.10.ebuild
+++ b/dev-haskell/concurrent-extra/concurrent-extra-0.7.0.10.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/stm-2.1.2.1:=[profile?] <dev-haskell/stm-2.5:=[profile?]
diff --git a/dev-haskell/conduit-extra/conduit-extra-1.1.9.1.ebuild b/dev-haskell/conduit-extra/conduit-extra-1.1.9.1.ebuild
index a2ec8825a22c..7509d59784ab 100644
--- a/dev-haskell/conduit-extra/conduit-extra-1.1.9.1.ebuild
+++ b/dev-haskell/conduit-extra/conduit-extra-1.1.9.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/attoparsec-0.10:=[profile?]
diff --git a/dev-haskell/conduit/conduit-1.0.15.1.ebuild b/dev-haskell/conduit/conduit-1.0.15.1.ebuild
index 51d2e833765f..ad5ab120fa21 100644
--- a/dev-haskell/conduit/conduit-1.0.15.1.ebuild
+++ b/dev-haskell/conduit/conduit-1.0.15.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="nohandles"
 
 RDEPEND=">=dev-haskell/lifted-base-0.1:=[profile?]
diff --git a/dev-haskell/conduit/conduit-1.1.6.ebuild b/dev-haskell/conduit/conduit-1.1.6.ebuild
index 21b9e5376c0a..78b6a2dee8b8 100644
--- a/dev-haskell/conduit/conduit-1.1.6.ebuild
+++ b/dev-haskell/conduit/conduit-1.1.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/exceptions:=[profile?]
diff --git a/dev-haskell/conduit/conduit-1.2.6.6.ebuild b/dev-haskell/conduit/conduit-1.2.6.6.ebuild
index 160825724505..6bb09aa4c011 100644
--- a/dev-haskell/conduit/conduit-1.2.6.6.ebuild
+++ b/dev-haskell/conduit/conduit-1.2.6.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/exceptions-0.6:=[profile?]
diff --git a/dev-haskell/conduit/conduit-1.2.8.ebuild b/dev-haskell/conduit/conduit-1.2.8.ebuild
index bb51d475fb53..2c64cffd4bfd 100644
--- a/dev-haskell/conduit/conduit-1.2.8.ebuild
+++ b/dev-haskell/conduit/conduit-1.2.8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/exceptions-0.6:=[profile?]
diff --git a/dev-haskell/connection/connection-0.2.4.ebuild b/dev-haskell/connection/connection-0.2.4.ebuild
index c67cdae99f34..a629a9446d49 100644
--- a/dev-haskell/connection/connection-0.2.4.ebuild
+++ b/dev-haskell/connection/connection-0.2.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/byteable:=[profile?]
diff --git a/dev-haskell/constraints/constraints-0.4.1.3.ebuild b/dev-haskell/constraints/constraints-0.4.1.3.ebuild
index ef8f8b60bfc1..e7cfd357418a 100644
--- a/dev-haskell/constraints/constraints-0.4.1.3.ebuild
+++ b/dev-haskell/constraints/constraints-0.4.1.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/newtype-0.2:=[profile?] <dev-haskell/newtype-0.3:=[profile?]
diff --git a/dev-haskell/contravariant/contravariant-0.6.ebuild b/dev-haskell/contravariant/contravariant-0.6.ebuild
index 77f4b38f47a5..290f2f95e911 100644
--- a/dev-haskell/contravariant/contravariant-0.6.ebuild
+++ b/dev-haskell/contravariant/contravariant-0.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
diff --git a/dev-haskell/contravariant/contravariant-1.3.3.ebuild b/dev-haskell/contravariant/contravariant-1.3.3.ebuild
index f7048bca5581..db84075bdfb7 100644
--- a/dev-haskell/contravariant/contravariant-1.3.3.ebuild
+++ b/dev-haskell/contravariant/contravariant-1.3.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+semigroups +statevar +tagged"
 
 RDEPEND=">=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
diff --git a/dev-haskell/contravariant/contravariant-1.4.ebuild b/dev-haskell/contravariant/contravariant-1.4.ebuild
index f3a3003f4bb7..babb8565a2bf 100644
--- a/dev-haskell/contravariant/contravariant-1.4.ebuild
+++ b/dev-haskell/contravariant/contravariant-1.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="safe +semigroups +statevar +tagged"
 
 RDEPEND=">=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
diff --git a/dev-haskell/cookie/cookie-0.4.2.ebuild b/dev-haskell/cookie/cookie-0.4.2.ebuild
index 46178c15cb47..4fed26489fcb 100644
--- a/dev-haskell/cookie/cookie-0.4.2.ebuild
+++ b/dev-haskell/cookie/cookie-0.4.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/blaze-builder-0.2.1:=[profile?]
diff --git a/dev-haskell/cpphs/cpphs-1.15.ebuild b/dev-haskell/cpphs/cpphs-1.15.ebuild
index 2551efc2608a..3a9385d4d4df 100644
--- a/dev-haskell/cpphs/cpphs-1.15.ebuild
+++ b/dev-haskell/cpphs/cpphs-1.15.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.10.4:="
diff --git a/dev-haskell/cpphs/cpphs-1.16.ebuild b/dev-haskell/cpphs/cpphs-1.16.ebuild
index a413824bf004..da7f6d02c626 100644
--- a/dev-haskell/cpphs/cpphs-1.16.ebuild
+++ b/dev-haskell/cpphs/cpphs-1.16.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.10.4:="
diff --git a/dev-haskell/cpphs/cpphs-1.17.1.ebuild b/dev-haskell/cpphs/cpphs-1.17.1.ebuild
index be1424f50cd6..c332f9a6af96 100644
--- a/dev-haskell/cpphs/cpphs-1.17.1.ebuild
+++ b/dev-haskell/cpphs/cpphs-1.17.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.10.4:="
diff --git a/dev-haskell/cpphs/cpphs-1.19.3.ebuild b/dev-haskell/cpphs/cpphs-1.19.3.ebuild
index 1db757804519..7611afa71bd3 100644
--- a/dev-haskell/cpphs/cpphs-1.19.3.ebuild
+++ b/dev-haskell/cpphs/cpphs-1.19.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/old-locale:=[profile?]
diff --git a/dev-haskell/cprng-aes/cprng-aes-0.5.2.ebuild b/dev-haskell/cprng-aes/cprng-aes-0.5.2.ebuild
index d8e9df434478..f6586c2f63ec 100644
--- a/dev-haskell/cprng-aes/cprng-aes-0.5.2.ebuild
+++ b/dev-haskell/cprng-aes/cprng-aes-0.5.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/byteable:=[profile?]
diff --git a/dev-haskell/crypto-api/crypto-api-0.13.2.ebuild b/dev-haskell/crypto-api/crypto-api-0.13.2.ebuild
index 1f0970c8b204..982a547b9ab4 100644
--- a/dev-haskell/crypto-api/crypto-api-0.13.2.ebuild
+++ b/dev-haskell/crypto-api/crypto-api-0.13.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="all-cpolys"
 
 RDEPEND=">=dev-haskell/cereal-0.2:=[profile?]
diff --git a/dev-haskell/crypto-cipher-tests/crypto-cipher-tests-0.0.11-r1.ebuild b/dev-haskell/crypto-cipher-tests/crypto-cipher-tests-0.0.11-r1.ebuild
index 84b89de5b15e..a7ccdd905aea 100644
--- a/dev-haskell/crypto-cipher-tests/crypto-cipher-tests-0.0.11-r1.ebuild
+++ b/dev-haskell/crypto-cipher-tests/crypto-cipher-tests-0.0.11-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/byteable-0.1.1:=[profile?] <dev-haskell/byteable-0.2:=[profile?]
diff --git a/dev-haskell/crypto-cipher-types/crypto-cipher-types-0.0.9.ebuild b/dev-haskell/crypto-cipher-types/crypto-cipher-types-0.0.9.ebuild
index d4f5b6b017bc..ffa134fe1227 100644
--- a/dev-haskell/crypto-cipher-types/crypto-cipher-types-0.0.9.ebuild
+++ b/dev-haskell/crypto-cipher-types/crypto-cipher-types-0.0.9.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/byteable-0.1.1:=[profile?]
diff --git a/dev-haskell/crypto-numbers/crypto-numbers-0.2.3.ebuild b/dev-haskell/crypto-numbers/crypto-numbers-0.2.3.ebuild
index 086f6d9368d2..ca0c64b465e3 100644
--- a/dev-haskell/crypto-numbers/crypto-numbers-0.2.3.ebuild
+++ b/dev-haskell/crypto-numbers/crypto-numbers-0.2.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/crypto-random-0.0:=[profile?] <dev-haskell/crypto-random-0.1:=[profile?]
diff --git a/dev-haskell/crypto-numbers/crypto-numbers-0.2.7.ebuild b/dev-haskell/crypto-numbers/crypto-numbers-0.2.7.ebuild
index 5d2ecc33c284..7f5489f6fd4d 100644
--- a/dev-haskell/crypto-numbers/crypto-numbers-0.2.7.ebuild
+++ b/dev-haskell/crypto-numbers/crypto-numbers-0.2.7.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+gmp"
 
 RDEPEND=">=dev-haskell/crypto-random-0.0:=[profile?] <dev-haskell/crypto-random-0.1:=[profile?]
diff --git a/dev-haskell/crypto-pubkey-types/crypto-pubkey-types-0.4.3.ebuild b/dev-haskell/crypto-pubkey-types/crypto-pubkey-types-0.4.3.ebuild
index 8856af67cd9c..4b4635f40e7c 100644
--- a/dev-haskell/crypto-pubkey-types/crypto-pubkey-types-0.4.3.ebuild
+++ b/dev-haskell/crypto-pubkey-types/crypto-pubkey-types-0.4.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/asn1-encoding:=[profile?]
diff --git a/dev-haskell/crypto-pubkey/crypto-pubkey-0.2.8.ebuild b/dev-haskell/crypto-pubkey/crypto-pubkey-0.2.8.ebuild
index 51bf61b87229..eb419ccd7dc9 100644
--- a/dev-haskell/crypto-pubkey/crypto-pubkey-0.2.8.ebuild
+++ b/dev-haskell/crypto-pubkey/crypto-pubkey-0.2.8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RESTRICT=test # missing files
diff --git a/dev-haskell/crypto-random/crypto-random-0.0.7.ebuild b/dev-haskell/crypto-random/crypto-random-0.0.7.ebuild
index f82ef5b3af6d..19c69379f71f 100644
--- a/dev-haskell/crypto-random/crypto-random-0.0.7.ebuild
+++ b/dev-haskell/crypto-random/crypto-random-0.0.7.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/securemem:=[profile?]
diff --git a/dev-haskell/crypto-random/crypto-random-0.0.9.ebuild b/dev-haskell/crypto-random/crypto-random-0.0.9.ebuild
index 09a5046e891e..075a5fa7ad44 100644
--- a/dev-haskell/crypto-random/crypto-random-0.0.9.ebuild
+++ b/dev-haskell/crypto-random/crypto-random-0.0.9.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/securemem:=[profile?]
diff --git a/dev-haskell/crypto/crypto-4.2.5.1-r1.ebuild b/dev-haskell/crypto/crypto-4.2.5.1-r1.ebuild
index 746151c0d4e5..72d4fa075413 100644
--- a/dev-haskell/crypto/crypto-4.2.5.1-r1.ebuild
+++ b/dev-haskell/crypto/crypto-4.2.5.1-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 
 LICENSE="BSD GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/hunit:=[profile?]
diff --git a/dev-haskell/cryptohash-sha256/cryptohash-sha256-0.11.100.1.ebuild b/dev-haskell/cryptohash-sha256/cryptohash-sha256-0.11.100.1.ebuild
index f6d6d9618724..b182becb5348 100644
--- a/dev-haskell/cryptohash-sha256/cryptohash-sha256-0.11.100.1.ebuild
+++ b/dev-haskell/cryptohash-sha256/cryptohash-sha256-0.11.100.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/cryptohash/cryptohash-0.10.0.ebuild b/dev-haskell/cryptohash/cryptohash-0.10.0.ebuild
index a7a56512bd27..b7a44a1a548c 100644
--- a/dev-haskell/cryptohash/cryptohash-0.10.0.ebuild
+++ b/dev-haskell/cryptohash/cryptohash-0.10.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/byteable:=[profile?]
diff --git a/dev-haskell/cryptohash/cryptohash-0.11.1.ebuild b/dev-haskell/cryptohash/cryptohash-0.11.1.ebuild
index 561047e817d2..502143ad01c4 100644
--- a/dev-haskell/cryptohash/cryptohash-0.11.1.ebuild
+++ b/dev-haskell/cryptohash/cryptohash-0.11.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/byteable:=[profile?]
diff --git a/dev-haskell/cryptonite/cryptonite-0.21.ebuild b/dev-haskell/cryptonite/cryptonite-0.21.ebuild
index dffa58355aae..531dfe8cfb7f 100644
--- a/dev-haskell/cryptonite/cryptonite-0.21.ebuild
+++ b/dev-haskell/cryptonite/cryptonite-0.21.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="cpu-flags-x86-rdrand cpu_flags_x86_aes cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 +integer-gmp"
 
 RDEPEND=">=dev-haskell/memory-0.8:=[profile?]
diff --git a/dev-haskell/css-text/css-text-0.1.2.1.ebuild b/dev-haskell/css-text/css-text-0.1.2.1.ebuild
index ea9a3c4355bb..65a1bd502c19 100644
--- a/dev-haskell/css-text/css-text-0.1.2.1.ebuild
+++ b/dev-haskell/css-text/css-text-0.1.2.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/attoparsec-0.10.2.0:=[profile?]
diff --git a/dev-haskell/curl/curl-1.3.8.ebuild b/dev-haskell/curl/curl-1.3.8.ebuild
index f51aca0a4010..d36ffad02dce 100644
--- a/dev-haskell/curl/curl-1.3.8.ebuild
+++ b/dev-haskell/curl/curl-1.3.8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.10.4:=
diff --git a/dev-haskell/data-default-class/data-default-class-0.0.1.ebuild b/dev-haskell/data-default-class/data-default-class-0.0.1.ebuild
index 4ed582714244..d4911124abbd 100644
--- a/dev-haskell/data-default-class/data-default-class-0.0.1.ebuild
+++ b/dev-haskell/data-default-class/data-default-class-0.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.10.4:="
diff --git a/dev-haskell/data-default-instances-base/data-default-instances-base-0.0.1.ebuild b/dev-haskell/data-default-instances-base/data-default-instances-base-0.0.1.ebuild
index abfe841fe6bc..f5719b5bbb62 100644
--- a/dev-haskell/data-default-instances-base/data-default-instances-base-0.0.1.ebuild
+++ b/dev-haskell/data-default-instances-base/data-default-instances-base-0.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 RDEPEND="dev-haskell/data-default-class:=[profile?]
diff --git a/dev-haskell/data-default-instances-containers/data-default-instances-containers-0.0.1.ebuild b/dev-haskell/data-default-instances-containers/data-default-instances-containers-0.0.1.ebuild
index df94619b4602..6b9552fd4c4c 100644
--- a/dev-haskell/data-default-instances-containers/data-default-instances-containers-0.0.1.ebuild
+++ b/dev-haskell/data-default-instances-containers/data-default-instances-containers-0.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 RDEPEND="dev-haskell/data-default-class:=[profile?]
diff --git a/dev-haskell/data-default-instances-dlist/data-default-instances-dlist-0.0.1.ebuild b/dev-haskell/data-default-instances-dlist/data-default-instances-dlist-0.0.1.ebuild
index e654420738dc..5da4cd4a8d9b 100644
--- a/dev-haskell/data-default-instances-dlist/data-default-instances-dlist-0.0.1.ebuild
+++ b/dev-haskell/data-default-instances-dlist/data-default-instances-dlist-0.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 RDEPEND="dev-haskell/data-default-class:=[profile?]
diff --git a/dev-haskell/data-default-instances-old-locale/data-default-instances-old-locale-0.0.1.ebuild b/dev-haskell/data-default-instances-old-locale/data-default-instances-old-locale-0.0.1.ebuild
index e775438a1127..8714637d8205 100644
--- a/dev-haskell/data-default-instances-old-locale/data-default-instances-old-locale-0.0.1.ebuild
+++ b/dev-haskell/data-default-instances-old-locale/data-default-instances-old-locale-0.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 RDEPEND="dev-haskell/data-default-class:=[profile?]
diff --git a/dev-haskell/data-default/data-default-0.5.3.ebuild b/dev-haskell/data-default/data-default-0.5.3.ebuild
index 30d7bcc8a23e..8aca9b09e700 100644
--- a/dev-haskell/data-default/data-default-0.5.3.ebuild
+++ b/dev-haskell/data-default/data-default-0.5.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 RDEPEND="dev-haskell/data-default-class:=[profile?]
diff --git a/dev-haskell/data-ordlist/data-ordlist-0.4.7.0.ebuild b/dev-haskell/data-ordlist/data-ordlist-0.4.7.0.ebuild
index bfd9d7a6fb93..a40607c015de 100644
--- a/dev-haskell/data-ordlist/data-ordlist-0.4.7.0.ebuild
+++ b/dev-haskell/data-ordlist/data-ordlist-0.4.7.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/dataenc/dataenc-0.14.0.5.ebuild b/dev-haskell/dataenc/dataenc-0.14.0.5.ebuild
index cc3381148e54..2788074ca25f 100644
--- a/dev-haskell/dataenc/dataenc-0.14.0.5.ebuild
+++ b/dev-haskell/dataenc/dataenc-0.14.0.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.10.4:="
diff --git a/dev-haskell/dbus/dbus-0.10.10.ebuild b/dev-haskell/dbus/dbus-0.10.10.ebuild
index 2a11d29abdca..1cd38eef5268 100644
--- a/dev-haskell/dbus/dbus-0.10.10.ebuild
+++ b/dev-haskell/dbus/dbus-0.10.10.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/cereal-0.3.4:=[profile?] <dev-haskell/cereal-0.5:=[profile?]
diff --git a/dev-haskell/dbus/dbus-0.10.13.ebuild b/dev-haskell/dbus/dbus-0.10.13.ebuild
index 38aee5733ed7..c23b21875bc3 100644
--- a/dev-haskell/dbus/dbus-0.10.13.ebuild
+++ b/dev-haskell/dbus/dbus-0.10.13.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RESTRICT=test # don't allow access to running dbus
diff --git a/dev-haskell/deepseq-generics/deepseq-generics-0.1.1.2.ebuild b/dev-haskell/deepseq-generics/deepseq-generics-0.1.1.2.ebuild
index 7ca3421ca34e..d8b760e1e108 100644
--- a/dev-haskell/deepseq-generics/deepseq-generics-0.1.1.2.ebuild
+++ b/dev-haskell/deepseq-generics/deepseq-generics-0.1.1.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/deepseq-generics/deepseq-generics-0.2.0.0.ebuild b/dev-haskell/deepseq-generics/deepseq-generics-0.2.0.0.ebuild
index 87cfa3b9dc1a..141b385467a4 100644
--- a/dev-haskell/deepseq-generics/deepseq-generics-0.2.0.0.ebuild
+++ b/dev-haskell/deepseq-generics/deepseq-generics-0.2.0.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/diff/diff-0.3.0.ebuild b/dev-haskell/diff/diff-0.3.0.ebuild
index c460b4d337f5..0d54cbe28333 100644
--- a/dev-haskell/diff/diff-0.3.0.ebuild
+++ b/dev-haskell/diff/diff-0.3.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.10.4:="
diff --git a/dev-haskell/digest/digest-0.0.1.2.ebuild b/dev-haskell/digest/digest-0.0.1.2.ebuild
index 8bddc31a91d8..1a81cc71a2d9 100644
--- a/dev-haskell/digest/digest-0.0.1.2.ebuild
+++ b/dev-haskell/digest/digest-0.0.1.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.10.4:=
diff --git a/dev-haskell/distributive/distributive-0.4.4.ebuild b/dev-haskell/distributive/distributive-0.4.4.ebuild
index 86295406ba7a..9521e8f2c566 100644
--- a/dev-haskell/distributive/distributive-0.4.4.ebuild
+++ b/dev-haskell/distributive/distributive-0.4.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-1:=[profile?]
diff --git a/dev-haskell/distributive/distributive-0.5.2.ebuild b/dev-haskell/distributive/distributive-0.5.2.ebuild
index 2dd7399ce3ad..e8562fa8646f 100644
--- a/dev-haskell/distributive/distributive-0.5.2.ebuild
+++ b/dev-haskell/distributive/distributive-0.5.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/base-orphans-0.5:=[profile?] <dev-haskell/base-orphans-1:=[profile?]
diff --git a/dev-haskell/dlist/dlist-0.5-r1.ebuild b/dev-haskell/dlist/dlist-0.5-r1.ebuild
index e2bd6fc4191c..104e8ee72310 100644
--- a/dev-haskell/dlist/dlist-0.5-r1.ebuild
+++ b/dev-haskell/dlist/dlist-0.5-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.10.4:="
diff --git a/dev-haskell/dlist/dlist-0.6.0.1.ebuild b/dev-haskell/dlist/dlist-0.6.0.1.ebuild
index 019d69b2c889..f0207b3638bc 100644
--- a/dev-haskell/dlist/dlist-0.6.0.1.ebuild
+++ b/dev-haskell/dlist/dlist-0.6.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.10.4:=
diff --git a/dev-haskell/dlist/dlist-0.7.1.2.ebuild b/dev-haskell/dlist/dlist-0.7.1.2.ebuild
index f2e2e781e33f..8b1fbdd2392e 100644
--- a/dev-haskell/dlist/dlist-0.7.1.2.ebuild
+++ b/dev-haskell/dlist/dlist-0.7.1.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/dlist/dlist-0.7.1.ebuild b/dev-haskell/dlist/dlist-0.7.1.ebuild
index c729bb74f86e..f8e66f5598fb 100644
--- a/dev-haskell/dlist/dlist-0.7.1.ebuild
+++ b/dev-haskell/dlist/dlist-0.7.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/dlist/dlist-0.8.0.2.ebuild b/dev-haskell/dlist/dlist-0.8.0.2.ebuild
index 210334041742..e91234c028eb 100644
--- a/dev-haskell/dlist/dlist-0.8.0.2.ebuild
+++ b/dev-haskell/dlist/dlist-0.8.0.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/doctemplates/doctemplates-0.1.0.2.ebuild b/dev-haskell/doctemplates/doctemplates-0.1.0.2.ebuild
index f436bdcfdea0..9e235a135cb5 100644
--- a/dev-haskell/doctemplates/doctemplates-0.1.0.2.ebuild
+++ b/dev-haskell/doctemplates/doctemplates-0.1.0.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/aeson:=[profile?]
diff --git a/dev-haskell/doctest/doctest-0.10.1.ebuild b/dev-haskell/doctest/doctest-0.10.1.ebuild
index 7a9df6f8f443..ba5800049912 100644
--- a/dev-haskell/doctest/doctest-0.10.1.ebuild
+++ b/dev-haskell/doctest/doctest-0.10.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/ghc-paths-0.1.0.9:=[profile?]
diff --git a/dev-haskell/doctest/doctest-0.11.1.ebuild b/dev-haskell/doctest/doctest-0.11.1.ebuild
index 4ef88b2fbb52..bb34ec51fa5a 100644
--- a/dev-haskell/doctest/doctest-0.11.1.ebuild
+++ b/dev-haskell/doctest/doctest-0.11.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/base-compat-0.7.0:=[profile?]
diff --git a/dev-haskell/doctest/doctest-0.9.12.ebuild b/dev-haskell/doctest/doctest-0.9.12.ebuild
index ade49bc537b2..ef03eee3ce9c 100644
--- a/dev-haskell/doctest/doctest-0.9.12.ebuild
+++ b/dev-haskell/doctest/doctest-0.9.12.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/ghc-paths-0.1.0.9:=[profile?]
diff --git a/dev-haskell/drift/drift-2.4.2.ebuild b/dev-haskell/drift/drift-2.4.2.ebuild
index 8652446e481e..7febd7ca3907 100644
--- a/dev-haskell/drift/drift-2.4.2.ebuild
+++ b/dev-haskell/drift/drift-2.4.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/old-time:=[profile?]
diff --git a/dev-haskell/easy-file/easy-file-0.2.1.ebuild b/dev-haskell/easy-file/easy-file-0.2.1.ebuild
index 267d2a20efda..63d0588abd8b 100644
--- a/dev-haskell/easy-file/easy-file-0.2.1.ebuild
+++ b/dev-haskell/easy-file/easy-file-0.2.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/ed25519/ed25519-0.0.5.0.ebuild b/dev-haskell/ed25519/ed25519-0.0.5.0.ebuild
index d99aa7750e8e..4d24f844aa37 100644
--- a/dev-haskell/ed25519/ed25519-0.0.5.0.ebuild
+++ b/dev-haskell/ed25519/ed25519-0.0.5.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/email-validate/email-validate-2.0.1.ebuild b/dev-haskell/email-validate/email-validate-2.0.1.ebuild
index 8d58bea0b2a3..f50409f9a818 100644
--- a/dev-haskell/email-validate/email-validate-2.0.1.ebuild
+++ b/dev-haskell/email-validate/email-validate-2.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/attoparsec-0.10.0:=[profile?]
diff --git a/dev-haskell/enclosed-exceptions/enclosed-exceptions-1.0.1.1.ebuild b/dev-haskell/enclosed-exceptions/enclosed-exceptions-1.0.1.1.ebuild
index 99397f321f9f..3d72eec60cce 100644
--- a/dev-haskell/enclosed-exceptions/enclosed-exceptions-1.0.1.1.ebuild
+++ b/dev-haskell/enclosed-exceptions/enclosed-exceptions-1.0.1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/async-2.0:=[profile?]
diff --git a/dev-haskell/encoding/encoding-0.6.7.2-r2.ebuild b/dev-haskell/encoding/encoding-0.6.7.2-r2.ebuild
index d2ff23af326f..2eac3715b8aa 100644
--- a/dev-haskell/encoding/encoding-0.6.7.2-r2.ebuild
+++ b/dev-haskell/encoding/encoding-0.6.7.2-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/binary:=[profile?]
diff --git a/dev-haskell/encoding/encoding-0.8.ebuild b/dev-haskell/encoding/encoding-0.8.ebuild
index 7580d1f8c584..62e277644a9d 100644
--- a/dev-haskell/encoding/encoding-0.8.ebuild
+++ b/dev-haskell/encoding/encoding-0.8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+systemencoding"
 
 RDEPEND="<dev-haskell/binary-0.8:=[profile?]
diff --git a/dev-haskell/entropy/entropy-0.3.7.ebuild b/dev-haskell/entropy/entropy-0.3.7.ebuild
index 0779407ce5b9..11ee6bfa07e5 100644
--- a/dev-haskell/entropy/entropy-0.3.7.ebuild
+++ b/dev-haskell/entropy/entropy-0.3.7.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="halvm"
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/enumerator/enumerator-0.4.20.ebuild b/dev-haskell/enumerator/enumerator-0.4.20.ebuild
index 1b5c682169fa..135477c4a952 100644
--- a/dev-haskell/enumerator/enumerator-0.4.20.ebuild
+++ b/dev-haskell/enumerator/enumerator-0.4.20.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/text-0.7:=[profile?]
diff --git a/dev-haskell/errorcall-eq-instance/errorcall-eq-instance-0.1.0.ebuild b/dev-haskell/errorcall-eq-instance/errorcall-eq-instance-0.1.0.ebuild
index 33de9dc82abc..045aa73fa0d2 100644
--- a/dev-haskell/errorcall-eq-instance/errorcall-eq-instance-0.1.0.ebuild
+++ b/dev-haskell/errorcall-eq-instance/errorcall-eq-instance-0.1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.10.4:=
diff --git a/dev-haskell/exceptions/exceptions-0.6.1.ebuild b/dev-haskell/exceptions/exceptions-0.6.1.ebuild
index 091831d9ed0d..ac293efaf12f 100644
--- a/dev-haskell/exceptions/exceptions-0.6.1.ebuild
+++ b/dev-haskell/exceptions/exceptions-0.6.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
diff --git a/dev-haskell/exceptions/exceptions-0.8.2.1.ebuild b/dev-haskell/exceptions/exceptions-0.8.2.1.ebuild
index 45065c912d63..58c336f452fb 100644
--- a/dev-haskell/exceptions/exceptions-0.8.2.1.ebuild
+++ b/dev-haskell/exceptions/exceptions-0.8.2.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
diff --git a/dev-haskell/exceptions/exceptions-0.8.3.ebuild b/dev-haskell/exceptions/exceptions-0.8.3.ebuild
index de3423494821..a0948f27c3c9 100644
--- a/dev-haskell/exceptions/exceptions-0.8.3.ebuild
+++ b/dev-haskell/exceptions/exceptions-0.8.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
diff --git a/dev-haskell/executable-path/executable-path-0.0.3-r1.ebuild b/dev-haskell/executable-path/executable-path-0.0.3-r1.ebuild
index bd3ba628abc9..213280bd2df8 100644
--- a/dev-haskell/executable-path/executable-path-0.0.3-r1.ebuild
+++ b/dev-haskell/executable-path/executable-path-0.0.3-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/extensible-exceptions/extensible-exceptions-0.1.1.4.ebuild b/dev-haskell/extensible-exceptions/extensible-exceptions-0.1.1.4.ebuild
index e5be57f0e752..2ba6e3f59aa4 100644
--- a/dev-haskell/extensible-exceptions/extensible-exceptions-0.1.1.4.ebuild
+++ b/dev-haskell/extensible-exceptions/extensible-exceptions-0.1.1.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.10.4:="
diff --git a/dev-haskell/extra/extra-1.4.2.ebuild b/dev-haskell/extra/extra-1.4.2.ebuild
index 30ca52e79a1a..5b0daf5218d5 100644
--- a/dev-haskell/extra/extra-1.4.2.ebuild
+++ b/dev-haskell/extra/extra-1.4.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 LICENSE="BSD"
 # this package has nothing to do with extra:0 (aka Extra on hackage)
 SLOT="2/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/extra/extra-1.5.1.ebuild b/dev-haskell/extra/extra-1.5.1.ebuild
index 17a3302aa238..9e12544fa3f4 100644
--- a/dev-haskell/extra/extra-1.5.1.ebuild
+++ b/dev-haskell/extra/extra-1.5.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="2/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/clock-0.7:=[profile?]
diff --git a/dev-haskell/fail/fail-4.9.0.0.ebuild b/dev-haskell/fail/fail-4.9.0.0.ebuild
index 100bfa584d47..01c2904253c0 100644
--- a/dev-haskell/fail/fail-4.9.0.0.ebuild
+++ b/dev-haskell/fail/fail-4.9.0.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/failure/failure-0.2.0.3.ebuild b/dev-haskell/failure/failure-0.2.0.3.ebuild
index 47ef50e47b99..3aa1a147b1de 100644
--- a/dev-haskell/failure/failure-0.2.0.3.ebuild
+++ b/dev-haskell/failure/failure-0.2.0.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/transformers-0.2:=[profile?]
diff --git a/dev-haskell/fast-logger/fast-logger-2.4.6.ebuild b/dev-haskell/fast-logger/fast-logger-2.4.6.ebuild
index 3f05e6829231..2696019e7d0a 100644
--- a/dev-haskell/fast-logger/fast-logger-2.4.6.ebuild
+++ b/dev-haskell/fast-logger/fast-logger-2.4.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/auto-update-0.1.2:=[profile?]
diff --git a/dev-haskell/fgl-arbitrary/fgl-arbitrary-0.2.0.1.ebuild b/dev-haskell/fgl-arbitrary/fgl-arbitrary-0.2.0.1.ebuild
index 2fd7e483f69f..c9e11df0d0e5 100644
--- a/dev-haskell/fgl-arbitrary/fgl-arbitrary-0.2.0.1.ebuild
+++ b/dev-haskell/fgl-arbitrary/fgl-arbitrary-0.2.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/fgl-5.5.2.0:=[profile?] <dev-haskell/fgl-6:=[profile?]
diff --git a/dev-haskell/fgl-arbitrary/fgl-arbitrary-0.2.0.2.ebuild b/dev-haskell/fgl-arbitrary/fgl-arbitrary-0.2.0.2.ebuild
index d7e4a8fe851a..2142d6a98d83 100644
--- a/dev-haskell/fgl-arbitrary/fgl-arbitrary-0.2.0.2.ebuild
+++ b/dev-haskell/fgl-arbitrary/fgl-arbitrary-0.2.0.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/fgl-5.5.2.0:=[profile?] <dev-haskell/fgl-6:=[profile?]
diff --git a/dev-haskell/fgl/fgl-5.5.0.1.ebuild b/dev-haskell/fgl/fgl-5.5.0.1.ebuild
index a98533ef0650..05edff756767 100644
--- a/dev-haskell/fgl/fgl-5.5.0.1.ebuild
+++ b/dev-haskell/fgl/fgl-5.5.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/mtl:=[profile?]
diff --git a/dev-haskell/fgl/fgl-5.5.2.3.ebuild b/dev-haskell/fgl/fgl-5.5.2.3.ebuild
index f849764a194f..1658893bb502 100644
--- a/dev-haskell/fgl/fgl-5.5.2.3.ebuild
+++ b/dev-haskell/fgl/fgl-5.5.2.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/transformers:=[profile?]
diff --git a/dev-haskell/fgl/fgl-5.5.3.0.ebuild b/dev-haskell/fgl/fgl-5.5.3.0.ebuild
index 27054f82c6a4..b8ad0263504f 100644
--- a/dev-haskell/fgl/fgl-5.5.3.0.ebuild
+++ b/dev-haskell/fgl/fgl-5.5.3.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="dev-haskell/transformers:=[profile?]
diff --git a/dev-haskell/file-embed/file-embed-0.0.7.ebuild b/dev-haskell/file-embed/file-embed-0.0.7.ebuild
index b5390b1bb06c..2f1d4a196b31 100644
--- a/dev-haskell/file-embed/file-embed-0.0.7.ebuild
+++ b/dev-haskell/file-embed/file-embed-0.0.7.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/filemanip/filemanip-0.3.6.3.ebuild b/dev-haskell/filemanip/filemanip-0.3.6.3.ebuild
index 09c976d1ed9b..5a2a2c084f9f 100644
--- a/dev-haskell/filemanip/filemanip-0.3.6.3.ebuild
+++ b/dev-haskell/filemanip/filemanip-0.3.6.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/mtl:=[profile?]
diff --git a/dev-haskell/findbin/findbin-0.0.5-r1.ebuild b/dev-haskell/findbin/findbin-0.0.5-r1.ebuild
index e9a314515a6a..1c52f7f3807b 100644
--- a/dev-haskell/findbin/findbin-0.0.5-r1.ebuild
+++ b/dev-haskell/findbin/findbin-0.0.5-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.10.4:="
diff --git a/dev-haskell/free/free-4.12.4.ebuild b/dev-haskell/free/free-4.12.4.ebuild
index 4a05bfd7d615..edeaea73155e 100644
--- a/dev-haskell/free/free-4.12.4.ebuild
+++ b/dev-haskell/free/free-4.12.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/bifunctors-4:=[profile?] <dev-haskell/bifunctors-6:=[profile?]
diff --git a/dev-haskell/frown/frown-0.6.2.3.ebuild b/dev-haskell/frown/frown-0.6.2.3.ebuild
index 9d76e0d1a48b..f152ea25f481 100644
--- a/dev-haskell/frown/frown-0.6.2.3.ebuild
+++ b/dev-haskell/frown/frown-0.6.2.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/generic-deriving/generic-deriving-1.11.1.ebuild b/dev-haskell/generic-deriving/generic-deriving-1.11.1.ebuild
index b66962b8fd43..3dc5dc031c90 100644
--- a/dev-haskell/generic-deriving/generic-deriving-1.11.1.ebuild
+++ b/dev-haskell/generic-deriving/generic-deriving-1.11.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/generic-deriving/generic-deriving-1.7.0.ebuild b/dev-haskell/generic-deriving/generic-deriving-1.7.0.ebuild
index c167a28d950e..51040d37e747 100644
--- a/dev-haskell/generic-deriving/generic-deriving-1.7.0.ebuild
+++ b/dev-haskell/generic-deriving/generic-deriving-1.7.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/ghc-paths/ghc-paths-0.1.0.9.ebuild b/dev-haskell/ghc-paths/ghc-paths-0.1.0.9.ebuild
index fd6d6870f63f..e1204d50420d 100644
--- a/dev-haskell/ghc-paths/ghc-paths-0.1.0.9.ebuild
+++ b/dev-haskell/ghc-paths/ghc-paths-0.1.0.9.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.8.2:="
diff --git a/dev-haskell/gio/gio-0.12.5.3.ebuild b/dev-haskell/gio/gio-0.12.5.3.ebuild
index f82cac3953ee..1ffed1b5d6f6 100644
--- a/dev-haskell/gio/gio-0.12.5.3.ebuild
+++ b/dev-haskell/gio/gio-0.12.5.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/glib-0.12.5.3:0=[profile?] <dev-haskell/glib-0.13:0=[profile?]
diff --git a/dev-haskell/gio/gio-0.13.1.1.ebuild b/dev-haskell/gio/gio-0.13.1.1.ebuild
index 9368aa38d8e0..bd6bcd7226a2 100644
--- a/dev-haskell/gio/gio-0.13.1.1.ebuild
+++ b/dev-haskell/gio/gio-0.13.1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/glib-0.13.0.0:=[profile?] <dev-haskell/glib-0.14:=[profile?]
diff --git a/dev-haskell/gio/gio-0.13.3.1.ebuild b/dev-haskell/gio/gio-0.13.3.1.ebuild
index f0337baa85ff..353d6815d666 100644
--- a/dev-haskell/gio/gio-0.13.3.1.ebuild
+++ b/dev-haskell/gio/gio-0.13.3.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/glib-0.13.0.0:=[profile?] <dev-haskell/glib-0.14:=[profile?]
diff --git a/dev-haskell/glade/glade-0.12.5.0-r100.ebuild b/dev-haskell/glade/glade-0.12.5.0-r100.ebuild
index 1d071a334dbf..786bb0925788 100644
--- a/dev-haskell/glade/glade-0.12.5.0-r100.ebuild
+++ b/dev-haskell/glade/glade-0.12.5.0-r100.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="2/${PV}"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/glib-0.12.5.0:0=[profile?]
diff --git a/dev-haskell/glade/glade-0.12.5.0-r2.ebuild b/dev-haskell/glade/glade-0.12.5.0-r2.ebuild
index ec72c8748eb8..48cdb9998cf1 100644
--- a/dev-haskell/glade/glade-0.12.5.0-r2.ebuild
+++ b/dev-haskell/glade/glade-0.12.5.0-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="2/${PV}"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/glib-0.12.5.0:0=[profile?] <dev-haskell/glib-0.14:0=[profile?]
diff --git a/dev-haskell/glib/glib-0.12.5.4.ebuild b/dev-haskell/glib/glib-0.12.5.4.ebuild
index ae55fd8d67a7..2a6577d92cbb 100644
--- a/dev-haskell/glib/glib-0.12.5.4.ebuild
+++ b/dev-haskell/glib/glib-0.12.5.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="+closure-signals"
 
 RDEPEND=">=dev-haskell/utf8-string-0.2:=[profile?] <dev-haskell/utf8-string-0.4:=[profile?]
diff --git a/dev-haskell/glib/glib-0.13.2.2.ebuild b/dev-haskell/glib/glib-0.13.2.2.ebuild
index c66e57750569..d35d1890f00d 100644
--- a/dev-haskell/glib/glib-0.13.2.2.ebuild
+++ b/dev-haskell/glib/glib-0.13.2.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="+closure-signals"
 
 RDEPEND=">=dev-haskell/text-1.0.0.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
diff --git a/dev-haskell/glib/glib-0.13.4.1.ebuild b/dev-haskell/glib/glib-0.13.4.1.ebuild
index c3ddcbd446eb..c1f5c521a416 100644
--- a/dev-haskell/glib/glib-0.13.4.1.ebuild
+++ b/dev-haskell/glib/glib-0.13.4.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="+closure-signals"
 
 RDEPEND=">=dev-haskell/text-1.0.0.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
diff --git a/dev-haskell/gluraw/gluraw-1.3.0.0.ebuild b/dev-haskell/gluraw/gluraw-1.3.0.0.ebuild
index 4bd8df23a6a3..f0790a6e5704 100644
--- a/dev-haskell/gluraw/gluraw-1.3.0.0.ebuild
+++ b/dev-haskell/gluraw/gluraw-1.3.0.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="=dev-haskell/openglraw-1.3*:=[profile?]
diff --git a/dev-haskell/gluraw/gluraw-1.4.0.1.ebuild b/dev-haskell/gluraw/gluraw-1.4.0.1.ebuild
index 1f6da5e0ec39..275210de04a9 100644
--- a/dev-haskell/gluraw/gluraw-1.4.0.1.ebuild
+++ b/dev-haskell/gluraw/gluraw-1.4.0.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/openglraw-1.3.0.0:=[profile?]
diff --git a/dev-haskell/glut/glut-2.5.1.1.ebuild b/dev-haskell/glut/glut-2.5.1.1.ebuild
index 3dd1c4f4bb8d..afc4e8657810 100644
--- a/dev-haskell/glut/glut-2.5.1.1.ebuild
+++ b/dev-haskell/glut/glut-2.5.1.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/opengl-2.8.0.0:=[profile?]
diff --git a/dev-haskell/gnuidn/gnuidn-0.2.1.ebuild b/dev-haskell/gnuidn/gnuidn-0.2.1.ebuild
index 5410278001c1..b7ba91e322d3 100644
--- a/dev-haskell/gnuidn/gnuidn-0.2.1.ebuild
+++ b/dev-haskell/gnuidn/gnuidn-0.2.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/text:=[profile?]
diff --git a/dev-haskell/graphviz/graphviz-2999.18.0.2-r1.ebuild b/dev-haskell/graphviz/graphviz-2999.18.0.2-r1.ebuild
index d3a6b6fb86bd..0eacedc6af69 100644
--- a/dev-haskell/graphviz/graphviz-2999.18.0.2-r1.ebuild
+++ b/dev-haskell/graphviz/graphviz-2999.18.0.2-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RESTRICT=test # too slow
diff --git a/dev-haskell/graphviz/graphviz-2999.18.1.2.ebuild b/dev-haskell/graphviz/graphviz-2999.18.1.2.ebuild
index 6003d89ee020..5628b3b5ec54 100644
--- a/dev-haskell/graphviz/graphviz-2999.18.1.2.ebuild
+++ b/dev-haskell/graphviz/graphviz-2999.18.1.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-haskell/colour-2.3:=[profile?] <dev-haskell/colour-2.4:=[profile?]
diff --git a/dev-haskell/gtk/gtk-0.12.5.7.2.ebuild b/dev-haskell/gtk/gtk-0.12.5.7.2.ebuild
index 8d998e9e16f2..742aa165b7c0 100644
--- a/dev-haskell/gtk/gtk-0.12.5.7.2.ebuild
+++ b/dev-haskell/gtk/gtk-0.12.5.7.2.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="LGPL-2.1"
 SLOT="${GTK_MAJ_VER}/${PV}"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="+fmode-binary +gio"
 
 RDEPEND="fmode-binary? ( >=dev-haskell/glib-0.12.5.4:0=[profile?] <dev-haskell/glib-0.13:0=[profile?]
diff --git a/dev-haskell/gtk/gtk-0.13.9.ebuild b/dev-haskell/gtk/gtk-0.13.9.ebuild
index a066efc29111..6630fc28ff4e 100644
--- a/dev-haskell/gtk/gtk-0.13.9.ebuild
+++ b/dev-haskell/gtk/gtk-0.13.9.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="2/${PV}"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="+deprecated +fmode-binary +gio"
 
 RDEPEND=">=dev-haskell/cairo-0.13.0.0:=[profile?] <dev-haskell/cairo-0.14:=[profile?]
diff --git a/dev-haskell/gtk/gtk-0.14.6.ebuild b/dev-haskell/gtk/gtk-0.14.6.ebuild
index 2e3f339dba6b..d70f535b3423 100644
--- a/dev-haskell/gtk/gtk-0.14.6.ebuild
+++ b/dev-haskell/gtk/gtk-0.14.6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="2/${PV}"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="+deprecated +fmode-binary +gio"
 
 RDEPEND=">=dev-haskell/cairo-0.13.0.0:=[profile?] <dev-haskell/cairo-0.14:=[profile?]
diff --git a/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.12.5.1-r1.ebuild b/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.12.5.1-r1.ebuild
index 9072d43ccb8f..10c16f92d591 100644
--- a/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.12.5.1-r1.ebuild
+++ b/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.12.5.1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="+closuresignals"
 
 RDEPEND=""
diff --git a/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.13.0.4-r3.ebuild b/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.13.0.4-r3.ebuild
index be26eee6994d..ea5655631c6b 100644
--- a/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.13.0.4-r3.ebuild
+++ b/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.13.0.4-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="+closuresignals"
 
 RDEPEND="dev-haskell/random:=
diff --git a/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.13.2.2.ebuild b/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.13.2.2.ebuild
index cf59ee052a89..cd346ca80d73 100644
--- a/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.13.2.2.ebuild
+++ b/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.13.2.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="+closuresignals"
 
 RDEPEND=">=dev-haskell/cabal-1.24.0.0:=[profile?] <dev-haskell/cabal-1.25:=[profile?]
diff --git a/dev-haskell/gtk3/gtk3-0.13.7.ebuild b/dev-haskell/gtk3/gtk3-0.13.7.ebuild
index f37e1f833882..f515449a1c5f 100644
--- a/dev-haskell/gtk3/gtk3-0.13.7.ebuild
+++ b/dev-haskell/gtk3/gtk3-0.13.7.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="examples +fmode-binary +gio"
 
 RDEPEND=">=dev-haskell/cairo-0.13.0.0:=[profile?] <dev-haskell/cairo-0.14:=[profile?]
diff --git a/dev-haskell/gtk3/gtk3-0.14.6.ebuild b/dev-haskell/gtk3/gtk3-0.14.6.ebuild
index 4d10bcb5d5ac..4a1e749390e9 100644
--- a/dev-haskell/gtk3/gtk3-0.14.6.ebuild
+++ b/dev-haskell/gtk3/gtk3-0.14.6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="+fmode-binary +gio"
 
 RDEPEND=">=dev-haskell/cairo-0.13.0.0:=[profile?] <dev-haskell/cairo-0.14:=[profile?]
diff --git a/dev-haskell/hackage-security/hackage-security-0.5.2.2.ebuild b/dev-haskell/hackage-security/hackage-security-0.5.2.2.ebuild
index de934d6768c8..322038a689a7 100644
--- a/dev-haskell/hackage-security/hackage-security-0.5.2.2.ebuild
+++ b/dev-haskell/hackage-security/hackage-security-0.5.2.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+use-network-uri"
 
 RDEPEND=">=dev-haskell/base16-bytestring-0.1.1:=[profile?] <dev-haskell/base16-bytestring-0.2:=[profile?]
diff --git a/dev-haskell/haddock-api/haddock-api-2.16.1.ebuild b/dev-haskell/haddock-api/haddock-api-2.16.1.ebuild
index fa88b8a9a70f..59695c65f85b 100644
--- a/dev-haskell/haddock-api/haddock-api-2.16.1.ebuild
+++ b/dev-haskell/haddock-api/haddock-api-2.16.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-haskell/cabal-1.10:=[profile?]
diff --git a/dev-haskell/haddock-api/haddock-api-2.17.3.ebuild b/dev-haskell/haddock-api/haddock-api-2.17.3.ebuild
index 9b19f7d6f006..b5946759dcb2 100644
--- a/dev-haskell/haddock-api/haddock-api-2.17.3.ebuild
+++ b/dev-haskell/haddock-api/haddock-api-2.17.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0/${PV}"
 # keep in sync with ghc-8.0.1
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-haskell/cabal-1.10:=[profile?]
diff --git a/dev-haskell/haddock-library/haddock-library-1.2.1.ebuild b/dev-haskell/haddock-library/haddock-library-1.2.1.ebuild
index b5ac84903b8d..a6f8d39766fd 100644
--- a/dev-haskell/haddock-library/haddock-library-1.2.1.ebuild
+++ b/dev-haskell/haddock-library/haddock-library-1.2.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RESTRICT=test # on ghc-7.6 Prelude collides with base-compat
diff --git a/dev-haskell/haddock-library/haddock-library-1.4.2.ebuild b/dev-haskell/haddock-library/haddock-library-1.4.2.ebuild
index f73f82cf32a2..2b79fef4c7b7 100644
--- a/dev-haskell/haddock-library/haddock-library-1.4.2.ebuild
+++ b/dev-haskell/haddock-library/haddock-library-1.4.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0/${PV}"
 # keep in sync with ghc-8.0.1, might not be required but needs porting revdeps
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="dev-haskell/transformers:=[profile?]
diff --git a/dev-haskell/haddock/haddock-2.14.3.0.7.8.3.ebuild b/dev-haskell/haddock/haddock-2.14.3.0.7.8.3.ebuild
index fe9cc89bde06..b6bccd23bde7 100644
--- a/dev-haskell/haddock/haddock-2.14.3.0.7.8.3.ebuild
+++ b/dev-haskell/haddock/haddock-2.14.3.0.7.8.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://code.haskell.org/~slyfox/snapshots/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RESTRICT=test # many test depends are not keyworded yet
diff --git a/dev-haskell/haddock/haddock-2.16.1.ebuild b/dev-haskell/haddock/haddock-2.16.1.ebuild
index 3ccde11b9a13..f6f2d94710e4 100644
--- a/dev-haskell/haddock/haddock-2.16.1.ebuild
+++ b/dev-haskell/haddock/haddock-2.16.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RESTRICT=test # tests are outdated
diff --git a/dev-haskell/haddock/haddock-2.17.2.ebuild b/dev-haskell/haddock/haddock-2.17.2.ebuild
index 27799101e13e..852f7854e614 100644
--- a/dev-haskell/haddock/haddock-2.17.2.ebuild
+++ b/dev-haskell/haddock/haddock-2.17.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 #keep in sync with ghc-8.0.1
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RESTRICT=test # there is no haddock-test on hackage yet
diff --git a/dev-haskell/happy/happy-1.19.4.ebuild b/dev-haskell/happy/happy-1.19.4.ebuild
index 9228e0f46d47..543e06e981b0 100644
--- a/dev-haskell/happy/happy-1.19.4.ebuild
+++ b/dev-haskell/happy/happy-1.19.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="doc"
 
 RDEPEND=""
diff --git a/dev-haskell/happy/happy-1.19.5.ebuild b/dev-haskell/happy/happy-1.19.5.ebuild
index 811f6c4bd4a2..a4467b95d752 100644
--- a/dev-haskell/happy/happy-1.19.5.ebuild
+++ b/dev-haskell/happy/happy-1.19.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="doc"
 
 RDEPEND=""
diff --git a/dev-haskell/hashable-time/hashable-time-0.2.ebuild b/dev-haskell/hashable-time/hashable-time-0.2.ebuild
index 7ca7b4c7b85b..57ecbcdf01fb 100644
--- a/dev-haskell/hashable-time/hashable-time-0.2.ebuild
+++ b/dev-haskell/hashable-time/hashable-time-0.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/hashable-1.2.3.3:=[profile?]
diff --git a/dev-haskell/hashable/hashable-1.2.1.0.ebuild b/dev-haskell/hashable/hashable-1.2.1.0.ebuild
index 106f08802416..ee01d27faa97 100644
--- a/dev-haskell/hashable/hashable-1.2.1.0.ebuild
+++ b/dev-haskell/hashable/hashable-1.2.1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="+cpu_flags_x86_sse2 cpu_flags_x86_sse4_1"
 
 RDEPEND=">=dev-haskell/text-0.11.0.5:=[profile?]
diff --git a/dev-haskell/hashable/hashable-1.2.4.0.ebuild b/dev-haskell/hashable/hashable-1.2.4.0.ebuild
index 0fc5553cee94..4b136eafee48 100644
--- a/dev-haskell/hashable/hashable-1.2.4.0.ebuild
+++ b/dev-haskell/hashable/hashable-1.2.4.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="+cpu_flags_x86_sse2 cpu_flags_x86_sse4_1"
 
 RDEPEND=">=dev-haskell/text-0.11.0.5:=[profile?]
diff --git a/dev-haskell/hashed-storage/hashed-storage-0.5.11.ebuild b/dev-haskell/hashed-storage/hashed-storage-0.5.11.ebuild
index 8f4832d6228b..68fbb201d2e5 100644
--- a/dev-haskell/hashed-storage/hashed-storage-0.5.11.ebuild
+++ b/dev-haskell/hashed-storage/hashed-storage-0.5.11.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x86-macos"
 IUSE="diff hpc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-haskell/hashtables/hashtables-1.1.2.1.ebuild b/dev-haskell/hashtables/hashtables-1.1.2.1.ebuild
index 8f214ddc013e..8c98b507c9f9 100644
--- a/dev-haskell/hashtables/hashtables-1.1.2.1.ebuild
+++ b/dev-haskell/hashtables/hashtables-1.1.2.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="bounds-checking portable cpu_flags_x86_sse4_1 +unsafe-tricks"
 
 RDEPEND="dev-haskell/primitive:=[profile?]
diff --git a/dev-haskell/haskeline/haskeline-0.7.1.2.ebuild b/dev-haskell/haskeline/haskeline-0.7.1.2.ebuild
index da156e885008..fdcdcc7354ec 100644
--- a/dev-haskell/haskeline/haskeline-0.7.1.2.ebuild
+++ b/dev-haskell/haskeline/haskeline-0.7.1.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ppc ppc64 x86 ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~ppc-macos ~x86-macos"
 IUSE="legacy-encoding libiconv +terminfo"
 
 RDEPEND=">=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?]
diff --git a/dev-haskell/haskeline/haskeline-0.7.1.3.ebuild b/dev-haskell/haskeline/haskeline-0.7.1.3.ebuild
index 7d755d279562..588bc14435c6 100644
--- a/dev-haskell/haskeline/haskeline-0.7.1.3.ebuild
+++ b/dev-haskell/haskeline/haskeline-0.7.1.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ppc ppc64 x86 ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~ppc-macos ~x86-macos"
 IUSE="legacy-encoding libiconv +terminfo"
 
 RDEPEND=">=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
diff --git a/dev-haskell/haskeline/haskeline-0.7.2.1.ebuild b/dev-haskell/haskeline/haskeline-0.7.2.1.ebuild
index b068e7c2a800..80afa9b3e9a5 100644
--- a/dev-haskell/haskeline/haskeline-0.7.2.1.ebuild
+++ b/dev-haskell/haskeline/haskeline-0.7.2.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~ppc-macos ~x86-macos"
 IUSE="legacy-encoding libiconv +terminfo"
 
 RDEPEND=">=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
diff --git a/dev-haskell/haskeline/haskeline-0.7.2.3.ebuild b/dev-haskell/haskeline/haskeline-0.7.2.3.ebuild
index 29df20c7bdd7..1685b35f7801 100644
--- a/dev-haskell/haskeline/haskeline-0.7.2.3.ebuild
+++ b/dev-haskell/haskeline/haskeline-0.7.2.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0/${PV}"
 # keep in sync with ghc-8.0.1
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="legacy-encoding libiconv +terminfo"
 
 RDEPEND=">=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
diff --git a/dev-haskell/haskell-lexer/haskell-lexer-1.0-r1.ebuild b/dev-haskell/haskell-lexer/haskell-lexer-1.0-r1.ebuild
index 85b2e1c3b876..6c34f82a1918 100644
--- a/dev-haskell/haskell-lexer/haskell-lexer-1.0-r1.ebuild
+++ b/dev-haskell/haskell-lexer/haskell-lexer-1.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.10.4:="
diff --git a/dev-haskell/haskell-platform/haskell-platform-2013.2.0.0-r2.ebuild b/dev-haskell/haskell-platform/haskell-platform-2013.2.0.0-r2.ebuild
index c63536972351..7efa1c561c1c 100644
--- a/dev-haskell/haskell-platform/haskell-platform-2013.2.0.0-r2.ebuild
+++ b/dev-haskell/haskell-platform/haskell-platform-2013.2.0.0-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+doc profile +X"
 
 RDEPEND=">=dev-haskell/async-2.0.1.4:=[profile?]
diff --git a/dev-haskell/haskell-src-exts/haskell-src-exts-1.13.5.ebuild b/dev-haskell/haskell-src-exts/haskell-src-exts-1.13.5.ebuild
index 9b455e09da48..d3b3cf4def4f 100644
--- a/dev-haskell/haskell-src-exts/haskell-src-exts-1.13.5.ebuild
+++ b/dev-haskell/haskell-src-exts/haskell-src-exts-1.13.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/cpphs-1.3:=[profile?]
diff --git a/dev-haskell/haskell-src-exts/haskell-src-exts-1.16.0.1.ebuild b/dev-haskell/haskell-src-exts/haskell-src-exts-1.16.0.1.ebuild
index 156205cdbb69..b8cc8ca07b23 100644
--- a/dev-haskell/haskell-src-exts/haskell-src-exts-1.16.0.1.ebuild
+++ b/dev-haskell/haskell-src-exts/haskell-src-exts-1.16.0.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/cpphs-1.3:=[profile?]
diff --git a/dev-haskell/haskell-src-meta/haskell-src-meta-0.6.0.14-r1.ebuild b/dev-haskell/haskell-src-meta/haskell-src-meta-0.6.0.14-r1.ebuild
index c6bbe9dbc897..91674b88ad83 100644
--- a/dev-haskell/haskell-src-meta/haskell-src-meta-0.6.0.14-r1.ebuild
+++ b/dev-haskell/haskell-src-meta/haskell-src-meta-0.6.0.14-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/haskell-src-exts-1.16:=[profile?] <dev-haskell/haskell-src-exts-1.18:=[profile?]
diff --git a/dev-haskell/haskell-src-meta/haskell-src-meta-0.6.0.8-r1.ebuild b/dev-haskell/haskell-src-meta/haskell-src-meta-0.6.0.8-r1.ebuild
index 40751aabc590..fd826e4e6659 100644
--- a/dev-haskell/haskell-src-meta/haskell-src-meta-0.6.0.8-r1.ebuild
+++ b/dev-haskell/haskell-src-meta/haskell-src-meta-0.6.0.8-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/haskell-src-exts-1.16:=[profile?] <dev-haskell/haskell-src-exts-1.17:=[profile?]
diff --git a/dev-haskell/haskell-src/haskell-src-1.0.1.6.ebuild b/dev-haskell/haskell-src/haskell-src-1.0.1.6.ebuild
index d4fcaa71b42b..e1a75d03f032 100644
--- a/dev-haskell/haskell-src/haskell-src-1.0.1.6.ebuild
+++ b/dev-haskell/haskell-src/haskell-src-1.0.1.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/syb:=[profile?]
diff --git a/dev-haskell/haskell-src/haskell-src-1.0.2.0.ebuild b/dev-haskell/haskell-src/haskell-src-1.0.2.0.ebuild
index 7352854bff7e..89b455832b70 100644
--- a/dev-haskell/haskell-src/haskell-src-1.0.2.0.ebuild
+++ b/dev-haskell/haskell-src/haskell-src-1.0.2.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/syb:=[profile?]
diff --git a/dev-haskell/haxml/haxml-1.24.ebuild b/dev-haskell/haxml/haxml-1.24.ebuild
index 8fc50de9ad34..c1374944d643 100644
--- a/dev-haskell/haxml/haxml-1.24.ebuild
+++ b/dev-haskell/haxml/haxml-1.24.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/polyparse-1.9:=[profile?]
diff --git a/dev-haskell/hexpat/hexpat-0.20.9.ebuild b/dev-haskell/hexpat/hexpat-0.20.9.ebuild
index 19004446c35e..f3a90906c97f 100644
--- a/dev-haskell/hexpat/hexpat-0.20.9.ebuild
+++ b/dev-haskell/hexpat/hexpat-0.20.9.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/list-0.4.2:=[profile?] <dev-haskell/list-0.6:=[profile?]
diff --git a/dev-haskell/hgettext/hgettext-0.1.30.ebuild b/dev-haskell/hgettext/hgettext-0.1.30.ebuild
index 65e119e3160e..0f991459b2f5 100644
--- a/dev-haskell/hgettext/hgettext-0.1.30.ebuild
+++ b/dev-haskell/hgettext/hgettext-0.1.30.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/cabal-1.10:=[profile?]
diff --git a/dev-haskell/highlighting-kate/highlighting-kate-0.5.5.ebuild b/dev-haskell/highlighting-kate/highlighting-kate-0.5.5.ebuild
index b22e6c8eab77..eb49402b0e76 100644
--- a/dev-haskell/highlighting-kate/highlighting-kate-0.5.5.ebuild
+++ b/dev-haskell/highlighting-kate/highlighting-kate-0.5.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="executable pcre-light"
 
 RDEPEND=">=dev-haskell/blaze-html-0.4.2:=[profile?]
diff --git a/dev-haskell/highlighting-kate/highlighting-kate-0.6.ebuild b/dev-haskell/highlighting-kate/highlighting-kate-0.6.ebuild
index 04567d105afe..d28287c878b7 100644
--- a/dev-haskell/highlighting-kate/highlighting-kate-0.6.ebuild
+++ b/dev-haskell/highlighting-kate/highlighting-kate-0.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="executable pcre-light"
 
 RDEPEND=">=dev-haskell/blaze-html-0.4.2:=[profile?] <dev-haskell/blaze-html-0.9:=[profile?]
diff --git a/dev-haskell/hinotify/hinotify-0.3.8.1.ebuild b/dev-haskell/hinotify/hinotify-0.3.8.1.ebuild
index 20fadc99db74..02721e631934 100644
--- a/dev-haskell/hinotify/hinotify-0.3.8.1.ebuild
+++ b/dev-haskell/hinotify/hinotify-0.3.8.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/hlint/hlint-1.9.21.ebuild b/dev-haskell/hlint/hlint-1.9.21.ebuild
index 3bed99fe3f51..b69731516182 100644
--- a/dev-haskell/hlint/hlint-1.9.21.ebuild
+++ b/dev-haskell/hlint/hlint-1.9.21.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="emacs +gpl"
 
 RDEPEND=">=dev-haskell/ansi-terminal-0.6.2:=[profile?]
diff --git a/dev-haskell/hostname/hostname-1.0.ebuild b/dev-haskell/hostname/hostname-1.0.ebuild
index e75ef049247d..65bc147cdeaa 100644
--- a/dev-haskell/hostname/hostname-1.0.ebuild
+++ b/dev-haskell/hostname/hostname-1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.8.2"
diff --git a/dev-haskell/hourglass/hourglass-0.2.9.ebuild b/dev-haskell/hourglass/hourglass-0.2.9.ebuild
index 2579ecee91b9..f19e3b0eb8a7 100644
--- a/dev-haskell/hourglass/hourglass-0.2.9.ebuild
+++ b/dev-haskell/hourglass/hourglass-0.2.9.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/hs-bibutils/hs-bibutils-5.5.ebuild b/dev-haskell/hs-bibutils/hs-bibutils-5.5.ebuild
index 777a59794b74..3e9c695d7ff8 100644
--- a/dev-haskell/hs-bibutils/hs-bibutils-5.5.ebuild
+++ b/dev-haskell/hs-bibutils/hs-bibutils-5.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/syb:=[profile?]
diff --git a/dev-haskell/hsb2hs/hsb2hs-0.2.ebuild b/dev-haskell/hsb2hs/hsb2hs-0.2.ebuild
index 82e42842da63..ea6e08121859 100644
--- a/dev-haskell/hsb2hs/hsb2hs-0.2.ebuild
+++ b/dev-haskell/hsb2hs/hsb2hs-0.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-haskell/hsb2hs/hsb2hs-0.3.1.ebuild b/dev-haskell/hsb2hs/hsb2hs-0.3.1.ebuild
index 81d51138ee75..b50762b19c07 100644
--- a/dev-haskell/hsb2hs/hsb2hs-0.3.1.ebuild
+++ b/dev-haskell/hsb2hs/hsb2hs-0.3.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">dev-haskell/preprocessor-tools-1.0:=
diff --git a/dev-haskell/hscolour/hscolour-1.20.3-r1.ebuild b/dev-haskell/hscolour/hscolour-1.20.3-r1.ebuild
index b9dc6aefd1a2..e71b6dfa266a 100644
--- a/dev-haskell/hscolour/hscolour-1.20.3-r1.ebuild
+++ b/dev-haskell/hscolour/hscolour-1.20.3-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="doc"
 
 RDEPEND=">=dev-lang/ghc-6.10.4:="
diff --git a/dev-haskell/hscolour/hscolour-1.23-r1.ebuild b/dev-haskell/hscolour/hscolour-1.23-r1.ebuild
index 1466235ee4f7..be34afec09aa 100644
--- a/dev-haskell/hscolour/hscolour-1.23-r1.ebuild
+++ b/dev-haskell/hscolour/hscolour-1.23-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/hslogger/hslogger-1.2.9.ebuild b/dev-haskell/hslogger/hslogger-1.2.9.ebuild
index 9b3f501e3e57..e9023bbe4ec8 100644
--- a/dev-haskell/hslogger/hslogger-1.2.9.ebuild
+++ b/dev-haskell/hslogger/hslogger-1.2.9.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86 ~amd64-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
 IUSE="buildtests"
 
 RDEPEND="dev-haskell/mtl:=[profile?]
diff --git a/dev-haskell/hslua/hslua-0.3.6.1.ebuild b/dev-haskell/hslua/hslua-0.3.6.1.ebuild
index 552c6d6849bb..9bc75f4c2a66 100644
--- a/dev-haskell/hslua/hslua-0.3.6.1.ebuild
+++ b/dev-haskell/hslua/hslua-0.3.6.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/mtl-2.1:=[profile?]
diff --git a/dev-haskell/hsopenssl/hsopenssl-0.11.1.1-r1.ebuild b/dev-haskell/hsopenssl/hsopenssl-0.11.1.1-r1.ebuild
index 92a92120108b..86089cbadc2a 100644
--- a/dev-haskell/hsopenssl/hsopenssl-0.11.1.1-r1.ebuild
+++ b/dev-haskell/hsopenssl/hsopenssl-0.11.1.1-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+fast-bignum libressl"
 
 RESTRICT=test # whoops, not good
diff --git a/dev-haskell/hsopenssl/hsopenssl-0.11.4.ebuild b/dev-haskell/hsopenssl/hsopenssl-0.11.4.ebuild
index 5bcf365e9f40..a3d1bc609557 100644
--- a/dev-haskell/hsopenssl/hsopenssl-0.11.4.ebuild
+++ b/dev-haskell/hsopenssl/hsopenssl-0.11.4.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="libressl"
 
 RESTRICT=test # whoops, not good
diff --git a/dev-haskell/hspec-core/hspec-core-2.1.4.ebuild b/dev-haskell/hspec-core/hspec-core-2.1.4.ebuild
index c530b6a6c4d8..25372af195c3 100644
--- a/dev-haskell/hspec-core/hspec-core-2.1.4.ebuild
+++ b/dev-haskell/hspec-core/hspec-core-2.1.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/ansi-terminal-0.5:=[profile?]
diff --git a/dev-haskell/hspec-core/hspec-core-2.2.4.ebuild b/dev-haskell/hspec-core/hspec-core-2.2.4.ebuild
index 4d7b7c24f158..aa206f2fdb31 100644
--- a/dev-haskell/hspec-core/hspec-core-2.2.4.ebuild
+++ b/dev-haskell/hspec-core/hspec-core-2.2.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RESTRICT=test # circular depends
diff --git a/dev-haskell/hspec-discover/hspec-discover-2.1.4.ebuild b/dev-haskell/hspec-discover/hspec-discover-2.1.4.ebuild
index 30c6e49a313d..b8c805761ee9 100644
--- a/dev-haskell/hspec-discover/hspec-discover-2.1.4.ebuild
+++ b/dev-haskell/hspec-discover/hspec-discover-2.1.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/hspec-discover/hspec-discover-2.2.4.ebuild b/dev-haskell/hspec-discover/hspec-discover-2.2.4.ebuild
index f66627891071..1567b10c10e6 100644
--- a/dev-haskell/hspec-discover/hspec-discover-2.2.4.ebuild
+++ b/dev-haskell/hspec-discover/hspec-discover-2.2.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/hspec-expectations/hspec-expectations-0.3.3.ebuild b/dev-haskell/hspec-expectations/hspec-expectations-0.3.3.ebuild
index df92ce444453..a3802a717242 100644
--- a/dev-haskell/hspec-expectations/hspec-expectations-0.3.3.ebuild
+++ b/dev-haskell/hspec-expectations/hspec-expectations-0.3.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/hunit:=[profile?]
diff --git a/dev-haskell/hspec-expectations/hspec-expectations-0.5.0.1.ebuild b/dev-haskell/hspec-expectations/hspec-expectations-0.5.0.1.ebuild
index 97e79edfe4df..638da0adf738 100644
--- a/dev-haskell/hspec-expectations/hspec-expectations-0.5.0.1.ebuild
+++ b/dev-haskell/hspec-expectations/hspec-expectations-0.5.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/hunit:=[profile?]
diff --git a/dev-haskell/hspec-expectations/hspec-expectations-0.6.1.1.ebuild b/dev-haskell/hspec-expectations/hspec-expectations-0.6.1.1.ebuild
index 4c60377d720f..8cfb385f62b0 100644
--- a/dev-haskell/hspec-expectations/hspec-expectations-0.6.1.1.ebuild
+++ b/dev-haskell/hspec-expectations/hspec-expectations-0.6.1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RESTRICT=test # circular depend: hspec-expectations[test]->hspec[test]->hspec-expectations
diff --git a/dev-haskell/hspec-expectations/hspec-expectations-0.7.2.ebuild b/dev-haskell/hspec-expectations/hspec-expectations-0.7.2.ebuild
index 98c255627b79..e5055f74cdbb 100644
--- a/dev-haskell/hspec-expectations/hspec-expectations-0.7.2.ebuild
+++ b/dev-haskell/hspec-expectations/hspec-expectations-0.7.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/hunit:=[profile?]
diff --git a/dev-haskell/hspec-meta/hspec-meta-1.7.2.ebuild b/dev-haskell/hspec-meta/hspec-meta-1.7.2.ebuild
index f9f601377204..554a88c81b15 100644
--- a/dev-haskell/hspec-meta/hspec-meta-1.7.2.ebuild
+++ b/dev-haskell/hspec-meta/hspec-meta-1.7.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/ansi-terminal-0.5:=[profile?]
diff --git a/dev-haskell/hspec-meta/hspec-meta-1.8.1.ebuild b/dev-haskell/hspec-meta/hspec-meta-1.8.1.ebuild
index d81ce9b376d6..06edea61fdec 100644
--- a/dev-haskell/hspec-meta/hspec-meta-1.8.1.ebuild
+++ b/dev-haskell/hspec-meta/hspec-meta-1.8.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/ansi-terminal-0.5:=[profile?]
diff --git a/dev-haskell/hspec-meta/hspec-meta-2.0.0.ebuild b/dev-haskell/hspec-meta/hspec-meta-2.0.0.ebuild
index 84c84370bcd5..586617507e0d 100644
--- a/dev-haskell/hspec-meta/hspec-meta-2.0.0.ebuild
+++ b/dev-haskell/hspec-meta/hspec-meta-2.0.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/ansi-terminal:=[profile?]
diff --git a/dev-haskell/hspec-meta/hspec-meta-2.2.1.ebuild b/dev-haskell/hspec-meta/hspec-meta-2.2.1.ebuild
index 79d09b01b6a1..94bde2bc4474 100644
--- a/dev-haskell/hspec-meta/hspec-meta-2.2.1.ebuild
+++ b/dev-haskell/hspec-meta/hspec-meta-2.2.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/ansi-terminal:=[profile?]
diff --git a/dev-haskell/hspec/hspec-1.7.2.1.ebuild b/dev-haskell/hspec/hspec-1.7.2.1.ebuild
index 642c96eb6f79..ae00f3b488d3 100644
--- a/dev-haskell/hspec/hspec-1.7.2.1.ebuild
+++ b/dev-haskell/hspec/hspec-1.7.2.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/ansi-terminal-0.5:=[profile?]
diff --git a/dev-haskell/hspec/hspec-1.8.1.1.ebuild b/dev-haskell/hspec/hspec-1.8.1.1.ebuild
index 649156245812..45c2dfc1e7e5 100644
--- a/dev-haskell/hspec/hspec-1.8.1.1.ebuild
+++ b/dev-haskell/hspec/hspec-1.8.1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/ansi-terminal-0.5:=[profile?]
diff --git a/dev-haskell/hspec/hspec-2.1.4.ebuild b/dev-haskell/hspec/hspec-2.1.4.ebuild
index f4543fdca3c1..6af355f1da05 100644
--- a/dev-haskell/hspec/hspec-2.1.4.ebuild
+++ b/dev-haskell/hspec/hspec-2.1.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RESTRICT=test # circular depend: hspec[test]->stringbuider[test]->hspec
diff --git a/dev-haskell/hspec/hspec-2.2.4.ebuild b/dev-haskell/hspec/hspec-2.2.4.ebuild
index d7f02ee48ff9..cba8e6c2db07 100644
--- a/dev-haskell/hspec/hspec-2.2.4.ebuild
+++ b/dev-haskell/hspec/hspec-2.2.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RESTRICT=test # has circular dependency
diff --git a/dev-haskell/html/html-1.0.1.2-r1.ebuild b/dev-haskell/html/html-1.0.1.2-r1.ebuild
index 127292a03f73..65e9caa04833 100644
--- a/dev-haskell/html/html-1.0.1.2-r1.ebuild
+++ b/dev-haskell/html/html-1.0.1.2-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.10.4:="
diff --git a/dev-haskell/http-attoparsec/http-attoparsec-0.1.1-r2.ebuild b/dev-haskell/http-attoparsec/http-attoparsec-0.1.1-r2.ebuild
index 3a125e327323..595325e6bb66 100644
--- a/dev-haskell/http-attoparsec/http-attoparsec-0.1.1-r2.ebuild
+++ b/dev-haskell/http-attoparsec/http-attoparsec-0.1.1-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/attoparsec-0.10.4.0:=[profile?]
diff --git a/dev-haskell/http-client-tls/http-client-tls-0.2.2.ebuild b/dev-haskell/http-client-tls/http-client-tls-0.2.2.ebuild
index 2279b26df499..51c6b4f63a43 100644
--- a/dev-haskell/http-client-tls/http-client-tls-0.2.2.ebuild
+++ b/dev-haskell/http-client-tls/http-client-tls-0.2.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/connection-0.2.2:=[profile?]
diff --git a/dev-haskell/http-client-tls/http-client-tls-0.3.3.ebuild b/dev-haskell/http-client-tls/http-client-tls-0.3.3.ebuild
index 3027c338058c..736152fafc03 100644
--- a/dev-haskell/http-client-tls/http-client-tls-0.3.3.ebuild
+++ b/dev-haskell/http-client-tls/http-client-tls-0.3.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RESTRICT=test # needs network access
diff --git a/dev-haskell/http-client/http-client-0.4.18.1.ebuild b/dev-haskell/http-client/http-client-0.4.18.1.ebuild
index d2cb9157ff0d..130af7884d81 100644
--- a/dev-haskell/http-client/http-client-0.4.18.1.ebuild
+++ b/dev-haskell/http-client/http-client-0.4.18.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+network-uri"
 
 RDEPEND=">=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?]
diff --git a/dev-haskell/http-client/http-client-0.4.30.ebuild b/dev-haskell/http-client/http-client-0.4.30.ebuild
index 0ca0637ce348..79711ddb1cbc 100644
--- a/dev-haskell/http-client/http-client-0.4.30.ebuild
+++ b/dev-haskell/http-client/http-client-0.4.30.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+network-uri"
 
 RDEPEND=">=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?]
diff --git a/dev-haskell/http-client/http-client-0.5.7.0.ebuild b/dev-haskell/http-client/http-client-0.5.7.0.ebuild
index 16eceb056b7d..b47005b1b7f8 100644
--- a/dev-haskell/http-client/http-client-0.5.7.0.ebuild
+++ b/dev-haskell/http-client/http-client-0.5.7.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+network-uri"
 
 RESTRICT=test # needs network access
diff --git a/dev-haskell/http-common/http-common-0.8.2.0.ebuild b/dev-haskell/http-common/http-common-0.8.2.0.ebuild
index b029d7a4325d..0ff6f6b7c8a4 100644
--- a/dev-haskell/http-common/http-common-0.8.2.0.ebuild
+++ b/dev-haskell/http-common/http-common-0.8.2.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/base64-bytestring:=[profile?]
diff --git a/dev-haskell/http-conduit/http-conduit-2.1.7.2.ebuild b/dev-haskell/http-conduit/http-conduit-2.1.7.2.ebuild
index a50ca681b83b..c677d1cf9d2d 100644
--- a/dev-haskell/http-conduit/http-conduit-2.1.7.2.ebuild
+++ b/dev-haskell/http-conduit/http-conduit-2.1.7.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/conduit-0.5.5:=[profile?] <dev-haskell/conduit-1.3:=[profile?]
diff --git a/dev-haskell/http-conduit/http-conduit-2.2.3.ebuild b/dev-haskell/http-conduit/http-conduit-2.2.3.ebuild
index 6e39854671bb..b2371dc77e17 100644
--- a/dev-haskell/http-conduit/http-conduit-2.2.3.ebuild
+++ b/dev-haskell/http-conduit/http-conduit-2.2.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/aeson-0.8:=[profile?]
diff --git a/dev-haskell/http-date/http-date-0.0.6.1.ebuild b/dev-haskell/http-date/http-date-0.0.6.1.ebuild
index 866e2e6fd343..b8b25174e2ca 100644
--- a/dev-haskell/http-date/http-date-0.0.6.1.ebuild
+++ b/dev-haskell/http-date/http-date-0.0.6.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/attoparsec:=[profile?]
diff --git a/dev-haskell/http-streams/http-streams-0.8.4.0.ebuild b/dev-haskell/http-streams/http-streams-0.8.4.0.ebuild
index 463d5bd2d8a0..af7cf9cb1218 100644
--- a/dev-haskell/http-streams/http-streams-0.8.4.0.ebuild
+++ b/dev-haskell/http-streams/http-streams-0.8.4.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+network-uri"
 
 RESTRICT=test # cyclic dep: http-streams[test]->snap-server->http-streams
diff --git a/dev-haskell/http-types/http-types-0.8.6.ebuild b/dev-haskell/http-types/http-types-0.8.6.ebuild
index afc015fb3c2b..9e2a0b0f0124 100644
--- a/dev-haskell/http-types/http-types-0.8.6.ebuild
+++ b/dev-haskell/http-types/http-types-0.8.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
diff --git a/dev-haskell/http/http-4000.2.20.ebuild b/dev-haskell/http/http-4000.2.20.ebuild
index 77209ab8cfff..f0cd617e230a 100644
--- a/dev-haskell/http/http-4000.2.20.ebuild
+++ b/dev-haskell/http/http-4000.2.20.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="conduit10 +network-uri"
 
 RDEPEND=">=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
diff --git a/dev-haskell/http/http-4000.2.8.ebuild b/dev-haskell/http/http-4000.2.8.ebuild
index 890c39a6bd7a..f48253dfe4e1 100644
--- a/dev-haskell/http/http-4000.2.8.ebuild
+++ b/dev-haskell/http/http-4000.2.8.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x86-macos"
 # hackport-args: --always-disabled='mtl1 network23 old-base warn-as-error'
 IUSE=""
 
diff --git a/dev-haskell/http/http-4000.3.5.ebuild b/dev-haskell/http/http-4000.3.5.ebuild
index 7156a2d16991..3c5a93903a97 100644
--- a/dev-haskell/http/http-4000.3.5.ebuild
+++ b/dev-haskell/http/http-4000.3.5.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="conduit10 +network-uri"
 
 RDEPEND=">=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
diff --git a/dev-haskell/httpd-shed/httpd-shed-0.4-r1.ebuild b/dev-haskell/httpd-shed/httpd-shed-0.4-r1.ebuild
index 53181157e23b..c14d0383dd8a 100644
--- a/dev-haskell/httpd-shed/httpd-shed-0.4-r1.ebuild
+++ b/dev-haskell/httpd-shed/httpd-shed-0.4-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ppc ppc64 x86 ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~ppc-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="dev-haskell/network:=[profile?]
diff --git a/dev-haskell/httpd-shed/httpd-shed-0.4.0.3.ebuild b/dev-haskell/httpd-shed/httpd-shed-0.4.0.3.ebuild
index bd4719362992..2ed759273617 100644
--- a/dev-haskell/httpd-shed/httpd-shed-0.4.0.3.ebuild
+++ b/dev-haskell/httpd-shed/httpd-shed-0.4.0.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~ppc-macos ~x86-macos"
 IUSE="buildexamples +network-uri"
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/hunit/hunit-1.2.5.2.ebuild b/dev-haskell/hunit/hunit-1.2.5.2.ebuild
index aba2c4cce30c..9e2fcb9d0502 100644
--- a/dev-haskell/hunit/hunit-1.2.5.2.ebuild
+++ b/dev-haskell/hunit/hunit-1.2.5.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.10.4:="
diff --git a/dev-haskell/hxt-charproperties/hxt-charproperties-9.1.1.1.ebuild b/dev-haskell/hxt-charproperties/hxt-charproperties-9.1.1.1.ebuild
index 11109326cdff..3d0478027597 100644
--- a/dev-haskell/hxt-charproperties/hxt-charproperties-9.1.1.1.ebuild
+++ b/dev-haskell/hxt-charproperties/hxt-charproperties-9.1.1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.10.4:="
diff --git a/dev-haskell/hxt-regex-xmlschema/hxt-regex-xmlschema-9.1.0.ebuild b/dev-haskell/hxt-regex-xmlschema/hxt-regex-xmlschema-9.1.0.ebuild
index b2d2625a0368..4beb035e206b 100644
--- a/dev-haskell/hxt-regex-xmlschema/hxt-regex-xmlschema-9.1.0.ebuild
+++ b/dev-haskell/hxt-regex-xmlschema/hxt-regex-xmlschema-9.1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="=dev-haskell/hxt-charproperties-9*:=[profile?]
diff --git a/dev-haskell/hxt-regex-xmlschema/hxt-regex-xmlschema-9.2.0.2.ebuild b/dev-haskell/hxt-regex-xmlschema/hxt-regex-xmlschema-9.2.0.2.ebuild
index 61df8870b090..5c55021b6ade 100644
--- a/dev-haskell/hxt-regex-xmlschema/hxt-regex-xmlschema-9.2.0.2.ebuild
+++ b/dev-haskell/hxt-regex-xmlschema/hxt-regex-xmlschema-9.2.0.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RESTRICT=test # slow tests
diff --git a/dev-haskell/hxt-unicode/hxt-unicode-9.0.2.1.ebuild b/dev-haskell/hxt-unicode/hxt-unicode-9.0.2.1.ebuild
index 85d9e30fc840..0e9771e497e9 100644
--- a/dev-haskell/hxt-unicode/hxt-unicode-9.0.2.1.ebuild
+++ b/dev-haskell/hxt-unicode/hxt-unicode-9.0.2.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="=dev-haskell/hxt-charproperties-9*:=[profile?]
diff --git a/dev-haskell/hxt/hxt-9.3.1.15.ebuild b/dev-haskell/hxt/hxt-9.3.1.15.ebuild
index 0c3d33546120..c201238456f0 100644
--- a/dev-haskell/hxt/hxt-9.3.1.15.ebuild
+++ b/dev-haskell/hxt/hxt-9.3.1.15.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+network-uri"
 
 RDEPEND=">=dev-haskell/binary-0.5:=[profile?] <dev-haskell/binary-1:=[profile?]
diff --git a/dev-haskell/idna/idna-0.2.ebuild b/dev-haskell/idna/idna-0.2.ebuild
index 3f36655cbbe2..c5eb74e3dd5a 100644
--- a/dev-haskell/idna/idna-0.2.ebuild
+++ b/dev-haskell/idna/idna-0.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/punycode-2.0:=[profile?]
diff --git a/dev-haskell/io-streams-haproxy/io-streams-haproxy-1.0.0.1.ebuild b/dev-haskell/io-streams-haproxy/io-streams-haproxy-1.0.0.1.ebuild
index 71f84eb78731..5b5a5c71bbeb 100644
--- a/dev-haskell/io-streams-haproxy/io-streams-haproxy-1.0.0.1.ebuild
+++ b/dev-haskell/io-streams-haproxy/io-streams-haproxy-1.0.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/attoparsec-0.7:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
diff --git a/dev-haskell/io-streams/io-streams-1.3.6.0.ebuild b/dev-haskell/io-streams/io-streams-1.3.6.0.ebuild
index 0fdf6de4f657..07e0c5995b81 100644
--- a/dev-haskell/io-streams/io-streams-1.3.6.0.ebuild
+++ b/dev-haskell/io-streams/io-streams-1.3.6.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
diff --git a/dev-haskell/iproute/iproute-1.5.0.ebuild b/dev-haskell/iproute/iproute-1.5.0.ebuild
index c9e1ee71d75c..95b82d3b096b 100644
--- a/dev-haskell/iproute/iproute-1.5.0.ebuild
+++ b/dev-haskell/iproute/iproute-1.5.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/appar:=[profile?]
diff --git a/dev-haskell/json/json-0.9.1.ebuild b/dev-haskell/json/json-0.9.1.ebuild
index 1e0eda7e1058..df76f2637869 100644
--- a/dev-haskell/json/json-0.9.1.ebuild
+++ b/dev-haskell/json/json-0.9.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux"
 IUSE="+generic mapdict +parsec +pretty"
 
 RDEPEND="dev-haskell/mtl:=[profile?]
diff --git a/dev-haskell/juicypixels/juicypixels-3.2.5.3.ebuild b/dev-haskell/juicypixels/juicypixels-3.2.5.3.ebuild
index e4ab974e65ed..352905567172 100644
--- a/dev-haskell/juicypixels/juicypixels-3.2.5.3.ebuild
+++ b/dev-haskell/juicypixels/juicypixels-3.2.5.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="mmap"
 
 RDEPEND=">=dev-haskell/binary-0.5:=[profile?] <dev-haskell/binary-0.8:=[profile?]
diff --git a/dev-haskell/kan-extensions/kan-extensions-4.2.3.ebuild b/dev-haskell/kan-extensions/kan-extensions-4.2.3.ebuild
index 95868cf4887c..bd3d3827cb57 100644
--- a/dev-haskell/kan-extensions/kan-extensions-4.2.3.ebuild
+++ b/dev-haskell/kan-extensions/kan-extensions-4.2.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/adjunctions-4.2:=[profile?] <dev-haskell/adjunctions-5:=[profile?]
diff --git a/dev-haskell/kan-extensions/kan-extensions-5.0.1.ebuild b/dev-haskell/kan-extensions/kan-extensions-5.0.1.ebuild
index 66538a52189d..8ab07637fc3b 100644
--- a/dev-haskell/kan-extensions/kan-extensions-5.0.1.ebuild
+++ b/dev-haskell/kan-extensions/kan-extensions-5.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/adjunctions-4.2:=[profile?] <dev-haskell/adjunctions-5:=[profile?]
diff --git a/dev-haskell/language-c/language-c-0.4.2.ebuild b/dev-haskell/language-c/language-c-0.4.2.ebuild
index adfe434002a2..80261c086b17 100644
--- a/dev-haskell/language-c/language-c-0.4.2.ebuild
+++ b/dev-haskell/language-c/language-c-0.4.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/syb[profile?]
diff --git a/dev-haskell/language-c/language-c-0.4.7.ebuild b/dev-haskell/language-c/language-c-0.4.7.ebuild
index 597f39d7b73e..973606aa2c55 100644
--- a/dev-haskell/language-c/language-c-0.4.7.ebuild
+++ b/dev-haskell/language-c/language-c-0.4.7.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/syb:=[profile?]
diff --git a/dev-haskell/language-haskell-extract/language-haskell-extract-0.2.4.ebuild b/dev-haskell/language-haskell-extract/language-haskell-extract-0.2.4.ebuild
index 75308ae2b74b..ab128e10c2b6 100644
--- a/dev-haskell/language-haskell-extract/language-haskell-extract-0.2.4.ebuild
+++ b/dev-haskell/language-haskell-extract/language-haskell-extract-0.2.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/regex-posix:=[profile?]
diff --git a/dev-haskell/lazysmallcheck/lazysmallcheck-0.6.ebuild b/dev-haskell/lazysmallcheck/lazysmallcheck-0.6.ebuild
index b89d7beabe7a..39ae97b35173 100644
--- a/dev-haskell/lazysmallcheck/lazysmallcheck-0.6.ebuild
+++ b/dev-haskell/lazysmallcheck/lazysmallcheck-0.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.8.2"
diff --git a/dev-haskell/lcs/lcs-0.2-r1.ebuild b/dev-haskell/lcs/lcs-0.2-r1.ebuild
index 0393e9c8448f..1c3bb1ed928d 100644
--- a/dev-haskell/lcs/lcs-0.2-r1.ebuild
+++ b/dev-haskell/lcs/lcs-0.2-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/lens/lens-4.11.ebuild b/dev-haskell/lens/lens-4.11.ebuild
index 52018405253d..288ddf949b50 100644
--- a/dev-haskell/lens/lens-4.11.ebuild
+++ b/dev-haskell/lens/lens-4.11.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="benchmark-uniplate dump-splices +inlining j old-inline-pragmas safe +test-doctests +test-hlint +test-hunit +test-properties +trustworthy"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-haskell/lens/lens-4.14.ebuild b/dev-haskell/lens/lens-4.14.ebuild
index 5cd6d4e13869..172b0cd65b8a 100644
--- a/dev-haskell/lens/lens-4.14.ebuild
+++ b/dev-haskell/lens/lens-4.14.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="benchmark-uniplate dump-splices +inlining j old-inline-pragmas safe +test-doctests +test-templates +trustworthy"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-haskell/lens/lens-4.6.0.1.ebuild b/dev-haskell/lens/lens-4.6.0.1.ebuild
index 65c51397c391..68466d8661b0 100644
--- a/dev-haskell/lens/lens-4.6.0.1.ebuild
+++ b/dev-haskell/lens/lens-4.6.0.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="benchmark-uniplate dump-splices +inlining j old-inline-pragmas safe +test-doctests +test-hlint +test-hunit +test-properties +trustworthy"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-haskell/libmpd/libmpd-0.9.0.2.ebuild b/dev-haskell/libmpd/libmpd-0.9.0.2.ebuild
index ae4e20d9e387..e0c998795b4f 100644
--- a/dev-haskell/libmpd/libmpd-0.9.0.2.ebuild
+++ b/dev-haskell/libmpd/libmpd-0.9.0.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RESTRICT=test # needs slight port to ghc-7.10
diff --git a/dev-haskell/libmpd/libmpd-0.9.0.6.ebuild b/dev-haskell/libmpd/libmpd-0.9.0.6.ebuild
index bd11ed63d4d9..9bf805a4173d 100644
--- a/dev-haskell/libmpd/libmpd-0.9.0.6.ebuild
+++ b/dev-haskell/libmpd/libmpd-0.9.0.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/attoparsec-0.10.1:=[profile?] <dev-haskell/attoparsec-1:=[profile?]
diff --git a/dev-haskell/libxml-sax/libxml-sax-0.7.5.ebuild b/dev-haskell/libxml-sax/libxml-sax-0.7.5.ebuild
index 171114875f81..0e0041b27f58 100644
--- a/dev-haskell/libxml-sax/libxml-sax-0.7.5.ebuild
+++ b/dev-haskell/libxml-sax/libxml-sax-0.7.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/text-0.7:=[profile?]
diff --git a/dev-haskell/libxml/libxml-0.1.1.ebuild b/dev-haskell/libxml/libxml-0.1.1.ebuild
index a8fa2e3dce66..3a3d077e3fa5 100644
--- a/dev-haskell/libxml/libxml-0.1.1.ebuild
+++ b/dev-haskell/libxml/libxml-0.1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/mtl:=[profile?]
diff --git a/dev-haskell/lifted-async/lifted-async-0.8.0.1-r1.ebuild b/dev-haskell/lifted-async/lifted-async-0.8.0.1-r1.ebuild
index 8b3b98968b35..90466b09e0bc 100644
--- a/dev-haskell/lifted-async/lifted-async-0.8.0.1-r1.ebuild
+++ b/dev-haskell/lifted-async/lifted-async-0.8.0.1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+monad-control-1"
 
 RDEPEND=">=dev-haskell/async-2.0.1:=[profile?] <dev-haskell/async-2.2:=[profile?]
diff --git a/dev-haskell/lifted-base/lifted-base-0.2.3.6-r2.ebuild b/dev-haskell/lifted-base/lifted-base-0.2.3.6-r2.ebuild
index 61a02c5499a2..f84be97e8c60 100644
--- a/dev-haskell/lifted-base/lifted-base-0.2.3.6-r2.ebuild
+++ b/dev-haskell/lifted-base/lifted-base-0.2.3.6-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86 ~amd64-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
 IUSE=""
 
 RDEPEND=">=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
diff --git a/dev-haskell/list/list-0.5.2.ebuild b/dev-haskell/list/list-0.5.2.ebuild
index c2000ea48481..55ae87cb7c56 100644
--- a/dev-haskell/list/list-0.5.2.ebuild
+++ b/dev-haskell/list/list-0.5.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/transformers-0.2:=[profile?]
diff --git a/dev-haskell/logict/logict-0.6.0.2.ebuild b/dev-haskell/logict/logict-0.6.0.2.ebuild
index 070cfd6d98c8..910c67f57809 100644
--- a/dev-haskell/logict/logict-0.6.0.2.ebuild
+++ b/dev-haskell/logict/logict-0.6.0.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/mtl-2:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
diff --git a/dev-haskell/markdown-unlit/markdown-unlit-0.2.0.1.ebuild b/dev-haskell/markdown-unlit/markdown-unlit-0.2.0.1.ebuild
index 8ec849ca45a8..973e6bc73e40 100644
--- a/dev-haskell/markdown-unlit/markdown-unlit-0.2.0.1.ebuild
+++ b/dev-haskell/markdown-unlit/markdown-unlit-0.2.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.10.4:="
diff --git a/dev-haskell/memory/memory-0.14.1.ebuild b/dev-haskell/memory/memory-0.14.1.ebuild
index bb543b0a536f..b4829216fcb3 100644
--- a/dev-haskell/memory/memory-0.14.1.ebuild
+++ b/dev-haskell/memory/memory-0.14.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/mime-types/mime-types-0.1.0.3.ebuild b/dev-haskell/mime-types/mime-types-0.1.0.3.ebuild
index 8595fd79e847..9b874aedb0c4 100644
--- a/dev-haskell/mime-types/mime-types-0.1.0.3.ebuild
+++ b/dev-haskell/mime-types/mime-types-0.1.0.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/text:=[profile?]
diff --git a/dev-haskell/missingh/missingh-1.2.0.2.ebuild b/dev-haskell/missingh/missingh-1.2.0.2.ebuild
index a602f8bdecaf..7b5d141a05ce 100644
--- a/dev-haskell/missingh/missingh-1.2.0.2.ebuild
+++ b/dev-haskell/missingh/missingh-1.2.0.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS=" amd64 x86 ~amd64-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
 IUSE=""
 
 RDEPEND="dev-haskell/hslogger:=[profile?]
diff --git a/dev-haskell/missingh/missingh-1.3.0.1.ebuild b/dev-haskell/missingh/missingh-1.3.0.1.ebuild
index 742bac0e456a..7c5973af14b6 100644
--- a/dev-haskell/missingh/missingh-1.3.0.1.ebuild
+++ b/dev-haskell/missingh/missingh-1.3.0.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86 ~amd64-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
 IUSE=""
 
 RDEPEND="dev-haskell/hslogger:=[profile?]
diff --git a/dev-haskell/mmap/mmap-0.5.8.ebuild b/dev-haskell/mmap/mmap-0.5.8.ebuild
index 93ccccc42dbd..6eee2da12447 100644
--- a/dev-haskell/mmap/mmap-0.5.8.ebuild
+++ b/dev-haskell/mmap/mmap-0.5.8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ppc ppc64 x86 ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~ppc-macos ~x86-macos"
 # IUSE="test"
 IUSE=""
 
diff --git a/dev-haskell/mmap/mmap-0.5.9.ebuild b/dev-haskell/mmap/mmap-0.5.9.ebuild
index dd2667d56100..b6b68baca466 100644
--- a/dev-haskell/mmap/mmap-0.5.9.ebuild
+++ b/dev-haskell/mmap/mmap-0.5.9.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 # IUSE="test"
 IUSE=""
 
diff --git a/dev-haskell/mmorph/mmorph-1.0.0.ebuild b/dev-haskell/mmorph/mmorph-1.0.0.ebuild
index f0921293a7d5..c95d42228355 100644
--- a/dev-haskell/mmorph/mmorph-1.0.0.ebuild
+++ b/dev-haskell/mmorph/mmorph-1.0.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/transformers-0.2.0.0:=[profile?]
diff --git a/dev-haskell/mmorph/mmorph-1.0.6.ebuild b/dev-haskell/mmorph/mmorph-1.0.6.ebuild
index 01152aadb374..421a78c827e4 100644
--- a/dev-haskell/mmorph/mmorph-1.0.6.ebuild
+++ b/dev-haskell/mmorph/mmorph-1.0.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/mtl-2.0.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
diff --git a/dev-haskell/monad-control/monad-control-0.3.2.2.ebuild b/dev-haskell/monad-control/monad-control-0.3.2.2.ebuild
index e71d14bbc022..aa45de968c64 100644
--- a/dev-haskell/monad-control/monad-control-0.3.2.2.ebuild
+++ b/dev-haskell/monad-control/monad-control-0.3.2.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86 ~amd64-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
 IUSE="+instancest"
 
 RDEPEND=">=dev-haskell/base-unicode-symbols-0.1.1:=[profile?] <dev-haskell/base-unicode-symbols-0.3:=[profile?]
diff --git a/dev-haskell/monad-control/monad-control-1.0.1.0.ebuild b/dev-haskell/monad-control/monad-control-1.0.1.0.ebuild
index 42e7a7d0a299..e0e77ad6bfdc 100644
--- a/dev-haskell/monad-control/monad-control-1.0.1.0.ebuild
+++ b/dev-haskell/monad-control/monad-control-1.0.1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-haskell/stm-2.3:=[profile?] <dev-haskell/stm-3:=[profile?]
diff --git a/dev-haskell/monadcatchio-mtl/monadcatchio-mtl-0.3.1.0-r1.ebuild b/dev-haskell/monadcatchio-mtl/monadcatchio-mtl-0.3.1.0-r1.ebuild
index 5a25569c4caa..39aeaacc7665 100644
--- a/dev-haskell/monadcatchio-mtl/monadcatchio-mtl-0.3.1.0-r1.ebuild
+++ b/dev-haskell/monadcatchio-mtl/monadcatchio-mtl-0.3.1.0-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/extensible-exceptions:=[profile?]
diff --git a/dev-haskell/monadcatchio-transformers/monadcatchio-transformers-0.3.1.3-r1.ebuild b/dev-haskell/monadcatchio-transformers/monadcatchio-transformers-0.3.1.3-r1.ebuild
index ce27c480d2eb..e0a6b183636c 100644
--- a/dev-haskell/monadcatchio-transformers/monadcatchio-transformers-0.3.1.3-r1.ebuild
+++ b/dev-haskell/monadcatchio-transformers/monadcatchio-transformers-0.3.1.3-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?]
diff --git a/dev-haskell/monadcatchio-transformers/monadcatchio-transformers-0.3.1.3.ebuild b/dev-haskell/monadcatchio-transformers/monadcatchio-transformers-0.3.1.3.ebuild
index ab25e4b9e9f8..25383b929e0b 100644
--- a/dev-haskell/monadcatchio-transformers/monadcatchio-transformers-0.3.1.3.ebuild
+++ b/dev-haskell/monadcatchio-transformers/monadcatchio-transformers-0.3.1.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?]
diff --git a/dev-haskell/monads-tf/monads-tf-0.1.0.2.ebuild b/dev-haskell/monads-tf/monads-tf-0.1.0.2.ebuild
index a0bc26025857..4a052ff85e33 100644
--- a/dev-haskell/monads-tf/monads-tf-0.1.0.2.ebuild
+++ b/dev-haskell/monads-tf/monads-tf-0.1.0.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/transformers-0.2.0.0:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
diff --git a/dev-haskell/monads-tf/monads-tf-0.1.0.3.ebuild b/dev-haskell/monads-tf/monads-tf-0.1.0.3.ebuild
index 67edcf640b33..aaf3ce3f9de4 100644
--- a/dev-haskell/monads-tf/monads-tf-0.1.0.3.ebuild
+++ b/dev-haskell/monads-tf/monads-tf-0.1.0.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/transformers-0.2.0.0:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
diff --git a/dev-haskell/mtl-compat/mtl-compat-0.2.1.3.ebuild b/dev-haskell/mtl-compat/mtl-compat-0.2.1.3.ebuild
index 200f27b8bf70..3193f0197c75 100644
--- a/dev-haskell/mtl-compat/mtl-compat-0.2.1.3.ebuild
+++ b/dev-haskell/mtl-compat/mtl-compat-0.2.1.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
diff --git a/dev-haskell/mtl/mtl-2.1.3.1.ebuild b/dev-haskell/mtl/mtl-2.1.3.1.ebuild
index a9b57b86495a..7cadd1148d6c 100644
--- a/dev-haskell/mtl/mtl-2.1.3.1.ebuild
+++ b/dev-haskell/mtl/mtl-2.1.3.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=dev-haskell/transformers-0.3:=[profile?] <dev-haskell/transformers-0.4:=[profile?]
diff --git a/dev-haskell/mtl/mtl-2.2.1-r1.ebuild b/dev-haskell/mtl/mtl-2.2.1-r1.ebuild
index 2e7e6a16b152..b369af576a72 100644
--- a/dev-haskell/mtl/mtl-2.2.1-r1.ebuild
+++ b/dev-haskell/mtl/mtl-2.2.1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=dev-haskell/transformers-0.4:=[profile?]
diff --git a/dev-haskell/multipart/multipart-0.1.2.ebuild b/dev-haskell/multipart/multipart-0.1.2.ebuild
index 2d911a896520..69489c19416a 100644
--- a/dev-haskell/multipart/multipart-0.1.2.ebuild
+++ b/dev-haskell/multipart/multipart-0.1.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/parsec-2.0:=[profile?]
diff --git a/dev-haskell/nanospec/nanospec-0.1.0.ebuild b/dev-haskell/nanospec/nanospec-0.1.0.ebuild
index 97fdb2e842e1..44e1b011e02e 100644
--- a/dev-haskell/nanospec/nanospec-0.1.0.ebuild
+++ b/dev-haskell/nanospec/nanospec-0.1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.10.4:="
diff --git a/dev-haskell/nanospec/nanospec-0.2.0.ebuild b/dev-haskell/nanospec/nanospec-0.2.0.ebuild
index 214e9ca26665..3833d334b449 100644
--- a/dev-haskell/nanospec/nanospec-0.2.0.ebuild
+++ b/dev-haskell/nanospec/nanospec-0.2.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RESTRICT=test # circular depend: nanospec[test]->silently[test]->nanospec
diff --git a/dev-haskell/nanospec/nanospec-0.2.1.ebuild b/dev-haskell/nanospec/nanospec-0.2.1.ebuild
index ba34767feae5..59a461c5f663 100644
--- a/dev-haskell/nanospec/nanospec-0.2.1.ebuild
+++ b/dev-haskell/nanospec/nanospec-0.2.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RESTRICT=test # cyclic depend
diff --git a/dev-haskell/nats/nats-0.1.2.ebuild b/dev-haskell/nats/nats-0.1.2.ebuild
index 6a857a2df8f7..5fc2a8ac92a3 100644
--- a/dev-haskell/nats/nats-0.1.2.ebuild
+++ b/dev-haskell/nats/nats-0.1.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.10.4:= <dev-lang/ghc-7.10:=
diff --git a/dev-haskell/nats/nats-0.2.ebuild b/dev-haskell/nats/nats-0.2.ebuild
index 844820247580..1792cb4b0572 100644
--- a/dev-haskell/nats/nats-0.2.ebuild
+++ b/dev-haskell/nats/nats-0.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+hashable"
 
 RDEPEND=">=dev-lang/ghc-7.4.1:= <dev-lang/ghc-7.10:=
diff --git a/dev-haskell/nats/nats-1.ebuild b/dev-haskell/nats/nats-1.ebuild
index 543449bd7da8..8aee789a0a54 100644
--- a/dev-haskell/nats/nats-1.ebuild
+++ b/dev-haskell/nats/nats-1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="+hashable"
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/network-conduit/network-conduit-1.0.0-r1.ebuild b/dev-haskell/network-conduit/network-conduit-1.0.0-r1.ebuild
index ce53b4e0bf76..dfbc31ae7f13 100644
--- a/dev-haskell/network-conduit/network-conduit-1.0.0-r1.ebuild
+++ b/dev-haskell/network-conduit/network-conduit-1.0.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="=dev-haskell/conduit-1.0*:=[profile?]
diff --git a/dev-haskell/network-conduit/network-conduit-1.1.0.ebuild b/dev-haskell/network-conduit/network-conduit-1.1.0.ebuild
index 49d4537d0b73..3fdab3fde1fd 100644
--- a/dev-haskell/network-conduit/network-conduit-1.1.0.ebuild
+++ b/dev-haskell/network-conduit/network-conduit-1.1.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/conduit-1.1:=[profile?]
diff --git a/dev-haskell/network-uri/network-uri-2.5.0.0.ebuild b/dev-haskell/network-uri/network-uri-2.5.0.0.ebuild
index 6c18787cf5ae..2fce20b648f6 100644
--- a/dev-haskell/network-uri/network-uri-2.5.0.0.ebuild
+++ b/dev-haskell/network-uri/network-uri-2.5.0.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/network-uri/network-uri-2.6.0.3.ebuild b/dev-haskell/network-uri/network-uri-2.6.0.3.ebuild
index a4eec9e2fc05..acf662d3f603 100644
--- a/dev-haskell/network-uri/network-uri-2.6.0.3.ebuild
+++ b/dev-haskell/network-uri/network-uri-2.6.0.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 RDEPEND=">=dev-haskell/parsec-3.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
diff --git a/dev-haskell/network/network-2.4.1.2.ebuild b/dev-haskell/network/network-2.4.1.2.ebuild
index 6980ef7c0df4..4d20404dceeb 100644
--- a/dev-haskell/network/network-2.4.1.2.ebuild
+++ b/dev-haskell/network/network-2.4.1.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 RDEPEND=">=dev-haskell/parsec-3.0:=[profile?]
diff --git a/dev-haskell/network/network-2.6.2.1.ebuild b/dev-haskell/network/network-2.6.2.1.ebuild
index 5cb13267a799..3ee10efb2244 100644
--- a/dev-haskell/network/network-2.6.2.1.ebuild
+++ b/dev-haskell/network/network-2.6.2.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/newtype/newtype-0.2.ebuild b/dev-haskell/newtype/newtype-0.2.ebuild
index 468c978e3deb..10efb3439abd 100644
--- a/dev-haskell/newtype/newtype-0.2.ebuild
+++ b/dev-haskell/newtype/newtype-0.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.8.2"
diff --git a/dev-haskell/objectname/objectname-1.0.0.0.ebuild b/dev-haskell/objectname/objectname-1.0.0.0.ebuild
index c5982ef7c886..ae972b29958d 100644
--- a/dev-haskell/objectname/objectname-1.0.0.0.ebuild
+++ b/dev-haskell/objectname/objectname-1.0.0.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.8.2"
diff --git a/dev-haskell/old-locale/old-locale-1.0.0.7.ebuild b/dev-haskell/old-locale/old-locale-1.0.0.7.ebuild
index eb1046a017ad..8dd8aaa47c04 100644
--- a/dev-haskell/old-locale/old-locale-1.0.0.7.ebuild
+++ b/dev-haskell/old-locale/old-locale-1.0.0.7.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/old-time/old-time-1.1.0.3-r1.ebuild b/dev-haskell/old-time/old-time-1.1.0.3-r1.ebuild
index 8497695c78b6..47e45a2cffcb 100644
--- a/dev-haskell/old-time/old-time-1.1.0.3-r1.ebuild
+++ b/dev-haskell/old-time/old-time-1.1.0.3-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
diff --git a/dev-haskell/openal/openal-1.4.0.2.ebuild b/dev-haskell/openal/openal-1.4.0.2.ebuild
index 5a21afb21d83..fb3aec3796a2 100644
--- a/dev-haskell/openal/openal-1.4.0.2.ebuild
+++ b/dev-haskell/openal/openal-1.4.0.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS=" amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/objectname:=[profile?]
diff --git a/dev-haskell/opengl/opengl-2.9.2.0.ebuild b/dev-haskell/opengl/opengl-2.9.2.0.ebuild
index 5fd4f942e76c..0d913a546055 100644
--- a/dev-haskell/opengl/opengl-2.9.2.0.ebuild
+++ b/dev-haskell/opengl/opengl-2.9.2.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/gluraw-1.3.0.0:=[profile?]
diff --git a/dev-haskell/openglraw/openglraw-1.3.0.0.ebuild b/dev-haskell/openglraw/openglraw-1.3.0.0.ebuild
index 5d82f3ea7e11..1fa7107792bb 100644
--- a/dev-haskell/openglraw/openglraw-1.3.0.0.ebuild
+++ b/dev-haskell/openglraw/openglraw-1.3.0.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/openglraw/openglraw-1.5.0.0.ebuild b/dev-haskell/openglraw/openglraw-1.5.0.0.ebuild
index 8d5abf9051f1..69dca6a3a1ab 100644
--- a/dev-haskell/openglraw/openglraw-1.5.0.0.ebuild
+++ b/dev-haskell/openglraw/openglraw-1.5.0.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/openssl-streams/openssl-streams-1.2.1.0.ebuild b/dev-haskell/openssl-streams/openssl-streams-1.2.1.0.ebuild
index 4a38a2295dbe..227acb2f313a 100644
--- a/dev-haskell/openssl-streams/openssl-streams-1.2.1.0.ebuild
+++ b/dev-haskell/openssl-streams/openssl-streams-1.2.1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/hsopenssl-0.10.3:=[profile?] <dev-haskell/hsopenssl-0.12:=[profile?]
diff --git a/dev-haskell/options/options-1.2.1.1.ebuild b/dev-haskell/options/options-1.2.1.1.ebuild
index 844022f47d03..e37b14b6908d 100644
--- a/dev-haskell/options/options-1.2.1.1.ebuild
+++ b/dev-haskell/options/options-1.2.1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RESTRICT=test # circular depends
diff --git a/dev-haskell/optparse-applicative/optparse-applicative-0.11.0.2.ebuild b/dev-haskell/optparse-applicative/optparse-applicative-0.11.0.2.ebuild
index 4728a7a6aea2..21ac79c229ee 100644
--- a/dev-haskell/optparse-applicative/optparse-applicative-0.11.0.2.ebuild
+++ b/dev-haskell/optparse-applicative/optparse-applicative-0.11.0.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/ansi-wl-pprint-0.6:=[profile?] <dev-haskell/ansi-wl-pprint-0.7:=[profile?]
diff --git a/dev-haskell/optparse-applicative/optparse-applicative-0.13.0.0.ebuild b/dev-haskell/optparse-applicative/optparse-applicative-0.13.0.0.ebuild
index 2cc440cf3879..4337e6548509 100644
--- a/dev-haskell/optparse-applicative/optparse-applicative-0.13.0.0.ebuild
+++ b/dev-haskell/optparse-applicative/optparse-applicative-0.13.0.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RESTRICT=test # missing files
diff --git a/dev-haskell/optparse-applicative/optparse-applicative-0.7.0.2.ebuild b/dev-haskell/optparse-applicative/optparse-applicative-0.7.0.2.ebuild
index 7fa5a7833a98..f6e405b526d7 100644
--- a/dev-haskell/optparse-applicative/optparse-applicative-0.7.0.2.ebuild
+++ b/dev-haskell/optparse-applicative/optparse-applicative-0.7.0.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?]
diff --git a/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.10.4.1.ebuild b/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.10.4.1.ebuild
index 83a24e6f5e92..6f5a77d320c6 100644
--- a/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.10.4.1.ebuild
+++ b/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.10.4.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+bibutils debug embed-data-files test-citeproc unicode_collation"
 
 RESTRICT=test # execs a process dropping environment (with LD_PRELOAD)
diff --git a/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.3.1.ebuild b/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.3.1.ebuild
index 2fcb5fe15b3b..a96bebacba37 100644
--- a/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.3.1.ebuild
+++ b/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.3.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+bibutils embed-data-files +hexpat +network test-citeproc unicode_collation"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.7.2.ebuild b/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.7.2.ebuild
index 6ae8393a4dd1..ab931f4393f0 100644
--- a/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.7.2.ebuild
+++ b/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.7.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+bibutils debug embed-data-files test-citeproc unicode_collation"
 
 RESTRICT=test # fd:8: hClose: resource vanished (Broken pipe)
diff --git a/dev-haskell/pandoc-types/pandoc-types-1.12.3.ebuild b/dev-haskell/pandoc-types/pandoc-types-1.12.3.ebuild
index 8cc4df19ec7e..5a35a63bc6af 100644
--- a/dev-haskell/pandoc-types/pandoc-types-1.12.3.ebuild
+++ b/dev-haskell/pandoc-types/pandoc-types-1.12.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/aeson-0.6.2:=[profile?] <dev-haskell/aeson-0.7:=[profile?]
diff --git a/dev-haskell/pandoc-types/pandoc-types-1.12.4.5.ebuild b/dev-haskell/pandoc-types/pandoc-types-1.12.4.5.ebuild
index 9d99e1abad78..e549eba8e478 100644
--- a/dev-haskell/pandoc-types/pandoc-types-1.12.4.5.ebuild
+++ b/dev-haskell/pandoc-types/pandoc-types-1.12.4.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/aeson-0.6.2:=[profile?] <dev-haskell/aeson-0.10:=[profile?]
diff --git a/dev-haskell/pandoc-types/pandoc-types-1.17.0.4.ebuild b/dev-haskell/pandoc-types/pandoc-types-1.17.0.4.ebuild
index c0e5a524418b..80d0b7c3940d 100644
--- a/dev-haskell/pandoc-types/pandoc-types-1.17.0.4.ebuild
+++ b/dev-haskell/pandoc-types/pandoc-types-1.17.0.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/aeson-0.6.2:=[profile?] <dev-haskell/aeson-1.1:=[profile?]
diff --git a/dev-haskell/pango/pango-0.12.5.3.ebuild b/dev-haskell/pango/pango-0.12.5.3.ebuild
index 99ec90692569..e7de7fb3722b 100644
--- a/dev-haskell/pango/pango-0.12.5.3.ebuild
+++ b/dev-haskell/pango/pango-0.12.5.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/cairo-0.12.5.3:0=[profile?] <dev-haskell/cairo-0.13:0=[profile?]
diff --git a/dev-haskell/pango/pango-0.13.1.1.ebuild b/dev-haskell/pango/pango-0.13.1.1.ebuild
index 7c47b5b88a84..4ec51e0f7fa4 100644
--- a/dev-haskell/pango/pango-0.13.1.1.ebuild
+++ b/dev-haskell/pango/pango-0.13.1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/cairo-0.13.0.0:=[profile?] <dev-haskell/cairo-0.14:=[profile?]
diff --git a/dev-haskell/pango/pango-0.13.3.1.ebuild b/dev-haskell/pango/pango-0.13.3.1.ebuild
index c62549e260b8..ef12aac53d66 100644
--- a/dev-haskell/pango/pango-0.13.3.1.ebuild
+++ b/dev-haskell/pango/pango-0.13.3.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/cairo-0.13.0.0:=[profile?] <dev-haskell/cairo-0.14:=[profile?]
diff --git a/dev-haskell/parallel/parallel-3.2.0.3.ebuild b/dev-haskell/parallel/parallel-3.2.0.3.ebuild
index 30aade79a91c..789725578937 100644
--- a/dev-haskell/parallel/parallel-3.2.0.3.ebuild
+++ b/dev-haskell/parallel/parallel-3.2.0.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="3/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.10.4:="
diff --git a/dev-haskell/parsec/parsec-3.1.5.ebuild b/dev-haskell/parsec/parsec-3.1.5.ebuild
index 1f769a8bf359..2fcd5db88bb8 100644
--- a/dev-haskell/parsec/parsec-3.1.5.ebuild
+++ b/dev-haskell/parsec/parsec-3.1.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="dev-haskell/mtl:=[profile?]
diff --git a/dev-haskell/parsec/parsec-3.1.9-r1.ebuild b/dev-haskell/parsec/parsec-3.1.9-r1.ebuild
index 17aec0944130..e2fecf1da5cd 100644
--- a/dev-haskell/parsec/parsec-3.1.9-r1.ebuild
+++ b/dev-haskell/parsec/parsec-3.1.9-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="dev-haskell/mtl:=[profile?]
diff --git a/dev-haskell/patience/patience-0.1.1.ebuild b/dev-haskell/patience/patience-0.1.1.ebuild
index 42998269cd4b..2fb6413dfa3f 100644
--- a/dev-haskell/patience/patience-0.1.1.ebuild
+++ b/dev-haskell/patience/patience-0.1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/pcap/pcap-0.4.5.2-r1.ebuild b/dev-haskell/pcap/pcap-0.4.5.2-r1.ebuild
index efdddf1b4b5f..1787dd4d682c 100644
--- a/dev-haskell/pcap/pcap-0.4.5.2-r1.ebuild
+++ b/dev-haskell/pcap/pcap-0.4.5.2-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/network:=[profile?]
diff --git a/dev-haskell/pcre-light/pcre-light-0.4-r1.ebuild b/dev-haskell/pcre-light/pcre-light-0.4-r1.ebuild
index 4e2231640ff2..1b938d18b1d4 100644
--- a/dev-haskell/pcre-light/pcre-light-0.4-r1.ebuild
+++ b/dev-haskell/pcre-light/pcre-light-0.4-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86 ~amd64-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.10.4:=
diff --git a/dev-haskell/pem/pem-0.2.2.ebuild b/dev-haskell/pem/pem-0.2.2.ebuild
index aac36e30769a..5fb5ee3ff2be 100644
--- a/dev-haskell/pem/pem-0.2.2.ebuild
+++ b/dev-haskell/pem/pem-0.2.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/base64-bytestring-1.0.0:=[profile?]
diff --git a/dev-haskell/polyparse/polyparse-1.11.ebuild b/dev-haskell/polyparse/polyparse-1.11.ebuild
index fe643b59a5b5..5920f7dd78c1 100644
--- a/dev-haskell/polyparse/polyparse-1.11.ebuild
+++ b/dev-haskell/polyparse/polyparse-1.11.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="dev-haskell/text:=[profile?]
diff --git a/dev-haskell/polyparse/polyparse-1.9.ebuild b/dev-haskell/polyparse/polyparse-1.9.ebuild
index 02eaeaa18480..c468aa996db7 100644
--- a/dev-haskell/polyparse/polyparse-1.9.ebuild
+++ b/dev-haskell/polyparse/polyparse-1.9.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/text:=[profile?]
diff --git a/dev-haskell/prelude-extras/prelude-extras-0.4.0.3.ebuild b/dev-haskell/prelude-extras/prelude-extras-0.4.0.3.ebuild
index 009342f650a6..5883be8779dc 100644
--- a/dev-haskell/prelude-extras/prelude-extras-0.4.0.3.ebuild
+++ b/dev-haskell/prelude-extras/prelude-extras-0.4.0.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/preprocessor-tools/preprocessor-tools-1.0.1.ebuild b/dev-haskell/preprocessor-tools/preprocessor-tools-1.0.1.ebuild
index a70b1a8bd748..e1e9949785f3 100644
--- a/dev-haskell/preprocessor-tools/preprocessor-tools-1.0.1.ebuild
+++ b/dev-haskell/preprocessor-tools/preprocessor-tools-1.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/mtl-1:=[profile?] <dev-haskell/mtl-3:=[profile?]
diff --git a/dev-haskell/pretty-show/pretty-show-1.6.8.2.ebuild b/dev-haskell/pretty-show/pretty-show-1.6.8.2.ebuild
index 2bd779cb78d6..19668aa3ceca 100644
--- a/dev-haskell/pretty-show/pretty-show-1.6.8.2.ebuild
+++ b/dev-haskell/pretty-show/pretty-show-1.6.8.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/haskell-lexer-1:=[profile?] <dev-haskell/haskell-lexer-2:=[profile?]
diff --git a/dev-haskell/primitive/primitive-0.5.0.1.ebuild b/dev-haskell/primitive/primitive-0.5.0.1.ebuild
index 88937ffa95cd..3a22e7f02d42 100644
--- a/dev-haskell/primitive/primitive-0.5.0.1.ebuild
+++ b/dev-haskell/primitive/primitive-0.5.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.12.3:="
diff --git a/dev-haskell/primitive/primitive-0.5.1.0.ebuild b/dev-haskell/primitive/primitive-0.5.1.0.ebuild
index d4182a31ef4f..a9cf9a5378eb 100644
--- a/dev-haskell/primitive/primitive-0.5.1.0.ebuild
+++ b/dev-haskell/primitive/primitive-0.5.1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.10.4:=
diff --git a/dev-haskell/profunctors/profunctors-4.4.1.ebuild b/dev-haskell/profunctors/profunctors-4.4.1.ebuild
index a79f7f11d57d..68198aee9905 100644
--- a/dev-haskell/profunctors/profunctors-4.4.1.ebuild
+++ b/dev-haskell/profunctors/profunctors-4.4.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-5:=[profile?]
diff --git a/dev-haskell/profunctors/profunctors-5.1.2.ebuild b/dev-haskell/profunctors/profunctors-5.1.2.ebuild
index 2d06a5c5b067..f9af8718ed9b 100644
--- a/dev-haskell/profunctors/profunctors-5.1.2.ebuild
+++ b/dev-haskell/profunctors/profunctors-5.1.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/bifunctors-5:=[profile?] <dev-haskell/bifunctors-6:=[profile?]
diff --git a/dev-haskell/profunctors/profunctors-5.2.ebuild b/dev-haskell/profunctors/profunctors-5.2.ebuild
index 9ad259902b1a..ccbe6434f49d 100644
--- a/dev-haskell/profunctors/profunctors-5.2.ebuild
+++ b/dev-haskell/profunctors/profunctors-5.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/base-orphans-0.4:=[profile?] <dev-haskell/base-orphans-0.6:=[profile?]
diff --git a/dev-haskell/psqueue/psqueue-1.1-r1.ebuild b/dev-haskell/psqueue/psqueue-1.1-r1.ebuild
index f788b4fcdcf0..6eb5c3e912e3 100644
--- a/dev-haskell/psqueue/psqueue-1.1-r1.ebuild
+++ b/dev-haskell/psqueue/psqueue-1.1-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/publicsuffixlist/publicsuffixlist-0.1.ebuild b/dev-haskell/publicsuffixlist/publicsuffixlist-0.1.ebuild
index 0e31adf5b893..6be6c2e78c2d 100644
--- a/dev-haskell/publicsuffixlist/publicsuffixlist-0.1.ebuild
+++ b/dev-haskell/publicsuffixlist/publicsuffixlist-0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="create runtimelist"
 
 RDEPEND="dev-haskell/cereal:=[profile?]
diff --git a/dev-haskell/punycode/punycode-2.0.ebuild b/dev-haskell/punycode/punycode-2.0.ebuild
index 305a6f0ba14a..1868a53af40f 100644
--- a/dev-haskell/punycode/punycode-2.0.ebuild
+++ b/dev-haskell/punycode/punycode-2.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RESTRICT=test # runs slow, finds error
diff --git a/dev-haskell/puremd5/puremd5-2.1.2.1.ebuild b/dev-haskell/puremd5/puremd5-2.1.2.1.ebuild
index 3fad0d492173..0a11a6af0589 100644
--- a/dev-haskell/puremd5/puremd5-2.1.2.1.ebuild
+++ b/dev-haskell/puremd5/puremd5-2.1.2.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/binary-0.4.0[profile?]
diff --git a/dev-haskell/quickcheck-instances/quickcheck-instances-0.3.11.ebuild b/dev-haskell/quickcheck-instances/quickcheck-instances-0.3.11.ebuild
index 2407e0b0b100..67017a36101f 100644
--- a/dev-haskell/quickcheck-instances/quickcheck-instances-0.3.11.ebuild
+++ b/dev-haskell/quickcheck-instances/quickcheck-instances-0.3.11.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
diff --git a/dev-haskell/quickcheck-instances/quickcheck-instances-0.3.12-r1.ebuild b/dev-haskell/quickcheck-instances/quickcheck-instances-0.3.12-r1.ebuild
index 86411bb3907e..77d2e606e87d 100644
--- a/dev-haskell/quickcheck-instances/quickcheck-instances-0.3.12-r1.ebuild
+++ b/dev-haskell/quickcheck-instances/quickcheck-instances-0.3.12-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
diff --git a/dev-haskell/quickcheck-io/quickcheck-io-0.1.1-r1.ebuild b/dev-haskell/quickcheck-io/quickcheck-io-0.1.1-r1.ebuild
index 09da6ecc046e..62569c3ed25b 100644
--- a/dev-haskell/quickcheck-io/quickcheck-io-0.1.1-r1.ebuild
+++ b/dev-haskell/quickcheck-io/quickcheck-io-0.1.1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/hunit-1.2.5:=[profile?]
diff --git a/dev-haskell/quickcheck-io/quickcheck-io-0.1.4.ebuild b/dev-haskell/quickcheck-io/quickcheck-io-0.1.4.ebuild
index 2020776147a9..15a75829ac09 100644
--- a/dev-haskell/quickcheck-io/quickcheck-io-0.1.4.ebuild
+++ b/dev-haskell/quickcheck-io/quickcheck-io-0.1.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/hunit-1.2.5:=[profile?]
diff --git a/dev-haskell/quickcheck-unicode/quickcheck-unicode-1.0.0.1.ebuild b/dev-haskell/quickcheck-unicode/quickcheck-unicode-1.0.0.1.ebuild
index 9169b7ccefa5..242646a1e8ba 100644
--- a/dev-haskell/quickcheck-unicode/quickcheck-unicode-1.0.0.1.ebuild
+++ b/dev-haskell/quickcheck-unicode/quickcheck-unicode-1.0.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/quickcheck-2.7:2=[profile?]
diff --git a/dev-haskell/quickcheck/quickcheck-2.6.ebuild b/dev-haskell/quickcheck/quickcheck-2.6.ebuild
index 8419022c7246..daef13bc6639 100644
--- a/dev-haskell/quickcheck/quickcheck-2.6.ebuild
+++ b/dev-haskell/quickcheck/quickcheck-2.6.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="2/${PV}"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux"
 IUSE="+template-haskell"
 
 RDEPEND="dev-haskell/extensible-exceptions:=[profile?]
diff --git a/dev-haskell/quickcheck/quickcheck-2.8.1.ebuild b/dev-haskell/quickcheck/quickcheck-2.8.1.ebuild
index f39049c400db..9f151ada5e84 100644
--- a/dev-haskell/quickcheck/quickcheck-2.8.1.ebuild
+++ b/dev-haskell/quickcheck/quickcheck-2.8.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="2/${PV}"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux"
 IUSE="+template-haskell"
 
 RDEPEND="dev-haskell/random:=[profile?]
diff --git a/dev-haskell/quickcheck/quickcheck-2.8.2.ebuild b/dev-haskell/quickcheck/quickcheck-2.8.2.ebuild
index 9aaf45111349..b7431f873a2f 100644
--- a/dev-haskell/quickcheck/quickcheck-2.8.2.ebuild
+++ b/dev-haskell/quickcheck/quickcheck-2.8.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="2/${PV}"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux"
 IUSE="+template-haskell"
 
 RESTRICT=test # to avoid test circular depends
diff --git a/dev-haskell/quickcheck/quickcheck-2.9.2.ebuild b/dev-haskell/quickcheck/quickcheck-2.9.2.ebuild
index 4a0ebf89f900..da927a6a25b4 100644
--- a/dev-haskell/quickcheck/quickcheck-2.9.2.ebuild
+++ b/dev-haskell/quickcheck/quickcheck-2.9.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="2/${PV}"
-KEYWORDS="amd64 x86 ~amd64-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
 IUSE="+template-haskell"
 
 RESTRICT=test # to avoid test circular depends
diff --git a/dev-haskell/random/random-1.0.1.1-r1.ebuild b/dev-haskell/random/random-1.0.1.1-r1.ebuild
index 0f91451f45c0..939c99180d4d 100644
--- a/dev-haskell/random/random-1.0.1.1-r1.ebuild
+++ b/dev-haskell/random/random-1.0.1.1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.8.2:="
diff --git a/dev-haskell/ranges/ranges-0.2.4-r1.ebuild b/dev-haskell/ranges/ranges-0.2.4-r1.ebuild
index ef30a7a8a550..3ce623959a52 100644
--- a/dev-haskell/ranges/ranges-0.2.4-r1.ebuild
+++ b/dev-haskell/ranges/ranges-0.2.4-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/readable/readable-0.3.1.ebuild b/dev-haskell/readable/readable-0.3.1.ebuild
index 67412cd01d62..50080957c397 100644
--- a/dev-haskell/readable/readable-0.3.1.ebuild
+++ b/dev-haskell/readable/readable-0.3.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?]
diff --git a/dev-haskell/reflection/reflection-1.5.2.1.ebuild b/dev-haskell/reflection/reflection-1.5.2.1.ebuild
index 3f7c0be7ee1a..771192b19a74 100644
--- a/dev-haskell/reflection/reflection-1.5.2.1.ebuild
+++ b/dev-haskell/reflection/reflection-1.5.2.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+template-haskell"
 
 RDEPEND=">=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?]
diff --git a/dev-haskell/reflection/reflection-2.1.2.ebuild b/dev-haskell/reflection/reflection-2.1.2.ebuild
index dbdb3c44b585..8431606b0af0 100644
--- a/dev-haskell/reflection/reflection-2.1.2.ebuild
+++ b/dev-haskell/reflection/reflection-2.1.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+template-haskell"
 
 RDEPEND=">=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?]
diff --git a/dev-haskell/regex-applicative/regex-applicative-0.3.3.ebuild b/dev-haskell/regex-applicative/regex-applicative-0.3.3.ebuild
index 100a8f92cc4c..394913aa91ae 100644
--- a/dev-haskell/regex-applicative/regex-applicative-0.3.3.ebuild
+++ b/dev-haskell/regex-applicative/regex-applicative-0.3.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="dev-haskell/transformers:=[profile?]
diff --git a/dev-haskell/regex-base/regex-base-0.93.2-r1.ebuild b/dev-haskell/regex-base/regex-base-0.93.2-r1.ebuild
index 4a5f286b2eb3..36c19b71bfc7 100644
--- a/dev-haskell/regex-base/regex-base-0.93.2-r1.ebuild
+++ b/dev-haskell/regex-base/regex-base-0.93.2-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="dev-haskell/mtl:=[profile?]
diff --git a/dev-haskell/regex-compat-tdfa/regex-compat-tdfa-0.95.1.4.ebuild b/dev-haskell/regex-compat-tdfa/regex-compat-tdfa-0.95.1.4.ebuild
index 9f8ca2257875..2e51afb3c933 100644
--- a/dev-haskell/regex-compat-tdfa/regex-compat-tdfa-0.95.1.4.ebuild
+++ b/dev-haskell/regex-compat-tdfa/regex-compat-tdfa-0.95.1.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-haskell/regex-base-0.93:=[profile?]
diff --git a/dev-haskell/regex-compat/regex-compat-0.95.1-r1.ebuild b/dev-haskell/regex-compat/regex-compat-0.95.1-r1.ebuild
index 66365944268d..983643f17178 100644
--- a/dev-haskell/regex-compat/regex-compat-0.95.1-r1.ebuild
+++ b/dev-haskell/regex-compat/regex-compat-0.95.1-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=dev-haskell/regex-base-0.93:=[profile?]
diff --git a/dev-haskell/regex-pcre-builtin/regex-pcre-builtin-0.94.4.8.8.35.ebuild b/dev-haskell/regex-pcre-builtin/regex-pcre-builtin-0.94.4.8.8.35.ebuild
index c03869ee7f19..48d8b5d6bf17 100644
--- a/dev-haskell/regex-pcre-builtin/regex-pcre-builtin-0.94.4.8.8.35.ebuild
+++ b/dev-haskell/regex-pcre-builtin/regex-pcre-builtin-0.94.4.8.8.35.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/regex-base-0.93:=[profile?]
diff --git a/dev-haskell/regex-pcre/regex-pcre-0.94.4-r1.ebuild b/dev-haskell/regex-pcre/regex-pcre-0.94.4-r1.ebuild
index 4d76c405fa8d..22b215934a1c 100644
--- a/dev-haskell/regex-pcre/regex-pcre-0.94.4-r1.ebuild
+++ b/dev-haskell/regex-pcre/regex-pcre-0.94.4-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/regex-base-0.93:=[profile?]
diff --git a/dev-haskell/regex-posix/regex-posix-0.95.2.ebuild b/dev-haskell/regex-posix/regex-posix-0.95.2.ebuild
index ed1fcc08186f..2c7bf9703b02 100644
--- a/dev-haskell/regex-posix/regex-posix-0.95.2.ebuild
+++ b/dev-haskell/regex-posix/regex-posix-0.95.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=dev-haskell/regex-base-0.93[profile?]
diff --git a/dev-haskell/regex-tdfa-rc/regex-tdfa-rc-1.1.8.3.ebuild b/dev-haskell/regex-tdfa-rc/regex-tdfa-rc-1.1.8.3.ebuild
index 76787e622711..1f0970f96289 100644
--- a/dev-haskell/regex-tdfa-rc/regex-tdfa-rc-1.1.8.3.ebuild
+++ b/dev-haskell/regex-tdfa-rc/regex-tdfa-rc-1.1.8.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/mtl:=[profile?]
diff --git a/dev-haskell/regex-tdfa/regex-tdfa-1.2.0.ebuild b/dev-haskell/regex-tdfa/regex-tdfa-1.2.0.ebuild
index 9108418a0e98..b3ca61d5138e 100644
--- a/dev-haskell/regex-tdfa/regex-tdfa-1.2.0.ebuild
+++ b/dev-haskell/regex-tdfa/regex-tdfa-1.2.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/mtl:=[profile?]
diff --git a/dev-haskell/resourcet/resourcet-0.4.9.ebuild b/dev-haskell/resourcet/resourcet-0.4.9.ebuild
index 1d9165467d50..35f6989bfa07 100644
--- a/dev-haskell/resourcet/resourcet-0.4.9.ebuild
+++ b/dev-haskell/resourcet/resourcet-0.4.9.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/lifted-base-0.1:=[profile?]
diff --git a/dev-haskell/resourcet/resourcet-1.1.2.2.ebuild b/dev-haskell/resourcet/resourcet-1.1.2.2.ebuild
index ff09380c2787..c234e8474196 100644
--- a/dev-haskell/resourcet/resourcet-1.1.2.2.ebuild
+++ b/dev-haskell/resourcet/resourcet-1.1.2.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/exceptions-0.5:=[profile?]
diff --git a/dev-haskell/resourcet/resourcet-1.1.7.4.ebuild b/dev-haskell/resourcet/resourcet-1.1.7.4.ebuild
index 55ee65ff5b43..102878ecb3c4 100644
--- a/dev-haskell/resourcet/resourcet-1.1.7.4.ebuild
+++ b/dev-haskell/resourcet/resourcet-1.1.7.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/exceptions-0.5:=[profile?]
diff --git a/dev-haskell/rfc5051/rfc5051-0.1.0.3.ebuild b/dev-haskell/rfc5051/rfc5051-0.1.0.3.ebuild
index 9f19c85f5157..8cba89ff50af 100644
--- a/dev-haskell/rfc5051/rfc5051-0.1.0.3.ebuild
+++ b/dev-haskell/rfc5051/rfc5051-0.1.0.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="mkunicodedata"
 
 RDEPEND=">=dev-lang/ghc-7.0.1:=
diff --git a/dev-haskell/safe/safe-0.3.9.ebuild b/dev-haskell/safe/safe-0.3.9.ebuild
index 2ffe29b00c79..608230a4dbed 100644
--- a/dev-haskell/safe/safe-0.3.9.ebuild
+++ b/dev-haskell/safe/safe-0.3.9.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/safesemaphore/safesemaphore-0.10.1.ebuild b/dev-haskell/safesemaphore/safesemaphore-0.10.1.ebuild
index 5b726492def8..f094d3f7db59 100644
--- a/dev-haskell/safesemaphore/safesemaphore-0.10.1.ebuild
+++ b/dev-haskell/safesemaphore/safesemaphore-0.10.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86 ~amd64-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
 IUSE=""
 
 RDEPEND="dev-haskell/stm:=[profile?]
diff --git a/dev-haskell/sandi/sandi-0.3.6.ebuild b/dev-haskell/sandi/sandi-0.3.6.ebuild
index 957515e03f13..149187789c7a 100644
--- a/dev-haskell/sandi/sandi-0.3.6.ebuild
+++ b/dev-haskell/sandi/sandi-0.3.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+with-conduit"
 
 RDEPEND=">=dev-lang/ghc-7.8.2:=
diff --git a/dev-haskell/sandi/sandi-0.4.0.ebuild b/dev-haskell/sandi/sandi-0.4.0.ebuild
index 074ab9e24d58..05b85729107c 100644
--- a/dev-haskell/sandi/sandi-0.4.0.ebuild
+++ b/dev-haskell/sandi/sandi-0.4.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="+with-conduit"
 
 RDEPEND=">=dev-haskell/stringsearch-0.3:=[profile?] <dev-haskell/stringsearch-0.4:=[profile?]
diff --git a/dev-haskell/scientific/scientific-0.3.3.8.ebuild b/dev-haskell/scientific/scientific-0.3.3.8.ebuild
index 7b5860057005..d7b467896092 100644
--- a/dev-haskell/scientific/scientific-0.3.3.8.ebuild
+++ b/dev-haskell/scientific/scientific-0.3.3.8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+bytestring-builder"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-haskell/scientific/scientific-0.3.4.9.ebuild b/dev-haskell/scientific/scientific-0.3.4.9.ebuild
index 70e37e5e72f9..ae9daf6295fb 100644
--- a/dev-haskell/scientific/scientific-0.3.4.9.ebuild
+++ b/dev-haskell/scientific/scientific-0.3.4.9.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-haskell/binary-0.4.1:=[profile?] <dev-haskell/binary-0.9:=[profile?]
diff --git a/dev-haskell/securemem/securemem-0.1.3.ebuild b/dev-haskell/securemem/securemem-0.1.3.ebuild
index 607b1c699b4a..4f482d2ab091 100644
--- a/dev-haskell/securemem/securemem-0.1.3.ebuild
+++ b/dev-haskell/securemem/securemem-0.1.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/byteable-0.1.1:=[profile?]
diff --git a/dev-haskell/semigroupoids/semigroupoids-4.3.ebuild b/dev-haskell/semigroupoids/semigroupoids-4.3.ebuild
index 961a3b8e36aa..9b23ea30875c 100644
--- a/dev-haskell/semigroupoids/semigroupoids-4.3.ebuild
+++ b/dev-haskell/semigroupoids/semigroupoids-4.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+comonad +containers +contravariant +distributive"
 RESTRICT="test"
 
diff --git a/dev-haskell/semigroupoids/semigroupoids-5.0.0.4.ebuild b/dev-haskell/semigroupoids/semigroupoids-5.0.0.4.ebuild
index f8de02c22d28..f72ec5733ede 100644
--- a/dev-haskell/semigroupoids/semigroupoids-5.0.0.4.ebuild
+++ b/dev-haskell/semigroupoids/semigroupoids-5.0.0.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+comonad +containers +contravariant +distributive +tagged"
 
 RDEPEND=">=dev-haskell/base-orphans-0.3:=[profile?] <dev-haskell/base-orphans-1:=[profile?]
diff --git a/dev-haskell/semigroupoids/semigroupoids-5.1.ebuild b/dev-haskell/semigroupoids/semigroupoids-5.1.ebuild
index 0be857d5cd08..178149aceba0 100644
--- a/dev-haskell/semigroupoids/semigroupoids-5.1.ebuild
+++ b/dev-haskell/semigroupoids/semigroupoids-5.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+comonad +containers +contravariant +distributive +tagged"
 
 RDEPEND=">=dev-haskell/base-orphans-0.3:=[profile?] <dev-haskell/base-orphans-1:=[profile?]
diff --git a/dev-haskell/semigroups/semigroups-0.11-r1.ebuild b/dev-haskell/semigroups/semigroups-0.11-r1.ebuild
index 9d2e700e1e41..3366842fce59 100644
--- a/dev-haskell/semigroups/semigroups-0.11-r1.ebuild
+++ b/dev-haskell/semigroups/semigroups-0.11-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
diff --git a/dev-haskell/semigroups/semigroups-0.12.1.ebuild b/dev-haskell/semigroups/semigroups-0.12.1.ebuild
index 300181e0735c..c3c8d3f4b83f 100644
--- a/dev-haskell/semigroups/semigroups-0.12.1.ebuild
+++ b/dev-haskell/semigroups/semigroups-0.12.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
diff --git a/dev-haskell/semigroups/semigroups-0.12.2.ebuild b/dev-haskell/semigroups/semigroups-0.12.2.ebuild
index c3e276b734d5..c633900ffcdd 100644
--- a/dev-haskell/semigroups/semigroups-0.12.2.ebuild
+++ b/dev-haskell/semigroups/semigroups-0.12.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
diff --git a/dev-haskell/semigroups/semigroups-0.16.2.2.ebuild b/dev-haskell/semigroups/semigroups-0.16.2.2.ebuild
index 8f5637ab742a..1c51b943602d 100644
--- a/dev-haskell/semigroups/semigroups-0.16.2.2.ebuild
+++ b/dev-haskell/semigroups/semigroups-0.16.2.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+bytestring +containers +deepseq +hashable +text +unordered-containers"
 
 RDEPEND=">=dev-haskell/nats-0.1:=[profile?] <dev-haskell/nats-2:=[profile?]
diff --git a/dev-haskell/semigroups/semigroups-0.18.2.ebuild b/dev-haskell/semigroups/semigroups-0.18.2.ebuild
index 81160186e82d..77a736fb3043 100644
--- a/dev-haskell/semigroups/semigroups-0.18.2.ebuild
+++ b/dev-haskell/semigroups/semigroups-0.18.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="+binary +transformers"
 
 RDEPEND=">=dev-haskell/bytestring-builder-0.10.4:=[profile?] <dev-haskell/bytestring-builder-1:=[profile?]
diff --git a/dev-haskell/setenv/setenv-0.1.1.1.ebuild b/dev-haskell/setenv/setenv-0.1.1.1.ebuild
index 5e592e8c7477..f8083be8661d 100644
--- a/dev-haskell/setenv/setenv-0.1.1.1.ebuild
+++ b/dev-haskell/setenv/setenv-0.1.1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RESTRICT=test # missing files
diff --git a/dev-haskell/setlocale/setlocale-1.0.0.3.ebuild b/dev-haskell/setlocale/setlocale-1.0.0.3.ebuild
index 09a250bd663b..fb34874e13b7 100644
--- a/dev-haskell/setlocale/setlocale-1.0.0.3.ebuild
+++ b/dev-haskell/setlocale/setlocale-1.0.0.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.6.1:=
diff --git a/dev-haskell/sha/sha-1.6.4.2.ebuild b/dev-haskell/sha/sha-1.6.4.2.ebuild
index ec5ddaedcaef..33d2e1fd284e 100644
--- a/dev-haskell/sha/sha-1.6.4.2.ebuild
+++ b/dev-haskell/sha/sha-1.6.4.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86 ~amd64-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
 IUSE="exe"
 
 RESTRICT=test # fails to build on ghc-7.6, https://ghc.haskell.org/trac/ghc/ticket/8657
diff --git a/dev-haskell/shellish/shellish-0.1.4.ebuild b/dev-haskell/shellish/shellish-0.1.4.ebuild
index 51d926c65965..2ac7bee17f9f 100644
--- a/dev-haskell/shellish/shellish-0.1.4.ebuild
+++ b/dev-haskell/shellish/shellish-0.1.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/mtl[profile?]
diff --git a/dev-haskell/shelly/shelly-1.6.6.ebuild b/dev-haskell/shelly/shelly-1.6.6.ebuild
index 1f092777defc..fde63b698850 100644
--- a/dev-haskell/shelly/shelly-1.6.6.ebuild
+++ b/dev-haskell/shelly/shelly-1.6.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="lifted"
 
 RDEPEND="dev-haskell/async:=[profile?]
diff --git a/dev-haskell/shelly/shelly-1.6.8.1.ebuild b/dev-haskell/shelly/shelly-1.6.8.1.ebuild
index 2b2a8c5693e8..3a938c2007cc 100644
--- a/dev-haskell/shelly/shelly-1.6.8.1.ebuild
+++ b/dev-haskell/shelly/shelly-1.6.8.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="examples lifted"
 
 RDEPEND="dev-haskell/async:=[profile?]
diff --git a/dev-haskell/silently/silently-1.2.4.1.ebuild b/dev-haskell/silently/silently-1.2.4.1.ebuild
index 431d88705983..28c9a86ca0ef 100644
--- a/dev-haskell/silently/silently-1.2.4.1.ebuild
+++ b/dev-haskell/silently/silently-1.2.4.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.10.4:="
diff --git a/dev-haskell/simple-reflect/simple-reflect-0.3.2.ebuild b/dev-haskell/simple-reflect/simple-reflect-0.3.2.ebuild
index 8beeb3dd661f..93ade0265dee 100644
--- a/dev-haskell/simple-reflect/simple-reflect-0.3.2.ebuild
+++ b/dev-haskell/simple-reflect/simple-reflect-0.3.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/simple-sendfile/simple-sendfile-0.2.13.ebuild b/dev-haskell/simple-sendfile/simple-sendfile-0.2.13.ebuild
index 543deb9204a1..e3464d1c4134 100644
--- a/dev-haskell/simple-sendfile/simple-sendfile-0.2.13.ebuild
+++ b/dev-haskell/simple-sendfile/simple-sendfile-0.2.13.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+allow-bsd"
 
 RESTRICT=test # openBinaryFile: does not exist (No such file or directory)
diff --git a/dev-haskell/skylighting/skylighting-0.3.ebuild b/dev-haskell/skylighting/skylighting-0.3.ebuild
index a27416bd9532..5f3bfabca52d 100644
--- a/dev-haskell/skylighting/skylighting-0.3.ebuild
+++ b/dev-haskell/skylighting/skylighting-0.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="executable"
 
 RDEPEND="dev-haskell/aeson:=[profile?]
diff --git a/dev-haskell/smallcheck/smallcheck-1.1.1.ebuild b/dev-haskell/smallcheck/smallcheck-1.1.1.ebuild
index 7204a022fbdc..37accc0efa38 100644
--- a/dev-haskell/smallcheck/smallcheck-1.1.1.ebuild
+++ b/dev-haskell/smallcheck/smallcheck-1.1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/logict:=[profile?]
diff --git a/dev-haskell/snap-core/snap-core-0.9.8.0.ebuild b/dev-haskell/snap-core/snap-core-0.9.8.0.ebuild
index 1883e8cf7fc3..7aaa43d11b24 100644
--- a/dev-haskell/snap-core/snap-core-0.9.8.0.ebuild
+++ b/dev-haskell/snap-core/snap-core-0.9.8.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="debug portable"
 
 RDEPEND=">=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
diff --git a/dev-haskell/snap-core/snap-core-1.0.1.0.ebuild b/dev-haskell/snap-core/snap-core-1.0.1.0.ebuild
index 854b91ee529d..ef5432515143 100644
--- a/dev-haskell/snap-core/snap-core-1.0.1.0.ebuild
+++ b/dev-haskell/snap-core/snap-core-1.0.1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="debug portable"
 
 RDEPEND=">=dev-haskell/attoparsec-0.12:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
diff --git a/dev-haskell/snap-server/snap-server-0.9.5.1-r1.ebuild b/dev-haskell/snap-server/snap-server-0.9.5.1-r1.ebuild
index ba8ab119701d..68ee62caac17 100644
--- a/dev-haskell/snap-server/snap-server-0.9.5.1-r1.ebuild
+++ b/dev-haskell/snap-server/snap-server-0.9.5.1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="openssl portable"
 
 RDEPEND=">=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
diff --git a/dev-haskell/snap-server/snap-server-1.0.1.1.ebuild b/dev-haskell/snap-server/snap-server-1.0.1.1.ebuild
index 0723881d15dc..d5722fa906b6 100644
--- a/dev-haskell/snap-server/snap-server-1.0.1.1.ebuild
+++ b/dev-haskell/snap-server/snap-server-1.0.1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="build-pong debug openssl portable"
 
 RDEPEND=">=dev-haskell/attoparsec-0.12:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
diff --git a/dev-haskell/socks/socks-0.5.4.ebuild b/dev-haskell/socks/socks-0.5.4.ebuild
index 2988690abcce..e983e17c91d6 100644
--- a/dev-haskell/socks/socks-0.5.4.ebuild
+++ b/dev-haskell/socks/socks-0.5.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/cereal-0.3.1:=[profile?]
diff --git a/dev-haskell/split/split-0.2.2.ebuild b/dev-haskell/split/split-0.2.2.ebuild
index e1ebeeeb1056..09a2a883bdad 100644
--- a/dev-haskell/split/split-0.2.2.ebuild
+++ b/dev-haskell/split/split-0.2.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ppc ppc64 x86 ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~ppc-macos ~x86-macos"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.10.4:="
diff --git a/dev-haskell/statevar/statevar-1.0.0.0-r1.ebuild b/dev-haskell/statevar/statevar-1.0.0.0-r1.ebuild
index fbde48c4ed0f..4190eed22c19 100644
--- a/dev-haskell/statevar/statevar-1.0.0.0-r1.ebuild
+++ b/dev-haskell/statevar/statevar-1.0.0.0-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.10.4:="
diff --git a/dev-haskell/statevar/statevar-1.1.0.4.ebuild b/dev-haskell/statevar/statevar-1.1.0.4.ebuild
index f8ae53d51271..c9be15ae569c 100644
--- a/dev-haskell/statevar/statevar-1.1.0.4.ebuild
+++ b/dev-haskell/statevar/statevar-1.1.0.4.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/stm-2.0:=[profile?] <dev-haskell/stm-2.5:=[profile?]
diff --git a/dev-haskell/stm/stm-2.4.2.ebuild b/dev-haskell/stm/stm-2.4.2.ebuild
index 89510a3e4bb7..f8bde8423fd1 100644
--- a/dev-haskell/stm/stm-2.4.2.ebuild
+++ b/dev-haskell/stm/stm-2.4.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.10.4:="
diff --git a/dev-haskell/streaming-commons/streaming-commons-0.1.12.1.ebuild b/dev-haskell/streaming-commons/streaming-commons-0.1.12.1.ebuild
index 554d5b922eea..d8be447b7d45 100644
--- a/dev-haskell/streaming-commons/streaming-commons-0.1.12.1.ebuild
+++ b/dev-haskell/streaming-commons/streaming-commons-0.1.12.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/blaze-builder-0.3:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
diff --git a/dev-haskell/strict/strict-0.3.2.ebuild b/dev-haskell/strict/strict-0.3.2.ebuild
index 929786cc1234..cdb0db49e97c 100644
--- a/dev-haskell/strict/strict-0.3.2.ebuild
+++ b/dev-haskell/strict/strict-0.3.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.8.2"
diff --git a/dev-haskell/string-qq/string-qq-0.0.2.ebuild b/dev-haskell/string-qq/string-qq-0.0.2.ebuild
index c9187d058a2f..fb5b5829177f 100644
--- a/dev-haskell/string-qq/string-qq-0.0.2.ebuild
+++ b/dev-haskell/string-qq/string-qq-0.0.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.10.4:="
diff --git a/dev-haskell/stringable/stringable-0.1.3.ebuild b/dev-haskell/stringable/stringable-0.1.3.ebuild
index 1c25c1488f6c..52733c3df40a 100644
--- a/dev-haskell/stringable/stringable-0.1.3.ebuild
+++ b/dev-haskell/stringable/stringable-0.1.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/system-filepath-0.4.7:=[profile?]
diff --git a/dev-haskell/stringbuilder/stringbuilder-0.4.0.ebuild b/dev-haskell/stringbuilder/stringbuilder-0.4.0.ebuild
index f17d815e4710..9e359228d18b 100644
--- a/dev-haskell/stringbuilder/stringbuilder-0.4.0.ebuild
+++ b/dev-haskell/stringbuilder/stringbuilder-0.4.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.10.4:="
diff --git a/dev-haskell/stringbuilder/stringbuilder-0.5.0.ebuild b/dev-haskell/stringbuilder/stringbuilder-0.5.0.ebuild
index 9d8046112e10..f7aafa7eac33 100644
--- a/dev-haskell/stringbuilder/stringbuilder-0.5.0.ebuild
+++ b/dev-haskell/stringbuilder/stringbuilder-0.5.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/stringprep/stringprep-0.1.5.ebuild b/dev-haskell/stringprep/stringprep-0.1.5.ebuild
index a3e0fbde1bc9..74e5807babee 100644
--- a/dev-haskell/stringprep/stringprep-0.1.5.ebuild
+++ b/dev-haskell/stringprep/stringprep-0.1.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/ranges-0.2.2:=[profile?]
diff --git a/dev-haskell/stringsearch/stringsearch-0.3.6.5.ebuild b/dev-haskell/stringsearch/stringsearch-0.3.6.5.ebuild
index 01b3b7ce6f2e..851e2b936708 100644
--- a/dev-haskell/stringsearch/stringsearch-0.3.6.5.ebuild
+++ b/dev-haskell/stringsearch/stringsearch-0.3.6.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.10.4:=
diff --git a/dev-haskell/stringsearch/stringsearch-0.3.6.6.ebuild b/dev-haskell/stringsearch/stringsearch-0.3.6.6.ebuild
index 709893756d34..cafc7fcc16eb 100644
--- a/dev-haskell/stringsearch/stringsearch-0.3.6.6.ebuild
+++ b/dev-haskell/stringsearch/stringsearch-0.3.6.6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/syb/syb-0.4.3.ebuild b/dev-haskell/syb/syb-0.4.3.ebuild
index 7c9ad79186aa..cbd1c4dd8073 100644
--- a/dev-haskell/syb/syb-0.4.3.ebuild
+++ b/dev-haskell/syb/syb-0.4.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/syb/syb-0.4.4.ebuild b/dev-haskell/syb/syb-0.4.4.ebuild
index dbeab2ba2fd2..218afaac8e05 100644
--- a/dev-haskell/syb/syb-0.4.4.ebuild
+++ b/dev-haskell/syb/syb-0.4.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux"
 IUSE=""
 
 RESTRICT=test # ghc-7.10 slightly changed namespacing
diff --git a/dev-haskell/system-fileio/system-fileio-0.3.16.3.ebuild b/dev-haskell/system-fileio/system-fileio-0.3.16.3.ebuild
index 54aa5bfad11f..41043e3c92cd 100644
--- a/dev-haskell/system-fileio/system-fileio-0.3.16.3.ebuild
+++ b/dev-haskell/system-fileio/system-fileio-0.3.16.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/system-filepath-0.3.1:=[profile?] <dev-haskell/system-filepath-0.5:=[profile?]
diff --git a/dev-haskell/system-filepath/system-filepath-0.4.8-r1.ebuild b/dev-haskell/system-filepath/system-filepath-0.4.8-r1.ebuild
index f6aa19c6ab17..9eb658a75a95 100644
--- a/dev-haskell/system-filepath/system-filepath-0.4.8-r1.ebuild
+++ b/dev-haskell/system-filepath/system-filepath-0.4.8-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/text-0.7.1:=[profile?]
diff --git a/dev-haskell/tagged/tagged-0.7.3.ebuild b/dev-haskell/tagged/tagged-0.7.3.ebuild
index 50f53a300f84..c93f1b3fcfe9 100644
--- a/dev-haskell/tagged/tagged-0.7.3.ebuild
+++ b/dev-haskell/tagged/tagged-0.7.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/tagged/tagged-0.8.4.ebuild b/dev-haskell/tagged/tagged-0.8.4.ebuild
index a72310b0f3fe..42825daad773 100644
--- a/dev-haskell/tagged/tagged-0.8.4.ebuild
+++ b/dev-haskell/tagged/tagged-0.8.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/tagsoup/tagsoup-0.13.10.ebuild b/dev-haskell/tagsoup/tagsoup-0.13.10.ebuild
index 5ac8b81f3def..5336220bc374 100644
--- a/dev-haskell/tagsoup/tagsoup-0.13.10.ebuild
+++ b/dev-haskell/tagsoup/tagsoup-0.13.10.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="download testprog"
 
 RDEPEND="dev-haskell/text:=[profile?]
diff --git a/dev-haskell/tagsoup/tagsoup-0.13.3-r1.ebuild b/dev-haskell/tagsoup/tagsoup-0.13.3-r1.ebuild
index b9eb0b13feea..547ac95f1b42 100644
--- a/dev-haskell/tagsoup/tagsoup-0.13.3-r1.ebuild
+++ b/dev-haskell/tagsoup/tagsoup-0.13.3-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="download testprog"
 
 RDEPEND="dev-haskell/text:=[profile?]
diff --git a/dev-haskell/tar/tar-0.4.0.1.ebuild b/dev-haskell/tar/tar-0.4.0.1.ebuild
index 7287af68fc48..0b0107e47739 100644
--- a/dev-haskell/tar/tar-0.4.0.1.ebuild
+++ b/dev-haskell/tar/tar-0.4.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-macos"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-macos"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.10.4:="
diff --git a/dev-haskell/tar/tar-0.4.2.1.ebuild b/dev-haskell/tar/tar-0.4.2.1.ebuild
index caa25fbe90da..508b157b31e9 100644
--- a/dev-haskell/tar/tar-0.4.2.1.ebuild
+++ b/dev-haskell/tar/tar-0.4.2.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86 ~x86-macos"
+KEYWORDS="~amd64 ~x86 ~x86-macos"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.6.1:=
diff --git a/dev-haskell/tar/tar-0.5.0.3.ebuild b/dev-haskell/tar/tar-0.5.0.3.ebuild
index aa031a9503aa..6d5b45354f54 100644
--- a/dev-haskell/tar/tar-0.5.0.3.ebuild
+++ b/dev-haskell/tar/tar-0.5.0.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86 ~x86-macos"
+KEYWORDS="~amd64 ~x86 ~x86-macos"
 IUSE=""
 
 RDEPEND="dev-haskell/bytestring-builder:=[profile?]
diff --git a/dev-haskell/tasty-ant-xml/tasty-ant-xml-1.0.1.ebuild b/dev-haskell/tasty-ant-xml/tasty-ant-xml-1.0.1.ebuild
index eb20abf75c5a..5f3f3b07b9f4 100644
--- a/dev-haskell/tasty-ant-xml/tasty-ant-xml-1.0.1.ebuild
+++ b/dev-haskell/tasty-ant-xml/tasty-ant-xml-1.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/generic-deriving-1.6.2:=[profile?]
diff --git a/dev-haskell/tasty-ant-xml/tasty-ant-xml-1.0.2.ebuild b/dev-haskell/tasty-ant-xml/tasty-ant-xml-1.0.2.ebuild
index 2e0bea37db82..6e9902d89825 100644
--- a/dev-haskell/tasty-ant-xml/tasty-ant-xml-1.0.2.ebuild
+++ b/dev-haskell/tasty-ant-xml/tasty-ant-xml-1.0.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/generic-deriving-1.6.2:=[profile?]
diff --git a/dev-haskell/tasty-golden/tasty-golden-2.2.2.4.ebuild b/dev-haskell/tasty-golden/tasty-golden-2.2.2.4.ebuild
index 769de4c2f049..1d1a6ffa294b 100644
--- a/dev-haskell/tasty-golden/tasty-golden-2.2.2.4.ebuild
+++ b/dev-haskell/tasty-golden/tasty-golden-2.2.2.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/async:=[profile?]
diff --git a/dev-haskell/tasty-golden/tasty-golden-2.3.1.1.ebuild b/dev-haskell/tasty-golden/tasty-golden-2.3.1.1.ebuild
index 3e24f67a5dab..a0477e796d34 100644
--- a/dev-haskell/tasty-golden/tasty-golden-2.3.1.1.ebuild
+++ b/dev-haskell/tasty-golden/tasty-golden-2.3.1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/async:=[profile?]
diff --git a/dev-haskell/tasty-hunit/tasty-hunit-0.9.2.ebuild b/dev-haskell/tasty-hunit/tasty-hunit-0.9.2.ebuild
index 9e5ff257264a..024ec7680e66 100644
--- a/dev-haskell/tasty-hunit/tasty-hunit-0.9.2.ebuild
+++ b/dev-haskell/tasty-hunit/tasty-hunit-0.9.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/tasty-0.8:=[profile?]
diff --git a/dev-haskell/tasty-kat/tasty-kat-0.0.3.ebuild b/dev-haskell/tasty-kat/tasty-kat-0.0.3.ebuild
index e953f49947d7..cda78beb62e7 100644
--- a/dev-haskell/tasty-kat/tasty-kat-0.0.3.ebuild
+++ b/dev-haskell/tasty-kat/tasty-kat-0.0.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/tasty:=[profile?]
diff --git a/dev-haskell/tasty-quickcheck/tasty-quickcheck-0.8.3.2.ebuild b/dev-haskell/tasty-quickcheck/tasty-quickcheck-0.8.3.2.ebuild
index ab5ac94e1349..ce9b9cc0abfb 100644
--- a/dev-haskell/tasty-quickcheck/tasty-quickcheck-0.8.3.2.ebuild
+++ b/dev-haskell/tasty-quickcheck/tasty-quickcheck-0.8.3.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="old-quickcheck"
 
 RDEPEND="dev-haskell/tagged:=[profile?]
diff --git a/dev-haskell/tasty-smallcheck/tasty-smallcheck-0.2.ebuild b/dev-haskell/tasty-smallcheck/tasty-smallcheck-0.2.ebuild
index f076e6f94f4b..ce67b27ae70e 100644
--- a/dev-haskell/tasty-smallcheck/tasty-smallcheck-0.2.ebuild
+++ b/dev-haskell/tasty-smallcheck/tasty-smallcheck-0.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/async:=[profile?]
diff --git a/dev-haskell/tasty-smallcheck/tasty-smallcheck-0.8.ebuild b/dev-haskell/tasty-smallcheck/tasty-smallcheck-0.8.ebuild
index e8bab88281b5..120bc0786607 100644
--- a/dev-haskell/tasty-smallcheck/tasty-smallcheck-0.8.ebuild
+++ b/dev-haskell/tasty-smallcheck/tasty-smallcheck-0.8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/async:=[profile?]
diff --git a/dev-haskell/tasty-th/tasty-th-0.1.4.ebuild b/dev-haskell/tasty-th/tasty-th-0.1.4.ebuild
index 967a124fa2d6..30f5e8d729d6 100644
--- a/dev-haskell/tasty-th/tasty-th-0.1.4.ebuild
+++ b/dev-haskell/tasty-th/tasty-th-0.1.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/tasty:=[profile?]
diff --git a/dev-haskell/tasty/tasty-0.10.1.2.ebuild b/dev-haskell/tasty/tasty-0.10.1.2.ebuild
index ed78f09317af..0880ee7ea464 100644
--- a/dev-haskell/tasty/tasty-0.10.1.2.ebuild
+++ b/dev-haskell/tasty/tasty-0.10.1.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/ansi-terminal-0.6.2:=[profile?]
diff --git a/dev-haskell/tasty/tasty-0.11.0.4.ebuild b/dev-haskell/tasty/tasty-0.11.0.4.ebuild
index 4de53058744c..e90ded228495 100644
--- a/dev-haskell/tasty/tasty-0.11.0.4.ebuild
+++ b/dev-haskell/tasty/tasty-0.11.0.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 PATCHES=("${FILESDIR}"/${P}-unbounded-delays.patch)
diff --git a/dev-haskell/tasty/tasty-0.3.1.ebuild b/dev-haskell/tasty/tasty-0.3.1.ebuild
index 5431faabb037..90673a1f59eb 100644
--- a/dev-haskell/tasty/tasty-0.3.1.ebuild
+++ b/dev-haskell/tasty/tasty-0.3.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="+colors"
 
 RDEPEND="dev-haskell/mtl:=[profile?]
diff --git a/dev-haskell/tasty/tasty-0.5.2.ebuild b/dev-haskell/tasty/tasty-0.5.2.ebuild
index 7c03aa404938..9177d392a13e 100644
--- a/dev-haskell/tasty/tasty-0.5.2.ebuild
+++ b/dev-haskell/tasty/tasty-0.5.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="+colors"
 
 RDEPEND="dev-haskell/mtl:=[profile?]
diff --git a/dev-haskell/tasty/tasty-0.8.1.2.ebuild b/dev-haskell/tasty/tasty-0.8.1.2.ebuild
index 2654d99d5a53..42dba237037f 100644
--- a/dev-haskell/tasty/tasty-0.8.1.2.ebuild
+++ b/dev-haskell/tasty/tasty-0.8.1.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/ansi-terminal-0.6.1:=[profile?]
diff --git a/dev-haskell/temporary-rc/temporary-rc-1.2.0.3.ebuild b/dev-haskell/temporary-rc/temporary-rc-1.2.0.3.ebuild
index 37d2f6d1f95c..98648f12f2e5 100644
--- a/dev-haskell/temporary-rc/temporary-rc-1.2.0.3.ebuild
+++ b/dev-haskell/temporary-rc/temporary-rc-1.2.0.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/exceptions-0.6:=[profile?]
diff --git a/dev-haskell/temporary/temporary-1.1.2.4.ebuild b/dev-haskell/temporary/temporary-1.1.2.4.ebuild
index 52ef4cfcd752..c0bbd705484e 100644
--- a/dev-haskell/temporary/temporary-1.1.2.4.ebuild
+++ b/dev-haskell/temporary/temporary-1.1.2.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.10.4:="
diff --git a/dev-haskell/temporary/temporary-1.2.0.4.ebuild b/dev-haskell/temporary/temporary-1.2.0.4.ebuild
index 91b33086a6c9..4f76a17ee7cd 100644
--- a/dev-haskell/temporary/temporary-1.2.0.4.ebuild
+++ b/dev-haskell/temporary/temporary-1.2.0.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-haskell/exceptions-0.6:=[profile?]
diff --git a/dev-haskell/tensor/tensor-1.0.0.1.ebuild b/dev-haskell/tensor/tensor-1.0.0.1.ebuild
index 7f9023d15273..ad79307206fa 100644
--- a/dev-haskell/tensor/tensor-1.0.0.1.ebuild
+++ b/dev-haskell/tensor/tensor-1.0.0.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/terminfo/terminfo-0.4.0.0.ebuild b/dev-haskell/terminfo/terminfo-0.4.0.0.ebuild
index af3336cb7736..216a8e46af4f 100644
--- a/dev-haskell/terminfo/terminfo-0.4.0.0.ebuild
+++ b/dev-haskell/terminfo/terminfo-0.4.0.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ppc ppc64 x86 ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~ppc-macos ~x86-macos"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.0.1:=
diff --git a/dev-haskell/terminfo/terminfo-0.4.0.1.ebuild b/dev-haskell/terminfo/terminfo-0.4.0.1.ebuild
index edca84d65250..122782885604 100644
--- a/dev-haskell/terminfo/terminfo-0.4.0.1.ebuild
+++ b/dev-haskell/terminfo/terminfo-0.4.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~ppc-macos ~x86-macos"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/terminfo/terminfo-0.4.0.2.ebuild b/dev-haskell/terminfo/terminfo-0.4.0.2.ebuild
index 9298f768a8a9..c3878715b41e 100644
--- a/dev-haskell/terminfo/terminfo-0.4.0.2.ebuild
+++ b/dev-haskell/terminfo/terminfo-0.4.0.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/test-framework-hunit/test-framework-hunit-0.3.0.ebuild b/dev-haskell/test-framework-hunit/test-framework-hunit-0.3.0.ebuild
index bbe2e099a9b9..ccf01e5e14da 100644
--- a/dev-haskell/test-framework-hunit/test-framework-hunit-0.3.0.ebuild
+++ b/dev-haskell/test-framework-hunit/test-framework-hunit-0.3.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/extensible-exceptions-0.1.1:=[profile?]
diff --git a/dev-haskell/test-framework-quickcheck2/test-framework-quickcheck2-0.3.0.2.ebuild b/dev-haskell/test-framework-quickcheck2/test-framework-quickcheck2-0.3.0.2.ebuild
index a6de2c23a637..edffdabbf292 100644
--- a/dev-haskell/test-framework-quickcheck2/test-framework-quickcheck2-0.3.0.2.ebuild
+++ b/dev-haskell/test-framework-quickcheck2/test-framework-quickcheck2-0.3.0.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 #hackport: ignore-flag base3 : we don't support base3
 #hackport: ignore-flag base4 : we don't support base4
 IUSE=""
diff --git a/dev-haskell/test-framework-quickcheck2/test-framework-quickcheck2-0.3.0.3-r2.ebuild b/dev-haskell/test-framework-quickcheck2/test-framework-quickcheck2-0.3.0.3-r2.ebuild
index fe6c4d2af015..19772fe62ed9 100644
--- a/dev-haskell/test-framework-quickcheck2/test-framework-quickcheck2-0.3.0.3-r2.ebuild
+++ b/dev-haskell/test-framework-quickcheck2/test-framework-quickcheck2-0.3.0.3-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/extensible-exceptions-0.1.1:=[profile?] <dev-haskell/extensible-exceptions-0.2.0:=[profile?]
diff --git a/dev-haskell/test-framework-th-prime/test-framework-th-prime-0.0.7.ebuild b/dev-haskell/test-framework-th-prime/test-framework-th-prime-0.0.7.ebuild
index 604561813510..1a9bc81a4022 100644
--- a/dev-haskell/test-framework-th-prime/test-framework-th-prime-0.0.7.ebuild
+++ b/dev-haskell/test-framework-th-prime/test-framework-th-prime-0.0.7.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/cpphs-0.2.1:=[profile?]
diff --git a/dev-haskell/test-framework-th-prime/test-framework-th-prime-0.0.9.ebuild b/dev-haskell/test-framework-th-prime/test-framework-th-prime-0.0.9.ebuild
index 8001c070fd90..cf997c1889e8 100644
--- a/dev-haskell/test-framework-th-prime/test-framework-th-prime-0.0.9.ebuild
+++ b/dev-haskell/test-framework-th-prime/test-framework-th-prime-0.0.9.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/cpphs-0.2.1:=[profile?]
diff --git a/dev-haskell/test-framework-th/test-framework-th-0.2.4.ebuild b/dev-haskell/test-framework-th/test-framework-th-0.2.4.ebuild
index 8c61799e7484..812e3653792f 100644
--- a/dev-haskell/test-framework-th/test-framework-th-0.2.4.ebuild
+++ b/dev-haskell/test-framework-th/test-framework-th-0.2.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/haskell-src-exts:=[profile?]
diff --git a/dev-haskell/test-framework/test-framework-0.8.1.1.ebuild b/dev-haskell/test-framework/test-framework-0.8.1.1.ebuild
index 681cf6b04114..2c0e1fe30df1 100644
--- a/dev-haskell/test-framework/test-framework-0.8.1.1.ebuild
+++ b/dev-haskell/test-framework/test-framework-0.8.1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="test"
 RESTRICT="test" # tests are missing
 
diff --git a/dev-haskell/test-framework/test-framework-0.8.ebuild b/dev-haskell/test-framework/test-framework-0.8.ebuild
index 02ea2deea1c5..ee7170edc295 100644
--- a/dev-haskell/test-framework/test-framework-0.8.ebuild
+++ b/dev-haskell/test-framework/test-framework-0.8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/ansi-terminal-0.4.0:=[profile?]
diff --git a/dev-haskell/testpack/testpack-2.1.3.0-r1.ebuild b/dev-haskell/testpack/testpack-2.1.3.0-r1.ebuild
index 9bf7ee9985ce..fdf8e0ff38d2 100644
--- a/dev-haskell/testpack/testpack-2.1.3.0-r1.ebuild
+++ b/dev-haskell/testpack/testpack-2.1.3.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/hunit:=[profile?]
diff --git a/dev-haskell/texmath/texmath-0.6.4.ebuild b/dev-haskell/texmath/texmath-0.6.4.ebuild
index 00ff3b3191be..25b0afa900ef 100644
--- a/dev-haskell/texmath/texmath-0.6.4.ebuild
+++ b/dev-haskell/texmath/texmath-0.6.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="cgi test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-haskell/texmath/texmath-0.8.2.2.ebuild b/dev-haskell/texmath/texmath-0.8.2.2.ebuild
index 2163e8423515..271539749295 100644
--- a/dev-haskell/texmath/texmath-0.8.2.2.ebuild
+++ b/dev-haskell/texmath/texmath-0.8.2.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="executable +network-uri"
 
 RDEPEND="dev-haskell/mtl:=[profile?]
diff --git a/dev-haskell/texmath/texmath-0.9.1.ebuild b/dev-haskell/texmath/texmath-0.9.1.ebuild
index fc83037fea8c..32063f3a1aea 100644
--- a/dev-haskell/texmath/texmath-0.9.1.ebuild
+++ b/dev-haskell/texmath/texmath-0.9.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="executable +network-uri"
 
 RDEPEND="dev-haskell/mtl:=[profile?]
diff --git a/dev-haskell/text-icu/text-icu-0.7.0.1.ebuild b/dev-haskell/text-icu/text-icu-0.7.0.1.ebuild
index f4dae0b1da5a..8a80dc6427ad 100644
--- a/dev-haskell/text-icu/text-icu-0.7.0.1.ebuild
+++ b/dev-haskell/text-icu/text-icu-0.7.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/text-0.9.1.0:=[profile?]
diff --git a/dev-haskell/text-stream-decode/text-stream-decode-0.1.0.5.ebuild b/dev-haskell/text-stream-decode/text-stream-decode-0.1.0.5.ebuild
index dba35f32e3ab..7cfa633e38e3 100644
--- a/dev-haskell/text-stream-decode/text-stream-decode-0.1.0.5.ebuild
+++ b/dev-haskell/text-stream-decode/text-stream-decode-0.1.0.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/text-1.1:=[profile?]
diff --git a/dev-haskell/text/text-0.11.3.1.ebuild b/dev-haskell/text/text-0.11.3.1.ebuild
index 3f5062082691..e7f6f104730b 100644
--- a/dev-haskell/text/text-0.11.3.1.ebuild
+++ b/dev-haskell/text/text-0.11.3.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="developer"
 
 RDEPEND=">=dev-lang/ghc-6.10.4:="
diff --git a/dev-haskell/text/text-1.1.1.3.ebuild b/dev-haskell/text/text-1.1.1.3.ebuild
index d2b5ec71f82e..d1ddab24f750 100644
--- a/dev-haskell/text/text-1.1.1.3.ebuild
+++ b/dev-haskell/text/text-1.1.1.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 RESTRICT="test" # quickcheck-2.7 is missing keywords due to new tf-random dep
 
diff --git a/dev-haskell/text/text-1.2.2.1.ebuild b/dev-haskell/text/text-1.2.2.1.ebuild
index b5d99d871280..55857605762c 100644
--- a/dev-haskell/text/text-1.2.2.1.ebuild
+++ b/dev-haskell/text/text-1.2.2.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RESTRICT=test # break cyclic dependencies
diff --git a/dev-haskell/tf-random/tf-random-0.5.ebuild b/dev-haskell/tf-random/tf-random-0.5.ebuild
index c4f7755038bd..7a8f960ab81c 100644
--- a/dev-haskell/tf-random/tf-random-0.5.ebuild
+++ b/dev-haskell/tf-random/tf-random-0.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/primitive-0.3:=[profile?]
diff --git a/dev-haskell/th-expand-syns/th-expand-syns-0.3.0.6.ebuild b/dev-haskell/th-expand-syns/th-expand-syns-0.3.0.6.ebuild
index 5549b7a84405..b67be3e1ad33 100644
--- a/dev-haskell/th-expand-syns/th-expand-syns-0.3.0.6.ebuild
+++ b/dev-haskell/th-expand-syns/th-expand-syns-0.3.0.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/syb:=[profile?]
diff --git a/dev-haskell/th-expand-syns/th-expand-syns-0.4.2.0.ebuild b/dev-haskell/th-expand-syns/th-expand-syns-0.4.2.0.ebuild
index b0b81d724b1e..b877da13fc37 100644
--- a/dev-haskell/th-expand-syns/th-expand-syns-0.4.2.0.ebuild
+++ b/dev-haskell/th-expand-syns/th-expand-syns-0.4.2.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/syb:=[profile?]
diff --git a/dev-haskell/th-lift/th-lift-0.7.2.ebuild b/dev-haskell/th-lift/th-lift-0.7.2.ebuild
index 55f15abfd09e..f274ca49f2de 100644
--- a/dev-haskell/th-lift/th-lift-0.7.2.ebuild
+++ b/dev-haskell/th-lift/th-lift-0.7.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/th-lift/th-lift-0.7.7.ebuild b/dev-haskell/th-lift/th-lift-0.7.7.ebuild
index 3b3bc5fba706..fcd279e4613d 100644
--- a/dev-haskell/th-lift/th-lift-0.7.7.ebuild
+++ b/dev-haskell/th-lift/th-lift-0.7.7.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/th-orphans/th-orphans-0.11.1.ebuild b/dev-haskell/th-orphans/th-orphans-0.11.1.ebuild
index 3f636d9c1ad5..69578fb72c3b 100644
--- a/dev-haskell/th-orphans/th-orphans-0.11.1.ebuild
+++ b/dev-haskell/th-orphans/th-orphans-0.11.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/mtl:=[profile?]
diff --git a/dev-haskell/th-reify-many/th-reify-many-0.1.3.ebuild b/dev-haskell/th-reify-many/th-reify-many-0.1.3.ebuild
index 062416e68270..1b7e8dcfe88d 100644
--- a/dev-haskell/th-reify-many/th-reify-many-0.1.3.ebuild
+++ b/dev-haskell/th-reify-many/th-reify-many-0.1.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/mtl:=[profile?]
diff --git a/dev-haskell/th-reify-many/th-reify-many-0.1.6.ebuild b/dev-haskell/th-reify-many/th-reify-many-0.1.6.ebuild
index 202b6eb61eb2..ebc4f3ccb06c 100644
--- a/dev-haskell/th-reify-many/th-reify-many-0.1.6.ebuild
+++ b/dev-haskell/th-reify-many/th-reify-many-0.1.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/mtl:=[profile?]
diff --git a/dev-haskell/threads/threads-0.5.1.4.ebuild b/dev-haskell/threads/threads-0.5.1.4.ebuild
index ad308622c9f8..7f58664950fe 100644
--- a/dev-haskell/threads/threads-0.5.1.4.ebuild
+++ b/dev-haskell/threads/threads-0.5.1.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/stm-2.1:=[profile?] <dev-haskell/stm-2.5:=[profile?]
diff --git a/dev-haskell/time-locale-compat/time-locale-compat-0.1.1.1.ebuild b/dev-haskell/time-locale-compat/time-locale-compat-0.1.1.1.ebuild
index 80eb982f8920..abc74da69ac4 100644
--- a/dev-haskell/time-locale-compat/time-locale-compat-0.1.1.1.ebuild
+++ b/dev-haskell/time-locale-compat/time-locale-compat-0.1.1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/old-locale:=[profile?]
diff --git a/dev-haskell/timezone-olson/timezone-olson-0.1.7-r1.ebuild b/dev-haskell/timezone-olson/timezone-olson-0.1.7-r1.ebuild
index a164e030af26..a0baf253e2c9 100644
--- a/dev-haskell/timezone-olson/timezone-olson-0.1.7-r1.ebuild
+++ b/dev-haskell/timezone-olson/timezone-olson-0.1.7-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/extensible-exceptions-0.1.0:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?]
diff --git a/dev-haskell/timezone-olson/timezone-olson-0.1.7.ebuild b/dev-haskell/timezone-olson/timezone-olson-0.1.7.ebuild
index 03cede44119b..261badce7128 100644
--- a/dev-haskell/timezone-olson/timezone-olson-0.1.7.ebuild
+++ b/dev-haskell/timezone-olson/timezone-olson-0.1.7.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/binary-0.4.1:=[profile?] <dev-haskell/binary-0.8:=[profile?]
diff --git a/dev-haskell/timezone-series/timezone-series-0.1.5.1.ebuild b/dev-haskell/timezone-series/timezone-series-0.1.5.1.ebuild
index 3b5f4c3bccc2..854aa0962448 100644
--- a/dev-haskell/timezone-series/timezone-series-0.1.5.1.ebuild
+++ b/dev-haskell/timezone-series/timezone-series-0.1.5.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/timezone-series/timezone-series-0.1.6.1.ebuild b/dev-haskell/timezone-series/timezone-series-0.1.6.1.ebuild
index b4ac6a134c98..342456a5cf7d 100644
--- a/dev-haskell/timezone-series/timezone-series-0.1.6.1.ebuild
+++ b/dev-haskell/timezone-series/timezone-series-0.1.6.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/tls/tls-1.2.18.ebuild b/dev-haskell/tls/tls-1.2.18.ebuild
index 33f29881f314..b7c559d95b97 100644
--- a/dev-haskell/tls/tls-1.2.18.ebuild
+++ b/dev-haskell/tls/tls-1.2.18.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+compat"
 
 RDEPEND="dev-haskell/asn1-encoding:=[profile?]
diff --git a/dev-haskell/transformers-base/transformers-base-0.4.4.ebuild b/dev-haskell/transformers-base/transformers-base-0.4.4.ebuild
index c83d512dd94a..c5af30c488e6 100644
--- a/dev-haskell/transformers-base/transformers-base-0.4.4.ebuild
+++ b/dev-haskell/transformers-base/transformers-base-0.4.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="+orphaninstances"
 
 RDEPEND=">=dev-haskell/stm-2.3:=[profile?]
diff --git a/dev-haskell/transformers-compat/transformers-compat-0.4.0.4.ebuild b/dev-haskell/transformers-compat/transformers-compat-0.4.0.4.ebuild
index f1036e52e6db..ceed5c05ccf1 100644
--- a/dev-haskell/transformers-compat/transformers-compat-0.4.0.4.ebuild
+++ b/dev-haskell/transformers-compat/transformers-compat-0.4.0.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/transformers-compat/transformers-compat-0.5.1.4.ebuild b/dev-haskell/transformers-compat/transformers-compat-0.5.1.4.ebuild
index 5e258cfa8e56..10ef06261625 100644
--- a/dev-haskell/transformers-compat/transformers-compat-0.5.1.4.ebuild
+++ b/dev-haskell/transformers-compat/transformers-compat-0.5.1.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/transformers/transformers-0.3.0.0-r1.ebuild b/dev-haskell/transformers/transformers-0.3.0.0-r1.ebuild
index 834757bdfaad..4bef18185558 100644
--- a/dev-haskell/transformers/transformers-0.3.0.0-r1.ebuild
+++ b/dev-haskell/transformers/transformers-0.3.0.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.10.4:= <dev-lang/ghc-7.10:="
diff --git a/dev-haskell/transformers/transformers-0.4.3.0.ebuild b/dev-haskell/transformers/transformers-0.4.3.0.ebuild
index 9e716c70ecd1..dc94f44b8fa5 100644
--- a/dev-haskell/transformers/transformers-0.4.3.0.ebuild
+++ b/dev-haskell/transformers/transformers-0.4.3.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/transformers/transformers-0.5.2.0.ebuild b/dev-haskell/transformers/transformers-0.5.2.0.ebuild
index 48e15d108934..44496ea0c06d 100644
--- a/dev-haskell/transformers/transformers-0.5.2.0.ebuild
+++ b/dev-haskell/transformers/transformers-0.5.2.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0/${PV}"
 #keep in sync with ghc-8.0.2_rc2
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/unbounded-delays/unbounded-delays-0.1.0.9.ebuild b/dev-haskell/unbounded-delays/unbounded-delays-0.1.0.9.ebuild
index 5f59e736a79d..a83b309bd2b7 100644
--- a/dev-haskell/unbounded-delays/unbounded-delays-0.1.0.9.ebuild
+++ b/dev-haskell/unbounded-delays/unbounded-delays-0.1.0.9.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/uniplate/uniplate-1.6.12.ebuild b/dev-haskell/uniplate/uniplate-1.6.12.ebuild
index 96ade1b8a3d7..27ad0ebbe345 100644
--- a/dev-haskell/uniplate/uniplate-1.6.12.ebuild
+++ b/dev-haskell/uniplate/uniplate-1.6.12.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
diff --git a/dev-haskell/unix-compat/unix-compat-0.4.1.3.ebuild b/dev-haskell/unix-compat/unix-compat-0.4.1.3.ebuild
index bf2b347d0e13..63ab6786801d 100644
--- a/dev-haskell/unix-compat/unix-compat-0.4.1.3.ebuild
+++ b/dev-haskell/unix-compat/unix-compat-0.4.1.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="old-time"
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/unix-compat/unix-compat-0.4.3.1.ebuild b/dev-haskell/unix-compat/unix-compat-0.4.3.1.ebuild
index 4c8c7c26a40e..5364ad054d05 100644
--- a/dev-haskell/unix-compat/unix-compat-0.4.3.1.ebuild
+++ b/dev-haskell/unix-compat/unix-compat-0.4.3.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="old-time"
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/unix-time/unix-time-0.3.5.ebuild b/dev-haskell/unix-time/unix-time-0.3.5.ebuild
index ba0ea45329a8..05c10834324a 100644
--- a/dev-haskell/unix-time/unix-time-0.3.5.ebuild
+++ b/dev-haskell/unix-time/unix-time-0.3.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/binary:=[profile?]
diff --git a/dev-haskell/unordered-containers/unordered-containers-0.2.3.3.ebuild b/dev-haskell/unordered-containers/unordered-containers-0.2.3.3.ebuild
index 038bed6ecd68..76e4728b8fb6 100644
--- a/dev-haskell/unordered-containers/unordered-containers-0.2.3.3.ebuild
+++ b/dev-haskell/unordered-containers/unordered-containers-0.2.3.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="debug"
 
 RDEPEND=">=dev-haskell/hashable-1.0.1.1:=[profile?]
diff --git a/dev-haskell/unordered-containers/unordered-containers-0.2.7.0.ebuild b/dev-haskell/unordered-containers/unordered-containers-0.2.7.0.ebuild
index 6ee7077183f4..55d4a165067c 100644
--- a/dev-haskell/unordered-containers/unordered-containers-0.2.7.0.ebuild
+++ b/dev-haskell/unordered-containers/unordered-containers-0.2.7.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="debug"
 
 RDEPEND=">=dev-haskell/hashable-1.0.1.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
diff --git a/dev-haskell/utf8-string/utf8-string-0.3.8.ebuild b/dev-haskell/utf8-string/utf8-string-0.3.8.ebuild
index c10f99f03a99..1f6bbd6c40fe 100644
--- a/dev-haskell/utf8-string/utf8-string-0.3.8.ebuild
+++ b/dev-haskell/utf8-string/utf8-string-0.3.8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/uulib/uulib-0.9.16.ebuild b/dev-haskell/uulib/uulib-0.9.16.ebuild
index 36198815ccc2..3f93aeae7615 100644
--- a/dev-haskell/uulib/uulib-0.9.16.ebuild
+++ b/dev-haskell/uulib/uulib-0.9.16.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/uulib/uulib-0.9.22.ebuild b/dev-haskell/uulib/uulib-0.9.22.ebuild
index cb04a3e1829d..0576c0578ff5 100644
--- a/dev-haskell/uulib/uulib-0.9.22.ebuild
+++ b/dev-haskell/uulib/uulib-0.9.22.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/vault/vault-0.3.0.3.ebuild b/dev-haskell/vault/vault-0.3.0.3.ebuild
index e55b26504f75..a10e5bc473e8 100644
--- a/dev-haskell/vault/vault-0.3.0.3.ebuild
+++ b/dev-haskell/vault/vault-0.3.0.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/hashable-1.1.2.5:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
diff --git a/dev-haskell/vector/vector-0.10.12.3.ebuild b/dev-haskell/vector/vector-0.10.12.3.ebuild
index 603286fb2346..f69e694a53e2 100644
--- a/dev-haskell/vector/vector-0.10.12.3.ebuild
+++ b/dev-haskell/vector/vector-0.10.12.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="+boundschecks internalchecks unsafechecks"
 
 RDEPEND=">=dev-haskell/primitive-0.5.0.1:=[profile?] <dev-haskell/primitive-0.7:=[profile?]
diff --git a/dev-haskell/vector/vector-0.11.0.0.ebuild b/dev-haskell/vector/vector-0.11.0.0.ebuild
index 668b39492505..c2c4c11ea38c 100644
--- a/dev-haskell/vector/vector-0.11.0.0.ebuild
+++ b/dev-haskell/vector/vector-0.11.0.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="+boundschecks internalchecks unsafechecks"
 
 RESTRICT=test # -O2 -g makes tests build hang
diff --git a/dev-haskell/void/void-0.6.1.ebuild b/dev-haskell/void/void-0.6.1.ebuild
index 78759c2bddef..28d8fec5ba60 100644
--- a/dev-haskell/void/void-0.6.1.ebuild
+++ b/dev-haskell/void/void-0.6.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="safe"
 
 RDEPEND=">=dev-haskell/hashable-1.1:=[profile?]
diff --git a/dev-haskell/void/void-0.7.1.ebuild b/dev-haskell/void/void-0.7.1.ebuild
index 6de525966d54..e7c32f9fa3e4 100644
--- a/dev-haskell/void/void-0.7.1.ebuild
+++ b/dev-haskell/void/void-0.7.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="safe"
 
 RDEPEND=">=dev-haskell/hashable-1.1:=[profile?]
diff --git a/dev-haskell/wai-conduit/wai-conduit-3.0.0.2.ebuild b/dev-haskell/wai-conduit/wai-conduit-3.0.0.2.ebuild
index d90e3c90d610..a7ee2fd95887 100644
--- a/dev-haskell/wai-conduit/wai-conduit-3.0.0.2.ebuild
+++ b/dev-haskell/wai-conduit/wai-conduit-3.0.0.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/blaze-builder:=[profile?]
diff --git a/dev-haskell/wai-extra/wai-extra-3.0.10.ebuild b/dev-haskell/wai-extra/wai-extra-3.0.10.ebuild
index 8c3106497179..266874b9cc35 100644
--- a/dev-haskell/wai-extra/wai-extra-3.0.10.ebuild
+++ b/dev-haskell/wai-extra/wai-extra-3.0.10.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/ansi-terminal:=[profile?]
diff --git a/dev-haskell/wai-extra/wai-extra-3.0.15.1.ebuild b/dev-haskell/wai-extra/wai-extra-3.0.15.1.ebuild
index 6f4bc5cd30bb..3634b792db7e 100644
--- a/dev-haskell/wai-extra/wai-extra-3.0.15.1.ebuild
+++ b/dev-haskell/wai-extra/wai-extra-3.0.15.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/aeson:=[profile?]
diff --git a/dev-haskell/wai-logger/wai-logger-2.2.4.1.ebuild b/dev-haskell/wai-logger/wai-logger-2.2.4.1.ebuild
index 8e039ee830a2..0967583dfd78 100644
--- a/dev-haskell/wai-logger/wai-logger-2.2.4.1.ebuild
+++ b/dev-haskell/wai-logger/wai-logger-2.2.4.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RESTRICT=test # wai-test cyclic depend
diff --git a/dev-haskell/wai-logger/wai-logger-2.2.7.ebuild b/dev-haskell/wai-logger/wai-logger-2.2.7.ebuild
index 1f759bfeb914..5c8100d66dee 100644
--- a/dev-haskell/wai-logger/wai-logger-2.2.7.ebuild
+++ b/dev-haskell/wai-logger/wai-logger-2.2.7.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RESTRICT=test # missing file?
diff --git a/dev-haskell/wai/wai-1.4.0.2.ebuild b/dev-haskell/wai/wai-1.4.0.2.ebuild
index 95f154fbb826..b8c9dde848be 100644
--- a/dev-haskell/wai/wai-1.4.0.2.ebuild
+++ b/dev-haskell/wai/wai-1.4.0.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?]
diff --git a/dev-haskell/wai/wai-2.0.0.ebuild b/dev-haskell/wai/wai-2.0.0.ebuild
index f288d9b700c7..1410d108991f 100644
--- a/dev-haskell/wai/wai-2.0.0.ebuild
+++ b/dev-haskell/wai/wai-2.0.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?]
diff --git a/dev-haskell/wai/wai-3.0.3.0.ebuild b/dev-haskell/wai/wai-3.0.3.0.ebuild
index cb0345178fcd..570d866dddf5 100644
--- a/dev-haskell/wai/wai-3.0.3.0.ebuild
+++ b/dev-haskell/wai/wai-3.0.3.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
diff --git a/dev-haskell/warp-tls/warp-tls-3.0.4.2.ebuild b/dev-haskell/warp-tls/warp-tls-3.0.4.2.ebuild
index 61fdb69967ee..724aa96ef4e3 100644
--- a/dev-haskell/warp-tls/warp-tls-3.0.4.2.ebuild
+++ b/dev-haskell/warp-tls/warp-tls-3.0.4.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/cprng-aes-0.5.0:=[profile?]
diff --git a/dev-haskell/warp/warp-3.0.13.1.ebuild b/dev-haskell/warp/warp-3.0.13.1.ebuild
index ecbf57871d4d..ecb770eeeb96 100644
--- a/dev-haskell/warp/warp-3.0.13.1.ebuild
+++ b/dev-haskell/warp/warp-3.0.13.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+allow-sendfilefd warp-debug"
 
 # Ambiguous module name ‘Data.IP’: it was found in multiple packages:
diff --git a/dev-haskell/weigh/weigh-0.0.3.ebuild b/dev-haskell/weigh/weigh-0.0.3.ebuild
index 2cb2795be6a2..ca3ed1402589 100644
--- a/dev-haskell/weigh/weigh-0.0.3.ebuild
+++ b/dev-haskell/weigh/weigh-0.0.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/mtl:=[profile?]
diff --git a/dev-haskell/with-location/with-location-0.1.0.ebuild b/dev-haskell/with-location/with-location-0.1.0.ebuild
index 5620b21a15fe..746345fec933 100644
--- a/dev-haskell/with-location/with-location-0.1.0.ebuild
+++ b/dev-haskell/with-location/with-location-0.1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/wl-pprint-text/wl-pprint-text-1.1.0.4.ebuild b/dev-haskell/wl-pprint-text/wl-pprint-text-1.1.0.4.ebuild
index 5370566ebc67..41d42d9a16bd 100644
--- a/dev-haskell/wl-pprint-text/wl-pprint-text-1.1.0.4.ebuild
+++ b/dev-haskell/wl-pprint-text/wl-pprint-text-1.1.0.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/text-0.11.0.0:=[profile?] <dev-haskell/text-1.3.0.0:=[profile?]
diff --git a/dev-haskell/word8/word8-0.1.2.ebuild b/dev-haskell/word8/word8-0.1.2.ebuild
index 67660d324c74..777e9a4f00e5 100644
--- a/dev-haskell/word8/word8-0.1.2.ebuild
+++ b/dev-haskell/word8/word8-0.1.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/x11-xft/x11-xft-0.3.1.ebuild b/dev-haskell/x11-xft/x11-xft-0.3.1.ebuild
index bb69ccfed5e3..5ba21a25ad1c 100644
--- a/dev-haskell/x11-xft/x11-xft-0.3.1.ebuild
+++ b/dev-haskell/x11-xft/x11-xft-0.3.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.6.1
diff --git a/dev-haskell/x11/x11-1.6.1.1.ebuild b/dev-haskell/x11/x11-1.6.1.1.ebuild
index b4e6e2d4b146..0b338e2d885e 100644
--- a/dev-haskell/x11/x11-1.6.1.1.ebuild
+++ b/dev-haskell/x11/x11-1.6.1.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="+screensaver +xinerama"
 
 RDEPEND="dev-haskell/data-default:=[profile?]
diff --git a/dev-haskell/x11/x11-1.8-r1.ebuild b/dev-haskell/x11/x11-1.8-r1.ebuild
index bc40d48c113e..ce28dc23a6ec 100644
--- a/dev-haskell/x11/x11-1.8-r1.ebuild
+++ b/dev-haskell/x11/x11-1.8-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="+screensaver +xinerama"
 
 RDEPEND="dev-haskell/data-default:=[profile?]
diff --git a/dev-haskell/x509-store/x509-store-1.5.0.ebuild b/dev-haskell/x509-store/x509-store-1.5.0.ebuild
index 2800baae1629..4911e1fef2fc 100644
--- a/dev-haskell/x509-store/x509-store-1.5.0.ebuild
+++ b/dev-haskell/x509-store/x509-store-1.5.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="executable test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-haskell/x509-system/x509-system-1.5.0.ebuild b/dev-haskell/x509-system/x509-system-1.5.0.ebuild
index d29edfd93e67..a214790d52dd 100644
--- a/dev-haskell/x509-system/x509-system-1.5.0.ebuild
+++ b/dev-haskell/x509-system/x509-system-1.5.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/mtl:=[profile?]
diff --git a/dev-haskell/x509-validation/x509-validation-1.5.2.ebuild b/dev-haskell/x509-validation/x509-validation-1.5.2.ebuild
index e62fc8e70bcb..aff853ef41fc 100644
--- a/dev-haskell/x509-validation/x509-validation-1.5.2.ebuild
+++ b/dev-haskell/x509-validation/x509-validation-1.5.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/asn1-encoding-0.9:=[profile?] <dev-haskell/asn1-encoding-0.10:=[profile?]
diff --git a/dev-haskell/x509/x509-1.5.1.ebuild b/dev-haskell/x509/x509-1.5.1.ebuild
index 8bbd800ffe45..304d6883e5d6 100644
--- a/dev-haskell/x509/x509-1.5.1.ebuild
+++ b/dev-haskell/x509/x509-1.5.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/asn1-encoding-0.9:=[profile?] <dev-haskell/asn1-encoding-0.10:=[profile?]
diff --git a/dev-haskell/xhtml/xhtml-3000.2.1-r1.ebuild b/dev-haskell/xhtml/xhtml-3000.2.1-r1.ebuild
index d1a0b7aed7c0..8d45698256d8 100644
--- a/dev-haskell/xhtml/xhtml-3000.2.1-r1.ebuild
+++ b/dev-haskell/xhtml/xhtml-3000.2.1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.10.4:="
diff --git a/dev-haskell/xml-conduit/xml-conduit-1.3.1.ebuild b/dev-haskell/xml-conduit/xml-conduit-1.3.1.ebuild
index fb77f5607454..4450917ad250 100644
--- a/dev-haskell/xml-conduit/xml-conduit-1.3.1.ebuild
+++ b/dev-haskell/xml-conduit/xml-conduit-1.3.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/attoparsec-0.10:=[profile?]
diff --git a/dev-haskell/xml-conduit/xml-conduit-1.3.4.2.ebuild b/dev-haskell/xml-conduit/xml-conduit-1.3.4.2.ebuild
index 095821699d5a..5bf481bdbd4c 100644
--- a/dev-haskell/xml-conduit/xml-conduit-1.3.4.2.ebuild
+++ b/dev-haskell/xml-conduit/xml-conduit-1.3.4.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/attoparsec-0.10:=[profile?]
diff --git a/dev-haskell/xml-types/xml-types-0.3.4.ebuild b/dev-haskell/xml-types/xml-types-0.3.4.ebuild
index d4cfd7f9b47f..0bc2bb8970d3 100644
--- a/dev-haskell/xml-types/xml-types-0.3.4.ebuild
+++ b/dev-haskell/xml-types/xml-types-0.3.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/text:=[profile?]
diff --git a/dev-haskell/xml/xml-1.3.13.ebuild b/dev-haskell/xml/xml-1.3.13.ebuild
index 1b3e261a02a9..c737caa4e4b4 100644
--- a/dev-haskell/xml/xml-1.3.13.ebuild
+++ b/dev-haskell/xml/xml-1.3.13.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/text:=[profile?]
diff --git a/dev-haskell/yaml/yaml-0.8.10.1.ebuild b/dev-haskell/yaml/yaml-0.8.10.1.ebuild
index e0d991aeebd7..7cad1b4d1359 100644
--- a/dev-haskell/yaml/yaml-0.8.10.1.ebuild
+++ b/dev-haskell/yaml/yaml-0.8.10.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="no-exe unicode system-libyaml"
 
 RDEPEND=">=dev-haskell/aeson-0.5:=[profile?]
diff --git a/dev-haskell/zip-archive/zip-archive-0.1.3.4.ebuild b/dev-haskell/zip-archive/zip-archive-0.1.3.4.ebuild
index 6994425b6921..a918e39f8b99 100644
--- a/dev-haskell/zip-archive/zip-archive-0.1.3.4.ebuild
+++ b/dev-haskell/zip-archive/zip-archive-0.1.3.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="executable"
 
 RDEPEND=">=dev-haskell/binary-0.5:=[profile?]
diff --git a/dev-haskell/zip-archive/zip-archive-0.2.3.7.ebuild b/dev-haskell/zip-archive/zip-archive-0.2.3.7.ebuild
index 726e7543e0dd..5e9aadcd5d00 100644
--- a/dev-haskell/zip-archive/zip-archive-0.2.3.7.ebuild
+++ b/dev-haskell/zip-archive/zip-archive-0.2.3.7.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="executable"
 
 RDEPEND=">=dev-haskell/binary-0.5:=[profile?]
diff --git a/dev-haskell/zlib-bindings/zlib-bindings-0.1.1.5.ebuild b/dev-haskell/zlib-bindings/zlib-bindings-0.1.1.5.ebuild
index 0de411933028..d522886fef03 100644
--- a/dev-haskell/zlib-bindings/zlib-bindings-0.1.1.5.ebuild
+++ b/dev-haskell/zlib-bindings/zlib-bindings-0.1.1.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/zlib-0.5.2.0:=[profile?]
diff --git a/dev-haskell/zlib-conduit/zlib-conduit-1.0.0.ebuild b/dev-haskell/zlib-conduit/zlib-conduit-1.0.0.ebuild
index 2b071d84dfb8..7ed7b4b47334 100644
--- a/dev-haskell/zlib-conduit/zlib-conduit-1.0.0.ebuild
+++ b/dev-haskell/zlib-conduit/zlib-conduit-1.0.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+debug"
 
 RDEPEND="=dev-haskell/conduit-1.0*:=[profile?]
diff --git a/dev-haskell/zlib-conduit/zlib-conduit-1.1.0.ebuild b/dev-haskell/zlib-conduit/zlib-conduit-1.1.0.ebuild
index e5cf0c379ab0..7c0d68c1b5b7 100644
--- a/dev-haskell/zlib-conduit/zlib-conduit-1.1.0.ebuild
+++ b/dev-haskell/zlib-conduit/zlib-conduit-1.1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/conduit-1.1:=[profile?]
diff --git a/dev-haskell/zlib-enum/zlib-enum-0.2.3.1-r1.ebuild b/dev-haskell/zlib-enum/zlib-enum-0.2.3.1-r1.ebuild
index e30375e56348..ae09a03b09a1 100644
--- a/dev-haskell/zlib-enum/zlib-enum-0.2.3.1-r1.ebuild
+++ b/dev-haskell/zlib-enum/zlib-enum-0.2.3.1-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/enumerator-0.4:=[profile?] <dev-haskell/enumerator-0.5:=[profile?]
diff --git a/dev-haskell/zlib-enum/zlib-enum-0.2.3.1.ebuild b/dev-haskell/zlib-enum/zlib-enum-0.2.3.1.ebuild
index cafa00df4d16..a2e71e7a57c2 100644
--- a/dev-haskell/zlib-enum/zlib-enum-0.2.3.1.ebuild
+++ b/dev-haskell/zlib-enum/zlib-enum-0.2.3.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/enumerator-0.4:=[profile?] <dev-haskell/enumerator-0.5:=[profile?]
diff --git a/dev-haskell/zlib/zlib-0.5.4.1.ebuild b/dev-haskell/zlib/zlib-0.5.4.1.ebuild
index 7dcbc29604f5..0682eb3d2505 100644
--- a/dev-haskell/zlib/zlib-0.5.4.1.ebuild
+++ b/dev-haskell/zlib/zlib-0.5.4.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ppc ppc64 x86 ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~ppc-macos ~x86-macos"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.10.4:=
diff --git a/dev-haskell/zlib/zlib-0.5.4.2.ebuild b/dev-haskell/zlib/zlib-0.5.4.2.ebuild
index ac28ab2e74eb..b580b3fb8e19 100644
--- a/dev-haskell/zlib/zlib-0.5.4.2.ebuild
+++ b/dev-haskell/zlib/zlib-0.5.4.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~ppc-macos ~x86-macos"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-lang/ghc/ghc-7.10.3.ebuild b/dev-lang/ghc/ghc-7.10.3.ebuild
index 1772cc847222..1b8e5de541d7 100644
--- a/dev-lang/ghc/ghc-7.10.3.ebuild
+++ b/dev-lang/ghc/ghc-7.10.3.ebuild
@@ -72,7 +72,7 @@ BUMP_LIBRARIES=(
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc ghcbootstrap ghcmakebinary +gmp"
 IUSE+=" binary"
 IUSE+=" elibc_glibc" # system stuff
diff --git a/dev-lang/ghc/ghc-7.8.4.ebuild b/dev-lang/ghc/ghc-7.8.4.ebuild
index 8ca6c34ea126..09a0b30498d4 100644
--- a/dev-lang/ghc/ghc-7.8.4.ebuild
+++ b/dev-lang/ghc/ghc-7.8.4.ebuild
@@ -65,7 +65,7 @@ S="${WORKDIR}"/${GHC_P}
 SRC_URI+=" https://dev.gentoo.org/~slyfox/distfiles/${P}-ia64-CLOSUREs-regenerated.patch.gz"
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc ghcbootstrap ghcmakebinary +gmp"
 IUSE+=" binary"
 IUSE+=" elibc_glibc" # system stuff
diff --git a/dev-lang/ghc/ghc-8.0.2.ebuild b/dev-lang/ghc/ghc-8.0.2.ebuild
index e242f25ecc70..aceb46dd71e5 100644
--- a/dev-lang/ghc/ghc-8.0.2.ebuild
+++ b/dev-lang/ghc/ghc-8.0.2.ebuild
@@ -71,7 +71,7 @@ BUMP_LIBRARIES=(
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc ghcbootstrap ghcmakebinary +gmp +profile"
 IUSE+=" binary"
 
diff --git a/dev-util/bustle/bustle-0.4.2-r1.ebuild b/dev-util/bustle/bustle-0.4.2-r1.ebuild
index cddebd759741..18e9dda482c3 100644
--- a/dev-util/bustle/bustle-0.4.2-r1.ebuild
+++ b/dev-util/bustle/bustle-0.4.2-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://willthompson.co.uk/${PN}/releases/${PV}/${P}.tar.gz https://dev.
 
 LICENSE="LGPL-2 GPL-2" # bustle-dbus-monitor.c is GPL-2, rest is LGPL-2
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND="dev-libs/glib:2
diff --git a/dev-util/bustle/bustle-0.5.4.ebuild b/dev-util/bustle/bustle-0.5.4.ebuild
index 79a27f23e784..3c422fff02f7 100644
--- a/dev-util/bustle/bustle-0.5.4.ebuild
+++ b/dev-util/bustle/bustle-0.5.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="LGPL-2 GPL-2 GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="interactivetests +threaded"
 
 RESTRICT=test # fails one propery test
diff --git a/dev-util/shellcheck/shellcheck-0.7.0.ebuild b/dev-util/shellcheck/shellcheck-0.7.0.ebuild
index 61b08cde9fc2..572de9c65f0b 100644
--- a/dev-util/shellcheck/shellcheck-0.7.0.ebuild
+++ b/dev-util/shellcheck/shellcheck-0.7.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/aeson:=[profile?]
diff --git a/dev-util/shelltestrunner/shelltestrunner-1.3.5-r1.ebuild b/dev-util/shelltestrunner/shelltestrunner-1.3.5-r1.ebuild
index 6f919da1c793..d51ce4d5631f 100644
--- a/dev-util/shelltestrunner/shelltestrunner-1.3.5-r1.ebuild
+++ b/dev-util/shelltestrunner/shelltestrunner-1.3.5-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/cmdargs-0.7:= <dev-haskell/cmdargs-0.11:=
diff --git a/dev-vcs/darcs/darcs-2.12.0.ebuild b/dev-vcs/darcs/darcs-2.12.0.ebuild
index 160bcf620c14..bb4e04774663 100644
--- a/dev-vcs/darcs/darcs-2.12.0.ebuild
+++ b/dev-vcs/darcs/darcs-2.12.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+curl +network-uri +terminfo +threaded"
 
 RESTRICT=test # occasionally hangs on directory creation race conditions
diff --git a/dev-vcs/darcs/darcs-2.12.5.ebuild b/dev-vcs/darcs/darcs-2.12.5.ebuild
index a524fcf1fea2..c1bf7f7d2b6b 100644
--- a/dev-vcs/darcs/darcs-2.12.5.ebuild
+++ b/dev-vcs/darcs/darcs-2.12.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="+curl +network-uri +terminfo +threaded"
 
 RDEPEND=">=dev-haskell/async-2.0.1.4:=[profile?] <dev-haskell/async-2.2:=[profile?]
diff --git a/dev-vcs/darcs/darcs-2.8.4-r6.ebuild b/dev-vcs/darcs/darcs-2.8.4-r6.ebuild
index 13b9ad6f7675..5f688a52aac3 100644
--- a/dev-vcs/darcs/darcs-2.8.4-r6.ebuild
+++ b/dev-vcs/darcs/darcs-2.8.4-r6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-misc/hath/hath-0.5.0.ebuild b/net-misc/hath/hath-0.5.0.ebuild
index 72234a8b54ae..3f2f323611b6 100644
--- a/net-misc/hath/hath-0.5.0.ebuild
+++ b/net-misc/hath/hath-0.5.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/cmdargs-0.10:=
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index 4b3dfdb0699f..3dddc06274ba 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.use.stable.mask
@@ -4,6 +4,15 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in package.use.mask
 
+# Sergei Trofimovich <slyfox@gentoo.org> (2020-04-13)
+# app-text/pandoc (dev-lang/ghc) has no stable keywords.
+app-emulation/xen-tools doc
+dev-python/notebook doc
+
+# Sergei Trofimovich <slyfox@gentoo.org> (2020-04-13)
+# dev-util/shellcheck (dev-lang/ghc) has no stable keywords.
+app-emulation/winetricks test
+
 # Adam Feldman <NP-Hardass@gentoo.org> (2020-04-12)
 # Dependency (net-wireless/blueman) has no stable keywords
 mate-base/mate bluetooth
diff --git a/profiles/base/use.stable.mask b/profiles/base/use.stable.mask
index d16c04770003..3d7804a385c6 100644
--- a/profiles/base/use.stable.mask
+++ b/profiles/base/use.stable.mask
@@ -4,6 +4,10 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
 
+# Sergei Trofimovich <slyfox@gentoo.org> (2020-04-13)
+# dev-vcs/darcs (dev-lang/ghc) has no stable keywords.
+darcs
+
 # Patrick Lauer <patrick@gentoo.org> (2019-10-04)
 # No postgres-12 stable yet
 postgres_targets_postgres12
diff --git a/x11-misc/xmobar/xmobar-0.23.1.ebuild b/x11-misc/xmobar/xmobar-0.23.1.ebuild
index 9bafcd89fb83..87e1f0c961b2 100644
--- a/x11-misc/xmobar/xmobar-0.23.1.ebuild
+++ b/x11-misc/xmobar/xmobar-0.23.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="alsa dbus inotify mpd mpris timezone wifi xft xpm"
 
 RDEPEND=">=dev-haskell/http-4000.2.4:=
diff --git a/x11-wm/xmonad-contrib/xmonad-contrib-0.11.2.ebuild b/x11-wm/xmonad-contrib/xmonad-contrib-0.11.2.ebuild
index 2a06f6468ef8..7abe17884f5c 100644
--- a/x11-wm/xmonad-contrib/xmonad-contrib-0.11.2.ebuild
+++ b/x11-wm/xmonad-contrib/xmonad-contrib-0.11.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 # hackport-args: --always-disabled='testing'
 IUSE="+xft"
 
diff --git a/x11-wm/xmonad-contrib/xmonad-contrib-0.12.ebuild b/x11-wm/xmonad-contrib/xmonad-contrib-0.12.ebuild
index 0723bfedff2f..0edc96785bb8 100644
--- a/x11-wm/xmonad-contrib/xmonad-contrib-0.12.ebuild
+++ b/x11-wm/xmonad-contrib/xmonad-contrib-0.12.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="+xft"
 
 RDEPEND="dev-haskell/extensible-exceptions:=[profile?]
diff --git a/x11-wm/xmonad-contrib/xmonad-contrib-0.13.ebuild b/x11-wm/xmonad-contrib/xmonad-contrib-0.13.ebuild
index ca629f352f9e..f0d151ea4912 100644
--- a/x11-wm/xmonad-contrib/xmonad-contrib-0.13.ebuild
+++ b/x11-wm/xmonad-contrib/xmonad-contrib-0.13.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+xft"
 
 RDEPEND="dev-haskell/extensible-exceptions:=[profile?]
diff --git a/x11-wm/xmonad/xmonad-0.11-r1.ebuild b/x11-wm/xmonad/xmonad-0.11-r1.ebuild
index a45aa0b4aab7..5e216665b0dd 100644
--- a/x11-wm/xmonad/xmonad-0.11-r1.ebuild
+++ b/x11-wm/xmonad/xmonad-0.11-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="+default-term"
 
 RDEPEND="dev-haskell/extensible-exceptions:=[profile?]
diff --git a/x11-wm/xmonad/xmonad-0.12.ebuild b/x11-wm/xmonad/xmonad-0.12.ebuild
index c9bbcad8c314..def284ca7ba1 100644
--- a/x11-wm/xmonad/xmonad-0.12.ebuild
+++ b/x11-wm/xmonad/xmonad-0.12.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="+default-term no-autorepeat-keys"
 
 RESTRICT=test # fails test on ghc-8 (assert has different text of exception)
diff --git a/x11-wm/xmonad/xmonad-0.13.ebuild b/x11-wm/xmonad/xmonad-0.13.ebuild
index c1c6f0f9e354..80e6c99b32d2 100644
--- a/x11-wm/xmonad/xmonad-0.13.ebuild
+++ b/x11-wm/xmonad/xmonad-0.13.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+default-term"
 
 RDEPEND="dev-haskell/data-default:=[profile?]