From 2f37da6768bb2653f05720d3eab22ffcb691c321 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
Date: Fri, 11 Oct 2019 17:34:19 +0200
Subject: [PATCH] dev-haskell: Remove *-fbsd KEYWORDS
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michał Górny <mgorny@gentoo.org>
---
 dev-haskell/ansi-terminal/ansi-terminal-0.5.5.ebuild            | 2 +-
 dev-haskell/ansi-terminal/ansi-terminal-0.6.2.1.ebuild          | 2 +-
 dev-haskell/ansi-terminal/ansi-terminal-0.6.2.3.ebuild          | 2 +-
 dev-haskell/ansi-wl-pprint/ansi-wl-pprint-0.6.7.1.ebuild        | 2 +-
 dev-haskell/ansi-wl-pprint/ansi-wl-pprint-0.6.7.3.ebuild        | 2 +-
 dev-haskell/binary/binary-0.5.1.1.ebuild                        | 2 +-
 dev-haskell/binary/binary-0.7.1.0.ebuild                        | 2 +-
 dev-haskell/binary/binary-0.7.2.3.ebuild                        | 2 +-
 dev-haskell/cabal/cabal-1.18.1.2.ebuild                         | 2 +-
 dev-haskell/cabal/cabal-1.18.1.3.ebuild                         | 2 +-
 dev-haskell/cabal/cabal-1.18.1.5.ebuild                         | 2 +-
 dev-haskell/cabal/cabal-1.20.0.2.ebuild                         | 2 +-
 dev-haskell/cabal/cabal-1.22.8.0.ebuild                         | 2 +-
 dev-haskell/dataenc/dataenc-0.14.0.5.ebuild                     | 2 +-
 dev-haskell/dataenc/dataenc-0.14.0.7.ebuild                     | 2 +-
 dev-haskell/digest/digest-0.0.1.2.ebuild                        | 2 +-
 .../extensible-exceptions/extensible-exceptions-0.1.1.4.ebuild  | 2 +-
 dev-haskell/fgl/fgl-5.4.2.4-r1.ebuild                           | 2 +-
 dev-haskell/fgl/fgl-5.4.2.4.ebuild                              | 2 +-
 dev-haskell/fgl/fgl-5.5.0.1.ebuild                              | 2 +-
 dev-haskell/ghc-paths/ghc-paths-0.1.0.9.ebuild                  | 2 +-
 dev-haskell/hashed-storage/hashed-storage-0.5.11.ebuild         | 2 +-
 dev-haskell/haskeline/haskeline-0.7.1.2.ebuild                  | 2 +-
 dev-haskell/haskeline/haskeline-0.7.1.3.ebuild                  | 2 +-
 dev-haskell/haskeline/haskeline-0.7.2.1.ebuild                  | 2 +-
 dev-haskell/haskeline/haskeline-0.7.2.3.ebuild                  | 2 +-
 dev-haskell/haskell-src/haskell-src-1.0.1.6.ebuild              | 2 +-
 dev-haskell/haskell-src/haskell-src-1.0.2.0.ebuild              | 2 +-
 dev-haskell/hostname/hostname-1.0.ebuild                        | 2 +-
 dev-haskell/hscolour/hscolour-1.19.ebuild                       | 2 +-
 dev-haskell/hscolour/hscolour-1.20.3-r1.ebuild                  | 2 +-
 dev-haskell/hscolour/hscolour-1.22.ebuild                       | 2 +-
 dev-haskell/hscolour/hscolour-1.23-r1.ebuild                    | 2 +-
 dev-haskell/hscolour/hscolour-1.24.ebuild                       | 2 +-
 dev-haskell/html/html-1.0.1.2-r1.ebuild                         | 2 +-
 dev-haskell/http/http-4000.2.17.ebuild                          | 2 +-
 dev-haskell/http/http-4000.2.8.ebuild                           | 2 +-
 dev-haskell/httpd-shed/httpd-shed-0.4-r1.ebuild                 | 2 +-
 dev-haskell/httpd-shed/httpd-shed-0.4.0.3.ebuild                | 2 +-
 dev-haskell/hunit/hunit-1.2.5.2-r1.ebuild                       | 2 +-
 dev-haskell/hunit/hunit-1.2.5.2.ebuild                          | 2 +-
 dev-haskell/libxml/libxml-0.1.1.ebuild                          | 2 +-
 dev-haskell/mmap/mmap-0.5.8.ebuild                              | 2 +-
 dev-haskell/mmap/mmap-0.5.9.ebuild                              | 2 +-
 dev-haskell/mtl/mtl-2.1.3.1.ebuild                              | 2 +-
 dev-haskell/mtl/mtl-2.2.1-r1.ebuild                             | 2 +-
 dev-haskell/mtl/mtl-2.2.1.ebuild                                | 2 +-
 dev-haskell/network-uri/network-uri-2.5.0.0.ebuild              | 2 +-
 dev-haskell/network-uri/network-uri-2.6.0.3.ebuild              | 2 +-
 dev-haskell/network-uri/network-uri-2.6.1.0.ebuild              | 2 +-
 dev-haskell/network/network-2.4.1.2.ebuild                      | 2 +-
 dev-haskell/network/network-2.4.2.2.ebuild                      | 2 +-
 dev-haskell/network/network-2.5.0.0.ebuild                      | 2 +-
 dev-haskell/network/network-2.6.2.1.ebuild                      | 2 +-
 dev-haskell/network/network-2.6.3.1-r1.ebuild                   | 2 +-
 dev-haskell/old-locale/old-locale-1.0.0.7.ebuild                | 2 +-
 dev-haskell/old-time/old-time-1.1.0.3-r1.ebuild                 | 2 +-
 dev-haskell/parsec/parsec-3.1.11.ebuild                         | 2 +-
 dev-haskell/parsec/parsec-3.1.5.ebuild                          | 2 +-
 dev-haskell/parsec/parsec-3.1.9-r1.ebuild                       | 2 +-
 dev-haskell/primitive/primitive-0.4.1.ebuild                    | 2 +-
 dev-haskell/primitive/primitive-0.5.0.1.ebuild                  | 2 +-
 dev-haskell/primitive/primitive-0.5.1.0.ebuild                  | 2 +-
 dev-haskell/primitive/primitive-0.5.4.0.ebuild                  | 2 +-
 dev-haskell/primitive/primitive-0.6.1.0-r1.ebuild               | 2 +-
 dev-haskell/quickcheck/quickcheck-2.6.ebuild                    | 2 +-
 dev-haskell/quickcheck/quickcheck-2.7.6.ebuild                  | 2 +-
 dev-haskell/quickcheck/quickcheck-2.8.1.ebuild                  | 2 +-
 dev-haskell/quickcheck/quickcheck-2.8.2.ebuild                  | 2 +-
 dev-haskell/quickcheck/quickcheck-2.9.2.ebuild                  | 2 +-
 dev-haskell/random/random-1.0.1.1-r1.ebuild                     | 2 +-
 dev-haskell/random/random-1.1.ebuild                            | 2 +-
 dev-haskell/regex-base/regex-base-0.93.2-r1.ebuild              | 2 +-
 dev-haskell/regex-compat/regex-compat-0.95.1-r1.ebuild          | 2 +-
 dev-haskell/regex-posix/regex-posix-0.95.2.ebuild               | 2 +-
 dev-haskell/split/split-0.1.4.3.ebuild                          | 2 +-
 dev-haskell/split/split-0.2.2.ebuild                            | 2 +-
 dev-haskell/split/split-0.2.3.1.ebuild                          | 2 +-
 dev-haskell/split/split-0.2.3.ebuild                            | 2 +-
 dev-haskell/syb/syb-0.3.7.ebuild                                | 2 +-
 dev-haskell/syb/syb-0.4.3.ebuild                                | 2 +-
 dev-haskell/syb/syb-0.4.4.ebuild                                | 2 +-
 dev-haskell/syb/syb-0.5.1.ebuild                                | 2 +-
 dev-haskell/tar/tar-0.4.0.1.ebuild                              | 2 +-
 dev-haskell/terminfo/terminfo-0.4.0.0.ebuild                    | 2 +-
 dev-haskell/terminfo/terminfo-0.4.0.1.ebuild                    | 2 +-
 dev-haskell/terminfo/terminfo-0.4.0.2.ebuild                    | 2 +-
 .../test-framework-hunit/test-framework-hunit-0.2.7.ebuild      | 2 +-
 .../test-framework-hunit/test-framework-hunit-0.3.0.2.ebuild    | 2 +-
 .../test-framework-hunit/test-framework-hunit-0.3.0.ebuild      | 2 +-
 .../test-framework-quickcheck2-0.3.0.2.ebuild                   | 2 +-
 .../test-framework-quickcheck2-0.3.0.3-r2.ebuild                | 2 +-
 dev-haskell/test-framework/test-framework-0.8.1.1.ebuild        | 2 +-
 dev-haskell/test-framework/test-framework-0.8.ebuild            | 2 +-
 dev-haskell/text/text-0.11.3.1.ebuild                           | 2 +-
 dev-haskell/text/text-1.1.1.3.ebuild                            | 2 +-
 dev-haskell/text/text-1.2.2.0.ebuild                            | 2 +-
 dev-haskell/text/text-1.2.2.1.ebuild                            | 2 +-
 dev-haskell/transformers/transformers-0.3.0.0-r1.ebuild         | 2 +-
 dev-haskell/transformers/transformers-0.4.1.0.ebuild            | 2 +-
 dev-haskell/transformers/transformers-0.4.2.0.ebuild            | 2 +-
 dev-haskell/transformers/transformers-0.4.3.0.ebuild            | 2 +-
 dev-haskell/transformers/transformers-0.5.2.0.ebuild            | 2 +-
 dev-haskell/utf8-string/utf8-string-0.3.8.ebuild                | 2 +-
 dev-haskell/utf8-string/utf8-string-1.0.1.1.ebuild              | 2 +-
 dev-haskell/vector/vector-0.10.12.3.ebuild                      | 2 +-
 dev-haskell/vector/vector-0.11.0.0.ebuild                       | 2 +-
 dev-haskell/xml/xml-1.3.13.ebuild                               | 2 +-
 dev-haskell/xml/xml-1.3.14.ebuild                               | 2 +-
 dev-haskell/zip-archive/zip-archive-0.1.3.4.ebuild              | 2 +-
 dev-haskell/zip-archive/zip-archive-0.2.3.7.ebuild              | 2 +-
 dev-haskell/zlib/zlib-0.5.4.1.ebuild                            | 2 +-
 dev-haskell/zlib/zlib-0.5.4.2.ebuild                            | 2 +-
 dev-haskell/zlib/zlib-0.6.1.1.ebuild                            | 2 +-
 114 files changed, 114 insertions(+), 114 deletions(-)

diff --git a/dev-haskell/ansi-terminal/ansi-terminal-0.5.5.ebuild b/dev-haskell/ansi-terminal/ansi-terminal-0.5.5.ebuild
index bb6f8ad12bce..7cc028d147b9 100644
--- a/dev-haskell/ansi-terminal/ansi-terminal-0.5.5.ebuild
+++ b/dev-haskell/ansi-terminal/ansi-terminal-0.5.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.8.2"
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 39b47f0b983f..d748da2bb883 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="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
 IUSE="example"
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/ansi-terminal/ansi-terminal-0.6.2.3.ebuild b/dev-haskell/ansi-terminal/ansi-terminal-0.6.2.3.ebuild
index 2532196f2048..e98d7af77504 100644
--- a/dev-haskell/ansi-terminal/ansi-terminal-0.6.2.3.ebuild
+++ b/dev-haskell/ansi-terminal/ansi-terminal-0.6.2.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~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 e42b98257c9d..cc4848a3300e 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="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc 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 378462f16834..0eb4843a430a 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="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="example"
 
 RDEPEND=">=dev-haskell/ansi-terminal-0.4.0:=[profile?] <dev-haskell/ansi-terminal-0.7:=[profile?]
diff --git a/dev-haskell/binary/binary-0.5.1.1.ebuild b/dev-haskell/binary/binary-0.5.1.1.ebuild
index bbefbb80beb1..e062aaf6129c 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="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc 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 a7f79eb6561c..8fbd3b006373 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="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc 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.2.3.ebuild b/dev-haskell/binary/binary-0.7.2.3.ebuild
index b6ca64a04cb2..915adc354c7d 100644
--- a/dev-haskell/binary/binary-0.7.2.3.ebuild
+++ b/dev-haskell/binary/binary-0.7.2.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/cabal/cabal-1.18.1.2.ebuild b/dev-haskell/cabal/cabal-1.18.1.2.ebuild
index 8307ff8adf4e..915891a23295 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="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc 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.3.ebuild b/dev-haskell/cabal/cabal-1.18.1.3.ebuild
index d8b10b3f2ad2..080b6c14b521 100644
--- a/dev-haskell/cabal/cabal-1.18.1.3.ebuild
+++ b/dev-haskell/cabal/cabal-1.18.1.3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~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 51e35e9f0a67..6af725f03e7c 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="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc 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.20.0.2.ebuild b/dev-haskell/cabal/cabal-1.20.0.2.ebuild
index d3af93e70694..f6afd30ca2ee 100644
--- a/dev-haskell/cabal/cabal-1.20.0.2.ebuild
+++ b/dev-haskell/cabal/cabal-1.20.0.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/cabal/cabal-1.22.8.0.ebuild b/dev-haskell/cabal/cabal-1.22.8.0.ebuild
index 1126e67f6751..bc6e0f597877 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="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RESTRICT=test
diff --git a/dev-haskell/dataenc/dataenc-0.14.0.5.ebuild b/dev-haskell/dataenc/dataenc-0.14.0.5.ebuild
index 3f4b52487da7..dfd0e345c56d 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="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.10.4:="
diff --git a/dev-haskell/dataenc/dataenc-0.14.0.7.ebuild b/dev-haskell/dataenc/dataenc-0.14.0.7.ebuild
index 6a61df78e57d..4f70084d35dd 100644
--- a/dev-haskell/dataenc/dataenc-0.14.0.7.ebuild
+++ b/dev-haskell/dataenc/dataenc-0.14.0.7.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x86-macos"
 IUSE="test"
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/digest/digest-0.0.1.2.ebuild b/dev-haskell/digest/digest-0.0.1.2.ebuild
index 174920a008ff..02ec9523a176 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="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.10.4:=
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 715637e6a7e9..d6e7a439a9b5 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="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc 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/fgl/fgl-5.4.2.4-r1.ebuild b/dev-haskell/fgl/fgl-5.4.2.4-r1.ebuild
index 3ce26a10de93..8d194c188b23 100644
--- a/dev-haskell/fgl/fgl-5.4.2.4-r1.ebuild
+++ b/dev-haskell/fgl/fgl-5.4.2.4-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/mtl:=[profile?]
diff --git a/dev-haskell/fgl/fgl-5.4.2.4.ebuild b/dev-haskell/fgl/fgl-5.4.2.4.ebuild
index bfbddd1cd1a7..07765b1ab43b 100644
--- a/dev-haskell/fgl/fgl-5.4.2.4.ebuild
+++ b/dev-haskell/fgl/fgl-5.4.2.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ia64 ~ppc ~ppc64 sparc x86"
 IUSE=""
 
 RDEPEND="dev-haskell/mtl[profile?]
diff --git a/dev-haskell/fgl/fgl-5.5.0.1.ebuild b/dev-haskell/fgl/fgl-5.5.0.1.ebuild
index b302c37489aa..396b5180297f 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="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND="dev-haskell/mtl:=[profile?]
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 f1330e2e1f62..0b58ab7851f7 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="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.8.2:="
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 101fab1e29d8..6b020276a208 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="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~ppc-macos ~x86-macos"
 IUSE="diff hpc test"
 
 RDEPEND="dev-haskell/binary:=[profile?]
diff --git a/dev-haskell/haskeline/haskeline-0.7.1.2.ebuild b/dev-haskell/haskeline/haskeline-0.7.1.2.ebuild
index 9dc9c7b07fd5..bc2362af1c19 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="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc 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 c5991f38bca9..8e7b8a516977 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="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc 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 fcf75a114844..63baebac4412 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="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc 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 8aa3dd9cc81d..bb9a33ba548d 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="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0/${PV}"
 # keep in sync with ghc-8.0.1
-KEYWORDS="amd64 x86 ~x86-fbsd ~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-src/haskell-src-1.0.1.6.ebuild b/dev-haskell/haskell-src/haskell-src-1.0.1.6.ebuild
index 82a8a71d72a1..bcb301414289 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="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc 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 dc22d217bb7b..304741775cc8 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="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND="dev-haskell/syb:=[profile?]
diff --git a/dev-haskell/hostname/hostname-1.0.ebuild b/dev-haskell/hostname/hostname-1.0.ebuild
index 4db16a3b21f3..74851baa9362 100644
--- a/dev-haskell/hostname/hostname-1.0.ebuild
+++ b/dev-haskell/hostname/hostname-1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.8.2"
diff --git a/dev-haskell/hscolour/hscolour-1.19.ebuild b/dev-haskell/hscolour/hscolour-1.19.ebuild
index 5af8f7dc228f..7a9b0599cf92 100644
--- a/dev-haskell/hscolour/hscolour-1.19.ebuild
+++ b/dev-haskell/hscolour/hscolour-1.19.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.6.1"
diff --git a/dev-haskell/hscolour/hscolour-1.20.3-r1.ebuild b/dev-haskell/hscolour/hscolour-1.20.3-r1.ebuild
index 5a5381e147a3..015676c85b03 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="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
 IUSE="doc"
 
 RDEPEND=">=dev-lang/ghc-6.10.4:="
diff --git a/dev-haskell/hscolour/hscolour-1.22.ebuild b/dev-haskell/hscolour/hscolour-1.22.ebuild
index 5afdddee51bf..1902dd0a33c8 100644
--- a/dev-haskell/hscolour/hscolour-1.22.ebuild
+++ b/dev-haskell/hscolour/hscolour-1.22.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~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 8964998e00c7..7214c7560b8e 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="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/hscolour/hscolour-1.24.ebuild b/dev-haskell/hscolour/hscolour-1.24.ebuild
index d1862033b496..20a33effe1f3 100644
--- a/dev-haskell/hscolour/hscolour-1.24.ebuild
+++ b/dev-haskell/hscolour/hscolour-1.24.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
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 99ba285f8a7c..3d5c334ab00b 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="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc 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/http-4000.2.17.ebuild b/dev-haskell/http/http-4000.2.17.ebuild
index 5ecee6b08830..6aee555e9218 100644
--- a/dev-haskell/http/http-4000.2.17.ebuild
+++ b/dev-haskell/http/http-4000.2.17.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x86-macos"
 IUSE=""
 RESTRICT=test # missing ia64 alpha keywords for dev-haskell/puremd5
 
diff --git a/dev-haskell/http/http-4000.2.8.ebuild b/dev-haskell/http/http-4000.2.8.ebuild
index e5cfa674ab79..6556a4cd732a 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="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~ppc-macos ~x86-macos"
 # hackport-args: --always-disabled='mtl1 network23 old-base warn-as-error'
 IUSE=""
 
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 fade9d6a627c..687a44edecbc 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="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc 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 29613f0789a1..b476735ae79d 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="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc 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-r1.ebuild b/dev-haskell/hunit/hunit-1.2.5.2-r1.ebuild
index 3dba99be2d27..495e53cc2872 100644
--- a/dev-haskell/hunit/hunit-1.2.5.2-r1.ebuild
+++ b/dev-haskell/hunit/hunit-1.2.5.2-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.10.4:="
diff --git a/dev-haskell/hunit/hunit-1.2.5.2.ebuild b/dev-haskell/hunit/hunit-1.2.5.2.ebuild
index 89cdffe72cdd..c9338d974e91 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="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.10.4:="
diff --git a/dev-haskell/libxml/libxml-0.1.1.ebuild b/dev-haskell/libxml/libxml-0.1.1.ebuild
index fba273ef96c5..7d9f99323c37 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="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND="dev-haskell/mtl:=[profile?]
diff --git a/dev-haskell/mmap/mmap-0.5.8.ebuild b/dev-haskell/mmap/mmap-0.5.8.ebuild
index d3fd5291728d..6d94b8e2b0b3 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="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc 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 5198186b1ac0..3e151eee47e0 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="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 # IUSE="test"
 IUSE=""
 
diff --git a/dev-haskell/mtl/mtl-2.1.3.1.ebuild b/dev-haskell/mtl/mtl-2.1.3.1.ebuild
index ae20efd812c0..5dd8e227f334 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="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc 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 30214e3fa1dc..b94061752817 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="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=dev-haskell/transformers-0.4:=[profile?]
diff --git a/dev-haskell/mtl/mtl-2.2.1.ebuild b/dev-haskell/mtl/mtl-2.2.1.ebuild
index 7c5552bdafc5..ba0f1eed6ca6 100644
--- a/dev-haskell/mtl/mtl-2.2.1.ebuild
+++ b/dev-haskell/mtl/mtl-2.2.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=dev-haskell/transformers-0.4:=[profile?] <dev-haskell/transformers-0.5:=[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 c8e3442c21f1..2acdc4ee8d47 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="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc 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 62effe9c4a61..0446e7dd61f2 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="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc 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-uri/network-uri-2.6.1.0.ebuild b/dev-haskell/network-uri/network-uri-2.6.1.0.ebuild
index 880801091572..b62e6d44ebec 100644
--- a/dev-haskell/network-uri/network-uri-2.6.1.0.ebuild
+++ b/dev-haskell/network-uri/network-uri-2.6.1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~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 9c15948573b7..7575e8b5c919 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="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc 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.4.2.2.ebuild b/dev-haskell/network/network-2.4.2.2.ebuild
index 25698bd9b44c..98ce6f9cd989 100644
--- a/dev-haskell/network/network-2.4.2.2.ebuild
+++ b/dev-haskell/network/network-2.4.2.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~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.5.0.0.ebuild b/dev-haskell/network/network-2.5.0.0.ebuild
index de91b6b7b949..8d08f9f358a4 100644
--- a/dev-haskell/network/network-2.5.0.0.ebuild
+++ b/dev-haskell/network/network-2.5.0.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~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 cbc2837f057a..be425943d9b2 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="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/network/network-2.6.3.1-r1.ebuild b/dev-haskell/network/network-2.6.3.1-r1.ebuild
index f0d3ee377b79..ae9d86970bcf 100644
--- a/dev-haskell/network/network-2.6.3.1-r1.ebuild
+++ b/dev-haskell/network/network-2.6.3.1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RESTRICT=test # missing regression test file
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 ca81a37488cd..e74927026353 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="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc 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 7f5c9e70dfdf..81773e83d344 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="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc 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/parsec/parsec-3.1.11.ebuild b/dev-haskell/parsec/parsec-3.1.11.ebuild
index 15e3e257c090..186096d0b643 100644
--- a/dev-haskell/parsec/parsec-3.1.11.ebuild
+++ b/dev-haskell/parsec/parsec-3.1.11.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~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.5.ebuild b/dev-haskell/parsec/parsec-3.1.5.ebuild
index f4c6885fe03d..d317d11c79b6 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="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc 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 acf69c92f51e..08d68e507d2e 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="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="dev-haskell/mtl:=[profile?]
diff --git a/dev-haskell/primitive/primitive-0.4.1.ebuild b/dev-haskell/primitive/primitive-0.4.1.ebuild
index 90412bfcd3bf..cdceec34b8b1 100644
--- a/dev-haskell/primitive/primitive-0.4.1.ebuild
+++ b/dev-haskell/primitive/primitive-0.4.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.10.1"
diff --git a/dev-haskell/primitive/primitive-0.5.0.1.ebuild b/dev-haskell/primitive/primitive-0.5.0.1.ebuild
index 4bb1f41766bd..33434c165ee1 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="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc 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 21eadcde2bda..881eaad3cf67 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="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.10.4:=
diff --git a/dev-haskell/primitive/primitive-0.5.4.0.ebuild b/dev-haskell/primitive/primitive-0.5.4.0.ebuild
index 8498a03cad02..4eee8e0ed71c 100644
--- a/dev-haskell/primitive/primitive-0.5.4.0.ebuild
+++ b/dev-haskell/primitive/primitive-0.5.4.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/primitive/primitive-0.6.1.0-r1.ebuild b/dev-haskell/primitive/primitive-0.6.1.0-r1.ebuild
index df932979b54f..eb41ccc7b540 100644
--- a/dev-haskell/primitive/primitive-0.6.1.0-r1.ebuild
+++ b/dev-haskell/primitive/primitive-0.6.1.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=dev-haskell/transformers-0.2:=[profile?]
diff --git a/dev-haskell/quickcheck/quickcheck-2.6.ebuild b/dev-haskell/quickcheck/quickcheck-2.6.ebuild
index c83c7d97c400..3d43664927fa 100644
--- a/dev-haskell/quickcheck/quickcheck-2.6.ebuild
+++ b/dev-haskell/quickcheck/quickcheck-2.6.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="2/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~amd64-linux"
 IUSE="+template-haskell"
 
 RDEPEND="dev-haskell/extensible-exceptions:=[profile?]
diff --git a/dev-haskell/quickcheck/quickcheck-2.7.6.ebuild b/dev-haskell/quickcheck/quickcheck-2.7.6.ebuild
index a15e1fbef4cb..b9948c6f5c46 100644
--- a/dev-haskell/quickcheck/quickcheck-2.7.6.ebuild
+++ b/dev-haskell/quickcheck/quickcheck-2.7.6.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="2/${PV}"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
 IUSE="+template-haskell"
 
 RDEPEND="dev-haskell/random:=[profile?]
diff --git a/dev-haskell/quickcheck/quickcheck-2.8.1.ebuild b/dev-haskell/quickcheck/quickcheck-2.8.1.ebuild
index 8a9db261e6aa..3dc8881d5cd9 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="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="2/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc 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 6c00030de7f8..11b2fd9517ca 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="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="2/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc 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 db4778bb98b3..d55efeea0daf 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="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="2/${PV}"
-KEYWORDS="amd64 x86 ~x86-fbsd ~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 208b2342f8a4..d96ff1b1056c 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="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc 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/random/random-1.1.ebuild b/dev-haskell/random/random-1.1.ebuild
index 5a4c498f2ca0..366e8c4f240f 100644
--- a/dev-haskell/random/random-1.1.ebuild
+++ b/dev-haskell/random/random-1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
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 b6f962d85120..44fecfb92b05 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="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="dev-haskell/mtl:=[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 f9a70e7a24ee..c5314e5bb01c 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="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc 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-posix/regex-posix-0.95.2.ebuild b/dev-haskell/regex-posix/regex-posix-0.95.2.ebuild
index 5b6881c88ed0..b9a761371d96 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="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc 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/split/split-0.1.4.3.ebuild b/dev-haskell/split/split-0.1.4.3.ebuild
index 5d8aa1ed97cd..f75f615e3ab1 100644
--- a/dev-haskell/split/split-0.1.4.3.ebuild
+++ b/dev-haskell/split/split-0.1.4.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~ppc-macos ~x86-macos"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.8.2"
diff --git a/dev-haskell/split/split-0.2.2.ebuild b/dev-haskell/split/split-0.2.2.ebuild
index 27537c984d1d..f394a1a83bed 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="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~ppc-macos ~x86-macos"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.10.4:="
diff --git a/dev-haskell/split/split-0.2.3.1.ebuild b/dev-haskell/split/split-0.2.3.1.ebuild
index 0b96f0c58478..9fb6f0f3e559 100644
--- a/dev-haskell/split/split-0.2.3.1.ebuild
+++ b/dev-haskell/split/split-0.2.3.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x86-macos"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/split/split-0.2.3.ebuild b/dev-haskell/split/split-0.2.3.ebuild
index 56aab6e6a1b1..b694c018197f 100644
--- a/dev-haskell/split/split-0.2.3.ebuild
+++ b/dev-haskell/split/split-0.2.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x86-macos"
 IUSE=""
 
 RESTRICT=test # test fail when quickcheck exhausted search space
diff --git a/dev-haskell/syb/syb-0.3.7.ebuild b/dev-haskell/syb/syb-0.3.7.ebuild
index 9a3a065b66ca..4f3898c9b3a6 100644
--- a/dev-haskell/syb/syb-0.3.7.ebuild
+++ b/dev-haskell/syb/syb-0.3.7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.10.1"
diff --git a/dev-haskell/syb/syb-0.4.3.ebuild b/dev-haskell/syb/syb-0.4.3.ebuild
index de97eb71252a..fbb90fbecc2b 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="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc 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 b72fbd21db5d..4dd7bef99909 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="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux"
 IUSE=""
 
 RESTRICT=test # ghc-7.10 slightly changed namespacing
diff --git a/dev-haskell/syb/syb-0.5.1.ebuild b/dev-haskell/syb/syb-0.5.1.ebuild
index c9c285003a06..69e785ef7552 100644
--- a/dev-haskell/syb/syb-0.5.1.ebuild
+++ b/dev-haskell/syb/syb-0.5.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
 IUSE=""
 
 RESTRICT=test # ghc-7.10 slightly changed namespacing
diff --git a/dev-haskell/tar/tar-0.4.0.1.ebuild b/dev-haskell/tar/tar-0.4.0.1.ebuild
index fa4e3ed7a9df..4ac4d216f1d8 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="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-macos"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-macos"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.10.4:="
diff --git a/dev-haskell/terminfo/terminfo-0.4.0.0.ebuild b/dev-haskell/terminfo/terminfo-0.4.0.0.ebuild
index 031b163f9df5..af40bd7454d6 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="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc 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 2c82db898a89..fa7d2f93e2e5 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="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc 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 0da700147cba..db2eb665a146 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="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc 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.2.7.ebuild b/dev-haskell/test-framework-hunit/test-framework-hunit-0.2.7.ebuild
index bf5b78a0a239..82402472b475 100644
--- a/dev-haskell/test-framework-hunit/test-framework-hunit-0.2.7.ebuild
+++ b/dev-haskell/test-framework-hunit/test-framework-hunit-0.2.7.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 HASKELLDEPS=">=dev-haskell/hunit-1.2[profile?]
diff --git a/dev-haskell/test-framework-hunit/test-framework-hunit-0.3.0.2.ebuild b/dev-haskell/test-framework-hunit/test-framework-hunit-0.3.0.2.ebuild
index 9c24a1e0dd3a..1bf777fd0915 100644
--- a/dev-haskell/test-framework-hunit/test-framework-hunit-0.3.0.2.ebuild
+++ b/dev-haskell/test-framework-hunit/test-framework-hunit-0.3.0.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~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-hunit/test-framework-hunit-0.3.0.ebuild b/dev-haskell/test-framework-hunit/test-framework-hunit-0.3.0.ebuild
index ae98e3c0b076..5059d6b5822c 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="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc 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 b49088d43f0c..aa3549c2cb92 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="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc 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 e3b0f8e6f126..28d168f0a0bf 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="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc 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/test-framework-0.8.1.1.ebuild b/dev-haskell/test-framework/test-framework-0.8.1.1.ebuild
index 039cabca33f7..e137d81db243 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="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc 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 9615d54a6c6a..554b68a97c86 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="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/ansi-terminal-0.4.0:=[profile?]
diff --git a/dev-haskell/text/text-0.11.3.1.ebuild b/dev-haskell/text/text-0.11.3.1.ebuild
index 7ff2ab68a5e4..a34081a33d97 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="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc 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 5aa1c86f2f19..df842d03827e 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="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc 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.0.ebuild b/dev-haskell/text/text-1.2.2.0.ebuild
index 676fcecd71a6..940067238b55 100644
--- a/dev-haskell/text/text-1.2.2.0.ebuild
+++ b/dev-haskell/text/text-1.2.2.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RESTRICT=test # break cyclic dependencies
diff --git a/dev-haskell/text/text-1.2.2.1.ebuild b/dev-haskell/text/text-1.2.2.1.ebuild
index 5cb8a0849ae1..58ba76de5a4a 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="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RESTRICT=test # break cyclic dependencies
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 bbab28fc16a8..1deaa5b9e181 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="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc 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.1.0.ebuild b/dev-haskell/transformers/transformers-0.4.1.0.ebuild
index dd73f8f9c88c..c25ab40760d7 100644
--- a/dev-haskell/transformers/transformers-0.4.1.0.ebuild
+++ b/dev-haskell/transformers/transformers-0.4.1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.10.4:=
diff --git a/dev-haskell/transformers/transformers-0.4.2.0.ebuild b/dev-haskell/transformers/transformers-0.4.2.0.ebuild
index 18d2b9743dfb..9c59fdb102f2 100644
--- a/dev-haskell/transformers/transformers-0.4.2.0.ebuild
+++ b/dev-haskell/transformers/transformers-0.4.2.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~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.4.3.0.ebuild b/dev-haskell/transformers/transformers-0.4.3.0.ebuild
index c9f530e1d7f1..ec9d63277b6d 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="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc 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 c3ca26298211..c09b17de4cc4 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="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0/${PV}"
 #keep in sync with ghc-8.0.2_rc2
-KEYWORDS="~alpha amd64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
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 127cba44d0c7..20bfee5e4024 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="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/utf8-string/utf8-string-1.0.1.1.ebuild b/dev-haskell/utf8-string/utf8-string-1.0.1.1.ebuild
index 6cd91dd78365..3739bf2e51a6 100644
--- a/dev-haskell/utf8-string/utf8-string-1.0.1.1.ebuild
+++ b/dev-haskell/utf8-string/utf8-string-1.0.1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/vector/vector-0.10.12.3.ebuild b/dev-haskell/vector/vector-0.10.12.3.ebuild
index 056efaa250b0..5fe9081880f9 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="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc 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 efdc86104afb..e31af9d8e223 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="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc 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/xml/xml-1.3.13.ebuild b/dev-haskell/xml/xml-1.3.13.ebuild
index d8bad485f520..48f9ed82144f 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="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND="dev-haskell/text:=[profile?]
diff --git a/dev-haskell/xml/xml-1.3.14.ebuild b/dev-haskell/xml/xml-1.3.14.ebuild
index 507a4f87a00e..6a1dd34b9886 100644
--- a/dev-haskell/xml/xml-1.3.14.ebuild
+++ b/dev-haskell/xml/xml-1.3.14.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/text:=[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 eb02969ae28c..48fd05719b61 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="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc 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 20568c27d17b..395d2c9b9bcf 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="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="executable"
 
 RDEPEND=">=dev-haskell/binary-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 d90af2e4805a..a90838ed0388 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="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc 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 9ba0e7d79637..553ddaf04696 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="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~ppc-macos ~x86-macos"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/zlib/zlib-0.6.1.1.ebuild b/dev-haskell/zlib/zlib-0.6.1.1.ebuild
index ffac01f1ec30..7898e8afa53f 100644
--- a/dev-haskell/zlib/zlib-0.6.1.1.ebuild
+++ b/dev-haskell/zlib/zlib-0.6.1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~x86 ~ppc-macos ~x86-macos"
 IUSE=""
 
 RESTRICT=test # needs porting to new test tools
-- 
2.26.2