gentoo resync : 13.10.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-10-13 22:19:36 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-10-14 23:22:23 +0100
commit: 4b19be30aa626b327c885dae62c559ec0e9fb935 (patch)
tree: 76e74807bc479502e13866b581b6bf86734ec634 /metadata/md5-cache/dev-haskell
parent: 30d6f67c98d149508509d5e86f176d558793acc0 (diff)
158 files changed, 278 insertions, 579 deletions
diff --git a/metadata/md5-cache/dev-haskell/Manifest.gz b/metadata/md5-cache/dev-haskell/Manifest.gz
index 1aa7dd355d14..3a4cb3b4c09d 100644
--- a/metadata/md5-cache/dev-haskell/Manifest.gz
+++ b/metadata/md5-cache/dev-haskell/Manifest.gz
diff --git a/metadata/md5-cache/dev-haskell/alut-2.1.0.0 b/metadata/md5-cache/dev-haskell/alut-2.1.0.0
deleted file mode 100644
index e52383d8c706..000000000000
--- a/metadata/md5-cache/dev-haskell/alut-2.1.0.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm setup test
-DEPEND=>=dev-lang/ghc-6.4 >=dev-haskell/opengl-2.2.1 >=dev-haskell/openal-1.3.1 media-libs/freealut doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) )
-DESCRIPTION=A Haskell binding for the OpenAL Utility Toolkit
-EAPI=0
-HOMEPAGE=http://haskell.org/ghc/
-IUSE=doc profile
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=>=dev-lang/ghc-6.4 >=dev-haskell/opengl-2.2.1 >=dev-haskell/openal-1.3.1 media-libs/freealut
-SLOT=0
-SRC_URI=mirror://hackage/packages/archive/ALUT/2.1.0.0/ALUT-2.1.0.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0a31462df421820e587a7f3eeab2d532
diff --git a/metadata/md5-cache/dev-haskell/alut-2.2.0.0 b/metadata/md5-cache/dev-haskell/alut-2.2.0.0
deleted file mode 100644
index 3cb52816e379..000000000000
--- a/metadata/md5-cache/dev-haskell/alut-2.2.0.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/openal[profile?] dev-haskell/statevar[profile?] >=dev-lang/ghc-6.8.2 media-libs/freealut dev-haskell/cabal doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=A binding for the OpenAL Utility Toolkit
-EAPI=4
-HOMEPAGE=http://connect.creativelabs.com/openal/
-IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-haskell/openal[profile?] dev-haskell/statevar[profile?] >=dev-lang/ghc-6.8.2 media-libs/freealut
-SLOT=0
-SRC_URI=mirror://hackage/packages/archive/ALUT/2.2.0.0/ALUT-2.2.0.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5418c29e457f6e68f31a507546c365c8
diff --git a/metadata/md5-cache/dev-haskell/alut-2.3.0.1 b/metadata/md5-cache/dev-haskell/alut-2.3.0.1
deleted file mode 100644
index 49b24b783e05..000000000000
--- a/metadata/md5-cache/dev-haskell/alut-2.3.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/openal-1.6.0.0:=[profile?] >=dev-haskell/opengl-2.9.0.0:=[profile?] >=dev-lang/ghc-6.10.4:= media-libs/freealut >=dev-haskell/cabal-1.6.0.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=A binding for the OpenAL Utility Toolkit
-EAPI=5
-HOMEPAGE=https://github.com/haskell-openal/ALUT
-IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-haskell/openal-1.6.0.0:=[profile?] >=dev-haskell/opengl-2.9.0.0:=[profile?] >=dev-lang/ghc-6.10.4:= media-libs/freealut
-SLOT=0/2.3.0.1
-SRC_URI=mirror://hackage/packages/archive/ALUT/2.3.0.1/ALUT-2.3.0.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5604011db2477663643b5a1fae06e26d
diff --git a/metadata/md5-cache/dev-haskell/ansi-terminal-0.5.5 b/metadata/md5-cache/dev-haskell/ansi-terminal-0.5.5
index 1eca4348e95a..4ebbafcb974b 100644
--- a/metadata/md5-cache/dev-haskell/ansi-terminal-0.5.5
+++ b/metadata/md5-cache/dev-haskell/ansi-terminal-0.5.5
@@ -4,10 +4,10 @@ DESCRIPTION=Simple ANSI terminal support, with Windows compatibility
 EAPI=4
 HOMEPAGE=https://batterseapower.github.com/ansi-terminal
 IUSE=doc hscolour profile
-KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.8.2
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/ansi-terminal/0.5.5/ansi-terminal-0.5.5.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a6c4862f6bfa98afa5fc88f1d9841445
+_md5_=c3885737363b5eaa6340141aec3e3d30
diff --git a/metadata/md5-cache/dev-haskell/ansi-terminal-0.6.2.1 b/metadata/md5-cache/dev-haskell/ansi-terminal-0.6.2.1
index 4ea2a6cbcf40..50325d8bd31e 100644
--- a/metadata/md5-cache/dev-haskell/ansi-terminal-0.6.2.1
+++ b/metadata/md5-cache/dev-haskell/ansi-terminal-0.6.2.1
@@ -4,10 +4,10 @@ DESCRIPTION=Simple ANSI terminal support, with Windows compatibility
 EAPI=5
 HOMEPAGE=https://github.com/feuerbach/ansi-terminal
 IUSE=example doc hscolour profile
-KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.6.2.1
 SRC_URI=mirror://hackage/packages/archive/ansi-terminal/0.6.2.1/ansi-terminal-0.6.2.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=dad2072eacd64b8672ad6e9c62593d7d
+_md5_=c7ea6b2bab4b5e3fc5d145b5d543470b
diff --git a/metadata/md5-cache/dev-haskell/ansi-terminal-0.6.2.3 b/metadata/md5-cache/dev-haskell/ansi-terminal-0.6.2.3
index bbb219ac617b..16359ed09c79 100644
--- a/metadata/md5-cache/dev-haskell/ansi-terminal-0.6.2.3
+++ b/metadata/md5-cache/dev-haskell/ansi-terminal-0.6.2.3
@@ -4,10 +4,10 @@ DESCRIPTION=Simple ANSI terminal support, with Windows compatibility
 EAPI=5
 HOMEPAGE=https://github.com/feuerbach/ansi-terminal
 IUSE=example doc hscolour profile
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.6.2.3
 SRC_URI=mirror://hackage/packages/archive/ansi-terminal/0.6.2.3/ansi-terminal-0.6.2.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2cbc1344cf77800a5ccf7b93f9858f1d
+_md5_=f70b46ea42dbe6a34f626c3bafb52d7c
diff --git a/metadata/md5-cache/dev-haskell/ansi-wl-pprint-0.6.7.1 b/metadata/md5-cache/dev-haskell/ansi-wl-pprint-0.6.7.1
index d5e46d8e9c39..502aea3350a1 100644
--- a/metadata/md5-cache/dev-haskell/ansi-wl-pprint-0.6.7.1
+++ b/metadata/md5-cache/dev-haskell/ansi-wl-pprint-0.6.7.1
@@ -4,10 +4,10 @@ DESCRIPTION=The Wadler/Leijen Pretty Printer for colored ANSI terminal output
 EAPI=5
 HOMEPAGE=https://github.com/batterseapower/ansi-wl-pprint
 IUSE=example doc hscolour profile
-KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/ansi-terminal-0.4.0:=[profile?] <dev-haskell/ansi-terminal-0.7:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.6.7.1
 SRC_URI=mirror://hackage/packages/archive/ansi-wl-pprint/0.6.7.1/ansi-wl-pprint-0.6.7.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8f7c54d81bc2b1cdb5a17ef785a9bdd6
+_md5_=4061f2585aee0123c64de971d7f6d4d2
diff --git a/metadata/md5-cache/dev-haskell/ansi-wl-pprint-0.6.7.3 b/metadata/md5-cache/dev-haskell/ansi-wl-pprint-0.6.7.3
index e2cc33a45eee..f92bcfd98f4d 100644
--- a/metadata/md5-cache/dev-haskell/ansi-wl-pprint-0.6.7.3
+++ b/metadata/md5-cache/dev-haskell/ansi-wl-pprint-0.6.7.3
@@ -4,10 +4,10 @@ DESCRIPTION=The Wadler/Leijen Pretty Printer for colored ANSI terminal output
 EAPI=5
 HOMEPAGE=https://github.com/ekmett/ansi-wl-pprint
 IUSE=example doc hscolour profile
-KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/ansi-terminal-0.4.0:=[profile?] <dev-haskell/ansi-terminal-0.7:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.6.7.3
 SRC_URI=mirror://hackage/packages/archive/ansi-wl-pprint/0.6.7.3/ansi-wl-pprint-0.6.7.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=64aba6ef441fd123c8242b24274f66bb
+_md5_=e27e1fb08bb4cf069edaaf80a9f7294d
diff --git a/metadata/md5-cache/dev-haskell/arrows-0.4.4.1-r1 b/metadata/md5-cache/dev-haskell/arrows-0.4.4.1-r1
index 97c3b0defb6d..d9c08459c315 100644
--- a/metadata/md5-cache/dev-haskell/arrows-0.4.4.1-r1
+++ b/metadata/md5-cache/dev-haskell/arrows-0.4.4.1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Arrow classes and transformers
 EAPI=5
 HOMEPAGE=http://www.haskell.org/arrows/
 IUSE=doc hscolour profile
-KEYWORDS=alpha amd64 ia64 ppc ~ppc64 sparc x86
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=BSD
 RDEPEND=dev-haskell/stream:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.4.4.1
 SRC_URI=mirror://hackage/packages/archive/arrows/0.4.4.1/arrows-0.4.4.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=180da6293baaa22400bdb99f3167db52
+_md5_=72969fc8ec7d396eb139c4fc2852a50b
diff --git a/metadata/md5-cache/dev-haskell/binary-0.5.1.1 b/metadata/md5-cache/dev-haskell/binary-0.5.1.1
index c3819fa4752f..f36262f847ac 100644
--- a/metadata/md5-cache/dev-haskell/binary-0.5.1.1
+++ b/metadata/md5-cache/dev-haskell/binary-0.5.1.1
@@ -4,10 +4,10 @@ DESCRIPTION=Binary serialisation for Haskell values using lazy ByteStrings
 EAPI=5
 HOMEPAGE=http://code.haskell.org/binary/
 IUSE=doc hscolour profile
-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
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/0.5.1.1
 SRC_URI=mirror://hackage/packages/archive/binary/0.5.1.1/binary-0.5.1.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0815c275a314e20f92b4c33169b77e42
+_md5_=0caaa4975b5c2c2f526501c6d885e268
diff --git a/metadata/md5-cache/dev-haskell/binary-0.7.1.0 b/metadata/md5-cache/dev-haskell/binary-0.7.1.0
index 181ada4a8ae6..003ede7536b0 100644
--- a/metadata/md5-cache/dev-haskell/binary-0.7.1.0
+++ b/metadata/md5-cache/dev-haskell/binary-0.7.1.0
@@ -4,10 +4,10 @@ DESCRIPTION=Binary serialisation for Haskell values using lazy ByteStrings
 EAPI=5
 HOMEPAGE=https://github.com/kolmodin/binary
 IUSE=doc hscolour profile test
-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
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/0.7.1.0
 SRC_URI=mirror://hackage/packages/archive/binary/0.7.1.0/binary-0.7.1.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=852dfcbf1f94957d658471e99dee49ed
+_md5_=750ecf1ab40a238283ac983b85f1d8b6
diff --git a/metadata/md5-cache/dev-haskell/binary-0.7.2.3 b/metadata/md5-cache/dev-haskell/binary-0.7.2.3
index e456a67a33b7..4e2278325e6a 100644
--- a/metadata/md5-cache/dev-haskell/binary-0.7.2.3
+++ b/metadata/md5-cache/dev-haskell/binary-0.7.2.3
@@ -4,10 +4,10 @@ DESCRIPTION=Binary serialisation for Haskell values using lazy ByteStrings
 EAPI=5
 HOMEPAGE=https://github.com/kolmodin/binary
 IUSE=doc hscolour profile test
-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
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.7.2.3
 SRC_URI=mirror://hackage/packages/archive/binary/0.7.2.3/binary-0.7.2.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5aadf1b5a1cdd8ae2a2a2167ce95c016
+_md5_=96ff8f9122211cfe7218abb2cb1d5ab5
diff --git a/metadata/md5-cache/dev-haskell/cabal-1.18.1.2 b/metadata/md5-cache/dev-haskell/cabal-1.18.1.2
index 14984bcad273..b19602306a70 100644
--- a/metadata/md5-cache/dev-haskell/cabal-1.18.1.2
+++ b/metadata/md5-cache/dev-haskell/cabal-1.18.1.2
@@ -4,10 +4,10 @@ DESCRIPTION=A framework for packaging Haskell software
 EAPI=5
 HOMEPAGE=http://www.haskell.org/cabal/
 IUSE=profile test
-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
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.12.1:=
 SLOT=0/1.18.1.2
 SRC_URI=mirror://hackage/packages/archive/Cabal/1.18.1.2/Cabal-1.18.1.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=856a52d197aa59dd7c5737fb93f3aa64
+_md5_=0aea95c75602506cb9dd968f8b133f2a
diff --git a/metadata/md5-cache/dev-haskell/cabal-1.18.1.3 b/metadata/md5-cache/dev-haskell/cabal-1.18.1.3
index 54da09c7bb75..54d5d79ab5e0 100644
--- a/metadata/md5-cache/dev-haskell/cabal-1.18.1.3
+++ b/metadata/md5-cache/dev-haskell/cabal-1.18.1.3
@@ -4,10 +4,10 @@ DESCRIPTION=A framework for packaging Haskell software
 EAPI=5
 HOMEPAGE=http://www.haskell.org/cabal/
 IUSE=profile test
-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
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.12.1:=
 SLOT=0/1.18.1.3
 SRC_URI=mirror://hackage/packages/archive/Cabal/1.18.1.3/Cabal-1.18.1.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b6cd084987f78c1a6f44bdc2ad53efe4
+_md5_=6086f33dc7666ffdb5fb217d76039a46
diff --git a/metadata/md5-cache/dev-haskell/cabal-1.18.1.5 b/metadata/md5-cache/dev-haskell/cabal-1.18.1.5
index 292ba27f1ad8..b54c683917c4 100644
--- a/metadata/md5-cache/dev-haskell/cabal-1.18.1.5
+++ b/metadata/md5-cache/dev-haskell/cabal-1.18.1.5
@@ -4,11 +4,11 @@ DESCRIPTION=A framework for packaging Haskell software
 EAPI=5
 HOMEPAGE=http://www.haskell.org/cabal/
 IUSE=profile test
-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
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.12.1:=
 RESTRICT=test
 SLOT=0/1.18.1.5
 SRC_URI=mirror://hackage/packages/archive/Cabal/1.18.1.5/Cabal-1.18.1.5.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=dbbbc9afc2022ef1953cb85889cfe01a
+_md5_=d890e12b13cd7b295d1bcf19a46e7139
diff --git a/metadata/md5-cache/dev-haskell/cabal-1.20.0.2 b/metadata/md5-cache/dev-haskell/cabal-1.20.0.2
index b936b5797d12..c5d53d294e4d 100644
--- a/metadata/md5-cache/dev-haskell/cabal-1.20.0.2
+++ b/metadata/md5-cache/dev-haskell/cabal-1.20.0.2
@@ -4,10 +4,10 @@ DESCRIPTION=A framework for packaging Haskell software
 EAPI=5
 HOMEPAGE=http://www.haskell.org/cabal/
 IUSE=profile test
-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
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/1.20.0.2
 SRC_URI=mirror://hackage/packages/archive/Cabal/1.20.0.2/Cabal-1.20.0.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c65b417ae060f2544a0c7098f8dd3119
+_md5_=9453c5489f37a464d9e92a0a1964b882
diff --git a/metadata/md5-cache/dev-haskell/cabal-1.22.8.0 b/metadata/md5-cache/dev-haskell/cabal-1.22.8.0
index e14d6800daa9..e7b0b93741ab 100644
--- a/metadata/md5-cache/dev-haskell/cabal-1.22.8.0
+++ b/metadata/md5-cache/dev-haskell/cabal-1.22.8.0
@@ -4,11 +4,11 @@ DESCRIPTION=A framework for packaging Haskell software
 EAPI=5
 HOMEPAGE=http://www.haskell.org/cabal/
 IUSE=profile test
-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
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.8.1:=
 RESTRICT=test
 SLOT=0/1.22.8.0
 SRC_URI=mirror://hackage/packages/archive/Cabal/1.22.8.0/Cabal-1.22.8.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e6b6283ada90aef133eeaf1ea20ca4a8
+_md5_=3725b6986c2867660d9d7d87b4eb9a96
diff --git a/metadata/md5-cache/dev-haskell/citeproc-hs-0.3.10 b/metadata/md5-cache/dev-haskell/citeproc-hs-0.3.10
deleted file mode 100644
index 27a2bf686145..000000000000
--- a/metadata/md5-cache/dev-haskell/citeproc-hs-0.3.10
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=dev-haskell/json:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/pandoc-types-1.8:=[profile?] <dev-haskell/pandoc-types-1.13:=[profile?] dev-haskell/parsec:=[profile?] dev-haskell/syb:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-7.4.1:= bibutils? ( >=dev-haskell/hs-bibutils-0.3:=[profile?] ) embed_data_files? ( dev-haskell/file-embed:=[profile?] ) hexpat? ( >=dev-haskell/hexpat-0.20.2:=[profile?] ) !hexpat? ( dev-haskell/xml:=[profile?] ) network? ( >=dev-haskell/http-4000.0.9:=[profile?] >=dev-haskell/network-2.6:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] ) unicode_collation? ( dev-haskell/text:=[profile?] dev-haskell/text-icu:=[profile?] ) >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=A Citation Style Language implementation in Haskell
-EAPI=5
-HOMEPAGE=http://istitutocolli.org/repos/citeproc-hs/
-IUSE=+bibutils embed_data_files +hexpat +network +small_base unicode_collation doc hscolour profile
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-haskell/json:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/pandoc-types-1.8:=[profile?] <dev-haskell/pandoc-types-1.13:=[profile?] dev-haskell/parsec:=[profile?] dev-haskell/syb:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-7.4.1:= bibutils? ( >=dev-haskell/hs-bibutils-0.3:=[profile?] ) embed_data_files? ( dev-haskell/file-embed:=[profile?] ) hexpat? ( >=dev-haskell/hexpat-0.20.2:=[profile?] ) !hexpat? ( dev-haskell/xml:=[profile?] ) network? ( >=dev-haskell/http-4000.0.9:=[profile?] >=dev-haskell/network-2.6:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] ) unicode_collation? ( dev-haskell/text:=[profile?] dev-haskell/text-icu:=[profile?] )
-SLOT=0/0.3.10
-SRC_URI=mirror://hackage/packages/archive/citeproc-hs/0.3.10/citeproc-hs-0.3.10.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=de1944268ad3a345f4dea9f5f717879d
diff --git a/metadata/md5-cache/dev-haskell/citeproc-hs-0.3.10-r1 b/metadata/md5-cache/dev-haskell/citeproc-hs-0.3.10-r1
index 94bf2bf77a99..b60adacb4747 100644
--- a/metadata/md5-cache/dev-haskell/citeproc-hs-0.3.10-r1
+++ b/metadata/md5-cache/dev-haskell/citeproc-hs-0.3.10-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-haskell/json:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/pandoc-types-1.8:=[profile?] dev-haskell/parsec:=[profile?] dev-haskell/syb:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-7.4.1:= bibutils? ( >=dev-haskell/hs-bibutils-0.3:=[profile?] ) embed_data_files? ( dev-haskell/file-embed:=[profile?] ) hexpat? ( >=dev-haskell/hexpat-0.20.2:=[profile?] ) !hexpat? ( dev-haskell/xml:=[profile?] ) network? ( >=dev-haskell/http-4000.0.9:=[profile?] >=dev-haskell/network-2.6:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] ) unicode_collation? ( dev-haskell/text:=[profile?] dev-haskell/text-icu:=[profile?] ) >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=dev-haskell/json:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/pandoc-types-1.8:=[profile?] dev-haskell/parsec:=[profile?] dev-haskell/syb:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-7.4.1:= bibutils? ( >=dev-haskell/hs-bibutils-0.3:=[profile?] ) embed-data-files? ( dev-haskell/file-embed:=[profile?] ) hexpat? ( >=dev-haskell/hexpat-0.20.2:=[profile?] ) !hexpat? ( dev-haskell/xml:=[profile?] ) network? ( >=dev-haskell/http-4000.0.9:=[profile?] >=dev-haskell/network-2.6:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] ) unicode-collation? ( dev-haskell/text:=[profile?] dev-haskell/text-icu:=[profile?] ) >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A Citation Style Language implementation in Haskell
 EAPI=5
 HOMEPAGE=http://istitutocolli.org/repos/citeproc-hs/
-IUSE=+bibutils embed_data_files +hexpat +network +small_base unicode_collation doc hscolour profile
+IUSE=+bibutils embed-data-files +hexpat +network +small-base unicode-collation doc hscolour profile
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=dev-haskell/json:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/pandoc-types-1.8:=[profile?] dev-haskell/parsec:=[profile?] dev-haskell/syb:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-7.4.1:= bibutils? ( >=dev-haskell/hs-bibutils-0.3:=[profile?] ) embed_data_files? ( dev-haskell/file-embed:=[profile?] ) hexpat? ( >=dev-haskell/hexpat-0.20.2:=[profile?] ) !hexpat? ( dev-haskell/xml:=[profile?] ) network? ( >=dev-haskell/http-4000.0.9:=[profile?] >=dev-haskell/network-2.6:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] ) unicode_collation? ( dev-haskell/text:=[profile?] dev-haskell/text-icu:=[profile?] )
+RDEPEND=dev-haskell/json:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/pandoc-types-1.8:=[profile?] dev-haskell/parsec:=[profile?] dev-haskell/syb:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-7.4.1:= bibutils? ( >=dev-haskell/hs-bibutils-0.3:=[profile?] ) embed-data-files? ( dev-haskell/file-embed:=[profile?] ) hexpat? ( >=dev-haskell/hexpat-0.20.2:=[profile?] ) !hexpat? ( dev-haskell/xml:=[profile?] ) network? ( >=dev-haskell/http-4000.0.9:=[profile?] >=dev-haskell/network-2.6:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] ) unicode-collation? ( dev-haskell/text:=[profile?] dev-haskell/text-icu:=[profile?] )
 SLOT=0/0.3.10
 SRC_URI=mirror://hackage/packages/archive/citeproc-hs/0.3.10/citeproc-hs-0.3.10.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0310f34bc3badb92041a43c6ae66706c
+_md5_=3985022b9fc51a93c108696be5d6353d
diff --git a/metadata/md5-cache/dev-haskell/cryptonite-0.21 b/metadata/md5-cache/dev-haskell/cryptonite-0.21
index 3707c261cbe5..5b6eb6b83e0c 100644
--- a/metadata/md5-cache/dev-haskell/cryptonite-0.21
+++ b/metadata/md5-cache/dev-haskell/cryptonite-0.21
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
 DEPEND=>=dev-haskell/memory-0.8:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( dev-haskell/byteable dev-haskell/tasty dev-haskell/tasty-hunit dev-haskell/tasty-kat dev-haskell/tasty-quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Cryptography Primitives sink
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/haskell-crypto/cryptonite
-IUSE=+integer-gmp +support_aesni support_blake2_sse +support_deepseq support_pclmuldq +support_rdrand doc hscolour profile test
+IUSE=cpu-flags-x86-rdrand cpu_flags_x86_aes cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 +integer-gmp doc hscolour profile test
 KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-haskell/memory-0.8:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.21
 SRC_URI=mirror://hackage/packages/archive/cryptonite/0.21/cryptonite-0.21.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d06ab4604340a699b877890921a62f43
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
+_md5_=b94b483b4e0bf1e5920139f69af0c777
diff --git a/metadata/md5-cache/dev-haskell/cryptonite-0.7 b/metadata/md5-cache/dev-haskell/cryptonite-0.7
deleted file mode 100644
index fb8b30412dbc..000000000000
--- a/metadata/md5-cache/dev-haskell/cryptonite-0.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/memory-0.8:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( dev-haskell/byteable dev-haskell/tasty dev-haskell/tasty-hunit dev-haskell/tasty-kat dev-haskell/tasty-quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Cryptography Primitives sink
-EAPI=5
-HOMEPAGE=https://github.com/vincenthz/cryptonite
-IUSE=+integer-gmp +support_aesni +support_deepseq support_pclmuldq +support_rdrand doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-haskell/memory-0.8:=[profile?] >=dev-lang/ghc-7.4.1:=
-RESTRICT=test
-SLOT=0/0.7
-SRC_URI=mirror://hackage/packages/archive/cryptonite/0.7/cryptonite-0.7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=74ff2a2843e0e231dfdec6d4f897216c
diff --git a/metadata/md5-cache/dev-haskell/cryptonite-0.8 b/metadata/md5-cache/dev-haskell/cryptonite-0.8
deleted file mode 100644
index b09df23f6271..000000000000
--- a/metadata/md5-cache/dev-haskell/cryptonite-0.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/memory-0.8:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( dev-haskell/byteable dev-haskell/tasty dev-haskell/tasty-hunit dev-haskell/tasty-kat dev-haskell/tasty-quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Cryptography Primitives sink
-EAPI=5
-HOMEPAGE=https://github.com/haskell-crypto/cryptonite
-IUSE=+integer-gmp +support_aesni +support_deepseq support_pclmuldq +support_rdrand doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-haskell/memory-0.8:=[profile?] >=dev-lang/ghc-7.4.1:=
-RESTRICT=test
-SLOT=0/0.8
-SRC_URI=mirror://hackage/packages/archive/cryptonite/0.8/cryptonite-0.8.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4bd23267cc0affb1dc3e3b6842bb799e
diff --git a/metadata/md5-cache/dev-haskell/dataenc-0.14.0.5 b/metadata/md5-cache/dev-haskell/dataenc-0.14.0.5
index 769152371e90..b3595549820a 100644
--- a/metadata/md5-cache/dev-haskell/dataenc-0.14.0.5
+++ b/metadata/md5-cache/dev-haskell/dataenc-0.14.0.5
@@ -4,10 +4,10 @@ DESCRIPTION=Data encoding library
 EAPI=5
 HOMEPAGE=http://www.haskell.org/haskellwiki/Library/Data_encoding
 IUSE=doc hscolour profile
-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
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/0.14.0.5
 SRC_URI=mirror://hackage/packages/archive/dataenc/0.14.0.5/dataenc-0.14.0.5.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0c6993a1b9ee2a41befbfc8feaa75557
+_md5_=26c3f55dc725e42bf491a49c72ba8320
diff --git a/metadata/md5-cache/dev-haskell/dataenc-0.14.0.7 b/metadata/md5-cache/dev-haskell/dataenc-0.14.0.7
index b725bd4b1b07..d7de5dd7e64d 100644
--- a/metadata/md5-cache/dev-haskell/dataenc-0.14.0.7
+++ b/metadata/md5-cache/dev-haskell/dataenc-0.14.0.7
@@ -4,10 +4,10 @@ DESCRIPTION=Data encoding library
 EAPI=5
 HOMEPAGE=http://www.haskell.org/haskellwiki/Library/Data_encoding
 IUSE=test doc hscolour profile
-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
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.14.0.7
 SRC_URI=mirror://hackage/packages/archive/dataenc/0.14.0.7/dataenc-0.14.0.7.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=bbabaf96d6382ee26b0d837d4c830db6
+_md5_=935198884a0ff2a9d68040e71e75e45f
diff --git a/metadata/md5-cache/dev-haskell/digest-0.0.1.2 b/metadata/md5-cache/dev-haskell/digest-0.0.1.2
index 0b5b741f29f1..0af12285d2b3 100644
--- a/metadata/md5-cache/dev-haskell/digest-0.0.1.2
+++ b/metadata/md5-cache/dev-haskell/digest-0.0.1.2
@@ -4,10 +4,10 @@ DESCRIPTION=Various cryptographic hashes for bytestrings; CRC32 and Adler32 for
 EAPI=5
 HOMEPAGE=http://hackage.haskell.org/package/digest
 IUSE=doc hscolour profile
-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
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:= sys-libs/zlib
 SLOT=0/0.0.1.2
 SRC_URI=mirror://hackage/packages/archive/digest/0.0.1.2/digest-0.0.1.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0c7b8ee60d5e5799eab8525f3f1a0a2d
+_md5_=671d51eac0dde2ff71fb89654f012610
diff --git a/metadata/md5-cache/dev-haskell/extensible-exceptions-0.1.1.4 b/metadata/md5-cache/dev-haskell/extensible-exceptions-0.1.1.4
index 90359faac4ef..9f4e46ea22a0 100644
--- a/metadata/md5-cache/dev-haskell/extensible-exceptions-0.1.1.4
+++ b/metadata/md5-cache/dev-haskell/extensible-exceptions-0.1.1.4
@@ -4,10 +4,10 @@ DESCRIPTION=Extensible exceptions
 EAPI=5
 HOMEPAGE=http://hackage.haskell.org/package/extensible-exceptions
 IUSE=doc hscolour profile
-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
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/0.1.1.4
 SRC_URI=mirror://hackage/packages/archive/extensible-exceptions/0.1.1.4/extensible-exceptions-0.1.1.4.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=91bc03cfbb4b0ffc3d565d758d980ec6
+_md5_=ba99c1e29fc633920695cd7be0797ae3
diff --git a/metadata/md5-cache/dev-haskell/fgl-5.4.2.4 b/metadata/md5-cache/dev-haskell/fgl-5.4.2.4
index ecef7ecd0973..1144d287fd4f 100644
--- a/metadata/md5-cache/dev-haskell/fgl-5.4.2.4
+++ b/metadata/md5-cache/dev-haskell/fgl-5.4.2.4
@@ -4,10 +4,10 @@ DESCRIPTION=Martin Erwig's Functional Graph Library
 EAPI=4
 HOMEPAGE=http://web.engr.oregonstate.edu/~erwig/fgl/haskell
 IUSE=doc hscolour profile
-KEYWORDS=alpha amd64 ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 ia64 ~ppc ~ppc64 sparc x86
 LICENSE=BSD
 RDEPEND=dev-haskell/mtl[profile?] >=dev-lang/ghc-6.8.2
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/fgl/5.4.2.4/fgl-5.4.2.4.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3972db30f676493393d3e0ae2dbfae71
+_md5_=7913867a5c15cf8d36af6e5eff88c659
diff --git a/metadata/md5-cache/dev-haskell/fgl-5.4.2.4-r1 b/metadata/md5-cache/dev-haskell/fgl-5.4.2.4-r1
index 0784671bc51f..441951d02213 100644
--- a/metadata/md5-cache/dev-haskell/fgl-5.4.2.4-r1
+++ b/metadata/md5-cache/dev-haskell/fgl-5.4.2.4-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Martin Erwig's Functional Graph Library
 EAPI=5
 HOMEPAGE=http://web.engr.oregonstate.edu/~erwig/fgl/haskell
 IUSE=doc hscolour profile
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=BSD
 RDEPEND=dev-haskell/mtl:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/5.4.2.4
 SRC_URI=mirror://hackage/packages/archive/fgl/5.4.2.4/fgl-5.4.2.4.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6766ac41e27f3a1d8b525dc62277e8c2
+_md5_=72b887e55a9b59c3ce58b2d44a7e240e
diff --git a/metadata/md5-cache/dev-haskell/fgl-5.5.0.1 b/metadata/md5-cache/dev-haskell/fgl-5.5.0.1
index 40aa7e096559..9930d4016578 100644
--- a/metadata/md5-cache/dev-haskell/fgl-5.5.0.1
+++ b/metadata/md5-cache/dev-haskell/fgl-5.5.0.1
@@ -4,10 +4,10 @@ DESCRIPTION=Martin Erwig's Functional Graph Library
 EAPI=5
 HOMEPAGE=http://web.engr.oregonstate.edu/~erwig/fgl/haskell
 IUSE=doc hscolour profile
-KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86
 LICENSE=BSD
 RDEPEND=dev-haskell/mtl:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/5.5.0.1
 SRC_URI=mirror://hackage/packages/archive/fgl/5.5.0.1/fgl-5.5.0.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d1c4ccd64a068e35d35d3167f18deee6
+_md5_=f2639ca97394a6810710d97ff725158c
diff --git a/metadata/md5-cache/dev-haskell/ghc-paths-0.1.0.9 b/metadata/md5-cache/dev-haskell/ghc-paths-0.1.0.9
index 13b8fcbc0c1b..384294804c99 100644
--- a/metadata/md5-cache/dev-haskell/ghc-paths-0.1.0.9
+++ b/metadata/md5-cache/dev-haskell/ghc-paths-0.1.0.9
@@ -4,10 +4,10 @@ DESCRIPTION=Knowledge of GHC's installation directories
 EAPI=5
 HOMEPAGE=http://hackage.haskell.org/package/ghc-paths
 IUSE=profile
-KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.8.2:=
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/ghc-paths/0.1.0.9/ghc-paths-0.1.0.9.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4bbef77b6fde727ec31060c9b31d2850
+_md5_=e6eb65ffd5284166eb4585f5c7adff8d
diff --git a/metadata/md5-cache/dev-haskell/glut-2.1.1.2 b/metadata/md5-cache/dev-haskell/glut-2.1.1.2
deleted file mode 100644
index 046b08b750d1..000000000000
--- a/metadata/md5-cache/dev-haskell/glut-2.1.1.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm setup test
-DEPEND=>=dev-lang/ghc-6.6.1 >=dev-haskell/opengl-2.2 virtual/opengl media-libs/freeglut >=dev-haskell/cabal-1.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) )
-DESCRIPTION=A binding for the OpenGL Utility Toolkit
-EAPI=0
-HOMEPAGE=http://www.haskell.org/HOpenGL/
-IUSE=doc profile
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=>=dev-lang/ghc-6.6.1 >=dev-haskell/opengl-2.2 virtual/opengl media-libs/freeglut
-SLOT=0
-SRC_URI=mirror://hackage/packages/archive/GLUT/2.1.1.2/GLUT-2.1.1.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=141406260536c97d481086c20c4a8689
diff --git a/metadata/md5-cache/dev-haskell/glut-2.3.1.0 b/metadata/md5-cache/dev-haskell/glut-2.3.1.0
deleted file mode 100644
index 757ce657a36a..000000000000
--- a/metadata/md5-cache/dev-haskell/glut-2.3.1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND==dev-haskell/opengl-2.6*:=[profile?] =dev-haskell/openglraw-1.3*:=[profile?] =dev-haskell/statevar-1.0*:=[profile?] =dev-haskell/tensor-1.0*:=[profile?] >=dev-lang/ghc-6.12.1:= media-libs/freeglut >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=A binding for the OpenGL Utility Toolkit
-EAPI=5
-HOMEPAGE=http://www.haskell.org/haskellwiki/Opengl
-IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND==dev-haskell/opengl-2.6*:=[profile?] =dev-haskell/openglraw-1.3*:=[profile?] =dev-haskell/statevar-1.0*:=[profile?] =dev-haskell/tensor-1.0*:=[profile?] >=dev-lang/ghc-6.12.1:= media-libs/freeglut
-SLOT=0/2.3.1.0
-SRC_URI=mirror://hackage/packages/archive/GLUT/2.3.1.0/GLUT-2.3.1.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f21a2e673fe026b92ff59831580f5fe9
diff --git a/metadata/md5-cache/dev-haskell/glut-2.4.0.0 b/metadata/md5-cache/dev-haskell/glut-2.4.0.0
deleted file mode 100644
index 6afe3d71d473..000000000000
--- a/metadata/md5-cache/dev-haskell/glut-2.4.0.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND==dev-haskell/opengl-2.8*:=[profile?] =dev-haskell/openglraw-1.3*:=[profile?] >=dev-lang/ghc-6.12.1:= media-libs/freeglut >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=A binding for the OpenGL Utility Toolkit
-EAPI=5
-HOMEPAGE=http://www.haskell.org/haskellwiki/Opengl
-IUSE=doc hscolour profile
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND==dev-haskell/opengl-2.8*:=[profile?] =dev-haskell/openglraw-1.3*:=[profile?] >=dev-lang/ghc-6.12.1:= media-libs/freeglut
-SLOT=0/2.4.0.0
-SRC_URI=mirror://hackage/packages/archive/GLUT/2.4.0.0/GLUT-2.4.0.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e6635793a062bd8c3ac0ae2b0bf11765
diff --git a/metadata/md5-cache/dev-haskell/glut-2.7.0.1 b/metadata/md5-cache/dev-haskell/glut-2.7.0.1
deleted file mode 100644
index a2f77fa65f1a..000000000000
--- a/metadata/md5-cache/dev-haskell/glut-2.7.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/opengl-2.12:=[profile?] <dev-haskell/opengl-2.13:=[profile?] >=dev-haskell/openglraw-2.3:=[profile?] <dev-haskell/openglraw-2.6:=[profile?] >=dev-haskell/statevar-1.1:=[profile?] <dev-haskell/statevar-1.2:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-lang/ghc-7.4.1:= media-libs/freeglut >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=A binding for the OpenGL Utility Toolkit
-EAPI=5
-HOMEPAGE=http://www.haskell.org/haskellwiki/Opengl
-IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-haskell/opengl-2.12:=[profile?] <dev-haskell/opengl-2.13:=[profile?] >=dev-haskell/openglraw-2.3:=[profile?] <dev-haskell/openglraw-2.6:=[profile?] >=dev-haskell/statevar-1.1:=[profile?] <dev-haskell/statevar-1.2:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-lang/ghc-7.4.1:= media-libs/freeglut
-SLOT=0/2.7.0.1
-SRC_URI=mirror://hackage/packages/archive/GLUT/2.7.0.1/GLUT-2.7.0.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=48893f9cbdfdf6343dccec6fbcf93ba8
diff --git a/metadata/md5-cache/dev-haskell/haddock-2.14.3.0.7.8.3 b/metadata/md5-cache/dev-haskell/haddock-2.14.3.0.7.8.3
index 8324277e7d81..3a91dc0a9056 100644
--- a/metadata/md5-cache/dev-haskell/haddock-2.14.3.0.7.8.3
+++ b/metadata/md5-cache/dev-haskell/haddock-2.14.3.0.7.8.3
@@ -10,5 +10,5 @@ RDEPEND=dev-haskell/ghc-paths:=[profile?] >=dev-haskell/xhtml-3000.2:=[profile?]
 RESTRICT=test
 SLOT=0/2.14.3.0.7.8.3
 SRC_URI=http://code.haskell.org/~slyfox/snapshots/haddock-2.14.3.0.7.8.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=cf74d6f3fd1a1a6c39ba71eb99e5b6c7
diff --git a/metadata/md5-cache/dev-haskell/haddock-2.16.1 b/metadata/md5-cache/dev-haskell/haddock-2.16.1
index 904c68b07279..45b8fcdc0f5f 100644
--- a/metadata/md5-cache/dev-haskell/haddock-2.16.1
+++ b/metadata/md5-cache/dev-haskell/haddock-2.16.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/haddock/2.16.1/haddock-2.16.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	db85a3c508cf82c45f24b2723791cc93	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=414e783393f9bd2296e401f8398a93b9
diff --git a/metadata/md5-cache/dev-haskell/happstack-server-7.3.9 b/metadata/md5-cache/dev-haskell/happstack-server-7.3.9
index bcb41cbb92e2..6025937ad8dd 100644
--- a/metadata/md5-cache/dev-haskell/happstack-server-7.3.9
+++ b/metadata/md5-cache/dev-haskell/happstack-server-7.3.9
@@ -3,11 +3,11 @@ DEPEND=>=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytes
 DESCRIPTION=Web related tools and services
 EAPI=5
 HOMEPAGE=http://happstack.com
-IUSE=+network-uri +template_haskell doc hscolour profile test
+IUSE=+network-uri +template-haskell doc hscolour profile test
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.8:=[profile?] dev-haskell/extensible-exceptions:=[profile?] >=dev-haskell/hslogger-1.0.2:=[profile?] dev-haskell/html:=[profile?] >=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-0.4:=[profile?] >=dev-haskell/mtl-2:=[profile?] <dev-haskell/mtl-2.3:=[profile?] <dev-haskell/parsec-4:=[profile?] >=dev-haskell/sendfile-0.7.1:=[profile?] <dev-haskell/sendfile-0.8:=[profile?] dev-haskell/syb:=[profile?] >=dev-haskell/system-filepath-0.3.1:=[profile?] >=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/threads-0.5:=[profile?] dev-haskell/time-compat:=[profile?] >=dev-haskell/transformers-0.1.3:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-haskell/utf8-string-0.3.4:=[profile?] <dev-haskell/utf8-string-0.4:=[profile?] dev-haskell/xhtml:=[profile?] dev-haskell/zlib:=[profile?] >=dev-lang/ghc-7.4.1:= network-uri? ( >dev-haskell/network-2.6:=[profile?] <dev-haskell/network-2.7:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] ) !network-uri? ( <dev-haskell/network-2.6:=[profile?] )
 SLOT=0/7.3.9
 SRC_URI=mirror://hackage/packages/archive/happstack-server/7.3.9/happstack-server-7.3.9.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=afcf0b85acac9deaa6fa068b2d17eacf
+_md5_=775423342d8ba0b892fd06f438d881d8
diff --git a/metadata/md5-cache/dev-haskell/happstack-server-7.4.5 b/metadata/md5-cache/dev-haskell/happstack-server-7.4.5
index 15464b40746e..8a6fb1f0ae8f 100644
--- a/metadata/md5-cache/dev-haskell/happstack-server-7.4.5
+++ b/metadata/md5-cache/dev-haskell/happstack-server-7.4.5
@@ -3,11 +3,11 @@ DEPEND=>=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytes
 DESCRIPTION=Web related tools and services
 EAPI=5
 HOMEPAGE=http://happstack.com
-IUSE=+network-uri +template_haskell doc hscolour profile test
+IUSE=+network-uri +template-haskell doc hscolour profile test
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.9:=[profile?] dev-haskell/exceptions:=[profile?] dev-haskell/extensible-exceptions:=[profile?] >=dev-haskell/hslogger-1.0.2:=[profile?] dev-haskell/html:=[profile?] >=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] >=dev-haskell/mtl-2:=[profile?] <dev-haskell/mtl-2.3:=[profile?] dev-haskell/old-locale:=[profile?] <dev-haskell/parsec-4:=[profile?] >=dev-haskell/sendfile-0.7.1:=[profile?] <dev-haskell/sendfile-0.8:=[profile?] dev-haskell/syb:=[profile?] >=dev-haskell/system-filepath-0.3.1:=[profile?] >=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/threads-0.5:=[profile?] dev-haskell/time-compat:=[profile?] >=dev-haskell/transformers-0.1.3:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.5:=[profile?] >=dev-haskell/utf8-string-0.3.4:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] dev-haskell/xhtml:=[profile?] dev-haskell/zlib:=[profile?] >=dev-lang/ghc-7.4.1:= network-uri? ( >dev-haskell/network-2.6:=[profile?] <dev-haskell/network-2.7:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] ) !network-uri? ( <dev-haskell/network-2.6:=[profile?] )
 SLOT=0/7.4.5
 SRC_URI=mirror://hackage/packages/archive/happstack-server/7.4.5/happstack-server-7.4.5.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b8e35d8f49c30e8dbf289e69261de2a2
+_md5_=e5ee67a790ea7737e1a547a249e944ec
diff --git a/metadata/md5-cache/dev-haskell/happstack-server-7.4.6.1 b/metadata/md5-cache/dev-haskell/happstack-server-7.4.6.1
index 5a2328b4b4ab..4ba62617b4a9 100644
--- a/metadata/md5-cache/dev-haskell/happstack-server-7.4.6.1
+++ b/metadata/md5-cache/dev-haskell/happstack-server-7.4.6.1
@@ -3,11 +3,11 @@ DEPEND=>=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytes
 DESCRIPTION=Web related tools and services
 EAPI=5
 HOMEPAGE=http://happstack.com
-IUSE=+network-uri +template_haskell doc hscolour profile test
+IUSE=+network-uri +template-haskell doc hscolour profile test
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.9:=[profile?] dev-haskell/exceptions:=[profile?] dev-haskell/extensible-exceptions:=[profile?] >=dev-haskell/hslogger-1.0.2:=[profile?] dev-haskell/html:=[profile?] >=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] >=dev-haskell/mtl-2:=[profile?] <dev-haskell/mtl-2.3:=[profile?] dev-haskell/old-locale:=[profile?] <dev-haskell/parsec-4:=[profile?] >=dev-haskell/sendfile-0.7.1:=[profile?] <dev-haskell/sendfile-0.8:=[profile?] dev-haskell/syb:=[profile?] >=dev-haskell/system-filepath-0.3.1:=[profile?] >=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/threads-0.5:=[profile?] dev-haskell/time-compat:=[profile?] >=dev-haskell/transformers-0.1.3:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.6:=[profile?] >=dev-haskell/utf8-string-0.3.4:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] dev-haskell/xhtml:=[profile?] dev-haskell/zlib:=[profile?] >=dev-lang/ghc-7.4.1:= network-uri? ( >dev-haskell/network-2.6:=[profile?] <dev-haskell/network-2.7:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] ) !network-uri? ( <dev-haskell/network-2.6:=[profile?] )
 SLOT=0/7.4.6.1
 SRC_URI=mirror://hackage/packages/archive/happstack-server/7.4.6.1/happstack-server-7.4.6.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7f210ab5a58ee507b3d560c0e7afbb81
+_md5_=a8517c86e5d4fc0aaf5ab28d852805b0
diff --git a/metadata/md5-cache/dev-haskell/happstack-server-7.4.6.2 b/metadata/md5-cache/dev-haskell/happstack-server-7.4.6.2
index d1fd60cde710..dbc64be764cf 100644
--- a/metadata/md5-cache/dev-haskell/happstack-server-7.4.6.2
+++ b/metadata/md5-cache/dev-haskell/happstack-server-7.4.6.2
@@ -3,11 +3,11 @@ DEPEND=>=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytes
 DESCRIPTION=Web related tools and services
 EAPI=6
 HOMEPAGE=http://happstack.com
-IUSE=+network-uri +template_haskell doc hscolour profile test
+IUSE=+network-uri +template-haskell doc hscolour profile test
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.9:=[profile?] dev-haskell/exceptions:=[profile?] dev-haskell/extensible-exceptions:=[profile?] >=dev-haskell/hslogger-1.0.2:=[profile?] dev-haskell/html:=[profile?] >=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] >=dev-haskell/mtl-2:=[profile?] <dev-haskell/mtl-2.3:=[profile?] dev-haskell/old-locale:=[profile?] <dev-haskell/parsec-4:=[profile?] >=dev-haskell/sendfile-0.7.1:=[profile?] <dev-haskell/sendfile-0.8:=[profile?] dev-haskell/syb:=[profile?] >=dev-haskell/system-filepath-0.3.1:=[profile?] >=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/threads-0.5:=[profile?] dev-haskell/time-compat:=[profile?] >=dev-haskell/transformers-0.1.3:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-haskell/transformers-base-0.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-0.6:=[profile?] >=dev-haskell/utf8-string-0.3.4:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] dev-haskell/xhtml:=[profile?] dev-haskell/zlib:=[profile?] >=dev-lang/ghc-7.4.1:= network-uri? ( >dev-haskell/network-2.6:=[profile?] <dev-haskell/network-2.7:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] ) !network-uri? ( <dev-haskell/network-2.6:=[profile?] )
 SLOT=0/7.4.6.2
 SRC_URI=mirror://hackage/packages/archive/happstack-server/7.4.6.2/happstack-server-7.4.6.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=027491c7fe9e030fc8a1727bf2e3c8b5
+_md5_=90e372282aa330e7b5c40e8e45d1e988
diff --git a/metadata/md5-cache/dev-haskell/hashed-storage-0.5.11 b/metadata/md5-cache/dev-haskell/hashed-storage-0.5.11
index 7c70ec176079..02cb40b767e5 100644
--- a/metadata/md5-cache/dev-haskell/hashed-storage-0.5.11
+++ b/metadata/md5-cache/dev-haskell/hashed-storage-0.5.11
@@ -4,10 +4,10 @@ DESCRIPTION=Hashed file storage support code
 EAPI=5
 HOMEPAGE=http://hackage.haskell.org/package/hashed-storage
 IUSE=diff hpc test doc hscolour profile
-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
 LICENSE=BSD
 RDEPEND=dev-haskell/binary:=[profile?] dev-haskell/dataenc:=[profile?] dev-haskell/extensible-exceptions:=[profile?] >=dev-haskell/mmap-0.5:=[profile?] <dev-haskell/mmap-0.6:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/zlib:=[profile?] >=dev-lang/ghc-7.4.1:= diff? ( dev-haskell/lcs:=[profile?] )
 SLOT=0/0.5.11
 SRC_URI=mirror://hackage/packages/archive/hashed-storage/0.5.11/hashed-storage-0.5.11.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9eca0d587b47715cbd52badc16ec3558
+_md5_=42a7d884eda36b6bc4227a51d101d68f
diff --git a/metadata/md5-cache/dev-haskell/haskeline-0.7.1.2 b/metadata/md5-cache/dev-haskell/haskeline-0.7.1.2
index 0efa3f32fee6..d6a13216982d 100644
--- a/metadata/md5-cache/dev-haskell/haskeline-0.7.1.2
+++ b/metadata/md5-cache/dev-haskell/haskeline-0.7.1.2
@@ -4,10 +4,10 @@ DESCRIPTION=A command-line interface for user input, written in Haskell
 EAPI=5
 HOMEPAGE=http://trac.haskell.org/haskeline
 IUSE=legacy-encoding libiconv +terminfo doc hscolour profile
-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
 LICENSE=BSD
 RDEPEND=>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-lang/ghc-7.4.1:= legacy-encoding? ( >=dev-haskell/utf8-string-0.3.6:=[profile?] <dev-haskell/utf8-string-0.4:=[profile?] ) terminfo? ( >=dev-haskell/terminfo-0.3.1.3:=[profile?] <dev-haskell/terminfo-0.5:=[profile?] )
 SLOT=0/0.7.1.2
 SRC_URI=mirror://hackage/packages/archive/haskeline/0.7.1.2/haskeline-0.7.1.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8e6c044b0402dca3311ff2aefa344591
+_md5_=599ce0b2ece36e94cc15720219d4a13c
diff --git a/metadata/md5-cache/dev-haskell/haskeline-0.7.1.3 b/metadata/md5-cache/dev-haskell/haskeline-0.7.1.3
index 273ed83378e2..d9b04ea8a811 100644
--- a/metadata/md5-cache/dev-haskell/haskeline-0.7.1.3
+++ b/metadata/md5-cache/dev-haskell/haskeline-0.7.1.3
@@ -4,10 +4,10 @@ DESCRIPTION=A command-line interface for user input, written in Haskell
 EAPI=5
 HOMEPAGE=http://trac.haskell.org/haskeline
 IUSE=legacy-encoding libiconv +terminfo doc hscolour profile
-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
 LICENSE=BSD
 RDEPEND=>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-lang/ghc-7.4.1:= legacy-encoding? ( >=dev-haskell/utf8-string-0.3.6:=[profile?] <dev-haskell/utf8-string-0.4:=[profile?] ) terminfo? ( >=dev-haskell/terminfo-0.3.1.3:=[profile?] <dev-haskell/terminfo-0.5:=[profile?] )
 SLOT=0/0.7.1.3
 SRC_URI=mirror://hackage/packages/archive/haskeline/0.7.1.3/haskeline-0.7.1.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=543e4a81383c3c0f506373516d5868ad
+_md5_=beb588ff38eb91a2388a247e0d86d4b2
diff --git a/metadata/md5-cache/dev-haskell/haskeline-0.7.2.1 b/metadata/md5-cache/dev-haskell/haskeline-0.7.2.1
index 017257083639..d3449a11a43b 100644
--- a/metadata/md5-cache/dev-haskell/haskeline-0.7.2.1
+++ b/metadata/md5-cache/dev-haskell/haskeline-0.7.2.1
@@ -4,10 +4,10 @@ DESCRIPTION=A command-line interface for user input, written in Haskell
 EAPI=5
 HOMEPAGE=http://trac.haskell.org/haskeline
 IUSE=legacy-encoding libiconv +terminfo doc hscolour profile
-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
 LICENSE=BSD
 RDEPEND=>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-lang/ghc-7.4.1:= legacy-encoding? ( >=dev-haskell/utf8-string-0.3.6:=[profile?] ) terminfo? ( >=dev-haskell/terminfo-0.3.1.3:=[profile?] <dev-haskell/terminfo-0.5:=[profile?] )
 SLOT=0/0.7.2.1
 SRC_URI=mirror://hackage/packages/archive/haskeline/0.7.2.1/haskeline-0.7.2.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8ffffe39c75fd1d47a0b4a88851b6500
+_md5_=3e6717334806febb8b47aa278f5a1544
diff --git a/metadata/md5-cache/dev-haskell/haskeline-0.7.2.3 b/metadata/md5-cache/dev-haskell/haskeline-0.7.2.3
index e8ee512ec128..0f9663fcad82 100644
--- a/metadata/md5-cache/dev-haskell/haskeline-0.7.2.3
+++ b/metadata/md5-cache/dev-haskell/haskeline-0.7.2.3
@@ -4,10 +4,10 @@ DESCRIPTION=A command-line interface for user input, written in Haskell
 EAPI=6
 HOMEPAGE=https://github.com/judah/haskeline
 IUSE=legacy-encoding libiconv +terminfo doc hscolour profile
-KEYWORDS=amd64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=BSD
 RDEPEND=>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.6:=[profile?] >=dev-lang/ghc-7.4.1:= legacy-encoding? ( >=dev-haskell/utf8-string-0.3.6:=[profile?] <dev-haskell/utf8-string-0.4:=[profile?] ) terminfo? ( >=dev-haskell/terminfo-0.3.1.3:=[profile?] <dev-haskell/terminfo-0.5:=[profile?] )
 SLOT=0/0.7.2.3
 SRC_URI=mirror://hackage/packages/archive/haskeline/0.7.2.3/haskeline-0.7.2.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=85ae563116fc12a5eea6463d0d6a4cdb
+_md5_=5d70dec26543df4346bc185c16db8181
diff --git a/metadata/md5-cache/dev-haskell/haskell-src-1.0.1.6 b/metadata/md5-cache/dev-haskell/haskell-src-1.0.1.6
index e8135eca18a5..5dc91bf99365 100644
--- a/metadata/md5-cache/dev-haskell/haskell-src-1.0.1.6
+++ b/metadata/md5-cache/dev-haskell/haskell-src-1.0.1.6
@@ -4,10 +4,10 @@ DESCRIPTION=Support for manipulating Haskell source code
 EAPI=5
 HOMEPAGE=http://hackage.haskell.org/package/haskell-src
 IUSE=doc hscolour profile
-KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86
 LICENSE=BSD
 RDEPEND=dev-haskell/syb:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/1.0.1.6
 SRC_URI=mirror://hackage/packages/archive/haskell-src/1.0.1.6/haskell-src-1.0.1.6.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c1dadc0806885f15bac0504cd49d1376
+_md5_=37794634f028b9323153b954fafe3c92
diff --git a/metadata/md5-cache/dev-haskell/haskell-src-1.0.2.0 b/metadata/md5-cache/dev-haskell/haskell-src-1.0.2.0
index c55c841add68..6200527db56c 100644
--- a/metadata/md5-cache/dev-haskell/haskell-src-1.0.2.0
+++ b/metadata/md5-cache/dev-haskell/haskell-src-1.0.2.0
@@ -4,10 +4,10 @@ DESCRIPTION=Support for manipulating Haskell source code
 EAPI=5
 HOMEPAGE=http://hackage.haskell.org/package/haskell-src
 IUSE=doc hscolour profile
-KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=BSD
 RDEPEND=dev-haskell/syb:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/1.0.2.0
 SRC_URI=mirror://hackage/packages/archive/haskell-src/1.0.2.0/haskell-src-1.0.2.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=bb058304f328897717d1516582aff2f1
+_md5_=80a10552f77392780b4a3581405bd7a3
diff --git a/metadata/md5-cache/dev-haskell/hostname-1.0 b/metadata/md5-cache/dev-haskell/hostname-1.0
index 1618a84f5f84..62189a50d719 100644
--- a/metadata/md5-cache/dev-haskell/hostname-1.0
+++ b/metadata/md5-cache/dev-haskell/hostname-1.0
@@ -4,10 +4,10 @@ DESCRIPTION=A a cross-platform means of determining the hostname
 EAPI=4
 HOMEPAGE=http://hackage.haskell.org/package/hostname
 IUSE=doc hscolour profile
-KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.8.2
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/hostname/1.0/hostname-1.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b13b8a87ce3edbed57c6bbb86c066e0b
+_md5_=56a8b292a04b2755fd32576fe19839dd
diff --git a/metadata/md5-cache/dev-haskell/hscolour-1.19 b/metadata/md5-cache/dev-haskell/hscolour-1.19
index 62c4e2e4895d..44994bff6470 100644
--- a/metadata/md5-cache/dev-haskell/hscolour-1.19
+++ b/metadata/md5-cache/dev-haskell/hscolour-1.19
@@ -4,10 +4,10 @@ DESCRIPTION=Colourise Haskell code
 EAPI=4
 HOMEPAGE=http://code.haskell.org/~malcolm/hscolour/
 IUSE=doc profile
-KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/ghc-6.6.1
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/hscolour/1.19/hscolour-1.19.tar.gz
 _eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9c0ebe520f66db0dbc2d70f6b7d71a3a
+_md5_=fc224767e6f4a2c5429b33275fb24854
diff --git a/metadata/md5-cache/dev-haskell/hscolour-1.20.3-r1 b/metadata/md5-cache/dev-haskell/hscolour-1.20.3-r1
index 39d0b7e55f0c..1332561068ae 100644
--- a/metadata/md5-cache/dev-haskell/hscolour-1.20.3-r1
+++ b/metadata/md5-cache/dev-haskell/hscolour-1.20.3-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Colourise Haskell code
 EAPI=5
 HOMEPAGE=http://code.haskell.org/~malcolm/hscolour/
 IUSE=doc profile
-KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/1.20.3
 SRC_URI=mirror://hackage/packages/archive/hscolour/1.20.3/hscolour-1.20.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b2f91ed2a4ab30706b7f8994d1811724
+_md5_=ef058f4e668a8f5898efaa91eaa73fb5
diff --git a/metadata/md5-cache/dev-haskell/hscolour-1.22 b/metadata/md5-cache/dev-haskell/hscolour-1.22
index 6886f2f3eb20..ea5d450145e6 100644
--- a/metadata/md5-cache/dev-haskell/hscolour-1.22
+++ b/metadata/md5-cache/dev-haskell/hscolour-1.22
@@ -4,10 +4,10 @@ DESCRIPTION=Colourise Haskell code
 EAPI=5
 HOMEPAGE=http://code.haskell.org/~malcolm/hscolour/
 IUSE=doc profile
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/1.22
 SRC_URI=mirror://hackage/packages/archive/hscolour/1.22/hscolour-1.22.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=68e42f574f24caa201dc1e16abc96121
+_md5_=11e6ae726d043f73193b0d7ad9794866
diff --git a/metadata/md5-cache/dev-haskell/hscolour-1.23-r1 b/metadata/md5-cache/dev-haskell/hscolour-1.23-r1
index aced823feac6..499311af9c28 100644
--- a/metadata/md5-cache/dev-haskell/hscolour-1.23-r1
+++ b/metadata/md5-cache/dev-haskell/hscolour-1.23-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Colourise Haskell code
 EAPI=5
 HOMEPAGE=http://code.haskell.org/~malcolm/hscolour/
 IUSE=doc profile
-KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/1.23
 SRC_URI=mirror://hackage/packages/archive/hscolour/1.23/hscolour-1.23.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ed7493ac07dffbf81bedcceaeb39d9fb
+_md5_=e7536da59c949a1355f55c1637661c06
diff --git a/metadata/md5-cache/dev-haskell/hscolour-1.24 b/metadata/md5-cache/dev-haskell/hscolour-1.24
index 3074c65f5540..c3fcd8630d1a 100644
--- a/metadata/md5-cache/dev-haskell/hscolour-1.24
+++ b/metadata/md5-cache/dev-haskell/hscolour-1.24
@@ -4,10 +4,10 @@ DESCRIPTION=Colourise Haskell code
 EAPI=5
 HOMEPAGE=http://code.haskell.org/~malcolm/hscolour/
 IUSE=doc profile
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/1.24
 SRC_URI=mirror://hackage/packages/archive/hscolour/1.24/hscolour-1.24.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7dfbb113e4a409b1c830fb8b47448afa
+_md5_=a2379b582dc51bf3d1b65044b9059e09
diff --git a/metadata/md5-cache/dev-haskell/html-1.0.1.2-r1 b/metadata/md5-cache/dev-haskell/html-1.0.1.2-r1
index dd3450b960e1..1a744a4ba448 100644
--- a/metadata/md5-cache/dev-haskell/html-1.0.1.2-r1
+++ b/metadata/md5-cache/dev-haskell/html-1.0.1.2-r1
@@ -4,10 +4,10 @@ DESCRIPTION=HTML combinator library
 EAPI=5
 HOMEPAGE=http://hackage.haskell.org/package/html
 IUSE=doc hscolour profile
-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
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/1.0.1.2
 SRC_URI=mirror://hackage/packages/archive/html/1.0.1.2/html-1.0.1.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=88da0389166dd9514ab93f108ff65e35
+_md5_=01489629a94d25306d8f05581750b6ce
diff --git a/metadata/md5-cache/dev-haskell/http-4000.2.17 b/metadata/md5-cache/dev-haskell/http-4000.2.17
index 3985f086799e..b3fede5cf0fd 100644
--- a/metadata/md5-cache/dev-haskell/http-4000.2.17
+++ b/metadata/md5-cache/dev-haskell/http-4000.2.17
@@ -4,11 +4,11 @@ DESCRIPTION=A library for client-side HTTP
 EAPI=5
 HOMEPAGE=https://github.com/haskell/HTTP
 IUSE=doc hscolour profile test
-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
 LICENSE=BSD
 RDEPEND=>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/network-2.2.0.1:=[profile?] <dev-haskell/network-2.6:=[profile?] >=dev-haskell/parsec-2.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=test
 SLOT=0/4000.2.17
 SRC_URI=mirror://hackage/packages/archive/HTTP/4000.2.17/HTTP-4000.2.17.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2478b098b077878de2d9242241af7edd
+_md5_=2638d1e3be084d67b6236ed69aed41d2
diff --git a/metadata/md5-cache/dev-haskell/http-4000.2.8 b/metadata/md5-cache/dev-haskell/http-4000.2.8
index 677e52cb39d8..f1250819c87c 100644
--- a/metadata/md5-cache/dev-haskell/http-4000.2.8
+++ b/metadata/md5-cache/dev-haskell/http-4000.2.8
@@ -4,11 +4,11 @@ DESCRIPTION=A library for client-side HTTP
 EAPI=5
 HOMEPAGE=https://github.com/haskell/HTTP
 IUSE=doc hscolour profile test
-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
 LICENSE=BSD
 RDEPEND=<dev-haskell/network-2.5:=[profile?] dev-haskell/parsec:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.2:=[profile?]
 RESTRICT=test
 SLOT=0/4000.2.8
 SRC_URI=mirror://hackage/packages/archive/HTTP/4000.2.8/HTTP-4000.2.8.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=97052132b1b3c3559d2d3519ea0b0205
+_md5_=008195179a0808f00b1dd8702b741a36
diff --git a/metadata/md5-cache/dev-haskell/httpd-shed-0.4-r1 b/metadata/md5-cache/dev-haskell/httpd-shed-0.4-r1
index 61db28ce356e..e23e5a61b7fe 100644
--- a/metadata/md5-cache/dev-haskell/httpd-shed-0.4-r1
+++ b/metadata/md5-cache/dev-haskell/httpd-shed-0.4-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A simple web-server with an interact style API
 EAPI=5
 HOMEPAGE=http://hackage.haskell.org/package/httpd-shed
 IUSE=doc hscolour profile
-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
 LICENSE=BSD
 RDEPEND=dev-haskell/network:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.4
 SRC_URI=mirror://hackage/packages/archive/httpd-shed/0.4/httpd-shed-0.4.tar.gz
 _eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=125983f15b8a730b6acf0b6d6d4880b2
+_md5_=b4f6bfc34dea45611776117345252b2c
diff --git a/metadata/md5-cache/dev-haskell/httpd-shed-0.4.0.3 b/metadata/md5-cache/dev-haskell/httpd-shed-0.4.0.3
index 147d53626724..4d25f9ad96a8 100644
--- a/metadata/md5-cache/dev-haskell/httpd-shed-0.4.0.3
+++ b/metadata/md5-cache/dev-haskell/httpd-shed-0.4.0.3
@@ -4,10 +4,10 @@ DESCRIPTION=A simple web-server with an interact style API
 EAPI=5
 HOMEPAGE=http://hackage.haskell.org/package/httpd-shed
 IUSE=buildexamples +network-uri doc hscolour profile
-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
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:= network-uri? ( >=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-2.7:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] ) !network-uri? ( >=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-2.6:=[profile?] >=dev-haskell/network-uri-2.5:=[profile?] <dev-haskell/network-uri-2.6:=[profile?] )
 SLOT=0/0.4.0.3
 SRC_URI=mirror://hackage/packages/archive/httpd-shed/0.4.0.3/httpd-shed-0.4.0.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=57da7250562f0f44ab9f951324b0e9b6
+_md5_=4d3af3bf72f1fc842e92ff60e83f5917
diff --git a/metadata/md5-cache/dev-haskell/hunit-1.2.5.2 b/metadata/md5-cache/dev-haskell/hunit-1.2.5.2
index 08e486088a58..726c49c8ed99 100644
--- a/metadata/md5-cache/dev-haskell/hunit-1.2.5.2
+++ b/metadata/md5-cache/dev-haskell/hunit-1.2.5.2
@@ -4,10 +4,10 @@ DESCRIPTION=A unit testing framework for Haskell
 EAPI=5
 HOMEPAGE=http://hunit.sourceforge.net/
 IUSE=doc hscolour profile
-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
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/1.2.5.2
 SRC_URI=mirror://hackage/packages/archive/HUnit/1.2.5.2/HUnit-1.2.5.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0055702324c0d96405b8a937d2c990c3
+_md5_=64c045b16d20c58e1f8c7a89beb9e5ae
diff --git a/metadata/md5-cache/dev-haskell/hunit-1.2.5.2-r1 b/metadata/md5-cache/dev-haskell/hunit-1.2.5.2-r1
index 22683451f239..4bc4cdc2adef 100644
--- a/metadata/md5-cache/dev-haskell/hunit-1.2.5.2-r1
+++ b/metadata/md5-cache/dev-haskell/hunit-1.2.5.2-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A unit testing framework for Haskell
 EAPI=5
 HOMEPAGE=http://hunit.sourceforge.net/
 IUSE=doc hscolour profile
-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
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/1.2.5.2
 SRC_URI=mirror://hackage/packages/archive/HUnit/1.2.5.2/HUnit-1.2.5.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=52c802590a805bff52be4eb8efb232d6
+_md5_=12bb46af3dde1b8d5e193ff7223d2694
diff --git a/metadata/md5-cache/dev-haskell/language-docker-6.0.4 b/metadata/md5-cache/dev-haskell/language-docker-6.0.4
deleted file mode 100644
index 92cf3cc235ad..000000000000
--- a/metadata/md5-cache/dev-haskell/language-docker-6.0.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/free:=[profile?] >=dev-haskell/megaparsec-6.4:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/prettyprinter:=[profile?] >=dev-haskell/split-0.2:=[profile?] dev-haskell/text:=[profile?] dev-haskell/th-lift:=[profile?] >=dev-lang/ghc-7.10.1:= >=dev-haskell/cabal-1.22.2.0 test? ( dev-haskell/glob dev-haskell/hspec >=dev-haskell/hunit-1.2 dev-haskell/quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Dockerfile parser, pretty-printer and embedded DSL
-EAPI=6
-HOMEPAGE=https://github.com/hadolint/language-docker#readme
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-haskell/free:=[profile?] >=dev-haskell/megaparsec-6.4:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/prettyprinter:=[profile?] >=dev-haskell/split-0.2:=[profile?] dev-haskell/text:=[profile?] dev-haskell/th-lift:=[profile?] >=dev-lang/ghc-7.10.1:=
-SLOT=0/6.0.4
-SRC_URI=mirror://hackage/packages/archive/language-docker/6.0.4/language-docker-6.0.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=50f787553510cf831c5f3096d9c83e6b
diff --git a/metadata/md5-cache/dev-haskell/language-docker-7.0.0 b/metadata/md5-cache/dev-haskell/language-docker-7.0.0
deleted file mode 100644
index 67d233543a41..000000000000
--- a/metadata/md5-cache/dev-haskell/language-docker-7.0.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/free:=[profile?] >=dev-haskell/megaparsec-6.4:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/prettyprinter:=[profile?] >=dev-haskell/split-0.2:=[profile?] dev-haskell/text:=[profile?] dev-haskell/th-lift:=[profile?] >=dev-lang/ghc-7.10.1:= >=dev-haskell/cabal-1.22.2.0 test? ( dev-haskell/glob dev-haskell/hspec >=dev-haskell/hunit-1.2 dev-haskell/quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Dockerfile parser, pretty-printer and embedded DSL
-EAPI=6
-HOMEPAGE=https://github.com/hadolint/language-docker#readme
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-haskell/free:=[profile?] >=dev-haskell/megaparsec-6.4:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/prettyprinter:=[profile?] >=dev-haskell/split-0.2:=[profile?] dev-haskell/text:=[profile?] dev-haskell/th-lift:=[profile?] >=dev-lang/ghc-7.10.1:=
-SLOT=0/7.0.0
-SRC_URI=mirror://hackage/packages/archive/language-docker/7.0.0/language-docker-7.0.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4c2100f488f0e4ee144c31986dd6d1b6
diff --git a/metadata/md5-cache/dev-haskell/libxml-0.1.1 b/metadata/md5-cache/dev-haskell/libxml-0.1.1
index 66a77faf1356..f948c1f4efd1 100644
--- a/metadata/md5-cache/dev-haskell/libxml-0.1.1
+++ b/metadata/md5-cache/dev-haskell/libxml-0.1.1
@@ -4,10 +4,10 @@ DESCRIPTION=Binding to libxml2
 EAPI=5
 HOMEPAGE=http://hackage.haskell.org/package/libxml
 IUSE=doc hscolour profile
-KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=BSD
 RDEPEND=dev-haskell/mtl:=[profile?] >=dev-lang/ghc-6.10.4:= dev-libs/libxml2
 SLOT=0/0.1.1
 SRC_URI=mirror://hackage/packages/archive/libxml/0.1.1/libxml-0.1.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=748d5a031f49d808daed807b13c7e740
+_md5_=36b0fd27c3acba79e9c0a82d82982817
diff --git a/metadata/md5-cache/dev-haskell/mmap-0.5.8 b/metadata/md5-cache/dev-haskell/mmap-0.5.8
index 9e7c60408310..cfede317b935 100644
--- a/metadata/md5-cache/dev-haskell/mmap-0.5.8
+++ b/metadata/md5-cache/dev-haskell/mmap-0.5.8
@@ -4,11 +4,11 @@ DESCRIPTION=Memory mapped files for POSIX and Windows
 EAPI=5
 HOMEPAGE=http://hackage.haskell.org/package/mmap
 IUSE=doc hscolour profile
-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
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 RESTRICT=test
 SLOT=0/0.5.8
 SRC_URI=mirror://hackage/packages/archive/mmap/0.5.8/mmap-0.5.8.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=872ef63c9992d385ef3ca6ca112b7cbc
+_md5_=faccffce865090402b8307f216b2bd05
diff --git a/metadata/md5-cache/dev-haskell/mmap-0.5.9 b/metadata/md5-cache/dev-haskell/mmap-0.5.9
index d39b2bd64a4f..abdaaf756227 100644
--- a/metadata/md5-cache/dev-haskell/mmap-0.5.9
+++ b/metadata/md5-cache/dev-haskell/mmap-0.5.9
@@ -4,11 +4,11 @@ DESCRIPTION=Memory mapped files for POSIX and Windows
 EAPI=5
 HOMEPAGE=http://hackage.haskell.org/package/mmap
 IUSE=doc hscolour profile
-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
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 RESTRICT=test
 SLOT=0/0.5.9
 SRC_URI=mirror://hackage/packages/archive/mmap/0.5.9/mmap-0.5.9.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=435b77b65aa41334cef3f8c251126bf7
+_md5_=b65e1a44d509227a7a51d99f0d02123e
diff --git a/metadata/md5-cache/dev-haskell/mtl-2.1.3.1 b/metadata/md5-cache/dev-haskell/mtl-2.1.3.1
index 80cbe21d5ee6..2a56ddfad362 100644
--- a/metadata/md5-cache/dev-haskell/mtl-2.1.3.1
+++ b/metadata/md5-cache/dev-haskell/mtl-2.1.3.1
@@ -4,10 +4,10 @@ DESCRIPTION=Monad classes, using functional dependencies
 EAPI=5
 HOMEPAGE=https://github.com/ekmett/mtl
 IUSE=doc hscolour profile
-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
 LICENSE=BSD
 RDEPEND=>=dev-haskell/transformers-0.3:=[profile?] <dev-haskell/transformers-0.4:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/2.1.3.1
 SRC_URI=mirror://hackage/packages/archive/mtl/2.1.3.1/mtl-2.1.3.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5322b98f044369af885a1bd008999574
+_md5_=d14730552e9ae0bd587853f01912979b
diff --git a/metadata/md5-cache/dev-haskell/mtl-2.2.1 b/metadata/md5-cache/dev-haskell/mtl-2.2.1
index 47219e47df56..56cdd9a685e5 100644
--- a/metadata/md5-cache/dev-haskell/mtl-2.2.1
+++ b/metadata/md5-cache/dev-haskell/mtl-2.2.1
@@ -4,10 +4,10 @@ DESCRIPTION=Monad classes, using functional dependencies
 EAPI=5
 HOMEPAGE=https://github.com/ekmett/mtl
 IUSE=doc hscolour profile
-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
 LICENSE=BSD
 RDEPEND=>=dev-haskell/transformers-0.4:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/2.2.1
 SRC_URI=mirror://hackage/packages/archive/mtl/2.2.1/mtl-2.2.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=aa6f90f979bc6e9de5152d759d592afd
+_md5_=2c68e5821a12ee1182b2973b3a1eb512
diff --git a/metadata/md5-cache/dev-haskell/mtl-2.2.1-r1 b/metadata/md5-cache/dev-haskell/mtl-2.2.1-r1
index 3aff10f07647..818567ec98a9 100644
--- a/metadata/md5-cache/dev-haskell/mtl-2.2.1-r1
+++ b/metadata/md5-cache/dev-haskell/mtl-2.2.1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Monad classes, using functional dependencies
 EAPI=5
 HOMEPAGE=https://github.com/ekmett/mtl
 IUSE=doc hscolour profile
-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
 LICENSE=BSD
 RDEPEND=>=dev-haskell/transformers-0.4:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/2.2.1
 SRC_URI=mirror://hackage/packages/archive/mtl/2.2.1/mtl-2.2.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7ccef655845f8056c3d37edebc69218c
+_md5_=f8766afca1a89df71249b102aa71d7cc
diff --git a/metadata/md5-cache/dev-haskell/network-2.4.1.2 b/metadata/md5-cache/dev-haskell/network-2.4.1.2
index 1c09f35b08e8..fc59ee52c0b1 100644
--- a/metadata/md5-cache/dev-haskell/network-2.4.1.2
+++ b/metadata/md5-cache/dev-haskell/network-2.4.1.2
@@ -4,10 +4,10 @@ DESCRIPTION=Low-level networking interface
 EAPI=5
 HOMEPAGE=https://github.com/haskell/network
 IUSE=doc hscolour profile test
-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
 LICENSE=BSD
 RDEPEND=>=dev-haskell/parsec-3.0:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/2.4.1.2
 SRC_URI=mirror://hackage/packages/archive/network/2.4.1.2/network-2.4.1.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6c22707b0224c20f6df535c85d55c01b
+_md5_=6ad241538bd084e4cf7cef0a1cf16df9
diff --git a/metadata/md5-cache/dev-haskell/network-2.4.2.2 b/metadata/md5-cache/dev-haskell/network-2.4.2.2
index 9c6de8a5be78..95b28836597f 100644
--- a/metadata/md5-cache/dev-haskell/network-2.4.2.2
+++ b/metadata/md5-cache/dev-haskell/network-2.4.2.2
@@ -4,10 +4,10 @@ DESCRIPTION=Low-level networking interface
 EAPI=5
 HOMEPAGE=https://github.com/haskell/network
 IUSE=doc hscolour profile test
-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
 LICENSE=BSD
 RDEPEND=>=dev-haskell/parsec-3.0:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/2.4.2.2
 SRC_URI=mirror://hackage/packages/archive/network/2.4.2.2/network-2.4.2.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7d072d241db0a38fa42daf532a7ba996
+_md5_=10565bac8962ddf407ed96a6d53a0922
diff --git a/metadata/md5-cache/dev-haskell/network-2.5.0.0 b/metadata/md5-cache/dev-haskell/network-2.5.0.0
index ae47b74355e6..a3682cef269d 100644
--- a/metadata/md5-cache/dev-haskell/network-2.5.0.0
+++ b/metadata/md5-cache/dev-haskell/network-2.5.0.0
@@ -4,10 +4,10 @@ DESCRIPTION=Low-level networking interface
 EAPI=5
 HOMEPAGE=https://github.com/haskell/network
 IUSE=doc hscolour profile test
-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
 LICENSE=BSD
 RDEPEND=>=dev-haskell/parsec-3.0:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/2.5.0.0
 SRC_URI=mirror://hackage/packages/archive/network/2.5.0.0/network-2.5.0.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=55606c5f4604a355d3deaba59926a2d5
+_md5_=3caa4ada0ea80cde700cbcb95f5feefb
diff --git a/metadata/md5-cache/dev-haskell/network-2.6.2.1 b/metadata/md5-cache/dev-haskell/network-2.6.2.1
index 7f7cbbfb7bee..8018274b00c2 100644
--- a/metadata/md5-cache/dev-haskell/network-2.6.2.1
+++ b/metadata/md5-cache/dev-haskell/network-2.6.2.1
@@ -4,10 +4,10 @@ DESCRIPTION=Low-level networking interface
 EAPI=5
 HOMEPAGE=https://github.com/haskell/network
 IUSE=doc hscolour profile test
-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
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/2.6.2.1
 SRC_URI=mirror://hackage/packages/archive/network/2.6.2.1/network-2.6.2.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=841b4f3c810dddcb91c0c511d19150bd
+_md5_=95c4c215a0d485bb6af5c7095e3b7228
diff --git a/metadata/md5-cache/dev-haskell/network-2.6.3.1-r1 b/metadata/md5-cache/dev-haskell/network-2.6.3.1-r1
index b949b5984f1c..20dd6179f5fe 100644
--- a/metadata/md5-cache/dev-haskell/network-2.6.3.1-r1
+++ b/metadata/md5-cache/dev-haskell/network-2.6.3.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Low-level networking interface
 EAPI=6
 HOMEPAGE=https://github.com/haskell/network
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=test
 SLOT=0/2.6.3.1
 SRC_URI=mirror://hackage/packages/archive/network/2.6.3.1/network-2.6.3.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9160e0214352f94960583438307d398c
+_md5_=0959ca39bedc152e54a5042a9804d90a
diff --git a/metadata/md5-cache/dev-haskell/network-data-0.5.3 b/metadata/md5-cache/dev-haskell/network-data-0.5.3
index 15c75ef243fe..818e1255ef0b 100644
--- a/metadata/md5-cache/dev-haskell/network-data-0.5.3
+++ b/metadata/md5-cache/dev-haskell/network-data-0.5.3
@@ -10,4 +10,4 @@ RDEPEND=>=dev-haskell/cereal-0.2:=[profile?] >=dev-haskell/prettyclass-1.0:=[pro
 SLOT=0/0.5.3
 SRC_URI=mirror://hackage/packages/archive/network-data/0.5.3/network-data-0.5.3.tar.gz
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
-_md5_=b6858526a2e6665844d91626e3d67334
+_md5_=3e2de971a570a4abee9466d432b68dd2
diff --git a/metadata/md5-cache/dev-haskell/network-uri-2.5.0.0 b/metadata/md5-cache/dev-haskell/network-uri-2.5.0.0
index 6893f5c5e366..94b2b8d58025 100644
--- a/metadata/md5-cache/dev-haskell/network-uri-2.5.0.0
+++ b/metadata/md5-cache/dev-haskell/network-uri-2.5.0.0
@@ -4,10 +4,10 @@ DESCRIPTION=URI manipulation
 EAPI=5
 HOMEPAGE=https://github.com/haskell/network-uri
 IUSE=profile
-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
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/2.5.0.0
 SRC_URI=mirror://hackage/packages/archive/network-uri/2.5.0.0/network-uri-2.5.0.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9370ad55561b95248457621e377d3ae6
+_md5_=81a9947956ce780d569e5670c7faf4e3
diff --git a/metadata/md5-cache/dev-haskell/network-uri-2.6.0.3 b/metadata/md5-cache/dev-haskell/network-uri-2.6.0.3
index 470b76f5bdcc..955af2c2bd0e 100644
--- a/metadata/md5-cache/dev-haskell/network-uri-2.6.0.3
+++ b/metadata/md5-cache/dev-haskell/network-uri-2.6.0.3
@@ -4,10 +4,10 @@ DESCRIPTION=URI manipulation
 EAPI=5
 HOMEPAGE=https://github.com/haskell/network-uri
 IUSE=doc hscolour profile test
-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
 LICENSE=BSD
 RDEPEND=>=dev-haskell/parsec-3.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-lang/ghc-7.4.1:= !<dev-haskell/network-2.6
 SLOT=0/2.6.0.3
 SRC_URI=mirror://hackage/packages/archive/network-uri/2.6.0.3/network-uri-2.6.0.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7e52a120ccdef9e6a64ef2d46f5136fe
+_md5_=8e0547e0a9b8892b1bab5903c516ca84
diff --git a/metadata/md5-cache/dev-haskell/network-uri-2.6.1.0 b/metadata/md5-cache/dev-haskell/network-uri-2.6.1.0
index 06b7d807464a..3fd186ade50d 100644
--- a/metadata/md5-cache/dev-haskell/network-uri-2.6.1.0
+++ b/metadata/md5-cache/dev-haskell/network-uri-2.6.1.0
@@ -4,10 +4,10 @@ DESCRIPTION=URI manipulation
 EAPI=5
 HOMEPAGE=https://github.com/haskell/network-uri
 IUSE=doc hscolour profile test
-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
 LICENSE=BSD
 RDEPEND=>=dev-haskell/parsec-3.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-lang/ghc-7.4.1:= !<dev-haskell/network-2.6
 SLOT=0/2.6.1.0
 SRC_URI=mirror://hackage/packages/archive/network-uri/2.6.1.0/network-uri-2.6.1.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=dd692b5d13fac81c04637befad0120ef
+_md5_=6bb0a97d6501d480b5809eed75091f7a
diff --git a/metadata/md5-cache/dev-haskell/old-locale-1.0.0.7 b/metadata/md5-cache/dev-haskell/old-locale-1.0.0.7
index 82345ec9117b..f5c4062e2141 100644
--- a/metadata/md5-cache/dev-haskell/old-locale-1.0.0.7
+++ b/metadata/md5-cache/dev-haskell/old-locale-1.0.0.7
@@ -4,10 +4,10 @@ DESCRIPTION=locale library
 EAPI=5
 HOMEPAGE=http://hackage.haskell.org/package/old-locale
 IUSE=doc hscolour profile
-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
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/1.0.0.7
 SRC_URI=mirror://hackage/packages/archive/old-locale/1.0.0.7/old-locale-1.0.0.7.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=40e6bcd466425b34ad81cdb315ba849d
+_md5_=19ef434bd868dd55b70c82c51943fbeb
diff --git a/metadata/md5-cache/dev-haskell/old-time-1.1.0.3-r1 b/metadata/md5-cache/dev-haskell/old-time-1.1.0.3-r1
index aadcc53da677..be2f2f54623a 100644
--- a/metadata/md5-cache/dev-haskell/old-time-1.1.0.3-r1
+++ b/metadata/md5-cache/dev-haskell/old-time-1.1.0.3-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Time library
 EAPI=5
 HOMEPAGE=http://hackage.haskell.org/package/old-time
 IUSE=doc hscolour profile
-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
 LICENSE=BSD
 RDEPEND=>=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/1.1.0.3
 SRC_URI=mirror://hackage/packages/archive/old-time/1.1.0.3/old-time-1.1.0.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f9766a2eea4395e06b055ecf910cee70
+_md5_=dc2ec78d89c404c7f2252a4ecf606a87
diff --git a/metadata/md5-cache/dev-haskell/opengl-2.2.1.1 b/metadata/md5-cache/dev-haskell/opengl-2.2.1.1
deleted file mode 100644
index 9cd5628c469e..000000000000
--- a/metadata/md5-cache/dev-haskell/opengl-2.2.1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm setup test unpack
-DEPEND=>=dev-lang/ghc-6.4 virtual/opengl virtual/glu media-libs/freeglut doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) )
-DESCRIPTION=OpenGL bindings for haskell
-EAPI=0
-HOMEPAGE=http://haskell.org/ghc/
-IUSE=doc profile
-KEYWORDS=amd64 sparc x86
-LICENSE=BSD
-RDEPEND=>=dev-lang/ghc-6.4 virtual/opengl virtual/glu media-libs/freeglut
-SLOT=0
-SRC_URI=mirror://hackage/packages/archive/OpenGL/2.2.1.1/OpenGL-2.2.1.1.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7a993f31725e83df19a8a4f207f86229
diff --git a/metadata/md5-cache/dev-haskell/opengl-2.5.0.0 b/metadata/md5-cache/dev-haskell/opengl-2.5.0.0
deleted file mode 100644
index ddc6900ac8ba..000000000000
--- a/metadata/md5-cache/dev-haskell/opengl-2.5.0.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/gluraw-1.1.0.0[profile?] =dev-haskell/objectname-1.0*[profile?] >=dev-haskell/openglraw-1.1.0.0[profile?] =dev-haskell/statevar-1.0*[profile?] =dev-haskell/tensor-1.0*[profile?] >=dev-lang/ghc-6.8.2 >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=A binding for the OpenGL graphics system
-EAPI=4
-HOMEPAGE=http://www.haskell.org/haskellwiki/Opengl
-IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~sparc ~x86
-LICENSE=BSD
-RDEPEND=>=dev-haskell/gluraw-1.1.0.0[profile?] =dev-haskell/objectname-1.0*[profile?] >=dev-haskell/openglraw-1.1.0.0[profile?] =dev-haskell/statevar-1.0*[profile?] =dev-haskell/tensor-1.0*[profile?] >=dev-lang/ghc-6.8.2
-SLOT=0
-SRC_URI=mirror://hackage/packages/archive/OpenGL/2.5.0.0/OpenGL-2.5.0.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=71ba06e0ba7f265bbe007ce680e92037
diff --git a/metadata/md5-cache/dev-haskell/opengl-2.6.0.1 b/metadata/md5-cache/dev-haskell/opengl-2.6.0.1
deleted file mode 100644
index 286b8b928e54..000000000000
--- a/metadata/md5-cache/dev-haskell/opengl-2.6.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/gluraw-1.1.0.0:=[profile?] =dev-haskell/objectname-1.0*:=[profile?] >=dev-haskell/openglraw-1.3.0.0:=[profile?] =dev-haskell/statevar-1.0*:=[profile?] =dev-haskell/tensor-1.0*:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=A binding for the OpenGL graphics system
-EAPI=5
-HOMEPAGE=http://www.haskell.org/haskellwiki/Opengl
-IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~sparc ~x86
-LICENSE=BSD
-RDEPEND=>=dev-haskell/gluraw-1.1.0.0:=[profile?] =dev-haskell/objectname-1.0*:=[profile?] >=dev-haskell/openglraw-1.3.0.0:=[profile?] =dev-haskell/statevar-1.0*:=[profile?] =dev-haskell/tensor-1.0*:=[profile?] >=dev-lang/ghc-6.10.4:=
-SLOT=0/2.6.0.1
-SRC_URI=mirror://hackage/packages/archive/OpenGL/2.6.0.1/OpenGL-2.6.0.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5cbd05c439b94cf2282c894d2b2af8d6
diff --git a/metadata/md5-cache/dev-haskell/opengl-2.8.0.0 b/metadata/md5-cache/dev-haskell/opengl-2.8.0.0
deleted file mode 100644
index 520a0345d95f..000000000000
--- a/metadata/md5-cache/dev-haskell/opengl-2.8.0.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/gluraw-1.1.0.0:=[profile?] >=dev-haskell/openglraw-1.3.0.0:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=A binding for the OpenGL graphics system
-EAPI=5
-HOMEPAGE=http://www.haskell.org/haskellwiki/Opengl
-IUSE=doc hscolour profile
-KEYWORDS=amd64 ~sparc x86
-LICENSE=BSD
-RDEPEND=>=dev-haskell/gluraw-1.1.0.0:=[profile?] >=dev-haskell/openglraw-1.3.0.0:=[profile?] >=dev-lang/ghc-6.10.4:=
-SLOT=0/2.8.0.0
-SRC_URI=mirror://hackage/packages/archive/OpenGL/2.8.0.0/OpenGL-2.8.0.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c571a067c67bfe2dae6e29f70be63576
diff --git a/metadata/md5-cache/dev-haskell/pandoc-citeproc-0.1.2.1 b/metadata/md5-cache/dev-haskell/pandoc-citeproc-0.1.2.1
index b0be78a9e9d6..02f0fc29dd71 100644
--- a/metadata/md5-cache/dev-haskell/pandoc-citeproc-0.1.2.1
+++ b/metadata/md5-cache/dev-haskell/pandoc-citeproc-0.1.2.1
@@ -3,7 +3,7 @@ DEPEND=>=app-text/pandoc-1.12.0.2:=[profile?] dev-haskell/aeson:=[profile?] dev-
 DESCRIPTION=Supports using pandoc with citeproc
 EAPI=5
 HOMEPAGE=http://hackage.haskell.org/package/pandoc-citeproc
-IUSE=+bibutils embed_data_files +hexpat +network +small_base unicode_collation doc hscolour profile test
+IUSE=+bibutils embed-data-files +hexpat +network +small-base unicode_collation doc hscolour profile test
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=>=app-text/pandoc-1.12.0.2:=[profile?] dev-haskell/aeson:=[profile?] dev-haskell/attoparsec:=[profile?] dev-haskell/json:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/pandoc-types-1.12.3:=[profile?] dev-haskell/parsec:=[profile?] dev-haskell/split:=[profile?] dev-haskell/syb:=[profile?] dev-haskell/tagsoup:=[profile?] >=dev-haskell/texmath-0.6.4:=[profile?] dev-haskell/text:=[profile?] dev-haskell/utf8-string:=[profile?] dev-haskell/vector:=[profile?] >=dev-haskell/yaml-0.8:=[profile?] >=dev-lang/ghc-6.12.1:= bibutils? ( >=dev-haskell/hs-bibutils-0.3:=[profile?] ) hexpat? ( >=dev-haskell/hexpat-0.20.2:=[profile?] ) !hexpat? ( dev-haskell/xml:=[profile?] ) network? ( >=dev-haskell/http-4000.0.9:=[profile?] >=dev-haskell/network-2:=[profile?] ) unicode_collation? ( dev-haskell/text-icu:=[profile?] ) !unicode_collation? ( dev-haskell/rfc5051:=[profile?] )
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0/0.1.2.1
 SRC_URI=mirror://hackage/packages/archive/pandoc-citeproc/0.1.2.1/pandoc-citeproc-0.1.2.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=816a3fe5f18e19d5867d76838e6843b3
+_md5_=c7e2d6cb28bfa414613ab88c635438d8
diff --git a/metadata/md5-cache/dev-haskell/pandoc-citeproc-0.10.4 b/metadata/md5-cache/dev-haskell/pandoc-citeproc-0.10.4
index 8462ece9cc75..b580e25a9bbc 100644
--- a/metadata/md5-cache/dev-haskell/pandoc-citeproc-0.10.4
+++ b/metadata/md5-cache/dev-haskell/pandoc-citeproc-0.10.4
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=app-text/pandoc-1.16:=[profile?] <app-text/pandoc-2.1:=[profile?] >=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-1.2:=[profile?] >=dev-haskell/aeson-pretty-0.8:=[profile?] dev-haskell/attoparsec:=[profile?] dev-haskell/data-default:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/old-locale:=[profile?] >=dev-haskell/pandoc-types-1.16:=[profile?] <dev-haskell/pandoc-types-1.18:=[profile?] dev-haskell/parsec:=[profile?] >=dev-haskell/setenv-0.1:=[profile?] <dev-haskell/setenv-0.2:=[profile?] dev-haskell/split:=[profile?] dev-haskell/syb:=[profile?] dev-haskell/tagsoup:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/xml-conduit-1.2:=[profile?] <dev-haskell/xml-conduit-1.5:=[profile?] >=dev-haskell/yaml-0.8.8.7:=[profile?] >=dev-lang/ghc-7.4.1:= bibutils? ( >=dev-haskell/hs-bibutils-0.3:=[profile?] ) debug? ( dev-haskell/pretty-show:=[profile?] ) test_citeproc? ( >=dev-haskell/temporary-1.1:=[profile?] >=dev-haskell/vector-0.10:=[profile?] ) !test_citeproc? ( dev-haskell/vector:=[profile?] ) unicode_collation? ( dev-haskell/text-icu:=[profile?] ) !unicode_collation? ( dev-haskell/rfc5051:=[profile?] ) >=dev-haskell/cabal-1.12 test? ( !test_citeproc? ( >=dev-haskell/temporary-1.1 ) ) embed_data_files? ( dev-haskell/hsb2hs ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=app-text/pandoc-1.16:=[profile?] <app-text/pandoc-2.1:=[profile?] >=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-1.2:=[profile?] >=dev-haskell/aeson-pretty-0.8:=[profile?] dev-haskell/attoparsec:=[profile?] dev-haskell/data-default:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/old-locale:=[profile?] >=dev-haskell/pandoc-types-1.16:=[profile?] <dev-haskell/pandoc-types-1.18:=[profile?] dev-haskell/parsec:=[profile?] >=dev-haskell/setenv-0.1:=[profile?] <dev-haskell/setenv-0.2:=[profile?] dev-haskell/split:=[profile?] dev-haskell/syb:=[profile?] dev-haskell/tagsoup:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/xml-conduit-1.2:=[profile?] <dev-haskell/xml-conduit-1.5:=[profile?] >=dev-haskell/yaml-0.8.8.7:=[profile?] >=dev-lang/ghc-7.4.1:= bibutils? ( >=dev-haskell/hs-bibutils-0.3:=[profile?] ) debug? ( dev-haskell/pretty-show:=[profile?] ) test-citeproc? ( >=dev-haskell/temporary-1.1:=[profile?] >=dev-haskell/vector-0.10:=[profile?] ) !test-citeproc? ( dev-haskell/vector:=[profile?] ) unicode_collation? ( dev-haskell/text-icu:=[profile?] ) !unicode_collation? ( dev-haskell/rfc5051:=[profile?] ) >=dev-haskell/cabal-1.12 test? ( !test-citeproc? ( >=dev-haskell/temporary-1.1 ) ) embed-data-files? ( dev-haskell/hsb2hs ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Supports using pandoc with citeproc
 EAPI=6
 HOMEPAGE=https://github.com/jgm/pandoc-citeproc
-IUSE=+bibutils debug embed_data_files test_citeproc unicode_collation doc hscolour profile test
+IUSE=+bibutils debug embed-data-files test-citeproc unicode_collation doc hscolour profile test
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=>=app-text/pandoc-1.16:=[profile?] <app-text/pandoc-2.1:=[profile?] >=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-1.2:=[profile?] >=dev-haskell/aeson-pretty-0.8:=[profile?] dev-haskell/attoparsec:=[profile?] dev-haskell/data-default:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/old-locale:=[profile?] >=dev-haskell/pandoc-types-1.16:=[profile?] <dev-haskell/pandoc-types-1.18:=[profile?] dev-haskell/parsec:=[profile?] >=dev-haskell/setenv-0.1:=[profile?] <dev-haskell/setenv-0.2:=[profile?] dev-haskell/split:=[profile?] dev-haskell/syb:=[profile?] dev-haskell/tagsoup:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/xml-conduit-1.2:=[profile?] <dev-haskell/xml-conduit-1.5:=[profile?] >=dev-haskell/yaml-0.8.8.7:=[profile?] >=dev-lang/ghc-7.4.1:= bibutils? ( >=dev-haskell/hs-bibutils-0.3:=[profile?] ) debug? ( dev-haskell/pretty-show:=[profile?] ) test_citeproc? ( >=dev-haskell/temporary-1.1:=[profile?] >=dev-haskell/vector-0.10:=[profile?] ) !test_citeproc? ( dev-haskell/vector:=[profile?] ) unicode_collation? ( dev-haskell/text-icu:=[profile?] ) !unicode_collation? ( dev-haskell/rfc5051:=[profile?] )
+RDEPEND=>=app-text/pandoc-1.16:=[profile?] <app-text/pandoc-2.1:=[profile?] >=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-1.2:=[profile?] >=dev-haskell/aeson-pretty-0.8:=[profile?] dev-haskell/attoparsec:=[profile?] dev-haskell/data-default:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/old-locale:=[profile?] >=dev-haskell/pandoc-types-1.16:=[profile?] <dev-haskell/pandoc-types-1.18:=[profile?] dev-haskell/parsec:=[profile?] >=dev-haskell/setenv-0.1:=[profile?] <dev-haskell/setenv-0.2:=[profile?] dev-haskell/split:=[profile?] dev-haskell/syb:=[profile?] dev-haskell/tagsoup:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/xml-conduit-1.2:=[profile?] <dev-haskell/xml-conduit-1.5:=[profile?] >=dev-haskell/yaml-0.8.8.7:=[profile?] >=dev-lang/ghc-7.4.1:= bibutils? ( >=dev-haskell/hs-bibutils-0.3:=[profile?] ) debug? ( dev-haskell/pretty-show:=[profile?] ) test-citeproc? ( >=dev-haskell/temporary-1.1:=[profile?] >=dev-haskell/vector-0.10:=[profile?] ) !test-citeproc? ( dev-haskell/vector:=[profile?] ) unicode_collation? ( dev-haskell/text-icu:=[profile?] ) !unicode_collation? ( dev-haskell/rfc5051:=[profile?] )
 RESTRICT=test
 SLOT=0/0.10.4
 SRC_URI=mirror://hackage/packages/archive/pandoc-citeproc/0.10.4/pandoc-citeproc-0.10.4.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=060d795e271b4d97d388e19c315ce8da
+_md5_=f83ea0d14cd73b7853a772cb68a176b7
diff --git a/metadata/md5-cache/dev-haskell/pandoc-citeproc-0.10.4.1 b/metadata/md5-cache/dev-haskell/pandoc-citeproc-0.10.4.1
index be057690aadd..66e1028eb743 100644
--- a/metadata/md5-cache/dev-haskell/pandoc-citeproc-0.10.4.1
+++ b/metadata/md5-cache/dev-haskell/pandoc-citeproc-0.10.4.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=app-text/pandoc-1.16:=[profile?] <app-text/pandoc-2.1:=[profile?] >=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-1.2:=[profile?] >=dev-haskell/aeson-pretty-0.8:=[profile?] dev-haskell/attoparsec:=[profile?] dev-haskell/data-default:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/old-locale:=[profile?] >=dev-haskell/pandoc-types-1.16:=[profile?] <dev-haskell/pandoc-types-1.18:=[profile?] dev-haskell/parsec:=[profile?] >=dev-haskell/setenv-0.1:=[profile?] <dev-haskell/setenv-0.2:=[profile?] dev-haskell/split:=[profile?] dev-haskell/syb:=[profile?] dev-haskell/tagsoup:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/xml-conduit-1.2:=[profile?] <dev-haskell/xml-conduit-1.6:=[profile?] >=dev-haskell/yaml-0.8.8.7:=[profile?] >=dev-lang/ghc-7.4.1:= bibutils? ( >=dev-haskell/hs-bibutils-0.3:=[profile?] ) debug? ( dev-haskell/pretty-show:=[profile?] ) test_citeproc? ( >=dev-haskell/temporary-1.1:=[profile?] >=dev-haskell/vector-0.10:=[profile?] ) !test_citeproc? ( dev-haskell/vector:=[profile?] ) unicode_collation? ( dev-haskell/text-icu:=[profile?] ) !unicode_collation? ( dev-haskell/rfc5051:=[profile?] ) >=dev-haskell/cabal-1.12 test? ( !test_citeproc? ( >=dev-haskell/temporary-1.1 ) ) embed_data_files? ( dev-haskell/hsb2hs ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=app-text/pandoc-1.16:=[profile?] <app-text/pandoc-2.1:=[profile?] >=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-1.2:=[profile?] >=dev-haskell/aeson-pretty-0.8:=[profile?] dev-haskell/attoparsec:=[profile?] dev-haskell/data-default:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/old-locale:=[profile?] >=dev-haskell/pandoc-types-1.16:=[profile?] <dev-haskell/pandoc-types-1.18:=[profile?] dev-haskell/parsec:=[profile?] >=dev-haskell/setenv-0.1:=[profile?] <dev-haskell/setenv-0.2:=[profile?] dev-haskell/split:=[profile?] dev-haskell/syb:=[profile?] dev-haskell/tagsoup:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/xml-conduit-1.2:=[profile?] <dev-haskell/xml-conduit-1.6:=[profile?] >=dev-haskell/yaml-0.8.8.7:=[profile?] >=dev-lang/ghc-7.4.1:= bibutils? ( >=dev-haskell/hs-bibutils-0.3:=[profile?] ) debug? ( dev-haskell/pretty-show:=[profile?] ) test-citeproc? ( >=dev-haskell/temporary-1.1:=[profile?] >=dev-haskell/vector-0.10:=[profile?] ) !test-citeproc? ( dev-haskell/vector:=[profile?] ) unicode_collation? ( dev-haskell/text-icu:=[profile?] ) !unicode_collation? ( dev-haskell/rfc5051:=[profile?] ) >=dev-haskell/cabal-1.12 test? ( !test-citeproc? ( >=dev-haskell/temporary-1.1 ) ) embed-data-files? ( dev-haskell/hsb2hs ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Supports using pandoc with citeproc
 EAPI=6
 HOMEPAGE=https://github.com/jgm/pandoc-citeproc
-IUSE=+bibutils debug embed_data_files test_citeproc unicode_collation doc hscolour profile test
+IUSE=+bibutils debug embed-data-files test-citeproc unicode_collation doc hscolour profile test
 KEYWORDS=amd64 x86
 LICENSE=BSD
-RDEPEND=>=app-text/pandoc-1.16:=[profile?] <app-text/pandoc-2.1:=[profile?] >=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-1.2:=[profile?] >=dev-haskell/aeson-pretty-0.8:=[profile?] dev-haskell/attoparsec:=[profile?] dev-haskell/data-default:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/old-locale:=[profile?] >=dev-haskell/pandoc-types-1.16:=[profile?] <dev-haskell/pandoc-types-1.18:=[profile?] dev-haskell/parsec:=[profile?] >=dev-haskell/setenv-0.1:=[profile?] <dev-haskell/setenv-0.2:=[profile?] dev-haskell/split:=[profile?] dev-haskell/syb:=[profile?] dev-haskell/tagsoup:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/xml-conduit-1.2:=[profile?] <dev-haskell/xml-conduit-1.6:=[profile?] >=dev-haskell/yaml-0.8.8.7:=[profile?] >=dev-lang/ghc-7.4.1:= bibutils? ( >=dev-haskell/hs-bibutils-0.3:=[profile?] ) debug? ( dev-haskell/pretty-show:=[profile?] ) test_citeproc? ( >=dev-haskell/temporary-1.1:=[profile?] >=dev-haskell/vector-0.10:=[profile?] ) !test_citeproc? ( dev-haskell/vector:=[profile?] ) unicode_collation? ( dev-haskell/text-icu:=[profile?] ) !unicode_collation? ( dev-haskell/rfc5051:=[profile?] )
+RDEPEND=>=app-text/pandoc-1.16:=[profile?] <app-text/pandoc-2.1:=[profile?] >=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-1.2:=[profile?] >=dev-haskell/aeson-pretty-0.8:=[profile?] dev-haskell/attoparsec:=[profile?] dev-haskell/data-default:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/old-locale:=[profile?] >=dev-haskell/pandoc-types-1.16:=[profile?] <dev-haskell/pandoc-types-1.18:=[profile?] dev-haskell/parsec:=[profile?] >=dev-haskell/setenv-0.1:=[profile?] <dev-haskell/setenv-0.2:=[profile?] dev-haskell/split:=[profile?] dev-haskell/syb:=[profile?] dev-haskell/tagsoup:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/xml-conduit-1.2:=[profile?] <dev-haskell/xml-conduit-1.6:=[profile?] >=dev-haskell/yaml-0.8.8.7:=[profile?] >=dev-lang/ghc-7.4.1:= bibutils? ( >=dev-haskell/hs-bibutils-0.3:=[profile?] ) debug? ( dev-haskell/pretty-show:=[profile?] ) test-citeproc? ( >=dev-haskell/temporary-1.1:=[profile?] >=dev-haskell/vector-0.10:=[profile?] ) !test-citeproc? ( dev-haskell/vector:=[profile?] ) unicode_collation? ( dev-haskell/text-icu:=[profile?] ) !unicode_collation? ( dev-haskell/rfc5051:=[profile?] )
 RESTRICT=test
 SLOT=0/0.10.4.1
 SRC_URI=mirror://hackage/packages/archive/pandoc-citeproc/0.10.4.1/pandoc-citeproc-0.10.4.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=cbbb0c229f8b1f74e2de5b087c555326
+_md5_=1d0ba79d7bd6df50d9776190967cbc64
diff --git a/metadata/md5-cache/dev-haskell/pandoc-citeproc-0.2 b/metadata/md5-cache/dev-haskell/pandoc-citeproc-0.2
index 28eed9925ae3..dd9f95ff8318 100644
--- a/metadata/md5-cache/dev-haskell/pandoc-citeproc-0.2
+++ b/metadata/md5-cache/dev-haskell/pandoc-citeproc-0.2
@@ -3,7 +3,7 @@ DEPEND=>=app-text/pandoc-1.12.1:=[profile?] dev-haskell/aeson:=[profile?] dev-ha
 DESCRIPTION=Supports using pandoc with citeproc
 EAPI=5
 HOMEPAGE=http://hackage.haskell.org/package/pandoc-citeproc
-IUSE=+bibutils embed_data_files +hexpat +network +small_base unicode_collation doc hscolour profile test
+IUSE=+bibutils embed-data-files +hexpat +network +small-base unicode_collation doc hscolour profile test
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=>=app-text/pandoc-1.12.1:=[profile?] dev-haskell/aeson:=[profile?] dev-haskell/aeson-pretty:=[profile?] dev-haskell/attoparsec:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/pandoc-types-1.12.3:=[profile?] dev-haskell/parsec:=[profile?] dev-haskell/split:=[profile?] dev-haskell/syb:=[profile?] dev-haskell/tagsoup:=[profile?] >=dev-haskell/temporary-1.1:=[profile?] >=dev-haskell/texmath-0.6.4:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-haskell/yaml-0.8:=[profile?] >=dev-lang/ghc-7.0.1:= bibutils? ( >=dev-haskell/hs-bibutils-0.3:=[profile?] ) hexpat? ( >=dev-haskell/hexpat-0.20.2:=[profile?] ) !hexpat? ( dev-haskell/xml:=[profile?] ) network? ( >=dev-haskell/http-4000.0.9:=[profile?] >=dev-haskell/network-2:=[profile?] ) unicode_collation? ( dev-haskell/text-icu:=[profile?] ) !unicode_collation? ( dev-haskell/rfc5051:=[profile?] )
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0/0.2
 SRC_URI=mirror://hackage/packages/archive/pandoc-citeproc/0.2/pandoc-citeproc-0.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f9a1d3cd269cd3db2e72765023a19ce8
+_md5_=8f67a706abf69aa5b62ad0d05abc62f1
diff --git a/metadata/md5-cache/dev-haskell/pandoc-citeproc-0.3.1 b/metadata/md5-cache/dev-haskell/pandoc-citeproc-0.3.1
index 403dd0c010ca..bf8b05446155 100644
--- a/metadata/md5-cache/dev-haskell/pandoc-citeproc-0.3.1
+++ b/metadata/md5-cache/dev-haskell/pandoc-citeproc-0.3.1
@@ -3,11 +3,11 @@ DEPEND=>=app-text/pandoc-1.12.1:=[profile?] dev-haskell/aeson:=[profile?] dev-ha
 DESCRIPTION=Supports using pandoc with citeproc
 EAPI=5
 HOMEPAGE=http://hackage.haskell.org/package/pandoc-citeproc
-IUSE=+bibutils embed_data_files +hexpat +network test_citeproc unicode_collation doc hscolour profile test
+IUSE=+bibutils embed-data-files +hexpat +network test-citeproc unicode_collation doc hscolour profile test
 KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=>=app-text/pandoc-1.12.1:=[profile?] dev-haskell/aeson:=[profile?] dev-haskell/aeson-pretty:=[profile?] dev-haskell/attoparsec:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/pandoc-types-1.12.3:=[profile?] dev-haskell/parsec:=[profile?] dev-haskell/split:=[profile?] dev-haskell/syb:=[profile?] dev-haskell/tagsoup:=[profile?] >=dev-haskell/temporary-1.1:=[profile?] >=dev-haskell/texmath-0.6.4:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-haskell/yaml-0.8.8.2:=[profile?] >=dev-lang/ghc-7.4.1:= bibutils? ( >=dev-haskell/hs-bibutils-0.3:=[profile?] ) hexpat? ( >=dev-haskell/hexpat-0.20.2:=[profile?] ) !hexpat? ( dev-haskell/xml:=[profile?] ) network? ( >=dev-haskell/http-4000.0.9:=[profile?] >=dev-haskell/network-2:=[profile?] dev-haskell/network-uri:=[profile?] ) unicode_collation? ( dev-haskell/text-icu:=[profile?] ) !unicode_collation? ( dev-haskell/rfc5051:=[profile?] )
 SLOT=0/0.3.1
 SRC_URI=mirror://hackage/packages/archive/pandoc-citeproc/0.3.1/pandoc-citeproc-0.3.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9454bea0e41c6edd751e1a4031638c31
+_md5_=6674ccb65b2772e60add4c1b6c75f339
diff --git a/metadata/md5-cache/dev-haskell/pandoc-citeproc-0.6 b/metadata/md5-cache/dev-haskell/pandoc-citeproc-0.6
index 076c18dfa77d..954354475406 100644
--- a/metadata/md5-cache/dev-haskell/pandoc-citeproc-0.6
+++ b/metadata/md5-cache/dev-haskell/pandoc-citeproc-0.6
@@ -3,7 +3,7 @@ DEPEND=>=app-text/pandoc-1.12.1:=[profile?] >=dev-haskell/aeson-0.7:=[profile?]
 DESCRIPTION=Supports using pandoc with citeproc
 EAPI=5
 HOMEPAGE=http://hackage.haskell.org/package/pandoc-citeproc
-IUSE=+bibutils embed_data_files test_citeproc unicode_collation doc hscolour profile test
+IUSE=+bibutils embed-data-files test-citeproc unicode_collation doc hscolour profile test
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=>=app-text/pandoc-1.12.1:=[profile?] >=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-0.9:=[profile?] dev-haskell/aeson-pretty:=[profile?] dev-haskell/attoparsec:=[profile?] dev-haskell/data-default:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/pandoc-types-1.12.3:=[profile?] dev-haskell/parsec:=[profile?] dev-haskell/split:=[profile?] dev-haskell/syb:=[profile?] dev-haskell/tagsoup:=[profile?] >=dev-haskell/temporary-1.1:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-haskell/xml-conduit-1.2:=[profile?] <dev-haskell/xml-conduit-1.3:=[profile?] >=dev-haskell/yaml-0.8.8.2:=[profile?] >=dev-lang/ghc-7.4.1:= bibutils? ( >=dev-haskell/hs-bibutils-0.3:=[profile?] ) unicode_collation? ( dev-haskell/text-icu:=[profile?] ) !unicode_collation? ( dev-haskell/rfc5051:=[profile?] )
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0/0.6
 SRC_URI=mirror://hackage/packages/archive/pandoc-citeproc/0.6/pandoc-citeproc-0.6.tar.gz
 _eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5afe86981240fe810fa9f61ecad2e200
+_md5_=eab938974cd0f8ef8cc3325daaccb0a0
diff --git a/metadata/md5-cache/dev-haskell/pandoc-citeproc-0.7.2 b/metadata/md5-cache/dev-haskell/pandoc-citeproc-0.7.2
index 1c10f614aeb3..67640a47cc03 100644
--- a/metadata/md5-cache/dev-haskell/pandoc-citeproc-0.7.2
+++ b/metadata/md5-cache/dev-haskell/pandoc-citeproc-0.7.2
@@ -3,7 +3,7 @@ DEPEND=>=app-text/pandoc-1.13:=[profile?] >=dev-haskell/aeson-0.7:=[profile?] <d
 DESCRIPTION=Supports using pandoc with citeproc
 EAPI=5
 HOMEPAGE=http://hackage.haskell.org/package/pandoc-citeproc
-IUSE=+bibutils debug embed_data_files test_citeproc unicode_collation doc hscolour profile test
+IUSE=+bibutils debug embed-data-files test-citeproc unicode_collation doc hscolour profile test
 KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=>=app-text/pandoc-1.13:=[profile?] >=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-0.10:=[profile?] dev-haskell/aeson-pretty:=[profile?] dev-haskell/attoparsec:=[profile?] dev-haskell/data-default:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/old-locale:=[profile?] >=dev-haskell/pandoc-types-1.12.3:=[profile?] dev-haskell/parsec:=[profile?] >=dev-haskell/setenv-0.1:=[profile?] <dev-haskell/setenv-0.2:=[profile?] dev-haskell/split:=[profile?] dev-haskell/syb:=[profile?] dev-haskell/tagsoup:=[profile?] >=dev-haskell/temporary-1.1:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-haskell/xml-conduit-1.2:=[profile?] <dev-haskell/xml-conduit-1.4:=[profile?] >=dev-haskell/yaml-0.8.8.7:=[profile?] >=dev-lang/ghc-7.4.1:= bibutils? ( >=dev-haskell/hs-bibutils-0.3:=[profile?] ) debug? ( dev-haskell/pretty-show:=[profile?] ) unicode_collation? ( dev-haskell/text-icu:=[profile?] ) !unicode_collation? ( dev-haskell/rfc5051:=[profile?] )
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0/0.7.2
 SRC_URI=mirror://hackage/packages/archive/pandoc-citeproc/0.7.2/pandoc-citeproc-0.7.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1591554beceee3ba9980a56d8fa905ca
+_md5_=abcd9fcae3b378fc597aac7858895408
diff --git a/metadata/md5-cache/dev-haskell/pandoc-citeproc-0.8.1.3 b/metadata/md5-cache/dev-haskell/pandoc-citeproc-0.8.1.3
index 8d902b54a5ef..454cadaf4602 100644
--- a/metadata/md5-cache/dev-haskell/pandoc-citeproc-0.8.1.3
+++ b/metadata/md5-cache/dev-haskell/pandoc-citeproc-0.8.1.3
@@ -1,9 +1,9 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=app-text/pandoc-1.13:=[profile?] >=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-0.11:=[profile?] dev-haskell/aeson-pretty:=[profile?] dev-haskell/attoparsec:=[profile?] dev-haskell/data-default:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/old-locale:=[profile?] >=dev-haskell/pandoc-types-1.12.3:=[profile?] dev-haskell/parsec:=[profile?] >=dev-haskell/setenv-0.1:=[profile?] <dev-haskell/setenv-0.2:=[profile?] dev-haskell/split:=[profile?] dev-haskell/syb:=[profile?] dev-haskell/tagsoup:=[profile?] >=dev-haskell/temporary-1.1:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] >=dev-haskell/xml-conduit-1.2:=[profile?] <dev-haskell/xml-conduit-1.4:=[profile?] >=dev-haskell/yaml-0.8.8.7:=[profile?] >=dev-lang/ghc-7.4.1:= bibutils? ( >=dev-haskell/hs-bibutils-0.3:=[profile?] ) debug? ( dev-haskell/pretty-show:=[profile?] ) unicode_collation? ( dev-haskell/text-icu:=[profile?] ) !unicode_collation? ( dev-haskell/rfc5051:=[profile?] ) >=dev-haskell/cabal-1.12 embed_data_files? ( dev-haskell/hsb2hs ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=app-text/pandoc-1.13:=[profile?] >=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-0.11:=[profile?] dev-haskell/aeson-pretty:=[profile?] dev-haskell/attoparsec:=[profile?] dev-haskell/data-default:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/old-locale:=[profile?] >=dev-haskell/pandoc-types-1.12.3:=[profile?] dev-haskell/parsec:=[profile?] >=dev-haskell/setenv-0.1:=[profile?] <dev-haskell/setenv-0.2:=[profile?] dev-haskell/split:=[profile?] dev-haskell/syb:=[profile?] dev-haskell/tagsoup:=[profile?] >=dev-haskell/temporary-1.1:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] >=dev-haskell/xml-conduit-1.2:=[profile?] <dev-haskell/xml-conduit-1.4:=[profile?] >=dev-haskell/yaml-0.8.8.7:=[profile?] >=dev-lang/ghc-7.4.1:= bibutils? ( >=dev-haskell/hs-bibutils-0.3:=[profile?] ) debug? ( dev-haskell/pretty-show:=[profile?] ) unicode_collation? ( dev-haskell/text-icu:=[profile?] ) !unicode_collation? ( dev-haskell/rfc5051:=[profile?] ) >=dev-haskell/cabal-1.12 embed-data-files? ( dev-haskell/hsb2hs ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Supports using pandoc with citeproc
 EAPI=5
 HOMEPAGE=http://hackage.haskell.org/package/pandoc-citeproc
-IUSE=+bibutils debug embed_data_files test_citeproc unicode_collation doc hscolour profile test
+IUSE=+bibutils debug embed-data-files test-citeproc unicode_collation doc hscolour profile test
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=>=app-text/pandoc-1.13:=[profile?] >=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-0.11:=[profile?] dev-haskell/aeson-pretty:=[profile?] dev-haskell/attoparsec:=[profile?] dev-haskell/data-default:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/old-locale:=[profile?] >=dev-haskell/pandoc-types-1.12.3:=[profile?] dev-haskell/parsec:=[profile?] >=dev-haskell/setenv-0.1:=[profile?] <dev-haskell/setenv-0.2:=[profile?] dev-haskell/split:=[profile?] dev-haskell/syb:=[profile?] dev-haskell/tagsoup:=[profile?] >=dev-haskell/temporary-1.1:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] >=dev-haskell/xml-conduit-1.2:=[profile?] <dev-haskell/xml-conduit-1.4:=[profile?] >=dev-haskell/yaml-0.8.8.7:=[profile?] >=dev-lang/ghc-7.4.1:= bibutils? ( >=dev-haskell/hs-bibutils-0.3:=[profile?] ) debug? ( dev-haskell/pretty-show:=[profile?] ) unicode_collation? ( dev-haskell/text-icu:=[profile?] ) !unicode_collation? ( dev-haskell/rfc5051:=[profile?] )
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0/0.8.1.3
 SRC_URI=mirror://hackage/packages/archive/pandoc-citeproc/0.8.1.3/pandoc-citeproc-0.8.1.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=dd2bc27f520d5dbcc64a1d502754d280
+_md5_=b34ec21a0b6e5d34f56a5b49a5d51342
diff --git a/metadata/md5-cache/dev-haskell/parallel-1.1.0.1 b/metadata/md5-cache/dev-haskell/parallel-1.1.0.1
deleted file mode 100644
index 12cd935d694b..000000000000
--- a/metadata/md5-cache/dev-haskell/parallel-1.1.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm setup test
-DEPEND=>=dev-lang/ghc-6.10.1 >=dev-haskell/cabal-1.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) )
-DESCRIPTION=parallel programming library
-EAPI=0
-HOMEPAGE=http://hackage.haskell.org/cgi-bin/hackage-scripts/package/parallel
-IUSE=doc profile
-KEYWORDS=amd64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=BSD
-RDEPEND=>=dev-lang/ghc-6.10.1
-SLOT=1
-SRC_URI=mirror://hackage/packages/archive/parallel/1.1.0.1/parallel-1.1.0.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b196898e57f4aa1bcebe15b94b57ea3c
diff --git a/metadata/md5-cache/dev-haskell/parsec-2.1.0.1 b/metadata/md5-cache/dev-haskell/parsec-2.1.0.1
deleted file mode 100644
index 201697d941ec..000000000000
--- a/metadata/md5-cache/dev-haskell/parsec-2.1.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm setup test
-DEPEND=>=dev-lang/ghc-6.6.1 >=dev-haskell/cabal-1.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) )
-DESCRIPTION=Monadic parser combinators
-EAPI=0
-HOMEPAGE=http://www.cs.uu.nl/~daan/parsec.html
-IUSE=doc profile
-KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
-LICENSE=BSD
-RDEPEND=>=dev-lang/ghc-6.6.1
-SLOT=0
-SRC_URI=mirror://hackage/packages/archive/parsec/2.1.0.1/parsec-2.1.0.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=cfd027b091644533650f2c7566e33bfb
diff --git a/metadata/md5-cache/dev-haskell/parsec-3.1.11 b/metadata/md5-cache/dev-haskell/parsec-3.1.11
index 5dda4376f45a..91bcff9eb32c 100644
--- a/metadata/md5-cache/dev-haskell/parsec-3.1.11
+++ b/metadata/md5-cache/dev-haskell/parsec-3.1.11
@@ -4,10 +4,10 @@ DESCRIPTION=Monadic parser combinators
 EAPI=6
 HOMEPAGE=https://github.com/aslatter/parsec
 IUSE=doc hscolour profile test
-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
 LICENSE=BSD
 RDEPEND=dev-haskell/mtl:=[profile?] >=dev-haskell/text-0.2:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/3.1.11
 SRC_URI=mirror://hackage/packages/archive/parsec/3.1.11/parsec-3.1.11.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=cd31eafef244e542d8b658af6c669a3b
+_md5_=78eb95eb3582f4686e0fe51324b6a7cd
diff --git a/metadata/md5-cache/dev-haskell/parsec-3.1.5 b/metadata/md5-cache/dev-haskell/parsec-3.1.5
index 43e9bf38b7f9..d2de49670cbd 100644
--- a/metadata/md5-cache/dev-haskell/parsec-3.1.5
+++ b/metadata/md5-cache/dev-haskell/parsec-3.1.5
@@ -4,10 +4,10 @@ DESCRIPTION=Monadic parser combinators
 EAPI=5
 HOMEPAGE=http://www.cs.uu.nl/~daan/parsec.html
 IUSE=doc hscolour profile
-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
 LICENSE=BSD
 RDEPEND=dev-haskell/mtl:=[profile?] >=dev-haskell/text-0.2:=[profile?] <dev-haskell/text-1.2:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/3.1.5
 SRC_URI=mirror://hackage/packages/archive/parsec/3.1.5/parsec-3.1.5.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b000174e346cb3fd34f8be288591b411
+_md5_=acc1b78e13d3e05515bef7440ec411c2
diff --git a/metadata/md5-cache/dev-haskell/parsec-3.1.9-r1 b/metadata/md5-cache/dev-haskell/parsec-3.1.9-r1
index a500a380d065..f1951e207322 100644
--- a/metadata/md5-cache/dev-haskell/parsec-3.1.9-r1
+++ b/metadata/md5-cache/dev-haskell/parsec-3.1.9-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Monadic parser combinators
 EAPI=5
 HOMEPAGE=https://github.com/aslatter/parsec
 IUSE=doc hscolour profile test
-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
 LICENSE=BSD
 RDEPEND=dev-haskell/mtl:=[profile?] >=dev-haskell/text-0.2:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/3.1.9
 SRC_URI=mirror://hackage/packages/archive/parsec/3.1.9/parsec-3.1.9.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=02197077bfb08d569eacf4790ba242d4
+_md5_=8f4472fec7fb4f92b375a57e16c0ea67
diff --git a/metadata/md5-cache/dev-haskell/primitive-0.4.1 b/metadata/md5-cache/dev-haskell/primitive-0.4.1
index 5c696835d345..a9d285f11795 100644
--- a/metadata/md5-cache/dev-haskell/primitive-0.4.1
+++ b/metadata/md5-cache/dev-haskell/primitive-0.4.1
@@ -4,10 +4,10 @@ DESCRIPTION=Wrappers for primitive operations
 EAPI=4
 HOMEPAGE=http://code.haskell.org/primitive
 IUSE=doc hscolour profile
-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
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.1
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/primitive/0.4.1/primitive-0.4.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=343673e0596af4cb65e513e79bb64bbe
+_md5_=6209d537d45fcac844a6781f09cbda48
diff --git a/metadata/md5-cache/dev-haskell/primitive-0.5.0.1 b/metadata/md5-cache/dev-haskell/primitive-0.5.0.1
index 03b6e28e68a6..e366143f42cd 100644
--- a/metadata/md5-cache/dev-haskell/primitive-0.5.0.1
+++ b/metadata/md5-cache/dev-haskell/primitive-0.5.0.1
@@ -4,10 +4,10 @@ DESCRIPTION=Primitive memory-related operations
 EAPI=5
 HOMEPAGE=http://code.haskell.org/primitive
 IUSE=doc hscolour profile
-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
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.12.3:=
 SLOT=0/0.5.0.1
 SRC_URI=mirror://hackage/packages/archive/primitive/0.5.0.1/primitive-0.5.0.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ed7fae8a596be04013a896bd303ff03d
+_md5_=84769cdccdff7dd5d6f75fef29895281
diff --git a/metadata/md5-cache/dev-haskell/primitive-0.5.1.0 b/metadata/md5-cache/dev-haskell/primitive-0.5.1.0
index 5088c8d17163..64aaba86c79e 100644
--- a/metadata/md5-cache/dev-haskell/primitive-0.5.1.0
+++ b/metadata/md5-cache/dev-haskell/primitive-0.5.1.0
@@ -4,10 +4,10 @@ DESCRIPTION=Primitive memory-related operations
 EAPI=5
 HOMEPAGE=https://github.com/haskell/primitive
 IUSE=doc hscolour profile
-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
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/0.5.1.0
 SRC_URI=mirror://hackage/packages/archive/primitive/0.5.1.0/primitive-0.5.1.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=95a38d50caf7be1376d9651c197896ac
+_md5_=2c0e6691e3af67cb6bfdc83de88b0346
diff --git a/metadata/md5-cache/dev-haskell/primitive-0.5.4.0 b/metadata/md5-cache/dev-haskell/primitive-0.5.4.0
index cd348e2dc8cb..b745a443c1fb 100644
--- a/metadata/md5-cache/dev-haskell/primitive-0.5.4.0
+++ b/metadata/md5-cache/dev-haskell/primitive-0.5.4.0
@@ -4,10 +4,10 @@ DESCRIPTION=Primitive memory-related operations
 EAPI=5
 HOMEPAGE=https://github.com/haskell/primitive
 IUSE=doc hscolour profile test
-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
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.5.4.0
 SRC_URI=mirror://hackage/packages/archive/primitive/0.5.4.0/primitive-0.5.4.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3476e97f568351e1c06dea4d1cf3a191
+_md5_=8b4141065795316c2442039225b5bd21
diff --git a/metadata/md5-cache/dev-haskell/primitive-0.6.1.0-r1 b/metadata/md5-cache/dev-haskell/primitive-0.6.1.0-r1
index 02e3b35bee5f..56b3c951c58d 100644
--- a/metadata/md5-cache/dev-haskell/primitive-0.6.1.0-r1
+++ b/metadata/md5-cache/dev-haskell/primitive-0.6.1.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Primitive memory-related operations
 EAPI=5
 HOMEPAGE=https://github.com/haskell/primitive
 IUSE=doc hscolour profile test
-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
 LICENSE=BSD
 RDEPEND=>=dev-haskell/transformers-0.2:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.6.1.0
 SRC_URI=mirror://hackage/packages/archive/primitive/0.6.1.0/primitive-0.6.1.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f6be3917122a78c9def2bf46a29ad2ce
+_md5_=3df22e4dd766dc3135e74f3f2a161d92
diff --git a/metadata/md5-cache/dev-haskell/quickcheck-1.2.0.1 b/metadata/md5-cache/dev-haskell/quickcheck-1.2.0.1
deleted file mode 100644
index f209aef6ec6c..000000000000
--- a/metadata/md5-cache/dev-haskell/quickcheck-1.2.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm setup test
-DEPEND=>=dev-lang/ghc-6.6.1 dev-haskell/random >=dev-haskell/cabal-1.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) )
-DESCRIPTION=Automatic testing of Haskell programs
-EAPI=0
-HOMEPAGE=https://github.com/nick8325/quickcheck
-IUSE=doc profile
-KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
-LICENSE=BSD
-RDEPEND=>=dev-lang/ghc-6.6.1 dev-haskell/random
-SLOT=1
-SRC_URI=mirror://hackage/packages/archive/QuickCheck/1.2.0.1/QuickCheck-1.2.0.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=93941175968bc466e2d36fad7d4ae4ca
diff --git a/metadata/md5-cache/dev-haskell/quickcheck-1.2.0.1-r1 b/metadata/md5-cache/dev-haskell/quickcheck-1.2.0.1-r1
deleted file mode 100644
index 0af7ebad9dff..000000000000
--- a/metadata/md5-cache/dev-haskell/quickcheck-1.2.0.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-lang/ghc-6.6.1 dev-haskell/random:=[profile?] >=dev-haskell/cabal-1.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) )
-DESCRIPTION=Automatic testing of Haskell programs
-EAPI=5
-HOMEPAGE=https://github.com/nick8325/quickcheck
-IUSE=doc profile
-KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
-LICENSE=BSD
-RDEPEND=>=dev-lang/ghc-6.6.1 dev-haskell/random:=[profile?]
-SLOT=1
-SRC_URI=mirror://hackage/packages/archive/QuickCheck/1.2.0.1/QuickCheck-1.2.0.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=cac0c547bbcba7c655c09ed8b09694a7
diff --git a/metadata/md5-cache/dev-haskell/quickcheck-2.6 b/metadata/md5-cache/dev-haskell/quickcheck-2.6
index 7a9d1cb9035f..9052b9bd0d73 100644
--- a/metadata/md5-cache/dev-haskell/quickcheck-2.6
+++ b/metadata/md5-cache/dev-haskell/quickcheck-2.6
@@ -3,11 +3,11 @@ DEPEND=dev-haskell/extensible-exceptions:=[profile?] dev-haskell/random:=[profil
 DESCRIPTION=Automatic testing of Haskell programs
 EAPI=5
 HOMEPAGE=https://github.com/nick8325/quickcheck
-IUSE=+template_haskell doc hscolour profile
-KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux
+IUSE=+template-haskell doc hscolour profile
+KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86 ~amd64-linux
 LICENSE=BSD
 RDEPEND=dev-haskell/extensible-exceptions:=[profile?] dev-haskell/random:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=2/2.6
 SRC_URI=mirror://hackage/packages/archive/QuickCheck/2.6/QuickCheck-2.6.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=612e7c2070f533429f5c59dae81cbb98
+_md5_=717dc4d5f9a2572d00e518867450168b
diff --git a/metadata/md5-cache/dev-haskell/quickcheck-2.7.6 b/metadata/md5-cache/dev-haskell/quickcheck-2.7.6
index e7c2a194dab3..4cc5cbc0a836 100644
--- a/metadata/md5-cache/dev-haskell/quickcheck-2.7.6
+++ b/metadata/md5-cache/dev-haskell/quickcheck-2.7.6
@@ -3,11 +3,11 @@ DEPEND=dev-haskell/random:=[profile?] >=dev-haskell/tf-random-0.4:=[profile?] >=
 DESCRIPTION=Automatic testing of Haskell programs
 EAPI=5
 HOMEPAGE=https://github.com/nick8325/quickcheck
-IUSE=+template_haskell doc hscolour profile test
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux
+IUSE=+template-haskell doc hscolour profile test
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux
 LICENSE=BSD
 RDEPEND=dev-haskell/random:=[profile?] >=dev-haskell/tf-random-0.4:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=2/2.7.6
 SRC_URI=mirror://hackage/packages/archive/QuickCheck/2.7.6/QuickCheck-2.7.6.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=aea3a53a98a7cea446169d9af2676231
+_md5_=b1e3f4c1c1d4e546825f913239d412e4
diff --git a/metadata/md5-cache/dev-haskell/quickcheck-2.8.1 b/metadata/md5-cache/dev-haskell/quickcheck-2.8.1
index 2b9e47a00dc7..c55761a51492 100644
--- a/metadata/md5-cache/dev-haskell/quickcheck-2.8.1
+++ b/metadata/md5-cache/dev-haskell/quickcheck-2.8.1
@@ -3,11 +3,11 @@ DEPEND=dev-haskell/random:=[profile?] >=dev-haskell/tf-random-0.4:=[profile?] >=
 DESCRIPTION=Automatic testing of Haskell programs
 EAPI=5
 HOMEPAGE=https://github.com/nick8325/quickcheck
-IUSE=+template_haskell doc hscolour profile test
-KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux
+IUSE=+template-haskell doc hscolour profile test
+KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux
 LICENSE=BSD
 RDEPEND=dev-haskell/random:=[profile?] >=dev-haskell/tf-random-0.4:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=2/2.8.1
 SRC_URI=mirror://hackage/packages/archive/QuickCheck/2.8.1/QuickCheck-2.8.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f1533015ff3bb0bda2e5d103fe50f89b
+_md5_=82a688c391521a4252371b5fe2d8131f
diff --git a/metadata/md5-cache/dev-haskell/quickcheck-2.8.2 b/metadata/md5-cache/dev-haskell/quickcheck-2.8.2
index 20f1a25b9f4c..875c1ea2052f 100644
--- a/metadata/md5-cache/dev-haskell/quickcheck-2.8.2
+++ b/metadata/md5-cache/dev-haskell/quickcheck-2.8.2
@@ -3,12 +3,12 @@ DEPEND=dev-haskell/random:=[profile?] >=dev-haskell/tf-random-0.4:=[profile?] >=
 DESCRIPTION=Automatic testing of Haskell programs
 EAPI=5
 HOMEPAGE=https://github.com/nick8325/quickcheck
-IUSE=+template_haskell doc hscolour profile test
-KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux
+IUSE=+template-haskell doc hscolour profile test
+KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux
 LICENSE=BSD
 RDEPEND=dev-haskell/random:=[profile?] >=dev-haskell/tf-random-0.4:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=test
 SLOT=2/2.8.2
 SRC_URI=mirror://hackage/packages/archive/QuickCheck/2.8.2/QuickCheck-2.8.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=eb6b4579244a0f9e3ff7f02c707c0c94
+_md5_=6b59d0e055d23da000ae090efbbf680e
diff --git a/metadata/md5-cache/dev-haskell/quickcheck-2.9.2 b/metadata/md5-cache/dev-haskell/quickcheck-2.9.2
index ed0ea2809c82..0fac8e93cded 100644
--- a/metadata/md5-cache/dev-haskell/quickcheck-2.9.2
+++ b/metadata/md5-cache/dev-haskell/quickcheck-2.9.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/nats-1:=[profile?] dev-haskell/random:=[profile?] >=dev-haskell/semigroups-0.9:=[profile?] >=dev-haskell/tf-random-0.4:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( template_haskell? ( >=dev-haskell/test-framework-0.4 <dev-haskell/test-framework-0.9 ) ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/nats-1:=[profile?] dev-haskell/random:=[profile?] >=dev-haskell/semigroups-0.9:=[profile?] >=dev-haskell/tf-random-0.4:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( template-haskell? ( >=dev-haskell/test-framework-0.4 <dev-haskell/test-framework-0.9 ) ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Automatic testing of Haskell programs
 EAPI=6
 HOMEPAGE=https://github.com/nick8325/quickcheck
-IUSE=+template_haskell doc hscolour profile test
-KEYWORDS=amd64 x86 ~x86-fbsd ~amd64-linux
+IUSE=+template-haskell doc hscolour profile test
+KEYWORDS=amd64 x86 ~amd64-linux
 LICENSE=BSD
 RDEPEND=>=dev-haskell/nats-1:=[profile?] dev-haskell/random:=[profile?] >=dev-haskell/semigroups-0.9:=[profile?] >=dev-haskell/tf-random-0.4:=[profile?] >=dev-lang/ghc-7.8.2:=
 RESTRICT=test
 SLOT=2/2.9.2
 SRC_URI=mirror://hackage/packages/archive/QuickCheck/2.9.2/QuickCheck-2.9.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c9988b8860dcb5263d81e55f21a7c359
+_md5_=c7ad67ea5dcab13b57ee768ab6c42930
diff --git a/metadata/md5-cache/dev-haskell/random-1.0.1.1-r1 b/metadata/md5-cache/dev-haskell/random-1.0.1.1-r1
index a4734d3e07ca..ebf5ae1df2f2 100644
--- a/metadata/md5-cache/dev-haskell/random-1.0.1.1-r1
+++ b/metadata/md5-cache/dev-haskell/random-1.0.1.1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=random number library
 EAPI=5
 HOMEPAGE=http://hackage.haskell.org/package/random
 IUSE=doc hscolour profile
-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
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.8.2:=
 SLOT=0/1.0.1.1
 SRC_URI=mirror://hackage/packages/archive/random/1.0.1.1/random-1.0.1.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=402bf978cea3cef9d0cf4967a076b962
+_md5_=d5034cc1f6d3c8d2ed60f226b2783497
diff --git a/metadata/md5-cache/dev-haskell/random-1.1 b/metadata/md5-cache/dev-haskell/random-1.1
index fa374484451a..3ac6b909f8f4 100644
--- a/metadata/md5-cache/dev-haskell/random-1.1
+++ b/metadata/md5-cache/dev-haskell/random-1.1
@@ -4,10 +4,10 @@ DESCRIPTION=random number library
 EAPI=5
 HOMEPAGE=http://hackage.haskell.org/package/random
 IUSE=doc hscolour profile test
-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
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/1.1
 SRC_URI=mirror://hackage/packages/archive/random/1.1/random-1.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b0ebbdd2d280b53c0892f50e31f23a57
+_md5_=4116fb8306cb5060e10f300fd74e586d
diff --git a/metadata/md5-cache/dev-haskell/regex-base-0.93.2-r1 b/metadata/md5-cache/dev-haskell/regex-base-0.93.2-r1
index 20f5aeeb6119..b78a9d28b367 100644
--- a/metadata/md5-cache/dev-haskell/regex-base-0.93.2-r1
+++ b/metadata/md5-cache/dev-haskell/regex-base-0.93.2-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Replaces/Enhances Text.Regex
 EAPI=5
 HOMEPAGE=https://sourceforge.net/projects/lazy-regex
 IUSE=doc hscolour profile
-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
 LICENSE=BSD
 RDEPEND=dev-haskell/mtl:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.93.2
 SRC_URI=mirror://hackage/packages/archive/regex-base/0.93.2/regex-base-0.93.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6931c88543c259b57f07f37a005d5235
+_md5_=10083ae31dd501f6253aa5797d34a949
diff --git a/metadata/md5-cache/dev-haskell/regex-compat-0.95.1-r1 b/metadata/md5-cache/dev-haskell/regex-compat-0.95.1-r1
index c05589f52947..9e833dfe7a3a 100644
--- a/metadata/md5-cache/dev-haskell/regex-compat-0.95.1-r1
+++ b/metadata/md5-cache/dev-haskell/regex-compat-0.95.1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Replaces/Enhances Text.Regex
 EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/lazy-regex
 IUSE=doc hscolour profile
-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
 LICENSE=BSD
 RDEPEND=>=dev-haskell/regex-base-0.93:=[profile?] >=dev-haskell/regex-posix-0.95.1:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.95.1
 SRC_URI=mirror://hackage/packages/archive/regex-compat/0.95.1/regex-compat-0.95.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6fc07705e0c7f671580ad050e63bbc8b
+_md5_=65a67b2c257d1852950ec5ed747b08d4
diff --git a/metadata/md5-cache/dev-haskell/regex-posix-0.95.2 b/metadata/md5-cache/dev-haskell/regex-posix-0.95.2
index 46fe4653547b..37f765b81a61 100644
--- a/metadata/md5-cache/dev-haskell/regex-posix-0.95.2
+++ b/metadata/md5-cache/dev-haskell/regex-posix-0.95.2
@@ -4,10 +4,10 @@ DESCRIPTION=Replaces/Enhances Text.Regex
 EAPI=4
 HOMEPAGE=https://sourceforge.net/projects/lazy-regex
 IUSE=doc hscolour profile
-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
 LICENSE=BSD
 RDEPEND=>=dev-haskell/regex-base-0.93[profile?] >=dev-lang/ghc-6.8.2
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/regex-posix/0.95.2/regex-posix-0.95.2.tar.gz
 _eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=191812200b3f3469ea89cc9d9ca76f51
+_md5_=57ddb69947173a6230fb0c3eda526567
diff --git a/metadata/md5-cache/dev-haskell/split-0.1.4.3 b/metadata/md5-cache/dev-haskell/split-0.1.4.3
index 7ca6dcd0c3db..431d597a5ff7 100644
--- a/metadata/md5-cache/dev-haskell/split-0.1.4.3
+++ b/metadata/md5-cache/dev-haskell/split-0.1.4.3
@@ -4,10 +4,10 @@ DESCRIPTION=Combinator library for splitting lists
 EAPI=4
 HOMEPAGE=http://code.haskell.org/~byorgey/code/split
 IUSE=doc hscolour profile
-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
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.8.2
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/split/0.1.4.3/split-0.1.4.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=19846352232a243757bdb61a0c7f94f0
+_md5_=0407e47a413e622d45a4b4922f209a09
diff --git a/metadata/md5-cache/dev-haskell/split-0.2.2 b/metadata/md5-cache/dev-haskell/split-0.2.2
index 4765de2833f1..29a778683965 100644
--- a/metadata/md5-cache/dev-haskell/split-0.2.2
+++ b/metadata/md5-cache/dev-haskell/split-0.2.2
@@ -4,10 +4,10 @@ DESCRIPTION=Combinator library for splitting lists
 EAPI=5
 HOMEPAGE=http://hackage.haskell.org/package/split
 IUSE=doc hscolour profile test
-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
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/0.2.2
 SRC_URI=mirror://hackage/packages/archive/split/0.2.2/split-0.2.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f001eccbd81395f3a37d877876266ebe
+_md5_=fd4757962570cda4e09caa58964cc65d
diff --git a/metadata/md5-cache/dev-haskell/split-0.2.3 b/metadata/md5-cache/dev-haskell/split-0.2.3
index e4f12b917464..24f2aff3aa5f 100644
--- a/metadata/md5-cache/dev-haskell/split-0.2.3
+++ b/metadata/md5-cache/dev-haskell/split-0.2.3
@@ -4,11 +4,11 @@ DESCRIPTION=Combinator library for splitting lists
 EAPI=5
 HOMEPAGE=http://hackage.haskell.org/package/split
 IUSE=doc hscolour profile test
-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
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=test
 SLOT=0/0.2.3
 SRC_URI=mirror://hackage/packages/archive/split/0.2.3/split-0.2.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0c5d3adcfb4a52608316300d0fe3c8be
+_md5_=3b8f9dbd997a76ff7e55213018227162
diff --git a/metadata/md5-cache/dev-haskell/split-0.2.3.1 b/metadata/md5-cache/dev-haskell/split-0.2.3.1
index 6273f5500853..354431dce862 100644
--- a/metadata/md5-cache/dev-haskell/split-0.2.3.1
+++ b/metadata/md5-cache/dev-haskell/split-0.2.3.1
@@ -4,10 +4,10 @@ DESCRIPTION=Combinator library for splitting lists
 EAPI=6
 HOMEPAGE=http://hackage.haskell.org/package/split
 IUSE=doc hscolour profile test
-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
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.2.3.1
 SRC_URI=mirror://hackage/packages/archive/split/0.2.3.1/split-0.2.3.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=52ca93727b68f92a1bdb729b8dbd5702
+_md5_=fe876bd3c0184bfe4d2dd61c17488dec
diff --git a/metadata/md5-cache/dev-haskell/stream-0.2.6-r1 b/metadata/md5-cache/dev-haskell/stream-0.2.6-r1
deleted file mode 100644
index 57db96755ac4..000000000000
--- a/metadata/md5-cache/dev-haskell/stream-0.2.6-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-lang/ghc-6.6.1 dev-haskell/quickcheck:1 dev-haskell/cabal doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) )
-DESCRIPTION=A library for manipulating infinite lists
-EAPI=4
-HOMEPAGE=http://www.cs.nott.ac.uk/~wss/repos/Stream/dist/doc/html/
-IUSE=doc profile
-KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86
-LICENSE=BSD
-RDEPEND=>=dev-lang/ghc-6.6.1 dev-haskell/quickcheck:1
-SLOT=0
-SRC_URI=mirror://hackage/packages/archive/Stream/0.2.6/Stream-0.2.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b493f7def710ff7e09bc20db207f0788
diff --git a/metadata/md5-cache/dev-haskell/stream-0.4.6 b/metadata/md5-cache/dev-haskell/stream-0.4.6
deleted file mode 100644
index e65d95dfdd6a..000000000000
--- a/metadata/md5-cache/dev-haskell/stream-0.4.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/lazysmallcheck-0.3[profile?] >=dev-haskell/quickcheck-2.0[profile?] >=dev-lang/ghc-6.8.2 dev-haskell/cabal doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=A library for manipulating infinite lists
-EAPI=4
-HOMEPAGE=http://hackage.haskell.org/package/Stream
-IUSE=doc hscolour profile
-KEYWORDS=alpha ~amd64 ia64 ppc ~ppc64 sparc ~x86
-LICENSE=BSD
-RDEPEND=>=dev-haskell/lazysmallcheck-0.3[profile?] >=dev-haskell/quickcheck-2.0[profile?] >=dev-lang/ghc-6.8.2
-SLOT=0
-SRC_URI=mirror://hackage/packages/archive/Stream/0.4.6/Stream-0.4.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=971f98f44ba5139606e4dd1e96de1629
diff --git a/metadata/md5-cache/dev-haskell/syb-0.3.7 b/metadata/md5-cache/dev-haskell/syb-0.3.7
index 3674fed8b925..cb2954cd443a 100644
--- a/metadata/md5-cache/dev-haskell/syb-0.3.7
+++ b/metadata/md5-cache/dev-haskell/syb-0.3.7
@@ -4,10 +4,10 @@ DESCRIPTION=Scrap Your Boilerplate
 EAPI=4
 HOMEPAGE=http://www.cs.uu.nl/wiki/GenericProgramming/SYB
 IUSE=doc hscolour profile
-KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.1
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/syb/0.3.7/syb-0.3.7.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=64e438ef5ac150d4d9da60334f4ffdac
+_md5_=8aec3276185e3b03e3cd415d91420233
diff --git a/metadata/md5-cache/dev-haskell/syb-0.4.3 b/metadata/md5-cache/dev-haskell/syb-0.4.3
index 87a67735b77d..7d063f8cf497 100644
--- a/metadata/md5-cache/dev-haskell/syb-0.4.3
+++ b/metadata/md5-cache/dev-haskell/syb-0.4.3
@@ -4,10 +4,10 @@ DESCRIPTION=Scrap Your Boilerplate
 EAPI=5
 HOMEPAGE=http://www.cs.uu.nl/wiki/GenericProgramming/SYB
 IUSE=doc hscolour profile test
-KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux
+KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86 ~amd64-linux
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.4.3
 SRC_URI=mirror://hackage/packages/archive/syb/0.4.3/syb-0.4.3.tar.gz
 _eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=38a2faa17f1cf5a0a936bbee15c9b673
+_md5_=8d508ee03386608e5f3a9138fada5402
diff --git a/metadata/md5-cache/dev-haskell/syb-0.4.4 b/metadata/md5-cache/dev-haskell/syb-0.4.4
index 9435fcd1feb4..ab43918ebaeb 100644
--- a/metadata/md5-cache/dev-haskell/syb-0.4.4
+++ b/metadata/md5-cache/dev-haskell/syb-0.4.4
@@ -4,11 +4,11 @@ DESCRIPTION=Scrap Your Boilerplate
 EAPI=5
 HOMEPAGE=http://www.cs.uu.nl/wiki/GenericProgramming/SYB
 IUSE=doc hscolour profile test
-KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux
+KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=test
 SLOT=0/0.4.4
 SRC_URI=mirror://hackage/packages/archive/syb/0.4.4/syb-0.4.4.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=024754c7c78e0f45cb3fc2d4c3c8d36d
+_md5_=567ecc8fbd455c4152587cfc91aa3b87
diff --git a/metadata/md5-cache/dev-haskell/syb-0.5.1 b/metadata/md5-cache/dev-haskell/syb-0.5.1
index 451ac47dcff9..2c88b4b028b8 100644
--- a/metadata/md5-cache/dev-haskell/syb-0.5.1
+++ b/metadata/md5-cache/dev-haskell/syb-0.5.1
@@ -4,11 +4,11 @@ DESCRIPTION=Scrap Your Boilerplate
 EAPI=5
 HOMEPAGE=http://www.cs.uu.nl/wiki/GenericProgramming/SYB
 IUSE=doc hscolour profile test
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=test
 SLOT=0/0.5.1
 SRC_URI=mirror://hackage/packages/archive/syb/0.5.1/syb-0.5.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6a59f75876167e9eae2651d470a80987
+_md5_=bcdf650fb4aa393f72cc4060966ff352
diff --git a/metadata/md5-cache/dev-haskell/tar-0.4.0.1 b/metadata/md5-cache/dev-haskell/tar-0.4.0.1
index ff1e58eda60d..6fe4f16d3630 100644
--- a/metadata/md5-cache/dev-haskell/tar-0.4.0.1
+++ b/metadata/md5-cache/dev-haskell/tar-0.4.0.1
@@ -4,10 +4,10 @@ DESCRIPTION=Reading, writing and manipulating '.tar' archive files
 EAPI=5
 HOMEPAGE=http://hackage.haskell.org/package/tar
 IUSE=doc hscolour profile
-KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-macos
+KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-macos
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/0.4.0.1
 SRC_URI=mirror://hackage/packages/archive/tar/0.4.0.1/tar-0.4.0.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2042d234fd4dbd276db1908b96ee6717
+_md5_=f2d8959a2bb29f60b98e5533ff1bcf12
diff --git a/metadata/md5-cache/dev-haskell/terminfo-0.4.0.0 b/metadata/md5-cache/dev-haskell/terminfo-0.4.0.0
index 922d0ae069a5..3763a3a932db 100644
--- a/metadata/md5-cache/dev-haskell/terminfo-0.4.0.0
+++ b/metadata/md5-cache/dev-haskell/terminfo-0.4.0.0
@@ -4,10 +4,10 @@ DESCRIPTION=Haskell bindings to the terminfo library
 EAPI=5
 HOMEPAGE=https://github.com/judah/terminfo
 IUSE=doc hscolour profile
-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
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.0.1:= sys-libs/ncurses
 SLOT=0/0.4.0.0
 SRC_URI=mirror://hackage/packages/archive/terminfo/0.4.0.0/terminfo-0.4.0.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=03edb7698f79c250ec4ac844b806ad32
+_md5_=d7b1682d97c9f45bb7e3fdfbd4501cda
diff --git a/metadata/md5-cache/dev-haskell/terminfo-0.4.0.1 b/metadata/md5-cache/dev-haskell/terminfo-0.4.0.1
index c3455de8849e..228c3d3b7dde 100644
--- a/metadata/md5-cache/dev-haskell/terminfo-0.4.0.1
+++ b/metadata/md5-cache/dev-haskell/terminfo-0.4.0.1
@@ -4,10 +4,10 @@ DESCRIPTION=Haskell bindings to the terminfo library
 EAPI=5
 HOMEPAGE=https://github.com/judah/terminfo
 IUSE=doc hscolour profile
-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
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.4.0.1
 SRC_URI=mirror://hackage/packages/archive/terminfo/0.4.0.1/terminfo-0.4.0.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4f2c752521eaf3c4eb7158711a3560b9
+_md5_=0452413fe41440aba782e88cc20332a0
diff --git a/metadata/md5-cache/dev-haskell/terminfo-0.4.0.2 b/metadata/md5-cache/dev-haskell/terminfo-0.4.0.2
index 9ce8607fe93e..40f23bec5d92 100644
--- a/metadata/md5-cache/dev-haskell/terminfo-0.4.0.2
+++ b/metadata/md5-cache/dev-haskell/terminfo-0.4.0.2
@@ -4,10 +4,10 @@ DESCRIPTION=Haskell bindings to the terminfo library
 EAPI=5
 HOMEPAGE=https://github.com/judah/terminfo
 IUSE=doc hscolour profile
-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
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.4.0.2
 SRC_URI=mirror://hackage/packages/archive/terminfo/0.4.0.2/terminfo-0.4.0.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=cc945b21102bc87df0f29a9104b82bc5
+_md5_=f4815e86fe8c957d38a1b7f93dda62c2
diff --git a/metadata/md5-cache/dev-haskell/test-framework-0.8 b/metadata/md5-cache/dev-haskell/test-framework-0.8
index b5ea97b9d35b..09ee370d122d 100644
--- a/metadata/md5-cache/dev-haskell/test-framework-0.8
+++ b/metadata/md5-cache/dev-haskell/test-framework-0.8
@@ -4,10 +4,10 @@ DESCRIPTION=Framework for running and organising tests, with HUnit and QuickChec
 EAPI=5
 HOMEPAGE=https://batterseapower.github.com/test-framework/
 IUSE=doc hscolour profile
-KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/ansi-terminal-0.4.0:=[profile?] >=dev-haskell/ansi-wl-pprint-0.5.1:=[profile?] >=dev-haskell/extensible-exceptions-0.1.1:=[profile?] >=dev-haskell/hostname-1.0:=[profile?] >=dev-haskell/random-1.0:=[profile?] >=dev-haskell/regex-posix-0.72:=[profile?] >=dev-haskell/xml-1.3.5:=[profile?] >=dev-lang/ghc-6.12.1:=
 SLOT=0/0.8
 SRC_URI=mirror://hackage/packages/archive/test-framework/0.8/test-framework-0.8.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=32797a03a7796c65fb48a09dfaaedf4e
+_md5_=da445200a55b0a4191641a27f00b880d
diff --git a/metadata/md5-cache/dev-haskell/test-framework-0.8.1.1 b/metadata/md5-cache/dev-haskell/test-framework-0.8.1.1
index f52f483d685f..ce60d34b97f7 100644
--- a/metadata/md5-cache/dev-haskell/test-framework-0.8.1.1
+++ b/metadata/md5-cache/dev-haskell/test-framework-0.8.1.1
@@ -4,11 +4,11 @@ DESCRIPTION=Framework for running and organising tests, with HUnit and QuickChec
 EAPI=5
 HOMEPAGE=https://batterseapower.github.io/test-framework/
 IUSE=test doc hscolour profile
-KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/ansi-terminal-0.4.0:=[profile?] >=dev-haskell/ansi-wl-pprint-0.5.1:=[profile?] >=dev-haskell/hostname-1.0:=[profile?] >=dev-haskell/old-locale-1.0:=[profile?] >=dev-haskell/random-1.0:=[profile?] >=dev-haskell/regex-posix-0.72:=[profile?] >=dev-haskell/xml-1.3.5:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=test
 SLOT=0/0.8.1.1
 SRC_URI=mirror://hackage/packages/archive/test-framework/0.8.1.1/test-framework-0.8.1.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=fd08812be15643dae1b248ad334f8f9b
+_md5_=28a3e8beea91085def4e622eebde5d5e
diff --git a/metadata/md5-cache/dev-haskell/test-framework-hunit-0.2.7 b/metadata/md5-cache/dev-haskell/test-framework-hunit-0.2.7
index 188c79842073..5b38bbe8eb2d 100644
--- a/metadata/md5-cache/dev-haskell/test-framework-hunit-0.2.7
+++ b/metadata/md5-cache/dev-haskell/test-framework-hunit-0.2.7
@@ -4,10 +4,10 @@ DESCRIPTION=HUnit support for the test-framework package
 EAPI=4
 HOMEPAGE=https://batterseapower.github.com/test-framework/
 IUSE=doc hscolour profile
-KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10 >=dev-haskell/hunit-1.2[profile?] >=dev-haskell/test-framework-0.2.0[profile?]
 SLOT=0
 SRC_URI=mirror://hackage/packages/archive/test-framework-hunit/0.2.7/test-framework-hunit-0.2.7.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a2d51aa39b9ffe7bf1ab6d0dc91c29d9
+_md5_=a9e715aa3d0c4ba29584acb4108bc95f
diff --git a/metadata/md5-cache/dev-haskell/test-framework-hunit-0.3.0 b/metadata/md5-cache/dev-haskell/test-framework-hunit-0.3.0
index 5ffadae92317..61b7ca48dacb 100644
--- a/metadata/md5-cache/dev-haskell/test-framework-hunit-0.3.0
+++ b/metadata/md5-cache/dev-haskell/test-framework-hunit-0.3.0
@@ -4,10 +4,10 @@ DESCRIPTION=HUnit support for the test-framework package
 EAPI=5
 HOMEPAGE=https://batterseapower.github.com/test-framework/
 IUSE=doc hscolour profile
-KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/extensible-exceptions-0.1.1:=[profile?] <dev-haskell/extensible-exceptions-0.2.0:=[profile?] >=dev-haskell/hunit-1.2:=[profile?] <dev-haskell/hunit-2:=[profile?] >=dev-haskell/test-framework-0.2.0:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.3.0
 SRC_URI=mirror://hackage/packages/archive/test-framework-hunit/0.3.0/test-framework-hunit-0.3.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=feefa74fdf5635fed0205e6e0b5deb58
+_md5_=13c219f948e10bcaa63d7fe0f19a655a
diff --git a/metadata/md5-cache/dev-haskell/test-framework-hunit-0.3.0.2 b/metadata/md5-cache/dev-haskell/test-framework-hunit-0.3.0.2
index d7e7b0d3a91f..f5eeaf2ce03d 100644
--- a/metadata/md5-cache/dev-haskell/test-framework-hunit-0.3.0.2
+++ b/metadata/md5-cache/dev-haskell/test-framework-hunit-0.3.0.2
@@ -4,10 +4,10 @@ DESCRIPTION=HUnit support for the test-framework package
 EAPI=5
 HOMEPAGE=https://batterseapower.github.io/test-framework/
 IUSE=doc hscolour profile
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/extensible-exceptions-0.1.1:=[profile?] <dev-haskell/extensible-exceptions-0.2.0:=[profile?] >=dev-haskell/hunit-1.2:=[profile?] <dev-haskell/hunit-1.4:=[profile?] >=dev-haskell/test-framework-0.2.0:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.3.0.2
 SRC_URI=mirror://hackage/packages/archive/test-framework-hunit/0.3.0.2/test-framework-hunit-0.3.0.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=23131526b6ddf674b5e3f556db9651e3
+_md5_=7d36093becdafb1d92afd416b1aa3615
diff --git a/metadata/md5-cache/dev-haskell/test-framework-quickcheck2-0.3.0.2 b/metadata/md5-cache/dev-haskell/test-framework-quickcheck2-0.3.0.2
index f33f6c119e55..7c2a84bf8c0b 100644
--- a/metadata/md5-cache/dev-haskell/test-framework-quickcheck2-0.3.0.2
+++ b/metadata/md5-cache/dev-haskell/test-framework-quickcheck2-0.3.0.2
@@ -4,10 +4,10 @@ DESCRIPTION=QuickCheck2 support for the test-framework package
 EAPI=5
 HOMEPAGE=https://batterseapower.github.io/test-framework/
 IUSE=doc hscolour profile
-KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/extensible-exceptions-0.1.1:=[profile?] <dev-haskell/extensible-exceptions-0.2.0:=[profile?] >=dev-haskell/quickcheck-2.4:=[profile?] <dev-haskell/quickcheck-2.7:=[profile?] >=dev-haskell/random-1:=[profile?] >=dev-haskell/test-framework-0.7.1:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.3.0.2
 SRC_URI=mirror://hackage/packages/archive/test-framework-quickcheck2/0.3.0.2/test-framework-quickcheck2-0.3.0.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=858a1b3625406305cc1bc84e673403f9
+_md5_=825796d258930e7c2774ecc89c7e3d52
diff --git a/metadata/md5-cache/dev-haskell/test-framework-quickcheck2-0.3.0.3-r2 b/metadata/md5-cache/dev-haskell/test-framework-quickcheck2-0.3.0.3-r2
index 53fa70a5ed01..99f2563764b4 100644
--- a/metadata/md5-cache/dev-haskell/test-framework-quickcheck2-0.3.0.3-r2
+++ b/metadata/md5-cache/dev-haskell/test-framework-quickcheck2-0.3.0.3-r2
@@ -4,10 +4,10 @@ DESCRIPTION=QuickCheck2 support for the test-framework package
 EAPI=5
 HOMEPAGE=https://batterseapower.github.io/test-framework/
 IUSE=doc hscolour profile
-KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/extensible-exceptions-0.1.1:=[profile?] <dev-haskell/extensible-exceptions-0.2.0:=[profile?] >=dev-haskell/quickcheck-2.4:2=[profile?] >=dev-haskell/random-1:=[profile?] >=dev-haskell/test-framework-0.7.1:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.3.0.3
 SRC_URI=mirror://hackage/packages/archive/test-framework-quickcheck2/0.3.0.3/test-framework-quickcheck2-0.3.0.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=dd722930dd1901f67150a0586eb69c20
+_md5_=d3d1515beec7b9b66022e0a097894aaf
diff --git a/metadata/md5-cache/dev-haskell/text-0.11.3.1 b/metadata/md5-cache/dev-haskell/text-0.11.3.1
index 7cfd27cf0316..3e69385b3bc9 100644
--- a/metadata/md5-cache/dev-haskell/text-0.11.3.1
+++ b/metadata/md5-cache/dev-haskell/text-0.11.3.1
@@ -4,10 +4,10 @@ DESCRIPTION=An efficient packed Unicode text type
 EAPI=5
 HOMEPAGE=https://github.com/bos/text
 IUSE=developer doc hscolour profile test
-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
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/0.11.3.1
 SRC_URI=mirror://hackage/packages/archive/text/0.11.3.1/text-0.11.3.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1faef5eabe82a3c4ad1dc3369488d17f
+_md5_=8840e47fbfa0db3ed92904337cb3eb4b
diff --git a/metadata/md5-cache/dev-haskell/text-1.1.1.3 b/metadata/md5-cache/dev-haskell/text-1.1.1.3
index 4519013509b8..f41e3d9eb723 100644
--- a/metadata/md5-cache/dev-haskell/text-1.1.1.3
+++ b/metadata/md5-cache/dev-haskell/text-1.1.1.3
@@ -4,11 +4,11 @@ DESCRIPTION=An efficient packed Unicode text type
 EAPI=5
 HOMEPAGE=https://github.com/bos/text
 IUSE=doc hscolour profile test
-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
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 RESTRICT=test
 SLOT=0/1.1.1.3
 SRC_URI=mirror://hackage/packages/archive/text/1.1.1.3/text-1.1.1.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=26c9b97a8e9899c57c37732180a6ef6f
+_md5_=56eabab2e0249769d947eb24531ddc27
diff --git a/metadata/md5-cache/dev-haskell/text-1.2.2.0 b/metadata/md5-cache/dev-haskell/text-1.2.2.0
index 873adfa8e08d..efdb9b415037 100644
--- a/metadata/md5-cache/dev-haskell/text-1.2.2.0
+++ b/metadata/md5-cache/dev-haskell/text-1.2.2.0
@@ -4,11 +4,11 @@ DESCRIPTION=An efficient packed Unicode text type
 EAPI=5
 HOMEPAGE=https://github.com/bos/text
 IUSE=doc hscolour profile test
-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
 LICENSE=BSD
 RDEPEND=dev-haskell/binary:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=test
 SLOT=0/1.2.2.0
 SRC_URI=mirror://hackage/packages/archive/text/1.2.2.0/text-1.2.2.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b17d0ac7185f62e74702470003cb8939
+_md5_=131e9d373f28874e3084ef26bbe2cde3
diff --git a/metadata/md5-cache/dev-haskell/text-1.2.2.1 b/metadata/md5-cache/dev-haskell/text-1.2.2.1
index ca71abe73f11..7047febcb908 100644
--- a/metadata/md5-cache/dev-haskell/text-1.2.2.1
+++ b/metadata/md5-cache/dev-haskell/text-1.2.2.1
@@ -4,11 +4,11 @@ DESCRIPTION=An efficient packed Unicode text type
 EAPI=5
 HOMEPAGE=https://github.com/bos/text
 IUSE=doc hscolour profile test
-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
 LICENSE=BSD
 RDEPEND=dev-haskell/binary:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=test
 SLOT=0/1.2.2.1
 SRC_URI=mirror://hackage/packages/archive/text/1.2.2.1/text-1.2.2.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7f0e21c93c4ad35e34014ba280eda24a
+_md5_=dd85244b4f96c9d575674d9e9c517fdf
diff --git a/metadata/md5-cache/dev-haskell/transformers-0.3.0.0-r1 b/metadata/md5-cache/dev-haskell/transformers-0.3.0.0-r1
index 67e68fb4e3e7..2ab2ea52446f 100644
--- a/metadata/md5-cache/dev-haskell/transformers-0.3.0.0-r1
+++ b/metadata/md5-cache/dev-haskell/transformers-0.3.0.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Concrete functor and monad transformers
 EAPI=5
 HOMEPAGE=http://hackage.haskell.org/package/transformers
 IUSE=doc hscolour profile
-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
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:= <dev-lang/ghc-7.10:=
 SLOT=0/0.3.0.0
 SRC_URI=mirror://hackage/packages/archive/transformers/0.3.0.0/transformers-0.3.0.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4b22c394675317fff0d779284082df9c
+_md5_=4e804865bec8caa1b7fb212ce98412e5
diff --git a/metadata/md5-cache/dev-haskell/transformers-0.4.1.0 b/metadata/md5-cache/dev-haskell/transformers-0.4.1.0
index 3cf18247164c..5a08ab8b6847 100644
--- a/metadata/md5-cache/dev-haskell/transformers-0.4.1.0
+++ b/metadata/md5-cache/dev-haskell/transformers-0.4.1.0
@@ -4,10 +4,10 @@ DESCRIPTION=Concrete functor and monad transformers
 EAPI=5
 HOMEPAGE=http://hackage.haskell.org/package/transformers
 IUSE=doc hscolour profile
-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
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/0.4.1.0
 SRC_URI=mirror://hackage/packages/archive/transformers/0.4.1.0/transformers-0.4.1.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a894de0c989a75dd606dc88e9f88a6a5
+_md5_=05d6a90b5583b8d3b1625ea46f0055ee
diff --git a/metadata/md5-cache/dev-haskell/transformers-0.4.2.0 b/metadata/md5-cache/dev-haskell/transformers-0.4.2.0
index 993c3e27f1b7..a7641c6cfd9f 100644
--- a/metadata/md5-cache/dev-haskell/transformers-0.4.2.0
+++ b/metadata/md5-cache/dev-haskell/transformers-0.4.2.0
@@ -4,10 +4,10 @@ DESCRIPTION=Concrete functor and monad transformers
 EAPI=5
 HOMEPAGE=http://hackage.haskell.org/package/transformers
 IUSE=doc hscolour profile
-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
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.4.2.0
 SRC_URI=mirror://hackage/packages/archive/transformers/0.4.2.0/transformers-0.4.2.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b089524bdde35f4ff7e8653cdd41bb53
+_md5_=7acf43f3ee77dae71721961162e69274
diff --git a/metadata/md5-cache/dev-haskell/transformers-0.4.3.0 b/metadata/md5-cache/dev-haskell/transformers-0.4.3.0
index c640ecdfa334..f8306c45f22f 100644
--- a/metadata/md5-cache/dev-haskell/transformers-0.4.3.0
+++ b/metadata/md5-cache/dev-haskell/transformers-0.4.3.0
@@ -4,10 +4,10 @@ DESCRIPTION=Concrete functor and monad transformers
 EAPI=5
 HOMEPAGE=http://hackage.haskell.org/package/transformers
 IUSE=doc hscolour profile
-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
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.4.3.0
 SRC_URI=mirror://hackage/packages/archive/transformers/0.4.3.0/transformers-0.4.3.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=89782af94280fcde3950923fc61b2200
+_md5_=aa05ab392b13db15d4ef242e963cd5d7
diff --git a/metadata/md5-cache/dev-haskell/transformers-0.5.2.0 b/metadata/md5-cache/dev-haskell/transformers-0.5.2.0
index 762cfa703276..c9d249d5c4bc 100644
--- a/metadata/md5-cache/dev-haskell/transformers-0.5.2.0
+++ b/metadata/md5-cache/dev-haskell/transformers-0.5.2.0
@@ -4,10 +4,10 @@ DESCRIPTION=Concrete functor and monad transformers
 EAPI=5
 HOMEPAGE=http://hackage.haskell.org/package/transformers
 IUSE=doc hscolour profile
-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
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.5.2.0
 SRC_URI=mirror://hackage/packages/archive/transformers/0.5.2.0/transformers-0.5.2.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=07de0494f2ee7a739e7bef6514321005
+_md5_=8debb8a2ddabf87dd5b357c0fa533447
diff --git a/metadata/md5-cache/dev-haskell/utf8-string-0.3.8 b/metadata/md5-cache/dev-haskell/utf8-string-0.3.8
index 1497b683a1b6..eac002ec871e 100644
--- a/metadata/md5-cache/dev-haskell/utf8-string-0.3.8
+++ b/metadata/md5-cache/dev-haskell/utf8-string-0.3.8
@@ -4,10 +4,10 @@ DESCRIPTION=Support for reading and writing UTF8 Strings
 EAPI=5
 HOMEPAGE=https://github.com/glguy/utf8-string/
 IUSE=doc hscolour profile
-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
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.3.8
 SRC_URI=mirror://hackage/packages/archive/utf8-string/0.3.8/utf8-string-0.3.8.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b51a3d2ba88861f8040c521f0b8620c0
+_md5_=a3fb295cae99ef50e25d7c7e22abc1b5
diff --git a/metadata/md5-cache/dev-haskell/utf8-string-1.0.1.1 b/metadata/md5-cache/dev-haskell/utf8-string-1.0.1.1
index 5cdf79086bad..486ad972d4a1 100644
--- a/metadata/md5-cache/dev-haskell/utf8-string-1.0.1.1
+++ b/metadata/md5-cache/dev-haskell/utf8-string-1.0.1.1
@@ -4,10 +4,10 @@ DESCRIPTION=Support for reading and writing UTF8 Strings
 EAPI=5
 HOMEPAGE=https://github.com/glguy/utf8-string/
 IUSE=doc hscolour profile
-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
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/1.0.1.1
 SRC_URI=mirror://hackage/packages/archive/utf8-string/1.0.1.1/utf8-string-1.0.1.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b2c0f06317d72836b188a22050c484bf
+_md5_=e12c2615303a9783ae6b955d20af2a86
diff --git a/metadata/md5-cache/dev-haskell/uuagc-0.9.24 b/metadata/md5-cache/dev-haskell/uuagc-0.9.24
deleted file mode 100644
index 29ca5630f4a8..000000000000
--- a/metadata/md5-cache/dev-haskell/uuagc-0.9.24
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm setup test unpack
-DEPEND=>=dev-haskell/cabal-1.2 >=dev-lang/ghc-6.10 dev-haskell/cabal >=dev-haskell/uulib-0.9.12 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) )
-DESCRIPTION=Attribute Grammar System of Universiteit Utrecht
-EAPI=0
-HOMEPAGE=http://www.cs.uu.nl/wiki/HUT/WebHome
-IUSE=doc profile
-KEYWORDS=amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=>=dev-lang/ghc-6.10 dev-haskell/cabal >=dev-haskell/uulib-0.9.12
-SLOT=0
-SRC_URI=mirror://hackage/packages/archive/uuagc/0.9.24/uuagc-0.9.24.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=62b509f71038cd857c8abb0cb8e3010b
diff --git a/metadata/md5-cache/dev-haskell/vector-0.10.12.3 b/metadata/md5-cache/dev-haskell/vector-0.10.12.3
index 7e16c121eefd..58f93d08e512 100644
--- a/metadata/md5-cache/dev-haskell/vector-0.10.12.3
+++ b/metadata/md5-cache/dev-haskell/vector-0.10.12.3
@@ -4,10 +4,10 @@ DESCRIPTION=Efficient Arrays
 EAPI=5
 HOMEPAGE=https://github.com/haskell/vector
 IUSE=+boundschecks internalchecks unsafechecks doc hscolour profile test
-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
 LICENSE=BSD
 RDEPEND=>=dev-haskell/primitive-0.5.0.1:=[profile?] <dev-haskell/primitive-0.7:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.10.12.3
 SRC_URI=mirror://hackage/packages/archive/vector/0.10.12.3/vector-0.10.12.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=dc254aa1aeed151901ded1fd967eedd6
+_md5_=f5d2cc5c68e08a890363344522162b63
diff --git a/metadata/md5-cache/dev-haskell/vector-0.11.0.0 b/metadata/md5-cache/dev-haskell/vector-0.11.0.0
index 3f0854032cad..e9a56102f600 100644
--- a/metadata/md5-cache/dev-haskell/vector-0.11.0.0
+++ b/metadata/md5-cache/dev-haskell/vector-0.11.0.0
@@ -4,11 +4,11 @@ DESCRIPTION=Efficient Arrays
 EAPI=6
 HOMEPAGE=https://github.com/haskell/vector
 IUSE=+boundschecks internalchecks unsafechecks doc hscolour profile
-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
 LICENSE=BSD
 RDEPEND=>=dev-haskell/primitive-0.5.0.1:=[profile?] <dev-haskell/primitive-0.7:=[profile?] >=dev-lang/ghc-7.4.1:=
 RESTRICT=test
 SLOT=0/0.11.0.0
 SRC_URI=mirror://hackage/packages/archive/vector/0.11.0.0/vector-0.11.0.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c703b63acf39e5fa00440646a792bc10
+_md5_=45ec2ca2a4f46b9c46c381d0c8688c18
diff --git a/metadata/md5-cache/dev-haskell/wxc-0.92.2.0 b/metadata/md5-cache/dev-haskell/wxc-0.92.2.0
index 31671b10cd88..5227d8388a55 100644
--- a/metadata/md5-cache/dev-haskell/wxc-0.92.2.0
+++ b/metadata/md5-cache/dev-haskell/wxc-0.92.2.0
@@ -9,5 +9,5 @@ LICENSE=wxWinLL-3.1
 RDEPEND=>dev-haskell/split-0:=[profile?] >=dev-haskell/wxdirect-0.90.1.1:3.0=[profile?] x11-libs/wxGTK:3.0=[X,gstreamer,opengl] >=dev-lang/ghc-7.6.1:=
 SLOT=3.0/0.92.2.0
 SRC_URI=mirror://hackage/packages/archive/wxc/0.92.2.0/wxc-0.92.2.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
 _md5_=e436999c2266650d38e90a6d10128831
diff --git a/metadata/md5-cache/dev-haskell/wxcore-0.92.2.0 b/metadata/md5-cache/dev-haskell/wxcore-0.92.2.0
index d07fb2064cfe..254690130443 100644
--- a/metadata/md5-cache/dev-haskell/wxcore-0.92.2.0
+++ b/metadata/md5-cache/dev-haskell/wxcore-0.92.2.0
@@ -9,5 +9,5 @@ LICENSE=wxWinLL-3.1
 RDEPEND=dev-haskell/parsec:=[profile?] dev-haskell/stm:=[profile?] >=dev-haskell/wxc-0.92:3.0=[profile?] >=dev-haskell/wxdirect-0.91:3.0=[profile?] >=dev-lang/ghc-7.4.1:= x11-libs/wxGTK:3.0=[X,gstreamer,opengl]
 SLOT=3.0/0.92.2.0
 SRC_URI=mirror://hackage/packages/archive/wxcore/0.92.2.0/wxcore-0.92.2.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	1b4b0d1d972613ecfb7af4c5c53f2051	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
 _md5_=ef5b5d92da17c595dc4f1e4fe20b7a41
diff --git a/metadata/md5-cache/dev-haskell/xml-1.3.13 b/metadata/md5-cache/dev-haskell/xml-1.3.13
index c359a1f9f17c..7578bec71ed3 100644
--- a/metadata/md5-cache/dev-haskell/xml-1.3.13
+++ b/metadata/md5-cache/dev-haskell/xml-1.3.13
@@ -4,10 +4,10 @@ DESCRIPTION=A simple XML library
 EAPI=5
 HOMEPAGE=http://code.galois.com
 IUSE=doc hscolour profile
-KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86
 LICENSE=BSD
 RDEPEND=dev-haskell/text:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/1.3.13
 SRC_URI=mirror://hackage/packages/archive/xml/1.3.13/xml-1.3.13.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=956f1ab3392de684ad7fdb93812a343b
+_md5_=3dd0598904fa0a884d450629a3a4d80e
diff --git a/metadata/md5-cache/dev-haskell/xml-1.3.14 b/metadata/md5-cache/dev-haskell/xml-1.3.14
index cd4237e5c585..130d9ad2c843 100644
--- a/metadata/md5-cache/dev-haskell/xml-1.3.14
+++ b/metadata/md5-cache/dev-haskell/xml-1.3.14
@@ -4,10 +4,10 @@ DESCRIPTION=A simple XML library
 EAPI=5
 HOMEPAGE=http://code.galois.com
 IUSE=doc hscolour profile
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=BSD
 RDEPEND=dev-haskell/text:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/1.3.14
 SRC_URI=mirror://hackage/packages/archive/xml/1.3.14/xml-1.3.14.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=082a9d1f7eecdac535e0654317b71570
+_md5_=87fec4e6722262c6944f659778533809
diff --git a/metadata/md5-cache/dev-haskell/zip-archive-0.1.3.4 b/metadata/md5-cache/dev-haskell/zip-archive-0.1.3.4
index 293c8d103068..5145e48f247a 100644
--- a/metadata/md5-cache/dev-haskell/zip-archive-0.1.3.4
+++ b/metadata/md5-cache/dev-haskell/zip-archive-0.1.3.4
@@ -4,10 +4,10 @@ DESCRIPTION=Library for creating and modifying zip archives
 EAPI=5
 HOMEPAGE=https://github.com/jgm/zip-archive
 IUSE=executable doc hscolour profile test
-KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/binary-0.5:=[profile?] >=dev-haskell/digest-0.0.0.1:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/utf8-string-0.3.1:=[profile?] dev-haskell/zlib:=[profile?] >=dev-lang/ghc-7.0.1:=
 SLOT=0/0.1.3.4
 SRC_URI=mirror://hackage/packages/archive/zip-archive/0.1.3.4/zip-archive-0.1.3.4.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=98f54e3aecc387521656d1826780806a
+_md5_=60da43f9d892583589509cee64fa059e
diff --git a/metadata/md5-cache/dev-haskell/zip-archive-0.2.3.7 b/metadata/md5-cache/dev-haskell/zip-archive-0.2.3.7
index 46a2a96d2027..c8645655e7f9 100644
--- a/metadata/md5-cache/dev-haskell/zip-archive-0.2.3.7
+++ b/metadata/md5-cache/dev-haskell/zip-archive-0.2.3.7
@@ -4,10 +4,10 @@ DESCRIPTION=Library for creating and modifying zip archives
 EAPI=5
 HOMEPAGE=https://github.com/jgm/zip-archive
 IUSE=executable doc hscolour profile test
-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
 LICENSE=BSD
 RDEPEND=>=dev-haskell/binary-0.5:=[profile?] >=dev-haskell/digest-0.0.0.1:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/old-time:=[profile?] >=dev-haskell/text-0.11:=[profile?] dev-haskell/zlib:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.2.3.7
 SRC_URI=mirror://hackage/packages/archive/zip-archive/0.2.3.7/zip-archive-0.2.3.7.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b8392e7bfacc4da2523da8741c572054
+_md5_=88e224c027c1b287c9136acdfe7ca1f0
diff --git a/metadata/md5-cache/dev-haskell/zlib-0.5.4.1 b/metadata/md5-cache/dev-haskell/zlib-0.5.4.1
index f20c20628024..a5dfab766741 100644
--- a/metadata/md5-cache/dev-haskell/zlib-0.5.4.1
+++ b/metadata/md5-cache/dev-haskell/zlib-0.5.4.1
@@ -4,10 +4,10 @@ DESCRIPTION=Compression and decompression in the gzip and zlib formats
 EAPI=5
 HOMEPAGE=http://hackage.haskell.org/package/zlib
 IUSE=doc hscolour profile
-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
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:= sys-libs/zlib
 SLOT=0/0.5.4.1
 SRC_URI=mirror://hackage/packages/archive/zlib/0.5.4.1/zlib-0.5.4.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6a1d434435a90ac5e219498b72e8d63b
+_md5_=9a3f08a30f8dc7d93d819eaa99c2c7e9
diff --git a/metadata/md5-cache/dev-haskell/zlib-0.5.4.2 b/metadata/md5-cache/dev-haskell/zlib-0.5.4.2
index d52b40441e74..d7eb28172f21 100644
--- a/metadata/md5-cache/dev-haskell/zlib-0.5.4.2
+++ b/metadata/md5-cache/dev-haskell/zlib-0.5.4.2
@@ -4,10 +4,10 @@ DESCRIPTION=Compression and decompression in the gzip and zlib formats
 EAPI=5
 HOMEPAGE=http://hackage.haskell.org/package/zlib
 IUSE=doc hscolour profile
-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
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:= sys-libs/zlib
 SLOT=0/0.5.4.2
 SRC_URI=mirror://hackage/packages/archive/zlib/0.5.4.2/zlib-0.5.4.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f3f3aeb3e8926c5482eb8a44e5400618
+_md5_=a1b8ebdcaec886d1f98b2ca7ceb8900a
diff --git a/metadata/md5-cache/dev-haskell/zlib-0.6.1.1 b/metadata/md5-cache/dev-haskell/zlib-0.6.1.1
index c02d4cc68bea..37b26f29b11e 100644
--- a/metadata/md5-cache/dev-haskell/zlib-0.6.1.1
+++ b/metadata/md5-cache/dev-haskell/zlib-0.6.1.1
@@ -4,11 +4,11 @@ DESCRIPTION=Compression and decompression in the gzip and zlib formats
 EAPI=5
 HOMEPAGE=http://hackage.haskell.org/package/zlib
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86 ~x86-fbsd ~ppc-macos ~x86-macos
+KEYWORDS=~amd64 ~x86 ~ppc-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-7.4.1:= sys-libs/zlib
 RESTRICT=test
 SLOT=0/0.6.1.1
 SRC_URI=mirror://hackage/packages/archive/zlib/0.6.1.1/zlib-0.6.1.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=fbd9ca4fec1ed6b041cb38a88da72fce
+_md5_=2bd91af15ae3ee57efbb26ca3e0172a1
author	V3n3RiX <venerix@redcorelinux.org>	2019-10-13 22:19:36 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-10-14 23:22:23 +0100
commit	4b19be30aa626b327c885dae62c559ec0e9fb935 (patch)
tree	76e74807bc479502e13866b581b6bf86734ec634 /metadata/md5-cache/dev-haskell
parent	30d6f67c98d149508509d5e86f176d558793acc0 (diff)