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 7d492d95c457e..0ca325522f80c 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 7d492d95c457e..0ca325522f80c 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 5de926a7721b4..680c8dd7f70ef 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 d164143bdc9ab..dac122fc12ab4 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 29e713715a4c4..b4859961ac2e8 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 45a28c15d3cbf..1cb4bb0a4467b 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 e621e1ec228e4..111a33276b5f8 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 8b8fe0676e4ea..385e68848589c 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 e29385e817792..ab46a0b6e0c94 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 f3ba9bcf09e7d..e34f74eeaafbf 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 49c782e9eb7e4..d24620363722c 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 29c57774fa081..6524456fa39e1 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 7311f01290d73..ec4669ca9c0e8 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 a5fb4cf92a97d..7d6d1da0c8440 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 d6fcf2c633b6c..16cd9f8ef3ea2 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 9bf331c9da179..1bd4653f52f18 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 a27bf490db423..1ca2f1bb4ce9d 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 8ab4945a4a7be..4497b45385f64 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 48a19b8b37033..764ae3414fb21 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 1c5ef4c26cc69..8e312c3bb82d5 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 74a0903a06a40..344aade92cdc2 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 8606dd00338bf..ecb4f498acb32 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 eee9e489717b5..60d1f2726f74f 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 389746ba5f354..47eb45f464c0d 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 5acca24128a6c..f8bdc7633943c 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 c5c6e9c6edf16..826ff08715956 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 f8c84f36a37b9..cffe59786c6c4 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 d55784ece9f48..718adc6237b70 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 bde42b7e25ee0..53cae80fd0422 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 9c0552dcaae72..b0b445edcae0a 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 730f2b0997cbb..ad70a428d48fb 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 14751c37dce87..6a61113e5c3e8 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 a25973f56137c..1a71982ebaa9e 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 f45ba488e6484..2743f9fcf58da 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 58d1d69cb3f0c..f3cba8bfc171b 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 c4a26c14df6fd..27b6b385987ce 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 3cfcfea78789f..f577ca17ae25c 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 f2fe19817fc07..02e15680c43c8 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 11a30d2403f89..647f2842da87a 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 e339eb1a4d175..c34667bd42bf7 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 fc9f30b4229e6..e798a243c6f5f 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 261eb398b6cfd..de6977130a8aa 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 3429649c222e3..c00dfc85cec9c 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 f490a425b14c8..6a58930e985b1 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 f3f17f61e260b..015bf719a80ed 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 fa4653cac886b..80206a556c083 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 2f8666adccb04..1edae186f55f7 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 289468ae47e88..ac47f9b4cad0b 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 fe60d77e7dd3d..3dfd5d93cee6a 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 4e95c19d03a3d..8459127a001cd 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 85b2a029d16f4..4dd74522332eb 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 a100a7a3d2271..115fb14878f1b 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 4f8fc5e1b09b0..61986fe80b5c5 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 a4b39009cd8da..eef90ef28ec60 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 e0b55fda91751..0ae0b62ba5595 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 58922c42b7735..cf4d2a9afeeb7 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 93840647cdcd8..ce61963948f5f 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 e65c6cd797648..eef49c0e0f54b 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 f673a9532142d..8671dd34e049f 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 715ae697d32b7..8ebea2208ae35 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 ae0417253ebd4..d4be1d37df14b 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 2d9c61d543467..d107a950834dd 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 f7cfa43d2692a..d0974b28d103a 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 537db1aea9526..5a3ccbdeb3df0 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 ae56658f9f471..6b30d1224c2d6 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 f81448d9a39d1..23bd4d49d8a36 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 967764d1e1081..96b40f8d68f1a 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 5ee0b8ffa0f7a..e54facf0fe9b0 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 7c6cb59f65aa3..ef198863bfba1 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 ab5cab969a8c7..7df11c7bd3ac3 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 d8f3d59759743..5a263f0f5147b 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 1899890112fc9..c11cab9918eaa 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 24ee18e7e9a5c..14584f769269b 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 88854fd1cc4f2..7f709c6c5e34a 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 b73975c859011..af885956ec140 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 c7b44167628d8..3d5bb3fd736e9 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 881cfc752655b..a05e119c7789c 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 be2dee7e46f58..4f5904e2ff964 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 6fb3926b32afc..7b5fb50c2b8f9 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 aa81f311a6c92..4c5522cc3814f 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 021ce86ff27ff..e080e92bf4afb 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 ed66a2ff55b86..12c57fd2ed94d 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 3d8ed9d78cfa5..f4f290e437f89 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 0f3a6d9355d56..ee9d51cde121b 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 69dfb1fc98e6d..177e4eb19d063 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 2bf507c4011e8..5e9ca276d36eb 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 a1c00965fb06c..84b545530c04d 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 1bae4e210c9ad..a4f73f6fc2624 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 87e4af15652f6..34a62d8729a2d 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 94b9dd89196b3..6e20fbf180a1f 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 f9d7bd176d1e5..0424261ac2adc 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 e5678e1be6081..50aa562eef6fb 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 34470cc811261..40f588e481320 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 92e50d6b21e08..9250639c7e07f 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 2bd72fc88d06d..ae1193e4fcbd8 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 1927479404d64..0c9961ace0a23 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 369c06cd4b67b..9491fb2445157 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 2ee07f6418c2f..0c6ece31943a6 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 df674c0bbb015..c7077cca20593 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 09e0827834327..6c5c6970be054 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 613f7aaea48cb..d36c0eae5d576 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 cdde0e69767b3..29d6d770a2e19 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 ead19812f79ad..d75de3ee20051 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 7d59c0a392cec..ee39489573f7c 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 277d5e275ec36..5ee4921b3accd 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 02193b3fb50fc..746d622583f3f 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 2263e832a94e5..e6397b9d5d3fe 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 a7a239fe186d0..3192667edfb47 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 62cb3ff9ea072..e97fa53d982b4 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 1e1acfa738108..889ccfd86514e 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 009379cbae807..5b47b2dd0cdeb 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 fd9f2ce3ed984..07a6c22f150f0 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 9903125e4a29d..848465e4775ef 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 e5f7d4125f428..f4d13217d9447 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 a2ec8825a22cc..7509d59784ab1 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 51d2e833765fa..ad5ab120fa219 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 21b9e5376c0a2..78b6a2dee8b8c 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 1608257245051..6bb09aa4c0110 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 bb51d475fb53c..2c64cffd4bfd8 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 c67cdae99f34c..a629a9446d498 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 ef8f8b60bfc10..e7cfd357418a3 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 77f4b38f47a5d..290f2f95e911d 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 f7048bca55819..db84075bdfb7a 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 f3a3003f4bb74..babb8565a2bfa 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 46178c15cb478..4fed26489fcb7 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 2551efc2608a5..3a9385d4d4df8 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 a413824bf0049..da7f6d02c6260 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 be1424f50cd61..c332f9a6af96a 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 1db757804519a..7611afa71bd3d 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 d8e9df434478c..f6586c2f63ec8 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 1f0970c8b204c..982a547b9ab4c 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 84b89de5b15e6..a7ccdd905aea8 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 d4f5b6b017bcb..ffa134fe1227f 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 086f6d9368d27..ca0c64b465e3b 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 5d2ecc33c284c..7f5489f6fd4d1 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 8856af67cd9c7..4b4635f40e7c4 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 51bf61b872292..eb419ccd7dc9a 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 f82ef5b3af6d9..19c69379f71f9 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 09a5046e891e1..075a5fa7ad44a 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 746151c0d4e5c..72d4fa075413b 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 f6d6d96187240..b182becb5348a 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 a7a56512bd27b..b7a44a1a548c9 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 561047e817d2f..502143ad01c44 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 dffa58355aae7..531dfe8cfb7fd 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 ea9a3c4355bb3..65a1bd502c190 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 f51aca0a40107..d36ffad02dce4 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 4ed5827142441..d4911124abbd8 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 abfe841fe6bcb..f5719b5bbb628 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 df94619b46020..6b9552fd4c4cc 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 e654420738dc0..5da4cd4a8d9be 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 e775438a1127e..8714637d8205a 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 30d7bcc8a23e8..8aca9b09e7008 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 bfd9d7a6fb931..a40607c015de0 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 cc3381148e549..2788074ca25f7 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 2a11d29abdca9..1cd38eef52684 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 38aee5733ed77..c23b21875bc3c 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 7ca3421ca34e9..d8b760e1e108e 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 87cfa3b9dc1a9..141b385467a4f 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 c460b4d337f52..0d54cbe28333c 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 8bddc31a91d89..1a81cc71a2d94 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 86295406ba7a8..9521e8f2c566a 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 2dd7399ce3add..e8562fa8646ff 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 e2bd6fc4191c2..104e8ee723109 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 019d69b2c8890..f0207b3638bce 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 f2e2e781e33f4..8b1fbdd2392ec 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 c729bb74f86ea..f8e66f5598fb4 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 210334041742d..e91234c028eb8 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 f436bdcfdea07..9e235a135cb51 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 7a9df6f8f443a..ba58000499121 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 4ef88b2fbb525..bb34ec51fa5a1 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 ade49bc537b23..ef03eee3ce9c4 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 8652446e481ee..7febd7ca39079 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 267d2a20efda6..63d0588abd8b9 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 d99aa7750e8e4..4d24f844aa37f 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 8d58bea0b2a30..f50409f9a8187 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 99397f321f9f0..3d72eec60cce3 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 d2ff23af326f1..2eac3715b8aa8 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 7580d1f8c584f..62e277644a9de 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 0779407ce5b9d..11ee6bfa07e52 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 1b5c682169fab..135477c4a952c 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 33de9dc82abcd..045aa73fa0d2a 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 091831d9ed0d4..ac293efaf12fe 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 45065c912d63f..58c336f452fbb 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 de34234948218..a0948f27c3c93 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 bd3ba628abc97..213280bd2df84 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 e5be57f0e7523..2ba6e3f59aa4d 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 30ca52e79a1a9..5b0daf5218d5f 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 17a3302aa2385..9e12544fa3f4a 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 100bfa584d47b..01c2904253c09 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 47ef50e47b992..3aa1a147b1de1 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 3f05e68292312..2696019e7d0a3 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 2fd7e483f69f1..c9e11df0d0e5a 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 d7e4a8fe851ac..2142d6a98d837 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 a98533ef06507..05edff7567676 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 f849764a194ff..1658893bb5020 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 27054f82c6a46..b8ad0263504fe 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 b5390b1bb06ce..2f1d4a196b31d 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 09c976d1ed9b2..5a2a2c084f9f5 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 e9a314515a6a0..1c52f7f3807b6 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 4a05bfd7d615f..edeaea73155e6 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 9d76e0d1a48ba..f152ea25f4812 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 b66962b8fd439..3dc5dc031c90d 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 c167a28d950e5..51040d37e7477 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 fd6d6870f63f6..e1204d50420d2 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 f82cac3953ee6..1ffed1b5d6f69 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 9368aa38d8e07..bd6bcd7226a2a 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 f0337baa85ff2..353d6815d6663 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 1d071a334dbf1..786bb0925788a 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 ec72c8748eb81..48cdb9998cf1c 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 ae55fd8d67a70..2a6577d92cbb8 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 c66e577505698..d35d1890f00d8 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 c3ddcbd446eb1..c1f5c521a4162 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 4bd8df23a6a3d..f0790a6e57044 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 1f6da5e0ec394..275210de04a9e 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 3dd1c4f4bb8d9..afc4e86578103 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 5410278001c1f..b7ba91e322d3e 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 d3a6b6fb86bdd..0eacedc6af69f 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 6003d89ee0207..5628b3b5ec546 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 8d998e9e16f22..742aa165b7c02 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 a066efc29111f..6630fc28ff4e9 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 2e3f339dba6b8..d70f535b34231 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 9072d43ccb8f2..10c16f92d591a 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 be26eee6994dc..ea5655631c6b2 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 cf59ee052a894..cd346ca80d73d 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 f37e1f833882d..f515449a1c5fb 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 4d10bcb5d5ace..4a1e749390e9f 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 de934d6768c82..322038a689a72 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 fa88b8a9a70f3..59695c65f85bf 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 9b19f7d6f006f..b5946759dcb26 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 b5ac84903b8da..a6f8d39766fd5 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 f73f82cf32a27..2b79fef4c7b77 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 fe9cc89bde061..b6bccd23bde7b 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 3ccde11b9a132..f6f2d94710e4f 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 27799101e13ea..852f7854e6148 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 9228e0f46d473..543e06e981b0d 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 811f6c4bd4a20..a4467b95d7529 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 7ca7b4c7b85b5..57ecbcdf01fb7 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 106f08802416f..ee01d27faa97e 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 0fc5553cee945..4b136eafee48c 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 8f4832d6228b7..68fbb201d2e57 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 8f214ddc013ef..8c98b507c9f9a 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 da156e8850088..fdcdcc7354ecb 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 7d755d2795626..588bc14435c60 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 b068e7c2a8006..80afa9b3e9a56 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 29df20c7bdd7c..1685b35f78015 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 85b2e1c3b876d..6c34f82a1918f 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 c635369723510..7efa1c561c1c3 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 9b455e09da48d..d3b3cf4def4fa 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 156205cdbb692..b8cc8ca07b233 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 c6bbe9dbc8978..91674b88ad83e 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 40751aabc5907..fd826e4e6659d 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 d4fcaa71b42b9..e1a75d03f0320 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 7352854bff7ea..89b455832b708 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 8fc50de9ad343..c1374944d643c 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 19004446c35e7..f3a90906c97f7 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 65e119e3160ec..0f991459b2f54 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 b22e6c8eab772..eb49402b0e76d 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 04567d105afef..d28287c878b73 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 20fadc99db743..02721e6319348 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 3bed99fe3f515..b697315161826 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 e75ef049247d3..65bc147cdeaaa 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 2579ecee91b95..f19e3b0eb8a7d 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 777a59794b743..3e9c695d7ff87 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 82e42842da635..ea6e08121859c 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 81d51138ee751..b50762b19c076 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 b9dc6aefd1a25..e71b6dfa266a1 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 1466235ee4f79..be34afec09aa8 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 9b3f501e3e57f..e9023bbe4ec88 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 552c6d6849bb1..9bc75f4c2a66f 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 92a92120108bd..86089cbadc2a2 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 5bcf365e9f402..a3d1bc609557a 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 c530b6a6c4d87..25372af195c34 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 4d7b7c24f1580..aa206f2fdb314 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 30c6e49a313dc..b8c805761ee93 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 f66627891071a..1567b10c10e61 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 df92ce4444531..a3802a717242b 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 97e79edfe4dfe..638da0adf7386 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 4c60377d720f7..8cfb385f62b07 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 98c255627b794..e5055f74cdbb9 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 f9f6013772045..554a88c81b151 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 d81ce9b376d67..06edea61fdec0 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 84c84370bcd5c..586617507e0d2 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 79d09b01b6a1f..94bde2bc44744 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 642c96eb6f799..ae00f3b488d34 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 6491562458126..45c2dfc1e7e58 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 f4543fdca3c13..6af355f1da055 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 d7f02ee48ff9e..cba8e6c2db070 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 127292a03f735..65e9caa048338 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 3a125e3273232..595325e6bb669 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 2279b26df4993..51c6b4f63a43a 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 3027c338058c2..736152fafc034 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 d2cb9157ff0dd..130af7884d816 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 0ca0637ce348a..79711ddb1cbcc 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 16eceb056b7d2..b47005b1b7f87 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 b029d7a4325db..0ff6f6b7c8a44 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 a50ca681b83b9..c677d1cf9d2df 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 6e39854671bb3..b2371dc77e173 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 866e2e6fd3433..b8b25174e2ca0 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 463d5bd2d8a07..af7cf9cb12184 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 afc015fb3c2b8..9e2a0b0f01245 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 77209ab8cfffa..f0cd617e230a4 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 890c39a6bd7ab..f48253dfe4e1f 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 7156a2d169919..3c5a93903a97d 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 53181157e23b9..c14d0383dd8ae 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 bd4719362992a..2ed7592736176 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 aba2c4cce30c8..9e2fcb9d05029 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 11109326cdff5..3d04780275971 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 b2d2625a0368f..4beb035e206bc 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 61df8870b0902..5c55021b6ade8 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 85d9e30fc8401..0e9771e497e93 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 0c3d33546120f..c201238456f0e 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 3f36655cbbe22..c5eb74e3dd5a9 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 71f84eb787314..5b5a5c71bbebc 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 0fdf6de4f6575..07e0c5995b81b 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 c9e1ee71d75cc..95b82d3b096bc 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 1e0eda7e10589..df76f26378698 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 e4ab974e65ed2..352905567172f 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 95868cf4887c5..bd3d3827cb572 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 66538a52189d1..8ab07637fc3ba 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 adfe434002a2b..80261c086b17c 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 597f39d7b73e7..973606aa2c558 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 75308ae2b74bb..ab128e10c2b6d 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 b89d7beabe7a5..39ae97b351737 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 0393e9c8448fe..1c3bb1ed928d3 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 52018405253d7..288ddf949b506 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 5cd6d4e138696..172b0cd65b8a8 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 65c51397c3918..68466d8661b08 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 ae4e20d9e387e..e0c998795b4ff 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 bd11ed63d4d9b..9bf805a4173d1 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 171114875f813..0e0041b27f580 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 a8fa2e3dce66b..3a3d077e3fa5a 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 8b3b98968b35f..90466b09e0bcb 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 61a02c5499a2f..f84be97e8c604 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 c2000ea48481a..55ae87cb7c564 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 070cfd6d98c82..910c67f578093 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 8ec849ca45a8f..973e6bc73e400 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 bb543b0a536f2..b4829216fcb3e 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 8595fd79e847b..9b874aedb0c4c 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 a602f8bdecaf3..7b5d141a05ce4 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 742bac0e456a5..7c5973af14b60 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 93ccccc42dbd2..6eee2da12447a 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 dd2667d561004..b6b68baca466e 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 f0921293a7d54..c95d422283551 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 01152aadb374e..421a78c827e4f 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 e71d14bbc0224..aa45de968c64a 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 42e7a7d0a299a..e0e77ad6bfdca 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 5a25569c4caaa..39aeaacc7665a 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 ce27c480d2ebe..e0a6b183636ce 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 ab25e4b9e9f87..25383b929e0bc 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 a0bc260258571..4a052ff85e337 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 67edcf640b337..aaf3ce3f9de4f 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 200f27b8bf70b..3193f0197c753 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 a9b57b86495ad..7cadd1148d6cc 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 2e7e6a16b1526..b369af576a720 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 2d911a8965204..69489c19416a9 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 97fdb2e842e10..44e1b011e02e9 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 214e9ca266654..3833d334b449c 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 ba34767feae50..59a461c5f6631 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 6a857a2df8f7b..5fc2a8ac92a3e 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 8448202475800..1792cb4b0572b 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 543449bd7da82..8aee789a0a544 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 ce53b4e0bf76f..dfbc31ae7f130 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 49d4537d0b73b..3fdab3fde1fde 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 6c18787cf5aed..2fce20b648f60 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 a4eec9e2fc050..acf662d3f603b 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 6980ef7c0df4f..4d20404dceebb 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 5cb13267a7999..3ee10efb2244b 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 468c978e3deb4..10efb3439abd8 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 c5982ef7c886b..ae972b29958db 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 eb1046a017ad1..8dd8aaa47c042 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 8497695c78b64..47e45a2cffcb4 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 5a21afb21d838..fb3aec3796a26 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 5fd4f942e76c0..0d913a5460559 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 5d82f3ea7e118..1fa7107792bbd 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 8d5abf9051f18..69dca6a3a1abc 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 4a38a2295dbef..227acb2f313a6 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 844022f47d031..e37b14b6908d9 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 4728a7a6aea21..21ac79c229eee 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 2cc440cf3879c..4337e6548509d 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 7fa5a7833a982..f6e405b526d7a 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 83a24e6f5e922..6f5a77d320c60 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 2fcb5fe15b3b9..a96bebacba37d 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 6ae8393a4dd16..ab931f4393f0e 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 8cc4df19ec7ee..5a35a63bc6af1 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 9d99e1abad782..e549eba8e4783 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 c0e5a524418b1..80d0b7c3940d6 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 99ec90692569c..e7de7fb3722b2 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 7c47b5b88a849..4ec51e0f7fa4a 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 c62549e260b88..ef12aac53d662 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 30aade79a91c4..789725578937f 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 1f769a8bf3597..2fcd5db88bb82 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 17aec0944130a..e2fecf1da5cd4 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 42998269cd4b5..2fb6413dfa3fa 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 efdddf1b4b5fb..1787dd4d682c4 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 4e2231640ff27..1b938d18b1d4b 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 aac36e30769a9..5fb5ee3ff2be5 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 fe643b59a5b53..5920f7dd78c13 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 02eaeaa18480e..c468aa996db79 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 009342f650a66..5883be8779dc8 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 a70b1a8bd7481..e1e9949785f35 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 2bd779cb78d6f..19668aa3ceca2 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 88937ffa95cd5..3a22e7f02d428 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 d4182a31ef4f6..a9cf9a5378ebb 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 a79f7f11d57d6..68198aee9905e 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 2d06a5c5b0673..f9af8718ed9b6 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 9ad259902b1a4..ccbe6434f49d3 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 f788b4fcdcf0c..6eb5c3e912e3d 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 0e31adf5b893e..6be6c2e78c2db 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 305a6f0ba14ae..1868a53af40fb 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 3fad0d492173b..0a11a6af05898 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 2407e0b0b100a..67017a36101f4 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 86411bb3907e1..77d2e606e87dc 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 09da6ecc046e1..62569c3ed25b7 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 2020776147a9b..15a75829ac09d 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 9169b7ccefa57..242646a1e8ba4 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 8419022c72469..daef13bc66398 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 f39049c400dbb..9f151ada5e848 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 9aaf451113497..b7431f873a2f1 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 4a0ebf89f900d..da927a6a25b45 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 0f91451f45c04..939c99180d4d5 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 ef30a7a8a5503..3ce623959a523 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 67412cd01d62e..50080957c397f 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 3f7c0be7ee1a9..771192b19a744 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 dbdb3c44b5857..8431606b0af0f 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 100a8f92cc4c3..394913aa91ae7 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 4a5f286b2eb34..36c19b71bfc7e 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 9f8ca22578759..2e51afb3c9332 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 66365944268d4..983643f17178b 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 c03869ee7f190..48d8b5d6bf17f 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 4d76c405fa8db..22b215934a1c0 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 ed1fcc08186ff..2c7bf9703b02d 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 76787e6227118..1f0970f962898 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 9108418a0e98f..b3ca61d5138e7 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 1d9165467d50d..35f6989bfa071 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 ff09380c27873..c234e84741965 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 55ee65ff5b434..102878ecb3c40 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 9f19c85f51577..8cba89ff50afe 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 2ffe29b00c797..608230a4dbed5 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 5b726492def8e..f094d3f7db59b 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 957515e03f135..149187789c7a8 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 074ab9e24d58b..05b85729107ca 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 7b5860057005b..d7b4678960929 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 70e37e5e72f9e..ae9daf6295fbe 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 607b1c699b4a4..4f482d2ab0915 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 961a3b8e36aa6..9b23ea30875cf 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 f8de02c22d288..f72ec5733ede9 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 0be857d5cd08f..178149aceba09 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 9d2e700e1e410..3366842fce59f 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 300181e0735cf..c3c8d3f4b83fc 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 c3e276b734d50..c633900ffcdd1 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 8f5637ab742ad..1c51b943602da 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 81160186e82de..77a736fb3043a 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 5e592e8c7477f..f8083be8661d1 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 09a250bd663be..fb34874e13b73 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 ec5ddaedcaef0..33d2e1fd284e3 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 51d926c659657..2ac7bee17f9f7 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 1f092777defc1..fde63b698850f 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 2b2a8c5693e8d..3a938c2007cc7 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 431d88705983b..28c9a86ca0efd 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 8beeb3dd661f2..93ade0265dee6 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 543deb9204a18..e3464d1c41348 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 a27416bd9532e..5f3bfabca52db 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 7204a022fbdc4..37accc0efa38b 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 1883e8cf7fc33..7aaa43d11b24a 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 854b91ee529d1..ef54325151430 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 ba8ab119701dd..68ee62caac170 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 0723881d15dcc..d5722fa906b67 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 2988690abcce8..e983e17c91d60 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 e1ebeeeb10561..09a2a883bdade 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 fbde48c4ed0fa..4190eed22c19c 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 f8ae53d512712..c9be15ae569c8 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 89510a3e4bb7a..f8bde8423fd18 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 554d5b922eeac..d8be447b7d455 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 929786cc12347..cdb0db49e97c1 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 c9187d058a2f7..fb5b5829177f6 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 1c25c1488f6c1..52733c3df40a0 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 f17d815e4710f..9e359228d18bd 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 9d8046112e109..f7aafa7eac33b 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 a3e0fbde1bc9a..74e5807babeee 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 01b3b7ce6f2ee..851e2b9367082 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 709893756d347..cafc7fcc16eba 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 7c9ad79186aa7..cbd1c4dd80734 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 dbeab2ba2fd2f..218afaac8e059 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 54aa5bfad11ff..41043e3c92cdd 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 f6aa19c6ab17e..9eb658a75a954 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 50f53a300f847..c93f1b3fcfe94 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 a72310b0f3fe5..42825daad7736 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 5ac8b81f3def9..5336220bc374c 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 b9eb0b13feea5..547ac95f1b42c 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 7287af68fc488..0b0107e477393 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 caa25fbe90da6..508b157b31e9c 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 aa031a9503aac..6d5b45354f546 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 eb20abf75c5a5..5f3f3b07b9f43 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 2e0bea37db829..6e9902d89825c 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 769de4c2f0490..1d1a6ffa294ba 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 3e24f67a5dab1..a0477e796d34f 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 9e5ff257264ab..024ec7680e664 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 e953f49947d7d..cda78beb62e78 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 ab5ac94e1349f..ce9b9cc0abfba 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 f076e6f94f4b1..ce67b27ae70ee 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 e8bab88281b57..120bc07866071 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 967a124fa2d68..30f5e8d729d64 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 ed78f09317af9..0880ee7ea464b 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 4de53058744cd..e90ded228495d 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 5431faabb0373..90673a1f59eb3 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 7c03aa404938b..9177d392a13e1 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 2654d99d5a53a..42dba237037f8 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 37d2f6d1f95cb..98648f12f2e5d 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 52ef4cfcd752d..c0bbd705484e2 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 91b33086a6c95..4f76a17ee7cd3 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 7f9023d152730..ad79307206fa9 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 af3336cb77363..216a8e46af4f5 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 edca84d652502..122782885604f 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 9298f768a8a99..c3878715b41eb 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 bbe2e099a9b91..ccf01e5e14da3 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 a6de2c23a637a..edffdabbf292d 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 fe6c4d2af0153..19772fe62ed9e 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 604561813510a..1a9bc81a4022d 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 8001c070fd906..cf997c1889e8c 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 8c61799e74842..812e3653792fb 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 681cf6b041146..2c0e1fe30df1a 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 02ea2deea1c55..ee7170edc295e 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 9bf7ee9985ce8..fdf8e0ff38d25 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 00ff3b3191be2..25b0afa900eff 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 2163e8423515b..271539749295e 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 fc83037fea8cd..32063f3a1aea1 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 f4dae0b1da5a1..8a80dc6427adc 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 dba35f32e3ab2..7cfa633e38e38 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 3f5062082691b..e7f6f104730b8 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 d2b5ec71f82eb..d1ddab24f750a 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 b5d99d8712802..55857605762c5 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 c4f7755038bde..7a8f960ab81c5 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 5549b7a844057..b67be3e1ad330 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 b0b81d724b1e6..b877da13fc373 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 55f15abfd09ed..f274ca49f2de2 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 3b3bc5fba7060..fcd279e4613d1 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 3f636d9c1ad5b..69578fb72c3bf 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 062416e682703..1b7e8dcfe88df 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 202b6eb61eb2e..ebc4f3ccb06c6 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 ad308622c9f8a..7f58664950fed 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 80eb982f89201..abc74da69ac47 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 a164e030af266..a0baf253e2c9e 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 03cede44119b8..261badce71287 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 3b5f4c3bccc2d..854aa09624480 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 b4ac6a134c98d..342456a5cf7dd 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 33f29881f314b..b7c559d95b977 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 c83d512dd94ae..c5af30c488e6a 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 f1036e52e6db0..ceed5c05ccf16 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 5e258cfa8e561..10ef062616253 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 834757bdfaad6..4bef181855582 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 9e716c70ecd11..dc94f44b8fa5e 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 48e15d108934d..44496ea0c06d6 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 5f59e736a79d3..a83b309bd2b7a 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 96ade1b8a3d7c..27ad0ebbe3450 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 bf2b347d0e13b..63ab6786801d6 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 4c8c7c26a40ec..5364ad054d058 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 ba0ea45329a8b..05c10834324a1 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 038bed6ecd68f..76e4728b8fb64 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 6ee7077183f47..55d4a165067c9 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 c10f99f03a99e..1f6bbd6c40fe8 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 36198815ccc2c..3f93aeae76158 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 cb04a3e1829d3..0576c0578ff5a 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 e55b26504f75f..a10e5bc473e8d 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 603286fb23469..f69e694a53e20 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 668b394925058..c2c4c11ea38cd 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 78759c2bddef0..28d8fec5ba600 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 6de525966d542..e7c32f9fa3e44 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 d90e3c90d610c..a7ee2fd958871 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 8c31064971792..266874b9cc35e 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 6f4bc5cd30bb4..3634b792db7e1 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 8e039ee830a25..0967583dfd78f 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 1f759bfeb9146..5c8100d66dee2 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 95f154fbb8269..b8c9dde848be2 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 f288d9b700c7f..1410d108991f2 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 cb0345178fcd2..570d866dddf58 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 61fdb69967eef..724aa96ef4e36 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 ecbf57871d4d9..ecb770eeeb962 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 2cb2795be6a2a..ca3ed14025897 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 5620b21a15fee..746345fec9333 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 5370566ebc67f..41d42d9a16bda 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 67660d324c74a..777e9a4f00e5f 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 bb69ccfed5e32..5ba21a25ad1cf 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 b4e6e2d4b146b..0b338e2d885e0 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 bc40d48c113ea..ce28dc23a6ec7 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 2800baae16296..4911e1fef2fc9 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 d29edfd93e675..a214790d52dd2 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 e62fc8e70bcbc..aff853ef41fcc 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 8bbd800ffe459..304d6883e5d66 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 d1a0b7aed7c06..8d45698256d87 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 fb77f56074544..4450917ad2504 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 095821699d5a2..5bf481bdbd4ca 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 d4cfd7f9b47f9..0bc2bb8970d3e 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 1b3e261a02a9a..c737caa4e4b42 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 e0d991aeebd7f..7cad1b4d13591 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 6994425b69214..a918e39f8b99e 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 726e7543e0dd1..5e9aadcd5d004 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 0de4119330281..d522886fef038 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 2b071d84dfb8d..7ed7b4b473342 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 e5cf0c379ab04..7c0d68c1b5b7f 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 e30375e563484..ae09a03b09a1f 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 cafa00df4d166..a2e71e7a57c2a 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 7dcbc29604f5f..0682eb3d25052 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 ac28ab2e74eb9..b580b3fb8e19b 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 1772cc847222a..1b8e5de541d75 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 8ca6c34ea1265..09a0b30498d42 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 e242f25ecc709..aceb46dd71e5e 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 cddebd7597413..18e9dda482c34 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 79a27f23e784b..3c422fff02f7b 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 61b08cde9fc20..572de9c65f0bd 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 6f919da1c793a..d51ce4d5631fb 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 160bcf620c147..bb4e047746633 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 a524fcf1fea24..c1bf7f7d2b6bc 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 13b9ad6f76752..5f688a52aac33 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 72234a8b54ae7..3f2f323611b68 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 4b3dfdb0699f8..3dddc06274bae 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 d16c047700032..3d7804a385c66 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 9bafcd89fb839..87e1f0c961b23 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 2a06f6468ef86..7abe17884f5ca 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 0723bfedff2f7..0edc96785bb80 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 ca629f352f9ea..f0d151ea49121 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 a45aa0b4aab74..5e216665b0ddc 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 c9bbcad8c3149..def284ca7ba14 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 c1c6f0f9e3547..80e6c99b32d2a 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?]